fix payment struck

Reviewed-on: #1

android/app/build.gradle

@@ -23,7 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
-    namespace "com.example.enaklo_pos"
+    namespace "com.appscale.pos"
     compileSdkVersion 35
     ndkVersion flutter.ndkVersion
 
@@ -42,10 +42,10 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.enaklo_pos"
+        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

android/app/src/main/kotlin/com/example/enaklo_pos/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.example.enaklo_pos
+package com.appscale.pos
 
 import io.flutter.embedding.android.FlutterActivity
 

assets/icons/people.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_17_4760)">
+<path d="M9 13.75C6.66 13.75 2 14.92 2 17.25V19H16V17.25C16 14.92 11.34 13.75 9 13.75ZM4.34 17C5.18 16.42 7.21 15.75 9 15.75C10.79 15.75 12.82 16.42 13.66 17H4.34ZM9 12C10.93 12 12.5 10.43 12.5 8.5C12.5 6.57 10.93 5 9 5C7.07 5 5.5 6.57 5.5 8.5C5.5 10.43 7.07 12 9 12ZM9 7C9.83 7 10.5 7.67 10.5 8.5C10.5 9.33 9.83 10 9 10C8.17 10 7.5 9.33 7.5 8.5C7.5 7.67 8.17 7 9 7ZM16.04 13.81C17.2 14.65 18 15.77 18 17.25V19H22V17.25C22 15.23 18.5 14.08 16.04 13.81ZM15 12C16.93 12 18.5 10.43 18.5 8.5C18.5 6.57 16.93 5 15 5C14.46 5 13.96 5.13 13.5 5.35C14.13 6.24 14.5 7.33 14.5 8.5C14.5 9.67 14.13 10.76 13.5 11.65C13.96 11.87 14.46 12 15 12Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_17_4760">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>

launcher_icon.yaml

@@ -3,15 +3,15 @@
 flutter_launcher_icons:
   android: "launcher_icon"
   ios: true
-  image_path: "assets/logo/ic_launcher.png"
+  image_path: "assets/logo/logo.png"
   remove_alpha_ios: true
   min_sdk_android: 21 # android min sdk min:16, default 21
   adaptive_icon_background: "#ffffff"
-  adaptive_icon_foreground: "assets/logo/ic_launcher.png"
+  adaptive_icon_foreground: "assets/logo/logo.png"
   web:
     generate: true
-    image_path: "assets/logo/ic_launcher.png"
+    image_path: "assets/logo/logo.png"
   windows:
     generate: true
-    image_path: "assets/logo/ic_launcher.png"
+    image_path: "assets/logo/logo.png"
     icon_size: 48

lib/core/assets/assets.gen.dart

