update carton and fcs shipment

lib/domain/vo/local_popupmenu.dart

@@ -13,13 +13,14 @@ class LocalPopupMenu {
       this.highlight = false,
       this.enabled = true});
 }
+
 List<LocalPopupMenu> shipFiteringMenu = <LocalPopupMenu>[
-  LocalPopupMenu(id: 0, text :"All"),
+  LocalPopupMenu(id: 0, text: "All"),
   LocalPopupMenu(id: 1, text: "Pending"),
   LocalPopupMenu(id: 2, text: "Processed"),
   LocalPopupMenu(id: 3, text: "Shipped"),
   LocalPopupMenu(id: 4, text: "Arrived"),
   LocalPopupMenu(id: 5, text: "Invoiced"),
+  LocalPopupMenu(id: 7, text: "Delivered"),
   LocalPopupMenu(id: 6, text: "Canceled"),
 ];
-

lib/domain/vo/shipment_status.dart

@@ -2,22 +2,22 @@ import 'package:cloud_firestore/cloud_firestore.dart';
 
 class ShipmentStatus {
   String status;
-  DateTime date;
+  DateTime? date;
   bool? done;
   String? staffId;
   String? staffName;
   ShipmentStatus(
       {required this.status,
-      required this.date,
+      this.date,
       this.done,
       this.staffId,
       this.staffName});
 
   factory ShipmentStatus.fromMap(Map<String, dynamic> map) {
-    var _date = (map['date'] as Timestamp);
+    var _date = map['date'] != null ? (map['date'] as Timestamp) : null;
     return ShipmentStatus(
         status: map['status'],
-        date: _date.toDate(),
+        date: _date?.toDate(),
         done: map['done'],
         staffId: map['staff_id'],
         staffName: map['staff_name']);