af3933092f
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>
447 lines
16 KiB
Dart
447 lines
16 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
|
|
import '../../../app/providers.dart';
|
|
import '../../../core/constants/app_constants.dart';
|
|
import '../../../core/theme/app_colors.dart';
|
|
import '../../../core/theme/app_dimens.dart';
|
|
import '../../../core/utils/formatters.dart';
|
|
import '../../../domain/entities/store_account.dart';
|
|
import '../../auth/providers/auth_controller.dart';
|
|
import '../providers/printer_settings.dart';
|
|
import '../../sync/providers/sync_controller.dart';
|
|
import '../widgets/module_widgets.dart';
|
|
|
|
/// Terminal and store configuration.
|
|
class SettingsView extends ConsumerStatefulWidget {
|
|
const SettingsView({super.key});
|
|
|
|
@override
|
|
ConsumerState<SettingsView> createState() => _SettingsViewState();
|
|
}
|
|
|
|
class _SettingsViewState extends ConsumerState<SettingsView> {
|
|
bool _scannerSound = true;
|
|
bool _roundOff = true;
|
|
bool _autoLoyalty = true;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final store = ref.watch(currentStoreProvider);
|
|
final user = ref.watch(currentUserProvider);
|
|
|
|
return ModulePage(
|
|
children: [
|
|
LayoutBuilder(
|
|
builder: (context, constraints) {
|
|
final wide = constraints.maxWidth >= 1040;
|
|
|
|
final left = Column(
|
|
children: [
|
|
_storeCard(store),
|
|
const SizedBox(height: AppSpacing.lg),
|
|
_taxCard(),
|
|
const SizedBox(height: AppSpacing.lg),
|
|
_loyaltyCard(),
|
|
],
|
|
);
|
|
final right = Column(
|
|
children: [
|
|
_hardwareCard(),
|
|
const SizedBox(height: AppSpacing.lg),
|
|
_connectivityCard(),
|
|
const SizedBox(height: AppSpacing.lg),
|
|
_staffCard(store, user),
|
|
const SizedBox(height: AppSpacing.lg),
|
|
_aboutCard(),
|
|
],
|
|
);
|
|
|
|
if (!wide) {
|
|
return Column(
|
|
children: [left, const SizedBox(height: AppSpacing.lg), right],
|
|
);
|
|
}
|
|
return Row(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Expanded(child: left),
|
|
const SizedBox(width: AppSpacing.lg),
|
|
Expanded(child: right),
|
|
],
|
|
);
|
|
},
|
|
),
|
|
],
|
|
);
|
|
}
|
|
|
|
Widget _storeCard(StoreAccount? store) => PanelCard(
|
|
title: 'Store details',
|
|
subtitle: 'Printed on every invoice',
|
|
action: TextButton(onPressed: () {}, child: const Text('Edit')),
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
_row('Store name', store?.name ?? AppConstants.storeName),
|
|
_row('Address', store?.address ?? AppConstants.storeAddress),
|
|
_row('GSTIN', store?.gstin ?? AppConstants.storeGstin, mono: true),
|
|
_row('Phone', store?.phone ?? AppConstants.storePhone, mono: true),
|
|
_row('Plan', store?.plan ?? 'Business'),
|
|
],
|
|
),
|
|
);
|
|
|
|
Widget _taxCard() => PanelCard(
|
|
title: 'Tax & pricing',
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
_row(
|
|
'Default GST slab',
|
|
Formatters.percent(AppConstants.defaultGstRate),
|
|
),
|
|
_row('Prices include tax', 'Yes'),
|
|
_toggle(
|
|
'Round bills to nearest rupee',
|
|
'Shows the adjustment as a Round Off line',
|
|
_roundOff,
|
|
(v) => setState(() => _roundOff = v),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
|
|
Widget _loyaltyCard() => PanelCard(
|
|
title: 'Loyalty programme',
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
_row(
|
|
'Earn rate',
|
|
'1 point per '
|
|
'${Formatters.money(AppConstants.loyaltyRupeesPerPoint)}',
|
|
),
|
|
_row(
|
|
'Point value',
|
|
Formatters.money(AppConstants.loyaltyPointValue),
|
|
),
|
|
_toggle(
|
|
'Apply tier discount automatically',
|
|
'Silver 2%, Gold 5%, Platinum 8%',
|
|
_autoLoyalty,
|
|
(v) => setState(() => _autoLoyalty = v),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
|
|
Widget _hardwareCard() {
|
|
final settings = ref.watch(printerSettingsProvider);
|
|
final controller = ref.read(printerSettingsProvider.notifier);
|
|
final printers = ref.watch(availablePrintersProvider);
|
|
|
|
return PanelCard(
|
|
title: 'Printer & peripherals',
|
|
subtitle: 'Install the printer in the operating system first — it then '
|
|
'appears in this list.',
|
|
action: TextButton.icon(
|
|
onPressed: () => ref.invalidate(availablePrintersProvider),
|
|
icon: const Icon(Icons.refresh_rounded, size: 16),
|
|
label: const Text('Rescan'),
|
|
),
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
children: [
|
|
printers.when(
|
|
loading: () => const Padding(
|
|
padding: EdgeInsets.symmetric(vertical: AppSpacing.lg),
|
|
child: Center(child: CircularProgressIndicator()),
|
|
),
|
|
error: (e, _) => Text(
|
|
'Could not list printers: $e',
|
|
style: const TextStyle(color: AppColors.danger, fontSize: 12.5),
|
|
),
|
|
data: (list) {
|
|
if (list.isEmpty) {
|
|
return Container(
|
|
padding: const EdgeInsets.all(AppSpacing.md),
|
|
decoration: const BoxDecoration(
|
|
color: AppColors.warningSurface,
|
|
borderRadius: AppRadius.brSm,
|
|
),
|
|
child: const Row(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Icon(Icons.print_disabled_rounded,
|
|
size: 18, color: AppColors.warning,),
|
|
SizedBox(width: AppSpacing.sm),
|
|
Expanded(
|
|
child: Text(
|
|
'No printers found. Add the thermal printer in your '
|
|
'operating system settings, then tap Rescan. Bills '
|
|
'still print to screen in the meantime.',
|
|
style: TextStyle(
|
|
fontSize: 12.5,
|
|
color: AppColors.warning,
|
|
height: 1.45,
|
|
),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
|
|
return Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
children: [
|
|
DropdownButtonFormField<String>(
|
|
initialValue: list.any((p) => p.url == settings.printerUrl)
|
|
? settings.printerUrl
|
|
: null,
|
|
isExpanded: true,
|
|
decoration: const InputDecoration(
|
|
labelText: 'Receipt printer',
|
|
prefixIcon: Icon(Icons.print_outlined),
|
|
isDense: true,
|
|
),
|
|
hint: const Text('Print to screen only'),
|
|
items: [
|
|
for (final p in list)
|
|
DropdownMenuItem(
|
|
value: p.url,
|
|
child: Text(
|
|
p.isDefault ? '${p.name} (system default)' : p.name,
|
|
overflow: TextOverflow.ellipsis,
|
|
),
|
|
),
|
|
],
|
|
onChanged: (url) => controller.selectPrinter(
|
|
url == null
|
|
? null
|
|
: list.firstWhere((p) => p.url == url),
|
|
),
|
|
),
|
|
const SizedBox(height: AppSpacing.md),
|
|
Wrap(
|
|
spacing: AppSpacing.sm,
|
|
runSpacing: AppSpacing.sm,
|
|
children: [
|
|
OutlinedButton.icon(
|
|
onPressed: () async {
|
|
final ok = await ref
|
|
.read(receiptServiceProvider)
|
|
.printTestPage(
|
|
printerUrl: settings.printerUrl,);
|
|
if (!context.mounted) return;
|
|
ScaffoldMessenger.of(context)
|
|
..hideCurrentSnackBar()
|
|
..showSnackBar(SnackBar(
|
|
backgroundColor: ok
|
|
? AppColors.success
|
|
: AppColors.danger,
|
|
content: Text(ok
|
|
? 'Test slip sent to the printer.'
|
|
: 'Could not reach the printer.',),
|
|
),);
|
|
},
|
|
icon: const Icon(Icons.receipt_long_rounded, size: 17),
|
|
label: const Text('Print test slip'),
|
|
),
|
|
if (settings.hasPrinter)
|
|
TextButton(
|
|
onPressed: () => controller.selectPrinter(null),
|
|
style: TextButton.styleFrom(
|
|
foregroundColor: AppColors.textSecondary,
|
|
),
|
|
child: const Text('Use screen only'),
|
|
),
|
|
],
|
|
),
|
|
],
|
|
);
|
|
},
|
|
),
|
|
const Divider(height: AppSpacing.xxl),
|
|
_toggle(
|
|
'Scanner beep',
|
|
'Audible confirmation on every scan',
|
|
_scannerSound,
|
|
(v) => setState(() => _scannerSound = v),
|
|
),
|
|
_toggle(
|
|
'Print receipt automatically',
|
|
settings.hasPrinter
|
|
? 'Sends to the selected printer the moment a sale completes'
|
|
: 'Select a printer above to enable this',
|
|
settings.autoPrint,
|
|
settings.hasPrinter ? controller.setAutoPrint : null,
|
|
),
|
|
_toggle(
|
|
'Open cash drawer on cash sales',
|
|
'Needs a raw ESC/POS link — see the notes in ReceiptService',
|
|
settings.openDrawer,
|
|
controller.setOpenDrawer,
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
|
|
Widget _staffCard(StoreAccount? store, StaffUser? current) => PanelCard(
|
|
title: 'Users & roles',
|
|
action: TextButton(onPressed: () {}, child: const Text('Manage')),
|
|
child: ResponsiveTable(
|
|
stackBelow: 360,
|
|
columns: const [
|
|
TableCol('Name', flex: 3),
|
|
TableCol('Role', flex: 3),
|
|
TableCol('', flex: 2, numeric: true),
|
|
],
|
|
rows: (store?.staff ?? const <StaffUser>[])
|
|
.map((s) => [
|
|
Cell(s.name, bold: true),
|
|
Cell(s.role.label, color: AppColors.textSecondary),
|
|
s.id == current?.id
|
|
? const TagChip('Signed in',
|
|
color: AppColors.success,)
|
|
: const SizedBox.shrink(),
|
|
],)
|
|
.toList(),
|
|
),
|
|
);
|
|
|
|
Widget _connectivityCard() {
|
|
final ready = ref.watch(catalogueReadyProvider);
|
|
final lastImport = ref.watch(lastImportAtProvider);
|
|
final outstanding = ref.watch(unsyncedCountProvider).value ?? 0;
|
|
|
|
return PanelCard(
|
|
title: 'Connectivity & sync',
|
|
subtitle: 'This terminal only needs a connection to import the '
|
|
'catalogue and to push the shift report.',
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
_row('Catalogue', ready ? 'Loaded' : 'Not imported'),
|
|
_row(
|
|
'Last import',
|
|
lastImport == null ? 'Never' : Formatters.dateTime(lastImport),
|
|
),
|
|
_row('Unsynced bills', '$outstanding'),
|
|
_toggle(
|
|
'Simulate offline',
|
|
'Forces import and sync to fail, so you can confirm nothing is '
|
|
'lost when the network drops',
|
|
// Read straight from the provider — no local copy to drift.
|
|
ref.watch(simulateOfflineProvider),
|
|
(v) {
|
|
ref.read(simulateOfflineProvider.notifier).state = v;
|
|
// Clear any stale failure banner left by the previous setting.
|
|
ref.read(catalogueImportProvider.notifier).reset();
|
|
ref.read(orderSyncProvider.notifier).reset();
|
|
},
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
|
|
Widget _aboutCard() => PanelCard(
|
|
title: 'About',
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
_row('Application', '${AppConstants.appName} 1.0.0'),
|
|
_row('Terminal', 'TERM-01'),
|
|
_row('Data store', 'SQLite (on device)'),
|
|
const SizedBox(height: AppSpacing.md),
|
|
SizedBox(
|
|
width: double.infinity,
|
|
child: OutlinedButton.icon(
|
|
onPressed: () {},
|
|
icon: const Icon(Icons.sync_rounded, size: 17),
|
|
label: const Text('Check for updates'),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
|
|
Widget _row(String label, String value, {bool mono = false}) => Padding(
|
|
padding: const EdgeInsets.symmetric(vertical: AppSpacing.sm),
|
|
child: Row(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Flexible(
|
|
flex: 3,
|
|
child: Text(
|
|
label,
|
|
overflow: TextOverflow.ellipsis,
|
|
style: const TextStyle(
|
|
fontSize: 13,
|
|
color: AppColors.textSecondary,
|
|
),
|
|
),
|
|
),
|
|
const SizedBox(width: AppSpacing.md),
|
|
Flexible(
|
|
flex: 4,
|
|
child: Text(
|
|
value,
|
|
textAlign: TextAlign.right,
|
|
overflow: TextOverflow.ellipsis,
|
|
style: TextStyle(
|
|
fontSize: 13,
|
|
fontWeight: FontWeight.w600,
|
|
color: AppColors.textPrimary,
|
|
fontFamily: mono ? 'monospace' : null,
|
|
),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
|
|
Widget _toggle(
|
|
String title,
|
|
String subtitle,
|
|
bool value,
|
|
ValueChanged<bool>? onChanged,
|
|
) =>
|
|
Padding(
|
|
padding: const EdgeInsets.symmetric(vertical: AppSpacing.xs),
|
|
child: Row(
|
|
children: [
|
|
Expanded(
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Text(
|
|
title,
|
|
style: const TextStyle(
|
|
fontSize: 13.5,
|
|
fontWeight: FontWeight.w500,
|
|
),
|
|
),
|
|
Text(
|
|
subtitle,
|
|
style: const TextStyle(
|
|
fontSize: 11.5,
|
|
color: AppColors.textTertiary,
|
|
height: 1.4,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
const SizedBox(width: AppSpacing.md),
|
|
Switch(value: value, onChanged: onChanged),
|
|
],
|
|
),
|
|
);
|
|
}
|