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

lib/domain/entities/carton.dart

@@ -36,8 +36,10 @@ class Carton {
   String? mixCartonNumber;
   String? cartonSizeID;
   String? cartonSizeName;
+  String? cartonSizeType;
+  String? cartonStandardSize;
   double cartonWeight;
-  String? billTo;
+   String? billTo;
   bool isSelected;
 
   int rate;
@@ -49,6 +51,7 @@ class Carton {
   String? remark;
   DateTime? arrivedDate;
   String? cartonNumber;
+  String? deliveryCarton;
 
   List<String> packageIDs;
   List<Package> packages;
@@ -159,6 +162,9 @@ class Carton {
       this.deliveryAddress,
       this.cartonSizeID,
       this.cartonSizeName,
+      this.cartonSizeType,
+      this.cartonStandardSize,
+      this.deliveryCarton,
       this.mixBoxType,
       this.mixCartons = const [],
       this.mixCartonIDs = const [],

lib/pages/carton/carton_image_upload_editor.dart

@@ -39,47 +39,40 @@ class _CartonImageUploaState extends State<CartonImageUploadEditor> {
                 labelColor: primaryColor,
                 arrowColor: primaryColor,
                 actions: []
-                // isEdiable
+                
-                //     ? <Widget>[
-                //         IconButton(
-                //           icon: Icon(Icons.edit, color: primaryColor),
-                //           onPressed: _gotoEditor,
-                //         ),
-                //         IconButton(
-                //           icon: Icon(Icons.delete, color: primaryColor),
-                //           onPressed: _delete,
-                //         ),
-                //       ]
-                //     : [],
                 ),
-            body:  ListView(
+            body: 
-                  children: [
+             Padding(padding:EdgeInsets.only(left: 12.0, right: 12),
-                    Center(
+               child: ListView(
-                        child: Text("${_box?.cartonNumber}",
+                    children: [
-                            style: TextStyle(
+                      Center(
-                              color: primaryColor,
+                          child: Text("${_box?.cartonNumber}",
-                              fontSize: 25,
+                              style: TextStyle(
-                            ))),
+                                color: primaryColor,
-                    MultiImageFile(
+                                fontSize: 25,
-                      enabled: true,
+                              ))),
-                      controller: multiImgController,
+                              
-                      title: "Receipt File",
+                      MultiImageFile(
-                    ),
+                        enabled: true,
-                    Center(
+                        controller: multiImgController,
-                      child: ElevatedButton(
+                        title: "Receipt File",
-                        style: ElevatedButton.styleFrom(
-                          backgroundColor: Color(0xff272262),
-                          elevation: 3,
-                          shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(5.0)),
-                          minimumSize: Size(300, 45), //////// HERE
-                        ),
-                        onPressed: () {},
-                        child:
-                            const Text('Save', style: TextStyle(fontSize: 20)),
                       ),
-                    ),
+                      Center(
-                  ],
+                        child: ElevatedButton(
-                )));
+                          style: ElevatedButton.styleFrom(
+                            backgroundColor: Color(0xff272262),
+                            elevation: 3,
+                            shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(5.0)),
+                            minimumSize: Size(300, 45), //////// HERE
+                          ),
+                          onPressed: () {},
+                          child:
+                              const Text('Save', style: TextStyle(fontSize: 20)),
+                        ),
+                      ),
+                    ],
+                  ),
+             )));
   }
 }

lib/pages/carton/carton_info.dart

@@ -34,14 +34,14 @@ class _CartonInfoState extends State<CartonInfo> {
   final DateFormat dateFormat = DateFormat("d MMM yyyy");
   final NumberFormat numberFormatter = NumberFormat("#,###");
   MultiImgController multiImgController = MultiImgController();
-
   bool _isLoading = false;
   late Carton _carton;
-
   List<CargoType> _cargoTypes = [];
   List<CargoType> _surchareItems = [];
   List<Carton> _mixCartons = [];
   List<Package> _packages = [];
+  double totalWeight=0.0;
+   double totalSurchargeCount=0.0;
 
   @override
   void initState() {
@@ -52,6 +52,7 @@ class _CartonInfoState extends State<CartonInfo> {
 
   _init() async {
     _carton.billTo = billToSender;
+    _carton.cartonSizeType=standardCarton;
     _carton.cartonType = carton_from_packages;
     multiImgController.setImageUrls = _carton.photos;
     _cargoTypes = _carton.cargoTypes.where((e) => !e.isCutomDuty).toList();
@@ -71,14 +72,16 @@ class _CartonInfoState extends State<CartonInfo> {
     if (mounted) {
       setState(() {});
     }
+     _carton.cartonType="Carton for packages";
+      totalWeight =
+        _carton.cargoTypes.fold(0, (sum, value) => sum + value.weight);
+   totalSurchargeCount =
+        _surchareItems.fold(0, (sum, value) => sum + value.qty);
   }
 
   @override
   Widget build(BuildContext context) {
-    double totalWeight =
+   
-        _carton.cargoTypes.fold(0, (sum, value) => sum + value.weight);
-    double totalSurchargeCount =
-        _surchareItems.fold(0, (sum, value) => sum + value.qty);
 
     final cartonTypeBox = DisplayText(
       text: _carton.cartonNumber,
@@ -86,6 +89,11 @@ class _CartonInfoState extends State<CartonInfo> {
     );
 
     final cartonQrBox = DisplayText(iconData: AntDesign.qrcode);
+    final cartonSubTypeBox = DisplayText(
+      text: _carton.cartonType==carton_from_packages ? "Carton for packages":"Mix carton",
+      subText:Text( "${_carton.cartonStandardSize}"),
+      labelTextKey: "box.carton.type",
+    );
 
     final shipmentBox = DisplayText(
       text: _carton.fcsShipmentNumber,
@@ -93,19 +101,19 @@ class _CartonInfoState extends State<CartonInfo> {
     );
 
     final deliveryBox = DisplayText(
-      text: "Delivery Carton",
+      text: _carton.deliveryCarton,
       labelTextKey: "box.delivery_type",
     );
 
     final senderBox = DisplayText(
-      text: _carton.userName == null ? "" : _carton.userName,
+      text: _carton.senderName== null ? "" : _carton.senderName,
-      subText: Text(_carton.fcsID ?? "", style: textStyle),
+      subText: Text(_carton.senderFCSID?? "", style: textStyle),
       labelTextKey: "box.name",
     );
 
     final consigneeNameBox = DisplayText(
-      text: _carton.senderName != null ? _carton.senderName : "",
+      text: _carton.userName != null ? _carton.userName : "",
-      subText: Text(_carton.senderFCSID ?? "", style: textStyle),
+      subText: Text(_carton.fcsID?? "", style: textStyle),
       labelTextKey: "processing.consignee.name",
     );
 
@@ -338,14 +346,20 @@ class _CartonInfoState extends State<CartonInfo> {
                       child: cartonQrBox,
                     ),
                   ]),
+                  Row(children: [Flexible(child: cartonSubTypeBox),],),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Flexible(child: shipmentBox),
-                      Flexible(child: deliveryBox),
+                      _mixCartons.isEmpty
+                      ?
+                      Flexible(child: deliveryBox):const SizedBox(),
                     ],
                   ),
-                  userRowBox,
+                   _mixCartons.isEmpty
+                   ?
+                   userRowBox:
+                   const SizedBox(),
                   _packages.isEmpty
                       ? const SizedBox()
                       : Padding(