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>
330 lines
11 KiB
Dart
330 lines
11 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_animate/flutter_animate.dart';
|
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
import 'package:go_router/go_router.dart';
|
|
|
|
import '../../../app/providers.dart';
|
|
import '../../../core/constants/app_constants.dart';
|
|
import '../../../core/router/app_router.dart';
|
|
import '../../../core/theme/app_colors.dart';
|
|
import '../../../core/theme/app_dimens.dart';
|
|
import '../../../core/theme/app_typography.dart';
|
|
import '../../../core/utils/extensions.dart';
|
|
import '../../../core/utils/formatters.dart';
|
|
import '../../../core/widgets/glass_card.dart';
|
|
import '../../../core/widgets/primary_button.dart';
|
|
import '../../../domain/entities/transaction.dart';
|
|
import '../../modules/providers/printer_settings.dart';
|
|
import '../../pos/providers/cart_controller.dart';
|
|
import '../widgets/receipt_preview.dart';
|
|
|
|
/// Confirmation screen. Counts down and starts the next sale on its own so an
|
|
/// unattended terminal never sits on a finished bill.
|
|
class ReceiptScreen extends ConsumerStatefulWidget {
|
|
const ReceiptScreen({super.key, required this.transaction});
|
|
|
|
final SaleTransaction transaction;
|
|
|
|
@override
|
|
ConsumerState<ReceiptScreen> createState() => _ReceiptScreenState();
|
|
}
|
|
|
|
class _ReceiptScreenState extends ConsumerState<ReceiptScreen> {
|
|
late int _seconds = AppConstants.postSaleResetDelay.inSeconds + 5;
|
|
Timer? _timer;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
|
|
// Auto-print is opt-in and only fires when a printer was actually
|
|
// selected, so it can never fail invisibly on a terminal with none.
|
|
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
|
final settings = ref.read(printerSettingsProvider);
|
|
if (!settings.autoPrint || !settings.hasPrinter) return;
|
|
|
|
final ok = await ref.read(receiptServiceProvider).printDirect(
|
|
widget.transaction,
|
|
printerUrl: settings.printerUrl,
|
|
);
|
|
if (!ok && mounted) {
|
|
_cancelAutoReturn();
|
|
ScaffoldMessenger.of(context)
|
|
..hideCurrentSnackBar()
|
|
..showSnackBar(const SnackBar(
|
|
backgroundColor: AppColors.danger,
|
|
content: Text(
|
|
'Printer did not respond — use Print to send it again.',
|
|
),
|
|
),);
|
|
}
|
|
});
|
|
|
|
_timer = Timer.periodic(const Duration(seconds: 1), (t) {
|
|
if (!mounted) return;
|
|
setState(() => _seconds--);
|
|
if (_seconds <= 0) _newSale();
|
|
});
|
|
}
|
|
|
|
@override
|
|
void dispose() {
|
|
_timer?.cancel();
|
|
super.dispose();
|
|
}
|
|
|
|
void _cancelAutoReturn() {
|
|
_timer?.cancel();
|
|
if (mounted) setState(() => _seconds = -1);
|
|
}
|
|
|
|
void _newSale() {
|
|
_timer?.cancel();
|
|
ref.read(cartControllerProvider.notifier).reset();
|
|
if (mounted) context.go(AppRoutes.pos);
|
|
}
|
|
|
|
void _continueBilling() {
|
|
_timer?.cancel();
|
|
ref.read(cartControllerProvider.notifier).reset();
|
|
if (mounted) context.go(AppRoutes.pos);
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final txn = widget.transaction;
|
|
|
|
return Scaffold(
|
|
backgroundColor: AppColors.background,
|
|
body: SafeArea(
|
|
child: Listener(
|
|
onPointerDown: (_) => _cancelAutoReturn(),
|
|
child: Padding(
|
|
padding: const EdgeInsets.all(AppSpacing.xxl),
|
|
child: context.isCompact
|
|
? SingleChildScrollView(
|
|
child: Column(children: [
|
|
_summary(txn),
|
|
const SizedBox(height: AppSpacing.lg),
|
|
SizedBox(
|
|
height: 480,
|
|
child: ReceiptPreview(transaction: txn),
|
|
),
|
|
],),
|
|
)
|
|
: Row(
|
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
children: [
|
|
Expanded(flex: 5, child: _summary(txn)),
|
|
const SizedBox(width: AppSpacing.xxl),
|
|
Expanded(
|
|
flex: 4,
|
|
child: ReceiptPreview(transaction: txn),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
Widget _summary(SaleTransaction txn) {
|
|
return GlassCard(
|
|
padding: const EdgeInsets.all(AppSpacing.xxxl),
|
|
radius: AppRadius.xxl,
|
|
shadows: AppColors.shadowMd,
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
children: [
|
|
Center(
|
|
child: Container(
|
|
width: 84,
|
|
height: 84,
|
|
decoration: const BoxDecoration(
|
|
color: AppColors.successSurface,
|
|
shape: BoxShape.circle,
|
|
),
|
|
child: const Icon(Icons.check_rounded,
|
|
size: 44, color: AppColors.success,),
|
|
)
|
|
.animate()
|
|
.scale(
|
|
duration: 340.ms,
|
|
curve: Curves.easeOutBack,
|
|
begin: const Offset(0.5, 0.5),
|
|
)
|
|
.fadeIn(),
|
|
),
|
|
const SizedBox(height: AppSpacing.xl),
|
|
Text('Sale complete',
|
|
textAlign: TextAlign.center,
|
|
style: context.text.headlineMedium,),
|
|
const SizedBox(height: AppSpacing.xs),
|
|
Text(
|
|
'${txn.invoiceNumber} · ${Formatters.dateTime(txn.createdAt)}',
|
|
textAlign: TextAlign.center,
|
|
style: context.text.bodySmall,
|
|
),
|
|
|
|
const SizedBox(height: AppSpacing.xxl),
|
|
Container(
|
|
padding: const EdgeInsets.all(AppSpacing.xl),
|
|
decoration: const BoxDecoration(
|
|
color: AppColors.primarySurface,
|
|
borderRadius: AppRadius.brLg,
|
|
),
|
|
child: Column(children: [
|
|
Text('Amount paid', style: context.text.labelMedium),
|
|
Text(
|
|
Formatters.money(txn.total),
|
|
style: AppTypography.money(36, color: AppColors.primary),
|
|
),
|
|
const SizedBox(height: AppSpacing.md),
|
|
const Divider(),
|
|
const SizedBox(height: AppSpacing.md),
|
|
_row('Paid via', txn.paymentSummary),
|
|
if (txn.changeDue > 0)
|
|
_row('Change returned', Formatters.money(txn.changeDue),
|
|
highlight: AppColors.success,),
|
|
_row('Items', '${txn.cart.lineCount}'),
|
|
if (txn.customer != null) ...[
|
|
_row('Customer', txn.customer!.name),
|
|
_row('Points earned', '+${txn.pointsEarned}',
|
|
highlight: AppColors.success,),
|
|
if (txn.pointsRedeemed > 0)
|
|
_row('Points redeemed', '-${txn.pointsRedeemed}'),
|
|
],
|
|
if (txn.cart.totalSavings > 0)
|
|
_row(
|
|
'Customer saved',
|
|
Formatters.money(txn.cart.totalSavings),
|
|
highlight: AppColors.success,
|
|
),
|
|
],),
|
|
),
|
|
|
|
const SizedBox(height: AppSpacing.xxl),
|
|
// Wrap, so three actions never overflow a narrow terminal.
|
|
Wrap(
|
|
spacing: AppSpacing.md,
|
|
runSpacing: AppSpacing.md,
|
|
children: [
|
|
SizedBox(
|
|
width: 150,
|
|
child: PrimaryButton(
|
|
label: 'Print',
|
|
icon: Icons.print_outlined,
|
|
tone: ButtonTone.neutral,
|
|
onPressed: () async {
|
|
_cancelAutoReturn();
|
|
final settings = ref.read(printerSettingsProvider);
|
|
final service = ref.read(receiptServiceProvider);
|
|
|
|
// Straight to the roll when one is configured; otherwise
|
|
// the system preview, which works with no hardware.
|
|
final printed = settings.hasPrinter &&
|
|
await service.printDirect(
|
|
txn,
|
|
printerUrl: settings.printerUrl,
|
|
);
|
|
if (!printed) await service.printPreview(txn);
|
|
},
|
|
),
|
|
),
|
|
SizedBox(
|
|
width: 170,
|
|
child: PrimaryButton(
|
|
label: 'WhatsApp',
|
|
icon: Icons.chat_rounded,
|
|
tone: txn.customer == null
|
|
? ButtonTone.neutral
|
|
: ButtonTone.ghost,
|
|
onPressed: txn.customer == null
|
|
? null
|
|
: () async {
|
|
_cancelAutoReturn();
|
|
final sent = await ref
|
|
.read(receiptServiceProvider)
|
|
.sendToWhatsApp(txn);
|
|
if (!context.mounted || sent) return;
|
|
ScaffoldMessenger.of(context)
|
|
..hideCurrentSnackBar()
|
|
..showSnackBar(const SnackBar(
|
|
content: Text(
|
|
'Could not open WhatsApp on this device.',
|
|
),
|
|
),);
|
|
},
|
|
),
|
|
),
|
|
SizedBox(
|
|
width: 170,
|
|
child: PrimaryButton(
|
|
label: 'Share PDF',
|
|
icon: Icons.ios_share_rounded,
|
|
tone: ButtonTone.neutral,
|
|
onPressed: () {
|
|
_cancelAutoReturn();
|
|
ref.read(receiptServiceProvider).sharePdf(txn);
|
|
},
|
|
),
|
|
),
|
|
],
|
|
),
|
|
if (txn.customer == null)
|
|
const Padding(
|
|
padding: EdgeInsets.only(top: AppSpacing.sm),
|
|
child: Text(
|
|
'No mobile number captured, so WhatsApp is unavailable for '
|
|
'this bill.',
|
|
style: TextStyle(
|
|
fontSize: 12,
|
|
color: AppColors.textTertiary,
|
|
),
|
|
),
|
|
),
|
|
const SizedBox(height: AppSpacing.md),
|
|
PrimaryButton(
|
|
label: _seconds > 0
|
|
? 'New Sale ($_seconds)'
|
|
: 'New Sale',
|
|
icon: Icons.add_shopping_cart_rounded,
|
|
large: true,
|
|
onPressed: _newSale,
|
|
),
|
|
const SizedBox(height: AppSpacing.sm),
|
|
TextButton(
|
|
onPressed: _continueBilling,
|
|
child: const Text('Back to billing screen'),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
|
|
Widget _row(String label, String value, {Color? highlight}) => Padding(
|
|
padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs),
|
|
child: Row(
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
children: [
|
|
Text(label,
|
|
style: const TextStyle(
|
|
fontSize: 13.5,
|
|
color: AppColors.textSecondary,
|
|
),),
|
|
Text(
|
|
value,
|
|
style: TextStyle(
|
|
fontSize: 13.5,
|
|
fontWeight: FontWeight.w700,
|
|
color: highlight ?? AppColors.textPrimary,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|