sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
phyothandar
2021-09-10 17:00:26 +06:30
parent d5fea4f81f 96eae9f92b
commit 4f7aa1b252
28 changed files with 206 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/rates/custom_editor.dart
View File

@@ -36,7 +36,7 @@ class _CustomEditorState extends State<CustomEditor> {
_productController.text = _custom.name??"";
_feeController.text = _custom.customDutyFee.toStringAsFixed(2);
_shipmentRateController.text =
_custom.rate == null ? "" : _custom.rate.toStringAsFixed(2);
_custom.rate == null ? "" : _custom.rate?.toStringAsFixed(2) ?? '';
} else {
_isNew = true;
}

3
lib/pages/rates/custom_list.dart
View File

@@ -85,7 +85,8 @@ class _CustomListState extends State<CustomList> {
"Custom Fee \$ " + custom.customDutyFee.toStringAsFixed(2),
custom.rate == null
? ""
: "Shipment rate \$ " + custom.rate.toStringAsFixed(2)),
: "Shipment rate \$ " +
custom.rate!.toStringAsFixed(2)),
),
);
}),

4
lib/pages/rates/shipment_rates_calculate.dart
View File

@@ -62,11 +62,11 @@ class _ShipmentRatesCalState extends State<ShipmentRatesCal> {
var amount = box.calAmount(rate);
var shipmentWeight = box.getShipmentWeight(rate.volumetricRatio);
var effectiveWeight =
_cargoType.weight > shipmentWeight ? _cargoType.weight : shipmentWeight;
_cargoType.weight! > shipmentWeight ? _cargoType.weight : shipmentWeight;
setState(() {
_deliveryFee =
effectiveWeight > rate.freeDeliveryWeight ? 0 : rate.deliveryFee;
effectiveWeight! > rate.freeDeliveryWeight ? 0 : rate.deliveryFee;
_amount = amount == null ? 0 : amount + _deliveryFee;
_shipmentWeight = shipmentWeight.toDouble();
});