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

assets/local/localization_en.json

@@ -280,7 +280,7 @@
     "box.cargo.type":"Cargos",
     "box.dimension":"Dimension",
     "box.delivery_address":"Delivery address",
-    "box.delivery_type":"Delivery type",
+    "box.delivery_type":"Last mile",
     "box.fcs_shipment_num":"Shipment",
     "box.fcs.id":"FCS ID",
     "box.name":"Sender",

assets/local/localization_mu.json

@@ -281,7 +281,7 @@
     "box.cargo.type":"ကုန်ပစ္စည်းအမျိုးအစားများ",
     "box.dimension":"အရွယ်အစား",
     "box.delivery_address":"ပို့ဆောင်ရမည့်လိပ်စာ",
-    "box.delivery_type":"ပို့ဆောင်ရမည့်အမျိုးအစား",
+    "box.delivery_type":"နောက်ဆုံးမိုင်",
     "box.fcs_shipment_num":"တင်ပို့နံပါတ်",
     "box.fcs.id":"FCS ID",
     "box.name":"ပေးပို့သူ",

lib/pages/carton/carton_info.dart

@@ -90,7 +90,7 @@ class _CartonInfoState extends State<CartonInfo> {
 
   @override
   Widget build(BuildContext context) {
-    String? boxDimension = _carton.cartonSizeType == standardCarton
+   String? boxDimension = _carton.cartonSizeType == standardCarton
         ? "${standardSize?.name} - ${standardSize?.length.toInt()}”x${standardSize?.width.toInt()}”x${standardSize?.height.toInt()}”"
         : _carton.cartonSizeType == customCarton
             ? "${_carton.length.toInt()}”x${_carton.width.toInt()}”x${_carton.height.toInt()}”"
@@ -113,12 +113,20 @@ class _CartonInfoState extends State<CartonInfo> {
 
     final cartonSubTypeBox = DisplayText(
       text: _carton.cartonType == carton_from_packages
-          ? "Carton for packages"
+          ? "For packages"
           : "Mix carton",
-      subText: boxDimension == null ? null : Text("$boxDimension"),
       labelTextKey: "box.carton.type",
     );
 
+    final billInfoBox = DisplayText(
+      text: _carton.billTo == billToSender
+          ? "Sender"
+          : _carton.billTo == billToConsignee
+              ? "Consignee"
+              : null,
+      labelTextKey: "box.bill_to",
+    );
+
     final shipmentBox = DisplayText(
       text: _carton.fcsShipmentNumber,
       labelTextKey: "box.fcs_shipment_num",
@@ -129,6 +137,11 @@ class _CartonInfoState extends State<CartonInfo> {
       labelTextKey: "box.delivery_type",
     );
 
+    final cartonSizeBox = DisplayText(
+      subText: boxDimension == null ? null : Text("$boxDimension"),
+      labelTextKey: "box.carton_size",
+    );
+
     final senderBox = DisplayText(
       text: _carton.senderName == null ? "" : _carton.senderName,
       subText: Text(_carton.senderFCSID ?? "", style: textStyle),
@@ -141,18 +154,18 @@ class _CartonInfoState extends State<CartonInfo> {
       labelTextKey: "processing.consignee.name",
     );
 
-    final billWidget = Expanded(
-        child: Padding(
-            padding: EdgeInsets.only(left: 0, top: 15),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: [
-                Icon(Ionicons.document_text_outline,
-                    color: primaryColor, size: 20),
-                Text("Bill to",
-                    style: TextStyle(color: primaryColor, fontSize: 15))
-              ],
-            )));
+    // final billWidget = Expanded(
+    //     child: Padding(
+    //         padding: EdgeInsets.only(left: 0, top: 15),
+    //         child: Row(
+    //           mainAxisAlignment: MainAxisAlignment.start,
+    //           children: [
+    //             Icon(Ionicons.document_text_outline,
+    //                 color: primaryColor, size: 20),
+    //             Text("Bill to",
+    //                 style: TextStyle(color: primaryColor, fontSize: 15))
+    //           ],
+    //         )));
 
     final userRowBox = Row(
       mainAxisAlignment: MainAxisAlignment.start,
@@ -169,7 +182,7 @@ class _CartonInfoState extends State<CartonInfo> {
                   ],
                 ),
               ),
-              _carton.billTo == billToSender ? billWidget : const SizedBox()
+              // _carton.billTo == billToSender ? billWidget : const SizedBox()
             ],
           ),
         ),
@@ -185,7 +198,7 @@ class _CartonInfoState extends State<CartonInfo> {
                 ],
               ),
             ),
-            _carton.billTo == billToConsignee ? billWidget : const SizedBox()
+            // _carton.billTo == billToConsignee ? billWidget : const SizedBox()
           ],
         ))
       ],
@@ -354,26 +367,34 @@ class _CartonInfoState extends State<CartonInfo> {
                 padding: const EdgeInsets.only(left: 20, right: 20),
                 child: ListView(children: <Widget>[
                   Row(children: [
-                    Flexible(child: cartonTypeBox),
+                    Flexible(child: cartonTypeBox,flex: 1),
                     Flexible(
                       child: cartonQrBox,
                     ),
+                  
                   ]),
                   Row(
                     children: [
                       Flexible(child: cartonSubTypeBox),
                     ],
                   ),
+                  _mixCartons.isEmpty ? userRowBox : const SizedBox(),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
+                      Flexible(child: billInfoBox),
                       Flexible(child: shipmentBox),
+                    ],
+                  ),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
                       _mixCartons.isEmpty
                           ? Flexible(child: deliveryBox)
                           : const SizedBox(),
+                      Flexible(child: cartonSizeBox),
                     ],
                   ),
-                  _mixCartons.isEmpty ? userRowBox : const SizedBox(),
                   _packages.isEmpty
                       ? const SizedBox()
                       : Padding(