From 46a70df415333ebc4895bf2e71a1c6c152039a30 Mon Sep 17 00:00:00 2001
From: tzw <thinzar.win@mokkon.com>
Date: Wed, 31 Jan 2024 18:01:54 +0630
Subject: [PATCH] merge

---
 lib/domain/constants.dart         |  9 ++++++---
 lib/pages/carton/carton_list.dart | 12 ++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/domain/constants.dart b/lib/domain/constants.dart
index 5173553..a9ab54e 100644
--- a/lib/domain/constants.dart
+++ b/lib/domain/constants.dart
@@ -20,7 +20,6 @@ const cartons_collection = "cartons";
 const discounts_collection = "discounts";
 const pickup_collection = "pickups";
 
-
 // docs
 const setting_doc_id = "setting";
 const rate_doc_id = "rate";
@@ -78,8 +77,8 @@ const privilege_invoice = "inv";
 const privilege_processing = "pr";
 const privilege_receiving = "rc";
 const privilege_pickup = "pku";
-const privilege_collect ="col";
-const privilege_report ="rpt";
+const privilege_collect = "col";
+const privilege_report = "rpt";
 
 // Pickup types
 const shipment_local_pickup = "Local pickup";
@@ -103,6 +102,10 @@ const mix_pickup = "Mix Pickup";
 const carton_packed_status = "packed";
 const carton_shipped_status = "shipped";
 const carton_delivered_status = "delivered";
+const carton_processing_status = "processing";
+const carton_arrived_status = "arrived";
+const carton_invoiced_status = "invoiced";
+const carton_canceled_status = "canceled";
 
 // shipment status
 const shipment_pending_status = "pending";
diff --git a/lib/pages/carton/carton_list.dart b/lib/pages/carton/carton_list.dart
index 226666c..1cf133d 100644
--- a/lib/pages/carton/carton_list.dart
+++ b/lib/pages/carton/carton_list.dart
@@ -46,19 +46,11 @@ class _CartonListState extends State<CartonList> {
         popmenus: [
           LocalPopupMenu(
               id: 1,
-              text: "Processing",
+              textKey: "box.popupmenu.active",
               selected: boxModel.selectedIndex == 1),
           LocalPopupMenu(
               id: 2,
-              text: "Shipped",
-              selected: boxModel.selectedIndex == 2),
-               LocalPopupMenu(
-              id: 3,
-              text: "Arrived",
-              selected: boxModel.selectedIndex == 2),
-               LocalPopupMenu(
-              id: 4,
-              text: "Invoiced",
+              textKey: "box.popupmenu.delivered",
               selected: boxModel.selectedIndex == 2)
         ],
         popupMenuCallback: (p) {