Merge branch 'master' of sma/fcs into master

assets/local/localization_mu.json

@@ -331,7 +331,7 @@
     "box.select.cartion":"Select cartons",
     "box.no_carton":"There is no cartons in this shipment.",
     "box.crete.carton":"Create carton",
-    "box.carton.type":"Carton type",
+    "box.carton.type":"ပုံး အမျိုးအစား",
     "box.select.delivery":"Select delivery type",
     "box.select.package":"Select packages",
     "box.no_package":"There is no packages.",

lib/pages/carton/carton_info.dart

@@ -248,7 +248,7 @@ class _CartonInfoState extends State<CartonInfo> {
         //),
         Container(
           child: Padding(
-            padding: const EdgeInsets.only(right: 50),
+            padding: const EdgeInsets.only(right: 60),
             child: Column(
               children: [
                 Column(
@@ -273,25 +273,7 @@ class _CartonInfoState extends State<CartonInfo> {
                       );
                     }).toList()),
                 const SizedBox(height: 10),
-                Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: _surchareItems.map((e) {
-                      return Padding(
-                        padding: const EdgeInsets.symmetric(vertical: 3),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            Text(
-                              e.name ?? "",
-                              style: TextStyle(color: labelColor, fontSize: 15),
-                            ),
-                            Text("${numberFormatter.format(e.qty)} pc",
-                                style:
-                                    TextStyle(color: labelColor, fontSize: 15))
-                          ],
-                        ),
-                      );
-                    }).toList()),
+                
               ],
             ),
           ),