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>
145 lines
3.8 KiB
Dart
145 lines
3.8 KiB
Dart
import 'package:equatable/equatable.dart';
|
|
|
|
import '../../core/constants/app_constants.dart';
|
|
import '../../core/utils/extensions.dart';
|
|
|
|
enum Gender {
|
|
male('Male'),
|
|
female('Female'),
|
|
other('Other'),
|
|
unspecified('Prefer not to say');
|
|
|
|
const Gender(this.label);
|
|
|
|
final String label;
|
|
}
|
|
|
|
/// Loyalty tier, derived from lifetime spend.
|
|
enum MembershipTier {
|
|
bronze('Bronze', 0, 0.0),
|
|
silver('Silver', 10000, 0.02),
|
|
gold('Gold', 50000, 0.05),
|
|
platinum('Platinum', 150000, 0.08);
|
|
|
|
const MembershipTier(this.label, this.threshold, this.discountRate);
|
|
|
|
final String label;
|
|
|
|
/// Lifetime spend in rupees required to reach this tier.
|
|
final double threshold;
|
|
|
|
/// Automatic bill discount granted to members of this tier.
|
|
final double discountRate;
|
|
|
|
static MembershipTier forSpend(double lifetimeSpend) {
|
|
return MembershipTier.values.lastWhere(
|
|
(t) => lifetimeSpend >= t.threshold,
|
|
orElse: () => MembershipTier.bronze,
|
|
);
|
|
}
|
|
|
|
MembershipTier? get next {
|
|
final i = index;
|
|
return i < MembershipTier.values.length - 1
|
|
? MembershipTier.values[i + 1]
|
|
: null;
|
|
}
|
|
}
|
|
|
|
/// A registered shopper. A `null` customer on a sale means walk-in.
|
|
class Customer extends Equatable {
|
|
const Customer({
|
|
required this.id,
|
|
required this.name,
|
|
required this.mobile,
|
|
this.email,
|
|
this.gender = Gender.unspecified,
|
|
this.dateOfBirth,
|
|
this.loyaltyPoints = 0,
|
|
this.lifetimeSpend = 0,
|
|
this.visitCount = 0,
|
|
this.createdAt,
|
|
this.lastVisitAt,
|
|
});
|
|
|
|
final String id;
|
|
final String name;
|
|
final String mobile;
|
|
final String? email;
|
|
final Gender gender;
|
|
final DateTime? dateOfBirth;
|
|
final int loyaltyPoints;
|
|
final double lifetimeSpend;
|
|
final int visitCount;
|
|
final DateTime? createdAt;
|
|
final DateTime? lastVisitAt;
|
|
|
|
MembershipTier get tier => MembershipTier.forSpend(lifetimeSpend);
|
|
|
|
/// Cash value of the points currently held.
|
|
double get redeemableValue =>
|
|
loyaltyPoints * AppConstants.loyaltyPointValue;
|
|
|
|
/// Rupees of additional spend needed to reach the next tier.
|
|
double? get spendToNextTier {
|
|
final next = tier.next;
|
|
if (next == null) return null;
|
|
return (next.threshold - lifetimeSpend).clamp(0, double.infinity);
|
|
}
|
|
|
|
bool get isBirthdayToday {
|
|
final dob = dateOfBirth;
|
|
if (dob == null) return false;
|
|
final now = DateTime.now();
|
|
return dob.month == now.month && dob.day == now.day;
|
|
}
|
|
|
|
/// The shopper as they stand after a completed sale.
|
|
///
|
|
/// Pure, so the caller can compute the new row and persist it in the same
|
|
/// transaction as the bill rather than as a separate write that might fail
|
|
/// on its own.
|
|
Customer applySale({
|
|
required double amount,
|
|
required int pointsEarned,
|
|
required int pointsRedeemed,
|
|
DateTime? at,
|
|
}) {
|
|
return copyWith(
|
|
loyaltyPoints:
|
|
(loyaltyPoints - pointsRedeemed + pointsEarned).clamp(0, 1 << 31),
|
|
lifetimeSpend: (lifetimeSpend + amount).asMoney,
|
|
visitCount: visitCount + 1,
|
|
lastVisitAt: at ?? DateTime.now(),
|
|
);
|
|
}
|
|
|
|
Customer copyWith({
|
|
String? name,
|
|
String? email,
|
|
Gender? gender,
|
|
DateTime? dateOfBirth,
|
|
int? loyaltyPoints,
|
|
double? lifetimeSpend,
|
|
int? visitCount,
|
|
DateTime? lastVisitAt,
|
|
}) {
|
|
return Customer(
|
|
id: id,
|
|
name: name ?? this.name,
|
|
mobile: mobile,
|
|
email: email ?? this.email,
|
|
gender: gender ?? this.gender,
|
|
dateOfBirth: dateOfBirth ?? this.dateOfBirth,
|
|
loyaltyPoints: loyaltyPoints ?? this.loyaltyPoints,
|
|
lifetimeSpend: lifetimeSpend ?? this.lifetimeSpend,
|
|
visitCount: visitCount ?? this.visitCount,
|
|
createdAt: createdAt,
|
|
lastVisitAt: lastVisitAt ?? this.lastVisitAt,
|
|
);
|
|
}
|
|
|
|
@override
|
|
List<Object?> get props => [id, name, mobile, loyaltyPoints, lifetimeSpend];
|
|
}
|