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>
198 lines
6.7 KiB
Dart
198 lines
6.7 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
|
|
import '../../../core/theme/app_colors.dart';
|
|
import '../../../core/theme/app_dimens.dart';
|
|
import '../../../core/theme/app_layout.dart';
|
|
import '../../../core/widgets/primary_button.dart';
|
|
import '../../sync/providers/sync_controller.dart';
|
|
import '../providers/navigation_provider.dart';
|
|
import '../widgets/category_chips.dart';
|
|
import '../widgets/customer_bar.dart';
|
|
import '../widgets/product_grid.dart';
|
|
import '../widgets/scan_toast.dart';
|
|
import '../widgets/search_field.dart';
|
|
|
|
/// Catalogue half of the terminal.
|
|
///
|
|
/// Gated on the catalogue import: with no products loaded there is nothing to
|
|
/// sell, so the cashier is sent to the import step instead of a broken grid.
|
|
class PosView extends ConsumerWidget {
|
|
const PosView({super.key, required this.layout, required this.searchFocus});
|
|
|
|
final PosLayout layout;
|
|
final FocusNode searchFocus;
|
|
|
|
@override
|
|
Widget build(BuildContext context, WidgetRef ref) {
|
|
if (!ref.watch(catalogueReadyProvider)) {
|
|
return const _CatalogueRequired();
|
|
}
|
|
|
|
final pad = layout.contentPadding;
|
|
|
|
// Keep the last grid row clear of the floating bill button.
|
|
final bottomInset = layout.billingIsSheet
|
|
? AppSizes.buttonHeightLarge + AppSpacing.xxxl
|
|
: AppSpacing.xxl;
|
|
|
|
return Stack(
|
|
children: [
|
|
Column(
|
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
children: [
|
|
const CustomerBar(),
|
|
const Divider(height: 1),
|
|
Padding(
|
|
padding:
|
|
EdgeInsets.fromLTRB(pad, AppSpacing.lg, pad, AppSpacing.md),
|
|
child: PosSearchField(focusNode: searchFocus),
|
|
),
|
|
CategoryChips(horizontalPadding: pad),
|
|
const SizedBox(height: AppSpacing.md),
|
|
Expanded(
|
|
child: ProductGrid(
|
|
horizontalPadding: pad,
|
|
tileExtent: layout.gridTileExtent,
|
|
bottomPadding: bottomInset,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
Positioned(
|
|
left: 0,
|
|
right: 0,
|
|
bottom: bottomInset,
|
|
child: const Align(
|
|
alignment: Alignment.bottomCenter,
|
|
child: ScanToast(),
|
|
),
|
|
),
|
|
],
|
|
);
|
|
}
|
|
}
|
|
|
|
/// Shown until the catalogue has been pulled onto this terminal.
|
|
class _CatalogueRequired extends ConsumerWidget {
|
|
const _CatalogueRequired();
|
|
|
|
@override
|
|
Widget build(BuildContext context, WidgetRef ref) {
|
|
final state = ref.watch(catalogueImportProvider);
|
|
final running = state is ImportRunning;
|
|
|
|
return Center(
|
|
child: SingleChildScrollView(
|
|
padding: const EdgeInsets.all(AppSpacing.xxl),
|
|
child: ConstrainedBox(
|
|
constraints: const BoxConstraints(maxWidth: 460),
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
Container(
|
|
width: 96,
|
|
height: 96,
|
|
decoration: const BoxDecoration(
|
|
color: AppColors.primarySurface,
|
|
shape: BoxShape.circle,
|
|
),
|
|
child: const Icon(Icons.cloud_download_outlined,
|
|
size: 42, color: AppColors.primary,),
|
|
),
|
|
const SizedBox(height: AppSpacing.xxl),
|
|
Text(
|
|
'Import products to start billing',
|
|
textAlign: TextAlign.center,
|
|
style: Theme.of(context).textTheme.headlineSmall,
|
|
),
|
|
const SizedBox(height: AppSpacing.sm),
|
|
const Text(
|
|
'This terminal has no catalogue yet. Pull the current products '
|
|
'once at the start of your shift — after that everything runs '
|
|
'offline.',
|
|
textAlign: TextAlign.center,
|
|
style: TextStyle(
|
|
fontSize: 14,
|
|
color: AppColors.textSecondary,
|
|
height: 1.6,
|
|
),
|
|
),
|
|
const SizedBox(height: AppSpacing.xxl),
|
|
|
|
if (running) ...[
|
|
Text(
|
|
state.stage,
|
|
style: const TextStyle(
|
|
fontSize: 13,
|
|
color: AppColors.textSecondary,
|
|
),
|
|
),
|
|
const SizedBox(height: AppSpacing.sm),
|
|
ClipRRect(
|
|
borderRadius: AppRadius.brPill,
|
|
child: LinearProgressIndicator(
|
|
value: state.progress,
|
|
minHeight: 8,
|
|
backgroundColor: AppColors.divider,
|
|
valueColor: const AlwaysStoppedAnimation<Color>(
|
|
AppColors.primary,),
|
|
),
|
|
),
|
|
const SizedBox(height: AppSpacing.lg),
|
|
],
|
|
|
|
if (state is ImportFailed) ...[
|
|
Container(
|
|
padding: const EdgeInsets.all(AppSpacing.md),
|
|
margin: const EdgeInsets.only(bottom: AppSpacing.lg),
|
|
decoration: const BoxDecoration(
|
|
color: AppColors.dangerSurface,
|
|
borderRadius: AppRadius.brSm,
|
|
),
|
|
child: Row(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
const Icon(Icons.wifi_off_rounded,
|
|
color: AppColors.danger, size: 18,),
|
|
const SizedBox(width: AppSpacing.sm),
|
|
Expanded(
|
|
child: Text(
|
|
state.message,
|
|
style: const TextStyle(
|
|
color: AppColors.danger,
|
|
fontSize: 13,
|
|
height: 1.45,
|
|
),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
],
|
|
|
|
PrimaryButton(
|
|
label: 'Import catalogue now',
|
|
icon: Icons.cloud_download_rounded,
|
|
large: true,
|
|
busy: running,
|
|
onPressed: running
|
|
? null
|
|
: () => ref.read(catalogueImportProvider.notifier).run(),
|
|
),
|
|
const SizedBox(height: AppSpacing.md),
|
|
TextButton.icon(
|
|
onPressed: () => ref
|
|
.read(activeModuleProvider.notifier)
|
|
.state = PosModule.productImport,
|
|
icon: const Icon(Icons.open_in_new_rounded, size: 16),
|
|
label: const Text('Open Product Import'),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|