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>
122 lines
3.6 KiB
Dart
122 lines
3.6 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 '../../../core/theme/app_colors.dart';
|
|
import '../../../core/theme/app_dimens.dart';
|
|
import '../providers/cart_controller.dart';
|
|
|
|
/// Brief floating confirmation after a scan.
|
|
///
|
|
/// Deliberately not a dialog: the cashier must never have to dismiss anything
|
|
/// between items.
|
|
class ScanToast extends ConsumerStatefulWidget {
|
|
const ScanToast({super.key});
|
|
|
|
@override
|
|
ConsumerState<ScanToast> createState() => _ScanToastState();
|
|
}
|
|
|
|
class _ScanToastState extends ConsumerState<ScanToast> {
|
|
Timer? _timer;
|
|
ScanFeedback? _visible;
|
|
|
|
void _show(ScanFeedback feedback) {
|
|
_timer?.cancel();
|
|
setState(() => _visible = feedback);
|
|
_timer = Timer(
|
|
const Duration(milliseconds: 1600),
|
|
() {
|
|
if (mounted) setState(() => _visible = null);
|
|
},
|
|
);
|
|
}
|
|
|
|
@override
|
|
void dispose() {
|
|
_timer?.cancel();
|
|
super.dispose();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
ref.listen<ScanFeedback?>(scanFeedbackProvider, (prev, next) {
|
|
if (next != null) _show(next);
|
|
});
|
|
|
|
final feedback = _visible;
|
|
if (feedback == null) return const SizedBox.shrink();
|
|
|
|
final success = feedback.isSuccess;
|
|
final color = success ? AppColors.success : AppColors.danger;
|
|
final product = feedback.product;
|
|
|
|
final message = feedback.message ??
|
|
switch (feedback.outcome) {
|
|
ScanOutcome.added => 'Added to bill',
|
|
ScanOutcome.incremented => 'Quantity updated',
|
|
ScanOutcome.notFound => 'Product not found',
|
|
ScanOutcome.outOfStock => 'Out of stock',
|
|
};
|
|
|
|
return Container(
|
|
margin: const EdgeInsets.symmetric(horizontal: AppSpacing.xxl),
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: AppSpacing.xl,
|
|
vertical: AppSpacing.md,
|
|
),
|
|
decoration: const BoxDecoration(
|
|
color: AppColors.textPrimary,
|
|
borderRadius: AppRadius.brPill,
|
|
boxShadow: AppColors.shadowLg,
|
|
),
|
|
child: Row(mainAxisSize: MainAxisSize.min, children: [
|
|
Container(
|
|
width: 26,
|
|
height: 26,
|
|
decoration: BoxDecoration(color: color, shape: BoxShape.circle),
|
|
child: Icon(
|
|
success ? Icons.check_rounded : Icons.priority_high_rounded,
|
|
size: 17,
|
|
color: Colors.white,
|
|
),
|
|
),
|
|
const SizedBox(width: AppSpacing.md),
|
|
if (product != null) ...[
|
|
Text(product.emoji, style: const TextStyle(fontSize: 17)),
|
|
const SizedBox(width: AppSpacing.sm),
|
|
ConstrainedBox(
|
|
constraints: const BoxConstraints(maxWidth: 220),
|
|
child: Text(
|
|
product.name,
|
|
overflow: TextOverflow.ellipsis,
|
|
style: const TextStyle(
|
|
color: Colors.white,
|
|
fontWeight: FontWeight.w700,
|
|
fontSize: 14.5,
|
|
),
|
|
),
|
|
),
|
|
const SizedBox(width: AppSpacing.sm),
|
|
Container(width: 1, height: 16, color: Colors.white24),
|
|
const SizedBox(width: AppSpacing.sm),
|
|
],
|
|
Text(
|
|
message,
|
|
style: TextStyle(
|
|
color: Colors.white.withValues(alpha: 0.85),
|
|
fontSize: 13.5,
|
|
),
|
|
),
|
|
],),
|
|
)
|
|
.animate(key: ValueKey(feedback.stamp))
|
|
.fadeIn(duration: 140.ms)
|
|
.slideY(begin: 0.4, end: 0, curve: Curves.easeOutBack)
|
|
.then(delay: 1200.ms)
|
|
.fadeOut(duration: 250.ms);
|
|
}
|
|
}
|