From e7260ea0e2e45f7d79713dcdbb731fbd924c71b0 Mon Sep 17 00:00:00 2001 From: Efril Date: Mon, 27 Apr 2026 17:39:15 +0700 Subject: [PATCH] fix success add item order --- .../checkout_form/checkout_form_bloc.dart | 3 + .../checkout_form_bloc.freezed.dart | 267 +++++++++++++++++- .../checkout_form/checkout_form_event.dart | 2 + .../checkout_form/checkout_form_state.dart | 2 + lib/domain/order/entities/order_entity.dart | 3 + .../widgets/checkout_right_panel.dart | 1 + .../success_add_item_order_left_panel.dart | 9 +- pubspec.yaml | 2 +- 8 files changed, 282 insertions(+), 7 deletions(-) diff --git a/lib/application/checkout/checkout_form/checkout_form_bloc.dart b/lib/application/checkout/checkout_form/checkout_form_bloc.dart index eb4e82f..533352b 100644 --- a/lib/application/checkout/checkout_form/checkout_form_bloc.dart +++ b/lib/application/checkout/checkout_form/checkout_form_bloc.dart @@ -180,6 +180,9 @@ class CheckoutFormBloc extends Bloc { orderAddedItems: (e) async { emit(state.copyWith(orderAdded: e.order)); }, + customerNameChanged: (e) async { + emit(state.copyWith(customerName: e.name,)); + } ); } } diff --git a/lib/application/checkout/checkout_form/checkout_form_bloc.freezed.dart b/lib/application/checkout/checkout_form/checkout_form_bloc.freezed.dart index 0ab4d21..6087f76 100644 --- a/lib/application/checkout/checkout_form/checkout_form_bloc.freezed.dart +++ b/lib/application/checkout/checkout_form/checkout_form_bloc.freezed.dart @@ -28,6 +28,7 @@ mixin _$CheckoutFormEvent { required TResult Function(Delivery delivery) updateDelivery, required TResult Function(Table? table) updateTable, required TResult Function(Order? order) orderAddedItems, + required TResult Function(String name) customerNameChanged, }) => throw _privateConstructorUsedError; @optionalTypeArgs TResult? whenOrNull({ @@ -39,6 +40,7 @@ mixin _$CheckoutFormEvent { TResult? Function(Delivery delivery)? updateDelivery, TResult? Function(Table? table)? updateTable, TResult? Function(Order? order)? orderAddedItems, + TResult? Function(String name)? customerNameChanged, }) => throw _privateConstructorUsedError; @optionalTypeArgs TResult maybeWhen({ @@ -50,6 +52,7 @@ mixin _$CheckoutFormEvent { TResult Function(Delivery delivery)? updateDelivery, TResult Function(Table? table)? updateTable, TResult Function(Order? order)? orderAddedItems, + TResult Function(String name)? customerNameChanged, required TResult orElse(), }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -62,6 +65,7 @@ mixin _$CheckoutFormEvent { required TResult Function(_UpdateDelivery value) updateDelivery, required TResult Function(_UpdateTable value) updateTable, required TResult Function(_OrderAddedItems value) orderAddedItems, + required TResult Function(_CustomerNameChanged value) customerNameChanged, }) => throw _privateConstructorUsedError; @optionalTypeArgs TResult? mapOrNull({ @@ -73,6 +77,7 @@ mixin _$CheckoutFormEvent { TResult? Function(_UpdateDelivery value)? updateDelivery, TResult? Function(_UpdateTable value)? updateTable, TResult? Function(_OrderAddedItems value)? orderAddedItems, + TResult? Function(_CustomerNameChanged value)? customerNameChanged, }) => throw _privateConstructorUsedError; @optionalTypeArgs TResult maybeMap({ @@ -84,6 +89,7 @@ mixin _$CheckoutFormEvent { TResult Function(_UpdateDelivery value)? updateDelivery, TResult Function(_UpdateTable value)? updateTable, TResult Function(_OrderAddedItems value)? orderAddedItems, + TResult Function(_CustomerNameChanged value)? customerNameChanged, required TResult orElse(), }) => throw _privateConstructorUsedError; } @@ -195,6 +201,7 @@ class _$StartedImpl implements _Started { required TResult Function(Delivery delivery) updateDelivery, required TResult Function(Table? table) updateTable, required TResult Function(Order? order) orderAddedItems, + required TResult Function(String name) customerNameChanged, }) { return started(items); } @@ -210,6 +217,7 @@ class _$StartedImpl implements _Started { TResult? Function(Delivery delivery)? updateDelivery, TResult? Function(Table? table)? updateTable, TResult? Function(Order? order)? orderAddedItems, + TResult? Function(String name)? customerNameChanged, }) { return started?.call(items); } @@ -225,6 +233,7 @@ class _$StartedImpl implements _Started { TResult Function(Delivery delivery)? updateDelivery, TResult Function(Table? table)? updateTable, TResult Function(Order? order)? orderAddedItems, + TResult Function(String name)? customerNameChanged, required TResult orElse(), }) { if (started != null) { @@ -244,6 +253,7 @@ class _$StartedImpl implements _Started { required TResult Function(_UpdateDelivery value) updateDelivery, required TResult Function(_UpdateTable value) updateTable, required TResult Function(_OrderAddedItems value) orderAddedItems, + required TResult Function(_CustomerNameChanged value) customerNameChanged, }) { return started(this); } @@ -259,6 +269,7 @@ class _$StartedImpl implements _Started { TResult? Function(_UpdateDelivery value)? updateDelivery, TResult? Function(_UpdateTable value)? updateTable, TResult? Function(_OrderAddedItems value)? orderAddedItems, + TResult? Function(_CustomerNameChanged value)? customerNameChanged, }) { return started?.call(this); } @@ -274,6 +285,7 @@ class _$StartedImpl implements _Started { TResult Function(_UpdateDelivery value)? updateDelivery, TResult Function(_UpdateTable value)? updateTable, TResult Function(_OrderAddedItems value)? orderAddedItems, + TResult Function(_CustomerNameChanged value)? customerNameChanged, required TResult orElse(), }) { if (started != null) { @@ -408,6 +420,7 @@ class _$AddItemImpl implements _AddItem { required TResult Function(Delivery delivery) updateDelivery, required TResult Function(Table? table) updateTable, required TResult Function(Order? order) orderAddedItems, + required TResult Function(String name) customerNameChanged, }) { return addItem(product, variant); } @@ -423,6 +436,7 @@ class _$AddItemImpl implements _AddItem { TResult? Function(Delivery delivery)? updateDelivery, TResult? Function(Table? table)? updateTable, TResult? Function(Order? order)? orderAddedItems, + TResult? Function(String name)? customerNameChanged, }) { return addItem?.call(product, variant); } @@ -438,6 +452,7 @@ class _$AddItemImpl implements _AddItem { TResult Function(Delivery delivery)? updateDelivery, TResult Function(Table? table)? updateTable, TResult Function(Order? order)? orderAddedItems, + TResult Function(String name)? customerNameChanged, required TResult orElse(), }) { if (addItem != null) { @@ -457,6 +472,7 @@ class _$AddItemImpl implements _AddItem { required TResult Function(_UpdateDelivery value) updateDelivery, required TResult Function(_UpdateTable value) updateTable, required TResult Function(_OrderAddedItems value) orderAddedItems, + required TResult Function(_CustomerNameChanged value) customerNameChanged, }) { return addItem(this); } @@ -472,6 +488,7 @@ class _$AddItemImpl implements _AddItem { TResult? Function(_UpdateDelivery value)? updateDelivery, TResult? Function(_UpdateTable value)? updateTable, TResult? Function(_OrderAddedItems value)? orderAddedItems, + TResult? Function(_CustomerNameChanged value)? customerNameChanged, }) { return addItem?.call(this); } @@ -487,6 +504,7 @@ class _$AddItemImpl implements _AddItem { TResult Function(_UpdateDelivery value)? updateDelivery, TResult Function(_UpdateTable value)? updateTable, TResult Function(_OrderAddedItems value)? orderAddedItems, + TResult Function(_CustomerNameChanged value)? customerNameChanged, required TResult orElse(), }) { if (addItem != null) { @@ -623,6 +641,7 @@ class _$RemoveItemImpl implements _RemoveItem { required TResult Function(Delivery delivery) updateDelivery, required TResult Function(Table? table) updateTable, required TResult Function(Order? order) orderAddedItems, + required TResult Function(String name) customerNameChanged, }) { return removeItem(product, variant); } @@ -638,6 +657,7 @@ class _$RemoveItemImpl implements _RemoveItem { TResult? Function(Delivery delivery)? updateDelivery, TResult? Function(Table? table)? updateTable, TResult? Function(Order? order)? orderAddedItems, + TResult? Function(String name)? customerNameChanged, }) { return removeItem?.call(product, variant); } @@ -653,6 +673,7 @@ class _$RemoveItemImpl implements _RemoveItem { TResult Function(Delivery delivery)? updateDelivery, TResult Function(Table? table)? updateTable, TResult Function(Order? order)? orderAddedItems, + TResult Function(String name)? customerNameChanged, required TResult orElse(), }) { if (removeItem != null) { @@ -672,6 +693,7 @@ class _$RemoveItemImpl implements _RemoveItem { required TResult Function(_UpdateDelivery value) updateDelivery, required TResult Function(_UpdateTable value) updateTable, required TResult Function(_OrderAddedItems value) orderAddedItems, + required TResult Function(_CustomerNameChanged value) customerNameChanged, }) { return removeItem(this); } @@ -687,6 +709,7 @@ class _$RemoveItemImpl implements _RemoveItem { TResult? Function(_UpdateDelivery value)? updateDelivery, TResult? Function(_UpdateTable value)? updateTable, TResult? Function(_OrderAddedItems value)? orderAddedItems, + TResult? Function(_CustomerNameChanged value)? customerNameChanged, }) { return removeItem?.call(this); } @@ -702,6 +725,7 @@ class _$RemoveItemImpl implements _RemoveItem { TResult Function(_UpdateDelivery value)? updateDelivery, TResult Function(_UpdateTable value)? updateTable, TResult Function(_OrderAddedItems value)? orderAddedItems, + TResult Function(_CustomerNameChanged value)? customerNameChanged, required TResult orElse(), }) { if (removeItem != null) { @@ -828,6 +852,7 @@ class _$UpdateItemNotesImpl implements _UpdateItemNotes { required TResult Function(Delivery delivery) updateDelivery, required TResult Function(Table? table) updateTable, required TResult Function(Order? order) orderAddedItems, + required TResult Function(String name) customerNameChanged, }) { return updateItemNotes(product, notes); } @@ -843,6 +868,7 @@ class _$UpdateItemNotesImpl implements _UpdateItemNotes { TResult? Function(Delivery delivery)? updateDelivery, TResult? Function(Table? table)? updateTable, TResult? Function(Order? order)? orderAddedItems, + TResult? Function(String name)? customerNameChanged, }) { return updateItemNotes?.call(product, notes); } @@ -858,6 +884,7 @@ class _$UpdateItemNotesImpl implements _UpdateItemNotes { TResult Function(Delivery delivery)? updateDelivery, TResult Function(Table? table)? updateTable, TResult Function(Order? order)? orderAddedItems, + TResult Function(String name)? customerNameChanged, required TResult orElse(), }) { if (updateItemNotes != null) { @@ -877,6 +904,7 @@ class _$UpdateItemNotesImpl implements _UpdateItemNotes { required TResult Function(_UpdateDelivery value) updateDelivery, required TResult Function(_UpdateTable value) updateTable, required TResult Function(_OrderAddedItems value) orderAddedItems, + required TResult Function(_CustomerNameChanged value) customerNameChanged, }) { return updateItemNotes(this); } @@ -892,6 +920,7 @@ class _$UpdateItemNotesImpl implements _UpdateItemNotes { TResult? Function(_UpdateDelivery value)? updateDelivery, TResult? Function(_UpdateTable value)? updateTable, TResult? Function(_OrderAddedItems value)? orderAddedItems, + TResult? Function(_CustomerNameChanged value)? customerNameChanged, }) { return updateItemNotes?.call(this); } @@ -907,6 +936,7 @@ class _$UpdateItemNotesImpl implements _UpdateItemNotes { TResult Function(_UpdateDelivery value)? updateDelivery, TResult Function(_UpdateTable value)? updateTable, TResult Function(_OrderAddedItems value)? orderAddedItems, + TResult Function(_CustomerNameChanged value)? customerNameChanged, required TResult orElse(), }) { if (updateItemNotes != null) { @@ -1013,6 +1043,7 @@ class _$UpdateOrderTypeImpl implements _UpdateOrderType { required TResult Function(Delivery delivery) updateDelivery, required TResult Function(Table? table) updateTable, required TResult Function(Order? order) orderAddedItems, + required TResult Function(String name) customerNameChanged, }) { return updateOrderType(orderType); } @@ -1028,6 +1059,7 @@ class _$UpdateOrderTypeImpl implements _UpdateOrderType { TResult? Function(Delivery delivery)? updateDelivery, TResult? Function(Table? table)? updateTable, TResult? Function(Order? order)? orderAddedItems, + TResult? Function(String name)? customerNameChanged, }) { return updateOrderType?.call(orderType); } @@ -1043,6 +1075,7 @@ class _$UpdateOrderTypeImpl implements _UpdateOrderType { TResult Function(Delivery delivery)? updateDelivery, TResult Function(Table? table)? updateTable, TResult Function(Order? order)? orderAddedItems, + TResult Function(String name)? customerNameChanged, required TResult orElse(), }) { if (updateOrderType != null) { @@ -1062,6 +1095,7 @@ class _$UpdateOrderTypeImpl implements _UpdateOrderType { required TResult Function(_UpdateDelivery value) updateDelivery, required TResult Function(_UpdateTable value) updateTable, required TResult Function(_OrderAddedItems value) orderAddedItems, + required TResult Function(_CustomerNameChanged value) customerNameChanged, }) { return updateOrderType(this); } @@ -1077,6 +1111,7 @@ class _$UpdateOrderTypeImpl implements _UpdateOrderType { TResult? Function(_UpdateDelivery value)? updateDelivery, TResult? Function(_UpdateTable value)? updateTable, TResult? Function(_OrderAddedItems value)? orderAddedItems, + TResult? Function(_CustomerNameChanged value)? customerNameChanged, }) { return updateOrderType?.call(this); } @@ -1092,6 +1127,7 @@ class _$UpdateOrderTypeImpl implements _UpdateOrderType { TResult Function(_UpdateDelivery value)? updateDelivery, TResult Function(_UpdateTable value)? updateTable, TResult Function(_OrderAddedItems value)? orderAddedItems, + TResult Function(_CustomerNameChanged value)? customerNameChanged, required TResult orElse(), }) { if (updateOrderType != null) { @@ -1197,6 +1233,7 @@ class _$UpdateDeliveryImpl implements _UpdateDelivery { required TResult Function(Delivery delivery) updateDelivery, required TResult Function(Table? table) updateTable, required TResult Function(Order? order) orderAddedItems, + required TResult Function(String name) customerNameChanged, }) { return updateDelivery(delivery); } @@ -1212,6 +1249,7 @@ class _$UpdateDeliveryImpl implements _UpdateDelivery { TResult? Function(Delivery delivery)? updateDelivery, TResult? Function(Table? table)? updateTable, TResult? Function(Order? order)? orderAddedItems, + TResult? Function(String name)? customerNameChanged, }) { return updateDelivery?.call(delivery); } @@ -1227,6 +1265,7 @@ class _$UpdateDeliveryImpl implements _UpdateDelivery { TResult Function(Delivery delivery)? updateDelivery, TResult Function(Table? table)? updateTable, TResult Function(Order? order)? orderAddedItems, + TResult Function(String name)? customerNameChanged, required TResult orElse(), }) { if (updateDelivery != null) { @@ -1246,6 +1285,7 @@ class _$UpdateDeliveryImpl implements _UpdateDelivery { required TResult Function(_UpdateDelivery value) updateDelivery, required TResult Function(_UpdateTable value) updateTable, required TResult Function(_OrderAddedItems value) orderAddedItems, + required TResult Function(_CustomerNameChanged value) customerNameChanged, }) { return updateDelivery(this); } @@ -1261,6 +1301,7 @@ class _$UpdateDeliveryImpl implements _UpdateDelivery { TResult? Function(_UpdateDelivery value)? updateDelivery, TResult? Function(_UpdateTable value)? updateTable, TResult? Function(_OrderAddedItems value)? orderAddedItems, + TResult? Function(_CustomerNameChanged value)? customerNameChanged, }) { return updateDelivery?.call(this); } @@ -1276,6 +1317,7 @@ class _$UpdateDeliveryImpl implements _UpdateDelivery { TResult Function(_UpdateDelivery value)? updateDelivery, TResult Function(_UpdateTable value)? updateTable, TResult Function(_OrderAddedItems value)? orderAddedItems, + TResult Function(_CustomerNameChanged value)? customerNameChanged, required TResult orElse(), }) { if (updateDelivery != null) { @@ -1392,6 +1434,7 @@ class _$UpdateTableImpl implements _UpdateTable { required TResult Function(Delivery delivery) updateDelivery, required TResult Function(Table? table) updateTable, required TResult Function(Order? order) orderAddedItems, + required TResult Function(String name) customerNameChanged, }) { return updateTable(table); } @@ -1407,6 +1450,7 @@ class _$UpdateTableImpl implements _UpdateTable { TResult? Function(Delivery delivery)? updateDelivery, TResult? Function(Table? table)? updateTable, TResult? Function(Order? order)? orderAddedItems, + TResult? Function(String name)? customerNameChanged, }) { return updateTable?.call(table); } @@ -1422,6 +1466,7 @@ class _$UpdateTableImpl implements _UpdateTable { TResult Function(Delivery delivery)? updateDelivery, TResult Function(Table? table)? updateTable, TResult Function(Order? order)? orderAddedItems, + TResult Function(String name)? customerNameChanged, required TResult orElse(), }) { if (updateTable != null) { @@ -1441,6 +1486,7 @@ class _$UpdateTableImpl implements _UpdateTable { required TResult Function(_UpdateDelivery value) updateDelivery, required TResult Function(_UpdateTable value) updateTable, required TResult Function(_OrderAddedItems value) orderAddedItems, + required TResult Function(_CustomerNameChanged value) customerNameChanged, }) { return updateTable(this); } @@ -1456,6 +1502,7 @@ class _$UpdateTableImpl implements _UpdateTable { TResult? Function(_UpdateDelivery value)? updateDelivery, TResult? Function(_UpdateTable value)? updateTable, TResult? Function(_OrderAddedItems value)? orderAddedItems, + TResult? Function(_CustomerNameChanged value)? customerNameChanged, }) { return updateTable?.call(this); } @@ -1471,6 +1518,7 @@ class _$UpdateTableImpl implements _UpdateTable { TResult Function(_UpdateDelivery value)? updateDelivery, TResult Function(_UpdateTable value)? updateTable, TResult Function(_OrderAddedItems value)? orderAddedItems, + TResult Function(_CustomerNameChanged value)? customerNameChanged, required TResult orElse(), }) { if (updateTable != null) { @@ -1590,6 +1638,7 @@ class _$OrderAddedItemsImpl implements _OrderAddedItems { required TResult Function(Delivery delivery) updateDelivery, required TResult Function(Table? table) updateTable, required TResult Function(Order? order) orderAddedItems, + required TResult Function(String name) customerNameChanged, }) { return orderAddedItems(order); } @@ -1605,6 +1654,7 @@ class _$OrderAddedItemsImpl implements _OrderAddedItems { TResult? Function(Delivery delivery)? updateDelivery, TResult? Function(Table? table)? updateTable, TResult? Function(Order? order)? orderAddedItems, + TResult? Function(String name)? customerNameChanged, }) { return orderAddedItems?.call(order); } @@ -1620,6 +1670,7 @@ class _$OrderAddedItemsImpl implements _OrderAddedItems { TResult Function(Delivery delivery)? updateDelivery, TResult Function(Table? table)? updateTable, TResult Function(Order? order)? orderAddedItems, + TResult Function(String name)? customerNameChanged, required TResult orElse(), }) { if (orderAddedItems != null) { @@ -1639,6 +1690,7 @@ class _$OrderAddedItemsImpl implements _OrderAddedItems { required TResult Function(_UpdateDelivery value) updateDelivery, required TResult Function(_UpdateTable value) updateTable, required TResult Function(_OrderAddedItems value) orderAddedItems, + required TResult Function(_CustomerNameChanged value) customerNameChanged, }) { return orderAddedItems(this); } @@ -1654,6 +1706,7 @@ class _$OrderAddedItemsImpl implements _OrderAddedItems { TResult? Function(_UpdateDelivery value)? updateDelivery, TResult? Function(_UpdateTable value)? updateTable, TResult? Function(_OrderAddedItems value)? orderAddedItems, + TResult? Function(_CustomerNameChanged value)? customerNameChanged, }) { return orderAddedItems?.call(this); } @@ -1669,6 +1722,7 @@ class _$OrderAddedItemsImpl implements _OrderAddedItems { TResult Function(_UpdateDelivery value)? updateDelivery, TResult Function(_UpdateTable value)? updateTable, TResult Function(_OrderAddedItems value)? orderAddedItems, + TResult Function(_CustomerNameChanged value)? customerNameChanged, required TResult orElse(), }) { if (orderAddedItems != null) { @@ -1690,6 +1744,195 @@ abstract class _OrderAddedItems implements CheckoutFormEvent { throw _privateConstructorUsedError; } +/// @nodoc +abstract class _$$CustomerNameChangedImplCopyWith<$Res> { + factory _$$CustomerNameChangedImplCopyWith( + _$CustomerNameChangedImpl value, + $Res Function(_$CustomerNameChangedImpl) then, + ) = __$$CustomerNameChangedImplCopyWithImpl<$Res>; + @useResult + $Res call({String name}); +} + +/// @nodoc +class __$$CustomerNameChangedImplCopyWithImpl<$Res> + extends _$CheckoutFormEventCopyWithImpl<$Res, _$CustomerNameChangedImpl> + implements _$$CustomerNameChangedImplCopyWith<$Res> { + __$$CustomerNameChangedImplCopyWithImpl( + _$CustomerNameChangedImpl _value, + $Res Function(_$CustomerNameChangedImpl) _then, + ) : super(_value, _then); + + /// Create a copy of CheckoutFormEvent + /// with the given fields replaced by the non-null parameter values. + @pragma('vm:prefer-inline') + @override + $Res call({Object? name = null}) { + return _then( + _$CustomerNameChangedImpl( + null == name + ? _value.name + : name // ignore: cast_nullable_to_non_nullable + as String, + ), + ); + } +} + +/// @nodoc + +class _$CustomerNameChangedImpl implements _CustomerNameChanged { + const _$CustomerNameChangedImpl(this.name); + + @override + final String name; + + @override + String toString() { + return 'CheckoutFormEvent.customerNameChanged(name: $name)'; + } + + @override + bool operator ==(Object other) { + return identical(this, other) || + (other.runtimeType == runtimeType && + other is _$CustomerNameChangedImpl && + (identical(other.name, name) || other.name == name)); + } + + @override + int get hashCode => Object.hash(runtimeType, name); + + /// Create a copy of CheckoutFormEvent + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) + @override + @pragma('vm:prefer-inline') + _$$CustomerNameChangedImplCopyWith<_$CustomerNameChangedImpl> get copyWith => + __$$CustomerNameChangedImplCopyWithImpl<_$CustomerNameChangedImpl>( + this, + _$identity, + ); + + @override + @optionalTypeArgs + TResult when({ + required TResult Function(List items) started, + required TResult Function(Product product, ProductVariant? variant) addItem, + required TResult Function(Product product, ProductVariant? variant) + removeItem, + required TResult Function(Product product, String notes) updateItemNotes, + required TResult Function(OrderType orderType) updateOrderType, + required TResult Function(Delivery delivery) updateDelivery, + required TResult Function(Table? table) updateTable, + required TResult Function(Order? order) orderAddedItems, + required TResult Function(String name) customerNameChanged, + }) { + return customerNameChanged(name); + } + + @override + @optionalTypeArgs + TResult? whenOrNull({ + TResult? Function(List items)? started, + TResult? Function(Product product, ProductVariant? variant)? addItem, + TResult? Function(Product product, ProductVariant? variant)? removeItem, + TResult? Function(Product product, String notes)? updateItemNotes, + TResult? Function(OrderType orderType)? updateOrderType, + TResult? Function(Delivery delivery)? updateDelivery, + TResult? Function(Table? table)? updateTable, + TResult? Function(Order? order)? orderAddedItems, + TResult? Function(String name)? customerNameChanged, + }) { + return customerNameChanged?.call(name); + } + + @override + @optionalTypeArgs + TResult maybeWhen({ + TResult Function(List items)? started, + TResult Function(Product product, ProductVariant? variant)? addItem, + TResult Function(Product product, ProductVariant? variant)? removeItem, + TResult Function(Product product, String notes)? updateItemNotes, + TResult Function(OrderType orderType)? updateOrderType, + TResult Function(Delivery delivery)? updateDelivery, + TResult Function(Table? table)? updateTable, + TResult Function(Order? order)? orderAddedItems, + TResult Function(String name)? customerNameChanged, + required TResult orElse(), + }) { + if (customerNameChanged != null) { + return customerNameChanged(name); + } + return orElse(); + } + + @override + @optionalTypeArgs + TResult map({ + required TResult Function(_Started value) started, + required TResult Function(_AddItem value) addItem, + required TResult Function(_RemoveItem value) removeItem, + required TResult Function(_UpdateItemNotes value) updateItemNotes, + required TResult Function(_UpdateOrderType value) updateOrderType, + required TResult Function(_UpdateDelivery value) updateDelivery, + required TResult Function(_UpdateTable value) updateTable, + required TResult Function(_OrderAddedItems value) orderAddedItems, + required TResult Function(_CustomerNameChanged value) customerNameChanged, + }) { + return customerNameChanged(this); + } + + @override + @optionalTypeArgs + TResult? mapOrNull({ + TResult? Function(_Started value)? started, + TResult? Function(_AddItem value)? addItem, + TResult? Function(_RemoveItem value)? removeItem, + TResult? Function(_UpdateItemNotes value)? updateItemNotes, + TResult? Function(_UpdateOrderType value)? updateOrderType, + TResult? Function(_UpdateDelivery value)? updateDelivery, + TResult? Function(_UpdateTable value)? updateTable, + TResult? Function(_OrderAddedItems value)? orderAddedItems, + TResult? Function(_CustomerNameChanged value)? customerNameChanged, + }) { + return customerNameChanged?.call(this); + } + + @override + @optionalTypeArgs + TResult maybeMap({ + TResult Function(_Started value)? started, + TResult Function(_AddItem value)? addItem, + TResult Function(_RemoveItem value)? removeItem, + TResult Function(_UpdateItemNotes value)? updateItemNotes, + TResult Function(_UpdateOrderType value)? updateOrderType, + TResult Function(_UpdateDelivery value)? updateDelivery, + TResult Function(_UpdateTable value)? updateTable, + TResult Function(_OrderAddedItems value)? orderAddedItems, + TResult Function(_CustomerNameChanged value)? customerNameChanged, + required TResult orElse(), + }) { + if (customerNameChanged != null) { + return customerNameChanged(this); + } + return orElse(); + } +} + +abstract class _CustomerNameChanged implements CheckoutFormEvent { + const factory _CustomerNameChanged(final String name) = + _$CustomerNameChangedImpl; + + String get name; + + /// Create a copy of CheckoutFormEvent + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) + _$$CustomerNameChangedImplCopyWith<_$CustomerNameChangedImpl> get copyWith => + throw _privateConstructorUsedError; +} + /// @nodoc mixin _$CheckoutFormState { Order? get orderAdded => throw _privateConstructorUsedError; @@ -1702,6 +1945,7 @@ mixin _$CheckoutFormState { int get totalPrice => throw _privateConstructorUsedError; String get draftName => throw _privateConstructorUsedError; OrderType get orderType => throw _privateConstructorUsedError; + String get customerName => throw _privateConstructorUsedError; Delivery? get delivery => throw _privateConstructorUsedError; Table? get table => throw _privateConstructorUsedError; bool get isLoading => throw _privateConstructorUsedError; @@ -1731,6 +1975,7 @@ abstract class $CheckoutFormStateCopyWith<$Res> { int totalPrice, String draftName, OrderType orderType, + String customerName, Delivery? delivery, Table? table, bool isLoading, @@ -1765,6 +2010,7 @@ class _$CheckoutFormStateCopyWithImpl<$Res, $Val extends CheckoutFormState> Object? totalPrice = null, Object? draftName = null, Object? orderType = null, + Object? customerName = null, Object? delivery = freezed, Object? table = freezed, Object? isLoading = null, @@ -1811,6 +2057,10 @@ class _$CheckoutFormStateCopyWithImpl<$Res, $Val extends CheckoutFormState> ? _value.orderType : orderType // ignore: cast_nullable_to_non_nullable as OrderType, + customerName: null == customerName + ? _value.customerName + : customerName // ignore: cast_nullable_to_non_nullable + as String, delivery: freezed == delivery ? _value.delivery : delivery // ignore: cast_nullable_to_non_nullable @@ -1877,6 +2127,7 @@ abstract class _$$CheckoutFormStateImplCopyWith<$Res> int totalPrice, String draftName, OrderType orderType, + String customerName, Delivery? delivery, Table? table, bool isLoading, @@ -1912,6 +2163,7 @@ class __$$CheckoutFormStateImplCopyWithImpl<$Res> Object? totalPrice = null, Object? draftName = null, Object? orderType = null, + Object? customerName = null, Object? delivery = freezed, Object? table = freezed, Object? isLoading = null, @@ -1958,6 +2210,10 @@ class __$$CheckoutFormStateImplCopyWithImpl<$Res> ? _value.orderType : orderType // ignore: cast_nullable_to_non_nullable as OrderType, + customerName: null == customerName + ? _value.customerName + : customerName // ignore: cast_nullable_to_non_nullable + as String, delivery: freezed == delivery ? _value.delivery : delivery // ignore: cast_nullable_to_non_nullable @@ -1989,6 +2245,7 @@ class _$CheckoutFormStateImpl implements _CheckoutFormState { required this.totalPrice, required this.draftName, required this.orderType, + required this.customerName, this.delivery, this.table, this.isLoading = false, @@ -2021,6 +2278,8 @@ class _$CheckoutFormStateImpl implements _CheckoutFormState { @override final OrderType orderType; @override + final String customerName; + @override final Delivery? delivery; @override final Table? table; @@ -2030,7 +2289,7 @@ class _$CheckoutFormStateImpl implements _CheckoutFormState { @override String toString() { - return 'CheckoutFormState(orderAdded: $orderAdded, items: $items, discount: $discount, discountAmount: $discountAmount, tax: $tax, serviceCharge: $serviceCharge, totalQuantity: $totalQuantity, totalPrice: $totalPrice, draftName: $draftName, orderType: $orderType, delivery: $delivery, table: $table, isLoading: $isLoading)'; + return 'CheckoutFormState(orderAdded: $orderAdded, items: $items, discount: $discount, discountAmount: $discountAmount, tax: $tax, serviceCharge: $serviceCharge, totalQuantity: $totalQuantity, totalPrice: $totalPrice, draftName: $draftName, orderType: $orderType, customerName: $customerName, delivery: $delivery, table: $table, isLoading: $isLoading)'; } @override @@ -2056,6 +2315,8 @@ class _$CheckoutFormStateImpl implements _CheckoutFormState { other.draftName == draftName) && (identical(other.orderType, orderType) || other.orderType == orderType) && + (identical(other.customerName, customerName) || + other.customerName == customerName) && (identical(other.delivery, delivery) || other.delivery == delivery) && (identical(other.table, table) || other.table == table) && @@ -2076,6 +2337,7 @@ class _$CheckoutFormStateImpl implements _CheckoutFormState { totalPrice, draftName, orderType, + customerName, delivery, table, isLoading, @@ -2105,6 +2367,7 @@ abstract class _CheckoutFormState implements CheckoutFormState { required final int totalPrice, required final String draftName, required final OrderType orderType, + required final String customerName, final Delivery? delivery, final Table? table, final bool isLoading, @@ -2131,6 +2394,8 @@ abstract class _CheckoutFormState implements CheckoutFormState { @override OrderType get orderType; @override + String get customerName; + @override Delivery? get delivery; @override Table? get table; diff --git a/lib/application/checkout/checkout_form/checkout_form_event.dart b/lib/application/checkout/checkout_form/checkout_form_event.dart index f45e4b7..8290512 100644 --- a/lib/application/checkout/checkout_form/checkout_form_event.dart +++ b/lib/application/checkout/checkout_form/checkout_form_event.dart @@ -30,4 +30,6 @@ class CheckoutFormEvent with _$CheckoutFormEvent { const factory CheckoutFormEvent.orderAddedItems(Order? order) = _OrderAddedItems; + const factory CheckoutFormEvent.customerNameChanged(String name) = + _CustomerNameChanged; } diff --git a/lib/application/checkout/checkout_form/checkout_form_state.dart b/lib/application/checkout/checkout_form/checkout_form_state.dart index 3ef1582..1ee58a9 100644 --- a/lib/application/checkout/checkout_form/checkout_form_state.dart +++ b/lib/application/checkout/checkout_form/checkout_form_state.dart @@ -13,6 +13,7 @@ class CheckoutFormState with _$CheckoutFormState { required int totalPrice, required String draftName, required OrderType orderType, + required String customerName, Delivery? delivery, Table? table, @Default(false) bool isLoading, @@ -27,6 +28,7 @@ class CheckoutFormState with _$CheckoutFormState { totalQuantity: 0, totalPrice: 0, draftName: '', + customerName: '', orderType: OrderType.dineIn, ); } diff --git a/lib/domain/order/entities/order_entity.dart b/lib/domain/order/entities/order_entity.dart index 16c8348..835d961 100644 --- a/lib/domain/order/entities/order_entity.dart +++ b/lib/domain/order/entities/order_entity.dart @@ -178,6 +178,9 @@ class Order with _$Order { totalAmount: products .map((e) => e.product.price.toInt() * e.quantity) .reduce((value, element) => value + element), + subtotal: products + .map((e) => e.product.price.toInt() * e.quantity) + .reduce((value, element) => value + element), ); List get orderItemNotCancelled => diff --git a/lib/presentation/pages/checkout/widgets/checkout_right_panel.dart b/lib/presentation/pages/checkout/widgets/checkout_right_panel.dart index 02f8c49..7f40e0d 100644 --- a/lib/presentation/pages/checkout/widgets/checkout_right_panel.dart +++ b/lib/presentation/pages/checkout/widgets/checkout_right_panel.dart @@ -58,6 +58,7 @@ class _CheckoutRightPanelState extends State { context.read().add( OrderFormEvent.customerNameChanged(customerController.text), ); + context.read().add(CheckoutFormEvent.customerNameChanged(customerController.text)); }); } diff --git a/lib/presentation/pages/order/pages/success_add_item_order/widgets/success_add_item_order_left_panel.dart b/lib/presentation/pages/order/pages/success_add_item_order/widgets/success_add_item_order_left_panel.dart index 57c78ae..f210acb 100644 --- a/lib/presentation/pages/order/pages/success_add_item_order/widgets/success_add_item_order_left_panel.dart +++ b/lib/presentation/pages/order/pages/success_add_item_order/widgets/success_add_item_order_left_panel.dart @@ -108,10 +108,7 @@ class SuccessAddItemOrderLeftPanel extends StatelessWidget { icon: Icons.person, label: 'Pemesan', value: - checkoutState - .orderAdded - ?.metadata['customer_name'] ?? - "-", + checkoutState.customerName, ), if (checkoutState.orderAdded?.payments.isNotEmpty ?? false) ...[ @@ -195,7 +192,9 @@ class SuccessAddItemOrderLeftPanel extends StatelessWidget { context.read().add( PrintStruckEvent.order( Order.fromLastOrder( - order, + order.copyWith(metadata: { + "customer_name": checkoutState.customerName + }), checkoutState.items, ), ), diff --git a/pubspec.yaml b/pubspec.yaml index f240415..238bacf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: "A new Flutter project." publish_to: "none" -version: 1.0.2+7 +version: 1.0.3+8 environment: sdk: ^3.8.1