update carton and add staff name

lib/domain/constants.dart

@@ -79,8 +79,13 @@ const shipment_courier_dropoff = "Courier drop off";
 //Carton types
 const carton_from_packages = "From packages";
 const carton_from_shipments = "From shipments";
-const carton_mix_box = "Mix carton";
+const carton_mix_carton = "Mix carton";
 const carton_small_bag = "Small bag";
+const carton_mix_box = "Mix box";
+
+//Mix types
+const mix_delivery = "Mix Delivery";
+const mix_pickup = "Mix Pickup";
 
 //Carton status
 const carton_packed_status = "packed";

lib/domain/vo/shipment_status.dart

@@ -4,14 +4,18 @@ class ShipmentStatus {
   String status;
   DateTime date;
   bool done;
-  ShipmentStatus({this.status, this.date, this.done});
+  String staffId;
+  String staffName;
+  ShipmentStatus(
+      {this.status, this.date, this.done, this.staffId, this.staffName});
 
   factory ShipmentStatus.fromMap(Map<String, dynamic> map) {
     var _date = (map['date'] as Timestamp);
     return ShipmentStatus(
-      status: map['status'],
-      date: _date == null ? null : _date.toDate(),
-      done: map['done'],
-    );
+        status: map['status'],
+        date: _date == null ? null : _date.toDate(),
+        done: map['done'],
+        staffId: map['staff_id'],
+        staffName: map['staff_name']);
   }
 }