apksel-dev/apskel-pos-flutter
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #1

Merged
aefril merged 128 commits from dev into main 2025-08-13 17:19:48 +00:00
Conversation 0 Commits 128 Files Changed 345 +65 -51
7 changed files with 65 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b34428965e - Show all commits

12
lib/data/models/response/dashboard_analytic_response_model.dart
View File

@ -59,11 +59,17 @@ class DashboardAnalyticData {
dateFrom: map['date_from'],
dateTo: map['date_to'],
overview: DashboardOverview.fromMap(map['overview']),
topProducts: List<TopProduct>.from(
topProducts: map['top_products'] == null
? []
: List<TopProduct>.from(
map['top_products']?.map((x) => TopProduct.fromMap(x))),
paymentMethods: List<PaymentMethodAnalytic>.from(map['payment_methods']
paymentMethods: map['payment_methods'] == null
? []
: List<PaymentMethodAnalytic>.from(map['payment_methods']
?.map((x) => PaymentMethodAnalytic.fromMap(x))),
recentSales: List<RecentSale>.from(
recentSales: map['recent_sales'] == null
? []
: List<RecentSale>.from(
map['recent_sales']?.map((x) => RecentSale.fromMap(x))),
);

7
lib/data/models/response/payment_method_analytic_response_model.dart
View File

@ -64,8 +64,11 @@ class PaymentMethodAnalyticData {
dateTo: DateTime.parse(map['date_to']),
groupBy: map['group_by'],
summary: PaymentSummary.fromMap(map['summary']),
data: List<PaymentMethodAnalyticItem>.from(
map['data']?.map((x) => PaymentMethodAnalyticItem.fromMap(x)) ?? [],
data: map['data'] == null
? []
: List<PaymentMethodAnalyticItem>.from(
map['data']?.map((x) => PaymentMethodAnalyticItem.fromMap(x)) ??
[],
),
);
}

4
lib/data/models/response/product_analytic_response_model.dart
View File

@ -52,7 +52,9 @@ class ProductAnalyticData {
outletId: map['outlet_id'],
dateFrom: DateTime.parse(map['date_from']),
dateTo: DateTime.parse(map['date_to']),
data: List<ProductAnalyticItem>.from(
data: map['data'] == null
? []
: List<ProductAnalyticItem>.from(
map['data'].map((x) => ProductAnalyticItem.fromMap(x)),
),
);

4
lib/presentation/home/bloc/order_form/order_form_bloc.dart
View File

@ -77,8 +77,8 @@ class OrderFormBloc extends Bloc<OrderFormEvent, OrderFormState> {
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

68
lib/presentation/home/bloc/order_form/order_form_bloc.freezed.dart
View File

@ -27,7 +27,7 @@ mixin _$OrderFormEvent {
String customerName,
Customer? customer,
OrderType orderType,
TableModel table,
TableModel? table,
PaymentMethod paymentMethod)
createWithPayment,
required TResult Function(List<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> 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<ProductQuantity> items, String orderId)? addToOrder,

2
lib/presentation/home/bloc/order_form/order_form_event.dart
View File

@ -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({

7
lib/presentation/home/pages/confirm_payment_page.dart
View File

@ -1065,13 +1065,16 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
}
context.read<OrderFormBloc>().add(
OrderFormEvent.create(
OrderFormEvent
.createWithPayment(
items: items,
customerName:
customerController
.text,
orderType: orderType,
table: widget.table,
paymentMethod:
selectedPaymentMethod!,
table: widget.table!,
customer:
selectedCustomer,
),