added local db
This commit is contained in:
@@ -3,10 +3,28 @@ 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';
|
||||
|
||||
/// Progress of a catalogue pull.
|
||||
/// 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();
|
||||
}
|
||||
@@ -34,20 +52,6 @@ class ImportFailed extends ImportState {
|
||||
final String message;
|
||||
}
|
||||
|
||||
/// Bumped after every successful import so catalogue providers refetch.
|
||||
final catalogueVersionProvider = StateProvider<int>((ref) => 0);
|
||||
|
||||
/// Whether the terminal has products to sell. The POS is gated on this.
|
||||
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;
|
||||
});
|
||||
|
||||
class CatalogueImportController extends StateNotifier<ImportState> {
|
||||
CatalogueImportController(this._ref) : super(const ImportIdle());
|
||||
|
||||
@@ -55,7 +59,6 @@ class CatalogueImportController extends StateNotifier<ImportState> {
|
||||
|
||||
Future<bool> run() async {
|
||||
if (state is ImportRunning) return false;
|
||||
|
||||
state = const ImportRunning(0, 'Starting…');
|
||||
|
||||
final event = await _ref.read(syncRepositoryProvider).importCatalogue(
|
||||
@@ -65,13 +68,11 @@ class CatalogueImportController extends StateNotifier<ImportState> {
|
||||
);
|
||||
|
||||
if (event.status == SyncStatus.synced) {
|
||||
// Force every catalogue-backed provider to refetch.
|
||||
_ref.read(catalogueVersionProvider.notifier).state++;
|
||||
_ref.invalidate(allProductsProvider);
|
||||
_ref.invalidate(visibleProductsProvider);
|
||||
_ref.invalidate(categoryCountsProvider);
|
||||
_ref.invalidate(lowStockProductsProvider);
|
||||
|
||||
state = ImportDone(event);
|
||||
return true;
|
||||
}
|
||||
@@ -79,8 +80,6 @@ class CatalogueImportController extends StateNotifier<ImportState> {
|
||||
state = ImportFailed(event.error ?? 'Import failed.');
|
||||
return false;
|
||||
}
|
||||
|
||||
void reset() => state = const ImportIdle();
|
||||
}
|
||||
|
||||
final catalogueImportProvider =
|
||||
@@ -88,69 +87,89 @@ final catalogueImportProvider =
|
||||
(ref) => CatalogueImportController(ref),
|
||||
);
|
||||
|
||||
// ------------------------------------------------------------------ Events
|
||||
/// Bumped whenever the event log changes.
|
||||
final syncVersionProvider = StateProvider<int>((ref) => 0);
|
||||
|
||||
final syncEventsProvider = Provider<List<SyncEvent>>((ref) {
|
||||
ref.watch(syncVersionProvider);
|
||||
ref.watch(catalogueVersionProvider);
|
||||
return ref.watch(syncRepositoryProvider).events;
|
||||
// ---------------------------------------------------- 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();
|
||||
});
|
||||
|
||||
final hasUnsyncedProvider = Provider<bool>((ref) {
|
||||
ref.watch(syncVersionProvider);
|
||||
ref.watch(catalogueVersionProvider);
|
||||
return ref.watch(syncRepositoryProvider).hasUnsyncedEvents;
|
||||
});
|
||||
|
||||
/// Today's takings, recomputed from local sales on every change.
|
||||
final shiftReportProvider = Provider<ShiftReport>((ref) {
|
||||
ref.watch(syncVersionProvider);
|
||||
/// Today's totals, read back from SQLite.
|
||||
final todayReportProvider = FutureProvider<ShiftReport>((ref) {
|
||||
ref.watch(orderVersionProvider);
|
||||
final session = ref.watch(cashierSessionProvider);
|
||||
final user = ref.watch(currentUserProvider);
|
||||
|
||||
return ref.watch(syncRepositoryProvider).buildShiftReport(
|
||||
businessDate: DateTime.now(),
|
||||
return ref.watch(syncRepositoryProvider).todayReport(
|
||||
terminalId: session.terminalId,
|
||||
cashierName: user?.name ?? session.name,
|
||||
);
|
||||
});
|
||||
|
||||
/// Drives the push button and the sign-out dialog.
|
||||
class ReportPushController extends StateNotifier<bool> {
|
||||
ReportPushController(this._ref) : super(false);
|
||||
/// 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;
|
||||
|
||||
/// Pushes today's report. Returns the resulting event so the caller can
|
||||
/// tell the cashier whether it landed.
|
||||
Future<SyncEvent> pushToday() async {
|
||||
state = true;
|
||||
try {
|
||||
final report = _ref.read(shiftReportProvider);
|
||||
final event =
|
||||
await _ref.read(syncRepositoryProvider).pushShiftReport(report);
|
||||
_ref.read(syncVersionProvider.notifier).state++;
|
||||
return event;
|
||||
} finally {
|
||||
if (mounted) state = false;
|
||||
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;
|
||||
}
|
||||
|
||||
Future<SyncEvent> retry(String eventId) async {
|
||||
state = true;
|
||||
try {
|
||||
final event = await _ref.read(syncRepositoryProvider).retry(eventId);
|
||||
_ref.read(syncVersionProvider.notifier).state++;
|
||||
return event;
|
||||
} finally {
|
||||
if (mounted) state = false;
|
||||
}
|
||||
}
|
||||
void reset() => state = const SyncIdle();
|
||||
}
|
||||
|
||||
final reportPushProvider =
|
||||
StateNotifierProvider<ReportPushController, bool>(
|
||||
(ref) => ReportPushController(ref),
|
||||
final orderSyncProvider =
|
||||
StateNotifierProvider<OrderSyncController, OrderSyncState>(
|
||||
(ref) => OrderSyncController(ref),
|
||||
);
|
||||
|
||||
@@ -7,9 +7,9 @@ import '../../../core/theme/app_colors.dart';
|
||||
import '../../../core/theme/app_dimens.dart';
|
||||
import '../../../core/utils/formatters.dart';
|
||||
import '../../../core/widgets/primary_button.dart';
|
||||
import '../../../domain/entities/sync_event.dart';
|
||||
import '../../auth/providers/auth_controller.dart';
|
||||
import '../../pos/providers/cart_controller.dart';
|
||||
import '../../../domain/repositories/sync_repository.dart';
|
||||
import '../providers/sync_controller.dart';
|
||||
|
||||
/// End-of-shift flow.
|
||||
@@ -33,7 +33,7 @@ class _SignOutDialog extends ConsumerStatefulWidget {
|
||||
}
|
||||
|
||||
class _SignOutDialogState extends ConsumerState<_SignOutDialog> {
|
||||
SyncEvent? _result;
|
||||
SyncOutcome? _result;
|
||||
|
||||
void _finish() {
|
||||
ref.read(cartControllerProvider.notifier).reset();
|
||||
@@ -43,12 +43,12 @@ class _SignOutDialogState extends ConsumerState<_SignOutDialog> {
|
||||
}
|
||||
|
||||
Future<void> _pushThenFinish() async {
|
||||
final event = await ref.read(reportPushProvider.notifier).pushToday();
|
||||
final outcome = await ref.read(orderSyncProvider.notifier).run();
|
||||
if (!mounted) return;
|
||||
|
||||
setState(() => _result = event);
|
||||
setState(() => _result = outcome);
|
||||
|
||||
if (event.status == SyncStatus.synced) {
|
||||
if (outcome.isSuccess) {
|
||||
await Future<void>.delayed(const Duration(milliseconds: 700));
|
||||
if (mounted) _finish();
|
||||
}
|
||||
@@ -56,10 +56,11 @@ class _SignOutDialogState extends ConsumerState<_SignOutDialog> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final report = ref.watch(shiftReportProvider);
|
||||
final report = ref.watch(todayReportProvider).value;
|
||||
final pending = ref.watch(unsyncedCountProvider).value ?? 0;
|
||||
final cart = ref.watch(cartControllerProvider);
|
||||
final pushing = ref.watch(reportPushProvider);
|
||||
final failed = _result?.status == SyncStatus.failed;
|
||||
final pushing = ref.watch(orderSyncProvider) is SyncRunning;
|
||||
final failed = _result != null && !_result!.isSuccess;
|
||||
|
||||
return AlertDialog(
|
||||
title: const Text('End shift'),
|
||||
@@ -70,7 +71,8 @@ class _SignOutDialogState extends ConsumerState<_SignOutDialog> {
|
||||
AppSpacing.sm,
|
||||
),
|
||||
content: SizedBox(
|
||||
width: 420,
|
||||
// Never wider than the viewport allows.
|
||||
width: (MediaQuery.sizeOf(context).width - 96).clamp(280.0, 420.0),
|
||||
child: SingleChildScrollView(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
@@ -85,17 +87,17 @@ class _SignOutDialogState extends ConsumerState<_SignOutDialog> {
|
||||
'and will be cleared. Park it first if you need it.',
|
||||
),
|
||||
|
||||
if (report.isEmpty)
|
||||
if (pending == 0)
|
||||
const _Banner(
|
||||
icon: Icons.info_outline_rounded,
|
||||
color: AppColors.textSecondary,
|
||||
background: AppColors.surfaceAlt,
|
||||
message: 'No sales were recorded today, so there is nothing '
|
||||
'to push.',
|
||||
icon: Icons.check_circle_outline_rounded,
|
||||
color: AppColors.success,
|
||||
background: AppColors.successSurface,
|
||||
message: 'Every bill has already been uploaded. Nothing is '
|
||||
'waiting on this terminal.',
|
||||
)
|
||||
else ...[
|
||||
const Text(
|
||||
"Today's takings",
|
||||
'Waiting to upload',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w600,
|
||||
@@ -103,12 +105,14 @@ class _SignOutDialogState extends ConsumerState<_SignOutDialog> {
|
||||
),
|
||||
),
|
||||
const SizedBox(height: AppSpacing.sm),
|
||||
_row('Bills', '${report.billCount}'),
|
||||
_row('Items sold', report.itemCount.toStringAsFixed(0)),
|
||||
_row('Gross sales', Formatters.money(report.grossSales)),
|
||||
_row('GST collected', Formatters.money(report.taxCollected)),
|
||||
_row('Average basket',
|
||||
Formatters.money(report.averageBasket)),
|
||||
_row('Bills pending sync', '$pending'),
|
||||
if (report != null) ...[
|
||||
_row('Bills today', '${report.billCount}'),
|
||||
_row('Items sold', report.itemCount.toStringAsFixed(0)),
|
||||
_row('Gross sales', Formatters.money(report.grossSales)),
|
||||
_row('GST collected',
|
||||
Formatters.money(report.taxCollected)),
|
||||
],
|
||||
],
|
||||
|
||||
if (failed) ...[
|
||||
@@ -118,7 +122,7 @@ class _SignOutDialogState extends ConsumerState<_SignOutDialog> {
|
||||
color: AppColors.danger,
|
||||
background: AppColors.dangerSurface,
|
||||
message: _result?.error ??
|
||||
'The push failed. The report is still saved on this '
|
||||
'Upload failed. Every bill is still stored on this '
|
||||
'terminal and can be retried from Events.',
|
||||
),
|
||||
],
|
||||
@@ -149,14 +153,14 @@ class _SignOutDialogState extends ConsumerState<_SignOutDialog> {
|
||||
foregroundColor: AppColors.textSecondary,
|
||||
),
|
||||
child: Text(
|
||||
report.isEmpty ? 'Sign out' : 'Sign out without pushing',
|
||||
pending == 0 ? 'Sign out' : 'Sign out without syncing',
|
||||
),
|
||||
),
|
||||
if (!report.isEmpty)
|
||||
if (pending > 0)
|
||||
SizedBox(
|
||||
width: 190,
|
||||
child: PrimaryButton(
|
||||
label: failed ? 'Retry push' : 'Push & sign out',
|
||||
label: failed ? 'Retry sync' : 'Sync & sign out',
|
||||
icon: Icons.cloud_upload_rounded,
|
||||
busy: pushing,
|
||||
onPressed: _pushThenFinish,
|
||||
|
||||
Reference in New Issue
Block a user