Merge branch 'master' of https://git.mokkon.com/sainw/fcs

lib/pages/rates/discount_by weight_list.dart

@@ -82,7 +82,8 @@ class _DiscountByWeightListState extends State<DiscountByWeightList> {
                               discountByWeight: discountByWeight)));
                     },
                     child: Container(
-                      child: _row("${discountByWeight.weight.toString()} lb",
+                      child: _row(
+                          "${discountByWeight.weight.toStringAsFixed(2)} lb",
                           "\$ " + discountByWeight.discount.toString()),
                     ),
                   );

lib/pages/rates/discount_by_weight_editor.dart

@@ -31,7 +31,7 @@ class _DiscountByWeightEditorState extends State<DiscountByWeightEditor> {
     super.initState();
     if (widget.discountByWeight != null) {
       _discountByWeight = widget.discountByWeight;
-      _weightController.text = _discountByWeight.weight.toString();
+      _weightController.text = _discountByWeight.weight.toStringAsFixed(2);
       _discountController.text = _discountByWeight.discount.toString();
       _isNew = false;
     } else {

lib/pages/rates/shipment_rates.dart

@@ -196,8 +196,8 @@ class _ShipmentRatesState extends State<ShipmentRates> {
     if (discounts == null) return [];
     return discounts.map((d) {
       return Container(
-        child: _row(
-            "${d.weight.toString()} lb", "\$ " + d.discount.toString(), ''),
+        child: _row("${d.weight.toStringAsFixed(2)} lb",
+            "\$ " + d.discount.toString(), ''),
       );
     }).toList();
   }

lib/pages/rates/shipment_rates_edit.dart

@@ -37,7 +37,7 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
         Provider.of<ShipmentRateModel>(context, listen: false);
     Rate rate = shipmentRateModel.rate;
 
-    _minWeight.text = rate.freeDeliveryWeight?.toString() ?? "";
+    _minWeight.text = rate.freeDeliveryWeight?.toStringAsFixed(2) ?? "";
     _deliveryFee.text = rate.deliveryFee?.toString() ?? "";
     _volumetricRatio.text = rate.volumetricRatio?.toString() ?? "";
   }