merge

assets/local/localization_en.json

@@ -266,7 +266,7 @@
     "box.delivery_type":"Delivery type",
     "box.fcs_shipment_num":"Shipment",
     "box.fcs.id":"FCS ID",
-    "box.name":"Customer name",
+    "box.name":"Sender",
     "box.phone":"Phone number",
     "box.actual_weight":"Actual weight",
     "box.add_cargo":"Add cargo",
@@ -595,7 +595,7 @@
     "processing.new":"New Processing",
     "processing.create":"New Processing",
     "processing.update":"Update Processing",
-    "processing.consignee.name":"Consignee name",
+    "processing.consignee.name":"Consignee",
     "processing.shipper.name":"Sender name",
     "processing.package.select.btn":"Select",
     "processing.package.create":"New Package",

assets/local/localization_mu.json

@@ -266,7 +266,7 @@
     "box.delivery_type":"ပို့ဆောင်ရမည့်အမျိုးအစား",
     "box.fcs_shipment_num":"တင်ပို့နံပါတ်",
     "box.fcs.id":"FCS ID",
-    "box.name":"နာမည်",
+    "box.name":"ပေးပို့သူ",
     "box.package":"အထုပ်များ",
     "box.phone":"ဖုန်းနံပါတ်",
     "box.actual_weight":"အမှန်အလေးချိန်",
@@ -598,7 +598,7 @@
     "processing.new":"လုပ်ဆောင်ခြင်း အသစ်",
     "processing.create":"လုပ်ဆောင်ခြင်း အသစ်",
     "processing.update":"လုပ်ဆောင်ခြင်း ပြင်ဆင်ခြင်း",
-    "processing.consignee.name":"လက်ခံသူ အမည်",
+    "processing.consignee.name":"လက်ခံသူ",
     "processing.shipper.name":"တင်ပို့သူ အမည်",
     "processing.package.select.btn":"ရွေးချယ်မည်",
     "processing.package.create":"အထုပ် အသစ်",

lib/domain/entities/cargo_type.dart

@@ -33,8 +33,8 @@ class CargoType {
         calWeight: map['cal_weight']?.toDouble() ?? 0,
         calRate: map['cal_rate']?.toDouble() ?? 0,
         isCutomDuty: map['custom_duty'] ?? false,
-        customDutyFee: (map['custom_duty_fee'] ?? 0).toDouble(),
-        qty: (map['qty'] ?? 0).toInt());
+        customDutyFee: (map['custom_duty_fee'] ?? 0).toDouble());
+        //qty: (map['qty'] ?? 0).toInt());
   }
 
   Map<String, dynamic> toMap() {

lib/pages/carton/cargo_table.dart

@@ -106,7 +106,7 @@ class _CargoTableState extends State<CargoTable> {
             padding: const EdgeInsets.only(right: 48.0),
             child: Align(
                 alignment: Alignment.centerRight,
-                child: Text(total.toStringAsFixed(2),
+                child: Text(total.toStringAsFixed(2)+" lb",
                     style: TextStyle(fontWeight: FontWeight.bold))),
           ),
         ),

lib/pages/carton/carton_info.dart

@@ -175,11 +175,19 @@ class _CartonInfoState extends State<CartonInfo> {
       labelTextKey: "box.number",
       //iconData: Ionicons.ios_airplane,
     );
+<<<<<<< HEAD
     final cartonQrBox = DisplayText(
       // text: _box!.,
       //labelTextKey: "box.number",
       iconData: AntDesign.qrcode,
     );
+=======
+    // final cartonQrBox = DisplayText(
+    //  // text: _box!.,
+    //   //labelTextKey: "box.number",
+    //   iconData: AntDesign.qrcode,
+    // );
+>>>>>>> 9bd0c5d484c580feff721ff039b506f107dcb314
     final shipmentBox = DisplayText(
       text: _box!.fcsShipmentNumber,
       labelTextKey: "box.fcs_shipment_num",
@@ -223,8 +231,11 @@ class _CartonInfoState extends State<CartonInfo> {
     final consigneeBox = Container(
       child: Column(
         children: [          
-          consigneefcsIDBox,
           consigneeNameBox,
+           IconButton(icon:Icon(Ionicons.document_text_outline),
+                     onPressed:() {},),
+                    Text("Bill to",style:TextStyle(color:Color.fromARGB(255, 57, 80, 233)))
+                   
         ],
       ),
     );
@@ -287,6 +298,7 @@ class _CartonInfoState extends State<CartonInfo> {
     final packageBox = DisplayText(
       text: "203FVH",
       labelTextKey: "box.package",
+      maxLines:20,
       //iconData: AntDesign.CodeSandbox,
     );
 
@@ -376,8 +388,15 @@ class _CartonInfoState extends State<CartonInfo> {
                       child: cartonTypeBox,
                       flex: 1,
                     ),
-                    Flexible(
-                      child: cartonQrBox,
+                   Expanded(
+                  child:  IconButton(
+                    alignment: Alignment.centerLeft,
+                iconSize: 30,
+                 icon: const Icon( AntDesign.qrcode),
+           onPressed: () {
+    // ...
+               },
+),
                 ),
                   ],
                 )),