merge

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";
@@ -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";

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",
+              textKey: "box.popupmenu.delivered",
-              selected: boxModel.selectedIndex == 2),
-               LocalPopupMenu(
-              id: 3,
-              text: "Arrived",
-              selected: boxModel.selectedIndex == 2),
-               LocalPopupMenu(
-              id: 4,
-              text: "Invoiced",
               selected: boxModel.selectedIndex == 2)
         ],
         popupMenuCallback: (p) {