merge

lib/domain/constants.dart

@@ -69,6 +69,7 @@ const privilege_delivery = "deli";
 const privilege_invoice = "inv";
 const privilege_processing = "pr";
 const privilege_receiving = "rc";
+const privilege_pickup = "pku";
 
 // Pickup types
 const shipment_local_pickup = "Local pickup";

lib/domain/entities/carton.dart

@@ -109,7 +109,6 @@ class Carton {
     double wd = sw - aw;
     wd = wd - rate.diffDiscountWeight;
     double wdAmount = wd > 0 ? wd * rate.diffWeightRate : 0;
-
     DiscountByWeight discountByWeight = rate.getDiscountByWeight(aw);
 
     double total = 0;

lib/domain/entities/rate.dart

@@ -16,10 +16,12 @@ class Rate {
 
   DiscountByWeight getDiscountByWeight(double weight) {
     discountByWeights.sort((d1, d2) => d2.weight.compareTo(d1.weight));
-    return discountByWeights.firstWhere((e) => e.weight < weight);
+    return discountByWeights.firstWhere((e) => e.weight < weight,
+        orElse: () => DiscountByWeight());
   }
 
-  CargoType get defaultCargoType => cargoTypes.firstWhere((e) => e.name == "General");
+  CargoType get defaultCargoType =>
+      cargoTypes.firstWhere((e) => e.name == "General");
 
   Rate(
       {this.deliveryFee = 0,

lib/domain/vo/privilege.dart

@@ -43,6 +43,8 @@ class Privilege {
       iconData = FontAwesome.dropbox;
     } else if (this.id == privilege_receiving) {
       iconData = MaterialCommunityIcons.inbox_arrow_down;
+    } else if (this.id == privilege_pickup) {
+      iconData = FontAwesome.dropbox;
     } else {
       iconData = MaterialCommunityIcons.account_question;
     }