dev #1

Merged
aefril merged 128 commits from dev into main 2025-08-13 17:19:48 +00:00
4 changed files with 87 additions and 38 deletions
Showing only changes of commit 37ed6686f8 - Show all commits

View File

@ -34,10 +34,10 @@ class _TypeDialogState extends State<TypeDialog> {
'type': OrderType.delivery, 'type': OrderType.delivery,
}, },
{ {
'value': 'grab', 'value': 'free_table',
'label': 'Grab', 'label': 'Free Table',
'icon': Icons.two_wheeler, 'icon': Icons.table_bar_outlined,
'type': OrderType.grab, 'type': OrderType.freeTable,
}, },
]; ];

View File

@ -1,8 +1,8 @@
enum OrderType { enum OrderType {
dineIn('DINE IN'), dineIn('DINE IN'),
takeAway('TAKE AWAY'), takeAway('TAKE AWAY'),
grab('GRAB'), delivery('DELIVERY'),
delivery('DELIVERY'); freeTable('FREE TABLE');
final String value; final String value;
const OrderType(this.value); const OrderType(this.value);

View File

@ -876,7 +876,16 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
SpaceWidth(12), SpaceWidth(12),
Expanded( Expanded(
child: Button.filled( child: Button.filled(
onPressed: () => showDialog( onPressed: () {
if (customerController.text == '') {
AppFlushbar.showError(
context,
'Pilih Pelanggan terlebih dahulu',
);
return;
}
showDialog(
context: context, context: context,
builder: (dcontext) => SaveDialog( builder: (dcontext) => SaveDialog(
selectedTable: widget.table, selectedTable: widget.table,
@ -885,7 +894,8 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
orderType: orderType, orderType: orderType,
customer: selectedCustomer, customer: selectedCustomer,
), ),
), );
},
label: 'Simpan', label: 'Simpan',
), ),
), ),
@ -914,6 +924,15 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
child: state.maybeMap( child: state.maybeMap(
orElse: () => Button.filled( orElse: () => Button.filled(
onPressed: () { onPressed: () {
if (customerController.text ==
'') {
AppFlushbar.showError(
context,
'Pilih Pelanggan terlebih dahulu',
);
return;
}
context.read<OrderFormBloc>().add( context.read<OrderFormBloc>().add(
OrderFormEvent.create( OrderFormEvent.create(
items: items, items: items,

View File

@ -6,6 +6,7 @@ import 'package:enaklo_pos/data/models/response/table_model.dart';
import 'package:enaklo_pos/presentation/customer/pages/customer_page.dart'; import 'package:enaklo_pos/presentation/customer/pages/customer_page.dart';
import 'package:enaklo_pos/presentation/home/bloc/checkout/checkout_bloc.dart'; import 'package:enaklo_pos/presentation/home/bloc/checkout/checkout_bloc.dart';
import 'package:enaklo_pos/presentation/home/dialog/type_dialog.dart'; import 'package:enaklo_pos/presentation/home/dialog/type_dialog.dart';
import 'package:enaklo_pos/presentation/home/models/order_type.dart';
import 'package:enaklo_pos/presentation/home/pages/dashboard_page.dart'; import 'package:enaklo_pos/presentation/home/pages/dashboard_page.dart';
import 'package:enaklo_pos/presentation/sales/pages/sales_page.dart'; import 'package:enaklo_pos/presentation/sales/pages/sales_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -115,7 +116,23 @@ class HomeRightTitle extends StatelessWidget {
}, },
), ),
), ),
Expanded( BlocBuilder<CheckoutBloc, CheckoutState>(
builder: (context, state) {
return state.maybeWhen(
orElse: () => const SizedBox.shrink(),
loaded: (items,
discountModel,
discount,
discountAmount,
tax,
serviceCharge,
totalQuantity,
totalPrice,
draftName,
orderType) {
switch (orderType) {
case OrderType.dineIn:
return Expanded(
child: Button.filled( child: Button.filled(
width: 180.0, width: 180.0,
height: 40, height: 40,
@ -134,8 +151,21 @@ class HomeRightTitle extends StatelessWidget {
}, },
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
label: table == null ? 'Pilih Meja' : '${table!.tableName}', label: table == null
? 'Pilih Meja'
: '${table!.tableName}',
), ),
);
case OrderType.takeAway:
return const SizedBox.shrink();
case OrderType.delivery:
return const SizedBox.shrink();
default:
return const SizedBox.shrink();
}
},
);
},
), ),
], ],
), ),