diff --git a/lib/core/constants/variables.dart b/lib/core/constants/variables.dart index b5b9b83..adbd8bb 100644 --- a/lib/core/constants/variables.dart +++ b/lib/core/constants/variables.dart @@ -2,6 +2,6 @@ class Variables { static const String appName = 'POS Kasir Resto App'; static const String apiVersion = 'v1'; // static const String baseUrl = 'http://192.168.1.202:8000'; - static const String baseUrl = 'https://enaklo-pos-be.altru.id'; + static const String baseUrl = 'https://api-pos.apskel.id'; static const int defaultLimit = 10; } diff --git a/lib/presentation/home/bloc/checkout/checkout_bloc.dart b/lib/presentation/home/bloc/checkout/checkout_bloc.dart index e08bfd0..0d41cd3 100644 --- a/lib/presentation/home/bloc/checkout/checkout_bloc.dart +++ b/lib/presentation/home/bloc/checkout/checkout_bloc.dart @@ -131,7 +131,7 @@ class CheckoutBloc extends Bloc { final serviceCharge = await settingsLocalDatasource.getServiceCharge(); emit(_Loaded( - [], + event.items, null, 0, 0, diff --git a/lib/presentation/home/bloc/checkout/checkout_bloc.freezed.dart b/lib/presentation/home/bloc/checkout/checkout_bloc.freezed.dart index 45934a1..79f2db0 100644 --- a/lib/presentation/home/bloc/checkout/checkout_bloc.freezed.dart +++ b/lib/presentation/home/bloc/checkout/checkout_bloc.freezed.dart @@ -18,7 +18,7 @@ final _privateConstructorUsedError = UnsupportedError( mixin _$CheckoutEvent { @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -41,7 +41,7 @@ mixin _$CheckoutEvent { throw _privateConstructorUsedError; @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -61,7 +61,7 @@ mixin _$CheckoutEvent { throw _privateConstructorUsedError; @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -166,6 +166,8 @@ abstract class _$$StartedImplCopyWith<$Res> { factory _$$StartedImplCopyWith( _$StartedImpl value, $Res Function(_$StartedImpl) then) = __$$StartedImplCopyWithImpl<$Res>; + @useResult + $Res call({List items}); } /// @nodoc @@ -178,31 +180,62 @@ class __$$StartedImplCopyWithImpl<$Res> /// Create a copy of CheckoutEvent /// with the given fields replaced by the non-null parameter values. + @pragma('vm:prefer-inline') + @override + $Res call({ + Object? items = null, + }) { + return _then(_$StartedImpl( + null == items + ? _value._items + : items // ignore: cast_nullable_to_non_nullable + as List, + )); + } } /// @nodoc class _$StartedImpl implements _Started { - const _$StartedImpl(); + const _$StartedImpl(final List items) : _items = items; + + final List _items; + @override + List get items { + if (_items is EqualUnmodifiableListView) return _items; + // ignore: implicit_dynamic_type + return EqualUnmodifiableListView(_items); + } @override String toString() { - return 'CheckoutEvent.started()'; + return 'CheckoutEvent.started(items: $items)'; } @override bool operator ==(Object other) { return identical(this, other) || - (other.runtimeType == runtimeType && other is _$StartedImpl); + (other.runtimeType == runtimeType && + other is _$StartedImpl && + const DeepCollectionEquality().equals(other._items, _items)); } @override - int get hashCode => runtimeType.hashCode; + int get hashCode => + Object.hash(runtimeType, const DeepCollectionEquality().hash(_items)); + + /// Create a copy of CheckoutEvent + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) + @override + @pragma('vm:prefer-inline') + _$$StartedImplCopyWith<_$StartedImpl> get copyWith => + __$$StartedImplCopyWithImpl<_$StartedImpl>(this, _$identity); @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -222,13 +255,13 @@ class _$StartedImpl implements _Started { required TResult Function(DraftOrderModel data) loadDraftOrder, required TResult Function(DeliveryModel delivery) updateDeliveryType, }) { - return started(); + return started(items); } @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -245,13 +278,13 @@ class _$StartedImpl implements _Started { TResult? Function(DraftOrderModel data)? loadDraftOrder, TResult? Function(DeliveryModel delivery)? updateDeliveryType, }) { - return started?.call(); + return started?.call(items); } @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -270,7 +303,7 @@ class _$StartedImpl implements _Started { required TResult orElse(), }) { if (started != null) { - return started(); + return started(items); } return orElse(); } @@ -347,7 +380,15 @@ class _$StartedImpl implements _Started { } abstract class _Started implements CheckoutEvent { - const factory _Started() = _$StartedImpl; + const factory _Started(final List items) = _$StartedImpl; + + List get items; + + /// Create a copy of CheckoutEvent + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) + _$$StartedImplCopyWith<_$StartedImpl> get copyWith => + throw _privateConstructorUsedError; } /// @nodoc @@ -426,7 +467,7 @@ class _$AddItemImpl implements _AddItem { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -452,7 +493,7 @@ class _$AddItemImpl implements _AddItem { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -475,7 +516,7 @@ class _$AddItemImpl implements _AddItem { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -660,7 +701,7 @@ class _$RemoveItemImpl implements _RemoveItem { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -686,7 +727,7 @@ class _$RemoveItemImpl implements _RemoveItem { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -709,7 +750,7 @@ class _$RemoveItemImpl implements _RemoveItem { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -894,7 +935,7 @@ class _$DeleteItemImpl implements _DeleteItem { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -920,7 +961,7 @@ class _$DeleteItemImpl implements _DeleteItem { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -943,7 +984,7 @@ class _$DeleteItemImpl implements _DeleteItem { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -1121,7 +1162,7 @@ class _$AddDiscountImpl implements _AddDiscount { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -1147,7 +1188,7 @@ class _$AddDiscountImpl implements _AddDiscount { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -1170,7 +1211,7 @@ class _$AddDiscountImpl implements _AddDiscount { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -1318,7 +1359,7 @@ class _$RemoveDiscountImpl implements _RemoveDiscount { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -1344,7 +1385,7 @@ class _$RemoveDiscountImpl implements _RemoveDiscount { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -1367,7 +1408,7 @@ class _$RemoveDiscountImpl implements _RemoveDiscount { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -1534,7 +1575,7 @@ class _$AddTaxImpl implements _AddTax { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -1560,7 +1601,7 @@ class _$AddTaxImpl implements _AddTax { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -1583,7 +1624,7 @@ class _$AddTaxImpl implements _AddTax { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -1760,7 +1801,7 @@ class _$AddServiceChargeImpl implements _AddServiceCharge { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -1786,7 +1827,7 @@ class _$AddServiceChargeImpl implements _AddServiceCharge { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -1809,7 +1850,7 @@ class _$AddServiceChargeImpl implements _AddServiceCharge { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -1958,7 +1999,7 @@ class _$RemoveTaxImpl implements _RemoveTax { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -1984,7 +2025,7 @@ class _$RemoveTaxImpl implements _RemoveTax { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -2007,7 +2048,7 @@ class _$RemoveTaxImpl implements _RemoveTax { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -2148,7 +2189,7 @@ class _$RemoveServiceChargeImpl implements _RemoveServiceCharge { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -2174,7 +2215,7 @@ class _$RemoveServiceChargeImpl implements _RemoveServiceCharge { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -2197,7 +2238,7 @@ class _$RemoveServiceChargeImpl implements _RemoveServiceCharge { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -2366,7 +2407,7 @@ class _$UpdateOrderTypeImpl implements _UpdateOrderType { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -2392,7 +2433,7 @@ class _$UpdateOrderTypeImpl implements _UpdateOrderType { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -2415,7 +2456,7 @@ class _$UpdateOrderTypeImpl implements _UpdateOrderType { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -2600,7 +2641,7 @@ class _$UpdateItemNotesImpl implements _UpdateItemNotes { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -2626,7 +2667,7 @@ class _$UpdateItemNotesImpl implements _UpdateItemNotes { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -2649,7 +2690,7 @@ class _$UpdateItemNotesImpl implements _UpdateItemNotes { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -2848,7 +2889,7 @@ class _$SaveDraftOrderImpl implements _SaveDraftOrder { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -2874,7 +2915,7 @@ class _$SaveDraftOrderImpl implements _SaveDraftOrder { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -2897,7 +2938,7 @@ class _$SaveDraftOrderImpl implements _SaveDraftOrder { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -3076,7 +3117,7 @@ class _$LoadDraftOrderImpl implements _LoadDraftOrder { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -3102,7 +3143,7 @@ class _$LoadDraftOrderImpl implements _LoadDraftOrder { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -3125,7 +3166,7 @@ class _$LoadDraftOrderImpl implements _LoadDraftOrder { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, @@ -3303,7 +3344,7 @@ class _$UpdateDeliveryTypeImpl implements _UpdateDeliveryType { @override @optionalTypeArgs TResult when({ - required TResult Function() started, + required TResult Function(List items) started, required TResult Function(Product product, ProductVariant? variant) addItem, required TResult Function(Product product, ProductVariant? variant) removeItem, @@ -3329,7 +3370,7 @@ class _$UpdateDeliveryTypeImpl implements _UpdateDeliveryType { @override @optionalTypeArgs TResult? whenOrNull({ - TResult? Function()? started, + TResult? Function(List items)? started, TResult? Function(Product product, ProductVariant? variant)? addItem, TResult? Function(Product product, ProductVariant? variant)? removeItem, TResult? Function(Product product, ProductVariant? variant)? deleteItem, @@ -3352,7 +3393,7 @@ class _$UpdateDeliveryTypeImpl implements _UpdateDeliveryType { @override @optionalTypeArgs TResult maybeWhen({ - TResult Function()? started, + TResult Function(List items)? started, TResult Function(Product product, ProductVariant? variant)? addItem, TResult Function(Product product, ProductVariant? variant)? removeItem, TResult Function(Product product, ProductVariant? variant)? deleteItem, diff --git a/lib/presentation/home/bloc/checkout/checkout_event.dart b/lib/presentation/home/bloc/checkout/checkout_event.dart index 25e6edf..882a5db 100644 --- a/lib/presentation/home/bloc/checkout/checkout_event.dart +++ b/lib/presentation/home/bloc/checkout/checkout_event.dart @@ -2,7 +2,7 @@ part of 'checkout_bloc.dart'; @freezed class CheckoutEvent with _$CheckoutEvent { - const factory CheckoutEvent.started() = _Started; + const factory CheckoutEvent.started(List items) = _Started; //add item const factory CheckoutEvent.addItem( Product product, ProductVariant? variant) = _AddItem; diff --git a/lib/presentation/home/pages/dashboard_page.dart b/lib/presentation/home/pages/dashboard_page.dart index f00472c..2a6c1c1 100644 --- a/lib/presentation/home/pages/dashboard_page.dart +++ b/lib/presentation/home/pages/dashboard_page.dart @@ -4,6 +4,7 @@ import 'dart:developer'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:enaklo_pos/presentation/customer/pages/customer_page.dart'; +import 'package:enaklo_pos/presentation/home/models/product_quantity.dart'; import 'package:enaklo_pos/presentation/setting/pages/setting_page.dart'; import 'package:enaklo_pos/presentation/table/pages/table_page.dart'; import 'package:flutter/material.dart'; @@ -26,10 +27,13 @@ import 'home_page.dart'; class DashboardPage extends StatefulWidget { final int? index; final TableModel? table; + final List? items; + const DashboardPage({ super.key, this.index = 0, this.table, + this.items, }); @override @@ -56,8 +60,11 @@ class _DashboardPageState extends State { HomePage( isTable: false, table: widget.table, + items: widget.items ?? [], + ), + TablePage( + items: widget.items ?? [], ), - const TablePage(), const ReportPage(), const CustomerPage(), const SettingPage(), diff --git a/lib/presentation/home/pages/home_page.dart b/lib/presentation/home/pages/home_page.dart index f3e3bd6..5e1d9f4 100644 --- a/lib/presentation/home/pages/home_page.dart +++ b/lib/presentation/home/pages/home_page.dart @@ -4,6 +4,7 @@ import 'package:enaklo_pos/presentation/home/bloc/category_loader/category_loade import 'package:enaklo_pos/presentation/home/bloc/current_outlet/current_outlet_bloc.dart'; import 'package:enaklo_pos/presentation/home/bloc/product_loader/product_loader_bloc.dart'; import 'package:enaklo_pos/presentation/home/bloc/user_update_outlet/user_update_outlet_bloc.dart'; +import 'package:enaklo_pos/presentation/home/models/product_quantity.dart'; import 'package:enaklo_pos/presentation/home/widgets/category_tab_bar.dart'; import 'package:enaklo_pos/presentation/home/widgets/home_right_title.dart'; import 'package:flutter/material.dart'; @@ -27,10 +28,12 @@ import '../widgets/product_card.dart'; class HomePage extends StatefulWidget { final bool isTable; final TableModel? table; + final List items; const HomePage({ super.key, required this.isTable, this.table, + required this.items, }); @override @@ -75,7 +78,7 @@ class _HomePageState extends State { .add(const ProductLoaderEvent.getProduct()); // Initialize checkout with tax and service charge settings - context.read().add(const CheckoutEvent.started()); + context.read().add(CheckoutEvent.started(widget.items)); // Get Category context.read().add(CategoryLoaderEvent.get()); diff --git a/lib/presentation/home/widgets/home_right_title.dart b/lib/presentation/home/widgets/home_right_title.dart index 3d1ba60..05f9b27 100644 --- a/lib/presentation/home/widgets/home_right_title.dart +++ b/lib/presentation/home/widgets/home_right_title.dart @@ -135,6 +135,7 @@ class HomeRightTitle extends StatelessWidget { if (table == null) { context.push(DashboardPage( index: 1, + items: items, )); } }, diff --git a/lib/presentation/home/widgets/save_order_dialog.dart b/lib/presentation/home/widgets/save_order_dialog.dart index 6e6179e..d73ec72 100644 --- a/lib/presentation/home/widgets/save_order_dialog.dart +++ b/lib/presentation/home/widgets/save_order_dialog.dart @@ -75,7 +75,7 @@ class _SaveOrderDialogState extends State { onPressed: () { context .read() - .add(const CheckoutEvent.started()); + .add(const CheckoutEvent.started([])); context .read() .add(const GetTableEvent.getTables()); diff --git a/lib/presentation/home/widgets/success_payment_dialog.dart b/lib/presentation/home/widgets/success_payment_dialog.dart index cdfac45..e1edda3 100644 --- a/lib/presentation/home/widgets/success_payment_dialog.dart +++ b/lib/presentation/home/widgets/success_payment_dialog.dart @@ -177,7 +177,7 @@ class _SuccessPaymentDialogState extends State { // For regular payment flow, reset and go to root context .read() - .add(const CheckoutEvent.started()); + .add(const CheckoutEvent.started([])); context .read() .add(const GetTableEvent.getTables()); diff --git a/lib/presentation/table/pages/table_page.dart b/lib/presentation/table/pages/table_page.dart index b31e397..268fc38 100644 --- a/lib/presentation/table/pages/table_page.dart +++ b/lib/presentation/table/pages/table_page.dart @@ -1,7 +1,10 @@ +import 'dart:developer'; + import 'package:enaklo_pos/core/components/flushbar.dart'; import 'package:enaklo_pos/core/constants/colors.dart'; import 'package:enaklo_pos/core/extensions/build_context_ext.dart'; import 'package:enaklo_pos/data/models/response/table_model.dart'; +import 'package:enaklo_pos/presentation/home/models/product_quantity.dart'; import 'package:enaklo_pos/presentation/home/pages/dashboard_page.dart'; import 'package:enaklo_pos/presentation/table/blocs/change_position_table/change_position_table_bloc.dart'; import 'package:enaklo_pos/presentation/table/blocs/create_table/create_table_bloc.dart'; @@ -32,7 +35,8 @@ TableStatus parseStatus(String? status) { } class TablePage extends StatefulWidget { - const TablePage({super.key}); + final List? items; + const TablePage({super.key, this.items}); @override State createState() => _TablePageState(); @@ -61,6 +65,7 @@ class _TablePageState extends State { @override void initState() { + log("ITEM COUNT: ${widget.items?.length}"); context.read().add(const GetTableEvent.getTables()); super.initState(); } @@ -391,8 +396,9 @@ class _TablePageState extends State { ), onPressed: () { if (selectedTable?.status == 'available') { - context.push(DashboardPage( + context.pushReplacement(DashboardPage( table: selectedTable!, + items: widget.items, )); } else {} }, diff --git a/lib/presentation/table/widgets/card_table_widget.dart b/lib/presentation/table/widgets/card_table_widget.dart index 4b18d5a..16de503 100644 --- a/lib/presentation/table/widgets/card_table_widget.dart +++ b/lib/presentation/table/widgets/card_table_widget.dart @@ -1,5 +1,6 @@ import 'dart:developer'; +import 'package:enaklo_pos/presentation/home/models/product_quantity.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter/material.dart'; import 'package:enaklo_pos/core/components/components.dart'; @@ -19,9 +20,11 @@ import 'package:enaklo_pos/presentation/table/pages/payment_table_page.dart'; class CardTableWidget extends StatefulWidget { final TableModel table; + final List items; const CardTableWidget({ super.key, required this.table, + required this.items, }); @override @@ -89,6 +92,7 @@ class _CardTableWidgetState extends State { context.push(HomePage( isTable: true, table: widget.table, + items: widget.items, )); } else { context.read().add(