@@ -101,6 +101,9 @@ class $AssetsIconsGen {
   /// File path: assets/icons/payments.svg
   SvgGenImage get payments => const SvgGenImage('assets/icons/payments.svg');
 
+  /// File path: assets/icons/people.svg
+  SvgGenImage get people => const SvgGenImage('assets/icons/people.svg');
+
   /// File path: assets/icons/print.svg
   SvgGenImage get print => const SvgGenImage('assets/icons/print.svg');
 
@@ -152,6 +155,7 @@ class $AssetsIconsGen {
         orders,
         pajak,
         payments,
+        people,
         print,
         qrCode,
         report,
@@ -186,6 +190,12 @@ class $AssetsImagesGen {
   /// File path: assets/images/drink7.png
   AssetGenImage get drink7 => const AssetGenImage('assets/images/drink7.png');
 
+  /// File path: assets/images/gojek.png
+  AssetGenImage get gojek => const AssetGenImage('assets/images/gojek.png');
+
+  /// File path: assets/images/grab.png
+  AssetGenImage get grab => const AssetGenImage('assets/images/grab.png');
+
   /// File path: assets/images/logo.png
   AssetGenImage get logo => const AssetGenImage('assets/images/logo.png');
 
@@ -265,6 +275,8 @@ class $AssetsImagesGen {
         drink5,
         drink6,
         drink7,
+        gojek,
+        grab,
         logo,
         managePrinter,
         manageProduct,
@@ -292,12 +304,8 @@ class $AssetsImagesGen {
 class $AssetsLogoGen {
   const $AssetsLogoGen();
 
-  /// File path: assets/logo/ic_launcher.png
-  AssetGenImage get icLauncher =>
-      const AssetGenImage('assets/logo/ic_launcher.png');
-
-  /// File path: assets/logo/logo.jpeg
-  AssetGenImage get logo => const AssetGenImage('assets/logo/logo.jpeg');
+  /// File path: assets/logo/logo.png
+  AssetGenImage get logo => const AssetGenImage('assets/logo/logo.png');
 
   /// File path: assets/logo/logo2.png
   AssetGenImage get logo2 => const AssetGenImage('assets/logo/logo2.png');
@@ -322,17 +330,8 @@ class $AssetsLogoGen {
   AssetGenImage get mylogo => const AssetGenImage('assets/logo/mylogo.png');
 
   /// List of all assets
-  List<AssetGenImage> get values => [
-        icLauncher,
-        logo,
-        logo2,
-        logo3,
-        logo4,
-        logo5,
-        logo6,
-        logoAppIcon,
-        mylogo
-      ];
+  List<AssetGenImage> get values =>
+      [logo, logo2, logo3, logo4, logo5, logo6, logoAppIcon, mylogo];
 }
 
 class Assets {

lib/core/function/app_function.dart

@@ -0,0 +1,183 @@
+import 'dart:developer';
+import 'dart:typed_data';
+
+import 'package:barcode_image/barcode_image.dart';
+import 'package:enaklo_pos/core/extensions/string_ext.dart';
+import 'package:enaklo_pos/core/utils/printer_service.dart';
+import 'package:enaklo_pos/data/dataoutputs/print_dataoutputs.dart';
+import 'package:enaklo_pos/data/datasources/auth_local_datasource.dart';
+import 'package:enaklo_pos/data/datasources/outlet_local_datasource.dart';
+import 'package:enaklo_pos/data/datasources/product_local_datasource.dart';
+import 'package:enaklo_pos/data/datasources/settings_local_datasource.dart';
+import 'package:enaklo_pos/data/models/response/order_response_model.dart';
+import 'package:enaklo_pos/data/type/bussines_type.dart';
+import 'package:enaklo_pos/presentation/home/models/product_quantity.dart';
+import 'package:flutter/material.dart';
+import 'package:barcode/barcode.dart';
+import 'package:image/image.dart' as img;
+
+Future<void> onPrint(
+  BuildContext context, {
+  required List<ProductQuantity> productQuantity,
+  required Order order,
+}) async {
+  final outlet = await OutletLocalDatasource().get();
+  if (outlet.businessType == BusinessType.restaurant) {
+    final checkerPrinter =
+        await ProductLocalDatasource.instance.getPrinterByCode('checker');
+    final kitchenPrinter =
+        await ProductLocalDatasource.instance.getPrinterByCode('kitchen');
+    final barPrinter =
+        await ProductLocalDatasource.instance.getPrinterByCode('bar');
+
+    final authData = await AuthLocalDataSource().getAuthData();
+
+    // Checker printer
+    if (checkerPrinter != null) {
+      try {
+        final printValue = await PrintDataoutputs.instance.printChecker(
+          productQuantity,
+          order.tableNumber ?? "",
+          order.orderNumber ?? "",
+          authData.user?.name ?? "",
+          checkerPrinter.paper.toIntegerFromText,
+          order.orderType ?? "",
+        );
+
+        await PrinterService()
+            // ignore: use_build_context_synchronously
+            .printWithPrinter(checkerPrinter, printValue, context);
+      } catch (e) {
+        log("Error printing checker: $e");
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Error printing checker: $e')),
+        );
+      }
+    }
+
+    // Kitchen printer
+    if (kitchenPrinter != null) {
+      try {
+        final printValue = await PrintDataoutputs.instance.printKitchen(
+          productQuantity,
+          order.tableNumber!,
+          order.orderNumber ?? "",
+          authData.user?.name ?? "",
+          kitchenPrinter.paper.toIntegerFromText,
+          order.orderType ?? "",
+        );
+
+        await PrinterService()
+            .printWithPrinter(kitchenPrinter, printValue, context);
+      } catch (e) {
+        log("Error printing kitchen order: $e");
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Error printing kitchen order: $e')),
+        );
+      }
+    }
+
+    // Bar printer
+    if (barPrinter != null) {
+      try {
+        final printValue = await PrintDataoutputs.instance.printBar(
+          productQuantity,
+          order.tableNumber ?? "",
+          order.orderNumber ?? "",
+          authData.user?.name ?? "",
+          barPrinter.paper.toIntegerFromText,
+          order.orderType ?? "",
+        );
+
+        await PrinterService()
+            .printWithPrinter(barPrinter, printValue, context);
+      } catch (e) {
+        log("Error printing bar order: $e");
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Error printing bar order: $e')),
+        );
+      }
+    }
+  }
+
+  if (outlet.businessType == BusinessType.ticketing) {
+    final ticketPrinter =
+        await ProductLocalDatasource.instance.getPrinterByCode('ticket');
+
+    final barcode = await generateBarcodeAsUint8List(order.orderNumber ?? "");
+
+    if (ticketPrinter != null) {
+      try {
+        final printValue = await PrintDataoutputs.instance.printTicket(
+          order.totalAmount ?? 0,
+          barcode,
+          ticketPrinter.paper.toIntegerFromText,
+        );
+
+        await PrinterService()
+            // ignore: use_build_context_synchronously
+            .printWithPrinter(ticketPrinter, printValue, context);
+      } catch (e) {
+        log("Error printing ticket: $e");
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Error printing ticket: $e')),
+        );
+      }
+    }
+  }
+}
+
+Future<void> onPrintRecipt(
+  context, {
+  required Order order,
+  required String paymentMethod,
+  required int nominalBayar,
+  required int kembalian,
+}) async {
+  final receiptPrinter =
+      await ProductLocalDatasource.instance.getPrinterByCode('receipt');
+  final authData = await AuthLocalDataSource().getAuthData();
+  final settings = await SettingsLocalDatasource().getTax();
+  final outlet = await OutletLocalDatasource().get();
+
+  if (receiptPrinter != null) {
+    try {
+      final printValue = await PrintDataoutputs.instance.printOrderV4(
+        order,
+        authData.user?.name ?? "",
+        paymentMethod,
+        nominalBayar,
+        kembalian,
+        settings.value,
+        receiptPrinter.paper.toIntegerFromText,
+        order.orderType ?? "",
+        outlet,
+      );
+      await PrinterService()
+          .printWithPrinter(receiptPrinter, printValue, context);
+    } catch (e) {
+      log("Error printing receipt order: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Error printing receipt order: $e')),
+      );
+    }
+  }
+}
+
+Future<Uint8List> generateBarcodeAsUint8List(String data) async {
+  // 1. Buat barcode instance (code128, qrCode, dll)
+  final barcode = Barcode.code128();
+
+  // 2. Siapkan canvas image dari package `image`
+  final image = img.Image(width: 600, height: 200);
+
+  // 3. Gambar barcode ke canvas menggunakan barcode_image
+  drawBarcode(
+    image,
+    barcode,
+    data,
+  );
+
+  // 4. Encode image ke Uint8List PNG
+  return Uint8List.fromList(img.encodePng(image));
+}

lib/core/network/dio_client.dart

@@ -1,6 +1,9 @@
-// lib/core/network/dio_client.dart
 import 'package:awesome_dio_interceptor/awesome_dio_interceptor.dart';
 import 'package:dio/dio.dart';
+import 'package:enaklo_pos/core/extensions/build_context_ext.dart';
+import 'package:enaklo_pos/presentation/auth/login_page.dart';
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 class DioClient {
   static final Dio _dio = Dio(BaseOptions(
@@ -10,6 +13,7 @@ class DioClient {
       'Accept': 'application/json',
     },
   ))
+    ..interceptors.add(AuthInterceptor())
     ..interceptors.add(
       AwesomeDioInterceptor(
         logRequestTimeout: true,
@@ -20,3 +24,158 @@ class DioClient {
 
   static Dio get instance => _dio;
 }
+
+class AuthInterceptor extends Interceptor {
+  static final GlobalKey<NavigatorState> navigatorKey =
+      GlobalKey<NavigatorState>();
+
+  @override
+  void onRequest(
+      RequestOptions options, RequestInterceptorHandler handler) async {
+    // Add token to request headers
+    final prefs = await SharedPreferences.getInstance();
+    final token = prefs.getString('auth_token');
+
+    if (token != null) {
+      options.headers['Authorization'] = 'Bearer $token';
+    }
+
+    handler.next(options);
+  }
+
+  @override
+  void onResponse(Response response, ResponseInterceptorHandler handler) {
+    handler.next(response);
+  }
+
+  @override
+  void onError(DioException err, ErrorInterceptorHandler handler) async {
+    // Check if error is 401 (Unauthorized) - token expired
+    if (err.response?.statusCode == 401) {
+      await _handleTokenExpired();
+    }
+
+    handler.next(err);
+  }
+
+  Future<void> _handleTokenExpired() async {
+    // Clear stored token
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.remove('auth_token');
+    await prefs.remove('refresh_token');
+    await prefs.clear(); // Optional: clear all user data
+
+    // Navigate to login page
+    final context = navigatorKey.currentContext;
+    if (context != null) {
+      // Option 1: Navigate and remove all previous routes
+      context.pushReplacement(LoginPage());
+
+      // Option 2: If using GoRouter, uncomment below:
+      // GoRouter.of(context).go('/login');
+
+      // Option 3: If using custom routing, uncomment below:
+      // Navigator.of(context).pushAndRemoveUntil(
+      //   MaterialPageRoute(builder: (context) => LoginPage()),
+      //   (route) => false,
+      // );
+    }
+  }
+}
+
+// Alternative: Dengan Refresh Token Logic
+class AuthInterceptorWithRefresh extends Interceptor {
+  static final GlobalKey<NavigatorState> navigatorKey =
+      GlobalKey<NavigatorState>();
+
+  @override
+  void onRequest(
+      RequestOptions options, RequestInterceptorHandler handler) async {
+    final prefs = await SharedPreferences.getInstance();
+    final token = prefs.getString('auth_token');
+
+    if (token != null) {
+      options.headers['Authorization'] = 'Bearer $token';
+    }
+
+    handler.next(options);
+  }
+
+  @override
+  void onError(DioException err, ErrorInterceptorHandler handler) async {
+    if (err.response?.statusCode == 401) {
+      // Try refresh token first
+      final success = await _tryRefreshToken();
+
+      if (success) {
+        // Retry the original request
+        final response = await _retryRequest(err.requestOptions);
+        handler.resolve(response);
+        return;
+      } else {
+        // Refresh failed, redirect to login
+        await _handleTokenExpired();
+      }
+    }
+
+    handler.next(err);
+  }
+
+  Future<bool> _tryRefreshToken() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final refreshToken = prefs.getString('refresh_token');
+
+      if (refreshToken == null) return false;
+
+      final response = await Dio().post(
+        'YOUR_REFRESH_TOKEN_ENDPOINT',
+        data: {'refresh_token': refreshToken},
+      );
+
+      if (response.statusCode == 200) {
+        final newToken = response.data['access_token'];
+        final newRefreshToken = response.data['refresh_token'];
+
+        await prefs.setString('auth_token', newToken);
+        await prefs.setString('refresh_token', newRefreshToken);
+
+        return true;
+      }
+    } catch (e) {
+      print('Refresh token failed: $e');
+    }
+
+    return false;
+  }
+
+  Future<Response> _retryRequest(RequestOptions options) async {
+    final prefs = await SharedPreferences.getInstance();
+    final token = prefs.getString('auth_token');
+
+    options.headers['Authorization'] = 'Bearer $token';
+
+    return await DioClient.instance.request(
+      options.path,
+      options: Options(
+        method: options.method,
+        headers: options.headers,
+      ),
+      data: options.data,
+      queryParameters: options.queryParameters,
+    );
+  }
+
+  Future<void> _handleTokenExpired() async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.clear();
+
+    final context = navigatorKey.currentContext;
+    if (context != null) {
+      Navigator.of(context).pushNamedAndRemoveUntil(
+        '/login',
+        (route) => false,
+      );
+    }
+  }
+}

lib/data/dataoutputs/print_dataoutputs.dart

@@ -1,5 +1,7 @@
 import 'dart:math';
 
+import 'package:enaklo_pos/data/models/response/order_response_model.dart';
+import 'package:enaklo_pos/presentation/home/models/outlet_model.dart';
 import 'package:esc_pos_utils_plus/esc_pos_utils_plus.dart';
 import 'package:flutter/services.dart';
 import 'package:enaklo_pos/core/extensions/int_ext.dart';
@@ -739,6 +741,267 @@ class PrintDataoutputs {
     return bytes;
   }
 
+  Future<List<int>> printOrderV4(
+    Order order,
+    String chashierName,
+    String paymentMethod,
+    int nominalBayar,
+    int kembalian,
+    int taxPercentage,
+    int paper,
+    String orderType,
+    Outlet outlet,
+  ) async {
+    List<int> bytes = [];
+
+    final profile = await CapabilityProfile.load();
+    final generator =
+        Generator(paper == 58 ? PaperSize.mm58 : PaperSize.mm80, profile);
+
+    bytes += generator.reset();
+
+    bytes += generator.text(outlet.name ?? "",
+        styles: const PosStyles(
+          bold: true,
+          align: PosAlign.center,
+          height: PosTextSize.size1,
+          width: PosTextSize.size1,
+        ));
+
+    bytes += generator.text(outlet.address ?? "",
+        styles: const PosStyles(bold: false, align: PosAlign.center));
+    bytes += generator.text(outlet.phoneNumber ?? "",
+        styles: const PosStyles(bold: false, align: PosAlign.center));
+
+    bytes += generator.text(
+        paper == 80
+            ? '------------------------------------------------'
+            : '--------------------------------',
+        styles: const PosStyles(bold: false, align: PosAlign.center));
+
+    bytes += generator.row([
+      PosColumn(
+        text: DateFormat('dd MMM yyyy').format(DateTime.now()),
+        width: 6,
+        styles: const PosStyles(align: PosAlign.left),
+      ),
+      PosColumn(
+        text: DateFormat('HH:mm').format(DateTime.now()),
+        width: 6,
+        styles: const PosStyles(align: PosAlign.right),
+      ),
+    ]);
+    bytes += generator.row([
+      PosColumn(
+        text: 'Receipt Number',
+        width: 6,
+        styles: const PosStyles(align: PosAlign.left),
+      ),
+      PosColumn(
+        text: 'JF-${DateFormat('yyyyMMddhhmm').format(DateTime.now())}',
+        width: 6,
+        styles: const PosStyles(align: PosAlign.right),
+      ),
+    ]);
+
+    bytes += generator.row([
+      PosColumn(
+        text: 'Order ID',
+        width: 6,
+        styles: const PosStyles(align: PosAlign.left),
+      ),
+      PosColumn(
+        text: Random().nextInt(100000).toString(),
+        width: 6,
+        styles: const PosStyles(align: PosAlign.right),
+      ),
+    ]);
+    bytes += generator.row([
+      PosColumn(
+        text: 'Bill Name',
+        width: 6,
+        styles: const PosStyles(align: PosAlign.left),
+      ),
+      PosColumn(
+        text: order.metadata?['customer_name'] ?? '',
+        width: 6,
+        styles: const PosStyles(align: PosAlign.right),
+      ),
+    ]);
+    bytes += generator.row([
+      PosColumn(
+        text: 'Collected By',
+        width: 6,
+        styles: const PosStyles(align: PosAlign.left),
+      ),
+      PosColumn(
+        text: chashierName,
+        width: 6,
+        styles: const PosStyles(align: PosAlign.right),
+      ),
+    ]);
+    bytes += generator.row([
+      PosColumn(
+        text: 'Pembayaran',
+        width: 8,
+        styles: const PosStyles(align: PosAlign.left),
+      ),
+      PosColumn(
+        text: paymentMethod,
+        width: 4,
+        styles: const PosStyles(align: PosAlign.right),
+      ),
+    ]);
+
+    bytes += generator.text(
+        paper == 80
+            ? '------------------------------------------------'
+            : '--------------------------------',
+        styles: const PosStyles(bold: false, align: PosAlign.center));
+    bytes += generator.text(orderType,
+        styles: const PosStyles(bold: true, align: PosAlign.center));
+    bytes += generator.text(
+        paper == 80
+            ? '------------------------------------------------'
+            : '--------------------------------',
+        styles: const PosStyles(bold: false, align: PosAlign.center));
+    for (final product
+        in (order.orderItems?.where((item) => item.status != 'cancelled') ??
+            <OrderItem>[])) {
+      bytes += generator.row([
+        PosColumn(
+          text: '${product.quantity} x ${product.productName}',
+          width: 8,
+          styles: const PosStyles(bold: true, align: PosAlign.left),
+        ),
+        PosColumn(
+          text: (product.totalPrice ?? 0).currencyFormatRpV2,
+          width: 4,
+          styles: const PosStyles(bold: true, align: PosAlign.right),
+        ),
+      ]);
+    }
+    bytes += generator.text(
+        paper == 80
+            ? '------------------------------------------------'
+            : '--------------------------------',
+        styles: const PosStyles(bold: false, align: PosAlign.center));
+
+    bytes += generator.row([
+      PosColumn(
+        text: 'Subtotal ${order.orderItems?.length ?? "0"} Product',
+        width: 6,
+        styles: const PosStyles(align: PosAlign.left),
+      ),
+      PosColumn(
+        text: (order.subtotal ?? 0).currencyFormatRpV2,
+        width: 6,
+        styles: const PosStyles(align: PosAlign.right),
+      ),
+    ]);
+
+    bytes += generator.row([
+      PosColumn(
+        text: 'Discount',
+        width: 6,
+        styles: const PosStyles(align: PosAlign.left),
+      ),
+      PosColumn(
+        text: (order.discountAmount ?? 0).currencyFormatRpV2,
+        width: 6,
+        styles: const PosStyles(align: PosAlign.right),
+      ),
+    ]);
+
+    // Only show tax if it's greater than 0
+    if ((order.taxAmount ?? 0) > 0) {
+      bytes += generator.row([
+        PosColumn(
+          text: 'Tax PB1 ($taxPercentage%)',
+          width: 6,
+          styles: const PosStyles(align: PosAlign.left),
+        ),
+        PosColumn(
+          text: (order.taxAmount ?? 0).currencyFormatRpV2,
+          width: 6,
+          styles: const PosStyles(align: PosAlign.right),
+        ),
+      ]);
+    }
+
+    // Only show service charge if it's greater than 0
+    // if (serviceCharge > 0) {
+    //   bytes += generator.row([
+    //     PosColumn(
+    //       text: 'Service Charge($serviceChargePercentage%)',
+    //       width: 6,
+    //       styles: const PosStyles(align: PosAlign.left),
+    //     ),
+    //     PosColumn(
+    //       text: serviceCharge.currencyFormatRpV2,
+    //       width: 6,
+    //       styles: const PosStyles(align: PosAlign.right),
+    //     ),
+    //   ]);
+    // }
+    bytes += generator.text(
+        paper == 80
+            ? '------------------------------------------------'
+            : '--------------------------------',
+        styles: const PosStyles(bold: false, align: PosAlign.center));
+    bytes += generator.row([
+      PosColumn(
+        text: 'Total',
+        width: 6,
+        styles: const PosStyles(bold: true, align: PosAlign.left),
+      ),
+      PosColumn(
+        text: '${order.totalAmount ?? ""}'.currencyFormatRpV2,
+        width: 6,
+        styles: const PosStyles(bold: true, align: PosAlign.right),
+      ),
+    ]);
+    bytes += generator.row([
+      PosColumn(
+        text: 'Dibayar',
+        width: 6,
+        styles: const PosStyles(align: PosAlign.left),
+      ),
+      PosColumn(
+        text: nominalBayar.currencyFormatRpV2,
+        width: 6,
+        styles: const PosStyles(align: PosAlign.right),
+      ),
+    ]);
+    bytes += generator.row([
+      PosColumn(
+        text: 'Kembali',
+        width: 6,
+        styles: const PosStyles(align: PosAlign.left),
+      ),
+      PosColumn(
+        text: kembalian.currencyFormatRpV2,
+        width: 6,
+        styles: const PosStyles(align: PosAlign.right),
+      ),
+    ]);
+    bytes += generator.text(
+        paper == 80
+            ? '------------------------------------------------'
+            : '--------------------------------',
+        styles: const PosStyles(bold: false, align: PosAlign.center));
+    // bytes += generator.text('Notes',
+    //     styles: const PosStyles(bold: false, align: PosAlign.center));
+    // bytes += generator.text('Pass Wifi: fic14jilid2',
+    //     styles: const PosStyles(bold: false, align: PosAlign.center));
+    // //terima kasih
+    // bytes += generator.text('Terima Kasih',
+    //     styles: const PosStyles(bold: true, align: PosAlign.center));
+    paper == 80 ? bytes += generator.feed(3) : bytes += generator.feed(1);
+    bytes += generator.cut();
+    return bytes;
+  }
+
   Future<List<int>> printQRIS(
       int totalPrice, Uint8List imageQris, int paper) async {
     List<int> bytes = [];
@@ -1140,4 +1403,39 @@ class PrintDataoutputs {
 
     return bytes;
   }
+
+  Future<List<int>> printTicket(
+      int totalPrice, Uint8List imageQris, int paper) async {
+    List<int> bytes = [];
+
+    final profile = await CapabilityProfile.load();
+    final generator =
+        Generator(paper == 58 ? PaperSize.mm58 : PaperSize.mm80, profile);
+
+    final img.Image? orginalImage = img.decodeImage(imageQris);
+    bytes += generator.reset();
+
+    // final Uint8List bytesData = data.buffer.asUint8List();
+    // final img.Image? orginalImage = img.decodeImage(bytesData);
+    // bytes += generator.reset();
+
+    bytes += generator.text('Scan Ticket',
+        styles: const PosStyles(bold: false, align: PosAlign.center));
+    bytes += generator.feed(2);
+    if (orginalImage != null) {
+      final img.Image grayscalledImage = img.grayscale(orginalImage);
+      final img.Image resizedImage =
+          img.copyResize(grayscalledImage, width: 240);
+      bytes += generator.imageRaster(resizedImage, align: PosAlign.center);
+      bytes += generator.feed(1);
+    }
+
+    bytes += generator.text('Price : ${totalPrice.currencyFormatRp}',
+        styles: const PosStyles(bold: false, align: PosAlign.center));
+
+    bytes += generator.feed(4);
+    bytes += generator.cut();
+
+    return bytes;
+  }
 }

lib/data/datasources/analytic_remote_datasource.dart

@@ -0,0 +1,187 @@
+import 'dart:developer';
+
+import 'package:dartz/dartz.dart';
+import 'package:dio/dio.dart';
+import 'package:enaklo_pos/core/constants/variables.dart';
+import 'package:enaklo_pos/core/network/dio_client.dart';
+import 'package:enaklo_pos/data/datasources/auth_local_datasource.dart';
+import 'package:enaklo_pos/data/models/response/dashboard_analytic_response_model.dart';
+import 'package:enaklo_pos/data/models/response/payment_method_analytic_response_model.dart';
+import 'package:enaklo_pos/data/models/response/product_analytic_response_model.dart';
+import 'package:enaklo_pos/data/models/response/profit_loss_response_model.dart';
+import 'package:enaklo_pos/data/models/response/sales_analytic_response_model.dart';
+import 'package:intl/intl.dart';
+
+class AnalyticRemoteDatasource {
+  final Dio dio = DioClient.instance;
+
+  Future<Either<String, PaymentMethodAnalyticResponseModel>> getPaymentMethod({
+    required DateTime dateFrom,
+    required DateTime dateTo,
+  }) async {
+    final authData = await AuthLocalDataSource().getAuthData();
+    final headers = {
+      'Authorization': 'Bearer ${authData.token}',
+      'Accept': 'application/json',
+    };
+
+    try {
+      final response = await dio.get(
+        '${Variables.baseUrl}/api/v1/analytics/payment-methods',
+        queryParameters: {
+          'date_from': DateFormat('dd-MM-yyyy').format(dateFrom),
+          'date_to': DateFormat('dd-MM-yyyy').format(dateTo),
+        },
+        options: Options(headers: headers),
+      );
+
+      if (response.statusCode == 200) {
+        return right(PaymentMethodAnalyticResponseModel.fromMap(response.data));
+      } else {
+        return left('Terjadi Kesalahan, Coba lagi nanti.');
+      }
+    } on DioException catch (e) {
+      log('Dio error: ${e.message}');
+      return left(e.response?.data.toString() ?? e.message ?? 'Unknown error');
+    } catch (e) {
+      log('Unexpected error: $e');
+      return left('Unexpected error occurred');
+    }
+  }
+
+  Future<Either<String, SalesAnalyticResponseModel>> getSales({
+    required DateTime dateFrom,
+    required DateTime dateTo,
+  }) async {
+    final authData = await AuthLocalDataSource().getAuthData();
+    final headers = {
+      'Authorization': 'Bearer ${authData.token}',
+      'Accept': 'application/json',
+    };
+
+    try {
+      final response = await dio.get(
+        '${Variables.baseUrl}/api/v1/analytics/sales',
+        queryParameters: {
+          'date_from': DateFormat('dd-MM-yyyy').format(dateFrom),
+          'date_to': DateFormat('dd-MM-yyyy').format(dateTo),
+        },
+        options: Options(headers: headers),
+      );
+
+      if (response.statusCode == 200) {
+        return right(SalesAnalyticResponseModel.fromMap(response.data));
+      } else {
+        return left('Terjadi Kesalahan, Coba lagi nanti.');
+      }
+    } on DioException catch (e) {
+      log('Dio error: ${e.message}');
+      return left(e.response?.data.toString() ?? e.message ?? 'Unknown error');
+    } catch (e) {
+      log('Unexpected error: $e');
+      return left('Unexpected error occurred');
+    }
+  }
+
+  Future<Either<String, ProductAnalyticResponseModel>> getProduct({
+    required DateTime dateFrom,
+    required DateTime dateTo,
+  }) async {
+    final authData = await AuthLocalDataSource().getAuthData();
+    final headers = {
+      'Authorization': 'Bearer ${authData.token}',
+      'Accept': 'application/json',
+    };
+
+    try {
+      final response = await dio.get(
+        '${Variables.baseUrl}/api/v1/analytics/products',
+        queryParameters: {
+          'date_from': DateFormat('dd-MM-yyyy').format(dateFrom),
+          'date_to': DateFormat('dd-MM-yyyy').format(dateTo),
+        },
+        options: Options(headers: headers),
+      );
+
+      if (response.statusCode == 200) {
+        return right(ProductAnalyticResponseModel.fromMap(response.data));
+      } else {
+        return left('Terjadi Kesalahan, Coba lagi nanti.');
+      }
+    } on DioException catch (e) {
+      log('Dio error: ${e.message}');
+      return left(e.response?.data.toString() ?? e.message ?? 'Unknown error');
+    } catch (e) {
+      log('Unexpected error: $e');
+      return left('Unexpected error occurred');
+    }
+  }
+
+  Future<Either<String, DashboardAnalyticResponseModel>> getDashboard({
+    required DateTime dateFrom,
+    required DateTime dateTo,
+  }) async {
+    final authData = await AuthLocalDataSource().getAuthData();
+    final headers = {
+      'Authorization': 'Bearer ${authData.token}',
+      'Accept': 'application/json',
+    };
+
+    try {
+      final response = await dio.get(
+        '${Variables.baseUrl}/api/v1/analytics/dashboard',
+        queryParameters: {
+          'date_from': DateFormat('dd-MM-yyyy').format(dateFrom),
+          'date_to': DateFormat('dd-MM-yyyy').format(dateTo),
+        },
+        options: Options(headers: headers),
+      );
+
+      if (response.statusCode == 200) {
+        return right(DashboardAnalyticResponseModel.fromMap(response.data));
+      } else {
+        return left('Terjadi Kesalahan, Coba lagi nanti.');
+      }
+    } on DioException catch (e) {
+      log('Dio error: ${e.message}');
+      return left(e.response?.data.toString() ?? e.message ?? 'Unknown error');
+    } catch (e) {
+      log('Unexpected error: $e');
+      return left('Unexpected error occurred');
+    }
+  }
+
+  Future<Either<String, ProfitLossResponseModel>> getProfitLoss({
+    required DateTime dateFrom,
+    required DateTime dateTo,
+  }) async {
+    final authData = await AuthLocalDataSource().getAuthData();
+    final headers = {
+      'Authorization': 'Bearer ${authData.token}',
+      'Accept': 'application/json',
+    };
+
+    try {
+      final response = await dio.get(
+        '${Variables.baseUrl}/api/v1/analytics/profit-loss',
+        queryParameters: {
+          'date_from': DateFormat('dd-MM-yyyy').format(dateFrom),
+          'date_to': DateFormat('dd-MM-yyyy').format(dateTo),
+        },
+        options: Options(headers: headers),
+      );
+
+      if (response.statusCode == 200) {
+        return right(ProfitLossResponseModel.fromMap(response.data));
+      } else {
+        return left('Terjadi Kesalahan, Coba lagi nanti.');
+      }
+    } on DioException catch (e) {
+      log('Dio error: ${e.message}');
+      return left(e.response?.data.toString() ?? e.message ?? 'Unknown error');
+    } catch (e) {
+      log('Unexpected error: $e');
+      return left('Unexpected error occurred');
+    }
+  }
+}

lib/data/datasources/delivery_local_datasource.dart

@@ -0,0 +1,15 @@
+import 'package:enaklo_pos/core/assets/assets.gen.dart';
+import 'package:enaklo_pos/data/models/response/delivery_response_model.dart';
+
+List<DeliveryModel> deliveries = [
+  DeliveryModel(
+    id: 'gojek',
+    name: 'Gojek',
+    imageUrl: Assets.images.gojek.path,
+  ),
+  DeliveryModel(
+    id: 'grab',
+    name: 'Grab',
+    imageUrl: Assets.images.grab.path,
+  ),
+];

lib/data/datasources/order_remote_datasource.dart

@@ -15,6 +15,7 @@ import 'package:enaklo_pos/data/models/response/summary_response_model.dart';
 import 'package:enaklo_pos/presentation/home/models/order_model.dart';
 import 'package:enaklo_pos/presentation/home/models/order_request.dart';
 import 'package:http/http.dart' as http;
+import 'package:intl/intl.dart';
 
 class OrderRemoteDatasource {
   final Dio dio = DioClient.instance;
@@ -195,7 +196,8 @@ class OrderRemoteDatasource {
 
   // New Api
   Future<Either<String, OrderDetailResponseModel>> createOrder(
-      OrderRequestModel orderModel) async {
+    OrderRequestModel orderModel,
+  ) async {
     final authData = await AuthLocalDataSource().getAuthData();
     final url = '${Variables.baseUrl}/api/v1/orders';
 
@@ -218,7 +220,8 @@ class OrderRemoteDatasource {
         return const Left('Gagal membuat pesanan');
       }
     } on DioException catch (e) {
-      final errorMessage = e.response?.data['message'] ?? 'Kesalahan jaringan';
+      final errorMessage =
+          e.response?.data['message'] ?? 'Terjadi kesalahan, coba lagi nanti.';
       log("💥 Dio error: ${e.message}");
       log("💥 Dio response: ${e.response?.data}");
       return Left(errorMessage);
@@ -252,7 +255,8 @@ class OrderRemoteDatasource {
         return const Left('Gagal membuat pembayaran');
       }
     } on DioException catch (e) {
-      final errorMessage = e.response?.data['message'] ?? 'Kesalahan jaringan';
+      final errorMessage =
+          e.response?.data['message'] ?? 'Terjadi kesalahan, coba lagi nanti.';
       log("💥 Dio error: ${e.message}");
       log("💥 Dio response: ${e.response?.data}");
       return Left(errorMessage);
@@ -262,20 +266,32 @@ class OrderRemoteDatasource {
     }
   }
 
-  Future<Either<String, OrderResponseModel>> getOrder(
-      {int page = 1,
-      int limit = Variables.defaultLimit,
-      String status = 'completed'}) async {
+  Future<Either<String, OrderResponseModel>> getOrder({
+    int page = 1,
+    int limit = Variables.defaultLimit,
+    String status = 'completed',
+    required DateTime dateFrom,
+    required DateTime dateTo,
+    String? search,
+  }) async {
     try {
       final authData = await AuthLocalDataSource().getAuthData();
+
+      Map<String, dynamic> params = {
+        'page': page,
+        'limit': limit,
+        'status': status,
+        'date_from': DateFormat('dd-MM-yyyy').format(dateFrom),
+        'date_to': DateFormat('dd-MM-yyyy').format(dateTo),
+      };
+
+      if (search != null && search.isNotEmpty) {
+        params['search'] = search;
+      }
+
       final response = await dio.get(
         '${Variables.baseUrl}/api/v1/orders',
-        queryParameters: {
-          'page': page,
-          'limit': limit,
-          'status': status,
-          'outlet_id': authData.user?.outletId,
-        },
+        queryParameters: params,
         options: Options(
           headers: {
             'Authorization': 'Bearer ${authData.token}',
@@ -378,7 +394,8 @@ class OrderRemoteDatasource {
         return const Left('Gagal membuat pesanan');
       }
     } on DioException catch (e) {
-      final errorMessage = e.response?.data['message'] ?? 'Kesalahan jaringan';
+      final errorMessage =
+          e.response?.data['message'] ?? 'Terjadi kesalahan, coba lagi nanti.';
       log("💥 Dio error: ${e.message}");
       log("💥 Dio response: ${e.response?.data}");
       return Left(errorMessage);
@@ -388,7 +405,7 @@ class OrderRemoteDatasource {
     }
   }
 
-  Future<Either<String, OrderDetailResponseModel>> addToOrder({
+  Future<Either<String, bool>> addToOrder({
     required String orderId,
     required List<OrderItemRequest> orderItems,
   }) async {
@@ -412,19 +429,19 @@ 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');
       }
     } on DioException catch (e) {
-      final errorMessage = e.response?.data['message'] ?? 'Kesalahan jaringan';
+      final errorMessage =
+          e.response?.data['message'] ?? 'Terjadi kesalahan, coba lagi nanti.';
       log("💥 Dio error: ${e.message}");
       log("💥 Dio response: ${e.response?.data}");
       return Left(errorMessage);
     } catch (e) {
       log("💥 Unexpected error: $e");
-      return const Left('Terjadi kesalahan tak terduga');
+      return const Left('Terjadi kesalahan, coba lagi nanti.');
     }
   }
 
@@ -470,7 +487,8 @@ class OrderRemoteDatasource {
         return const Left('Gagal refund');
       }
     } on DioException catch (e) {
-      final errorMessage = e.response?.data['message'] ?? 'Kesalahan jaringan';
+      final errorMessage =
+          e.response?.data['message'] ?? 'Terjadi kesalahan, coba lagi nanti.';
       log("💥 Dio error: ${e.message}");
       log("💥 Dio response: ${e.response?.data}");
       return Left(errorMessage);
@@ -518,7 +536,8 @@ class OrderRemoteDatasource {
         return const Left('Gagal refund');
       }
     } on DioException catch (e) {
-      final errorMessage = e.response?.data['message'] ?? 'Kesalahan jaringan';
+      final errorMessage =
+          e.response?.data['message'] ?? 'Terjadi kesalahan, coba lagi nanti.';
       log("💥 Dio error: ${e.message}");
       log("💥 Dio response: ${e.response?.data}");
       return Left(errorMessage);
@@ -529,12 +548,12 @@ class OrderRemoteDatasource {
   }
 
   Future<Either<String, bool>> refundPayment({
-    required String paymentId,
+    required String orderId,
     required String reason,
     required int refundAmount,
   }) async {
     final authData = await AuthLocalDataSource().getAuthData();
-    final url = '${Variables.baseUrl}/api/v1/payments/$paymentId/refund';
+    final url = '${Variables.baseUrl}/api/v1/orders/$orderId/refund';
 
     try {
       final response = await dio.post(
@@ -558,7 +577,42 @@ class OrderRemoteDatasource {
         return const Left('Gagal refund');
       }
     } on DioException catch (e) {
-      final errorMessage = e.response?.data['message'] ?? 'Kesalahan jaringan';
+      final errorMessage = 'Terjadi kesalahan coba lagi nanti';
+      log("💥 Dio error: ${e.message}");
+      log("💥 Dio response: ${e.response?.data}");
+      return Left(errorMessage);
+    } catch (e) {
+      log("💥 Unexpected error: $e");
+      return const Left('Terjadi kesalahan tak terduga');
+    }
+  }
+
+  Future<Either<String, PaymentSuccessResponseModel>> createPaymentSplitBill(
+      PaymentSplitBillRequest request) async {
+    final authData = await AuthLocalDataSource().getAuthData();
+    final url = '${Variables.baseUrl}/api/v1/orders/split-bill';
+
+    try {
+      final response = await dio.post(
+        url,
+        data: request.toMap(),
+        options: Options(
+          headers: {
+            'Authorization': 'Bearer ${authData.token}',
+            'Accept': 'application/json',
+            'Content-Type': 'application/json',
+          },
+        ),
+      );
+
+      if (response.statusCode == 200) {
+        return Right(PaymentSuccessResponseModel.fromMap(response.data));
+      } else {
+        return const Left('Gagal membuat pembayaran');
+      }
+    } on DioException catch (e) {
+      final errorMessage =
+          e.response?.data['message'] ?? 'Terjadi kesalahan, coba lagi nanti.';
       log("💥 Dio error: ${e.message}");
       log("💥 Dio response: ${e.response?.data}");
       return Left(errorMessage);

lib/data/datasources/outlet_local_datasource.dart

@@ -0,0 +1,30 @@
+import 'dart:developer';
+
+import 'package:enaklo_pos/presentation/home/models/outlet_model.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class OutletLocalDatasource {
+  Future<void> save(Outlet outlet) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString('outlet', outlet.toJson());
+      log('Outlet Local Data: ${outlet.toJson()}');
+    } catch (e) {
+      log('Error saving outlet: $e');
+    }
+  }
+
+  Future<void> remove() async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.remove('outlet');
+  }
+
+  Future<Outlet> get() async {
+    final prefs = await SharedPreferences.getInstance();
+    final outlet = prefs.getString('outlet');
+
+    log('Outlet Local Data: $outlet');
+
+    return Outlet.fromJson(outlet!);
+  }
+}

lib/data/datasources/outlet_remote_data_source.dart

@@ -2,7 +2,10 @@ import 'dart:developer';
 import 'package:dartz/dartz.dart';
 import 'package:dio/dio.dart';
 import 'package:enaklo_pos/core/network/dio_client.dart';
+import 'package:enaklo_pos/data/datasources/outlet_local_datasource.dart';
+import 'package:enaklo_pos/data/datasources/settings_local_datasource.dart';
 import 'package:enaklo_pos/presentation/home/models/outlet_model.dart';
+import 'package:enaklo_pos/presentation/setting/models/tax_model.dart';
 import '../../core/constants/variables.dart';
 import 'auth_local_datasource.dart';
 
@@ -12,6 +15,7 @@ class OutletRemoteDataSource {
   Future<Either<String, OutletResponse>> getOutlets() async {
     try {
       final authData = await AuthLocalDataSource().getAuthData();
+
       final url = '${Variables.baseUrl}/api/v1/outlets/list';
 
       final response = await dio.get(
@@ -28,7 +32,8 @@ class OutletRemoteDataSource {
       );
 
       if (response.statusCode == 200) {
-        return Right(OutletResponse.fromMap(response.data));
+        final data = OutletResponse.fromMap(response.data);
+        return Right(data);
       } else {
         return const Left('Failed to get outlets');
       }
@@ -66,7 +71,17 @@ class OutletRemoteDataSource {
       );
 
       if (response.statusCode == 200) {
-        return Right(OutletDetailResponse.fromMap(response.data));
+        final data = OutletDetailResponse.fromMap(response.data);
+        await SettingsLocalDatasource().saveTax(
+          TaxModel(
+            name: 'PB1',
+            type: TaxType.pajak,
+            value: data.data?.taxRate ?? 0,
+          ),
+        );
+
+        await OutletLocalDatasource().save(data.data!);
+        return Right(data);
       } else {
         return const Left('Failed to get outlets');
       }

lib/data/datasources/product_remote_datasource.dart

@@ -17,6 +17,7 @@ class ProductRemoteDatasource {
     int page = 1,
     int limit = Variables.defaultLimit,
     String? categoryId,
+    String? search,
   }) async {
     try {
       final authData = await AuthLocalDataSource().getAuthData();
@@ -31,6 +32,10 @@ class ProductRemoteDatasource {
         queryParameters['category_id'] = categoryId;
       }
 
+      if (search != null && search.isNotEmpty) {
+        queryParameters['search'] = search;
+      }
+
       final response = await dio.get(
         url,
         queryParameters: queryParameters,

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 {
@@ -131,4 +131,40 @@ class TableRemoteDataSource {
       return const Left('Unexpected error occurred');
     }
   }
+
+  Future<Either<String, bool>> transferTable({
+    required String fromTableId,
+    required String toTableId,
+  }) async {
+    try {
+      final authData = await AuthLocalDataSource().getAuthData();
+      final url = '${Variables.baseUrl}/api/v1/tables/transfer';
+
+      final response = await dio.put(
+        url,
+        data: {
+          "from_table": fromTableId,
+          "to_table": toTableId,
+        },
+        options: Options(
+          headers: {
+            'Authorization': 'Bearer ${authData.token}',
+            'Accept': 'application/json',
+          },
+        ),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return Right(true);
+      } else {
+        return const Left('Failed to create table');
+      }
+    } on DioException catch (e) {
+      log("Dio error: ${e.message}");
+      return Left(e.response?.data['message'] ?? 'Gagal membuat table');
+    } catch (e) {
+      log("Unexpected error: $e");
+      return const Left('Unexpected error occurred');
+    }
+  }
 }

lib/data/models/request/payment_request.dart

@@ -78,3 +78,60 @@ class PaymentOrderItemModel {
         "amount": amount,
       };
 }
+
+class PaymentSplitBillRequest {
+  final String orderId;
+  final String paymentMethodId;
+  final String customerId;
+  final String type; // e.g., "AMOUNT" or "ITEM"
+  final int amount;
+  final List<SplitItem> items;
+
+  PaymentSplitBillRequest({
+    required this.orderId,
+    required this.paymentMethodId,
+    required this.customerId,
+    required this.type,
+    required this.amount,
+    required this.items,
+  });
+
+  Map<String, dynamic> toMap() {
+    Map<String, dynamic> data = {
+      'order_id': orderId,
+      'payment_method_id': paymentMethodId,
+      'type': type,
+    };
+
+    if (customerId.isNotEmpty) {
+      data['customer_id'] = customerId;
+    }
+
+    if (type == "AMOUNT") {
+      data['amount'] = amount;
+    }
+
+    if (type == "ITEM") {
+      data['items'] = items.map((e) => e.toJson()).toList();
+    }
+
+    return data;
+  }
+}
+
+class SplitItem {
+  final String orderItemId;
+  final int quantity;
+
+  SplitItem({
+    required this.orderItemId,
+    required this.quantity,
+  });
+
+  Map<String, dynamic> toJson() {
+    return {
+      'order_item_id': orderItemId,
+      'quantity': quantity,
+    };
+  }
+}

lib/data/models/response/dashboard_analytic_response_model.dart

@@ -0,0 +1,248 @@
+class DashboardAnalyticResponseModel {
+  final bool success;
+  final DashboardAnalyticData data;
+  final dynamic errors;
+
+  DashboardAnalyticResponseModel({
+    required this.success,
+    required this.data,
+    this.errors,
+  });
+
+  /// Khusus untuk JSON string
+  factory DashboardAnalyticResponseModel.fromJson(Map<String, dynamic> json) =>
+      DashboardAnalyticResponseModel.fromMap(json);
+
+  /// Untuk menerima Map biasa (bukan dari JSON string)
+  factory DashboardAnalyticResponseModel.fromMap(Map<String, dynamic> map) {
+    return DashboardAnalyticResponseModel(
+      success: map['success'] ?? false,
+      data: DashboardAnalyticData.fromMap(map['data'] ?? {}),
+      errors: map['errors'],
+    );
+  }
+
+  Map<String, dynamic> toJson() => toMap();
+
+  Map<String, dynamic> toMap() => {
+        'success': success,
+        'data': data.toMap(),
+        'errors': errors,
+      };
+}
+
+class DashboardAnalyticData {
+  final String organizationId;
+  final String outletId;
+  final String dateFrom;
+  final String dateTo;
+  final DashboardOverview overview;
+  final List<TopProduct> topProducts;
+  final List<PaymentMethodAnalytic> paymentMethods;
+  final List<RecentSale> recentSales;
+
+  DashboardAnalyticData({
+    required this.organizationId,
+    required this.outletId,
+    required this.dateFrom,
+    required this.dateTo,
+    required this.overview,
+    required this.topProducts,
+    required this.paymentMethods,
+    required this.recentSales,
+  });
+
+  factory DashboardAnalyticData.fromMap(Map<String, dynamic> map) =>
+      DashboardAnalyticData(
+        organizationId: map['organization_id'],
+        outletId: map['outlet_id'],
+        dateFrom: map['date_from'],
+        dateTo: map['date_to'],
+        overview: DashboardOverview.fromMap(map['overview']),
+        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() => {
+        'organization_id': organizationId,
+        'outlet_id': outletId,
+        'date_from': dateFrom,
+        'date_to': dateTo,
+        'overview': overview.toMap(),
+        'top_products': topProducts.map((x) => x.toMap()).toList(),
+        'payment_methods': paymentMethods.map((x) => x.toMap()).toList(),
+        'recent_sales': recentSales.map((x) => x.toMap()).toList(),
+      };
+}
+
+class DashboardOverview {
+  final int totalSales;
+  final int totalOrders;
+  final double averageOrderValue;
+  final int totalCustomers;
+  final int voidedOrders;
+  final int refundedOrders;
+
+  DashboardOverview({
+    required this.totalSales,
+    required this.totalOrders,
+    required this.averageOrderValue,
+    required this.totalCustomers,
+    required this.voidedOrders,
+    required this.refundedOrders,
+  });
+
+  factory DashboardOverview.fromMap(Map<String, dynamic> map) =>
+      DashboardOverview(
+        totalSales: map['total_sales'],
+        totalOrders: map['total_orders'],
+        averageOrderValue: map['average_order_value']?.toDouble() ?? 0.0,
+        totalCustomers: map['total_customers'],
+        voidedOrders: map['voided_orders'],
+        refundedOrders: map['refunded_orders'],
+      );
+
+  Map<String, dynamic> toMap() => {
+        'total_sales': totalSales,
+        'total_orders': totalOrders,
+        'average_order_value': averageOrderValue,
+        'total_customers': totalCustomers,
+        'voided_orders': voidedOrders,
+        'refunded_orders': refundedOrders,
+      };
+}
+
+class TopProduct {
+  final String productId;
+  final String productName;
+  final String categoryId;
+  final String categoryName;
+  final int quantitySold;
+  final int revenue;
+  final double averagePrice;
+  final int orderCount;
+
+  TopProduct({
+    required this.productId,
+    required this.productName,
+    required this.categoryId,
+    required this.categoryName,
+    required this.quantitySold,
+    required this.revenue,
+    required this.averagePrice,
+    required this.orderCount,
+  });
+
+  factory TopProduct.fromMap(Map<String, dynamic> map) => TopProduct(
+        productId: map['product_id'],
+        productName: map['product_name'],
+        categoryId: map['category_id'],
+        categoryName: map['category_name'],
+        quantitySold: map['quantity_sold'],
+        revenue: map['revenue'],
+        averagePrice: map['average_price']?.toDouble() ?? 0.0,
+        orderCount: map['order_count'],
+      );
+
+  Map<String, dynamic> toMap() => {
+        'product_id': productId,
+        'product_name': productName,
+        'category_id': categoryId,
+        'category_name': categoryName,
+        'quantity_sold': quantitySold,
+        'revenue': revenue,
+        'average_price': averagePrice,
+        'order_count': orderCount,
+      };
+}
+
+class PaymentMethodAnalytic {
+  final String paymentMethodId;
+  final String paymentMethodName;
+  final String paymentMethodType;
+  final int totalAmount;
+  final int orderCount;
+  final int paymentCount;
+  final double percentage;
+
+  PaymentMethodAnalytic({
+    required this.paymentMethodId,
+    required this.paymentMethodName,
+    required this.paymentMethodType,
+    required this.totalAmount,
+    required this.orderCount,
+    required this.paymentCount,
+    required this.percentage,
+  });
+
+  factory PaymentMethodAnalytic.fromMap(Map<String, dynamic> map) =>
+      PaymentMethodAnalytic(
+        paymentMethodId: map['payment_method_id'],
+        paymentMethodName: map['payment_method_name'],
+        paymentMethodType: map['payment_method_type'],
+        totalAmount: map['total_amount'],
+        orderCount: map['order_count'],
+        paymentCount: map['payment_count'],
+        percentage: map['percentage']?.toDouble() ?? 0.0,
+      );
+
+  Map<String, dynamic> toMap() => {
+        'payment_method_id': paymentMethodId,
+        'payment_method_name': paymentMethodName,
+        'payment_method_type': paymentMethodType,
+        'total_amount': totalAmount,
+        'order_count': orderCount,
+        'payment_count': paymentCount,
+        'percentage': percentage,
+      };
+}
+
+class RecentSale {
+  final String date;
+  final int sales;
+  final int orders;
+  final int items;
+  final int tax;
+  final int discount;
+  final int netSales;
+
+  RecentSale({
+    required this.date,
+    required this.sales,
+    required this.orders,
+    required this.items,
+    required this.tax,
+    required this.discount,
+    required this.netSales,
+  });
+
+  factory RecentSale.fromMap(Map<String, dynamic> map) => RecentSale(
+        date: map['date'],
+        sales: map['sales'],
+        orders: map['orders'],
+        items: map['items'],
+        tax: map['tax'],
+        discount: map['discount'],
+        netSales: map['net_sales'],
+      );
+
+  Map<String, dynamic> toMap() => {
+        'date': date,
+        'sales': sales,
+        'orders': orders,
+        'items': items,
+        'tax': tax,
+        'discount': discount,
+        'net_sales': netSales,
+      };
+}

lib/data/models/response/delivery_response_model.dart

@@ -0,0 +1,11 @@
+class DeliveryModel {
+  String id;
+  String name;
+  String imageUrl;
+
+  DeliveryModel({
+    required this.id,
+    required this.name,
+    required this.imageUrl,
+  });
+}

lib/data/models/response/order_response_model.dart

@@ -1,35 +1,5 @@
 import 'dart:convert';
 
-class OrderResponseModel {
-  final bool? success;
-  final OrderData? data;
-  final dynamic errors;
-
-  OrderResponseModel({
-    this.success,
-    this.data,
-    this.errors,
-  });
-
-  factory OrderResponseModel.fromJson(String str) =>
-      OrderResponseModel.fromMap(json.decode(str));
-
-  String toJson() => json.encode(toMap());
-
-  factory OrderResponseModel.fromMap(Map<String, dynamic> json) =>
-      OrderResponseModel(
-        success: json["success"],
-        data: json["data"] == null ? null : OrderData.fromMap(json["data"]),
-        errors: json["errors"],
-      );
-
-  Map<String, dynamic> toMap() => {
-        "success": success,
-        "data": data?.toMap(),
-        "errors": errors,
-      };
-}
-
 class OrderDetailResponseModel {
   final bool? success;
   final Order? data;
@@ -60,40 +30,77 @@ class OrderDetailResponseModel {
       };
 }
 
+class OrderResponseModel {
+  final bool? success;
+  final OrderData? data;
+
+  OrderResponseModel({
+    this.success,
+    this.data,
+  });
+
+  factory OrderResponseModel.fromJson(String str) =>
+      OrderResponseModel.fromMap(json.decode(str));
+
+  String toJson() => json.encode(toMap());
+
+  factory OrderResponseModel.fromMap(Map<String, dynamic> map) {
+    return OrderResponseModel(
+      success: map['success'] ?? false,
+      data: OrderData.fromMap(map['data']),
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'success': success,
+      'data': data?.toMap(),
+    };
+  }
+}
+
 class OrderData {
   final List<Order>? orders;
+  final List<Payment>? payments;
   final int? totalCount;
   final int? page;
   final int? limit;
   final int? totalPages;
 
   OrderData({
-    this.orders,
-    this.totalCount,
-    this.page,
-    this.limit,
-    this.totalPages,
+    required this.orders,
+    required this.payments,
+    required this.totalCount,
+    required this.page,
+    required this.limit,
+    required this.totalPages,
   });
 
-  factory OrderData.fromMap(Map<String, dynamic> json) => OrderData(
-        orders: json["orders"] == null
-            ? []
-            : List<Order>.from(json["orders"].map((x) => Order.fromMap(x))),
-        totalCount: json["total_count"],
-        page: json["page"],
-        limit: json["limit"],
-        totalPages: json["total_pages"],
-      );
+  factory OrderData.fromMap(Map<String, dynamic> map) {
+    return OrderData(
+      orders: map["orders"] == null
+          ? []
+          : List<Order>.from(map['orders']?.map((x) => Order.fromMap(x))),
+      payments: map["payments"] == null
+          ? []
+          : List<Payment>.from(map['payments']?.map((x) => Payment.fromMap(x))),
+      totalCount: map['total_count'],
+      page: map['page'],
+      limit: map['limit'],
+      totalPages: map['total_pages'],
+    );
+  }
 
-  Map<String, dynamic> toMap() => {
-        "orders": orders == null
-            ? []
-            : List<dynamic>.from(orders!.map((x) => x.toMap())),
-        "total_count": totalCount,
-        "page": page,
-        "limit": limit,
-        "total_pages": totalPages,
-      };
+  Map<String, dynamic> toMap() {
+    return {
+      'orders': orders?.map((x) => x.toMap()).toList(),
+      'payments': payments?.map((x) => x.toMap()).toList(),
+      'total_count': totalCount,
+      'page': page,
+      'limit': limit,
+      'total_pages': totalPages,
+    };
+  }
 }
 
 class Order {
@@ -108,11 +115,21 @@ class Order {
   final int? taxAmount;
   final int? discountAmount;
   final int? totalAmount;
+  final int? totalCost;
+  final int? remainingAmount;
+  final String? paymentStatus;
+  final int? refundAmount;
+  final bool? isVoid;
+  final bool? isRefund;
   final String? notes;
   final Map<String, dynamic>? metadata;
   final DateTime? createdAt;
   final DateTime? updatedAt;
   final List<OrderItem>? orderItems;
+  final List<Payment>? payments;
+  final int? totalPaid;
+  final int? paymentCount;
+  final String? splitType;
 
   Order({
     this.id,
@@ -126,76 +143,108 @@ class Order {
     this.taxAmount,
     this.discountAmount,
     this.totalAmount,
+    this.totalCost,
+    this.remainingAmount,
+    this.paymentStatus,
+    this.refundAmount,
+    this.isVoid,
+    this.isRefund,
     this.notes,
     this.metadata,
     this.createdAt,
     this.updatedAt,
     this.orderItems,
+    this.payments,
+    this.totalPaid,
+    this.paymentCount,
+    this.splitType,
   });
 
-  factory Order.fromMap(Map<String, dynamic> json) => Order(
-        id: json["id"],
-        orderNumber: json["order_number"],
-        outletId: json["outlet_id"],
-        userId: json["user_id"],
-        tableNumber: json["table_number"],
-        orderType: json["order_type"],
-        status: json["status"],
-        subtotal: json["subtotal"],
-        taxAmount: json["tax_amount"],
-        discountAmount: json["discount_amount"],
-        totalAmount: json["total_amount"],
-        notes: json["notes"],
-        metadata: json["metadata"] ?? {},
-        createdAt: json["created_at"] == null
-            ? null
-            : DateTime.parse(json["created_at"]),
-        updatedAt: json["updated_at"] == null
-            ? null
-            : DateTime.parse(json["updated_at"]),
-        orderItems: json["order_items"] == null
-            ? []
-            : List<OrderItem>.from(
-                json["order_items"].map((x) => OrderItem.fromMap(x))),
-      );
+  factory Order.fromMap(Map<String, dynamic> map) {
+    return Order(
+      id: map['id'],
+      orderNumber: map['order_number'],
+      outletId: map['outlet_id'],
+      userId: map['user_id'],
+      tableNumber: map['table_number'],
+      orderType: map['order_type'],
+      status: map['status'],
+      subtotal: map['subtotal'],
+      taxAmount: map['tax_amount'],
+      discountAmount: map['discount_amount'],
+      totalAmount: map['total_amount'],
+      totalCost: map['total_cost'],
+      remainingAmount: map['remaining_amount'],
+      paymentStatus: map['payment_status'],
+      refundAmount: map['refund_amount'],
+      isVoid: map['is_void'],
+      isRefund: map['is_refund'],
+      notes: map['notes'],
+      metadata: map['metadata'] ?? {},
+      createdAt: DateTime.parse(map['created_at']),
+      updatedAt: DateTime.parse(map['updated_at']),
+      orderItems: map["order_items"] == null
+          ? []
+          : List<OrderItem>.from(
+              map['order_items'].map((x) => OrderItem.fromMap(x))),
+      payments: map["payments"] == null
+          ? []
+          : List<Payment>.from(map['payments'].map((x) => Payment.fromMap(x))),
+      totalPaid: map['total_paid'],
+      paymentCount: map['payment_count'],
+      splitType: map['split_type'] ?? "",
+    );
+  }
 
-  Map<String, dynamic> toMap() => {
-        "id": id,
-        "order_number": orderNumber,
-        "outlet_id": outletId,
-        "user_id": userId,
-        "table_number": tableNumber,
-        "order_type": orderType,
-        "status": status,
-        "subtotal": subtotal,
-        "tax_amount": taxAmount,
-        "discount_amount": discountAmount,
-        "total_amount": totalAmount,
-        "notes": notes,
-        "metadata": metadata,
-        "created_at": createdAt?.toIso8601String(),
-        "updated_at": updatedAt?.toIso8601String(),
-        "order_items": orderItems == null
-            ? []
-            : List<dynamic>.from(orderItems!.map((x) => x.toMap())),
-      };
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'order_number': orderNumber,
+      'outlet_id': outletId,
+      'user_id': userId,
+      'table_number': tableNumber,
+      'order_type': orderType,
+      'status': status,
+      'subtotal': subtotal,
+      'tax_amount': taxAmount,
+      'discount_amount': discountAmount,
+      'total_amount': totalAmount,
+      'total_cost': totalCost,
+      'remaining_amount': remainingAmount,
+      'payment_status': paymentStatus,
+      'refund_amount': refundAmount,
+      'is_void': isVoid,
+      'is_refund': isRefund,
+      'notes': notes,
+      'metadata': metadata,
+      'created_at': createdAt?.toIso8601String(),
+      'updated_at': updatedAt?.toIso8601String(),
+      'order_items': orderItems?.map((x) => x.toMap()).toList(),
+      'payments': payments?.map((x) => x.toMap()).toList(),
+      'total_paid': totalPaid,
+      'payment_count': paymentCount,
+      'split_type': splitType,
+    };
+  }
 }
 
 class OrderItem {
-  final String? id;
-  final String? orderId;
-  final String? productId;
-  final String? productName;
-  final String? productVariantId;
-  final String? productVariantName;
-  final int? quantity;
-  final int? unitPrice;
-  final int? totalPrice;
-  final List<dynamic>? modifiers;
-  final String? notes;
-  final String? status;
-  final DateTime? createdAt;
-  final DateTime? updatedAt;
+  String? id;
+  String? orderId;
+  String? productId;
+  String? productName;
+  String? productVariantId;
+  String? productVariantName;
+  int? quantity;
+  int? unitPrice;
+  int? totalPrice;
+  List<dynamic>? modifiers;
+  String? notes;
+  String? status;
+  DateTime? createdAt;
+  DateTime? updatedAt;
+  String? printerType;
+  int? paidQuantity;
 
   OrderItem({
     this.id,
@@ -212,43 +261,122 @@ class OrderItem {
     this.status,
     this.createdAt,
     this.updatedAt,
+    this.printerType,
+    this.paidQuantity,
   });
 
-  factory OrderItem.fromMap(Map<String, dynamic> json) => OrderItem(
-        id: json["id"],
-        orderId: json["order_id"],
-        productId: json["product_id"],
-        productName: json["product_name"],
-        productVariantId: json["product_variant_id"],
-        productVariantName: json["product_variant_name"],
-        quantity: json["quantity"],
-        unitPrice: json["unit_price"],
-        totalPrice: json["total_price"],
-        modifiers: json["modifiers"] ?? [],
-        notes: json["notes"],
-        status: json["status"],
-        createdAt: json["created_at"] == null
-            ? null
-            : DateTime.parse(json["created_at"]),
-        updatedAt: json["updated_at"] == null
-            ? null
-            : DateTime.parse(json["updated_at"]),
-      );
+  factory OrderItem.fromMap(Map<String, dynamic> map) {
+    return OrderItem(
+      id: map['id'],
+      orderId: map['order_id'],
+      productId: map['product_id'],
+      productName: map['product_name'],
+      productVariantId: map['product_variant_id'],
+      productVariantName: map['product_variant_name'],
+      quantity: map['quantity'],
+      unitPrice: map['unit_price'],
+      totalPrice: map['total_price'],
+      modifiers:
+          map['modifiers'] == null ? [] : List<dynamic>.from(map['modifiers']),
+      notes: map['notes'],
+      status: map['status'],
+      createdAt: DateTime.parse(map['created_at']),
+      updatedAt: DateTime.parse(map['updated_at']),
+      printerType: map['printer_type'],
+      paidQuantity: map['paid_quantity'],
+    );
+  }
 
-  Map<String, dynamic> toMap() => {
-        "id": id,
-        "order_id": orderId,
-        "product_id": productId,
-        "product_name": productName,
-        "product_variant_id": productVariantId,
-        "product_variant_name": productVariantName,
-        "quantity": quantity,
-        "unit_price": unitPrice,
-        "total_price": totalPrice,
-        "modifiers": modifiers,
-        "notes": notes,
-        "status": status,
-        "created_at": createdAt?.toIso8601String(),
-        "updated_at": updatedAt?.toIso8601String(),
-      };
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'order_id': orderId,
+      'product_id': productId,
+      'product_name': productName,
+      'product_variant_id': productVariantId,
+      'product_variant_name': productVariantName,
+      'quantity': quantity,
+      'unit_price': unitPrice,
+      'total_price': totalPrice,
+      'modifiers': modifiers,
+      'notes': notes,
+      'status': status,
+      'created_at': createdAt?.toIso8601String(),
+      'updated_at': updatedAt?.toIso8601String(),
+      'printer_type': printerType,
+      'paid_quantity': paidQuantity,
+    };
+  }
+}
+
+class Payment {
+  final String? id;
+  final String? orderId;
+  final String? paymentMethodId;
+  final String? paymentMethodName;
+  final String? paymentMethodType;
+  final int? amount;
+  final String? status;
+  final int? splitNumber;
+  final int? splitTotal;
+  final String? splitDescription;
+  final int? refundAmount;
+  final Map<String, dynamic>? metadata;
+  final DateTime? createdAt;
+  final DateTime? updatedAt;
+
+  Payment({
+    this.id,
+    this.orderId,
+    this.paymentMethodId,
+    this.paymentMethodName,
+    this.paymentMethodType,
+    this.amount,
+    this.status,
+    this.splitNumber,
+    this.splitTotal,
+    this.splitDescription,
+    this.refundAmount,
+    this.metadata,
+    this.createdAt,
+    this.updatedAt,
+  });
+
+  factory Payment.fromMap(Map<String, dynamic> map) {
+    return Payment(
+      id: map['id'],
+      orderId: map['order_id'],
+      paymentMethodId: map['payment_method_id'],
+      paymentMethodName: map['payment_method_name'],
+      paymentMethodType: map['payment_method_type'],
+      amount: map['amount'],
+      status: map['status'],
+      splitNumber: map['split_number'],
+      splitTotal: map['split_total'],
+      splitDescription: map['split_description'],
+      refundAmount: map['refund_amount'],
+      metadata: map['metadata'] ?? {},
+      createdAt: DateTime.parse(map['created_at']),
+      updatedAt: DateTime.parse(map['updated_at']),
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'order_id': orderId,
+      'payment_method_id': paymentMethodId,
+      'payment_method_name': paymentMethodName,
+      'payment_method_type': paymentMethodType,
+      'amount': amount,
+      'status': status,
+      'split_number': splitNumber,
+      'split_total': splitTotal,
+      'split_description': splitDescription,
+      'refund_amount': refundAmount,
+      'metadata': metadata,
+      'created_at': createdAt?.toIso8601String(),
+      'updated_at': updatedAt?.toIso8601String(),
+    };
+  }
 }

lib/data/models/response/payment_method_analytic_response_model.dart

@@ -0,0 +1,173 @@
+class PaymentMethodAnalyticResponseModel {
+  final bool success;
+  final PaymentMethodAnalyticData data;
+  final dynamic errors;
+
+  PaymentMethodAnalyticResponseModel({
+    required this.success,
+    required this.data,
+    this.errors,
+  });
+
+  factory PaymentMethodAnalyticResponseModel.fromJson(
+          Map<String, dynamic> json) =>
+      PaymentMethodAnalyticResponseModel.fromMap(json);
+
+  Map<String, dynamic> toJson() => toMap();
+
+  factory PaymentMethodAnalyticResponseModel.fromMap(Map<String, dynamic> map) {
+    return PaymentMethodAnalyticResponseModel(
+      success: map['success'],
+      data: PaymentMethodAnalyticData.fromMap(map['data']),
+      errors: map['errors'],
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'success': success,
+      'data': data.toMap(),
+      'errors': errors,
+    };
+  }
+}
+
+class PaymentMethodAnalyticData {
+  final String organizationId;
+  final String outletId;
+  final DateTime dateFrom;
+  final DateTime dateTo;
+  final String groupBy;
+  final PaymentSummary summary;
+  final List<PaymentMethodAnalyticItem> data;
+
+  PaymentMethodAnalyticData({
+    required this.organizationId,
+    required this.outletId,
+    required this.dateFrom,
+    required this.dateTo,
+    required this.groupBy,
+    required this.summary,
+    required this.data,
+  });
+
+  factory PaymentMethodAnalyticData.fromJson(Map<String, dynamic> json) =>
+      PaymentMethodAnalyticData.fromMap(json);
+
+  Map<String, dynamic> toJson() => toMap();
+
+  factory PaymentMethodAnalyticData.fromMap(Map<String, dynamic> map) {
+    return PaymentMethodAnalyticData(
+      organizationId: map['organization_id'],
+      outletId: map['outlet_id'],
+      dateFrom: DateTime.parse(map['date_from']),
+      dateTo: DateTime.parse(map['date_to']),
+      groupBy: map['group_by'],
+      summary: PaymentSummary.fromMap(map['summary']),
+      data: map['data'] == null
+          ? []
+          : List<PaymentMethodAnalyticItem>.from(
+              map['data']?.map((x) => PaymentMethodAnalyticItem.fromMap(x)) ??
+                  [],
+            ),
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'organization_id': organizationId,
+      'outlet_id': outletId,
+      'date_from': dateFrom.toIso8601String(),
+      'date_to': dateTo.toIso8601String(),
+      'group_by': groupBy,
+      'summary': summary.toMap(),
+      'data': data.map((x) => x.toMap()).toList(),
+    };
+  }
+}
+
+class PaymentSummary {
+  final int totalAmount;
+  final int totalOrders;
+  final int totalPayments;
+  final double averageOrderValue;
+
+  PaymentSummary({
+    required this.totalAmount,
+    required this.totalOrders,
+    required this.totalPayments,
+    required this.averageOrderValue,
+  });
+
+  factory PaymentSummary.fromJson(Map<String, dynamic> json) =>
+      PaymentSummary.fromMap(json);
+
+  Map<String, dynamic> toJson() => toMap();
+
+  factory PaymentSummary.fromMap(Map<String, dynamic> map) {
+    return PaymentSummary(
+      totalAmount: map['total_amount'],
+      totalOrders: map['total_orders'],
+      totalPayments: map['total_payments'],
+      averageOrderValue: (map['average_order_value'] as num).toDouble(),
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'total_amount': totalAmount,
+      'total_orders': totalOrders,
+      'total_payments': totalPayments,
+      'average_order_value': averageOrderValue,
+    };
+  }
+}
+
+class PaymentMethodAnalyticItem {
+  final String paymentMethodId;
+  final String paymentMethodName;
+  final String paymentMethodType;
+  final int totalAmount;
+  final int orderCount;
+  final int paymentCount;
+  final int percentage;
+
+  PaymentMethodAnalyticItem({
+    required this.paymentMethodId,
+    required this.paymentMethodName,
+    required this.paymentMethodType,
+    required this.totalAmount,
+    required this.orderCount,
+    required this.paymentCount,
+    required this.percentage,
+  });
+
+  factory PaymentMethodAnalyticItem.fromJson(Map<String, dynamic> json) =>
+      PaymentMethodAnalyticItem.fromMap(json);
+
+  Map<String, dynamic> toJson() => toMap();
+
+  factory PaymentMethodAnalyticItem.fromMap(Map<String, dynamic> map) {
+    return PaymentMethodAnalyticItem(
+      paymentMethodId: map['payment_method_id'],
+      paymentMethodName: map['payment_method_name'],
+      paymentMethodType: map['payment_method_type'],
+      totalAmount: map['total_amount'],
+      orderCount: map['order_count'],
+      paymentCount: map['payment_count'],
+      percentage: map['percentage'],
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'payment_method_id': paymentMethodId,
+      'payment_method_name': paymentMethodName,
+      'payment_method_type': paymentMethodType,
+      'total_amount': totalAmount,
+      'order_count': orderCount,
+      'payment_count': paymentCount,
+      'percentage': percentage,
+    };
+  }
+}

lib/data/models/response/product_analytic_response_model.dart

@@ -0,0 +1,145 @@
+class ProductAnalyticResponseModel {
+  final bool success;
+  final ProductAnalyticData data;
+  final dynamic errors;
+
+  ProductAnalyticResponseModel({
+    required this.success,
+    required this.data,
+    this.errors,
+  });
+
+  factory ProductAnalyticResponseModel.fromJson(Map<String, dynamic> json) =>
+      ProductAnalyticResponseModel.fromMap(json);
+
+  Map<String, dynamic> toJson() => toMap();
+
+  factory ProductAnalyticResponseModel.fromMap(Map<String, dynamic> map) {
+    return ProductAnalyticResponseModel(
+      success: map['success'] ?? false,
+      data: ProductAnalyticData.fromMap(map['data']),
+      errors: map['errors'],
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'success': success,
+      'data': data.toMap(),
+      'errors': errors,
+    };
+  }
+}
+
+class ProductAnalyticData {
+  final String organizationId;
+  final String outletId;
+  final DateTime dateFrom;
+  final DateTime dateTo;
+  final List<ProductAnalyticItem> data;
+
+  ProductAnalyticData({
+    required this.organizationId,
+    required this.outletId,
+    required this.dateFrom,
+    required this.dateTo,
+    required this.data,
+  });
+
+  factory ProductAnalyticData.fromMap(Map<String, dynamic> map) =>
+      ProductAnalyticData(
+        organizationId: map['organization_id'],
+        outletId: map['outlet_id'],
+        dateFrom: DateTime.parse(map['date_from']),
+        dateTo: DateTime.parse(map['date_to']),
+        data: map['data'] == null
+            ? []
+            : List<ProductAnalyticItem>.from(
+                map['data'].map((x) => ProductAnalyticItem.fromMap(x)),
+              ),
+      );
+
+  Map<String, dynamic> toMap() => {
+        'organization_id': organizationId,
+        'outlet_id': outletId,
+        'date_from': dateFrom.toIso8601String(),
+        'date_to': dateTo.toIso8601String(),
+        'data': data.map((x) => x.toMap()).toList(),
+      };
+}
+
+class ProductAnalyticItem {
+  final String productId;
+  final String productName;
+  final String categoryId;
+  final String categoryName;
+  final int quantitySold;
+  final int revenue;
+  final double averagePrice;
+  final int orderCount;
+
+  ProductAnalyticItem({
+    required this.productId,
+    required this.productName,
+    required this.categoryId,
+    required this.categoryName,
+    required this.quantitySold,
+    required this.revenue,
+    required this.averagePrice,
+    required this.orderCount,
+  });
+
+  factory ProductAnalyticItem.fromMap(Map<String, dynamic> map) =>
+      ProductAnalyticItem(
+        productId: map['product_id'],
+        productName: map['product_name'],
+        categoryId: map['category_id'],
+        categoryName: map['category_name'],
+        quantitySold: map['quantity_sold'],
+        revenue: map['revenue'],
+        averagePrice: (map['average_price'] as num).toDouble(),
+        orderCount: map['order_count'],
+      );
+
+  Map<String, dynamic> toMap() => {
+        'product_id': productId,
+        'product_name': productName,
+        'category_id': categoryId,
+        'category_name': categoryName,
+        'quantity_sold': quantitySold,
+        'revenue': revenue,
+        'average_price': averagePrice,
+        'order_count': orderCount,
+      };
+}
+
+class ProductInsights {
+  final List<ProductAnalyticItem> topProducts;
+  final ProductAnalyticItem? bestProduct;
+  final List<CategorySummary> categorySummary;
+  final int totalProducts;
+  final int totalRevenue;
+  final int totalQuantitySold;
+
+  ProductInsights({
+    required this.topProducts,
+    required this.bestProduct,
+    required this.categorySummary,
+    required this.totalProducts,
+    required this.totalRevenue,
+    required this.totalQuantitySold,
+  });
+}
+
+// Category summary class
+class CategorySummary {
+  final String categoryName;
+  int productCount;
+  int totalRevenue;
+
+  CategorySummary({
+    required this.categoryName,
+    required this.productCount,
+    required this.totalRevenue,
+  });
+}

lib/data/models/response/profit_loss_response_model.dart

@@ -0,0 +1,277 @@
+class ProfitLossResponseModel {
+  final bool success;
+  final ProfitLossData data;
+  final dynamic errors;
+
+  ProfitLossResponseModel({
+    required this.success,
+    required this.data,
+    this.errors,
+  });
+
+  /// Dari JSON ke model (misal response dari API)
+  factory ProfitLossResponseModel.fromJson(Map<String, dynamic> json) {
+    return ProfitLossResponseModel(
+      success: json['success'],
+      data: ProfitLossData.fromMap(json['data']),
+      errors: json['errors'],
+    );
+  }
+
+  /// Dari model ke JSON (misal saat kirim ke API)
+  Map<String, dynamic> toJson() {
+    return {
+      'success': success,
+      'data': data.toMap(),
+      'errors': errors,
+    };
+  }
+
+  /// Alias dari fromJson, kadang dibutuhkan untuk naming yang konsisten
+  factory ProfitLossResponseModel.fromMap(Map<String, dynamic> map) {
+    return ProfitLossResponseModel(
+      success: map['success'],
+      data: ProfitLossData.fromMap(map['data']),
+      errors: map['errors'],
+    );
+  }
+
+  /// Alias dari toJson
+  Map<String, dynamic> toMap() {
+    return {
+      'success': success,
+      'data': data.toMap(),
+      'errors': errors,
+    };
+  }
+}
+
+class ProfitLossData {
+  final String organizationId;
+  final String dateFrom;
+  final String dateTo;
+  final String groupBy;
+  final ProfitLossSummary summary;
+  final List<ProfitLossItem> data;
+  final List<ProfitLossProduct> productData;
+
+  ProfitLossData({
+    required this.organizationId,
+    required this.dateFrom,
+    required this.dateTo,
+    required this.groupBy,
+    required this.summary,
+    required this.data,
+    required this.productData,
+  });
+
+  factory ProfitLossData.fromMap(Map<String, dynamic> map) {
+    return ProfitLossData(
+      organizationId: map['organization_id'],
+      dateFrom: map['date_from'],
+      dateTo: map['date_to'],
+      groupBy: map['group_by'],
+      summary: ProfitLossSummary.fromMap(map['summary']),
+      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))),
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'organization_id': organizationId,
+      'date_from': dateFrom,
+      'date_to': dateTo,
+      'group_by': groupBy,
+      'summary': summary.toMap(),
+      'data': data.map((x) => x.toMap()).toList(),
+      'product_data': productData.map((x) => x.toMap()).toList(),
+    };
+  }
+}
+
+class ProfitLossSummary {
+  final int totalRevenue;
+  final int totalCost;
+  final int grossProfit;
+  final double grossProfitMargin;
+  final int totalTax;
+  final int totalDiscount;
+  final int netProfit;
+  final double netProfitMargin;
+  final int totalOrders;
+  final int averageProfit;
+  final double profitabilityRatio;
+
+  ProfitLossSummary({
+    required this.totalRevenue,
+    required this.totalCost,
+    required this.grossProfit,
+    required this.grossProfitMargin,
+    required this.totalTax,
+    required this.totalDiscount,
+    required this.netProfit,
+    required this.netProfitMargin,
+    required this.totalOrders,
+    required this.averageProfit,
+    required this.profitabilityRatio,
+  });
+
+  factory ProfitLossSummary.fromMap(Map<String, dynamic> map) {
+    return ProfitLossSummary(
+      totalRevenue: map['total_revenue'],
+      totalCost: map['total_cost'],
+      grossProfit: map['gross_profit'],
+      grossProfitMargin: (map['gross_profit_margin'] as num).toDouble(),
+      totalTax: map['total_tax'],
+      totalDiscount: map['total_discount'],
+      netProfit: map['net_profit'],
+      netProfitMargin: (map['net_profit_margin'] as num).toDouble(),
+      totalOrders: map['total_orders'],
+      averageProfit: map['average_profit'],
+      profitabilityRatio: (map['profitability_ratio'] as num).toDouble(),
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'total_revenue': totalRevenue,
+      'total_cost': totalCost,
+      'gross_profit': grossProfit,
+      'gross_profit_margin': grossProfitMargin,
+      'total_tax': totalTax,
+      'total_discount': totalDiscount,
+      'net_profit': netProfit,
+      'net_profit_margin': netProfitMargin,
+      'total_orders': totalOrders,
+      'average_profit': averageProfit,
+      'profitability_ratio': profitabilityRatio,
+    };
+  }
+}
+
+class ProfitLossItem {
+  final String date;
+  final int revenue;
+  final int cost;
+  final int grossProfit;
+  final double grossProfitMargin;
+  final int tax;
+  final int discount;
+  final int netProfit;
+  final double netProfitMargin;
+  final int orders;
+
+  ProfitLossItem({
+    required this.date,
+    required this.revenue,
+    required this.cost,
+    required this.grossProfit,
+    required this.grossProfitMargin,
+    required this.tax,
+    required this.discount,
+    required this.netProfit,
+    required this.netProfitMargin,
+    required this.orders,
+  });
+
+  factory ProfitLossItem.fromMap(Map<String, dynamic> map) {
+    return ProfitLossItem(
+      date: map['date'],
+      revenue: map['revenue'],
+      cost: map['cost'],
+      grossProfit: map['gross_profit'],
+      grossProfitMargin: (map['gross_profit_margin'] as num).toDouble(),
+      tax: map['tax'],
+      discount: map['discount'],
+      netProfit: map['net_profit'],
+      netProfitMargin: (map['net_profit_margin'] as num).toDouble(),
+      orders: map['orders'],
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'date': date,
+      'revenue': revenue,
+      'cost': cost,
+      'gross_profit': grossProfit,
+      'gross_profit_margin': grossProfitMargin,
+      'tax': tax,
+      'discount': discount,
+      'net_profit': netProfit,
+      'net_profit_margin': netProfitMargin,
+      'orders': orders,
+    };
+  }
+}
+
+class ProfitLossProduct {
+  final String productId;
+  final String productName;
+  final String categoryId;
+  final String categoryName;
+  final int quantitySold;
+  final int revenue;
+  final int cost;
+  final int grossProfit;
+  final double grossProfitMargin;
+  final int averagePrice;
+  final int averageCost;
+  final int profitPerUnit;
+
+  ProfitLossProduct({
+    required this.productId,
+    required this.productName,
+    required this.categoryId,
+    required this.categoryName,
+    required this.quantitySold,
+    required this.revenue,
+    required this.cost,
+    required this.grossProfit,
+    required this.grossProfitMargin,
+    required this.averagePrice,
+    required this.averageCost,
+    required this.profitPerUnit,
+  });
+
+  factory ProfitLossProduct.fromMap(Map<String, dynamic> map) {
+    return ProfitLossProduct(
+      productId: map['product_id'],
+      productName: map['product_name'],
+      categoryId: map['category_id'],
+      categoryName: map['category_name'],
+      quantitySold: map['quantity_sold'],
+      revenue: map['revenue'],
+      cost: map['cost'],
+      grossProfit: map['gross_profit'],
+      grossProfitMargin: (map['gross_profit_margin'] as num).toDouble(),
+      averagePrice: map['average_price'],
+      averageCost: map['average_cost'],
+      profitPerUnit: map['profit_per_unit'],
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'product_id': productId,
+      'product_name': productName,
+      'category_id': categoryId,
+      'category_name': categoryName,
+      'quantity_sold': quantitySold,
+      'revenue': revenue,
+      'cost': cost,
+      'gross_profit': grossProfit,
+      'gross_profit_margin': grossProfitMargin,
+      'average_price': averagePrice,
+      'average_cost': averageCost,
+      'profit_per_unit': profitPerUnit,
+    };
+  }
+}

lib/data/models/response/sales_analytic_response_model.dart

@@ -0,0 +1,195 @@
+class SalesAnalyticResponseModel {
+  final bool success;
+  final SalesAnalyticData data;
+  final dynamic errors;
+
+  SalesAnalyticResponseModel({
+    required this.success,
+    required this.data,
+    this.errors,
+  });
+
+  factory SalesAnalyticResponseModel.fromJson(Map<String, dynamic> json) =>
+      SalesAnalyticResponseModel.fromMap(json);
+
+  Map<String, dynamic> toJson() => toMap();
+
+  factory SalesAnalyticResponseModel.fromMap(Map<String, dynamic> map) {
+    return SalesAnalyticResponseModel(
+      success: map['success'],
+      data: SalesAnalyticData.fromMap(map['data']),
+      errors: map['errors'],
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'success': success,
+      'data': data.toMap(),
+      'errors': errors,
+    };
+  }
+}
+
+class SalesAnalyticData {
+  final String organizationId;
+  final String outletId;
+  final DateTime dateFrom;
+  final DateTime dateTo;
+  final String groupBy;
+  final SalesSummary summary;
+  final List<SalesAnalyticItem> data;
+
+  SalesAnalyticData({
+    required this.organizationId,
+    required this.outletId,
+    required this.dateFrom,
+    required this.dateTo,
+    required this.groupBy,
+    required this.summary,
+    required this.data,
+  });
+
+  factory SalesAnalyticData.fromJson(Map<String, dynamic> json) =>
+      SalesAnalyticData.fromMap(json);
+
+  Map<String, dynamic> toJson() => toMap();
+
+  factory SalesAnalyticData.fromMap(Map<String, dynamic> map) {
+    return SalesAnalyticData(
+      organizationId: map['organization_id'],
+      outletId: map['outlet_id'],
+      dateFrom: DateTime.parse(map['date_from']),
+      dateTo: DateTime.parse(map['date_to']),
+      groupBy: map['group_by'],
+      summary: SalesSummary.fromMap(map['summary']),
+      data: List<SalesAnalyticItem>.from(
+        map['data']?.map((x) => SalesAnalyticItem.fromMap(x)) ?? [],
+      ),
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'organization_id': organizationId,
+      'outlet_id': outletId,
+      'date_from': dateFrom.toIso8601String(),
+      'date_to': dateTo.toIso8601String(),
+      'group_by': groupBy,
+      'summary': summary.toMap(),
+      'data': data.map((x) => x.toMap()).toList(),
+    };
+  }
+}
+
+class SalesSummary {
+  final int totalSales;
+  final int totalOrders;
+  final int totalItems;
+  final double averageOrderValue;
+  final int totalTax;
+  final int totalDiscount;
+  final int netSales;
+
+  SalesSummary({
+    required this.totalSales,
+    required this.totalOrders,
+    required this.totalItems,
+    required this.averageOrderValue,
+    required this.totalTax,
+    required this.totalDiscount,
+    required this.netSales,
+  });
+
+  factory SalesSummary.fromJson(Map<String, dynamic> json) =>
+      SalesSummary.fromMap(json);
+
+  Map<String, dynamic> toJson() => toMap();
+
+  factory SalesSummary.fromMap(Map<String, dynamic> map) {
+    return SalesSummary(
+      totalSales: map['total_sales'],
+      totalOrders: map['total_orders'],
+      totalItems: map['total_items'],
+      averageOrderValue: (map['average_order_value'] as num).toDouble(),
+      totalTax: map['total_tax'],
+      totalDiscount: map['total_discount'],
+      netSales: map['net_sales'],
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'total_sales': totalSales,
+      'total_orders': totalOrders,
+      'total_items': totalItems,
+      'average_order_value': averageOrderValue,
+      'total_tax': totalTax,
+      'total_discount': totalDiscount,
+      'net_sales': netSales,
+    };
+  }
+}
+
+class SalesAnalyticItem {
+  final DateTime date;
+  final int sales;
+  final int orders;
+  final int items;
+  final int tax;
+  final int discount;
+  final int netSales;
+
+  SalesAnalyticItem({
+    required this.date,
+    required this.sales,
+    required this.orders,
+    required this.items,
+    required this.tax,
+    required this.discount,
+    required this.netSales,
+  });
+
+  factory SalesAnalyticItem.fromJson(Map<String, dynamic> json) =>
+      SalesAnalyticItem.fromMap(json);
+
+  Map<String, dynamic> toJson() => toMap();
+
+  factory SalesAnalyticItem.fromMap(Map<String, dynamic> map) {
+    return SalesAnalyticItem(
+      date: DateTime.parse(map['date']),
+      sales: map['sales'],
+      orders: map['orders'],
+      items: map['items'],
+      tax: map['tax'],
+      discount: map['discount'],
+      netSales: map['net_sales'],
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'date': date.toIso8601String(),
+      'sales': sales,
+      'orders': orders,
+      'items': items,
+      'tax': tax,
+      'discount': discount,
+      'net_sales': netSales,
+    };
+  }
+}
+
+class SalesInsights {
+  final List<SalesAnalyticItem> originalData;
+  final List<SalesAnalyticItem> sortedDailyData;
+  final SalesAnalyticItem? highestRevenueDay;
+  final SalesSummary summary;
+
+  SalesInsights({
+    required this.originalData,
+    required this.sortedDailyData,
+    required this.highestRevenueDay,
+    required this.summary,
+  });
+}

lib/data/type/bussines_type.dart

@@ -0,0 +1,17 @@
+enum BusinessType {
+  restaurant('restaurant'),
+  retail('retail'),
+  service('service'),
+  ticketing('ticketing'),
+  entertainment('entertainment');
+
+  final String value;
+  const BusinessType(this.value);
+
+  static BusinessType fromString(String value) {
+    return BusinessType.values.firstWhere(
+      (type) => type.value == value,
+      orElse: () => BusinessType.restaurant,
+    );
+  }
+}

lib/main.dart

@@ -1,5 +1,7 @@
 import 'dart:developer';
 import 'package:enaklo_pos/core/constants/theme.dart';
+import 'package:enaklo_pos/core/network/dio_client.dart';
+import 'package:enaklo_pos/data/datasources/analytic_remote_datasource.dart';
 import 'package:enaklo_pos/data/datasources/customer_remote_datasource.dart';
 import 'package:enaklo_pos/data/datasources/file_remote_datasource.dart';
 import 'package:enaklo_pos/data/datasources/outlet_remote_data_source.dart';
@@ -7,15 +9,19 @@ import 'package:enaklo_pos/data/datasources/table_remote_datasource.dart';
 import 'package:enaklo_pos/data/datasources/user_remote_datasource.dart';
 import 'package:enaklo_pos/presentation/customer/bloc/customer_form/customer_form_bloc.dart';
 import 'package:enaklo_pos/presentation/customer/bloc/customer_loader/customer_loader_bloc.dart';
+import 'package:enaklo_pos/presentation/home/bloc/category_loader/category_loader_bloc.dart';
 import 'package:enaklo_pos/presentation/home/bloc/current_outlet/current_outlet_bloc.dart';
 import 'package:enaklo_pos/presentation/home/bloc/order_form/order_form_bloc.dart';
 import 'package:enaklo_pos/presentation/home/bloc/outlet_loader/outlet_loader_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/refund/bloc/refund_bloc.dart';
+import 'package:enaklo_pos/presentation/report/blocs/profit_loss/profit_loss_bloc.dart';
 import 'package:enaklo_pos/presentation/sales/blocs/order_loader/order_loader_bloc.dart';
 import 'package:enaklo_pos/presentation/sales/blocs/payment_form/payment_form_bloc.dart';
+import 'package:enaklo_pos/presentation/setting/bloc/get_printer_ticket/get_printer_ticket_bloc.dart';
 import 'package:enaklo_pos/presentation/setting/bloc/upload_file/upload_file_bloc.dart';
+import 'package:enaklo_pos/presentation/table/blocs/transfer_table/transfer_table_bloc.dart';
 import 'package:enaklo_pos/presentation/void/bloc/void_order_bloc.dart';
 import 'package:flutter/material.dart';
 import 'package:enaklo_pos/data/datasources/auth_local_datasource.dart';
@@ -26,7 +32,6 @@ import 'package:enaklo_pos/data/datasources/midtrans_remote_datasource.dart';
 import 'package:enaklo_pos/data/datasources/order_remote_datasource.dart';
 import 'package:enaklo_pos/data/datasources/product_local_datasource.dart';
 import 'package:enaklo_pos/data/datasources/product_remote_datasource.dart';
-import 'package:enaklo_pos/data/datasources/order_item_remote_datasource.dart';
 import 'package:enaklo_pos/data/datasources/payment_methods_remote_datasource.dart';
 import 'package:enaklo_pos/data/datasources/settings_local_datasource.dart';
 import 'package:enaklo_pos/presentation/auth/bloc/logout/logout_bloc.dart';
@@ -189,16 +194,20 @@ class _MyAppState extends State<MyApp> {
           create: (context) => GetCategoriesBloc(CategoryRemoteDatasource()),
         ),
         BlocProvider(
-          create: (context) => SummaryBloc(OrderRemoteDatasource()),
+          create: (context) => SummaryBloc(AnalyticRemoteDatasource()),
         ),
         BlocProvider(
-          create: (context) => ProductSalesBloc(OrderItemRemoteDatasource()),
+          create: (context) => ProfitLossBloc(AnalyticRemoteDatasource()),
         ),
         BlocProvider(
-          create: (context) => ItemSalesReportBloc(OrderItemRemoteDatasource()),
+          create: (context) => ProductSalesBloc(AnalyticRemoteDatasource()),
         ),
         BlocProvider(
-          create: (context) => PaymentMethodReportBloc(OrderRemoteDatasource()),
+          create: (context) => ItemSalesReportBloc(AnalyticRemoteDatasource()),
+        ),
+        BlocProvider(
+          create: (context) =>
+              PaymentMethodReportBloc(AnalyticRemoteDatasource()),
         ),
         BlocProvider(
           create: (context) => DaySalesBloc(ProductLocalDatasource.instance),
@@ -270,8 +279,18 @@ class _MyAppState extends State<MyApp> {
         BlocProvider(
           create: (context) => UploadFileBloc(FileRemoteDataSource()),
         ),
+        BlocProvider(
+          create: (context) => CategoryLoaderBloc(CategoryRemoteDatasource()),
+        ),
+        BlocProvider(
+          create: (context) => GetPrinterTicketBloc(),
+        ),
+        BlocProvider(
+          create: (context) => TransferTableBloc(TableRemoteDataSource()),
+        ),
       ],
       child: MaterialApp(
+        navigatorKey: AuthInterceptor.navigatorKey,
         debugShowCheckedModeBanner: false,
         title: 'POS Resto App',
         theme: getApplicationTheme,

lib/presentation/customer/widgets/customer_title.dart

@@ -30,11 +30,6 @@ class CustomerTitle extends StatelessWidget {
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              IconButton(
-                onPressed: () => context.pop(),
-                icon: Icon(Icons.arrow_back, color: AppColors.black),
-              ),
-              SpaceWidth(16),
               Expanded(
                 child: Text(
                   title,

lib/presentation/home/bloc/category_loader/category_loader_bloc.dart

@@ -0,0 +1,43 @@
+import 'package:bloc/bloc.dart';
+import 'package:enaklo_pos/data/datasources/category_remote_datasource.dart';
+import 'package:enaklo_pos/data/models/response/category_response_model.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'category_loader_event.dart';
+part 'category_loader_state.dart';
+part 'category_loader_bloc.freezed.dart';
+
+class CategoryLoaderBloc
+    extends Bloc<CategoryLoaderEvent, CategoryLoaderState> {
+  final CategoryRemoteDatasource _datasource;
+  CategoryLoaderBloc(this._datasource) : super(CategoryLoaderState.initial()) {
+    on<_Get>((event, emit) async {
+      emit(const _Loading());
+      final result = await _datasource.getCategories(limit: 50);
+      result.fold(
+        (l) => emit(_Error(l)),
+        (r) async {
+          List<CategoryModel> categories = r.data.categories;
+          categories.insert(
+            0,
+            CategoryModel(
+              id: "",
+              name: 'Semua',
+              organizationId: '',
+              businessType: '',
+              metadata: {},
+              createdAt: DateTime.now(),
+              updatedAt: DateTime.now(),
+            ),
+          );
+          emit(_Loaded(categories, null));
+        },
+      );
+    });
+    on<_SetCategoryId>((event, emit) async {
+      var currentState = state as _Loaded;
+
+      emit(_Loaded(currentState.categories, event.categoryId));
+    });
+  }
+}

lib/presentation/home/bloc/category_loader/category_loader_bloc.freezed.dart

@@ -0,0 +1,976 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'category_loader_bloc.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+/// @nodoc
+mixin _$CategoryLoaderEvent {
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() get,
+    required TResult Function(String categoryId) setCategoryId,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? get,
+    TResult? Function(String categoryId)? setCategoryId,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? get,
+    TResult Function(String categoryId)? setCategoryId,
+    required TResult orElse(),
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(_Get value) get,
+    required TResult Function(_SetCategoryId value) setCategoryId,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(_Get value)? get,
+    TResult? Function(_SetCategoryId value)? setCategoryId,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(_Get value)? get,
+    TResult Function(_SetCategoryId value)? setCategoryId,
+    required TResult orElse(),
+  }) =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $CategoryLoaderEventCopyWith<$Res> {
+  factory $CategoryLoaderEventCopyWith(
+          CategoryLoaderEvent value, $Res Function(CategoryLoaderEvent) then) =
+      _$CategoryLoaderEventCopyWithImpl<$Res, CategoryLoaderEvent>;
+}
+
+/// @nodoc
+class _$CategoryLoaderEventCopyWithImpl<$Res, $Val extends CategoryLoaderEvent>
+    implements $CategoryLoaderEventCopyWith<$Res> {
+  _$CategoryLoaderEventCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of CategoryLoaderEvent
+  /// with the given fields replaced by the non-null parameter values.
+}
+
+/// @nodoc
+abstract class _$$GetImplCopyWith<$Res> {
+  factory _$$GetImplCopyWith(_$GetImpl value, $Res Function(_$GetImpl) then) =
+      __$$GetImplCopyWithImpl<$Res>;
+}
+
+/// @nodoc
+class __$$GetImplCopyWithImpl<$Res>
+    extends _$CategoryLoaderEventCopyWithImpl<$Res, _$GetImpl>
+    implements _$$GetImplCopyWith<$Res> {
+  __$$GetImplCopyWithImpl(_$GetImpl _value, $Res Function(_$GetImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of CategoryLoaderEvent
+  /// with the given fields replaced by the non-null parameter values.
+}
+
+/// @nodoc
+
+class _$GetImpl implements _Get {
+  const _$GetImpl();
+
+  @override
+  String toString() {
+    return 'CategoryLoaderEvent.get()';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is _$GetImpl);
+  }
+
+  @override
+  int get hashCode => runtimeType.hashCode;
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() get,
+    required TResult Function(String categoryId) setCategoryId,
+  }) {
+    return get();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? get,
+    TResult? Function(String categoryId)? setCategoryId,
+  }) {
+    return get?.call();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? get,
+    TResult Function(String categoryId)? setCategoryId,
+    required TResult orElse(),
+  }) {
+    if (get != null) {
+      return get();
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(_Get value) get,
+    required TResult Function(_SetCategoryId value) setCategoryId,
+  }) {
+    return get(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(_Get value)? get,
+    TResult? Function(_SetCategoryId value)? setCategoryId,
+  }) {
+    return get?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(_Get value)? get,
+    TResult Function(_SetCategoryId value)? setCategoryId,
+    required TResult orElse(),
+  }) {
+    if (get != null) {
+      return get(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class _Get implements CategoryLoaderEvent {
+  const factory _Get() = _$GetImpl;
+}
+
+/// @nodoc
+abstract class _$$SetCategoryIdImplCopyWith<$Res> {
+  factory _$$SetCategoryIdImplCopyWith(
+          _$SetCategoryIdImpl value, $Res Function(_$SetCategoryIdImpl) then) =
+      __$$SetCategoryIdImplCopyWithImpl<$Res>;
+  @useResult
+  $Res call({String categoryId});
+}
+
+/// @nodoc
+class __$$SetCategoryIdImplCopyWithImpl<$Res>
+    extends _$CategoryLoaderEventCopyWithImpl<$Res, _$SetCategoryIdImpl>
+    implements _$$SetCategoryIdImplCopyWith<$Res> {
+  __$$SetCategoryIdImplCopyWithImpl(
+      _$SetCategoryIdImpl _value, $Res Function(_$SetCategoryIdImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of CategoryLoaderEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? categoryId = null,
+  }) {
+    return _then(_$SetCategoryIdImpl(
+      null == categoryId
+          ? _value.categoryId
+          : categoryId // ignore: cast_nullable_to_non_nullable
+              as String,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$SetCategoryIdImpl implements _SetCategoryId {
+  const _$SetCategoryIdImpl(this.categoryId);
+
+  @override
+  final String categoryId;
+
+  @override
+  String toString() {
+    return 'CategoryLoaderEvent.setCategoryId(categoryId: $categoryId)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$SetCategoryIdImpl &&
+            (identical(other.categoryId, categoryId) ||
+                other.categoryId == categoryId));
+  }
+
+  @override
+  int get hashCode => Object.hash(runtimeType, categoryId);
+
+  /// Create a copy of CategoryLoaderEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$SetCategoryIdImplCopyWith<_$SetCategoryIdImpl> get copyWith =>
+      __$$SetCategoryIdImplCopyWithImpl<_$SetCategoryIdImpl>(this, _$identity);
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() get,
+    required TResult Function(String categoryId) setCategoryId,
+  }) {
+    return setCategoryId(categoryId);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? get,
+    TResult? Function(String categoryId)? setCategoryId,
+  }) {
+    return setCategoryId?.call(categoryId);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? get,
+    TResult Function(String categoryId)? setCategoryId,
+    required TResult orElse(),
+  }) {
+    if (setCategoryId != null) {
+      return setCategoryId(categoryId);
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(_Get value) get,
+    required TResult Function(_SetCategoryId value) setCategoryId,
+  }) {
+    return setCategoryId(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(_Get value)? get,
+    TResult? Function(_SetCategoryId value)? setCategoryId,
+  }) {
+    return setCategoryId?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(_Get value)? get,
+    TResult Function(_SetCategoryId value)? setCategoryId,
+    required TResult orElse(),
+  }) {
+    if (setCategoryId != null) {
+      return setCategoryId(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class _SetCategoryId implements CategoryLoaderEvent {
+  const factory _SetCategoryId(final String categoryId) = _$SetCategoryIdImpl;
+
+  String get categoryId;
+
+  /// Create a copy of CategoryLoaderEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$SetCategoryIdImplCopyWith<_$SetCategoryIdImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+mixin _$CategoryLoaderState {
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() initial,
+    required TResult Function() loading,
+    required TResult Function(
+            List<CategoryModel> categories, String? categoryId)
+        loaded,
+    required TResult Function(String message) error,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? initial,
+    TResult? Function()? loading,
+    TResult? Function(List<CategoryModel> categories, String? categoryId)?
+        loaded,
+    TResult? Function(String message)? error,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? initial,
+    TResult Function()? loading,
+    TResult Function(List<CategoryModel> categories, String? categoryId)?
+        loaded,
+    TResult Function(String message)? error,
+    required TResult orElse(),
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(_Initial value) initial,
+    required TResult Function(_Loading value) loading,
+    required TResult Function(_Loaded value) loaded,
+    required TResult Function(_Error value) error,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(_Initial value)? initial,
+    TResult? Function(_Loading value)? loading,
+    TResult? Function(_Loaded value)? loaded,
+    TResult? Function(_Error value)? error,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(_Initial value)? initial,
+    TResult Function(_Loading value)? loading,
+    TResult Function(_Loaded value)? loaded,
+    TResult Function(_Error value)? error,
+    required TResult orElse(),
+  }) =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $CategoryLoaderStateCopyWith<$Res> {
+  factory $CategoryLoaderStateCopyWith(
+          CategoryLoaderState value, $Res Function(CategoryLoaderState) then) =
+      _$CategoryLoaderStateCopyWithImpl<$Res, CategoryLoaderState>;
+}
+
+/// @nodoc
+class _$CategoryLoaderStateCopyWithImpl<$Res, $Val extends CategoryLoaderState>
+    implements $CategoryLoaderStateCopyWith<$Res> {
+  _$CategoryLoaderStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of CategoryLoaderState
+  /// with the given fields replaced by the non-null parameter values.
+}
+
+/// @nodoc
+abstract class _$$InitialImplCopyWith<$Res> {
+  factory _$$InitialImplCopyWith(
+          _$InitialImpl value, $Res Function(_$InitialImpl) then) =
+      __$$InitialImplCopyWithImpl<$Res>;
+}
+
+/// @nodoc
+class __$$InitialImplCopyWithImpl<$Res>
+    extends _$CategoryLoaderStateCopyWithImpl<$Res, _$InitialImpl>
+    implements _$$InitialImplCopyWith<$Res> {
+  __$$InitialImplCopyWithImpl(
+      _$InitialImpl _value, $Res Function(_$InitialImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of CategoryLoaderState
+  /// with the given fields replaced by the non-null parameter values.
+}
+
+/// @nodoc
+
+class _$InitialImpl implements _Initial {
+  const _$InitialImpl();
+
+  @override
+  String toString() {
+    return 'CategoryLoaderState.initial()';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is _$InitialImpl);
+  }
+
+  @override
+  int get hashCode => runtimeType.hashCode;
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() initial,
+    required TResult Function() loading,
+    required TResult Function(
+            List<CategoryModel> categories, String? categoryId)
+        loaded,
+    required TResult Function(String message) error,
+  }) {
+    return initial();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? initial,
+    TResult? Function()? loading,
+    TResult? Function(List<CategoryModel> categories, String? categoryId)?
+        loaded,
+    TResult? Function(String message)? error,
+  }) {
+    return initial?.call();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? initial,
+    TResult Function()? loading,
+    TResult Function(List<CategoryModel> categories, String? categoryId)?
+        loaded,
+    TResult Function(String message)? error,
+    required TResult orElse(),
+  }) {
+    if (initial != null) {
+      return initial();
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(_Initial value) initial,
+    required TResult Function(_Loading value) loading,
+    required TResult Function(_Loaded value) loaded,
+    required TResult Function(_Error value) error,
+  }) {
+    return initial(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(_Initial value)? initial,
+    TResult? Function(_Loading value)? loading,
+    TResult? Function(_Loaded value)? loaded,
+    TResult? Function(_Error value)? error,
+  }) {
+    return initial?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(_Initial value)? initial,
+    TResult Function(_Loading value)? loading,
+    TResult Function(_Loaded value)? loaded,
+    TResult Function(_Error value)? error,
+    required TResult orElse(),
+  }) {
+    if (initial != null) {
+      return initial(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class _Initial implements CategoryLoaderState {
+  const factory _Initial() = _$InitialImpl;
+}
+
+/// @nodoc
+abstract class _$$LoadingImplCopyWith<$Res> {
+  factory _$$LoadingImplCopyWith(
+          _$LoadingImpl value, $Res Function(_$LoadingImpl) then) =
+      __$$LoadingImplCopyWithImpl<$Res>;
+}
+
+/// @nodoc
+class __$$LoadingImplCopyWithImpl<$Res>
+    extends _$CategoryLoaderStateCopyWithImpl<$Res, _$LoadingImpl>
+    implements _$$LoadingImplCopyWith<$Res> {
+  __$$LoadingImplCopyWithImpl(
+      _$LoadingImpl _value, $Res Function(_$LoadingImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of CategoryLoaderState
+  /// with the given fields replaced by the non-null parameter values.
+}
+
+/// @nodoc
+
+class _$LoadingImpl implements _Loading {
+  const _$LoadingImpl();
+
+  @override
+  String toString() {
+    return 'CategoryLoaderState.loading()';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is _$LoadingImpl);
+  }
+
+  @override
+  int get hashCode => runtimeType.hashCode;
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() initial,
+    required TResult Function() loading,
+    required TResult Function(
+            List<CategoryModel> categories, String? categoryId)
+        loaded,
+    required TResult Function(String message) error,
+  }) {
+    return loading();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? initial,
+    TResult? Function()? loading,
+    TResult? Function(List<CategoryModel> categories, String? categoryId)?
+        loaded,
+    TResult? Function(String message)? error,
+  }) {
+    return loading?.call();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? initial,
+    TResult Function()? loading,
+    TResult Function(List<CategoryModel> categories, String? categoryId)?
+        loaded,
+    TResult Function(String message)? error,
+    required TResult orElse(),
+  }) {
+    if (loading != null) {
+      return loading();
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(_Initial value) initial,
+    required TResult Function(_Loading value) loading,
+    required TResult Function(_Loaded value) loaded,
+    required TResult Function(_Error value) error,
+  }) {
+    return loading(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(_Initial value)? initial,
+    TResult? Function(_Loading value)? loading,
+    TResult? Function(_Loaded value)? loaded,
+    TResult? Function(_Error value)? error,
+  }) {
+    return loading?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(_Initial value)? initial,
+    TResult Function(_Loading value)? loading,
+    TResult Function(_Loaded value)? loaded,
+    TResult Function(_Error value)? error,
+    required TResult orElse(),
+  }) {
+    if (loading != null) {
+      return loading(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class _Loading implements CategoryLoaderState {
+  const factory _Loading() = _$LoadingImpl;
+}
+
+/// @nodoc
+abstract class _$$LoadedImplCopyWith<$Res> {
+  factory _$$LoadedImplCopyWith(
+          _$LoadedImpl value, $Res Function(_$LoadedImpl) then) =
+      __$$LoadedImplCopyWithImpl<$Res>;
+  @useResult
+  $Res call({List<CategoryModel> categories, String? categoryId});
+}
+
+/// @nodoc
+class __$$LoadedImplCopyWithImpl<$Res>
+    extends _$CategoryLoaderStateCopyWithImpl<$Res, _$LoadedImpl>
+    implements _$$LoadedImplCopyWith<$Res> {
+  __$$LoadedImplCopyWithImpl(
+      _$LoadedImpl _value, $Res Function(_$LoadedImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of CategoryLoaderState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? categories = null,
+    Object? categoryId = freezed,
+  }) {
+    return _then(_$LoadedImpl(
+      null == categories
+          ? _value._categories
+          : categories // ignore: cast_nullable_to_non_nullable
+              as List<CategoryModel>,
+      freezed == categoryId
+          ? _value.categoryId
+          : categoryId // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$LoadedImpl implements _Loaded {
+  const _$LoadedImpl(final List<CategoryModel> categories, this.categoryId)
+      : _categories = categories;
+
+  final List<CategoryModel> _categories;
+  @override
+  List<CategoryModel> get categories {
+    if (_categories is EqualUnmodifiableListView) return _categories;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_categories);
+  }
+
+  @override
+  final String? categoryId;
+
+  @override
+  String toString() {
+    return 'CategoryLoaderState.loaded(categories: $categories, categoryId: $categoryId)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$LoadedImpl &&
+            const DeepCollectionEquality()
+                .equals(other._categories, _categories) &&
+            (identical(other.categoryId, categoryId) ||
+                other.categoryId == categoryId));
+  }
+
+  @override
+  int get hashCode => Object.hash(runtimeType,
+      const DeepCollectionEquality().hash(_categories), categoryId);
+
+  /// Create a copy of CategoryLoaderState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$LoadedImplCopyWith<_$LoadedImpl> get copyWith =>
+      __$$LoadedImplCopyWithImpl<_$LoadedImpl>(this, _$identity);
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() initial,
+    required TResult Function() loading,
+    required TResult Function(
+            List<CategoryModel> categories, String? categoryId)
+        loaded,
+    required TResult Function(String message) error,
+  }) {
+    return loaded(categories, categoryId);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? initial,
+    TResult? Function()? loading,
+    TResult? Function(List<CategoryModel> categories, String? categoryId)?
+        loaded,
+    TResult? Function(String message)? error,
+  }) {
+    return loaded?.call(categories, categoryId);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? initial,
+    TResult Function()? loading,
+    TResult Function(List<CategoryModel> categories, String? categoryId)?
+        loaded,
+    TResult Function(String message)? error,
+    required TResult orElse(),
+  }) {
+    if (loaded != null) {
+      return loaded(categories, categoryId);
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(_Initial value) initial,
+    required TResult Function(_Loading value) loading,
+    required TResult Function(_Loaded value) loaded,
+    required TResult Function(_Error value) error,
+  }) {
+    return loaded(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(_Initial value)? initial,
+    TResult? Function(_Loading value)? loading,
+    TResult? Function(_Loaded value)? loaded,
+    TResult? Function(_Error value)? error,
+  }) {
+    return loaded?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(_Initial value)? initial,
+    TResult Function(_Loading value)? loading,
+    TResult Function(_Loaded value)? loaded,
+    TResult Function(_Error value)? error,
+    required TResult orElse(),
+  }) {
+    if (loaded != null) {
+      return loaded(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class _Loaded implements CategoryLoaderState {
+  const factory _Loaded(
+          final List<CategoryModel> categories, final String? categoryId) =
+      _$LoadedImpl;
+
+  List<CategoryModel> get categories;
+  String? get categoryId;
+
+  /// Create a copy of CategoryLoaderState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$LoadedImplCopyWith<_$LoadedImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class _$$ErrorImplCopyWith<$Res> {
+  factory _$$ErrorImplCopyWith(
+          _$ErrorImpl value, $Res Function(_$ErrorImpl) then) =
+      __$$ErrorImplCopyWithImpl<$Res>;
+  @useResult
+  $Res call({String message});
+}
+
+/// @nodoc
+class __$$ErrorImplCopyWithImpl<$Res>
+    extends _$CategoryLoaderStateCopyWithImpl<$Res, _$ErrorImpl>
+    implements _$$ErrorImplCopyWith<$Res> {
+  __$$ErrorImplCopyWithImpl(
+      _$ErrorImpl _value, $Res Function(_$ErrorImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of CategoryLoaderState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? message = null,
+  }) {
+    return _then(_$ErrorImpl(
+      null == message
+          ? _value.message
+          : message // ignore: cast_nullable_to_non_nullable
+              as String,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$ErrorImpl implements _Error {
+  const _$ErrorImpl(this.message);
+
+  @override
+  final String message;
+
+  @override
+  String toString() {
+    return 'CategoryLoaderState.error(message: $message)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ErrorImpl &&
+            (identical(other.message, message) || other.message == message));
+  }
+
+  @override
+  int get hashCode => Object.hash(runtimeType, message);
+
+  /// Create a copy of CategoryLoaderState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ErrorImplCopyWith<_$ErrorImpl> get copyWith =>
+      __$$ErrorImplCopyWithImpl<_$ErrorImpl>(this, _$identity);
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() initial,
+    required TResult Function() loading,
+    required TResult Function(
+            List<CategoryModel> categories, String? categoryId)
+        loaded,
+    required TResult Function(String message) error,
+  }) {
+    return error(message);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? initial,
+    TResult? Function()? loading,
+    TResult? Function(List<CategoryModel> categories, String? categoryId)?
+        loaded,
+    TResult? Function(String message)? error,
+  }) {
+    return error?.call(message);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? initial,
+    TResult Function()? loading,
+    TResult Function(List<CategoryModel> categories, String? categoryId)?
+        loaded,
+    TResult Function(String message)? error,
+    required TResult orElse(),
+  }) {
+    if (error != null) {
+      return error(message);
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(_Initial value) initial,
+    required TResult Function(_Loading value) loading,
+    required TResult Function(_Loaded value) loaded,
+    required TResult Function(_Error value) error,
+  }) {
+    return error(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(_Initial value)? initial,
+    TResult? Function(_Loading value)? loading,
+    TResult? Function(_Loaded value)? loaded,
+    TResult? Function(_Error value)? error,
+  }) {
+    return error?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(_Initial value)? initial,
+    TResult Function(_Loading value)? loading,
+    TResult Function(_Loaded value)? loaded,
+    TResult Function(_Error value)? error,
+    required TResult orElse(),
+  }) {
+    if (error != null) {
+      return error(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class _Error implements CategoryLoaderState {
+  const factory _Error(final String message) = _$ErrorImpl;
+
+  String get message;
+
+  /// Create a copy of CategoryLoaderState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$ErrorImplCopyWith<_$ErrorImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/presentation/home/bloc/category_loader/category_loader_event.dart

@@ -0,0 +1,8 @@
+part of 'category_loader_bloc.dart';
+
+@freezed
+class CategoryLoaderEvent with _$CategoryLoaderEvent {
+  const factory CategoryLoaderEvent.get() = _Get;
+  const factory CategoryLoaderEvent.setCategoryId(String categoryId) =
+      _SetCategoryId;
+}

lib/presentation/home/bloc/category_loader/category_loader_state.dart

@@ -0,0 +1,10 @@
+part of 'category_loader_bloc.dart';
+
+@freezed
+class CategoryLoaderState with _$CategoryLoaderState {
+  const factory CategoryLoaderState.initial() = _Initial;
+  const factory CategoryLoaderState.loading() = _Loading;
+  const factory CategoryLoaderState.loaded(
+      List<CategoryModel> categories, String? categoryId) = _Loaded;
+  const factory CategoryLoaderState.error(String message) = _Error;
+}

lib/presentation/home/bloc/checkout/checkout_bloc.dart

@@ -2,6 +2,7 @@ import 'dart:developer';
 
 import 'package:bloc/bloc.dart';
 import 'package:enaklo_pos/data/datasources/product_local_datasource.dart';
+import 'package:enaklo_pos/data/models/response/delivery_response_model.dart';
 import 'package:enaklo_pos/data/models/response/discount_response_model.dart';
 import 'package:enaklo_pos/presentation/table/models/draft_order_item.dart';
 import 'package:enaklo_pos/presentation/table/models/draft_order_model.dart';
@@ -58,7 +59,8 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
           currentState.totalQuantity,
           currentState.totalPrice,
           currentState.draftName,
-          currentState.orderType));
+          currentState.orderType,
+          currentState.deliveryType));
     });
 
     on<_RemoveItem>((event, emit) {
@@ -91,7 +93,8 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
           currentState.totalQuantity,
           currentState.totalPrice,
           currentState.draftName,
-          currentState.orderType));
+          currentState.orderType,
+          currentState.deliveryType));
     });
 
     on<_DeleteItem>((event, emit) {
@@ -116,7 +119,8 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
           currentState.totalQuantity,
           currentState.totalPrice,
           currentState.draftName,
-          currentState.orderType));
+          currentState.orderType,
+          currentState.deliveryType));
     });
 
     on<_Started>((event, emit) async {
@@ -126,29 +130,41 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
         final tax = await settingsLocalDatasource.getTax();
         final serviceCharge = await settingsLocalDatasource.getServiceCharge();
 
-        emit(_Loaded([], null, 0, 0, tax.value, serviceCharge, 0, 0, '',
-            OrderType.dineIn));
+        emit(_Loaded(
+          [],
+          null,
+          0,
+          0,
+          tax.value,
+          serviceCharge,
+          0,
+          0,
+          '',
+          OrderType.dineIn,
+          null,
+        ));
       } catch (e) {
         // If loading fails, use default values
         log('Failed to load settings: $e');
-        emit(const _Loaded([], null, 0, 0, 10, 5, 0, 0, '', OrderType.dineIn));
+        emit(const _Loaded(
+            [], null, 0, 0, 10, 5, 0, 0, '', OrderType.dineIn, null));
       }
     });
 
     on<_AddDiscount>((event, emit) {
       var currentState = state as _Loaded;
       emit(_Loaded(
-        currentState.items,
-        event.discount,
-        currentState.discount,
-        currentState.discountAmount,
-        currentState.tax,
-        currentState.serviceCharge,
-        currentState.totalQuantity,
-        currentState.totalPrice,
-        currentState.draftName,
-        currentState.orderType,
-      ));
+          currentState.items,
+          event.discount,
+          currentState.discount,
+          currentState.discountAmount,
+          currentState.tax,
+          currentState.serviceCharge,
+          currentState.totalQuantity,
+          currentState.totalPrice,
+          currentState.draftName,
+          currentState.orderType,
+          currentState.deliveryType));
     });
 
     on<_RemoveDiscount>((event, emit) {
@@ -163,7 +179,8 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
           currentState.totalQuantity,
           currentState.totalPrice,
           currentState.draftName,
-          currentState.orderType));
+          currentState.orderType,
+          currentState.deliveryType));
     });
 
     on<_AddTax>((event, emit) {
@@ -178,7 +195,8 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
           currentState.totalQuantity,
           currentState.totalPrice,
           currentState.draftName,
-          currentState.orderType));
+          currentState.orderType,
+          currentState.deliveryType));
     });
 
     on<_AddServiceCharge>((event, emit) {
@@ -194,6 +212,7 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
         currentState.totalPrice,
         currentState.draftName,
         currentState.orderType,
+        currentState.deliveryType,
       ));
     });
 
