diff --git a/lib/core/extensions/string_ext.dart b/lib/core/extensions/string_ext.dart index 4ed973a..cdb7ae7 100644 --- a/lib/core/extensions/string_ext.dart +++ b/lib/core/extensions/string_ext.dart @@ -15,4 +15,12 @@ extension StringExt on String { decimalDigits: 0, ).format(parsedValue); } + + String toTitleCase() { + if (isEmpty) return ''; + return split(' ').map((word) { + if (word.isEmpty) return ''; + return word[0].toUpperCase() + word.substring(1).toLowerCase(); + }).join(' '); + } } diff --git a/lib/presentation/home/dialog/type_dialog.dart b/lib/presentation/home/dialog/type_dialog.dart index 5fca75e..f689820 100644 --- a/lib/presentation/home/dialog/type_dialog.dart +++ b/lib/presentation/home/dialog/type_dialog.dart @@ -1,7 +1,10 @@ import 'package:enaklo_pos/core/components/custom_modal_dialog.dart'; import 'package:enaklo_pos/core/components/spaces.dart'; import 'package:enaklo_pos/core/constants/colors.dart'; +import 'package:enaklo_pos/presentation/home/bloc/checkout/checkout_bloc.dart'; +import 'package:enaklo_pos/presentation/home/models/order_type.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; class TypeDialog extends StatefulWidget { const TypeDialog({super.key}); @@ -11,19 +14,30 @@ class TypeDialog extends StatefulWidget { } class _TypeDialogState extends State { - String selectedType = 'dine_in'; - List> types = [ - {'value': 'dine_in', 'label': 'Dine In', 'icon': Icons.restaurant_outlined}, + { + 'value': 'dine_in', + 'label': 'Dine In', + 'icon': Icons.restaurant_outlined, + 'type': OrderType.dineIn, + }, { 'value': 'take_away', 'label': 'Take Away', - 'icon': Icons.takeout_dining_outlined + 'icon': Icons.takeout_dining_outlined, + 'type': OrderType.takeAway, }, { 'value': 'delivery', 'label': 'Delivery', - 'icon': Icons.delivery_dining_outlined + 'icon': Icons.delivery_dining_outlined, + 'type': OrderType.delivery, + }, + { + 'value': 'grab', + 'label': 'Grab', + 'icon': Icons.two_wheeler, + 'type': OrderType.grab, }, ]; @@ -32,34 +46,56 @@ class _TypeDialogState extends State { return CustomModalDialog( title: 'Pilih Tipe', subtitle: 'Silahkan pilih tipe yang sesuai', - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - children: List.generate(types.length, (index) { - return _buildItem(context, types[index]); - }), - ), + contentPadding: + const EdgeInsets.symmetric(horizontal: 16.0, vertical: 24.0), + child: BlocBuilder( + builder: (context, state) { + return state.maybeWhen( + orElse: () => const SizedBox.shrink(), + loaded: (items, + discountModel, + discount, + discountAmount, + tax, + serviceCharge, + totalQuantity, + totalPrice, + draftName, + orderType) { + return Column( + children: List.generate(types.length, (index) { + return _buildItem( + context, + types[index], + selectedType: orderType, + ); + }), + ); + }); + }, ), ); } - Widget _buildItem(BuildContext context, Map type) { + Widget _buildItem(BuildContext context, Map type, + {required OrderType selectedType}) { return GestureDetector( onTap: () { - setState(() { - selectedType = type['value']!; - }); + context.read().add( + CheckoutEvent.updateOrderType(type['type']), + ); + Navigator.pop(context); }, child: Container( padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 16.0), margin: const EdgeInsets.only(bottom: 8.0), decoration: BoxDecoration( - color: selectedType == type['value'] + color: selectedType == type['type'] ? AppColors.primary : AppColors.white, borderRadius: BorderRadius.circular(8.0), border: Border.all( - color: selectedType == type['value'] + color: selectedType == type['type'] ? AppColors.primary : AppColors.grey, width: 1.0, @@ -68,7 +104,7 @@ class _TypeDialogState extends State { child: Row( children: [ Icon(type['icon'], - color: selectedType == type['value'] + color: selectedType == type['type'] ? AppColors.white : AppColors.black), SpaceWidth(12.0), @@ -77,7 +113,7 @@ class _TypeDialogState extends State { type['label']!, style: TextStyle( fontSize: 16, - color: selectedType == type['value'] + color: selectedType == type['type'] ? AppColors.white : AppColors.black, fontWeight: FontWeight.bold, diff --git a/lib/presentation/home/pages/confirm_payment_page-new.dart.backup b/lib/presentation/home/pages/confirm_payment_page-old.dart similarity index 100% rename from lib/presentation/home/pages/confirm_payment_page-new.dart.backup rename to lib/presentation/home/pages/confirm_payment_page-old.dart diff --git a/lib/presentation/home/pages/confirm_payment_page.dart b/lib/presentation/home/pages/confirm_payment_page.dart index eacdb66..3ea0ead 100644 --- a/lib/presentation/home/pages/confirm_payment_page.dart +++ b/lib/presentation/home/pages/confirm_payment_page.dart @@ -118,6 +118,44 @@ class _ConfirmPaymentPageState extends State { subtitle: widget.isTable ? 'Orders Table ${widget.table?.tableName}' : 'Orders #1', + actionWidget: [ + BlocBuilder( + builder: (context, state) { + return state.maybeWhen( + orElse: () => const SizedBox(), + loaded: (products, + discountModel, + discount, + discountAmount, + tax, + serviceCharge, + totalQuantity, + totalPrice, + draftName, + orderType) { + return Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8.0), + border: Border.all( + color: AppColors.primary, + width: 1.0, + ), + ), + padding: const EdgeInsets.all(8.0), + child: Text( + orderType.value, + style: TextStyle( + color: AppColors.primary, + fontSize: 16, + fontWeight: FontWeight.w600, + ), + ), + ); + }, + ); + }, + ), + ], ), Container( padding: const EdgeInsets.all(16.0).copyWith(bottom: 8), diff --git a/lib/presentation/home/widgets/home_right_title.dart b/lib/presentation/home/widgets/home_right_title.dart index 1319f82..4c2ee63 100644 --- a/lib/presentation/home/widgets/home_right_title.dart +++ b/lib/presentation/home/widgets/home_right_title.dart @@ -1,11 +1,14 @@ import 'package:enaklo_pos/core/components/buttons.dart'; import 'package:enaklo_pos/core/constants/colors.dart'; import 'package:enaklo_pos/core/extensions/build_context_ext.dart'; +import 'package:enaklo_pos/core/extensions/string_ext.dart'; import 'package:enaklo_pos/data/models/response/table_model.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/pages/dashboard_page.dart'; import 'package:enaklo_pos/presentation/sales/pages/sales_page.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; class HomeRightTitle extends StatelessWidget { final TableModel? table; @@ -72,25 +75,43 @@ class HomeRightTitle extends StatelessWidget { Row( children: [ Expanded( - child: Button.filled( - width: 180.0, - height: 40, - elevation: 0, - onPressed: () { - showDialog( - context: context, - builder: (context) { - return TypeDialog(); - }); + child: BlocBuilder( + builder: (context, state) { + return state.maybeWhen( + orElse: () => const SizedBox.shrink(), + loaded: (items, + discountModel, + discount, + discountAmount, + tax, + serviceCharge, + totalQuantity, + totalPrice, + draftName, + orderType) { + return Button.filled( + width: 180.0, + height: 40, + elevation: 0, + onPressed: () { + showDialog( + context: context, + builder: (context) { + return TypeDialog(); + }); + }, + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + icon: Icon( + Icons.dinner_dining_outlined, + color: Colors.white, + size: 24, + ), + label: orderType.value.toTitleCase(), + ); + }, + ); }, - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - icon: Icon( - Icons.dinner_dining_outlined, - color: Colors.white, - size: 24, - ), - label: 'Dine In', ), ), Expanded(