From b34428965ecc986a372a8d7ab3748babc1d4214c Mon Sep 17 00:00:00 2001 From: efrilm Date: Wed, 13 Aug 2025 22:11:24 +0700 Subject: [PATCH] fix: bug --- .../dashboard_analytic_response_model.dart | 18 +++-- ...ayment_method_analytic_response_model.dart | 9 ++- .../product_analytic_response_model.dart | 8 ++- .../home/bloc/order_form/order_form_bloc.dart | 4 +- .../order_form/order_form_bloc.freezed.dart | 68 +++++++++---------- .../bloc/order_form/order_form_event.dart | 2 +- .../home/pages/confirm_payment_page.dart | 7 +- 7 files changed, 65 insertions(+), 51 deletions(-) diff --git a/lib/data/models/response/dashboard_analytic_response_model.dart b/lib/data/models/response/dashboard_analytic_response_model.dart index b0b5ac5..e9ac3d2 100644 --- a/lib/data/models/response/dashboard_analytic_response_model.dart +++ b/lib/data/models/response/dashboard_analytic_response_model.dart @@ -59,12 +59,18 @@ class DashboardAnalyticData { dateFrom: map['date_from'], dateTo: map['date_to'], overview: DashboardOverview.fromMap(map['overview']), - topProducts: List.from( - map['top_products']?.map((x) => TopProduct.fromMap(x))), - paymentMethods: List.from(map['payment_methods'] - ?.map((x) => PaymentMethodAnalytic.fromMap(x))), - recentSales: List.from( - map['recent_sales']?.map((x) => RecentSale.fromMap(x))), + topProducts: map['top_products'] == null + ? [] + : List.from( + map['top_products']?.map((x) => TopProduct.fromMap(x))), + paymentMethods: map['payment_methods'] == null + ? [] + : List.from(map['payment_methods'] + ?.map((x) => PaymentMethodAnalytic.fromMap(x))), + recentSales: map['recent_sales'] == null + ? [] + : List.from( + map['recent_sales']?.map((x) => RecentSale.fromMap(x))), ); Map toMap() => { diff --git a/lib/data/models/response/payment_method_analytic_response_model.dart b/lib/data/models/response/payment_method_analytic_response_model.dart index 8cf816a..6796cae 100644 --- a/lib/data/models/response/payment_method_analytic_response_model.dart +++ b/lib/data/models/response/payment_method_analytic_response_model.dart @@ -64,9 +64,12 @@ class PaymentMethodAnalyticData { dateTo: DateTime.parse(map['date_to']), groupBy: map['group_by'], summary: PaymentSummary.fromMap(map['summary']), - data: List.from( - map['data']?.map((x) => PaymentMethodAnalyticItem.fromMap(x)) ?? [], - ), + data: map['data'] == null + ? [] + : List.from( + map['data']?.map((x) => PaymentMethodAnalyticItem.fromMap(x)) ?? + [], + ), ); } diff --git a/lib/data/models/response/product_analytic_response_model.dart b/lib/data/models/response/product_analytic_response_model.dart index 2e8f6ba..35a9f4f 100644 --- a/lib/data/models/response/product_analytic_response_model.dart +++ b/lib/data/models/response/product_analytic_response_model.dart @@ -52,9 +52,11 @@ class ProductAnalyticData { outletId: map['outlet_id'], dateFrom: DateTime.parse(map['date_from']), dateTo: DateTime.parse(map['date_to']), - data: List.from( - map['data'].map((x) => ProductAnalyticItem.fromMap(x)), - ), + data: map['data'] == null + ? [] + : List.from( + map['data'].map((x) => ProductAnalyticItem.fromMap(x)), + ), ); Map toMap() => { diff --git a/lib/presentation/home/bloc/order_form/order_form_bloc.dart b/lib/presentation/home/bloc/order_form/order_form_bloc.dart index 7c31645..cc86adc 100644 --- a/lib/presentation/home/bloc/order_form/order_form_bloc.dart +++ b/lib/presentation/home/bloc/order_form/order_form_bloc.dart @@ -77,8 +77,8 @@ class OrderFormBloc extends Bloc { customerName: event.customerName, notes: '', orderType: event.orderType.name, - tableId: event.table.id, - tableNumber: event.table.tableName, + tableId: event.table?.id ?? "", + tableNumber: event.table?.tableName ?? "", outletId: userData.user?.outletId, customerId: event.customer?.id ?? '', orderItems: event.items diff --git a/lib/presentation/home/bloc/order_form/order_form_bloc.freezed.dart b/lib/presentation/home/bloc/order_form/order_form_bloc.freezed.dart index c2c49bc..d0b2688 100644 --- a/lib/presentation/home/bloc/order_form/order_form_bloc.freezed.dart +++ b/lib/presentation/home/bloc/order_form/order_form_bloc.freezed.dart @@ -27,7 +27,7 @@ mixin _$OrderFormEvent { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod) createWithPayment, required TResult Function(List items, String orderId) @@ -53,7 +53,7 @@ mixin _$OrderFormEvent { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult? Function(List items, String orderId)? addToOrder, @@ -76,7 +76,7 @@ mixin _$OrderFormEvent { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult Function(List items, String orderId)? addToOrder, @@ -226,7 +226,7 @@ class _$StartedImpl implements _Started { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod) createWithPayment, required TResult Function(List items, String orderId) @@ -255,7 +255,7 @@ class _$StartedImpl implements _Started { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult? Function(List items, String orderId)? addToOrder, @@ -281,7 +281,7 @@ class _$StartedImpl implements _Started { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult Function(List items, String orderId)? addToOrder, @@ -496,7 +496,7 @@ class _$CreateImpl implements _Create { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod) createWithPayment, required TResult Function(List items, String orderId) @@ -525,7 +525,7 @@ class _$CreateImpl implements _Create { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult? Function(List items, String orderId)? addToOrder, @@ -551,7 +551,7 @@ class _$CreateImpl implements _Create { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult Function(List items, String orderId)? addToOrder, @@ -652,7 +652,7 @@ abstract class _$$CreateWithPaymentMethodImplCopyWith<$Res> { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod}); } @@ -674,7 +674,7 @@ class __$$CreateWithPaymentMethodImplCopyWithImpl<$Res> Object? customerName = null, Object? customer = freezed, Object? orderType = null, - Object? table = null, + Object? table = freezed, Object? paymentMethod = null, }) { return _then(_$CreateWithPaymentMethodImpl( @@ -694,10 +694,10 @@ class __$$CreateWithPaymentMethodImplCopyWithImpl<$Res> ? _value.orderType : orderType // ignore: cast_nullable_to_non_nullable as OrderType, - table: null == table + table: freezed == table ? _value.table : table // ignore: cast_nullable_to_non_nullable - as TableModel, + as TableModel?, paymentMethod: null == paymentMethod ? _value.paymentMethod : paymentMethod // ignore: cast_nullable_to_non_nullable @@ -733,7 +733,7 @@ class _$CreateWithPaymentMethodImpl implements _CreateWithPaymentMethod { @override final OrderType orderType; @override - final TableModel table; + final TableModel? table; @override final PaymentMethod paymentMethod; @@ -790,7 +790,7 @@ class _$CreateWithPaymentMethodImpl implements _CreateWithPaymentMethod { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod) createWithPayment, required TResult Function(List items, String orderId) @@ -820,7 +820,7 @@ class _$CreateWithPaymentMethodImpl implements _CreateWithPaymentMethod { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult? Function(List items, String orderId)? addToOrder, @@ -847,7 +847,7 @@ class _$CreateWithPaymentMethodImpl implements _CreateWithPaymentMethod { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult Function(List items, String orderId)? addToOrder, @@ -922,7 +922,7 @@ abstract class _CreateWithPaymentMethod implements OrderFormEvent { required final String customerName, required final Customer? customer, required final OrderType orderType, - required final TableModel table, + required final TableModel? table, required final PaymentMethod paymentMethod}) = _$CreateWithPaymentMethodImpl; @@ -930,7 +930,7 @@ abstract class _CreateWithPaymentMethod implements OrderFormEvent { String get customerName; Customer? get customer; OrderType get orderType; - TableModel get table; + TableModel? get table; PaymentMethod get paymentMethod; /// Create a copy of OrderFormEvent @@ -1034,7 +1034,7 @@ class _$AddToOrderImpl implements _AddToOrder { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod) createWithPayment, required TResult Function(List items, String orderId) @@ -1063,7 +1063,7 @@ class _$AddToOrderImpl implements _AddToOrder { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult? Function(List items, String orderId)? addToOrder, @@ -1089,7 +1089,7 @@ class _$AddToOrderImpl implements _AddToOrder { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult Function(List items, String orderId)? addToOrder, @@ -1276,7 +1276,7 @@ class _$RefundImpl implements _Refund { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod) createWithPayment, required TResult Function(List items, String orderId) @@ -1305,7 +1305,7 @@ class _$RefundImpl implements _Refund { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult? Function(List items, String orderId)? addToOrder, @@ -1331,7 +1331,7 @@ class _$RefundImpl implements _Refund { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult Function(List items, String orderId)? addToOrder, @@ -1520,7 +1520,7 @@ class _$VoidOrderImpl implements _VoidOrder { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod) createWithPayment, required TResult Function(List items, String orderId) @@ -1549,7 +1549,7 @@ class _$VoidOrderImpl implements _VoidOrder { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult? Function(List items, String orderId)? addToOrder, @@ -1575,7 +1575,7 @@ class _$VoidOrderImpl implements _VoidOrder { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult Function(List items, String orderId)? addToOrder, @@ -1737,7 +1737,7 @@ class _$ToggleItemImpl implements _ToggleItem { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod) createWithPayment, required TResult Function(List items, String orderId) @@ -1766,7 +1766,7 @@ class _$ToggleItemImpl implements _ToggleItem { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult? Function(List items, String orderId)? addToOrder, @@ -1792,7 +1792,7 @@ class _$ToggleItemImpl implements _ToggleItem { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult Function(List items, String orderId)? addToOrder, @@ -1951,7 +1951,7 @@ class _$ToggleSelectAllImpl implements _ToggleSelectAll { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod) createWithPayment, required TResult Function(List items, String orderId) @@ -1980,7 +1980,7 @@ class _$ToggleSelectAllImpl implements _ToggleSelectAll { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult? Function(List items, String orderId)? addToOrder, @@ -2006,7 +2006,7 @@ class _$ToggleSelectAllImpl implements _ToggleSelectAll { String customerName, Customer? customer, OrderType orderType, - TableModel table, + TableModel? table, PaymentMethod paymentMethod)? createWithPayment, TResult Function(List items, String orderId)? addToOrder, diff --git a/lib/presentation/home/bloc/order_form/order_form_event.dart b/lib/presentation/home/bloc/order_form/order_form_event.dart index 63a6a61..b54406d 100644 --- a/lib/presentation/home/bloc/order_form/order_form_event.dart +++ b/lib/presentation/home/bloc/order_form/order_form_event.dart @@ -15,7 +15,7 @@ class OrderFormEvent with _$OrderFormEvent { required String customerName, required Customer? customer, required OrderType orderType, - required TableModel table, + required TableModel? table, required PaymentMethod paymentMethod, }) = _CreateWithPaymentMethod; const factory OrderFormEvent.addToOrder({ diff --git a/lib/presentation/home/pages/confirm_payment_page.dart b/lib/presentation/home/pages/confirm_payment_page.dart index 7fdacb0..ba12f76 100644 --- a/lib/presentation/home/pages/confirm_payment_page.dart +++ b/lib/presentation/home/pages/confirm_payment_page.dart @@ -1065,13 +1065,16 @@ class _ConfirmPaymentPageState extends State { } context.read().add( - OrderFormEvent.create( + OrderFormEvent + .createWithPayment( items: items, customerName: customerController .text, orderType: orderType, - table: widget.table, + paymentMethod: + selectedPaymentMethod!, + table: widget.table!, customer: selectedCustomer, ),