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>
311 lines
8.8 KiB
Dart
311 lines
8.8 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
import 'package:uuid/uuid.dart';
|
|
|
|
import '../../../app/providers.dart';
|
|
import '../../../core/constants/app_constants.dart';
|
|
import '../../../core/services/sound_service.dart';
|
|
import '../../../domain/entities/cart.dart';
|
|
import '../../../domain/entities/customer.dart';
|
|
import '../../../domain/entities/product.dart';
|
|
import '../../../domain/entities/transaction.dart';
|
|
import '../../../domain/repositories/product_repository.dart';
|
|
import '../../../domain/repositories/transaction_repository.dart';
|
|
|
|
/// Transient feedback for the scan toast — never a blocking dialog.
|
|
enum ScanOutcome { added, incremented, notFound, outOfStock }
|
|
|
|
class ScanFeedback {
|
|
const ScanFeedback({
|
|
required this.outcome,
|
|
required this.stamp,
|
|
this.product,
|
|
this.message,
|
|
});
|
|
|
|
final ScanOutcome outcome;
|
|
final DateTime stamp;
|
|
final Product? product;
|
|
final String? message;
|
|
|
|
bool get isSuccess =>
|
|
outcome == ScanOutcome.added || outcome == ScanOutcome.incremented;
|
|
}
|
|
|
|
/// Owns the live bill.
|
|
///
|
|
/// All mutations funnel through here so that scanner input, product taps and
|
|
/// keyboard shortcuts share one code path and one set of guarantees.
|
|
class CartController extends StateNotifier<Cart> {
|
|
CartController({
|
|
required ProductRepository products,
|
|
required TransactionRepository transactions,
|
|
required SoundService sound,
|
|
required this.onFeedback,
|
|
}) : _products = products,
|
|
_transactions = transactions,
|
|
_sound = sound,
|
|
super(Cart.empty);
|
|
|
|
final ProductRepository _products;
|
|
final TransactionRepository _transactions;
|
|
final SoundService _sound;
|
|
final void Function(ScanFeedback) onFeedback;
|
|
|
|
static const _uuid = Uuid();
|
|
|
|
/// Snapshots for undo — capped so memory can't grow unbounded on a terminal
|
|
/// that runs for days.
|
|
final List<Cart> _undoStack = [];
|
|
static const int _maxUndo = 25;
|
|
|
|
bool get canUndo => _undoStack.isNotEmpty;
|
|
|
|
void _push() {
|
|
_undoStack.add(state);
|
|
if (_undoStack.length > _maxUndo) _undoStack.removeAt(0);
|
|
}
|
|
|
|
void undo() {
|
|
if (_undoStack.isEmpty) return;
|
|
state = _undoStack.removeLast();
|
|
}
|
|
|
|
// ------------------------------------------------------------ Line items
|
|
/// Adds a product, merging into the existing line when already present.
|
|
void addProduct(Product product, {double quantity = 1}) {
|
|
if (product.isOutOfStock) {
|
|
_sound.scanError();
|
|
onFeedback(ScanFeedback(
|
|
outcome: ScanOutcome.outOfStock,
|
|
stamp: DateTime.now(),
|
|
product: product,
|
|
message: '${product.name} is out of stock',
|
|
),);
|
|
return;
|
|
}
|
|
|
|
_push();
|
|
|
|
final existing = state.lineFor(product.id);
|
|
final requested = (existing?.quantity ?? 0) + quantity;
|
|
|
|
if (requested > product.stock) {
|
|
_undoStack.removeLast();
|
|
_sound.scanError();
|
|
onFeedback(ScanFeedback(
|
|
outcome: ScanOutcome.outOfStock,
|
|
stamp: DateTime.now(),
|
|
product: product,
|
|
message: 'Only ${product.stock.toStringAsFixed(0)} '
|
|
'${product.unit.symbol} left',
|
|
),);
|
|
return;
|
|
}
|
|
|
|
if (existing == null) {
|
|
state = state.copyWith(lines: [
|
|
...state.lines,
|
|
CartLine(
|
|
product: product,
|
|
quantity: quantity,
|
|
addedAt: DateTime.now(),
|
|
),
|
|
],);
|
|
} else {
|
|
state = state.copyWith(
|
|
lines: _replace(existing.copyWith(quantity: requested)),
|
|
);
|
|
}
|
|
|
|
_clampRedemption();
|
|
_sound.scanSuccess();
|
|
onFeedback(ScanFeedback(
|
|
outcome: existing == null ? ScanOutcome.added : ScanOutcome.incremented,
|
|
stamp: DateTime.now(),
|
|
product: product,
|
|
),);
|
|
}
|
|
|
|
/// Scanner entry point. Resolves the barcode and adds it with no dialogs.
|
|
Future<void> scanBarcode(String code) async {
|
|
final product = await _products.findByBarcode(code);
|
|
|
|
if (product == null) {
|
|
// Deliberately not awaited — the beep must never delay the next scan.
|
|
unawaited(_sound.scanError());
|
|
onFeedback(ScanFeedback(
|
|
outcome: ScanOutcome.notFound,
|
|
stamp: DateTime.now(),
|
|
message: 'No product for barcode $code',
|
|
),);
|
|
return;
|
|
}
|
|
|
|
addProduct(product);
|
|
}
|
|
|
|
void setQuantity(String productId, double quantity) {
|
|
final line = state.lineFor(productId);
|
|
if (line == null) return;
|
|
|
|
if (quantity <= 0) {
|
|
removeLine(productId);
|
|
return;
|
|
}
|
|
|
|
final capped = quantity
|
|
.clamp(0, AppConstants.maxCartQuantityPerLine.toDouble())
|
|
.toDouble();
|
|
|
|
if (capped > line.product.stock) {
|
|
_sound.scanError();
|
|
onFeedback(ScanFeedback(
|
|
outcome: ScanOutcome.outOfStock,
|
|
stamp: DateTime.now(),
|
|
product: line.product,
|
|
message: 'Only ${line.product.stock.toStringAsFixed(0)} in stock',
|
|
),);
|
|
return;
|
|
}
|
|
|
|
_push();
|
|
state = state.copyWith(lines: _replace(line.copyWith(quantity: capped)));
|
|
_clampRedemption();
|
|
}
|
|
|
|
void increment(String productId, {double by = 1}) {
|
|
final line = state.lineFor(productId);
|
|
if (line == null) return;
|
|
setQuantity(productId, line.quantity + by);
|
|
}
|
|
|
|
void decrement(String productId, {double by = 1}) {
|
|
final line = state.lineFor(productId);
|
|
if (line == null) return;
|
|
setQuantity(productId, line.quantity - by);
|
|
}
|
|
|
|
void removeLine(String productId) {
|
|
if (!state.contains(productId)) return;
|
|
_push();
|
|
state = state.copyWith(
|
|
lines: state.lines.where((l) => l.product.id != productId).toList(),
|
|
);
|
|
_clampRedemption();
|
|
}
|
|
|
|
void applyLineDiscount(String productId, Discount discount) {
|
|
final line = state.lineFor(productId);
|
|
if (line == null) return;
|
|
_push();
|
|
state = state.copyWith(lines: _replace(line.copyWith(discount: discount)));
|
|
_clampRedemption();
|
|
}
|
|
|
|
// ------------------------------------------------------------ Bill level
|
|
void applyBillDiscount(Discount discount) {
|
|
_push();
|
|
state = state.copyWith(billDiscount: discount);
|
|
_clampRedemption();
|
|
}
|
|
|
|
void clearBillDiscount() => applyBillDiscount(Discount.none);
|
|
|
|
void attachCustomer(Customer? customer) {
|
|
_push();
|
|
state = customer == null
|
|
? state.copyWith(clearCustomer: true, pointsRedeemed: 0)
|
|
: state.copyWith(customer: customer);
|
|
_clampRedemption();
|
|
}
|
|
|
|
void redeemPoints(int points) {
|
|
final max = state.maxRedeemablePoints;
|
|
_push();
|
|
state = state.copyWith(pointsRedeemed: points.clamp(0, max));
|
|
}
|
|
|
|
void redeemAllPoints() => redeemPoints(state.maxRedeemablePoints);
|
|
|
|
void clearRedemption() => redeemPoints(0);
|
|
|
|
void setNote(String? note) => state = state.copyWith(note: note);
|
|
|
|
/// Keeps redemption legal after the bill shrinks below the redeemed value.
|
|
void _clampRedemption() {
|
|
if (state.pointsRedeemed == 0) return;
|
|
final max = state.maxRedeemablePoints;
|
|
if (state.pointsRedeemed > max) {
|
|
state = state.copyWith(pointsRedeemed: max);
|
|
}
|
|
}
|
|
|
|
// --------------------------------------------------------------- Session
|
|
void clear() {
|
|
_push();
|
|
state = Cart.empty;
|
|
}
|
|
|
|
/// Starts a brand new sale, dropping undo history and the customer.
|
|
void reset() {
|
|
_undoStack.clear();
|
|
state = Cart.empty;
|
|
}
|
|
|
|
/// Keeps the customer attached for a follow-up bill.
|
|
void resetKeepingCustomer() {
|
|
_undoStack.clear();
|
|
state = Cart(customer: state.customer);
|
|
}
|
|
|
|
// ---------------------------------------------------------- Parked bills
|
|
Future<void> park({String? label}) async {
|
|
if (state.isEmpty) return;
|
|
await _transactions.park(ParkedBill(
|
|
id: _uuid.v4(),
|
|
cart: state,
|
|
parkedAt: DateTime.now(),
|
|
label: label,
|
|
),);
|
|
reset();
|
|
}
|
|
|
|
Future<void> resume(ParkedBill bill) async {
|
|
await _transactions.removeParked(bill.id);
|
|
_undoStack.clear();
|
|
state = bill.cart;
|
|
}
|
|
|
|
List<CartLine> _replace(CartLine updated) => [
|
|
for (final l in state.lines)
|
|
if (l.product.id == updated.product.id) updated else l,
|
|
];
|
|
}
|
|
|
|
// ----------------------------------------------------------------- Providers
|
|
final scanFeedbackProvider = StateProvider<ScanFeedback?>((ref) => null);
|
|
|
|
final cartControllerProvider =
|
|
StateNotifierProvider<CartController, Cart>((ref) {
|
|
return CartController(
|
|
products: ref.watch(productRepositoryProvider),
|
|
transactions: ref.watch(transactionRepositoryProvider),
|
|
sound: ref.watch(soundServiceProvider),
|
|
onFeedback: (feedback) =>
|
|
ref.read(scanFeedbackProvider.notifier).state = feedback,
|
|
);
|
|
});
|
|
|
|
/// Convenience selectors — each rebuilds only the widget that needs it.
|
|
final cartTotalProvider =
|
|
Provider<double>((ref) => ref.watch(cartControllerProvider).grandTotal);
|
|
|
|
final cartItemCountProvider =
|
|
Provider<int>((ref) => ref.watch(cartControllerProvider).lineCount);
|
|
|
|
final parkedBillsProvider = FutureProvider<List<ParkedBill>>(
|
|
(ref) => ref.watch(transactionRepositoryProvider).parkedBills(),
|
|
);
|