@@ -209,7 +228,8 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
           currentState.totalQuantity,
           currentState.totalPrice,
           currentState.draftName,
-          currentState.orderType));
+          currentState.orderType,
+          currentState.deliveryType));
     });
 
     on<_RemoveServiceCharge>((event, emit) {
@@ -224,7 +244,8 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
           currentState.totalQuantity,
           currentState.totalPrice,
           currentState.draftName,
-          currentState.orderType));
+          currentState.orderType,
+          currentState.deliveryType));
     });
 
     on<_UpdateOrderType>((event, emit) {
@@ -239,7 +260,8 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
           currentState.totalQuantity,
           currentState.totalPrice,
           currentState.draftName,
-          event.orderType));
+          event.orderType,
+          currentState.deliveryType));
     });
 
     on<_UpdateItemNotes>((event, emit) {
@@ -260,7 +282,8 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
           currentState.totalQuantity,
           currentState.totalPrice,
           currentState.draftName,
-          currentState.orderType));
+          currentState.orderType,
+          currentState.deliveryType));
     });
 
     on<_SaveDraftOrder>((event, emit) async {
@@ -298,19 +321,38 @@ class CheckoutBloc extends Bloc<CheckoutEvent, CheckoutState> {
       final draftOrder = event.data;
       log("draftOrder: ${draftOrder.toMap()}");
       emit(_Loaded(
-          draftOrder.orders
-              .map((e) =>
-                  ProductQuantity(product: e.product, quantity: e.quantity))
-              .toList(),
-          null,
-          draftOrder.discount,
-          draftOrder.discountAmount,
-          draftOrder.tax,
-          draftOrder.serviceCharge,
-          draftOrder.totalQuantity,
-          draftOrder.totalPrice,
-          draftOrder.draftName,
-          OrderType.dineIn));
+        draftOrder.orders
+            .map((e) =>
+                ProductQuantity(product: e.product, quantity: e.quantity))
+            .toList(),
+        null,
+        draftOrder.discount,
+        draftOrder.discountAmount,
+        draftOrder.tax,
+        draftOrder.serviceCharge,
+        draftOrder.totalQuantity,
+        draftOrder.totalPrice,
+        draftOrder.draftName,
+        OrderType.dineIn,
+        null,
+      ));
+    });
+
+    on<_UpdateDeliveryType>((event, emit) {
+      var currentState = state as _Loaded;
+      emit(_Loaded(
+        currentState.items,
+        currentState.discountModel,
+        currentState.discount,
+        currentState.discountAmount,
+        currentState.tax,
+        currentState.serviceCharge,
+        currentState.totalQuantity,
+        currentState.totalPrice,
+        currentState.draftName,
+        currentState.orderType,
+        event.delivery,
+      ));
     });
   }
 }

