fix payment struck

Reviewed-on: #1

android/app/build.gradle

@@ -45,7 +45,7 @@ android {
         applicationId "com.appscale.pos"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 21
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

lib/data/dataoutputs/print_dataoutputs.dart

@@ -865,7 +865,9 @@ class PrintDataoutputs {
             ? '------------------------------------------------'
             : '--------------------------------',
         styles: const PosStyles(bold: false, align: PosAlign.center));
-    for (final product in (order.orderItems ?? <OrderItem>[])) {
+    for (final product
+        in (order.orderItems?.where((item) => item.status != 'cancelled') ??
+            <OrderItem>[])) {
       bytes += generator.row([
         PosColumn(
           text: '${product.quantity} x ${product.productName}',

lib/data/datasources/order_remote_datasource.dart

@@ -405,7 +405,7 @@ class OrderRemoteDatasource {
     }
   }
 
-  Future<Either<String, OrderDetailResponseModel>> addToOrder({
+  Future<Either<String, bool>> addToOrder({
     required String orderId,
     required List<OrderItemRequest> orderItems,
   }) async {
@@ -429,8 +429,7 @@ class OrderRemoteDatasource {
       );
 
       if (response.statusCode == 200) {
-        final data = OrderDetailResponseModel.fromMap(response.data);
-        return Right(data);
+        return Right(true);
       } else {
         return const Left('Gagal menambahkan pesanan pesanan');
       }
@@ -442,7 +441,7 @@ class OrderRemoteDatasource {
       return Left(errorMessage);
     } catch (e) {
       log("💥 Unexpected error: $e");
-      return const Left('Terjadi kesalahan tak terduga');
+      return const Left('Terjadi kesalahan, coba lagi nanti.');
     }
   }
 

lib/data/datasources/table_remote_datasource.dart

@@ -55,7 +55,7 @@ class TableRemoteDataSource {
 
   Future<Either<String, TableResponseModel>> getTable({
     int page = 1,
-    int limit = 10,
+    int limit = 50,
     String? status,
   }) async {
     try {

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<TopProduct>.from(
-            map['top_products']?.map((x) => TopProduct.fromMap(x))),
-        paymentMethods: List<PaymentMethodAnalytic>.from(map['payment_methods']
-            ?.map((x) => PaymentMethodAnalytic.fromMap(x))),
-        recentSales: List<RecentSale>.from(
-            map['recent_sales']?.map((x) => RecentSale.fromMap(x))),
+        topProducts: map['top_products'] == null
+            ? []
+            : List<TopProduct>.from(
+                map['top_products']?.map((x) => TopProduct.fromMap(x))),
+        paymentMethods: map['payment_methods'] == null
+            ? []
+            : List<PaymentMethodAnalytic>.from(map['payment_methods']
+                ?.map((x) => PaymentMethodAnalytic.fromMap(x))),
+        recentSales: map['recent_sales'] == null
+            ? []
+            : List<RecentSale>.from(
+                map['recent_sales']?.map((x) => RecentSale.fromMap(x))),
       );
 
   Map<String, dynamic> toMap() => {

lib/data/models/response/order_response_model.dart

@@ -81,7 +81,7 @@ class OrderData {
       orders: map["orders"] == null
           ? []
           : List<Order>.from(map['orders']?.map((x) => Order.fromMap(x))),
-      payments: map["orders"] == null
+      payments: map["payments"] == null
           ? []
           : List<Payment>.from(map['payments']?.map((x) => Payment.fromMap(x))),
       totalCount: map['total_count'],

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<PaymentMethodAnalyticItem>.from(
-        map['data']?.map((x) => PaymentMethodAnalyticItem.fromMap(x)) ?? [],
-      ),
+      data: map['data'] == null
+          ? []
+          : List<PaymentMethodAnalyticItem>.from(
+              map['data']?.map((x) => PaymentMethodAnalyticItem.fromMap(x)) ??
+                  [],
+            ),
     );
   }
 

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<ProductAnalyticItem>.from(
-          map['data'].map((x) => ProductAnalyticItem.fromMap(x)),
-        ),
+        data: map['data'] == null
+            ? []
+            : List<ProductAnalyticItem>.from(
+                map['data'].map((x) => ProductAnalyticItem.fromMap(x)),
+              ),
       );
 
   Map<String, dynamic> toMap() => {

lib/data/models/response/profit_loss_response_model.dart

@@ -72,10 +72,14 @@ class ProfitLossData {
       dateTo: map['date_to'],
       groupBy: map['group_by'],
       summary: ProfitLossSummary.fromMap(map['summary']),
-      data: List<ProfitLossItem>.from(
-          map['data'].map((x) => ProfitLossItem.fromMap(x))),
-      productData: List<ProfitLossProduct>.from(
-          map['product_data'].map((x) => ProfitLossProduct.fromMap(x))),
+      data: map['data'] == null
+          ? []
+          : List<ProfitLossItem>.from(
+              map['data'].map((x) => ProfitLossItem.fromMap(x))),
+      productData: map['product_data'] == null
+          ? []
+          : List<ProfitLossProduct>.from(
+              map['product_data'].map((x) => ProfitLossProduct.fromMap(x))),
     );
   }
 

lib/presentation/home/bloc/order_form/order_form_bloc.dart

@@ -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
@@ -131,11 +131,11 @@ class OrderFormBloc extends Bloc<OrderFormEvent, OrderFormState> {
 
           result.fold(
             (error) => emit(_Error(error)),
-            (success) => emit(_Success(success.data!)),
+            (success) => emit(_SuccessMsg()),
           );
         } catch (e) {
           log("Error in AddOrderItemsBloc: $e");
-          emit(_Error("Failed to add order items: $e"));
+          emit(_Error("Ada kesalahan. Coba lagi nanti"));
         }
       },
     );

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<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,

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

lib/presentation/home/dialog/payment_add_order_dialog.dart

@@ -289,7 +289,7 @@ class _PaymentAddOrderDialogState extends State<PaymentAddOrderDialog> {
             listener: (context, state) {
               state.maybeWhen(
                 orElse: () {},
-                success: (data) {
+                successMsg: () {
                   context.pop();
                   context.pushReplacement(
                     SuccessSaveOrderPage(

lib/presentation/home/models/order_request.dart

@@ -45,7 +45,6 @@ class OrderRequestModel {
     Map<String, dynamic> data = {
       "outlet_id": outletId,
       "table_number": tableNumber,
-      "table_id": tableId,
       "order_type": orderType,
       "notes": notes,
       "order_items": orderItems == null
@@ -58,6 +57,10 @@ class OrderRequestModel {
       data["customer_id"] = customerId;
     }
 
+    if (tableId != null && tableId != "") {
+      data["table_id"] = tableId;
+    }
+
     return data;
   }
 }

lib/presentation/home/pages/confirm_payment_page.dart

@@ -355,7 +355,10 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                               (previousValue, element) =>
                                                   previousValue +
                                                   (element.product.price! *
-                                                      element.quantity),
+                                                      element.quantity) +
+                                                  (element.variant
+                                                          ?.priceModifier ??
+                                                      0),
                                             ));
                                     return Text(
                                       price.currencyFormatRp,
@@ -500,7 +503,9 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                         (previousValue, element) =>
                                             previousValue +
                                             (element.product.price! *
-                                                element.quantity),
+                                                element.quantity) +
+                                            (element.variant?.priceModifier ??
+                                                0),
                                       ),
                                     );
 
@@ -1065,12 +1070,15 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                               }
 
                                               context.read<OrderFormBloc>().add(
-                                                    OrderFormEvent.create(
+                                                    OrderFormEvent
+                                                        .createWithPayment(
                                                       items: items,
                                                       customerName:
                                                           customerController
                                                               .text,
                                                       orderType: orderType,
+                                                      paymentMethod:
+                                                          selectedPaymentMethod!,
                                                       table: widget.table,
                                                       customer:
                                                           selectedCustomer,

lib/presentation/home/pages/home_page.dart

@@ -429,8 +429,10 @@ class _HomePageState extends State<HomePage> {
                                             }
                                             return products
                                                 .map((e) =>
-                                                    e.product.price! *
-                                                    e.quantity)
+                                                    (e.product.price! *
+                                                        e.quantity) +
+                                                    (e.variant?.priceModifier ??
+                                                        0))
                                                 .reduce((value, element) =>
                                                     value + element);
                                           });

lib/presentation/payment/pages/payment_page.dart

@@ -372,7 +372,8 @@ class _PaymentPageState extends State<PaymentPage> {
                   success: (data) {
                     context.pushReplacement(SuccessPaymentPage(
                       productQuantity: widget.order.orderItems
-                              ?.map(
+                              ?.where((item) => item.status == "pending")
+                              .map(
                                 (item) => ProductQuantity(
                                   product: Product(
                                     name: item.productName,

lib/presentation/refund/dialog/refund_success_dialog.dart

@@ -1,6 +1,8 @@
 import 'package:enaklo_pos/core/components/spaces.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/int_ext.dart';
+import 'package:enaklo_pos/presentation/home/pages/dashboard_page.dart';
 import 'package:flutter/material.dart';
 
 class RefundSuccessDialog extends StatelessWidget {
@@ -102,8 +104,7 @@ class RefundSuccessDialog extends StatelessWidget {
                 Expanded(
                   child: ElevatedButton(
                     onPressed: () {
-                      Navigator.pop(context);
-                      Navigator.pop(context);
+                      context.push(DashboardPage());
                     },
                     style: ElevatedButton.styleFrom(
                       backgroundColor: AppColors.primary,

lib/presentation/report/widgets/profit_loss_widget.dart

@@ -172,12 +172,17 @@ class ProfitLossWidget extends StatelessWidget {
         break;
     }
 
-    if (previous == 0) return '+0.0%';
+    // Handle division by zero and invalid values
+    if (previous == 0 || previous.isNaN || previous.isInfinite) return '+0.0%';
+    if (current.isNaN || current.isInfinite) return '+0.0%';
 
     final trendPercentage = ((current - previous) / previous) * 100;
-    final sign = trendPercentage >= 0 ? '+' : '';
 
-    return '$sign${trendPercentage.toStringAsFixed(1)}%';
+    // Check if trendPercentage is valid
+    if (trendPercentage.isNaN || trendPercentage.isInfinite) return '+0.0%';
+
+    final sign = trendPercentage >= 0 ? '+' : '';
+    return '$sign${trendPercentage.round()}%';
   }
 
   Widget _buildSummaryCards() {
@@ -201,8 +206,7 @@ class ProfitLossWidget extends StatelessWidget {
       {
         'title': 'Laba Kotor',
         'value': _formatCurrency(data.summary.grossProfit),
-        'subtitle':
-            '${data.summary.grossProfitMargin.toStringAsFixed(1)}% margin',
+        'subtitle': '${_safeRound(data.summary.grossProfitMargin)}% margin',
         'icon': Icons.trending_up,
         'color': AppColorProfitLoss.primary,
         'trend': _calculateTrend('grossProfit'),
@@ -210,8 +214,7 @@ class ProfitLossWidget extends StatelessWidget {
       {
         'title': 'Laba Bersih',
         'value': _formatCurrency(data.summary.netProfit),
-        'subtitle':
-            '${data.summary.netProfitMargin.toStringAsFixed(1)}% margin',
+        'subtitle': '${_safeRound(data.summary.netProfitMargin)}% margin',
         'icon': Icons.account_balance,
         'color': AppColorProfitLoss.info,
         'trend': _calculateTrend('netProfit'),
@@ -360,13 +363,17 @@ class ProfitLossWidget extends StatelessWidget {
                       showTitles: true,
                       reservedSize: 50,
                       getTitlesWidget: (value, meta) {
-                        return Text(
-                          '${(value / 1000).toInt()}K',
-                          style: TextStyle(
-                            color: Colors.grey[600],
-                            fontSize: 10,
-                          ),
-                        );
+                        final kValue = (value / 1000);
+                        if (kValue.isFinite) {
+                          return Text(
+                            '${kValue.toInt()}K',
+                            style: TextStyle(
+                              color: Colors.grey[600],
+                              fontSize: 10,
+                            ),
+                          );
+                        }
+                        return const SizedBox();
                       },
                     ),
                   ),
@@ -402,8 +409,9 @@ class ProfitLossWidget extends StatelessWidget {
                   // Garis Pendapatan
                   LineChartBarData(
                     spots: data.data.asMap().entries.map((entry) {
+                      final revenue = entry.value.revenue.toDouble();
                       return FlSpot(
-                          entry.key.toDouble(), entry.value.revenue.toDouble());
+                          entry.key.toDouble(), revenue.isFinite ? revenue : 0);
                     }).toList(),
                     isCurved: true,
                     color: AppColorProfitLoss.info,
@@ -412,8 +420,9 @@ class ProfitLossWidget extends StatelessWidget {
                   // Garis Biaya
                   LineChartBarData(
                     spots: data.data.asMap().entries.map((entry) {
+                      final cost = entry.value.cost.toDouble();
                       return FlSpot(
-                          entry.key.toDouble(), entry.value.cost.toDouble());
+                          entry.key.toDouble(), cost.isFinite ? cost : 0);
                     }).toList(),
                     isCurved: true,
                     color: AppColorProfitLoss.danger,
@@ -422,8 +431,9 @@ class ProfitLossWidget extends StatelessWidget {
                   // Garis Laba Bersih
                   LineChartBarData(
                     spots: data.data.asMap().entries.map((entry) {
+                      final netProfit = entry.value.netProfit.toDouble();
                       return FlSpot(entry.key.toDouble(),
-                          entry.value.netProfit.toDouble());
+                          netProfit.isFinite ? netProfit : 0);
                     }).toList(),
                     isCurved: true,
                     color: AppColorProfitLoss.success,
@@ -506,9 +516,10 @@ class ProfitLossWidget extends StatelessWidget {
   }
 
   Widget _buildProductItem(ProfitLossProduct product) {
-    final profitColor = product.grossProfitMargin >= 35
+    final profitMargin = _safeDouble(product.grossProfitMargin);
+    final profitColor = profitMargin >= 35
         ? AppColorProfitLoss.success
-        : product.grossProfitMargin >= 25
+        : profitMargin >= 25
             ? AppColorProfitLoss.warning
             : AppColorProfitLoss.danger;
 
@@ -572,7 +583,7 @@ class ProfitLossWidget extends StatelessWidget {
                       borderRadius: BorderRadius.circular(6),
                     ),
                     child: Text(
-                      '${product.grossProfitMargin.toStringAsFixed(1)}%',
+                      '${_safeRound(profitMargin)}%',
                       style: TextStyle(
                         fontSize: 12,
                         fontWeight: FontWeight.bold,
@@ -710,13 +721,17 @@ class ProfitLossWidget extends StatelessWidget {
                 startDegreeOffset: -90,
                 sections: breakdownData.asMap().entries.map((entry) {
                   final item = entry.value;
+                  final grossProfit = data.summary.grossProfit;
+                  final value = item['value'] as int;
+
+                  // Handle division by zero
                   final percentage =
-                      (item['value'] as int) / data.summary.grossProfit * 100;
+                      grossProfit > 0 ? (value / grossProfit * 100) : 0.0;
 
                   return PieChartSectionData(
                     color: item['color'] as Color,
-                    value: (item['value'] as int).toDouble(),
-                    title: '${percentage.toStringAsFixed(1)}%',
+                    value: value.toDouble(),
+                    title: '${_safeRound(percentage)}%',
                     radius: 40,
                     titleStyle: const TextStyle(
                       fontSize: 10,
@@ -799,7 +814,7 @@ class ProfitLossWidget extends StatelessWidget {
                 ),
                 const SizedBox(height: 8),
                 Text(
-                  '${(data.summary.profitabilityRatio * 100).toStringAsFixed(1)}%',
+                  '${_safeRound(data.summary.profitabilityRatio)}%',
                   style: const TextStyle(
                     fontSize: 24,
                     fontWeight: FontWeight.bold,
@@ -848,9 +863,7 @@ class ProfitLossWidget extends StatelessWidget {
               Expanded(
                 child: _buildMetricCard(
                   'Nilai Rata-rata Pesanan',
-                  _formatCurrency(
-                      (data.summary.totalRevenue / data.summary.totalOrders)
-                          .round()),
+                  _formatCurrency(_safeCalculateAverageOrder()),
                   'Per transaksi',
                   Icons.shopping_cart_outlined,
                   AppColorProfitLoss.info,
@@ -870,7 +883,7 @@ class ProfitLossWidget extends StatelessWidget {
               Expanded(
                 child: _buildMetricCard(
                   'Rasio Biaya',
-                  '${((data.summary.totalCost / data.summary.totalRevenue) * 100).toStringAsFixed(1)}%',
+                  '${_safeCalculateCostRatio()}%',
                   'Dari total pendapatan',
                   Icons.pie_chart,
                   AppColorProfitLoss.danger,
@@ -1026,7 +1039,7 @@ class ProfitLossWidget extends StatelessWidget {
                               borderRadius: BorderRadius.circular(4),
                             ),
                             child: Text(
-                              '${item.netProfitMargin.toStringAsFixed(1)}%',
+                              '${_safeRound(item.netProfitMargin)}%',
                               textAlign: TextAlign.center,
                               style: TextStyle(
                                 fontSize: 10,
@@ -1093,6 +1106,31 @@ class ProfitLossWidget extends StatelessWidget {
     );
   }
 
+  // Helper methods for safe calculations
+  int _safeRound(double value) {
+    if (value.isNaN || value.isInfinite) return 0;
+    return value.round();
+  }
+
+  double _safeDouble(double value) {
+    if (value.isNaN || value.isInfinite) return 0.0;
+    return value;
+  }
+
+  int _safeCalculateAverageOrder() {
+    if (data.summary.totalOrders == 0) return 0;
+    final average = data.summary.totalRevenue / data.summary.totalOrders;
+    if (average.isNaN || average.isInfinite) return 0;
+    return average.round();
+  }
+
+  int _safeCalculateCostRatio() {
+    if (data.summary.totalRevenue == 0) return 0;
+    final ratio = (data.summary.totalCost / data.summary.totalRevenue) * 100;
+    if (ratio.isNaN || ratio.isInfinite) return 0;
+    return ratio.round();
+  }
+
   IconData _getProductIcon(String category) {
     switch (category.toLowerCase()) {
       case 'coffee':
@@ -1110,8 +1148,9 @@ class ProfitLossWidget extends StatelessWidget {
   }
 
   Color _getMarginColor(double margin) {
-    if (margin >= 25) return AppColorProfitLoss.success;
-    if (margin >= 15) return AppColorProfitLoss.warning;
+    final safeMargin = _safeDouble(margin);
+    if (safeMargin >= 25) return AppColorProfitLoss.success;
+    if (safeMargin >= 15) return AppColorProfitLoss.warning;
     return AppColorProfitLoss.danger;
   }
 
@@ -1126,7 +1165,7 @@ class ProfitLossWidget extends StatelessWidget {
 
   String _formatCurrencyShort(int amount) {
     if (amount >= 1000000) {
-      return 'Rp ${(amount / 1000000).toStringAsFixed(1)}M';
+      return 'Rp ${(amount / 1000000).round()}M';
     } else if (amount >= 1000) {
       return 'Rp ${(amount / 1000).toStringAsFixed(0)}K';
     }

lib/presentation/sales/widgets/sales_card.dart

@@ -58,6 +58,24 @@ class SalesCard extends StatelessWidget {
                       ),
                     ),
                   ),
+                if (order.isVoid == true)
+                  Container(
+                    padding:
+                        const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                    decoration: BoxDecoration(
+                      color: Colors.red.withOpacity(0.15),
+                      borderRadius: BorderRadius.circular(16),
+                    ),
+                    child: Text(
+                      'Void',
+                      style: TextStyle(
+                        color: Colors.red,
+                        fontWeight: FontWeight.w600,
+                        fontSize: 10,
+                        letterSpacing: 0.5,
+                      ),
+                    ),
+                  ),
               ],
             ),
             const SizedBox(height: 12),

lib/presentation/success/pages/success_order_page.dart

@@ -538,7 +538,8 @@ class _SuccessOrderPageState extends State<SuccessOrderPage>
 
   Widget _buildProductCard(int index) {
     final item = widget.productQuantity[index];
-    final totalPrice = (item.product.price ?? 0) * item.quantity;
+    final totalPrice = (item.product.price ?? 0) * item.quantity +
+        (item.variant?.priceModifier ?? 0);
 
     return TweenAnimationBuilder<double>(
       tween: Tween<double>(begin: 0.0, end: 1.0),
@@ -634,7 +635,8 @@ class _SuccessOrderPageState extends State<SuccessOrderPage>
                             borderRadius: BorderRadius.circular(8),
                           ),
                           child: Text(
-                            (item.product.price ?? 0)
+                            ((item.product.price ?? 0) +
+                                    (item.variant?.priceModifier ?? 0))
                                 .toString()
                                 .currencyFormatRpV2,
                             style: TextStyle(

lib/presentation/success/pages/success_payment_page.dart

@@ -887,7 +887,7 @@ class _SuccessPaymentPageState extends State<SuccessPaymentPage> {
                 ],
               ),
               Text(
-                (order.totalAmount ?? 0).toString().currencyFormatRpV2,
+                widget.nominalBayar.currencyFormatRpV2,
                 style: const TextStyle(
                   fontSize: 14,
                   fontWeight: FontWeight.w600,
@@ -965,7 +965,7 @@ class _SuccessPaymentPageState extends State<SuccessPaymentPage> {
                     ],
                   ),
                   child: Text(
-                    (order.totalAmount ?? 0).toString().currencyFormatRpV2,
+                    widget.nominalBayar.currencyFormatRpV2,
                     style: const TextStyle(
                       fontSize: 18,
                       fontWeight: FontWeight.bold,

lib/presentation/success/pages/success_save_order_page.dart

@@ -24,12 +24,27 @@ class SuccessSaveOrderPage extends StatefulWidget {
 }
 
 class _SuccessSaveOrderPageState extends State<SuccessSaveOrderPage> {
+  int totalPrice = 0;
+
+  getPrice() {
+    setState(() {
+      totalPrice = widget.productQuantity.fold(
+        0,
+        (previousValue, element) =>
+            previousValue +
+            (element.product.price! * element.quantity) +
+            (element.variant?.priceModifier ?? 0),
+      );
+    });
+  }
+
   @override
   void initState() {
     super.initState();
     context
         .read<OrderLoaderBloc>()
         .add(OrderLoaderEvent.getById(widget.orderId));
+    getPrice();
   }
 
   @override
@@ -380,7 +395,8 @@ class _SuccessSaveOrderPageState extends State<SuccessSaveOrderPage> {
 
   Widget _buildProductCard(int index) {
     final item = widget.productQuantity[index];
-    final totalPrice = (item.product.price ?? 0) * item.quantity;
+    final totalPrice = (item.product.price ?? 0) * item.quantity +
+        (item.variant?.priceModifier ?? 0);
 
     return Container(
       padding: const EdgeInsets.all(16.0),
@@ -464,7 +480,10 @@ class _SuccessSaveOrderPageState extends State<SuccessSaveOrderPage> {
                     borderRadius: BorderRadius.circular(8),
                   ),
                   child: Text(
-                    (item.product.price ?? 0).toString().currencyFormatRpV2,
+                    ((item.product.price ?? 0) +
+                            (item.variant?.priceModifier ?? 0))
+                        .toString()
+                        .currencyFormatRpV2,
                     style: TextStyle(
                       fontSize: 14,
                       color: Colors.grey.shade700,
@@ -707,7 +726,7 @@ class _SuccessSaveOrderPageState extends State<SuccessSaveOrderPage> {
                   ),
                 ),
                 Text(
-                  (order.totalAmount ?? 0).toString().currencyFormatRpV2,
+                  totalPrice.toString().currencyFormatRpV2,
                   style: const TextStyle(
                     fontSize: 24,
                     fontWeight: FontWeight.bold,
@@ -876,7 +895,7 @@ class _SuccessSaveOrderPageState extends State<SuccessSaveOrderPage> {
                 ],
               ),
               Text(
-                (order.totalAmount ?? 0).toString().currencyFormatRpV2,
+                totalPrice.toString().currencyFormatRpV2,
                 style: const TextStyle(
                   fontSize: 14,
                   fontWeight: FontWeight.w600,
@@ -954,7 +973,7 @@ class _SuccessSaveOrderPageState extends State<SuccessSaveOrderPage> {
                     ],
                   ),
                   child: Text(
-                    (order.totalAmount ?? 0).toString().currencyFormatRpV2,
+                    totalPrice.toString().currencyFormatRpV2,
                     style: const TextStyle(
                       fontSize: 18,
                       fontWeight: FontWeight.bold,

pubspec.lock

@@ -5,23 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
       url: "https://pub.dev"
     source: hosted
-    version: "76.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.3"
+    version: "67.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "6.4.1"
   another_flushbar:
     dependency: "direct main"
     description:
@@ -106,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
@@ -130,26 +125,26 @@ packages:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e"
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.3"
+    version: "2.4.2"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.14"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
+      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "7.3.2"
   built_collection:
     dependency: transitive
     description:
@@ -314,10 +309,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
+      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.7"
+    version: "2.3.6"
   dartx:
     dependency: transitive
     description:
@@ -585,10 +580,10 @@ packages:
     dependency: "direct main"
     description:
       name: freezed
-      sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e"
+      sha256: a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.7"
+    version: "2.5.2"
   freezed_annotation:
     dependency: "direct main"
     description:
@@ -809,26 +804,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.9"
+    version: "11.0.2"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.9"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -845,14 +840,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3-main.0"
   matcher:
     dependency: transitive
     description:
@@ -873,10 +860,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   mime:
     dependency: transitive
     description:
@@ -1406,10 +1393,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.7"
   time:
     dependency: transitive
     description:
@@ -1470,10 +1457,10 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
@@ -1571,5 +1558,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.7.0-0 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"
   flutter: ">=3.27.4"