add packages

lib/model/main_model.dart

@@ -60,7 +60,9 @@ class MainModel extends ChangeNotifier {
       shippingAddress: '154-19 64th Ave.Flushing, \nNY 11367',
       deliveryAddress: '39 42th St. Kyaut Ta Thar Township Yangon');
 
-  Setting setting = Setting(terms: '[{"insert":"* Minimum shipping weight is 1lbs.\n* Oversized goods, Light weight/Large volume items, laptops, phones, tablets may incur extra charges based on pecifications.Please contact us for pricing.\n* Goods with lithium battary needs extra packaging and declaration. Please inform us ahead of time so that we can process your package accordingly.\n* Loose Batteries, Drones, and Prescription medicines are not allowed on aircraft.\n* Payment: We accept money orders, any US bank transfers via Zelle, AYA, KBZ and CB. No COD except for pick-ups.\n*Payments made in Myanmar will incur 2% tranfer fee\n"}]');
+  Setting setting = Setting(
+      terms:
+          '[{"insert":"* Minimum shipping weight is 1lbs.\n* Oversized goods, Light weight/Large volume items, laptops, phones, tablets may incur extra charges based on pecifications.Please contact us for pricing.\n* Goods with lithium battary needs extra packaging and declaration. Please inform us ahead of time so that we can process your package accordingly.\n* Loose Batteries, Drones, and Prescription medicines are not allowed on aircraft.\n* Payment: We accept money orders, any US bank transfers via Zelle, AYA, KBZ and CB. No COD except for pick-ups.\n*Payments made in Myanmar will incur 2% tranfer fee\n"}]');
   PackageInfo packageInfo;
   bool isLoaded = true;
   bool isOnline = true;
@@ -109,6 +111,14 @@ class MainModel extends ChangeNotifier {
     return this.user != null;
   }
 
+  bool isCustomer() {
+    return user != null && user.name != "Owner";
+  }
+
+  bool isOwner() {
+    return user != null && user.name == "Owner";
+  }
+
   bool hasEmail() {
     return this.user != null && this.user.isEmail();
   }

lib/model/shipment_model.dart

@@ -8,19 +8,19 @@ class ShipmentModel extends BaseModel {
     Shipment(
         shipDate: DateTime(2020, 4, 23),
         shipmentNumber: 'A103B',
-        status: 'Pending',
+        status: 'In Progress',
         arrivalDate: DateTime(2020, 4, 30),
         departureDate: DateTime(2020, 4, 23)),
     Shipment(
         shipDate: DateTime(2020, 4, 2),
         shipmentNumber: 'A100A',
-        status: 'Delivered',
+        status: 'Ready to ship',
         arrivalDate: DateTime(2020, 4, 28),
         departureDate: DateTime(2020, 4, 15)),
     Shipment(
         shipDate: DateTime(2020, 4, 2),
         shipmentNumber: 'A100B',
-        status: 'Delivered',
+        status: 'Arrived',
         arrivalDate: DateTime(2020, 4, 28),
         departureDate: DateTime(2020, 4, 15)),
     Shipment(
@@ -38,7 +38,7 @@ class ShipmentModel extends BaseModel {
     Shipment(
       shipDate: DateTime(2020, 4, 10),
       shipmentNumber: 'A102B',
-      status: 'Assigned',
+      status: 'Arrived',
       arrivalDate: DateTime(2020, 4, 30),
       departureDate: DateTime(2020, 4, 20),
     )
@@ -47,29 +47,31 @@ class ShipmentModel extends BaseModel {
   List<Shipment> get canceled {
     List<Shipment> _p = shipments.where((e) => e.status == "Canceled").toList()
       ..sort((e1, e2) {
-        return e2.shipDate.compareTo(e1.shipDate);
+        return e1.shipDate.compareTo(e2.shipDate);
       });
     return _p;
   }
 
   List<Shipment> get completed {
-    return shipments.where((e) => e.status == "Delivered").toList()
+    return shipments.where((e) => e.status == "Arrived").toList()
       ..sort((e1, e2) {
-        return e2.shipDate.compareTo(e1.shipDate);
+        return e1.shipDate.compareTo(e2.shipDate);
       });
   }
 
   List<Shipment> get upcoming {
-    return shipments
+    List<Shipment> _shipments = shipments
         .where((e) =>
-            e.status == "Pending" ||
-            e.status == "Assigned" ||
+            e.status == "In Progress" ||
+            e.status == "Ready to ship" ||
             e.status == "Processed" ||
             e.status == "Rescheduled")
-        .toList()
-          ..sort((e1, e2) {
-            return e2.shipDate.compareTo(e1.shipDate);
-          });
+        .toList();
+
+    _shipments.sort((e1, e2) {
+      return e1.shipDate.compareTo(e2.shipDate);
+    });
+    return _shipments;
   }
 
   void initUser(user) {