lib/presentation/home/bloc/checkout/checkout_event.dart

@@ -42,4 +42,8 @@ class CheckoutEvent with _$CheckoutEvent {
   //load draft order
   const factory CheckoutEvent.loadDraftOrder(DraftOrderModel data) =
       _LoadDraftOrder;
+
+// Update delivery type
+  const factory CheckoutEvent.updateDeliveryType(DeliveryModel delivery) =
+      _UpdateDeliveryType;
 }

lib/presentation/home/bloc/checkout/checkout_state.dart

@@ -5,16 +5,18 @@ class CheckoutState with _$CheckoutState {
   const factory CheckoutState.initial() = _Initial;
   const factory CheckoutState.loading() = _Loading;
   const factory CheckoutState.loaded(
-      List<ProductQuantity> items,
-      Discount? discountModel,
-      int discount,
-      int discountAmount,
-      int tax,
-      int serviceCharge,
-      int totalQuantity,
-      int totalPrice,
-      String draftName,
-      OrderType orderType) = _Loaded;
+    List<ProductQuantity> items,
+    Discount? discountModel,
+    int discount,
+    int discountAmount,
+    int tax,
+    int serviceCharge,
+    int totalQuantity,
+    int totalPrice,
+    String draftName,
+    OrderType orderType,
+    DeliveryModel? deliveryType,
+  ) = _Loaded;
   const factory CheckoutState.error(String message) = _Error;
 
   //save draft order

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

