fix for slides

2020-07-02 16:16:21 +06:30
parent 9b865a201d
commit 2681de6850
16 changed files with 389 additions and 182 deletions
--- a/lib/model/invoice_model.dart
+++ b/lib/model/invoice_model.dart
@@ -10,7 +10,7 @@ class InvoiceModel extends BaseModel {
        invoiceDate: DateTime(2020, 4, 5, 12, 30),
        customerName: 'Ko Nyi',
        customerPhoneNumber: '+959 888888888',
-        amount: 5000,
+        amount: 500,
        status: 'Pending',
        packages: [
          Package(
@@ -36,15 +36,15 @@ class InvoiceModel extends BaseModel {
              receiverAddress: '1 Bo Yar Nyunt St.\nDagon Tsp, Yangon'),
        ],
        receipts: [
-          Receipt(amount: 2000, date: DateTime(2020, 6, 1)),
-          Receipt(amount: 1000, date: DateTime(2020, 6, 16)),
+          Receipt(amount: 200, date: DateTime(2020, 6, 1)),
+          Receipt(amount: 100, date: DateTime(2020, 6, 16)),
        ]),
    Invoice(
        invoiceNumber: 'A092(A)-31',
        invoiceDate: DateTime(2020, 4, 5, 9, 30),
        customerName: 'Ko Aung Myo',
        customerPhoneNumber: '+959 444444444',
-        amount: 3000,
+        amount: 300,
        status: 'Paid',
        packages: [
          Package(
@@ -69,14 +69,14 @@ class InvoiceModel extends BaseModel {
              receiverAddress: '2 Shwe Taung Kyar St, Bahan Tsp, Yangon'),
        ],
        receipts: [
-          Receipt(amount: 2000, date: DateTime(2020, 6, 1)),
+          Receipt(amount: 200, date: DateTime(2020, 6, 1)),
        ]),
    Invoice(
        invoiceNumber: 'A092(A)-32',
        invoiceDate: DateTime(2020, 4, 6, 10, 10),
        customerName: 'Ko Zaw Thu',
        customerPhoneNumber: '+959 777777777',
-        amount: 2000,
+        amount: 200,
        status: 'Paid',
        packages: [
          Package(
@@ -101,17 +101,17 @@ class InvoiceModel extends BaseModel {
              receiverAddress: '3 Kambzwza St, Bahan Tsp, Yangon'),
        ],
        receipts: [
-          Receipt(amount: 2000, date: DateTime(2020, 6, 1)),
+          Receipt(amount: 200, date: DateTime(2020, 6, 1)),
        ]),
    Invoice(
        invoiceNumber: 'A092(A)-33',
        invoiceDate: DateTime(2020, 4, 6, 12, 15),
        customerName: 'Ko Myo Min',
        customerPhoneNumber: '+959 555555555',
-        amount: 3000,
+        amount: 300,
        status: 'Pending',
        receipts: [
-          Receipt(amount: 2000, date: DateTime(2020, 6, 1)),
+          Receipt(amount: 200, date: DateTime(2020, 6, 1)),
        ],
        packages: [
          Package(
--- a/lib/model/pickup_model.dart
+++ b/lib/model/pickup_model.dart
@@ -23,7 +23,7 @@ class PickUpModel extends BaseModel {
      mail: 'admin@fcs.com',
      facebook: 'https://facebook.com/fcs');

-  List<RadioGroup> radioGroups = [
+  List<RadioGroup> radioGroups1 = [
    RadioGroup(
      text: "FCS Pickup",
      index: 1,
@@ -42,9 +42,33 @@ class PickUpModel extends BaseModel {
    ),
  ];

+  List<RadioGroup> get radioGroups {
+    List<RadioGroup> radioGroups = [
+      RadioGroup(
+        text: "Local Pickup",
+        index: 1,
+      ),
+      RadioGroup(
+        text: "Courier Pickup",
+        index: 2,
+      ),
+      RadioGroup(
+        text: "Local Drop-off",
+        index: 3,
+      ),
+      RadioGroup(
+        text: "Courier Drop-off",
+        index: 4,
+      ),
+    ];
+    return radioGroups;
+  }
+
+  List<PickUp> get pickups {
+
  List<PickUp> pickups = [
    PickUp(
-        id: "P200412 - 12 Apr 2020",
+        id: "S200412 - 12 Apr 2020",
        userName: "Ko Kyaw Nyi",
        phoneNumber: '+959111111111',
        fromTime: '1PM',
@@ -54,7 +78,7 @@ class PickUpModel extends BaseModel {
        status: 'Pending',
        date: DateTime(2020, 5, 1),
        address: '154-19 64th Ave.\nFlushing, NY 11367',
-        handlingFee: 5000,
+        handlingFee: 50,
        isCourier: true,
        radioIndex: 2,
        cargoTypes: [
@@ -63,7 +87,7 @@ class PickUpModel extends BaseModel {
          Cargo(type: 'Dangerous Cargo', weight: 30)
        ]),
    PickUp(
-        id: "P200125 - 12 May 2020",
+        id: "S200125 - 12 May 2020",
        userName: "Ko Kyaw Nyi",
        phoneNumber: '+959111111111',
        fromTime: '1PM',
@@ -73,14 +97,14 @@ class PickUpModel extends BaseModel {
        status: 'Confirmed',
        date: DateTime(2020, 5, 6),
        address: '154-19 64th Ave.\nFlushing, NY 11367',
-        handlingFee: 5000,
+        handlingFee: 50,
        cargoTypes: [
          Cargo(type: 'General Cargo', weight: 25),
          Cargo(type: 'Medicine', weight: 20),
          Cargo(type: 'Dangerous Cargo', weight: 30)
        ]),
    PickUp(
-        id: "P200441 - 13 Apr 2020",
+        id: "S200441 - 13 Apr 2020",
        userName: "Ko Kyaw Nyi",
        phoneNumber: '+959111111111',
        fromTime: '1PM',
@@ -90,7 +114,7 @@ class PickUpModel extends BaseModel {
        status: "Pickuped",
        date: DateTime(2020, 5, 9),
        address: '154-19 64th Ave.\nFlushing, NY 11367',
-        handlingFee: 5000,
+        handlingFee: 50,
        radioIndex: 3,
        cargoTypes: [
          Cargo(type: 'General Cargo', weight: 25),
@@ -98,7 +122,7 @@ class PickUpModel extends BaseModel {
          Cargo(type: 'Dangerous Cargo', weight: 30)
        ]),
    PickUp(
-        id: "P200412 - 12 Apr 2020",
+        id: "S200412 - 12 Apr 2020",
        userName: "Ko Kyaw Nyi",
        phoneNumber: '+959111111111',
        fromTime: '1PM',
@@ -108,14 +132,14 @@ class PickUpModel extends BaseModel {
        status: 'Pickuped',
        date: DateTime(2020, 5, 15),
        address: '154-19 64th Ave.\nFlushing, NY 11367',
-        handlingFee: 5000,
+        handlingFee: 50,
        cargoTypes: [
          Cargo(type: 'General Cargo', weight: 25),
          Cargo(type: 'Medicine', weight: 20),
          Cargo(type: 'Dangerous Cargo', weight: 30)
        ]),
    PickUp(
-        id: "P200125 - 12 May 2020",
+        id: "S200125 - 12 May 2020",
        userName: "Ko Kyaw Nyi",
        phoneNumber: '+959111111111',
        fromTime: '1PM',
@@ -125,14 +149,14 @@ class PickUpModel extends BaseModel {
        status: 'Pickuped',
        date: DateTime(2020, 5, 20),
        address: '154-19 64th Ave.\nFlushing, NY 11367',
-        handlingFee: 5000,
+        handlingFee: 50,
        cargoTypes: [
          Cargo(type: 'General Cargo', weight: 25),
          Cargo(type: 'Medicine', weight: 20),
          Cargo(type: 'Dangerous Cargo', weight: 30)
        ]),
    PickUp(
-        id: "P200441 - 13 Apr 2020",
+        id: "S200441 - 13 Apr 2020",
        userName: "Ko Kyaw Nyi",
        phoneNumber: '+959111111111',
        fromTime: '1PM',
@@ -142,14 +166,14 @@ class PickUpModel extends BaseModel {
        status: "Pickuped",
        date: DateTime(2020, 5, 21),
        address: '154-19 64th Ave.\nFlushing, NY 11367',
-        handlingFee: 5000,
+        handlingFee: 50,
        cargoTypes: [
          Cargo(type: 'General Cargo', weight: 25),
          Cargo(type: 'Medicine', weight: 20),
          Cargo(type: 'Dangerous Cargo', weight: 30)
        ]),
    PickUp(
-        id: "P200441 - 10 Apr 2020",
+        id: "S200441 - 10 Apr 2020",
        userName: "Ko Kyaw Nyi",
        phoneNumber: '+959111111111',
        fromTime: '1PM',
@@ -159,14 +183,14 @@ class PickUpModel extends BaseModel {
        status: "Canceled",
        date: DateTime(2020, 5, 25),
        address: '154-19 64th Ave.\nFlushing, NY 11367',
-        handlingFee: 5000,
+        handlingFee: 50,
        cargoTypes: [
          Cargo(type: 'General Cargo', weight: 25),
          Cargo(type: 'Medicine', weight: 20),
          Cargo(type: 'Dangerous Cargo', weight: 30)
        ]),
    PickUp(
-        id: "P200441 - 6 Apr 2020",
+        id: "S200441 - 6 Apr 2020",
        userName: "Ko Kyaw Nyi",
        phoneNumber: '+959111111111',
        fromTime: '1PM',
@@ -176,7 +200,151 @@ class PickUpModel extends BaseModel {
        status: "Canceled",
        date: DateTime(2020, 5, 27),
        address: '154-19 64th Ave.\nFlushing, NY 11367',
-        handlingFee: 5000,
+        handlingFee: 50,
+        cargoTypes: [
+          Cargo(type: 'General Cargo', weight: 25),
+          Cargo(type: 'Medicine', weight: 20),
+          Cargo(type: 'Dangerous Cargo', weight: 30)
+        ]),
+  ];
+  return pickups;
+  }
+
+  List<PickUp> pickups1 = [
+    PickUp(
+        id: "S200412 - 12 Apr 2020",
+        userName: "Ko Kyaw Nyi",
+        phoneNumber: '+959111111111',
+        fromTime: '1PM',
+        toTime: '3PM',
+        numberOfPackage: 5,
+        weight: 25,
+        status: 'Pending',
+        date: DateTime(2020, 5, 1),
+        address: '154-19 64th Ave.\nFlushing, NY 11367',
+        handlingFee: 50,
+        isCourier: true,
+        radioIndex: 2,
+        cargoTypes: [
+          Cargo(type: 'General Cargo', weight: 25),
+          Cargo(type: 'Medicine', weight: 20),
+          Cargo(type: 'Dangerous Cargo', weight: 30)
+        ]),
+    PickUp(
+        id: "S200125 - 12 May 2020",
+        userName: "Ko Kyaw Nyi",
+        phoneNumber: '+959111111111',
+        fromTime: '1PM',
+        toTime: '3PM',
+        numberOfPackage: 5,
+        weight: 25,
+        status: 'Confirmed',
+        date: DateTime(2020, 5, 6),
+        address: '154-19 64th Ave.\nFlushing, NY 11367',
+        handlingFee: 50,
+        cargoTypes: [
+          Cargo(type: 'General Cargo', weight: 25),
+          Cargo(type: 'Medicine', weight: 20),
+          Cargo(type: 'Dangerous Cargo', weight: 30)
+        ]),
+    PickUp(
+        id: "S200441 - 13 Apr 2020",
+        userName: "Ko Kyaw Nyi",
+        phoneNumber: '+959111111111',
+        fromTime: '1PM',
+        toTime: '3PM',
+        numberOfPackage: 5,
+        weight: 25,
+        status: "Pickuped",
+        date: DateTime(2020, 5, 9),
+        address: '154-19 64th Ave.\nFlushing, NY 11367',
+        handlingFee: 50,
+        radioIndex: 3,
+        cargoTypes: [
+          Cargo(type: 'General Cargo', weight: 25),
+          Cargo(type: 'Medicine', weight: 20),
+          Cargo(type: 'Dangerous Cargo', weight: 30)
+        ]),
+    PickUp(
+        id: "S200412 - 12 Apr 2020",
+        userName: "Ko Kyaw Nyi",
+        phoneNumber: '+959111111111',
+        fromTime: '1PM',
+        toTime: '3PM',
+        numberOfPackage: 5,
+        weight: 25,
+        status: 'Pickuped',
+        date: DateTime(2020, 5, 15),
+        address: '154-19 64th Ave.\nFlushing, NY 11367',
+        handlingFee: 50,
+        cargoTypes: [
+          Cargo(type: 'General Cargo', weight: 25),
+          Cargo(type: 'Medicine', weight: 20),
+          Cargo(type: 'Dangerous Cargo', weight: 30)
+        ]),
+    PickUp(
+        id: "S200125 - 12 May 2020",
+        userName: "Ko Kyaw Nyi",
+        phoneNumber: '+959111111111',
+        fromTime: '1PM',
+        toTime: '3PM',
+        numberOfPackage: 5,
+        weight: 25,
+        status: 'Pickuped',
+        date: DateTime(2020, 5, 20),
+        address: '154-19 64th Ave.\nFlushing, NY 11367',
+        handlingFee: 50,
+        cargoTypes: [
+          Cargo(type: 'General Cargo', weight: 25),
+          Cargo(type: 'Medicine', weight: 20),
+          Cargo(type: 'Dangerous Cargo', weight: 30)
+        ]),
+    PickUp(
+        id: "S200441 - 13 Apr 2020",
+        userName: "Ko Kyaw Nyi",
+        phoneNumber: '+959111111111',
+        fromTime: '1PM',
+        toTime: '3PM',
+        numberOfPackage: 5,
+        weight: 25,
+        status: "Pickuped",
+        date: DateTime(2020, 5, 21),
+        address: '154-19 64th Ave.\nFlushing, NY 11367',
+        handlingFee: 50,
+        cargoTypes: [
+          Cargo(type: 'General Cargo', weight: 25),
+          Cargo(type: 'Medicine', weight: 20),
+          Cargo(type: 'Dangerous Cargo', weight: 30)
+        ]),
+    PickUp(
+        id: "S200441 - 10 Apr 2020",
+        userName: "Ko Kyaw Nyi",
+        phoneNumber: '+959111111111',
+        fromTime: '1PM',
+        toTime: '3PM',
+        numberOfPackage: 5,
+        weight: 25,
+        status: "Canceled",
+        date: DateTime(2020, 5, 25),
+        address: '154-19 64th Ave.\nFlushing, NY 11367',
+        handlingFee: 50,
+        cargoTypes: [
+          Cargo(type: 'General Cargo', weight: 25),
+          Cargo(type: 'Medicine', weight: 20),
+          Cargo(type: 'Dangerous Cargo', weight: 30)
+        ]),
+    PickUp(
+        id: "S200441 - 6 Apr 2020",
+        userName: "Ko Kyaw Nyi",
+        phoneNumber: '+959111111111',
+        fromTime: '1PM',
+        toTime: '3PM',
+        numberOfPackage: 5,
+        weight: 25,
+        status: "Canceled",
+        date: DateTime(2020, 5, 27),
+        address: '154-19 64th Ave.\nFlushing, NY 11367',
+        handlingFee: 50,
        cargoTypes: [
          Cargo(type: 'General Cargo', weight: 25),
          Cargo(type: 'Medicine', weight: 20),
@@ -219,6 +387,6 @@ class PickUpModel extends BaseModel {
  @override
  logout() async {
    if (listener != null) await listener.cancel();
-    pickups = [];
+    // pickups = [];
  }
 }
--- a/lib/model/shipment_rate_model.dart
+++ b/lib/model/shipment_rate_model.dart
@@ -30,8 +30,8 @@ class ShipmentRateModel extends BaseModel {
  ];

  List<Discount> discountsByWeight = [
-    Discount(weight: 10, discountRate: 3),
-    Discount(weight: 20, discountRate: 5)
+    Discount(weight: 50, discountRate: 0.25),
+    Discount(weight: 100, discountRate: 0.50)
  ];

  int freeDeliveryWeight = 10;