check
This commit is contained in:
@@ -11,17 +11,19 @@ import '../../../core/widgets/numeric_keypad.dart';
|
||||
import '../../../core/widgets/primary_button.dart';
|
||||
import '../../../domain/entities/customer.dart';
|
||||
import '../../pos/providers/cart_controller.dart';
|
||||
import '../providers/customer_providers.dart';
|
||||
|
||||
/// Attaches a customer to the current bill: a mobile number, a name, or
|
||||
/// neither.
|
||||
/// Attaches a customer to the current bill.
|
||||
///
|
||||
/// Deliberately not a lookup screen. There is no search against the customers
|
||||
/// already on the terminal, no recent list, and no membership tier — a cashier
|
||||
/// at a queue keys the number, keys the name if the shopper gives one, and
|
||||
/// carries on. A number that turns out to be registered already is reused
|
||||
/// silently rather than being turned into a decision the counter has to make.
|
||||
/// A mobile number, optionally a name, or skip. Nothing else — no lookup
|
||||
/// result to read, no tier, no points balance. Those were a screenful of
|
||||
/// information nobody at a counter acts on, in front of a queue, for a step
|
||||
/// that is optional in the first place.
|
||||
///
|
||||
/// Nothing here blocks the sale: Skip closes it with a walk-in bill.
|
||||
/// The lookup still happens; it just does not show. On save the number is
|
||||
/// matched against what the terminal already holds, so a returning shopper is
|
||||
/// attached to their existing record rather than duplicated — the loyalty
|
||||
/// figures stay correct, they simply are not read out at the till.
|
||||
Future<void> showCustomerCaptureSheet(BuildContext context) {
|
||||
return showModalBottomSheet<void>(
|
||||
context: context,
|
||||
@@ -81,64 +83,46 @@ class _CustomerCaptureSheetState extends ConsumerState<_CustomerCaptureSheet> {
|
||||
Navigator.of(context).pop();
|
||||
}
|
||||
|
||||
/// Saves the number under the name given, then puts it on the bill.
|
||||
/// Saves with whatever was given.
|
||||
///
|
||||
/// The name is optional — a bare number is still worth keeping, because it
|
||||
/// is what the WhatsApp bill is sent to.
|
||||
///
|
||||
/// A number already on file is the ordinary case, not an error: the existing
|
||||
/// record is picked up and attached, and a freshly typed name is written
|
||||
/// over the stored one so a correction at the counter sticks. The cashier
|
||||
/// sees the same thing either way, which is the point of not having a lookup
|
||||
/// step.
|
||||
/// The name is optional: a bare number is still worth keeping, because it is
|
||||
/// what the WhatsApp bill is sent to. An existing record wins over creating a
|
||||
/// second one — silently, because a cashier does not need to be told the
|
||||
/// shopper has been here before to finish the sale.
|
||||
Future<void> _save() async {
|
||||
if (!_complete) {
|
||||
setState(() => _error = 'Enter all '
|
||||
'${AppConstants.mobileNumberLength} digits of the mobile number.');
|
||||
return;
|
||||
}
|
||||
|
||||
final typed = _name.text.trim();
|
||||
final name = typed.isEmpty
|
||||
? 'Customer ${_digits.substring(_digits.length - 4)}'
|
||||
: typed;
|
||||
if (!_complete) return;
|
||||
|
||||
setState(() {
|
||||
_saving = true;
|
||||
_error = null;
|
||||
});
|
||||
|
||||
final repo = ref.read(customerRepositoryProvider);
|
||||
final typed = _name.text.trim();
|
||||
final repository = ref.read(customerRepositoryProvider);
|
||||
|
||||
try {
|
||||
final created = await repo.create(
|
||||
Customer(id: '', name: name, mobile: _digits),
|
||||
);
|
||||
if (mounted) _attachAndClose(created);
|
||||
} on StateError {
|
||||
// Already registered. Reuse the row rather than making the counter
|
||||
// reconcile it.
|
||||
try {
|
||||
final existing = await repo.findByMobile(_digits);
|
||||
if (existing == null) throw StateError('lookup failed');
|
||||
|
||||
final updated = typed.isEmpty || typed == existing.name
|
||||
? existing
|
||||
: await repo.update(existing.copyWith(name: typed));
|
||||
|
||||
if (mounted) _attachAndClose(updated);
|
||||
} catch (_) {
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_saving = false;
|
||||
_error = 'Could not save customer. Try again.';
|
||||
});
|
||||
final existing = await repository.findByMobile(_digits);
|
||||
if (existing != null) {
|
||||
if (mounted) _attachAndClose(existing);
|
||||
return;
|
||||
}
|
||||
} catch (_) {
|
||||
|
||||
final created = await repository.create(
|
||||
Customer(
|
||||
id: '',
|
||||
name: typed.isEmpty
|
||||
? 'Customer ${_digits.substring(_digits.length - 4)}'
|
||||
: typed,
|
||||
mobile: _digits,
|
||||
),
|
||||
);
|
||||
ref.invalidate(recentCustomersProvider);
|
||||
if (mounted) _attachAndClose(created);
|
||||
} catch (e) {
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_saving = false;
|
||||
_error = 'Could not save customer. Try again.';
|
||||
_error = e is StateError ? e.message : 'Could not save customer.';
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -166,13 +150,13 @@ class _CustomerCaptureSheetState extends ConsumerState<_CustomerCaptureSheet> {
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
_grabber(),
|
||||
// Everything inside is capped and centred. A modal sheet on a
|
||||
// 27-inch till used to run the full width of the screen, which
|
||||
// put the keypad and the fields at opposite ends of the desk.
|
||||
// Capped and centred. A modal sheet on a 27-inch till used to run
|
||||
// the full width of the screen, which put the keypad and the save
|
||||
// button at opposite ends of the desk.
|
||||
Flexible(
|
||||
child: Center(
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 900),
|
||||
constraints: const BoxConstraints(maxWidth: 640),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
@@ -186,32 +170,75 @@ class _CustomerCaptureSheetState extends ConsumerState<_CustomerCaptureSheet> {
|
||||
AppSpacing.xxl,
|
||||
AppSpacing.xxl,
|
||||
),
|
||||
child: LayoutBuilder(
|
||||
builder: (context, box) {
|
||||
// Side by side once there is room for both.
|
||||
final wide = box.maxWidth >= 660;
|
||||
final entry = _entryColumn();
|
||||
final details = _detailsColumn();
|
||||
|
||||
if (!wide) {
|
||||
return Column(
|
||||
children: [
|
||||
entry,
|
||||
const SizedBox(height: AppSpacing.xl),
|
||||
details,
|
||||
],
|
||||
);
|
||||
}
|
||||
return Row(
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.start,
|
||||
children: [
|
||||
SizedBox(width: 300, child: entry),
|
||||
const SizedBox(width: AppSpacing.xxl),
|
||||
Expanded(child: details),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
_display(),
|
||||
const SizedBox(height: AppSpacing.sm),
|
||||
Text(
|
||||
_complete
|
||||
? 'Ready to save'
|
||||
: '${AppConstants.mobileNumberLength - _digits.length}'
|
||||
' more digit(s)',
|
||||
textAlign: TextAlign.center,
|
||||
style: const TextStyle(
|
||||
fontSize: 11.5,
|
||||
color: AppColors.textTertiary,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: AppSpacing.lg),
|
||||
Center(
|
||||
child: NumericKeypad(
|
||||
maxWidth: 320,
|
||||
onKey: _append,
|
||||
onBackspace: _backspace,
|
||||
onClear: _clear,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: AppSpacing.lg),
|
||||
TextField(
|
||||
controller: _name,
|
||||
textCapitalization:
|
||||
TextCapitalization.words,
|
||||
enabled: !_saving,
|
||||
onSubmitted: (_) => _save(),
|
||||
inputFormatters: [
|
||||
LengthLimitingTextInputFormatter(60),
|
||||
],
|
||||
);
|
||||
},
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Customer name',
|
||||
hintText: 'Optional',
|
||||
prefixIcon:
|
||||
Icon(Icons.person_outline_rounded),
|
||||
),
|
||||
),
|
||||
if (_error != null) ...[
|
||||
const SizedBox(height: AppSpacing.sm),
|
||||
Text(
|
||||
_error!,
|
||||
style: const TextStyle(
|
||||
color: AppColors.danger,
|
||||
fontSize: 12.5,
|
||||
),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: AppSpacing.lg),
|
||||
PrimaryButton(
|
||||
label: 'Save & use',
|
||||
icon: Icons.check_rounded,
|
||||
large: true,
|
||||
busy: _saving,
|
||||
onPressed: _complete ? _save : null,
|
||||
),
|
||||
const SizedBox(height: AppSpacing.sm),
|
||||
PrimaryButton(
|
||||
label: 'Skip',
|
||||
tone: ButtonTone.neutral,
|
||||
onPressed:
|
||||
_saving ? null : () => _attachAndClose(null),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -275,7 +302,7 @@ class _CustomerCaptureSheetState extends ConsumerState<_CustomerCaptureSheet> {
|
||||
),
|
||||
),
|
||||
const Text(
|
||||
'Optional — number and name, or skip',
|
||||
'Optional — the bill can be sent to this number',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
fontSize: 12.5,
|
||||
@@ -286,16 +313,8 @@ class _CustomerCaptureSheetState extends ConsumerState<_CustomerCaptureSheet> {
|
||||
),
|
||||
),
|
||||
const SizedBox(width: AppSpacing.sm),
|
||||
TextButton(
|
||||
onPressed: _saving ? null : () => _attachAndClose(null),
|
||||
style: TextButton.styleFrom(
|
||||
foregroundColor: AppColors.textSecondary,
|
||||
minimumSize: const Size(0, 38),
|
||||
),
|
||||
child: const Text('Skip'),
|
||||
),
|
||||
IconButton(
|
||||
onPressed: _saving ? null : () => Navigator.of(context).pop(),
|
||||
onPressed: () => Navigator.of(context).pop(),
|
||||
icon: const Icon(Icons.close_rounded),
|
||||
color: AppColors.textTertiary,
|
||||
tooltip: 'Close',
|
||||
@@ -304,36 +323,6 @@ class _CustomerCaptureSheetState extends ConsumerState<_CustomerCaptureSheet> {
|
||||
),
|
||||
);
|
||||
|
||||
// ----------------------------------------------------------------- Entry
|
||||
Widget _entryColumn() => Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
_display(),
|
||||
const SizedBox(height: AppSpacing.sm),
|
||||
Text(
|
||||
_complete
|
||||
? 'Number complete'
|
||||
: '${AppConstants.mobileNumberLength - _digits.length} more '
|
||||
'digit(s)',
|
||||
textAlign: TextAlign.center,
|
||||
style: const TextStyle(
|
||||
fontSize: 11.5,
|
||||
color: AppColors.textTertiary,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: AppSpacing.lg),
|
||||
Center(
|
||||
child: NumericKeypad(
|
||||
maxWidth: 300,
|
||||
onKey: _append,
|
||||
onBackspace: _backspace,
|
||||
onClear: _clear,
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
/// The number as it is keyed, grouped 5 + 5 the way it is read aloud.
|
||||
Widget _display() {
|
||||
final filled = _digits.isNotEmpty;
|
||||
@@ -395,7 +384,7 @@ class _CustomerCaptureSheetState extends ConsumerState<_CustomerCaptureSheet> {
|
||||
),
|
||||
if (filled)
|
||||
IconButton(
|
||||
onPressed: _saving ? null : _clear,
|
||||
onPressed: _clear,
|
||||
icon: const Icon(Icons.backspace_outlined, size: 18),
|
||||
color: AppColors.textTertiary,
|
||||
tooltip: 'Clear',
|
||||
@@ -404,77 +393,4 @@ class _CustomerCaptureSheetState extends ConsumerState<_CustomerCaptureSheet> {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------- Details
|
||||
Widget _detailsColumn() => Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
_hint(),
|
||||
const SizedBox(height: AppSpacing.lg),
|
||||
TextField(
|
||||
controller: _name,
|
||||
textCapitalization: TextCapitalization.words,
|
||||
enabled: !_saving,
|
||||
onSubmitted: (_) => _save(),
|
||||
inputFormatters: [LengthLimitingTextInputFormatter(60)],
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Customer name',
|
||||
hintText: 'Optional',
|
||||
prefixIcon: Icon(Icons.person_outline_rounded),
|
||||
),
|
||||
),
|
||||
if (_error != null) ...[
|
||||
const SizedBox(height: AppSpacing.sm),
|
||||
Text(
|
||||
_error!,
|
||||
style: const TextStyle(color: AppColors.danger, fontSize: 12.5),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: AppSpacing.lg),
|
||||
PrimaryButton(
|
||||
label: 'Save & use',
|
||||
icon: Icons.person_add_alt_1_rounded,
|
||||
large: true,
|
||||
busy: _saving,
|
||||
onPressed: _complete && !_saving ? _save : null,
|
||||
),
|
||||
const SizedBox(height: AppSpacing.sm),
|
||||
PrimaryButton(
|
||||
label: 'Skip — no customer',
|
||||
tone: ButtonTone.neutral,
|
||||
onPressed: _saving ? null : () => _attachAndClose(null),
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
Widget _hint() => Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(AppSpacing.lg),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.surfaceAlt,
|
||||
borderRadius: AppRadius.brLg,
|
||||
border: Border.all(color: AppColors.border),
|
||||
),
|
||||
child: const Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Icon(Icons.dialpad_rounded,
|
||||
size: 19, color: AppColors.textTertiary,),
|
||||
SizedBox(width: AppSpacing.md),
|
||||
Expanded(
|
||||
child: Text(
|
||||
'Key in the mobile number, add a name if the shopper gives '
|
||||
'one, then save. The name is optional and the whole step can '
|
||||
'be skipped — the sale is never held up by it.',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
color: AppColors.textSecondary,
|
||||
height: 1.5,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user