Bills were persisted correctly but read back wrong. The read path rebuilt a cart from its lines alone, dropping bill-level discounts and loyalty, so every figure derived from a stored bill was overstated: the upload payload, the day archive and the shift report. A discounted 529 bill read back as 620. Money and data integrity - order_dao: restore bill_discount and points_redeemed when rebuilding a cart; keep the reconstruction tier-less so the membership discount is not applied twice. Trust the recorded total and points via SaleTransaction.storedTotal. - checkout_sale + order_dao.commitSale: write the bill, its stock movement and the loyalty update in one transaction. Previously a failure part-way through left a persisted bill the cashier believed had failed, inviting a duplicate. - checkout_sale: re-check every line against live stock. A parked bill resumed after its stock was sold passed validation and oversold. - catalogue_dao: allocate the invoice sequence in one transaction; the previous read-modify-write could hand two sales the same number and fail UNIQUE. - local_store: replay unsynced sales after a catalogue import, so a mid-shift re-import cannot restore stock that has already been sold. - payment_controller: stamp the signed-in operator on the bill instead of the hardcoded seed session, and pass the terminal id through. - cart: reconcile per-slab GST against the bill total so the parts sum to the whole on a tax invoice. Sync and reporting - sync_repository: drain unsynced bills in a loop rather than silently capping at one page; stop on rejection so rejected rows cannot loop forever. - sync_log_dao (new): persist the sync history to the sync_log table, which the schema already defined but nothing used. It was in memory, so the only record that bills had been uploaded died at restart. - Scope shift reports by cashier. day_archive is re-keyed to (business_date, cashier_name) so a till stays settleable after its bills are uploaded and deleted. Schema v4 with a migration that carries v3 rows across. Input and UI - barcode_service: consume machine-paced keystrokes so a scan cannot also land in the focused field, and raise the bar to 60ms/char while a text field has focus so typing a mobile number is not read as a scan. Clock and focus check injected so the behaviour is testable. - primary_button: make the label flexible; label plus trailing total overflowed the Charge button by up to 131px. - app_router: redirect instead of null-casting when the receipt route is entered without its transaction. - customer_repository: reduce the search query to digits so a punctuated mobile number matches. Cleanup - Remove TransactionRepository.save, CustomerRepository.recordSale and OrderDao.insertOrder, all superseded by commitSale. - dart fix across the tree; 251 analyzer issues down to 3 info-level. Tests: 23 passing / 15 failing -> 90 passing. Fixed the two defects that broke the existing suite (containsAll type argument, reset() needing a catalogue) and deleted the leftover template test. Added coverage for the order round trip, the day archive after a real sync, stock safety, checkout atomicity, the v3->v4 migration, scanner-versus-human input, and an app-level smoke test that renders every module. Note: bills already uploaded with a discount went up overstated. This stops it happening again but does not correct historical server data. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
195 lines
5.7 KiB
Dart
195 lines
5.7 KiB
Dart
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
|
|
import '../../../app/providers.dart';
|
|
import '../../../domain/entities/shift_report.dart';
|
|
import '../../../domain/entities/sync_event.dart';
|
|
import '../../../domain/repositories/sync_repository.dart';
|
|
import '../../auth/providers/auth_controller.dart';
|
|
import '../../pos/providers/catalog_providers.dart';
|
|
|
|
/// Bumped after every import so catalogue-backed providers refetch.
|
|
final catalogueVersionProvider = StateProvider<int>((ref) => 0);
|
|
|
|
/// Bumped after every sale or sync so order-backed providers refetch.
|
|
final orderVersionProvider = StateProvider<int>((ref) => 0);
|
|
|
|
/// Whether products exist on this terminal. Billing is gated on it.
|
|
final catalogueReadyProvider = Provider<bool>((ref) {
|
|
ref.watch(catalogueVersionProvider);
|
|
return ref.watch(syncRepositoryProvider).hasCatalogue;
|
|
});
|
|
|
|
final lastImportAtProvider = Provider<DateTime?>((ref) {
|
|
ref.watch(catalogueVersionProvider);
|
|
return ref.watch(syncRepositoryProvider).lastImportAt;
|
|
});
|
|
|
|
// ------------------------------------------------------- Morning: import
|
|
sealed class ImportState {
|
|
const ImportState();
|
|
}
|
|
|
|
class ImportIdle extends ImportState {
|
|
const ImportIdle();
|
|
}
|
|
|
|
class ImportRunning extends ImportState {
|
|
const ImportRunning(this.progress, this.stage);
|
|
|
|
final double progress;
|
|
final String stage;
|
|
}
|
|
|
|
class ImportDone extends ImportState {
|
|
const ImportDone(this.event);
|
|
|
|
final SyncEvent event;
|
|
}
|
|
|
|
class ImportFailed extends ImportState {
|
|
const ImportFailed(this.message);
|
|
|
|
final String message;
|
|
}
|
|
|
|
class CatalogueImportController extends StateNotifier<ImportState> {
|
|
CatalogueImportController(this._ref) : super(const ImportIdle());
|
|
|
|
final Ref _ref;
|
|
|
|
Future<bool> run() async {
|
|
if (state is ImportRunning) return false;
|
|
state = const ImportRunning(0, 'Starting…');
|
|
|
|
final event = await _ref.read(syncRepositoryProvider).importCatalogue(
|
|
onProgress: (progress, stage) {
|
|
if (mounted) state = ImportRunning(progress, stage);
|
|
},
|
|
);
|
|
|
|
if (event.status == SyncStatus.synced) {
|
|
_ref.read(catalogueVersionProvider.notifier).state++;
|
|
_ref.invalidate(allProductsProvider);
|
|
_ref.invalidate(visibleProductsProvider);
|
|
_ref.invalidate(categoryCountsProvider);
|
|
_ref.invalidate(lowStockProductsProvider);
|
|
state = ImportDone(event);
|
|
return true;
|
|
}
|
|
|
|
state = ImportFailed(event.error ?? 'Import failed.');
|
|
return false;
|
|
}
|
|
|
|
/// Drops a stale success or failure banner.
|
|
void reset() => state = const ImportIdle();
|
|
}
|
|
|
|
final catalogueImportProvider =
|
|
StateNotifierProvider<CatalogueImportController, ImportState>(
|
|
(ref) => CatalogueImportController(ref),
|
|
);
|
|
|
|
// ---------------------------------------------------- Business hours: read
|
|
/// Bills still held on this terminal at sync_status = 0.
|
|
final unsyncedCountProvider = FutureProvider<int>((ref) {
|
|
ref.watch(orderVersionProvider);
|
|
return ref.watch(syncRepositoryProvider).unsyncedCount();
|
|
});
|
|
|
|
/// Everything this terminal traded today, across every operator.
|
|
final todayReportProvider = FutureProvider<ShiftReport>((ref) {
|
|
ref.watch(orderVersionProvider);
|
|
final session = ref.watch(cashierSessionProvider);
|
|
final user = ref.watch(currentUserProvider);
|
|
|
|
return ref.watch(syncRepositoryProvider).todayReport(
|
|
terminalId: session.terminalId,
|
|
cashierName: user?.name ?? session.name,
|
|
);
|
|
});
|
|
|
|
/// Only the bills the signed-in operator rang.
|
|
///
|
|
/// This is the figure a cashier counts their drawer against at the end of a
|
|
/// shift, so it must not include anyone else's sales.
|
|
final myShiftReportProvider = FutureProvider<ShiftReport>((ref) {
|
|
ref.watch(orderVersionProvider);
|
|
final session = ref.watch(cashierSessionProvider);
|
|
final user = ref.watch(currentUserProvider);
|
|
|
|
return ref.watch(syncRepositoryProvider).todayReport(
|
|
terminalId: session.terminalId,
|
|
cashierName: user?.name ?? session.name,
|
|
scopeToCashier: true,
|
|
);
|
|
});
|
|
|
|
/// Per-order sync state for the events log.
|
|
final orderSyncRowsProvider = FutureProvider<List<OrderSyncRow>>((ref) {
|
|
ref.watch(orderVersionProvider);
|
|
return ref.watch(syncRepositoryProvider).orderSyncRows();
|
|
});
|
|
|
|
final syncEventsProvider = Provider<List<SyncEvent>>((ref) {
|
|
ref.watch(orderVersionProvider);
|
|
ref.watch(catalogueVersionProvider);
|
|
return ref.watch(syncRepositoryProvider).events;
|
|
});
|
|
|
|
// ------------------------------------------------------ End of day: upload
|
|
sealed class OrderSyncState {
|
|
const OrderSyncState();
|
|
}
|
|
|
|
class SyncIdle extends OrderSyncState {
|
|
const SyncIdle();
|
|
}
|
|
|
|
class SyncRunning extends OrderSyncState {
|
|
const SyncRunning(this.progress, this.stage);
|
|
|
|
final double progress;
|
|
final String stage;
|
|
}
|
|
|
|
class SyncFinished extends OrderSyncState {
|
|
const SyncFinished(this.outcome);
|
|
|
|
final SyncOutcome outcome;
|
|
}
|
|
|
|
class OrderSyncController extends StateNotifier<OrderSyncState> {
|
|
OrderSyncController(this._ref) : super(const SyncIdle());
|
|
|
|
final Ref _ref;
|
|
|
|
bool get isRunning => state is SyncRunning;
|
|
|
|
/// Uploads every bill at sync_status = 0 and flips the accepted ones to 1.
|
|
Future<SyncOutcome> run() async {
|
|
if (isRunning) {
|
|
return const SyncOutcome(attempted: 0, uploaded: 0);
|
|
}
|
|
|
|
state = const SyncRunning(0, 'Starting…');
|
|
|
|
final outcome = await _ref.read(syncRepositoryProvider).syncOrders(
|
|
onProgress: (progress, stage) {
|
|
if (mounted) state = SyncRunning(progress, stage);
|
|
},
|
|
);
|
|
|
|
_ref.read(orderVersionProvider.notifier).state++;
|
|
if (mounted) state = SyncFinished(outcome);
|
|
return outcome;
|
|
}
|
|
|
|
void reset() => state = const SyncIdle();
|
|
}
|
|
|
|
final orderSyncProvider =
|
|
StateNotifierProvider<OrderSyncController, OrderSyncState>(
|
|
(ref) => OrderSyncController(ref),
|
|
);
|