@@ -35,8 +35,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
@@ -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

@@ -20,14 +20,14 @@ mixin _$OrderFormEvent {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)
         createWithPayment,
     required TResult Function(List<ProductQuantity> items, String orderId)
@@ -46,14 +46,14 @@ mixin _$OrderFormEvent {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult? Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -69,14 +69,14 @@ mixin _$OrderFormEvent {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -219,14 +219,14 @@ class _$StartedImpl implements _Started {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)
         createWithPayment,
     required TResult Function(List<ProductQuantity> items, String orderId)
@@ -248,14 +248,14 @@ class _$StartedImpl implements _Started {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult? Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -274,14 +274,14 @@ class _$StartedImpl implements _Started {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -372,7 +372,7 @@ abstract class _$$CreateImplCopyWith<$Res> {
       String customerName,
       Customer? customer,
       OrderType orderType,
-      TableModel table});
+      TableModel? table});
 }
 
 /// @nodoc
@@ -392,7 +392,7 @@ class __$$CreateImplCopyWithImpl<$Res>
     Object? customerName = null,
     Object? customer = freezed,
     Object? orderType = null,
-    Object? table = null,
+    Object? table = freezed,
   }) {
     return _then(_$CreateImpl(
       items: null == items
@@ -411,10 +411,10 @@ class __$$CreateImplCopyWithImpl<$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?,
     ));
   }
 }
