Merge branch 'master' of tzw/fcs into master

lib/pages_fcs/box_editor.dart

@@ -82,14 +82,14 @@ class _BoxEditorState extends State<BoxEditor> {
 
       isNew = true;
       _box = Box(
-        rate: 0,
-        weight: 75,
-        width: 0,
-        height: 0,
-        length: 0,
-        packages: packages,
-        cargoTypes: _cargoTypes,
-      );
+          rate: 0,
+          weight: 75,
+          width: 0,
+          height: 0,
+          length: 0,
+          packages: packages,
+          cargoTypes: _cargoTypes,
+          shipmentWeight: 0);
     }
   }
 
@@ -283,7 +283,7 @@ class _BoxEditorState extends State<BoxEditor> {
                               textAlign: TextAlign.end,
                               decoration: InputDecoration(
                                 fillColor: Colors.white,
-                                labelText: 'Total Weight',
+                                labelText: 'Actual Weight',
                                 filled: true,
                                 icon: Icon(FontAwesomeIcons.weightHanging,
                                     color: primaryColor),
@@ -369,6 +369,12 @@ class _BoxEditorState extends State<BoxEditor> {
                             color: primaryColor, fontWeight: FontWeight.bold),
                       ),
                       children: [
+                        Padding(
+                          padding: const EdgeInsets.only(left: 20.0, right: 20),
+                          child: fcsInputReadOnly(
+                              "Shipment Weight", FontAwesomeIcons.weightHanging,
+                              value: _box.shipmentWeight.toString()),
+                        ),
                         Padding(
                           padding: const EdgeInsets.only(left: 20.0, right: 20),
                           child: TextFormField(