update carton and fcs shipment

lib/pages/carton/carton_filter.dart

@@ -32,11 +32,12 @@ class _CartonFilterState extends State<CartonFilter> {
 
   List<String> statusList = [
     all_status,
-    carton_processing_status,
+    carton_packed_status,
     carton_shipped_status,
     carton_arrived_status,
     carton_invoiced_status,
-    carton_canceled_status
+    carton_delivered_status,
+    carton_canceled_status,
   ];
 
   final TextEditingController _consigneeCtl = TextEditingController();

lib/pages/carton/carton_info.dart

@@ -376,9 +376,11 @@ class _CartonInfoState extends State<CartonInfo> {
                 labelColor: primaryColor,
                 arrowColor: primaryColor,
                 actions: <Widget>[
-                  IconButton(
-                      icon: Icon(Icons.edit, color: primaryColor),
-                      onPressed: _gotoEditor),
+                  _carton.status == carton_packed_status
+                      ? IconButton(
+                          icon: Icon(Icons.edit, color: primaryColor),
+                          onPressed: _gotoEditor)
+                      : const SizedBox(),
                 ]),
             body: Container(
                 padding: const EdgeInsets.only(left: 20, right: 20),
@@ -452,7 +454,9 @@ class _CartonInfoState extends State<CartonInfo> {
                   _carton.photoUrls.isNotEmpty
                       ? const SizedBox(height: 40)
                       : const SizedBox(),
-                  deleteBtn,
+                  _carton.status == carton_packed_status
+                      ? deleteBtn
+                      : const SizedBox(),
                   const SizedBox(height: 20)
                 ]))));
   }

lib/pages/carton/model/carton_selection_model.dart

@@ -46,8 +46,8 @@ class CartonSelectionModel extends BaseModel {
       String path = "/$cartons_collection";
       Query query = FirebaseFirestore.instance
           .collection(path)
-          // .where("fcs_shipment_id", isEqualTo: shipmentId)
-          // .where("status", isEqualTo: carton_processing_status)
+          .where("fcs_shipment_id", isEqualTo: shipmentId)
+          .where("status", isEqualTo: carton_packed_status)
           .where("is_deleted", isEqualTo: false);
 
       if (term != "") {

lib/pages/carton/model/package_selection_model.dart

@@ -65,8 +65,8 @@ class PackageSelectionModel extends BaseModel {
       String path = "/$packages_collection";
       Query query = FirebaseFirestore.instance
           .collection(path)
-          // .where("fcs_shipment_id", isEqualTo: shipmentId)
-          // .where("status", isEqualTo: package_processed_status)
+          .where("status",
+              whereIn: [package_processed_status, package_packed_status])
           .where("sender_id", isEqualTo: senderId)
           .where("user_id", isEqualTo: consigneeId)
           .where("is_deleted", isEqualTo: false);