@@ -445,7 +445,7 @@ class _$CreateImpl implements _Create {
   @override
   final OrderType orderType;
   @override
-  final TableModel table;
+  final TableModel? table;
 
   @override
   String toString() {
@@ -489,14 +489,14 @@ class _$CreateImpl implements _Create {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)
         createWithPayment,
     required TResult Function(List<ProductQuantity> items, String orderId)
@@ -518,14 +518,14 @@ class _$CreateImpl implements _Create {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult? Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -544,14 +544,14 @@ class _$CreateImpl implements _Create {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -625,13 +625,13 @@ abstract class _Create implements OrderFormEvent {
       required final String customerName,
       required final Customer? customer,
       required final OrderType orderType,
-      required final TableModel table}) = _$CreateImpl;
+      required final TableModel? table}) = _$CreateImpl;
 
   List<ProductQuantity> get items;
   String get customerName;
   Customer? get customer;
   OrderType get orderType;
-  TableModel get table;
+  TableModel? get table;
 
   /// Create a copy of OrderFormEvent
   /// with the given fields replaced by the non-null parameter values.
@@ -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;
 
@@ -783,14 +783,14 @@ class _$CreateWithPaymentMethodImpl implements _CreateWithPaymentMethod {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)
         createWithPayment,
     required TResult Function(List<ProductQuantity> items, String orderId)
@@ -813,14 +813,14 @@ class _$CreateWithPaymentMethodImpl implements _CreateWithPaymentMethod {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult? Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -840,14 +840,14 @@ class _$CreateWithPaymentMethodImpl implements _CreateWithPaymentMethod {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
             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
@@ -1027,14 +1027,14 @@ class _$AddToOrderImpl implements _AddToOrder {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)
         createWithPayment,
     required TResult Function(List<ProductQuantity> items, String orderId)
@@ -1056,14 +1056,14 @@ class _$AddToOrderImpl implements _AddToOrder {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult? Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -1082,14 +1082,14 @@ class _$AddToOrderImpl implements _AddToOrder {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -1269,14 +1269,14 @@ class _$RefundImpl implements _Refund {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)
         createWithPayment,
     required TResult Function(List<ProductQuantity> items, String orderId)
@@ -1298,14 +1298,14 @@ class _$RefundImpl implements _Refund {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult? Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -1324,14 +1324,14 @@ class _$RefundImpl implements _Refund {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -1513,14 +1513,14 @@ class _$VoidOrderImpl implements _VoidOrder {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)
         createWithPayment,
     required TResult Function(List<ProductQuantity> items, String orderId)
@@ -1542,14 +1542,14 @@ class _$VoidOrderImpl implements _VoidOrder {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult? Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -1568,14 +1568,14 @@ class _$VoidOrderImpl implements _VoidOrder {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -1730,14 +1730,14 @@ class _$ToggleItemImpl implements _ToggleItem {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)
         createWithPayment,
     required TResult Function(List<ProductQuantity> items, String orderId)
@@ -1759,14 +1759,14 @@ class _$ToggleItemImpl implements _ToggleItem {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult? Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -1785,14 +1785,14 @@ class _$ToggleItemImpl implements _ToggleItem {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -1944,14 +1944,14 @@ class _$ToggleSelectAllImpl implements _ToggleSelectAll {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)
         createWithPayment,
     required TResult Function(List<ProductQuantity> items, String orderId)
@@ -1973,14 +1973,14 @@ class _$ToggleSelectAllImpl implements _ToggleSelectAll {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
             String customerName,
             Customer? customer,
             OrderType orderType,
-            TableModel table,
+            TableModel? table,
             PaymentMethod paymentMethod)?
         createWithPayment,
     TResult? Function(List<ProductQuantity> items, String orderId)? addToOrder,
@@ -1999,14 +1999,14 @@ class _$ToggleSelectAllImpl implements _ToggleSelectAll {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
             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

@@ -8,14 +8,14 @@ class OrderFormEvent with _$OrderFormEvent {
     required String customerName,
     required Customer? customer,
     required OrderType orderType,
-    required TableModel table,
+    required TableModel? table,
   }) = _Create;
   const factory OrderFormEvent.createWithPayment({
     required List<ProductQuantity> items,
     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/bloc/product_loader/product_loader_bloc.dart

@@ -49,6 +49,7 @@ class ProductLoaderBloc extends Bloc<ProductLoaderEvent, ProductLoaderState> {
     final result = await _productRemoteDatasource.getProducts(
       page: 1,
       limit: 10,
+      categoryId: event.categoryId,
     );
 
     await result.fold(
@@ -93,6 +94,7 @@ class ProductLoaderBloc extends Bloc<ProductLoaderEvent, ProductLoaderState> {
       final result = await _productRemoteDatasource.getProducts(
         page: nextPage,
         limit: 10,
+        categoryId: event.categoryId,
       );
 
       await result.fold(

lib/presentation/home/bloc/product_loader/product_loader_bloc.freezed.dart

@@ -18,22 +18,22 @@ final _privateConstructorUsedError = UnsupportedError(
 mixin _$ProductLoaderEvent {
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function() getProduct,
-    required TResult Function() loadMore,
+    required TResult Function(String? categoryId, String? search) getProduct,
+    required TResult Function(String? categoryId, String? search) loadMore,
     required TResult Function() refresh,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? getProduct,
-    TResult? Function()? loadMore,
+    TResult? Function(String? categoryId, String? search)? getProduct,
+    TResult? Function(String? categoryId, String? search)? loadMore,
     TResult? Function()? refresh,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? getProduct,
-    TResult Function()? loadMore,
+    TResult Function(String? categoryId, String? search)? getProduct,
+    TResult Function(String? categoryId, String? search)? loadMore,
     TResult Function()? refresh,
     required TResult orElse(),
   }) =>
@@ -88,6 +88,8 @@ abstract class _$$GetProductImplCopyWith<$Res> {
   factory _$$GetProductImplCopyWith(
           _$GetProductImpl value, $Res Function(_$GetProductImpl) then) =
       __$$GetProductImplCopyWithImpl<$Res>;
+  @useResult
+  $Res call({String? categoryId, String? search});
 }
 
 /// @nodoc
@@ -100,57 +102,91 @@ class __$$GetProductImplCopyWithImpl<$Res>
 
   /// Create a copy of ProductLoaderEvent
   /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? categoryId = freezed,
+    Object? search = freezed,
+  }) {
+    return _then(_$GetProductImpl(
+      categoryId: freezed == categoryId
+          ? _value.categoryId
+          : categoryId // ignore: cast_nullable_to_non_nullable
+              as String?,
+      search: freezed == search
+          ? _value.search
+          : search // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ));
+  }
 }
 
 /// @nodoc
 
 class _$GetProductImpl implements _GetProduct {
-  const _$GetProductImpl();
+  const _$GetProductImpl({this.categoryId, this.search});
+
+  @override
+  final String? categoryId;
+  @override
+  final String? search;
 
   @override
   String toString() {
-    return 'ProductLoaderEvent.getProduct()';
+    return 'ProductLoaderEvent.getProduct(categoryId: $categoryId, search: $search)';
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType && other is _$GetProductImpl);
+        (other.runtimeType == runtimeType &&
+            other is _$GetProductImpl &&
+            (identical(other.categoryId, categoryId) ||
+                other.categoryId == categoryId) &&
+            (identical(other.search, search) || other.search == search));
   }
 
   @override
-  int get hashCode => runtimeType.hashCode;
+  int get hashCode => Object.hash(runtimeType, categoryId, search);
+
+  /// Create a copy of ProductLoaderEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$GetProductImplCopyWith<_$GetProductImpl> get copyWith =>
+      __$$GetProductImplCopyWithImpl<_$GetProductImpl>(this, _$identity);
 
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function() getProduct,
-    required TResult Function() loadMore,
+    required TResult Function(String? categoryId, String? search) getProduct,
+    required TResult Function(String? categoryId, String? search) loadMore,
     required TResult Function() refresh,
   }) {
-    return getProduct();
+    return getProduct(categoryId, search);
   }
 
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? getProduct,
-    TResult? Function()? loadMore,
+    TResult? Function(String? categoryId, String? search)? getProduct,
+    TResult? Function(String? categoryId, String? search)? loadMore,
     TResult? Function()? refresh,
   }) {
-    return getProduct?.call();
+    return getProduct?.call(categoryId, search);
   }
 
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? getProduct,
-    TResult Function()? loadMore,
+    TResult Function(String? categoryId, String? search)? getProduct,
+    TResult Function(String? categoryId, String? search)? loadMore,
     TResult Function()? refresh,
     required TResult orElse(),
   }) {
     if (getProduct != null) {
-      return getProduct();
+      return getProduct(categoryId, search);
     }
     return orElse();
   }
@@ -191,7 +227,17 @@ class _$GetProductImpl implements _GetProduct {
 }
 
 abstract class _GetProduct implements ProductLoaderEvent {
-  const factory _GetProduct() = _$GetProductImpl;
+  const factory _GetProduct({final String? categoryId, final String? search}) =
+      _$GetProductImpl;
+
+  String? get categoryId;
+  String? get search;
+
+  /// Create a copy of ProductLoaderEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$GetProductImplCopyWith<_$GetProductImpl> get copyWith =>
+      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
@@ -199,6 +245,8 @@ abstract class _$$LoadMoreImplCopyWith<$Res> {
   factory _$$LoadMoreImplCopyWith(
           _$LoadMoreImpl value, $Res Function(_$LoadMoreImpl) then) =
       __$$LoadMoreImplCopyWithImpl<$Res>;
+  @useResult
+  $Res call({String? categoryId, String? search});
 }
 
 /// @nodoc
@@ -211,57 +259,91 @@ class __$$LoadMoreImplCopyWithImpl<$Res>
 
   /// Create a copy of ProductLoaderEvent
   /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? categoryId = freezed,
+    Object? search = freezed,
+  }) {
+    return _then(_$LoadMoreImpl(
+      categoryId: freezed == categoryId
+          ? _value.categoryId
+          : categoryId // ignore: cast_nullable_to_non_nullable
+              as String?,
+      search: freezed == search
+          ? _value.search
+          : search // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ));
+  }
 }
 
 /// @nodoc
 
 class _$LoadMoreImpl implements _LoadMore {
-  const _$LoadMoreImpl();
+  const _$LoadMoreImpl({this.categoryId, this.search});
+
+  @override
+  final String? categoryId;
+  @override
+  final String? search;
 
   @override
   String toString() {
-    return 'ProductLoaderEvent.loadMore()';
+    return 'ProductLoaderEvent.loadMore(categoryId: $categoryId, search: $search)';
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType && other is _$LoadMoreImpl);
+        (other.runtimeType == runtimeType &&
+            other is _$LoadMoreImpl &&
+            (identical(other.categoryId, categoryId) ||
+                other.categoryId == categoryId) &&
+            (identical(other.search, search) || other.search == search));
   }
 
   @override
-  int get hashCode => runtimeType.hashCode;
+  int get hashCode => Object.hash(runtimeType, categoryId, search);
+
+  /// Create a copy of ProductLoaderEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$LoadMoreImplCopyWith<_$LoadMoreImpl> get copyWith =>
+      __$$LoadMoreImplCopyWithImpl<_$LoadMoreImpl>(this, _$identity);
 
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function() getProduct,
-    required TResult Function() loadMore,
+    required TResult Function(String? categoryId, String? search) getProduct,
+    required TResult Function(String? categoryId, String? search) loadMore,
     required TResult Function() refresh,
   }) {
-    return loadMore();
+    return loadMore(categoryId, search);
   }
 
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? getProduct,
-    TResult? Function()? loadMore,
+    TResult? Function(String? categoryId, String? search)? getProduct,
+    TResult? Function(String? categoryId, String? search)? loadMore,
     TResult? Function()? refresh,
   }) {
-    return loadMore?.call();
+    return loadMore?.call(categoryId, search);
   }
 
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? getProduct,
-    TResult Function()? loadMore,
+    TResult Function(String? categoryId, String? search)? getProduct,
+    TResult Function(String? categoryId, String? search)? loadMore,
     TResult Function()? refresh,
     required TResult orElse(),
   }) {
     if (loadMore != null) {
-      return loadMore();
+      return loadMore(categoryId, search);
     }
     return orElse();
   }
@@ -302,7 +384,17 @@ class _$LoadMoreImpl implements _LoadMore {
 }
 
 abstract class _LoadMore implements ProductLoaderEvent {
-  const factory _LoadMore() = _$LoadMoreImpl;
+  const factory _LoadMore({final String? categoryId, final String? search}) =
+      _$LoadMoreImpl;
+
+  String? get categoryId;
+  String? get search;
+
+  /// Create a copy of ProductLoaderEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$LoadMoreImplCopyWith<_$LoadMoreImpl> get copyWith =>
+      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
@@ -346,8 +438,8 @@ class _$RefreshImpl implements _Refresh {
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function() getProduct,
-    required TResult Function() loadMore,
+    required TResult Function(String? categoryId, String? search) getProduct,
+    required TResult Function(String? categoryId, String? search) loadMore,
     required TResult Function() refresh,
   }) {
     return refresh();
@@ -356,8 +448,8 @@ class _$RefreshImpl implements _Refresh {
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? getProduct,
-    TResult? Function()? loadMore,
+    TResult? Function(String? categoryId, String? search)? getProduct,
+    TResult? Function(String? categoryId, String? search)? loadMore,
     TResult? Function()? refresh,
   }) {
     return refresh?.call();
@@ -366,8 +458,8 @@ class _$RefreshImpl implements _Refresh {
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? getProduct,
-    TResult Function()? loadMore,
+    TResult Function(String? categoryId, String? search)? getProduct,
+    TResult Function(String? categoryId, String? search)? loadMore,
     TResult Function()? refresh,
     required TResult orElse(),
   }) {

lib/presentation/home/bloc/product_loader/product_loader_event.dart

@@ -2,7 +2,9 @@ part of 'product_loader_bloc.dart';
 
 @freezed
 class ProductLoaderEvent with _$ProductLoaderEvent {
-  const factory ProductLoaderEvent.getProduct() = _GetProduct;
-  const factory ProductLoaderEvent.loadMore() = _LoadMore;
+  const factory ProductLoaderEvent.getProduct(
+      {String? categoryId, String? search}) = _GetProduct;
+  const factory ProductLoaderEvent.loadMore(
+      {String? categoryId, String? search}) = _LoadMore;
   const factory ProductLoaderEvent.refresh() = _Refresh;
 }

lib/presentation/home/bloc/qris/qris_bloc.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:developer';
 
 import 'package:flutter_bloc/flutter_bloc.dart';

lib/presentation/home/bloc/user_update_outlet/user_update_outlet_bloc.dart

@@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:bloc/bloc.dart';
 import 'package:enaklo_pos/data/datasources/user_remote_datasource.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

lib/presentation/home/dialog/confirm_save_order_dialog.dart

@@ -0,0 +1,410 @@
+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/core/extensions/int_ext.dart';
+import 'package:enaklo_pos/data/models/response/customer_response_model.dart';
+import 'package:enaklo_pos/data/models/response/delivery_response_model.dart';
+import 'package:enaklo_pos/presentation/home/bloc/order_form/order_form_bloc.dart';
+import 'package:enaklo_pos/presentation/home/models/order_type.dart';
+import 'package:enaklo_pos/presentation/home/models/product_quantity.dart';
+import 'package:enaklo_pos/presentation/success/pages/success_save_order_page.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class ConfirmSaveOrderDialog extends StatelessWidget {
+  final String customerName;
+  final OrderType orderType;
+  final List<ProductQuantity> items;
+  final Customer? customer;
+  final DeliveryModel? delivery;
+
+  const ConfirmSaveOrderDialog({
+    super.key,
+    required this.customerName,
+    required this.orderType,
+    required this.items,
+    this.customer,
+    this.delivery,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Dialog(
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(16),
+      ),
+      elevation: 8,
+      child: Container(
+        width: MediaQuery.of(context).size.width * 0.9,
+        constraints: BoxConstraints(
+          maxWidth: 600,
+          maxHeight: MediaQuery.of(context).size.height * 0.8,
+        ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            // Header
+            Container(
+              width: double.infinity,
+              padding: EdgeInsets.all(20),
+              decoration: BoxDecoration(
+                gradient: LinearGradient(
+                  colors: [
+                    AppColors.primary,
+                    AppColors.primary.withOpacity(0.8)
+                  ],
+                  begin: Alignment.topLeft,
+                  end: Alignment.bottomRight,
+                ),
+                borderRadius: BorderRadius.only(
+                  topLeft: Radius.circular(16),
+                  topRight: Radius.circular(16),
+                ),
+              ),
+              child: Column(
+                children: [
+                  Container(
+                    width: 50,
+                    height: 50,
+                    decoration: BoxDecoration(
+                      color: Colors.white.withOpacity(0.2),
+                      shape: BoxShape.circle,
+                    ),
+                    child: Icon(
+                      Icons.warning_rounded,
+                      color: Colors.white,
+                      size: 28,
+                    ),
+                  ),
+                  SizedBox(height: 12),
+                  Text(
+                    'Konfirmasi Pesanan',
+                    style: TextStyle(
+                      color: Colors.white,
+                      fontSize: 20,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  Text(
+                    'Tindakan ini tidak dapat dibatalkan',
+                    style: TextStyle(
+                      color: Colors.white.withOpacity(0.9),
+                      fontSize: 12,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+
+            // Scrollable Content
+            Flexible(
+              child: SingleChildScrollView(
+                padding: EdgeInsets.all(20),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    // Main message
+                    Container(
+                      width: double.infinity,
+                      padding: EdgeInsets.all(16),
+                      decoration: BoxDecoration(
+                        color: Colors.grey[50],
+                        borderRadius: BorderRadius.circular(12),
+                        border: Border.all(color: Colors.grey[200]!),
+                      ),
+                      child: Text(
+                        message,
+                        style: TextStyle(
+                          fontSize: 14,
+                          height: 1.4,
+                          color: Colors.grey[800],
+                        ),
+                      ),
+                    ),
+
+                    if (items.isNotEmpty) ...[
+                      SizedBox(height: 16),
+
+                      // Items section
+                      Container(
+                        width: double.infinity,
+                        decoration: BoxDecoration(
+                          color: Colors.orange[50],
+                          borderRadius: BorderRadius.circular(12),
+                          border: Border.all(color: Colors.orange[200]!),
+                        ),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Padding(
+                              padding: EdgeInsets.all(16),
+                              child: Row(
+                                children: [
+                                  Container(
+                                    padding: EdgeInsets.all(6),
+                                    decoration: BoxDecoration(
+                                      color: Colors.orange[100],
+                                      borderRadius: BorderRadius.circular(6),
+                                    ),
+                                    child: Icon(
+                                      Icons.list_alt_rounded,
+                                      color: Colors.orange[700],
+                                      size: 16,
+                                    ),
+                                  ),
+                                  SizedBox(width: 8),
+                                  Text(
+                                    'Item yang akan dipesan:',
+                                    style: TextStyle(
+                                      fontWeight: FontWeight.bold,
+                                      fontSize: 14,
+                                      color: Colors.orange[800],
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                            Container(
+                              constraints: BoxConstraints(maxHeight: 120),
+                              child: Scrollbar(
+                                child: SingleChildScrollView(
+                                  padding: EdgeInsets.only(
+                                      left: 16, right: 16, bottom: 16),
+                                  child: Column(
+                                    children: items.map((item) {
+                                      return Container(
+                                        margin: EdgeInsets.only(bottom: 6),
+                                        padding: EdgeInsets.all(10),
+                                        decoration: BoxDecoration(
+                                          color: Colors.white,
+                                          borderRadius:
+                                              BorderRadius.circular(6),
+                                          boxShadow: [
+                                            BoxShadow(
+                                              color: Colors.black
+                                                  .withOpacity(0.03),
+                                              blurRadius: 2,
+                                              offset: Offset(0, 1),
+                                            ),
+                                          ],
+                                        ),
+                                        child: Row(
+                                          children: [
+                                            Container(
+                                              width: 6,
+                                              height: 6,
+                                              decoration: BoxDecoration(
+                                                color: Colors.red[400],
+                                                shape: BoxShape.circle,
+                                              ),
+                                            ),
+                                            SizedBox(width: 8),
+                                            Expanded(
+                                              child: Column(
+                                                crossAxisAlignment:
+                                                    CrossAxisAlignment.start,
+                                                children: [
+                                                  Text(
+                                                    item.product.name ??
+                                                        'Unknown Product',
+                                                    style: TextStyle(
+                                                      fontWeight:
+                                                          FontWeight.w600,
+                                                      fontSize: 12,
+                                                    ),
+                                                    maxLines: 1,
+                                                    overflow:
+                                                        TextOverflow.ellipsis,
+                                                  ),
+                                                  Text(
+                                                    '${item.quantity} qty',
+                                                    style: TextStyle(
+                                                      fontSize: 10,
+                                                      color: Colors.grey[600],
+                                                    ),
+                                                  ),
+                                                ],
+                                              ),
+                                            ),
+                                            Container(
+                                              padding: EdgeInsets.symmetric(
+                                                  horizontal: 6, vertical: 2),
+                                              decoration: BoxDecoration(
+                                                color: Colors.red[100],
+                                                borderRadius:
+                                                    BorderRadius.circular(4),
+                                              ),
+                                              child: Text(
+                                                ((item.product.price ?? 0) *
+                                                        item.quantity)
+                                                    .currencyFormatRpV2,
+                                                style: TextStyle(
+                                                  fontSize: 10,
+                                                  fontWeight: FontWeight.bold,
+                                                  color: Colors.red[700],
+                                                ),
+                                              ),
+                                            ),
+                                          ],
+                                        ),
+                                      );
+                                    }).toList(),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+
+                    SizedBox(height: 16),
+                  ],
+                ),
+              ),
+            ),
+
+            // Action buttons
+            Container(
+              padding: EdgeInsets.all(20),
+              decoration: BoxDecoration(
+                color: Colors.grey[50],
+                borderRadius: BorderRadius.only(
+                  bottomLeft: Radius.circular(16),
+                  bottomRight: Radius.circular(16),
+                ),
+              ),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: SizedBox(
+                      height: 44,
+                      child: ElevatedButton(
+                        onPressed: () => Navigator.pop(context),
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: Colors.grey[300],
+                          foregroundColor: Colors.grey[700],
+                          elevation: 0,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Icon(Icons.close_rounded, size: 18),
+                            SizedBox(width: 6),
+                            Text(
+                              'Batal',
+                              style: TextStyle(
+                                fontSize: 14,
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                  SizedBox(width: 12),
+                  Expanded(
+                    child: BlocListener<OrderFormBloc, OrderFormState>(
+                      listener: (context, state) {
+                        state.maybeWhen(
+                          orElse: () {},
+                          success: (data) {
+                            context.pushReplacement(SuccessSaveOrderPage(
+                              productQuantity: items,
+                              orderId: data.id ?? "",
+                            ));
+                          },
+                          error: (message) =>
+                              AppFlushbar.showError(context, message),
+                        );
+                      },
+                      child: BlocBuilder<OrderFormBloc, OrderFormState>(
+                        builder: (context, state) {
+                          return state.maybeWhen(
+                            orElse: () => SizedBox(
+                              height: 44,
+                              child: ElevatedButton(
+                                onPressed: () {
+                                  context.read<OrderFormBloc>().add(
+                                        OrderFormEvent.create(
+                                          items: items,
+                                          customerName: customerName,
+                                          orderType: orderType,
+                                          table: null,
+                                          customer: customer,
+                                        ),
+                                      );
+                                },
+                                style: ElevatedButton.styleFrom(
+                                  backgroundColor: AppColors.primary,
+                                  foregroundColor: Colors.white,
+                                  elevation: 2,
+                                  shadowColor:
+                                      AppColors.primary.withOpacity(0.3),
+                                  shape: RoundedRectangleBorder(
+                                    borderRadius: BorderRadius.circular(8),
+                                  ),
+                                ),
+                                child: Row(
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: [
+                                    Icon(Icons.delete_forever_rounded,
+                                        size: 18),
+                                    SizedBox(width: 6),
+                                    Text(
+                                      'Konfirmasi',
+                                      style: TextStyle(
+                                        fontSize: 14,
+                                        fontWeight: FontWeight.bold,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
+                            loading: () =>
+                                Center(child: CircularProgressIndicator()),
+                          );
+                        },
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  String get message {
+    switch (orderType) {
+      case OrderType.dineIn:
+        return 'Konfirmasi untuk menyimpan pesanan Dine-In\n\n'
+            'Pesanan untuk ${customerName.isNotEmpty ? customerName : "Pelanggan"} akan disimpan ke dalam sistem. '
+            'Pelanggan dapat langsung menikmati pesanan di meja yang telah disediakan. '
+            'Pastikan semua item pesanan sudah sesuai sebelum menyimpan.';
+
+      case OrderType.delivery:
+        return 'Konfirmasi untuk menyimpan pesanan Delivery\n\n'
+            'Pesanan delivery untuk ${customerName.isNotEmpty ? customerName : "Pelanggan"} akan disimpan. '
+            '${delivery != null ? "Pengiriman: ${delivery!.name}. " : ""}'
+            'Tim delivery akan segera mempersiapkan pesanan.';
+
+      case OrderType.takeAway:
+        return 'Konfirmasi untuk menyimpan pesanan Take Away\n\n'
+            'Pesanan take away untuk ${customerName.isNotEmpty ? customerName : "Pelanggan"} akan disimpan. '
+            'Dapur akan mulai mempersiapkan pesanan dan pelanggan dapat mengambil pesanan sesuai estimasi waktu yang diberikan.';
+
+      case OrderType.freeTable:
+        return 'Konfirmasi untuk menyimpan pesanan Free Table\n\n'
+            'Pesanan free table untuk ${customerName.isNotEmpty ? customerName : "Pelanggan"} akan disimpan. '
+            'Meja akan direservasi dan pesanan akan dipersiapkan sesuai dengan waktu kedatangan pelanggan.';
+    }
+  }
+}

lib/presentation/home/dialog/delivery_dialog.dart

@@ -0,0 +1,114 @@
+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/data/datasources/delivery_local_datasource.dart';
+import 'package:enaklo_pos/data/models/response/delivery_response_model.dart';
+import 'package:enaklo_pos/presentation/home/bloc/checkout/checkout_bloc.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class DeliveryDialog extends StatefulWidget {
+  const DeliveryDialog({super.key});
+
+  @override
+  State<DeliveryDialog> createState() => _DeliveryDialogState();
+}
+
+class _DeliveryDialogState extends State<DeliveryDialog> {
+  @override
+  Widget build(BuildContext context) {
+    return CustomModalDialog(
+      title: 'Pilih Pengiriman',
+      subtitle: 'Silahkan pilih pengiriman yang sesuai',
+      contentPadding:
+          const EdgeInsets.symmetric(horizontal: 16.0, vertical: 24.0),
+      child: BlocBuilder<CheckoutBloc, CheckoutState>(
+        builder: (context, state) {
+          return state.maybeWhen(
+              orElse: () => const SizedBox.shrink(),
+              loaded: (items,
+                  discountModel,
+                  discount,
+                  discountAmount,
+                  tax,
+                  serviceCharge,
+                  totalQuantity,
+                  totalPrice,
+                  draftName,
+                  orderType,
+                  deliveryType) {
+                return Column(
+                  children: List.generate(deliveries.length, (index) {
+                    return _buildItem(
+                      context,
+                      deliveries[index],
+                      selectedType: deliveryType,
+                    );
+                  }),
+                );
+              });
+        },
+      ),
+    );
+  }
+
+  Widget _buildItem(BuildContext context, DeliveryModel delivery,
+      {DeliveryModel? selectedType}) {
+    return GestureDetector(
+      onTap: () {
+        context.read<CheckoutBloc>().add(
+              CheckoutEvent.updateDeliveryType(delivery),
+            );
+        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?.id == delivery.id
+              ? AppColors.primary
+              : AppColors.white,
+          borderRadius: BorderRadius.circular(8.0),
+          border: Border.all(
+            color: selectedType?.id == delivery.id
+                ? AppColors.primary
+                : AppColors.grey,
+            width: 1.0,
+          ),
+        ),
+        child: Row(
+          children: [
+            Image.asset(
+              delivery.imageUrl,
+              width: 40.0,
+              height: 40.0,
+              fit: BoxFit.contain,
+            ),
+            SpaceWidth(12.0),
+            Expanded(
+              child: Text(
+                delivery.name,
+                style: TextStyle(
+                  fontSize: 16,
+                  color: selectedType?.id == delivery.id
+                      ? AppColors.white
+                      : AppColors.black,
+                  fontWeight: FontWeight.bold,
+                ),
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+            SpaceWidth(12.0),
+            Icon(
+              Icons.check_circle,
+              color: selectedType?.id == delivery.id
+                  ? AppColors.green
+                  : Colors.transparent,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/presentation/home/dialog/outlet_dialog.dart

@@ -69,24 +69,35 @@ class _OutletDialogState extends State<OutletDialog> {
                   ),
                 ),
                 SpaceHeight(24),
-                BlocBuilder<UserUpdateOutletBloc, UserUpdateOutletState>(
-                  builder: (context, state) {
-                    return state.maybeWhen(
-                      orElse: () => Button.filled(
-                        onPressed: selectedOutlet == null
-                            ? null
-                            : () {
-                                context.read<UserUpdateOutletBloc>().add(
-                                    UserUpdateOutletEvent.update(
-                                        selectedOutlet!.id ?? ""));
-                              },
-                        label: 'Terapkan',
-                      ),
-                      loading: () => Center(
-                        child: CircularProgressIndicator(),
-                      ),
+                BlocListener<UserUpdateOutletBloc, UserUpdateOutletState>(
+                  listener: (context, state) {
+                    state.maybeWhen(
+                      orElse: () {},
+                      success: () {
+                        context.pop();
+                      },
                     );
                   },
+                  child:
+                      BlocBuilder<UserUpdateOutletBloc, UserUpdateOutletState>(
+                    builder: (context, state) {
+                      return state.maybeWhen(
+                        orElse: () => Button.filled(
+                          onPressed: selectedOutlet == null
+                              ? null
+                              : () {
+                                  context.read<UserUpdateOutletBloc>().add(
+                                      UserUpdateOutletEvent.update(
+                                          selectedOutlet!.id ?? ""));
+                                },
+                          label: 'Terapkan',
+                        ),
+                        loading: () => Center(
+                          child: CircularProgressIndicator(),
+                        ),
+                      );
+                    },
+                  ),
                 ),
               ],
             ),

lib/presentation/home/dialog/payment_add_order_dialog.dart

@@ -1,3 +1,6 @@
+import 'dart:developer';
+
+import 'package:dropdown_search/dropdown_search.dart';
 import 'package:enaklo_pos/core/components/buttons.dart';
 import 'package:enaklo_pos/core/components/custom_modal_dialog.dart';
 import 'package:enaklo_pos/core/components/flushbar.dart';
@@ -26,9 +29,14 @@ class _PaymentAddOrderDialogState extends State<PaymentAddOrderDialog> {
   @override
   void initState() {
     super.initState();
-    context
-        .read<OrderLoaderBloc>()
-        .add(OrderLoaderEvent.getByStatus('pending'));
+    context.read<OrderLoaderBloc>().add(
+          OrderLoaderEvent.getByStatus(
+            'pending',
+            dateFrom: DateTime.now(),
+            dateTo: DateTime.now(),
+            limit: 20,
+          ),
+        );
   }
 
   @override
@@ -62,7 +70,13 @@ class _PaymentAddOrderDialogState extends State<PaymentAddOrderDialog> {
                       Center(child: const CircularProgressIndicator()),
                   loading: () =>
                       Center(child: const CircularProgressIndicator()),
-                  loaded: (orders, totalOrder) {
+                  loaded: (
+                    orders,
+                    totalOrder,
+                    _,
+                    __,
+                    ___,
+                  ) {
                     final availableOrders = orders;
 
                     if (selectOrder == null && availableOrders.isNotEmpty) {
@@ -87,40 +101,183 @@ class _PaymentAddOrderDialogState extends State<PaymentAddOrderDialog> {
                       );
                     }
 
-                    return Container(
-                      padding: const EdgeInsets.symmetric(horizontal: 16),
-                      decoration: BoxDecoration(
-                        color: Colors.white,
-                        borderRadius: BorderRadius.circular(16),
-                        border: Border.all(
-                          color: Theme.of(context).primaryColor,
-                          width: 2,
+                    return DropdownSearch<Order>(
+                      items: orders,
+                      selectedItem: selectOrder,
+
+                      // Dropdown properties
+                      dropdownDecoratorProps: DropDownDecoratorProps(
+                        dropdownSearchDecoration: InputDecoration(
+                          hintText: "Pilih Meja",
+                          hintStyle: TextStyle(
+                            color: Colors.grey.shade600,
+                            fontSize: 14,
+                          ),
+                          prefixIcon: Icon(
+                            Icons.category_outlined,
+                            color: Colors.grey.shade500,
+                            size: 20,
+                          ),
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: Colors.grey.shade300,
+                              width: 1.5,
+                            ),
+                          ),
+                          enabledBorder: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: Colors.grey.shade300,
+                              width: 1.5,
+                            ),
+                          ),
+                          focusedBorder: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: Colors.blue.shade400,
+                              width: 2,
+                            ),
+                          ),
+                          filled: true,
+                          fillColor: Colors.white,
+                          contentPadding: const EdgeInsets.symmetric(
+                            horizontal: 16,
+                            vertical: 16,
+                          ),
                         ),
                       ),
-                      child: DropdownButtonHideUnderline(
-                        child: DropdownButton<Order>(
-                          isExpanded: true,
-                          value: availableOrders.firstWhere(
-                            (t) => t.id == selectOrder?.id,
-                            orElse: () => availableOrders.first,
+
+                      // Popup properties
+                      popupProps: PopupProps.menu(
+                        showSearchBox: true,
+                        searchFieldProps: TextFieldProps(
+                          decoration: InputDecoration(
+                            hintText: "Cari meja...",
+                            prefixIcon: const Icon(Icons.search),
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(8),
+                            ),
+                            contentPadding: const EdgeInsets.symmetric(
+                              horizontal: 16,
+                              vertical: 12,
+                            ),
                           ),
-                          onChanged: (Order? newValue) {
-                            setState(() {
-                              selectOrder = newValue;
-                            });
-                          },
-                          items: availableOrders
-                              .map<DropdownMenuItem<Order>>(
-                                (Order value) => DropdownMenuItem<Order>(
-                                  value: value,
-                                  child: Text(
-                                    "${value.tableNumber ?? ""} - ${value.metadata?['customer_name'] ?? ""}",
+                        ),
+                        menuProps: MenuProps(
+                          backgroundColor: Colors.white,
+                          elevation: 8,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                        ),
+                        itemBuilder: (context, order, isSelected) {
+                          return Container(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 16,
+                              vertical: 12,
+                            ),
+                            decoration: BoxDecoration(
+                              color: isSelected
+                                  ? Colors.blue.shade50
+                                  : Colors.transparent,
+                              border: Border(
+                                bottom: BorderSide(
+                                  color: Colors.grey.shade100,
+                                  width: 0.5,
+                                ),
+                              ),
+                            ),
+                            child: Row(
+                              children: [
+                                Container(
+                                  width: 8,
+                                  height: 8,
+                                  decoration: BoxDecoration(
+                                    color: isSelected
+                                        ? Colors.blue.shade600
+                                        : Colors.grey.shade400,
+                                    shape: BoxShape.circle,
                                   ),
                                 ),
-                              )
-                              .toList(),
-                        ),
+                                const SizedBox(width: 12),
+                                Expanded(
+                                  child: Text(
+                                    "${order.tableNumber ?? ""} - ${order.metadata?['customer_name']}",
+                                    style: TextStyle(
+                                      fontSize: 14,
+                                      fontWeight: isSelected
+                                          ? FontWeight.w600
+                                          : FontWeight.w500,
+                                      color: isSelected
+                                          ? Colors.blue.shade700
+                                          : Colors.black87,
+                                    ),
+                                  ),
+                                ),
+                                if (isSelected)
+                                  Icon(
+                                    Icons.check,
+                                    color: Colors.blue.shade600,
+                                    size: 18,
+                                  ),
+                              ],
+                            ),
+                          );
+                        },
+                        emptyBuilder: (context, searchEntry) {
+                          return Container(
+                            padding: const EdgeInsets.all(20),
+                            child: Column(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                Icon(
+                                  Icons.search_off,
+                                  color: Colors.grey.shade400,
+                                  size: 48,
+                                ),
+                                const SizedBox(height: 12),
+                                Text(
+                                  searchEntry.isEmpty
+                                      ? "Tidak ada meja tersedia"
+                                      : "Tidak ditemukan meja dengan '${searchEntry}'",
+                                  style: TextStyle(
+                                    color: Colors.grey.shade600,
+                                    fontSize: 14,
+                                  ),
+                                  textAlign: TextAlign.center,
+                                ),
+                              ],
+                            ),
+                          );
+                        },
                       ),
+
+                      // Item as string (for search functionality)
+                      itemAsString: (Order order) => order.tableNumber ?? "",
+
+                      // Comparison function
+                      compareFn: (Order? item1, Order? item2) {
+                        return item1?.id == item2?.id;
+                      },
+
+                      // On changed callback
+                      onChanged: (Order? selectedOrder) {
+                        if (selectedOrder != null) {
+                          setState(() {
+                            selectOrder = selectedOrder;
+                          });
+                          log("selectOrder: ${selectOrder!.tableNumber}");
+                        }
+                      },
+
+                      // Validator (optional)
+                      validator: (Order? value) {
+                        if (value == null) {
+                          return "Meja harus dipilih";
+                        }
+                        return null;
+                      },
                     );
                   },
                 );
@@ -132,7 +289,8 @@ class _PaymentAddOrderDialogState extends State<PaymentAddOrderDialog> {
             listener: (context, state) {
               state.maybeWhen(
                 orElse: () {},
-                success: (data) {
+                successMsg: () {
+                  context.pop();
                   context.pushReplacement(
                     SuccessSaveOrderPage(
                       productQuantity: widget.items,

lib/presentation/home/dialog/payment_qris_dialog.dart

@@ -13,8 +13,6 @@ import 'package:intl/intl.dart';
 import 'package:enaklo_pos/core/extensions/build_context_ext.dart';
 import 'package:enaklo_pos/presentation/home/bloc/qris/qris_bloc.dart';
 import 'package:enaklo_pos/presentation/home/widgets/success_payment_dialog.dart';
-import 'package:enaklo_pos/presentation/setting/bloc/sync_order/sync_order_bloc.dart';
-import 'package:print_bluetooth_thermal/print_bluetooth_thermal.dart';
 import 'package:widgets_to_image/widgets_to_image.dart';
 import 'package:enaklo_pos/core/utils/printer_service.dart';
 
@@ -230,24 +228,25 @@ class _PaymentQrisDialogState extends State<PaymentQrisDialog> {
                   ElevatedButton(
                     onPressed: () async {
                       try {
-                        final sizeReceipt = await AuthLocalDataSource().getSizeReceipt();
+                        final sizeReceipt =
+                            await AuthLocalDataSource().getSizeReceipt();
                         final bytes = await controller.capture();
                         final printValue = await PrintDataoutputs.instance
-                            .printQRIS(widget.price, bytes!, int.parse(sizeReceipt));
-                        
+                            .printQRIS(
+                                widget.price, bytes!, int.parse(sizeReceipt));
+
                         // Get the receipt printer to print QRIS
-                        final receiptPrinter = await ProductLocalDatasource.instance
+                        final receiptPrinter = await ProductLocalDatasource
+                            .instance
                             .getPrinterByCode('receipt');
-                        
+
                         if (receiptPrinter != null) {
                           await PrinterService().printWithPrinter(
-                            receiptPrinter, 
-                            printValue, 
-                            context
-                          );
+                              receiptPrinter, printValue, context);
                         } else {
                           ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(content: Text('No receipt printer configured')),
+                            SnackBar(
+                                content: Text('No receipt printer configured')),
                           );
                         }
                       } catch (e) {

lib/presentation/home/dialog/payment_save_dialog.dart

@@ -1,3 +1,6 @@
+import 'dart:developer';
+
+import 'package:dropdown_search/dropdown_search.dart';
 import 'package:enaklo_pos/core/components/buttons.dart';
 import 'package:enaklo_pos/core/components/custom_modal_dialog.dart';
 import 'package:enaklo_pos/core/components/flushbar.dart';
@@ -103,39 +106,183 @@ class _PaymentSaveDialogState extends State<PaymentSaveDialog> {
                       );
                     }
 
-                    return Container(
-                      padding: const EdgeInsets.symmetric(horizontal: 16),
-                      decoration: BoxDecoration(
-                        color: Colors.white,
-                        borderRadius: BorderRadius.circular(16),
-                        border: Border.all(
-                          color: Theme.of(context).primaryColor,
-                          width: 2,
-                        ),
-                      ),
-                      child: DropdownButtonHideUnderline(
-                        child: DropdownButton<TableModel>(
-                          isExpanded: true,
-                          value: availableTables.firstWhere(
-                            (t) => t.id == selectTable?.id,
-                            orElse: () => availableTables.first,
+                    return DropdownSearch<TableModel>(
+                      items: tables,
+                      selectedItem: selectTable,
+
+                      // Dropdown properties
+                      dropdownDecoratorProps: DropDownDecoratorProps(
+                        dropdownSearchDecoration: InputDecoration(
+                          hintText: "Pilih meja",
+                          hintStyle: TextStyle(
+                            color: Colors.grey.shade600,
+                            fontSize: 14,
+                          ),
+                          prefixIcon: Icon(
+                            Icons.category_outlined,
+                            color: Colors.grey.shade500,
+                            size: 20,
+                          ),
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: Colors.grey.shade300,
+                              width: 1.5,
+                            ),
+                          ),
+                          enabledBorder: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: Colors.grey.shade300,
+                              width: 1.5,
+                            ),
+                          ),
+                          focusedBorder: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: Colors.blue.shade400,
+                              width: 2,
+                            ),
+                          ),
+                          filled: true,
+                          fillColor: Colors.white,
+                          contentPadding: const EdgeInsets.symmetric(
+                            horizontal: 16,
+                            vertical: 16,
                           ),
-                          onChanged: (TableModel? newValue) {
-                            setState(() {
-                              selectTable = newValue;
-                            });
-                          },
-                          items: availableTables
-                              .map<DropdownMenuItem<TableModel>>(
-                                (TableModel value) =>
-                                    DropdownMenuItem<TableModel>(
-                                  value: value,
-                                  child: Text(value.tableName ?? ""),
-                                ),
-                              )
-                              .toList(),
                         ),
                       ),
+
+                      // Popup properties
+                      popupProps: PopupProps.menu(
+                        showSearchBox: true,
+                        searchFieldProps: TextFieldProps(
+                          decoration: InputDecoration(
+                            hintText: "Cari meja...",
+                            prefixIcon: const Icon(Icons.search),
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(8),
+                            ),
+                            contentPadding: const EdgeInsets.symmetric(
+                              horizontal: 16,
+                              vertical: 12,
+                            ),
+                          ),
+                        ),
+                        menuProps: MenuProps(
+                          backgroundColor: Colors.white,
+                          elevation: 8,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                        ),
+                        itemBuilder: (context, category, isSelected) {
+                          return Container(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 16,
+                              vertical: 12,
+                            ),
+                            decoration: BoxDecoration(
+                              color: isSelected
+                                  ? Colors.blue.shade50
+                                  : Colors.transparent,
+                              border: Border(
+                                bottom: BorderSide(
+                                  color: Colors.grey.shade100,
+                                  width: 0.5,
+                                ),
+                              ),
+                            ),
+                            child: Row(
+                              children: [
+                                Container(
+                                  width: 8,
+                                  height: 8,
+                                  decoration: BoxDecoration(
+                                    color: isSelected
+                                        ? Colors.blue.shade600
+                                        : Colors.grey.shade400,
+                                    shape: BoxShape.circle,
+                                  ),
+                                ),
+                                const SizedBox(width: 12),
+                                Expanded(
+                                  child: Text(
+                                    category.tableName ?? "",
+                                    style: TextStyle(
+                                      fontSize: 14,
+                                      fontWeight: isSelected
+                                          ? FontWeight.w600
+                                          : FontWeight.w500,
+                                      color: isSelected
+                                          ? Colors.blue.shade700
+                                          : Colors.black87,
+                                    ),
+                                  ),
+                                ),
+                                if (isSelected)
+                                  Icon(
+                                    Icons.check,
+                                    color: Colors.blue.shade600,
+                                    size: 18,
+                                  ),
+                              ],
+                            ),
+                          );
+                        },
+                        emptyBuilder: (context, searchEntry) {
+                          return Container(
+                            padding: const EdgeInsets.all(20),
+                            child: Column(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                Icon(
+                                  Icons.search_off,
+                                  color: Colors.grey.shade400,
+                                  size: 48,
+                                ),
+                                const SizedBox(height: 12),
+                                Text(
+                                  searchEntry.isEmpty
+                                      ? "Tidak ada meja tersedia"
+                                      : "Tidak ditemukan meja dengan '${searchEntry}'",
+                                  style: TextStyle(
+                                    color: Colors.grey.shade600,
+                                    fontSize: 14,
+                                  ),
+                                  textAlign: TextAlign.center,
+                                ),
+                              ],
+                            ),
+                          );
+                        },
+                      ),
+
+                      // Item as string (for search functionality)
+                      itemAsString: (TableModel table) => table.tableName ?? "",
+
+                      // Comparison function
+                      compareFn: (TableModel? item1, TableModel? item2) {
+                        return item1?.id == item2?.id;
+                      },
+
+                      // On changed callback
+                      onChanged: (TableModel? selectedTable) {
+                        if (selectedTable != null) {
+                          setState(() {
+                            selectTable = selectedTable;
+                          });
+                          log("selectTable: ${selectTable!.tableName}");
+                        }
+                      },
+
+                      // Validator (optional)
+                      validator: (TableModel? value) {
+                        if (value == null) {
+                          return "Meja harus dipilih";
+                        }
+                        return null;
+                      },
                     );
                   },
                 );
@@ -148,6 +295,7 @@ class _PaymentSaveDialogState extends State<PaymentSaveDialog> {
               state.maybeWhen(
                 orElse: () {},
                 success: (data) {
+                  context.pop();
                   context.pushReplacement(SuccessSaveOrderPage(
                     productQuantity: widget.items,
                     orderId: data.id ?? "",

lib/presentation/home/dialog/save_dialog.dart

@@ -3,7 +3,9 @@ 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/data/models/response/customer_response_model.dart';
+import 'package:enaklo_pos/data/models/response/delivery_response_model.dart';
 import 'package:enaklo_pos/data/models/response/table_model.dart';
+import 'package:enaklo_pos/presentation/home/dialog/confirm_save_order_dialog.dart';
 import 'package:enaklo_pos/presentation/home/dialog/payment_add_order_dialog.dart';
 import 'package:enaklo_pos/presentation/home/dialog/payment_save_dialog.dart';
 import 'package:enaklo_pos/presentation/home/models/order_type.dart';
@@ -16,6 +18,7 @@ class SaveDialog extends StatefulWidget {
   final OrderType orderType;
   final List<ProductQuantity> items;
   final Customer? customer;
+  final DeliveryModel? deliveryModel;
 
   const SaveDialog({
     super.key,
@@ -24,6 +27,7 @@ class SaveDialog extends StatefulWidget {
     required this.orderType,
     required this.items,
     required this.customer,
+    this.deliveryModel,
   });
 
   @override
@@ -46,16 +50,29 @@ class _SaveDialogState extends State<SaveDialog> {
               subtitle: 'Simpan pesanan dan bayar nanti',
               onTap: () {
                 context.pop();
-                showDialog(
-                  context: context,
-                  builder: (context) => PaymentSaveDialog(
-                    selectedTable: widget.selectedTable,
-                    customerName: widget.customerName,
-                    orderType: widget.orderType,
-                    items: widget.items,
-                    customer: widget.customer,
-                  ),
-                );
+                if (OrderType.dineIn == widget.orderType) {
+                  showDialog(
+                    context: context,
+                    builder: (context) => PaymentSaveDialog(
+                      selectedTable: widget.selectedTable,
+                      customerName: widget.customerName,
+                      orderType: widget.orderType,
+                      items: widget.items,
+                      customer: widget.customer,
+                    ),
+                  );
+                } else {
+                  showDialog(
+                    context: context,
+                    builder: (context) => ConfirmSaveOrderDialog(
+                      delivery: widget.deliveryModel,
+                      customerName: widget.customerName,
+                      orderType: widget.orderType,
+                      items: widget.items,
+                      customer: widget.customer,
+                    ),
+                  );
+                }
               }),
           SpaceHeight(16.0),
           _item(

lib/presentation/home/dialog/service_dialog.dart

@@ -56,7 +56,19 @@ class ServiceDialog extends StatelessWidget {
               return state.maybeWhen(
                 initial: () => const SizedBox(),
                 loading: () => const Center(child: CircularProgressIndicator()),
-                loaded: (data, a, b, c, d, service, e, f, g, orderType) =>
+                loaded: (
+                  data,
+                  a,
+                  b,
+                  c,
+                  d,
+                  service,
+                  e,
+                  f,
+                  g,
+                  orderType,
+                  deliveryType,
+                ) =>
                     _buildServiceItem(context, service),
                 orElse: () => const SizedBox(),
               );

lib/presentation/home/dialog/tax_dialog.dart

@@ -44,7 +44,20 @@ class TaxDialog extends StatelessWidget {
               return state.maybeWhen(
                 initial: () => const SizedBox(),
                 loading: () => const Center(child: CircularProgressIndicator()),
-                loaded: (data, a, b, c, tax, d, e, f, g, orderType) => ListTile(
+                loaded: (
+                  data,
+                  a,
+                  b,
+                  c,
+                  tax,
+                  d,
+                  e,
+                  f,
+                  g,
+                  orderType,
+                  deliveryType,
+                ) =>
+                    ListTile(
                   title: const Text('PB1'),
                   subtitle: Text('tarif pajak ($tax%)'),
                   contentPadding: EdgeInsets.zero,

lib/presentation/home/dialog/type_dialog.dart

@@ -34,10 +34,10 @@ class _TypeDialogState extends State<TypeDialog> {
       'type': OrderType.delivery,
     },
     {
-      'value': 'grab',
-      'label': 'Grab',
-      'icon': Icons.two_wheeler,
-      'type': OrderType.grab,
+      'value': 'free_table',
+      'label': 'Free Table',
+      'icon': Icons.table_bar_outlined,
+      'type': OrderType.freeTable,
     },
   ];
 
@@ -52,16 +52,19 @@ class _TypeDialogState extends State<TypeDialog> {
         builder: (context, state) {
           return state.maybeWhen(
               orElse: () => const SizedBox.shrink(),
-              loaded: (items,
-                  discountModel,
-                  discount,
-                  discountAmount,
-                  tax,
-                  serviceCharge,
-                  totalQuantity,
-                  totalPrice,
-                  draftName,
-                  orderType) {
+              loaded: (
+                items,
+                discountModel,
+                discount,
+                discountAmount,
+                tax,
+                serviceCharge,
+                totalQuantity,
+                totalPrice,
+                draftName,
+                orderType,
+                deliveryType,
+              ) {
                 return Column(
                   children: List.generate(types.length, (index) {
                     return _buildItem(

lib/presentation/home/dialog/variant_dialog.dart

@@ -51,7 +51,7 @@ class VariantDialog extends StatelessWidget {
                   Text(
                     (variant.priceModifier ?? 0).currencyFormatRpV2,
                     style: TextStyle(
-                      color: AppColors.grey,
+                      color: AppColors.black,
                     ),
                   ),
                 ],

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
@@ -54,10 +53,14 @@ class OrderRequestModel {
       "customer_name": customerName,
     };
 
-    if (customerId != null || customerId != "") {
+    if (customerId != null && customerId != "") {
       data["customer_id"] = customerId;
     }
 
+    if (tableId != null && tableId != "") {
+      data["table_id"] = tableId;
+    }
+
     return data;
   }
 }

lib/presentation/home/models/order_type.dart

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

lib/presentation/home/models/outlet_model.dart

@@ -1,5 +1,7 @@
 import 'dart:convert';
 
+import 'package:enaklo_pos/data/type/bussines_type.dart';
+
 class OutletResponse {
   final bool? success;
   final OutletData? data;
@@ -101,7 +103,7 @@ class Outlet {
   final String? name;
   final String? address;
   final String? phoneNumber;
-  final String? businessType;
+  final BusinessType? businessType;
   final String? currency;
   final int? taxRate;
   final bool? isActive;
@@ -128,7 +130,7 @@ class Outlet {
         name: json["name"],
         address: json["address"],
         phoneNumber: json["phone_number"],
-        businessType: json["business_type"],
+        businessType: BusinessType.fromString(json["business_type"]),
         currency: json["currency"],
         taxRate: json["tax_rate"],
         isActive: json["is_active"],
@@ -146,7 +148,7 @@ class Outlet {
         "name": name,
         "address": address,
         "phone_number": phoneNumber,
-        "business_type": businessType,
+        "business_type": businessType?.value,
         "currency": currency,
         "tax_rate": taxRate,
         "is_active": isActive,

lib/presentation/home/pages/confirm_payment_page-old.dart

@@ -11,13 +11,11 @@ import 'package:enaklo_pos/data/models/response/table_model.dart';
 import 'package:enaklo_pos/presentation/home/bloc/get_table_status/get_table_status_bloc.dart';
 import 'package:enaklo_pos/presentation/home/bloc/order/order_bloc.dart';
 import 'package:enaklo_pos/presentation/home/bloc/payment_methods/payment_methods_bloc.dart';
-import 'package:enaklo_pos/presentation/home/bloc/status_table/status_table_bloc.dart';
 import 'package:enaklo_pos/presentation/home/models/product_quantity.dart';
 import 'package:enaklo_pos/presentation/home/models/order_type.dart';
 import 'package:enaklo_pos/presentation/home/widgets/save_order_dialog.dart';
 import 'package:enaklo_pos/data/models/response/payment_methods_response_model.dart';
 import 'package:enaklo_pos/data/datasources/product_local_datasource.dart';
-import 'package:enaklo_pos/presentation/table/models/draft_order_item.dart';
 
 import '../../../core/components/buttons.dart';
 import '../../../core/components/spaces.dart';
@@ -200,16 +198,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                               orElse: () => const Center(
                                 child: Text('No Items'),
                               ),
-                              loaded: (products,
-                                  discountModel,
-                                  discount,
-                                  discountAmount,
-                                  tax,
-                                  serviceCharge,
-                                  totalQuantity,
-                                  totalPrice,
-                                  draftName,
-                                  orderType) {
+                              loaded: (
+                                products,
+                                discountModel,
+                                discount,
+                                discountAmount,
+                                tax,
+                                serviceCharge,
+                                totalQuantity,
+                                totalPrice,
+                                draftName,
+                                orderType,
+                                deliveryType,
+                              ) {
                                 if (products.isEmpty) {
                                   return const Center(
                                     child: Text('No Items'),
@@ -242,16 +243,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                               builder: (context, state) {
                                 final price = state.maybeWhen(
                                     orElse: () => 0,
-                                    loaded: (products,
-                                            discountModel,
-                                            discount,
-                                            discountAmount,
-                                            tax,
-                                            serviceCharge,
-                                            totalQuantity,
-                                            totalPrice,
-                                            draftName,
-                                            orderType) =>
+                                    loaded: (
+                                      products,
+                                      discountModel,
+                                      discount,
+                                      discountAmount,
+                                      tax,
+                                      serviceCharge,
+                                      totalQuantity,
+                                      totalPrice,
+                                      draftName,
+                                      orderType,
+                                      deliveryType,
+                                    ) =>
                                         products.fold(
                                           0,
                                           (previousValue, element) =>
@@ -282,16 +286,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                               builder: (context, state) {
                                 final discount = state.maybeWhen(
                                     orElse: () => 0,
-                                    loaded: (products,
-                                        discountModel,
-                                        discount,
-                                        discountAmount,
-                                        tax,
-                                        serviceCharge,
-                                        totalQuantity,
-                                        totalPrice,
-                                        draftName,
-                                        orderType) {
+                                    loaded: (
+                                      products,
+                                      discountModel,
+                                      discount,
+                                      discountAmount,
+                                      tax,
+                                      serviceCharge,
+                                      totalQuantity,
+                                      totalPrice,
+                                      draftName,
+                                      orderType,
+                                      deliveryType,
+                                    ) {
                                       if (discountModel == null) {
                                         return 0;
                                       }
@@ -302,16 +309,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
 
                                 final subTotal = state.maybeWhen(
                                     orElse: () => 0,
-                                    loaded: (products,
-                                            discountModel,
-                                            discount,
-                                            discountAmount,
-                                            tax,
-                                            serviceCharge,
-                                            totalQuantity,
-                                            totalPrice,
-                                            draftName,
-                                            orderType) =>
+                                    loaded: (
+                                      products,
+                                      discountModel,
+                                      discount,
+                                      discountAmount,
+                                      tax,
+                                      serviceCharge,
+                                      totalQuantity,
+                                      totalPrice,
+                                      draftName,
+                                      orderType,
+                                      deliveryType,
+                                    ) =>
                                         products.fold(
                                           0,
                                           (previousValue, element) =>
@@ -345,30 +355,36 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                               builder: (context, state) {
                                 final tax = state.maybeWhen(
                                   orElse: () => 0,
-                                  loaded: (products,
-                                          discountModel,
-                                          discount,
-                                          discountAmount,
-                                          tax,
-                                          serviceCharge,
-                                          totalQuantity,
-                                          totalPrice,
-                                          draftName,
-                                          orderType) =>
+                                  loaded: (
+                                    products,
+                                    discountModel,
+                                    discount,
+                                    discountAmount,
+                                    tax,
+                                    serviceCharge,
+                                    totalQuantity,
+                                    totalPrice,
+                                    draftName,
+                                    orderType,
+                                    deliveryType,
+                                  ) =>
                                       tax,
                                 );
                                 final price = state.maybeWhen(
                                   orElse: () => 0,
-                                  loaded: (products,
-                                          discountModel,
-                                          discount,
-                                          discountAmount,
-                                          tax,
-                                          serviceCharge,
-                                          totalQuantity,
-                                          totalPrice,
-                                          draftName,
-                                          orderType) =>
+                                  loaded: (
+                                    products,
+                                    discountModel,
+                                    discount,
+                                    discountAmount,
+                                    tax,
+                                    serviceCharge,
+                                    totalQuantity,
+                                    totalPrice,
+                                    draftName,
+                                    orderType,
+                                    deliveryType,
+                                  ) =>
                                       products.fold(
                                     0,
                                     (previousValue, element) =>
@@ -380,16 +396,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
 
                                 final discount = state.maybeWhen(
                                     orElse: () => 0,
-                                    loaded: (products,
-                                        discountModel,
-                                        discount,
-                                        discountAmount,
-                                        tax,
-                                        serviceCharge,
-                                        totalQuantity,
-                                        totalPrice,
-                                        draftName,
-                                        orderType) {
+                                    loaded: (
+                                      products,
+                                      discountModel,
+                                      discount,
+                                      discountAmount,
+                                      tax,
+                                      serviceCharge,
+                                      totalQuantity,
+                                      totalPrice,
+                                      draftName,
+                                      orderType,
+                                      deliveryType,
+                                    ) {
                                       if (discountModel == null) {
                                         return 0;
                                       }
@@ -427,31 +446,37 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                               builder: (context, state) {
                                 final serviceCharge = state.maybeWhen(
                                   orElse: () => 0,
-                                  loaded: (products,
-                                          discountModel,
-                                          discount,
-                                          discountAmount,
-                                          tax,
-                                          serviceCharge,
-                                          totalQuantity,
-                                          totalPrice,
-                                          draftName,
-                                          orderType) =>
+                                  loaded: (
+                                    products,
+                                    discountModel,
+                                    discount,
+                                    discountAmount,
+                                    tax,
+                                    serviceCharge,
+                                    totalQuantity,
+                                    totalPrice,
+                                    draftName,
+                                    orderType,
+                                    deliveryType,
+                                  ) =>
                                       serviceCharge,
                                 );
 
                                 final price = state.maybeWhen(
                                   orElse: () => 0,
-                                  loaded: (products,
-                                          discountModel,
-                                          discount,
-                                          discountAmount,
-                                          tax,
-                                          serviceCharge,
-                                          totalQuantity,
-                                          totalPrice,
-                                          draftName,
-                                          orderType) =>
+                                  loaded: (
+                                    products,
+                                    discountModel,
+                                    discount,
+                                    discountAmount,
+                                    tax,
+                                    serviceCharge,
+                                    totalQuantity,
+                                    totalPrice,
+                                    draftName,
+                                    orderType,
+                                    deliveryType,
+                                  ) =>
                                       products.fold(
                                     0,
                                     (previousValue, element) =>
@@ -493,16 +518,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                               builder: (context, state) {
                                 final price = state.maybeWhen(
                                   orElse: () => 0,
-                                  loaded: (products,
-                                          discountModel,
-                                          discount,
-                                          discountAmount,
-                                          tax,
-                                          serviceCharge,
-                                          totalQuantity,
-                                          totalPrice,
-                                          draftName,
-                                          orderType) =>
+                                  loaded: (
+                                    products,
+                                    discountModel,
+                                    discount,
+                                    discountAmount,
+                                    tax,
+                                    serviceCharge,
+                                    totalQuantity,
+                                    totalPrice,
+                                    draftName,
+                                    orderType,
+                                    deliveryType,
+                                  ) =>
                                       products.fold(
                                     0,
                                     (previousValue, element) =>
@@ -514,16 +542,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
 
                                 final discount = state.maybeWhen(
                                     orElse: () => 0,
-                                    loaded: (products,
-                                        discountModel,
-                                        discount,
-                                        discountAmount,
-                                        tax,
-                                        serviceCharge,
-                                        totalQuantity,
-                                        totalPrice,
-                                        draftName,
-                                        orderType) {
+                                    loaded: (
+                                      products,
+                                      discountModel,
+                                      discount,
+                                      discountAmount,
+                                      tax,
+                                      serviceCharge,
+                                      totalQuantity,
+                                      totalPrice,
+                                      draftName,
+                                      orderType,
+                                      deliveryType,
+                                    ) {
                                       if (discountModel == null) {
                                         return 0;
                                       }
@@ -534,31 +565,37 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
 
                                 final tax = state.maybeWhen(
                                   orElse: () => 0,
-                                  loaded: (products,
-                                          discountModel,
-                                          discount,
-                                          discountAmount,
-                                          tax,
-                                          serviceCharge,
-                                          totalQuantity,
-                                          totalPrice,
-                                          draftName,
-                                          orderType) =>
+                                  loaded: (
+                                    products,
+                                    discountModel,
+                                    discount,
+                                    discountAmount,
+                                    tax,
+                                    serviceCharge,
+                                    totalQuantity,
+                                    totalPrice,
+                                    draftName,
+                                    orderType,
+                                    deliveryType,
+                                  ) =>
                                       tax,
                                 );
 
                                 final serviceCharge = state.maybeWhen(
                                   orElse: () => 0,
-                                  loaded: (products,
-                                          discountModel,
-                                          discount,
-                                          discountAmount,
-                                          tax,
-                                          serviceCharge,
-                                          totalQuantity,
-                                          totalPrice,
-                                          draftName,
-                                          orderType) =>
+                                  loaded: (
+                                    products,
+                                    discountModel,
+                                    discount,
+                                    discountAmount,
+                                    tax,
+                                    serviceCharge,
+                                    totalQuantity,
+                                    totalPrice,
+                                    draftName,
+                                    orderType,
+                                    deliveryType,
+                                  ) =>
                                       serviceCharge,
                                 );
 
@@ -1222,16 +1259,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                     builder: (context, state) {
                                       final discount = state.maybeWhen(
                                           orElse: () => 0,
-                                          loaded: (products,
-                                              discountModel,
-                                              discount,
-                                              discountAmount,
-                                              tax,
-                                              serviceCharge,
-                                              totalQuantity,
-                                              totalPrice,
-                                              draftName,
-                                              orderType) {
+                                          loaded: (
+                                            products,
+                                            discountModel,
+                                            discount,
+                                            discountAmount,
+                                            tax,
+                                            serviceCharge,
+                                            totalQuantity,
+                                            totalPrice,
+                                            draftName,
+                                            orderType,
+                                            deliveryType,
+                                          ) {
                                             if (discountModel == null) {
                                               return 0;
                                             }
@@ -1242,16 +1282,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
 
                                       final price = state.maybeWhen(
                                         orElse: () => 0,
-                                        loaded: (products,
-                                                discountModel,
-                                                discount,
-                                                discountAmount,
-                                                tax,
-                                                serviceCharge,
-                                                totalQuantity,
-                                                totalPrice,
-                                                draftName,
-                                                orderType) =>
+                                        loaded: (
+                                          products,
+                                          discountModel,
+                                          discount,
+                                          discountAmount,
+                                          tax,
+                                          serviceCharge,
+                                          totalQuantity,
+                                          totalPrice,
+                                          draftName,
+                                          orderType,
+                                          deliveryType,
+                                        ) =>
                                             products.fold(
                                           0,
                                           (previousValue, element) =>
@@ -1263,46 +1306,55 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
 
                                       final serviceCharge = state.maybeWhen(
                                         orElse: () => 0,
-                                        loaded: (products,
-                                                discountModel,
-                                                discount,
-                                                discountAmount,
-                                                tax,
-                                                serviceCharge,
-                                                totalQuantity,
-                                                totalPrice,
-                                                draftName,
-                                                orderType) =>
+                                        loaded: (
+                                          products,
+                                          discountModel,
+                                          discount,
+                                          discountAmount,
+                                          tax,
+                                          serviceCharge,
+                                          totalQuantity,
+                                          totalPrice,
+                                          draftName,
+                                          orderTyp,
+                                          deliveryType,
+                                        ) =>
                                             serviceCharge,
                                       );
 
                                       final tax = state.maybeWhen(
                                         orElse: () => 0,
-                                        loaded: (products,
-                                                discountModel,
-                                                discount,
-                                                discountAmount,
-                                                tax,
-                                                serviceCharge,
-                                                totalQuantity,
-                                                totalPrice,
-                                                draftName,
-                                                orderType) =>
+                                        loaded: (
+                                          products,
+                                          discountModel,
+                                          discount,
+                                          discountAmount,
+                                          tax,
+                                          serviceCharge,
+                                          totalQuantity,
+                                          totalPrice,
+                                          draftName,
+                                          orderType,
+                                          deliveryType,
+                                        ) =>
                                             tax,
                                       );
 
                                       final orderType = state.maybeWhen(
                                         orElse: () => OrderType.dineIn,
-                                        loaded: (products,
-                                                discountModel,
-                                                discount,
-                                                discountAmount,
-                                                tax,
-                                                serviceCharge,
-                                                totalQuantity,
-                                                totalPrice,
-                                                draftName,
-                                                orderType) =>
+                                        loaded: (
+                                          products,
+                                          discountModel,
+                                          discount,
+                                          discountAmount,
+                                          tax,
+                                          serviceCharge,
+                                          totalQuantity,
+                                          totalPrice,
+                                          draftName,
+                                          orderType,
+                                          deliveryType,
+                                        ) =>
                                             orderType,
                                       );
 
@@ -1317,16 +1369,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                       List<ProductQuantity> items =
                                           state.maybeWhen(
                                         orElse: () => [],
-                                        loaded: (products,
-                                                discountModel,
-                                                discount,
-                                                discountAmount,
-                                                tax,
-                                                serviceCharge,
-                                                totalQuantity,
-                                                totalPrice,
-                                                draftName,
-                                                orderType) =>
+                                        loaded: (
+                                          products,
+                                          discountModel,
+                                          discount,
+                                          discountAmount,
+                                          tax,
+                                          serviceCharge,
+                                          totalQuantity,
+                                          totalPrice,
+                                          draftName,
+                                          orderType,
+                                          deliveryType,
+                                        ) =>
                                             products,
                                       );
                                       final totalQty = items.fold(

lib/presentation/home/pages/confirm_payment_page.dart

@@ -5,6 +5,7 @@ import 'package:enaklo_pos/core/components/dashed_divider.dart';
 import 'package:enaklo_pos/core/components/flushbar.dart';
 import 'package:enaklo_pos/core/extensions/build_context_ext.dart';
 import 'package:enaklo_pos/data/models/response/customer_response_model.dart';
+import 'package:enaklo_pos/data/models/response/delivery_response_model.dart';
 import 'package:enaklo_pos/presentation/home/bloc/order_form/order_form_bloc.dart';
 import 'package:enaklo_pos/presentation/home/dialog/save_dialog.dart';
 import 'package:enaklo_pos/presentation/home/models/order_type.dart';
@@ -132,16 +133,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                             builder: (context, state) {
                               return state.maybeWhen(
                                 orElse: () => const SizedBox(),
-                                loaded: (products,
-                                    discountModel,
-                                    discount,
-                                    discountAmount,
-                                    tax,
-                                    serviceCharge,
-                                    totalQuantity,
-                                    totalPrice,
-                                    draftName,
-                                    orderType) {
+                                loaded: (
+                                  products,
+                                  discountModel,
+                                  discount,
+                                  discountAmount,
+                                  tax,
+                                  serviceCharge,
+                                  totalQuantity,
+                                  totalPrice,
+                                  draftName,
+                                  orderType,
+                                  deliveryType,
+                                ) {
                                   return Container(
                                     decoration: BoxDecoration(
                                       borderRadius: BorderRadius.circular(8.0),
@@ -221,16 +225,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                               orElse: () => const Center(
                                 child: Text('No Items'),
                               ),
-                              loaded: (products,
-                                  discountModel,
-                                  discount,
-                                  discountAmount,
-                                  tax,
-                                  serviceCharge,
-                                  totalQuantity,
-                                  totalPrice,
-                                  draftName,
-                                  orderType) {
+                              loaded: (
+                                products,
+                                discountModel,
+                                discount,
+                                discountAmount,
+                                tax,
+                                serviceCharge,
+                                totalQuantity,
+                                totalPrice,
+                                draftName,
+                                orderType,
+                                deliveryType,
+                              ) {
                                 if (products.isEmpty) {
                                   return const Center(
                                     child: Text('No Items'),
@@ -263,6 +270,59 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                         ),
                         child: Column(
                           children: [
+                            BlocBuilder<CheckoutBloc, CheckoutState>(
+                              builder: (context, state) {
+                                return state.maybeWhen(
+                                    orElse: () => const SizedBox.shrink(),
+                                    loaded: (
+                                      products,
+                                      discountModel,
+                                      discount,
+                                      discountAmount,
+                                      tax,
+                                      serviceCharge,
+                                      totalQuantity,
+                                      totalPrice,
+                                      draftName,
+                                      orderType,
+                                      deliveryType,
+                                    ) {
+                                      if (deliveryType == null) {
+                                        return const SizedBox.shrink();
+                                      }
+
+                                      return Column(
+                                        children: [
+                                          Row(
+                                            mainAxisAlignment:
+                                                MainAxisAlignment.spaceBetween,
+                                            children: [
+                                              Text(
+                                                'Pengiriman',
+                                                style: TextStyle(
+                                                  color: AppColors.black,
+                                                  fontWeight: FontWeight.w600,
+                                                ),
+                                              ),
+                                              Text(
+                                                deliveryType.name,
+                                                style: TextStyle(
+                                                  color: AppColors.black,
+                                                  fontWeight: FontWeight.w600,
+                                                ),
+                                              ),
+                                            ],
+                                          ),
+                                          const SpaceHeight(8.0),
+                                          DashedDivider(
+                                            color: AppColors.grey,
+                                          ),
+                                          const SpaceHeight(8.0),
+                                        ],
+                                      );
+                                    });
+                              },
+                            ),
                             Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
@@ -277,22 +337,28 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                   builder: (context, state) {
                                     final price = state.maybeWhen(
                                         orElse: () => 0,
-                                        loaded: (products,
-                                                discountModel,
-                                                discount,
-                                                discountAmount,
-                                                tax,
-                                                serviceCharge,
-                                                totalQuantity,
-                                                totalPrice,
-                                                draftName,
-                                                orderType) =>
+                                        loaded: (
+                                          products,
+                                          discountModel,
+                                          discount,
+                                          discountAmount,
+                                          tax,
+                                          serviceCharge,
+                                          totalQuantity,
+                                          totalPrice,
+                                          draftName,
+                                          orderType,
+                                          deliveryType,
+                                        ) =>
                                             products.fold(
                                               0,
                                               (previousValue, element) =>
                                                   previousValue +
                                                   (element.product.price! *
-                                                      element.quantity),
+                                                      element.quantity) +
+                                                  (element.variant
+                                                          ?.priceModifier ??
+                                                      0),
                                             ));
                                     return Text(
                                       price.currencyFormatRp,
@@ -320,30 +386,36 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                   builder: (context, state) {
                                     final tax = state.maybeWhen(
                                       orElse: () => 0,
-                                      loaded: (products,
-                                              discountModel,
-                                              discount,
-                                              discountAmount,
-                                              tax,
-                                              serviceCharge,
-                                              totalQuantity,
-                                              totalPrice,
-                                              draftName,
-                                              orderType) =>
+                                      loaded: (
+                                        products,
+                                        discountModel,
+                                        discount,
+                                        discountAmount,
+                                        tax,
+                                        serviceCharge,
+                                        totalQuantity,
+                                        totalPrice,
+                                        draftName,
+                                        orderType,
+                                        deliveryType,
+                                      ) =>
                                           tax,
                                     );
                                     final price = state.maybeWhen(
                                       orElse: () => 0,
-                                      loaded: (products,
-                                              discountModel,
-                                              discount,
-                                              discountAmount,
-                                              tax,
-                                              serviceCharge,
-                                              totalQuantity,
-                                              totalPrice,
-                                              draftName,
-                                              orderType) =>
+                                      loaded: (
+                                        products,
+                                        discountModel,
+                                        discount,
+                                        discountAmount,
+                                        tax,
+                                        serviceCharge,
+                                        totalQuantity,
+                                        totalPrice,
+                                        draftName,
+                                        orderType,
+                                        deliveryType,
+                                      ) =>
                                           products.fold(
                                         0,
                                         (previousValue, element) =>
@@ -355,16 +427,19 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
 
                                     final discount = state.maybeWhen(
                                         orElse: () => 0,
-                                        loaded: (products,
-                                            discountModel,
-                                            discount,
-                                            discountAmount,
-                                            tax,
-                                            serviceCharge,
-                                            totalQuantity,
-                                            totalPrice,
-                                            draftName,
-                                            orderType) {
+                                        loaded: (
+                                          products,
+                                          discountModel,
+                                          discount,
+                                          discountAmount,
+                                          tax,
+                                          serviceCharge,
+                                          totalQuantity,
+                                          totalPrice,
+                                          draftName,
+                                          orderType,
+                                          deliveryType,
+                                        ) {
                                           if (discountModel == null) {
                                             return 0;
                                           }
@@ -410,37 +485,45 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                   builder: (context, state) {
                                     final price = state.maybeWhen(
                                       orElse: () => 0,
-                                      loaded: (products,
-                                              discountModel,
-                                              discount,
-                                              discountAmount,
-                                              tax,
-                                              serviceCharge,
-                                              totalQuantity,
-                                              totalPrice,
-                                              draftName,
-                                              orderType) =>
+                                      loaded: (
+                                        products,
+                                        discountModel,
+                                        discount,
+                                        discountAmount,
+                                        tax,
+                                        serviceCharge,
+                                        totalQuantity,
+                                        totalPrice,
+                                        draftName,
+                                        orderType,
+                                        deliveryType,
+                                      ) =>
                                           products.fold(
                                         0,
                                         (previousValue, element) =>
                                             previousValue +
                                             (element.product.price! *
-                                                element.quantity),
+                                                element.quantity) +
+                                            (element.variant?.priceModifier ??
+                                                0),
                                       ),
                                     );
 
                                     final discount = state.maybeWhen(
                                         orElse: () => 0,
-                                        loaded: (products,
-                                            discountModel,
-                                            discount,
-                                            discountAmount,
-                                            tax,
-                                            serviceCharge,
-                                            totalQuantity,
-                                            totalPrice,
-                                            draftName,
-                                            orderType) {
+                                        loaded: (
+                                          products,
+                                          discountModel,
+                                          discount,
+                                          discountAmount,
+                                          tax,
+                                          serviceCharge,
+                                          totalQuantity,
+                                          totalPrice,
+                                          draftName,
+                                          orderType,
+                                          deliveryType,
+                                        ) {
                                           if (discountModel == null) {
                                             return 0;
                                           }
@@ -451,31 +534,37 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
 
                                     final tax = state.maybeWhen(
                                       orElse: () => 0,
-                                      loaded: (products,
-                                              discountModel,
-                                              discount,
-                                              discountAmount,
-                                              tax,
-                                              serviceCharge,
-                                              totalQuantity,
-                                              totalPrice,
-                                              draftName,
-                                              orderType) =>
+                                      loaded: (
+                                        products,
+                                        discountModel,
+                                        discount,
+                                        discountAmount,
+                                        tax,
+                                        serviceCharge,
+                                        totalQuantity,
+                                        totalPrice,
+                                        draftName,
+                                        orderType,
+                                        deliveryType,
+                                      ) =>
                                           tax,
                                     );
 
                                     final serviceCharge = state.maybeWhen(
                                       orElse: () => 0,
-                                      loaded: (products,
-                                              discountModel,
-                                              discount,
-                                              discountAmount,
-                                              tax,
-                                              serviceCharge,
-                                              totalQuantity,
-                                              totalPrice,
-                                              draftName,
-                                              orderType) =>
+                                      loaded: (
+                                        products,
+                                        discountModel,
+                                        discount,
+                                        discountAmount,
+                                        tax,
+                                        serviceCharge,
+                                        totalQuantity,
+                                        totalPrice,
+                                        draftName,
+                                        orderType,
+                                        deliveryType,
+                                      ) =>
                                           serviceCharge,
                                     );
 
@@ -826,33 +915,74 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                         builder: (context, state) {
                           final orderType = state.maybeWhen(
                             orElse: () => OrderType.dineIn,
-                            loaded: (products,
-                                    discountModel,
-                                    discount,
-                                    discountAmount,
-                                    tax,
-                                    serviceCharge,
-                                    totalQuantity,
-                                    totalPrice,
-                                    draftName,
-                                    orderType) =>
+                            loaded: (
+                              products,
+                              discountModel,
+                              discount,
+                              discountAmount,
+                              tax,
+                              serviceCharge,
+                              totalQuantity,
+                              totalPrice,
+                              draftName,
+                              orderType,
+                              deliveryType,
+                            ) =>
                                 orderType,
                           );
 
+                          DeliveryModel? delivery = state.maybeWhen(
+                            orElse: () => null,
+                            loaded: (
+                              products,
+                              discountModel,
+                              discount,
+                              discountAmount,
+                              tax,
+                              serviceCharge,
+                              totalQuantity,
+                              totalPrice,
+                              draftName,
+                              orderType,
+                              deliveryType,
+                            ) =>
+                                deliveryType,
+                          );
+
                           List<ProductQuantity> items = state.maybeWhen(
                             orElse: () => [],
-                            loaded: (products,
-                                    discountModel,
-                                    discount,
-                                    discountAmount,
-                                    tax,
-                                    serviceCharge,
-                                    totalQuantity,
-                                    totalPrice,
-                                    draftName,
-                                    orderType) =>
+                            loaded: (
+                              products,
+                              discountModel,
+                              discount,
+                              discountAmount,
+                              tax,
+                              serviceCharge,
+                              totalQuantity,
+                              totalPrice,
+                              draftName,
+                              orderType,
+                              deliveryType,
+                            ) =>
                                 products,
                           );
+                          int tax = state.maybeWhen(
+                            orElse: () => 0,
+                            loaded: (
+                              products,
+                              discountModel,
+                              discount,
+                              discountAmount,
+                              tax,
+                              serviceCharge,
+                              totalQuantity,
+                              totalPrice,
+                              draftName,
+                              orderType,
+                              deliveryType,
+                            ) =>
+                                tax,
+                          );
 
                           return Container(
                             padding: EdgeInsets.all(16),
@@ -876,16 +1006,27 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                 SpaceWidth(12),
                                 Expanded(
                                   child: Button.filled(
-                                    onPressed: () => showDialog(
-                                      context: context,
-                                      builder: (dcontext) => SaveDialog(
-                                        selectedTable: widget.table,
-                                        customerName: customerController.text,
-                                        items: items,
-                                        orderType: orderType,
-                                        customer: selectedCustomer,
-                                      ),
-                                    ),
+                                    onPressed: () {
+                                      if (customerController.text == '') {
+                                        AppFlushbar.showError(
+                                          context,
+                                          'Pilih Pelanggan terlebih dahulu',
+                                        );
+                                        return;
+                                      }
+
+                                      showDialog(
+                                        context: context,
+                                        builder: (dcontext) => SaveDialog(
+                                          selectedTable: widget.table,
+                                          customerName: customerController.text,
+                                          items: items,
+                                          orderType: orderType,
+                                          customer: selectedCustomer,
+                                          deliveryModel: delivery,
+                                        ),
+                                      );
+                                    },
                                     label: 'Simpan',
                                   ),
                                 ),
@@ -899,6 +1040,11 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                             .pushReplacement(SuccessOrderPage(
                                           productQuantity: items,
                                           order: data,
+                                          paymentMethod:
+                                              selectedPaymentMethod?.name ?? "",
+                                          nominalBayar: totalPriceController
+                                              .text.toIntegerFromText,
+                                          taxPercentage: tax,
                                         ));
                                       },
                                       error: (message) => AppFlushbar.showError(
@@ -914,14 +1060,26 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                         child: state.maybeMap(
                                           orElse: () => Button.filled(
                                             onPressed: () {
+                                              if (customerController.text ==
+                                                  '') {
+                                                AppFlushbar.showError(
+                                                  context,
+                                                  'Pilih Pelanggan terlebih dahulu',
+                                                );
+                                                return;
+                                              }
+
                                               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,
                                                     ),

lib/presentation/home/pages/dashboard_page.dart

@@ -3,6 +3,8 @@ import 'dart:async';
 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/setting/pages/setting_page.dart';
 import 'package:enaklo_pos/presentation/table/pages/table_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -14,9 +16,6 @@ import 'package:enaklo_pos/data/datasources/auth_local_datasource.dart';
 import 'package:enaklo_pos/presentation/auth/login_page.dart';
 import 'package:enaklo_pos/presentation/report/pages/report_page.dart';
 import 'package:enaklo_pos/presentation/setting/bloc/sync_order/sync_order_bloc.dart';
-import 'package:enaklo_pos/presentation/setting/pages/printer_configuration_page.dart';
-import 'package:enaklo_pos/presentation/setting/pages/settings_page.dart';
-import 'package:enaklo_pos/presentation/table/pages/new_table_management_page.dart';
 
 import '../../../core/assets/assets.gen.dart';
 import '../../auth/bloc/logout/logout_bloc.dart';
@@ -60,9 +59,8 @@ class _DashboardPageState extends State<DashboardPage> {
       ),
       const TablePage(),
       const ReportPage(),
-      const PrinterConfigurationPage(),
-      // SalesPage(),
-      const SettingsPage(),
+      const CustomerPage(),
+      const SettingPage(),
     ];
     // ignore: unused_local_variable
     _connectivitySubscription = Connectivity()
@@ -122,7 +120,7 @@ class _DashboardPageState extends State<DashboardPage> {
                         onTap: () => _onItemTapped(2),
                       ),
                       NavItem(
-                        iconPath: Assets.icons.print.path,
+                        iconPath: Assets.icons.people.path,
                         isActive: _selectedIndex == 3,
                         onTap: () => _onItemTapped(3),
                       ),

lib/presentation/home/pages/home_page.dart

@@ -1,8 +1,10 @@
 // ignore_for_file: public_member_api_docs, sort_constructors_first
 import 'package:enaklo_pos/core/components/flushbar.dart';
+import 'package:enaklo_pos/presentation/home/bloc/category_loader/category_loader_bloc.dart';
 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/widgets/category_tab_bar.dart';
 import 'package:enaklo_pos/presentation/home/widgets/home_right_title.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -18,7 +20,6 @@ import '../../../core/components/buttons.dart';
 import '../../../core/components/spaces.dart';
 import '../../../core/constants/colors.dart';
 import '../bloc/checkout/checkout_bloc.dart';
-import '../widgets/custom_tab_bar.dart';
 import '../widgets/home_title.dart';
 import '../widgets/order_menu.dart';
 import '../widgets/product_card.dart';
@@ -53,6 +54,14 @@ class _HomePageState extends State<HomePage> {
     super.initState();
   }
 
+  @override
+  void dispose() {
+    // Properly dispose controllers
+    searchController.dispose();
+    scrollController.dispose();
+    super.dispose();
+  }
+
   void _syncAndLoadProducts() {
     // Trigger sync from API first
     // context.read<SyncProductBloc>().add(const SyncProductEvent.syncProduct());
@@ -68,6 +77,9 @@ class _HomePageState extends State<HomePage> {
     // Initialize checkout with tax and service charge settings
     context.read<CheckoutBloc>().add(const CheckoutEvent.started());
 
+    // Get Category
+    context.read<CategoryLoaderBloc>().add(CategoryLoaderEvent.get());
+
     // Get Outlets
     context.read<CurrentOutletBloc>().add(CurrentOutletEvent.currentOutlet());
   }
@@ -91,12 +103,24 @@ class _HomePageState extends State<HomePage> {
     }).toList();
   }
 
-  List<Product> _filterProductsByCategory(
-      List<Product> products, int categoryId) {
-    final filteredBySearch = _filterProducts(products);
-    return filteredBySearch
-        .where((element) => element.price == categoryId)
-        .toList();
+  bool _handleScrollNotification(
+      ScrollNotification notification, String? categoryId) {
+    // Check if the ScrollController is attached before accessing position
+    if (!scrollController.hasClients) {
+      return false;
+    }
+
+    if (notification is ScrollEndNotification &&
+        scrollController.position.extentAfter == 0) {
+      context.read<ProductLoaderBloc>().add(
+            ProductLoaderEvent.loadMore(
+              categoryId: categoryId,
+              search: searchQuery,
+            ),
+          );
+      return true;
+    }
+    return false;
   }
 
   @override
@@ -107,7 +131,6 @@ class _HomePageState extends State<HomePage> {
           orElse: () {},
           loading: () {},
           success: () {
-            context.pop();
             Future.delayed(Duration(milliseconds: 300), () {
               AppFlushbar.showSuccess(context, 'Outlet berhasil diubah');
               context
@@ -128,118 +151,81 @@ class _HomePageState extends State<HomePage> {
                 flex: 3,
                 child: Align(
                   alignment: AlignmentDirectional.topStart,
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: [
-                      HomeTitle(
-                        controller: searchController,
-                        onChanged: (value) {
-                          setState(() {
-                            searchQuery = value;
-                          });
-                        },
-                      ),
-                      BlocBuilder<ProductLoaderBloc, ProductLoaderState>(
-                        builder: (context, state) {
-                          return NotificationListener<ScrollNotification>(
-                            onNotification: (notification) {
-                              return state.maybeWhen(
-                                orElse: () => false,
-                                loaded: (products, hasReachedMax, currentPage,
-                                    isLoadingMore) {
-                                  if (notification is ScrollEndNotification &&
-                                      scrollController.position.extentAfter ==
-                                          0) {
-                                    context.read<ProductLoaderBloc>().add(
-                                        const ProductLoaderEvent.loadMore());
-                                    return true;
-                                  }
-
-                                  return true;
-                                },
-                              );
-                            },
-                            child: Expanded(
-                              child: CustomTabBarV2(
-                                tabTitles: const [
-                                  'Semua',
-                                  'Makanan',
-                                  'Minuman',
-                                  'Paket'
-                                ],
-                                tabViews: [
-                                  // All Products Tab
-                                  SizedBox(
-                                    child: state.maybeWhen(orElse: () {
-                                      return const Center(
-                                        child: CircularProgressIndicator(),
-                                      );
-                                    }, loading: () {
-                                      return const Center(
-                                        child: CircularProgressIndicator(),
-                                      );
-                                    }, loaded: (products, hashasReachedMax,
-                                        currentPage, isLoadingMore) {
-                                      final filteredProducts =
-                                          _filterProducts(products);
-                                      if (filteredProducts.isEmpty) {
-                                        return const Center(
-                                          child: Text('No Items Found'),
-                                        );
-                                      }
-                                      return GridView.builder(
-                                        itemCount: filteredProducts.length,
-                                        controller: scrollController,
-                                        padding: const EdgeInsets.all(16),
-                                        gridDelegate:
-                                            SliverGridDelegateWithMaxCrossAxisExtent(
-                                          maxCrossAxisExtent: 180,
-                                          mainAxisSpacing: 30,
-                                          crossAxisSpacing: 30,
-                                          childAspectRatio: 180 / 240,
-                                        ),
-                                        itemBuilder: (context, index) =>
-                                            ProductCard(
-                                          data: filteredProducts[index],
-                                          onCartButton: () {},
+                  child: BlocBuilder<CategoryLoaderBloc, CategoryLoaderState>(
+                    builder: (context, state) {
+                      return state.maybeWhen(
+                        orElse: () => Center(
+                          child: CircularProgressIndicator(),
+                        ),
+                        loaded: (categories, categoryId) => Column(
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          children: [
+                            HomeTitle(
+                              controller: searchController,
+                              onChanged: (value) {
+                                setState(() {
+                                  searchQuery = value;
+                                });
+                                Future.delayed(Duration(milliseconds: 600), () {
+                                  context.read<ProductLoaderBloc>().add(
+                                        ProductLoaderEvent.getProduct(
+                                          categoryId: categoryId,
+                                          search: value,
                                         ),
                                       );
-                                    }),
-                                  ),
-                                  // Makanan Tab
-                                  SizedBox(
-                                    child: state.maybeWhen(orElse: () {
-                                      return const Center(
-                                        child: CircularProgressIndicator(),
-                                      );
-                                    }, loading: () {
-                                      return const Center(
-                                        child: CircularProgressIndicator(),
-                                      );
-                                    }, loaded: (products, hashasReachedMax,
-                                        currentPage, isLoadingMore) {
-                                      if (products.isEmpty) {
-                                        return const Center(
-                                          child: Text('No Items'),
-                                        );
-                                      }
-                                      final filteredProducts =
-                                          _filterProductsByCategory(
-                                              products, 1);
-                                      return filteredProducts.isEmpty
-                                          ? const _IsEmpty()
-                                          : GridView.builder(
+                                });
+                              },
+                            ),
+                            BlocBuilder<ProductLoaderBloc, ProductLoaderState>(
+                              builder: (context, state) {
+                                return NotificationListener<ScrollNotification>(
+                                  onNotification: (notification) {
+                                    return state.maybeWhen(
+                                      orElse: () => false,
+                                      loaded: (products, hasReachedMax,
+                                          currentPage, isLoadingMore) {
+                                        return _handleScrollNotification(
+                                            notification, categoryId);
+                                      },
+                                    );
+                                  },
+                                  child: Expanded(
+                                    child: CategoryTabBar(
+                                      categories: categories,
+                                      tabViews: categories.map((category) {
+                                        return SizedBox(
+                                          child: state.maybeWhen(orElse: () {
+                                            return const Center(
+                                              child:
+                                                  CircularProgressIndicator(),
+                                            );
+                                          }, loading: () {
+                                            return const Center(
+                                              child:
+                                                  CircularProgressIndicator(),
+                                            );
+                                          }, loaded: (products,
+                                              hashasReachedMax,
+                                              currentPage,
+                                              isLoadingMore) {
+                                            final filteredProducts =
+                                                _filterProducts(products);
+                                            if (filteredProducts.isEmpty) {
+                                              return const Center(
+                                                child: Text('No Items Found'),
+                                              );
+                                            }
+                                            return GridView.builder(
                                               itemCount:
                                                   filteredProducts.length,
-                                              padding: const EdgeInsets.all(16),
                                               controller: scrollController,
+                                              padding: const EdgeInsets.all(16),
                                               gridDelegate:
                                                   SliverGridDelegateWithMaxCrossAxisExtent(
-                                                maxCrossAxisExtent:
-                                                    200, // Lebar maksimal tiap item (bisa kamu ubah)
+                                                maxCrossAxisExtent: 180,
                                                 mainAxisSpacing: 30,
                                                 crossAxisSpacing: 30,
-                                                childAspectRatio: 0.85,
+                                                childAspectRatio: 180 / 240,
                                               ),
                                               itemBuilder: (context, index) =>
                                                   ProductCard(
@@ -247,103 +233,18 @@ class _HomePageState extends State<HomePage> {
                                                 onCartButton: () {},
                                               ),
                                             );
-                                    }),
-                                  ),
-                                  // Minuman Tab
-                                  SizedBox(
-                                    child: state.maybeWhen(orElse: () {
-                                      return const Center(
-                                        child: CircularProgressIndicator(),
-                                      );
-                                    }, loading: () {
-                                      return const Center(
-                                        child: CircularProgressIndicator(),
-                                      );
-                                    }, loaded: (products, hashasReachedMax,
-                                        currentPage, isLoadingMore) {
-                                      if (products.isEmpty) {
-                                        return const Center(
-                                          child: Text('No Items'),
+                                          }),
                                         );
-                                      }
-                                      final filteredProducts =
-                                          _filterProductsByCategory(
-                                              products, 2);
-                                      return filteredProducts.isEmpty
-                                          ? const _IsEmpty()
-                                          : GridView.builder(
-                                              itemCount:
-                                                  filteredProducts.length,
-                                              padding: const EdgeInsets.all(16),
-                                              controller: scrollController,
-                                              gridDelegate:
-                                                  SliverGridDelegateWithMaxCrossAxisExtent(
-                                                maxCrossAxisExtent:
-                                                    200, // Lebar maksimal tiap item (bisa kamu ubah)
-                                                mainAxisSpacing: 30,
-                                                crossAxisSpacing: 30,
-                                                childAspectRatio: 0.85,
-                                              ),
-                                              itemBuilder: (context, index) {
-                                                return ProductCard(
-                                                  data: filteredProducts[index],
-                                                  onCartButton: () {},
-                                                );
-                                              },
-                                            );
-                                    }),
+                                      }).toList(),
+                                    ),
                                   ),
-                                  // Snack Tab
-                                  SizedBox(
-                                    child: state.maybeWhen(orElse: () {
-                                      return const Center(
-                                        child: CircularProgressIndicator(),
-                                      );
-                                    }, loading: () {
-                                      return const Center(
-                                        child: CircularProgressIndicator(),
-                                      );
-                                    }, loaded: (products, hashasReachedMax,
-                                        currentPage, isLoadingMore) {
-                                      if (products.isEmpty) {
-                                        return const Center(
-                                          child: Text('No Items'),
-                                        );
-                                      }
-                                      final filteredProducts =
-                                          _filterProductsByCategory(
-                                              products, 3);
-                                      return filteredProducts.isEmpty
-                                          ? const _IsEmpty()
-                                          : GridView.builder(
-                                              itemCount:
-                                                  filteredProducts.length,
-                                              padding: const EdgeInsets.all(16),
-                                              controller: scrollController,
-                                              gridDelegate:
-                                                  SliverGridDelegateWithMaxCrossAxisExtent(
-                                                maxCrossAxisExtent:
-                                                    200, // Lebar maksimal tiap item (bisa kamu ubah)
-                                                mainAxisSpacing: 30,
-                                                crossAxisSpacing: 30,
-                                                childAspectRatio: 0.85,
-                                              ),
-                                              itemBuilder: (context, index) {
-                                                return ProductCard(
-                                                  data: filteredProducts[index],
-                                                  onCartButton: () {},
-                                                );
-                                              },
-                                            );
-                                    }),
-                                  ),
-                                ],
-                              ),
+                                );
+                              },
                             ),
-                          );
-                        },
-                      ),
-                    ],
+                          ],
+                        ),
+                      );
+                    },
                   ),
                 ),
               ),
@@ -413,16 +314,19 @@ class _HomePageState extends State<HomePage> {
                                 orElse: () => const Center(
                                   child: Text('No Items'),
                                 ),
-                                loaded: (products,
-                                    discountModel,
-                                    discount,
-                                    discountAmount,
-                                    tax,
-                                    serviceCharge,
-                                    totalQuantity,
-                                    totalPrice,
-                                    draftName,
-                                    orderType) {
+                                loaded: (
+                                  products,
+                                  discountModel,
+                                  discount,
+                                  discountAmount,
+                                  tax,
+                                  serviceCharge,
+                                  totalQuantity,
+                                  totalPrice,
+                                  draftName,
+                                  orderType,
+                                  deliveryType,
+                                ) {
                                   if (products.isEmpty) {
                                     return const Center(
                                       child: Text('No Items'),
@@ -464,16 +368,19 @@ class _HomePageState extends State<HomePage> {
                                     builder: (context, state) {
                                       final tax = state.maybeWhen(
                                           orElse: () => 0,
-                                          loaded: (products,
-                                              discountModel,
-                                              discount,
-                                              discountAmount,
-                                              tax,
-                                              serviceCharge,
-                                              totalQuantity,
-                                              totalPrice,
-                                              draftName,
-                                              orderType) {
+                                          loaded: (
+                                            products,
+                                            discountModel,
+                                            discount,
+                                            discountAmount,
+                                            tax,
+                                            serviceCharge,
+                                            totalQuantity,
+                                            totalPrice,
+                                            draftName,
+                                            orderType,
+                                            deliveryType,
+                                          ) {
                                             if (products.isEmpty) {
                                               return 0;
                                             }
@@ -515,14 +422,17 @@ class _HomePageState extends State<HomePage> {
                                               totalQuantity,
                                               totalPrice,
                                               draftName,
-                                              orderType) {
+                                              orderType,
+                                              deliveryType) {
                                             if (products.isEmpty) {
                                               return 0;
                                             }
                                             return products
                                                 .map((e) =>
-                                                    e.product.price! *
-                                                    e.quantity)
+                                                    (e.product.price! *
+                                                        e.quantity) +
+                                                    (e.variant?.priceModifier ??
+                                                        0))
                                                 .reduce((value, element) =>
                                                     value + element);
                                           });
@@ -568,7 +478,8 @@ class _HomePageState extends State<HomePage> {
                                             totalQuantity,
                                             totalPrice,
                                             draftName,
-                                            orderType) =>
+                                            orderType,
+                                            deliveryType) =>
                                         Align(
                                       alignment: Alignment.bottomCenter,
                                       child: Button.filled(
@@ -582,6 +493,14 @@ class _HomePageState extends State<HomePage> {
                                                 'Mohon pilih meja terlebih dahulu');
                                             return;
                                           }
+
+                                          if (orderType.name == 'delivery' &&
+                                              deliveryType == null) {
+                                            AppFlushbar.showError(context,
+                                                'Mohon pilih pengiriman terlebih dahulu');
+                                            return;
+                                          }
+
                                           context.push(ConfirmPaymentPage(
                                             isTable: widget.table == null
                                                 ? false
@@ -611,6 +530,7 @@ class _HomePageState extends State<HomePage> {
   }
 }
 
+// ignore: unused_element
 class _IsEmpty extends StatelessWidget {
   const _IsEmpty();
 

lib/presentation/home/widgets/category_tab_bar.dart

@@ -0,0 +1,100 @@
+import 'package:enaklo_pos/core/constants/colors.dart';
+import 'package:enaklo_pos/data/models/response/category_response_model.dart';
+import 'package:enaklo_pos/presentation/home/bloc/category_loader/category_loader_bloc.dart';
+import 'package:enaklo_pos/presentation/home/bloc/product_loader/product_loader_bloc.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class CategoryTabBar extends StatefulWidget {
+  final List<CategoryModel> categories;
+  final List<Widget> tabViews;
+  const CategoryTabBar(
+      {super.key, required this.categories, required this.tabViews});
+
+  @override
+  State<CategoryTabBar> createState() => _CategoryTabBarState();
+}
+
+class _CategoryTabBarState extends State<CategoryTabBar>
+    with SingleTickerProviderStateMixin {
+  late TabController _tabController;
+  String? selectedCategoryId;
+
+  @override
+  void initState() {
+    super.initState();
+    _tabController =
+        TabController(length: widget.categories.length, vsync: this);
+
+    _tabController.addListener(() {
+      if (_tabController.indexIsChanging) {
+        if (_tabController.index == 0) {
+          context.read<ProductLoaderBloc>().add(
+                ProductLoaderEvent.getProduct(),
+              );
+        } else {
+          selectedCategoryId = widget.categories[_tabController.index].id;
+          context.read<ProductLoaderBloc>().add(
+                ProductLoaderEvent.getProduct(categoryId: selectedCategoryId),
+              );
+          context
+              .read<CategoryLoaderBloc>()
+              .add(CategoryLoaderEvent.setCategoryId(selectedCategoryId ?? ""));
+        }
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _tabController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DefaultTabController(
+      length: widget.categories.length,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Material(
+            elevation: 0,
+            color: Colors.white,
+            borderOnForeground: false,
+            child: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 16),
+              child: TabBar(
+                controller: _tabController,
+                isScrollable: true,
+                tabAlignment: TabAlignment.start,
+                labelColor: AppColors.primary,
+                labelStyle: TextStyle(
+                  fontWeight: FontWeight.bold,
+                ),
+                dividerColor: AppColors.primary,
+                unselectedLabelColor: AppColors.primary,
+                indicatorSize: TabBarIndicatorSize.label,
+                indicatorWeight: 4,
+                indicatorColor: AppColors.primary,
+                tabs: widget.categories
+                    .map((category) => Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 16),
+                          child: Tab(text: category.name),
+                        ))
+                    .toList(),
+              ),
+            ),
+          ),
+          Expanded(
+            // ✅ ini bagian penting
+            child: TabBarView(
+              controller: _tabController,
+              children: widget.tabViews,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/presentation/home/widgets/home_right_title.dart

@@ -3,9 +3,10 @@ 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/customer/pages/customer_page.dart';
 import 'package:enaklo_pos/presentation/home/bloc/checkout/checkout_bloc.dart';
+import 'package:enaklo_pos/presentation/home/dialog/delivery_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/sales/pages/sales_page.dart';
 import 'package:flutter/material.dart';
@@ -18,7 +19,7 @@ class HomeRightTitle extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: context.deviceHeight * 0.15,
+      height: context.deviceHeight * 0.12,
       decoration: BoxDecoration(
         color: AppColors.primary,
         border: Border(
@@ -31,56 +32,40 @@ class HomeRightTitle extends StatelessWidget {
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Row(
-            children: [
-              Expanded(
-                child: Button.filled(
-                  width: 180.0,
-                  height: 40,
-                  elevation: 0,
-                  onPressed: () => context.push(SalesPage(
-                    status: 'pending',
-                  )),
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  icon: Icon(
-                    Icons.list,
-                    color: Colors.white,
-                    size: 24,
+          Expanded(
+            child: Row(
+              children: [
+                Expanded(
+                  child: Button.filled(
+                    width: 180.0,
+                    height: 40,
+                    elevation: 0,
+                    onPressed: () => context.push(SalesPage(
+                      status: 'pending',
+                    )),
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    icon: Icon(
+                      Icons.list,
+                      color: Colors.white,
+                      size: 24,
+                    ),
+                    label: 'Daftar Pesanan',
                   ),
-                  label: 'Daftar Pesanan',
                 ),
-              ),
-              Expanded(
-                child: Button.filled(
-                  width: 180.0,
-                  height: 40,
-                  elevation: 0,
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  icon: Icon(
-                    Icons.person_outline,
-                    color: Colors.white,
-                    size: 24,
-                  ),
-                  onPressed: () {
-                    if (table == null) {
-                      context.push(CustomerPage());
-                    }
-                  },
-                  label: 'Pelanggan',
-                ),
-              ),
-            ],
+              ],
+            ),
           ),
-          Row(
-            children: [
-              Expanded(
-                child: BlocBuilder<CheckoutBloc, CheckoutState>(
-                  builder: (context, state) {
-                    return state.maybeWhen(
-                      orElse: () => const SizedBox.shrink(),
-                      loaded: (items,
+          Expanded(
+            child: Row(
+              children: [
+                Expanded(
+                  child: BlocBuilder<CheckoutBloc, CheckoutState>(
+                    builder: (context, state) {
+                      return state.maybeWhen(
+                        orElse: () => const SizedBox.shrink(),
+                        loaded: (
+                          items,
                           discountModel,
                           discount,
                           discountAmount,
@@ -89,55 +74,113 @@ class HomeRightTitle extends StatelessWidget {
                           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(),
-                        );
+                          orderType,
+                          deliveryType,
+                        ) {
+                          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(),
+                          );
+                        },
+                      );
+                    },
+                  ),
+                ),
+                BlocBuilder<CheckoutBloc, CheckoutState>(
+                  builder: (context, state) {
+                    return state.maybeWhen(
+                      orElse: () => const SizedBox.shrink(),
+                      loaded: (
+                        items,
+                        discountModel,
+                        discount,
+                        discountAmount,
+                        tax,
+                        serviceCharge,
+                        totalQuantity,
+                        totalPrice,
+                        draftName,
+                        orderType,
+                        deliveryType,
+                      ) {
+                        switch (orderType) {
+                          case OrderType.dineIn:
+                            return Expanded(
+                              child: Button.filled(
+                                width: 180.0,
+                                height: 40,
+                                elevation: 0,
+                                icon: Icon(
+                                  Icons.table_restaurant_outlined,
+                                  color: Colors.white,
+                                  size: 24,
+                                ),
+                                onPressed: () {
+                                  if (table == null) {
+                                    context.push(DashboardPage(
+                                      index: 1,
+                                    ));
+                                  }
+                                },
+                                mainAxisAlignment: MainAxisAlignment.start,
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                label: table == null
+                                    ? 'Pilih Meja'
+                                    : '${table!.tableName}',
+                              ),
+                            );
+                          case OrderType.takeAway:
+                            return const SizedBox.shrink();
+                          case OrderType.delivery:
+                            return Expanded(
+                              child: Button.filled(
+                                width: 180.0,
+                                height: 40,
+                                elevation: 0,
+                                icon: Icon(
+                                  Icons.motorcycle_outlined,
+                                  color: Colors.white,
+                                  size: 24,
+                                ),
+                                onPressed: () {
+                                  showDialog(
+                                      context: context,
+                                      builder: (context) {
+                                        return DeliveryDialog();
+                                      });
+                                },
+                                mainAxisAlignment: MainAxisAlignment.start,
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                label: deliveryType == null
+                                    ? 'Pilih Pengiriman'
+                                    : deliveryType.name,
+                              ),
+                            );
+                          default:
+                            return const SizedBox.shrink();
+                        }
                       },
                     );
                   },
                 ),
-              ),
-              Expanded(
-                child: Button.filled(
-                  width: 180.0,
-                  height: 40,
-                  elevation: 0,
-                  icon: Icon(
-                    Icons.table_restaurant_outlined,
-                    color: Colors.white,
-                    size: 24,
-                  ),
-                  onPressed: () {
-                    if (table == null) {
-                      context.push(DashboardPage(
-                        index: 1,
-                      ));
-                    }
-                  },
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  label: table == null ? 'Pilih Meja' : '${table!.tableName}',
-                ),
-              ),
-            ],
+              ],
+            ),
           ),
         ],
       ),

lib/presentation/home/widgets/order_type_selector.dart

@@ -15,7 +15,19 @@ class OrderTypeSelector extends StatelessWidget {
       builder: (context, state) {
         return state.maybeWhen(
           orElse: () => const SizedBox.shrink(),
-          loaded: (items, discountModel, discount, discountAmount, tax, serviceCharge, totalQuantity, totalPrice, draftName, orderType) {
+          loaded: (
+            items,
+            discountModel,
+            discount,
+            discountAmount,
+            tax,
+            serviceCharge,
+            totalQuantity,
+            totalPrice,
+            draftName,
+            orderType,
+            deliveryType,
+          ) {
             return Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
@@ -36,8 +48,8 @@ class OrderTypeSelector extends StatelessWidget {
                     return GestureDetector(
                       onTap: () {
                         context.read<CheckoutBloc>().add(
-                          CheckoutEvent.updateOrderType(type),
-                        );
+                              CheckoutEvent.updateOrderType(type),
+                            );
                       },
                       child: Container(
                         padding: const EdgeInsets.symmetric(
@@ -45,9 +57,11 @@ class OrderTypeSelector extends StatelessWidget {
                           vertical: 8.0,
                         ),
                         decoration: BoxDecoration(
-                          color: isSelected ? AppColors.primary : AppColors.white,
+                          color:
+                              isSelected ? AppColors.primary : AppColors.white,
                           border: Border.all(
-                            color: isSelected ? AppColors.primary : AppColors.grey,
+                            color:
+                                isSelected ? AppColors.primary : AppColors.grey,
                             width: 1.0,
                           ),
                           borderRadius: BorderRadius.circular(8.0),
@@ -55,9 +69,12 @@ class OrderTypeSelector extends StatelessWidget {
                         child: Text(
                           type.value,
                           style: TextStyle(
-                            color: isSelected ? AppColors.white : AppColors.black,
+                            color:
+                                isSelected ? AppColors.white : AppColors.black,
                             fontSize: 14,
-                            fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
+                            fontWeight: isSelected
+                                ? FontWeight.w600
+                                : FontWeight.normal,
                           ),
                         ),
                       ),
@@ -71,4 +88,4 @@ class OrderTypeSelector extends StatelessWidget {
       },
     );
   }
-} 
+}

lib/presentation/home/widgets/product_card.dart

@@ -23,15 +23,17 @@ class ProductCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () {
-        if (data.variants!.isEmpty) {
-          context.read<CheckoutBloc>().add(
-                CheckoutEvent.addItem(data, null),
-              );
-        } else {
-          showDialog(
-            context: context,
-            builder: (context) => VariantDialog(product: data),
-          );
+        if (data.isActive == true) {
+          if (data.variants!.isEmpty) {
+            context.read<CheckoutBloc>().add(
+                  CheckoutEvent.addItem(data, null),
+                );
+          } else {
+            showDialog(
+              context: context,
+              builder: (context) => VariantDialog(product: data),
+            );
+          }
         }
       },
       child: Container(
@@ -114,16 +116,19 @@ class ProductCard extends StatelessWidget {
               builder: (context, state) {
                 return state.maybeWhen(
                   orElse: () => const SizedBox(),
-                  loaded: (products,
-                      discountModel,
-                      discount,
-                      discountAmount,
-                      tax,
-                      serviceCharge,
-                      totalQuantity,
-                      totalPrice,
-                      draftName,
-                      orderType) {
+                  loaded: (
+                    products,
+                    discountModel,
+                    discount,
+                    discountAmount,
+                    tax,
+                    serviceCharge,
+                    totalQuantity,
+                    totalPrice,
+                    draftName,
+                    orderType,
+                    deliveryType,
+                  ) {
                     final totalQuantity = products
                         .where((item) => item.product.id == data.id)
                         .map((item) => item.quantity)
@@ -158,6 +163,14 @@ class ProductCard extends StatelessWidget {
                 );
               },
             ),
+            if (data.isActive == false)
+              Container(
+                width: double.infinity,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.all(Radius.circular(8.0)),
+                  color: AppColors.grey.withOpacity(0.5),
+                ),
+              ),
           ],
         ),
       ),