diff --git a/assets/local/localization_en.json b/assets/local/localization_en.json index 4b07884..d4f684d 100644 --- a/assets/local/localization_en.json +++ b/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", @@ -592,7 +592,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", diff --git a/assets/local/localization_mu.json b/assets/local/localization_mu.json index e623fa8..aec7ed5 100644 --- a/assets/local/localization_mu.json +++ b/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":"အမှန်အလေးချိန်", @@ -595,7 +595,7 @@ "processing.new":"လုပ်ဆောင်ခြင်း အသစ်", "processing.create":"လုပ်ဆောင်ခြင်း အသစ်", "processing.update":"လုပ်ဆောင်ခြင်း ပြင်ဆင်ခြင်း", - "processing.consignee.name":"လက်ခံသူ အမည်", + "processing.consignee.name":"လက်ခံသူ", "processing.shipper.name":"တင်ပို့သူ အမည်", "processing.package.select.btn":"ရွေးချယ်မည်", "processing.package.create":"အထုပ် အသစ်", diff --git a/lib/domain/entities/cargo_type.dart b/lib/domain/entities/cargo_type.dart index 0e165ea..92d3f25 100644 --- a/lib/domain/entities/cargo_type.dart +++ b/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 toMap() { diff --git a/lib/pages/carton/cargo_table.dart b/lib/pages/carton/cargo_table.dart index 0639bf4..ea21a8f 100644 --- a/lib/pages/carton/cargo_table.dart +++ b/lib/pages/carton/cargo_table.dart @@ -106,7 +106,7 @@ class _CargoTableState extends State { 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))), ), ), diff --git a/lib/pages/carton/carton_info.dart b/lib/pages/carton/carton_info.dart index 9812ecb..6cd744d 100644 --- a/lib/pages/carton/carton_info.dart +++ b/lib/pages/carton/carton_info.dart @@ -175,11 +175,11 @@ class _CartonInfoState extends State { labelTextKey: "box.number", //iconData: Ionicons.ios_airplane, ); - final cartonQrBox = DisplayText( - // text: _box!., - //labelTextKey: "box.number", - iconData: AntDesign.qrcode, - ); + // final cartonQrBox = DisplayText( + // // text: _box!., + // //labelTextKey: "box.number", + // iconData: AntDesign.qrcode, + // ); final shipmentBox = DisplayText( text: _box!.fcsShipmentNumber, labelTextKey: "box.fcs_shipment_num", @@ -215,14 +215,17 @@ class _CartonInfoState extends State { text1: _box!.fcsID != null ? _box!.fcsID : "", labelTextKey: "processing.consignee.name", //maxLines: 2, - //iconData: Ionicons.document_text_outline, + // iconData: Ionicons.document_text_outline, ); final consigneeBox = Container( child: Column( - children: [ - consigneefcsIDBox, + children: [ consigneeNameBox, + IconButton(icon:Icon(Ionicons.document_text_outline), + onPressed:() {},), + Text("Bill to",style:TextStyle(color:Color.fromARGB(255, 57, 80, 233))) + ], ), ); @@ -285,6 +288,7 @@ class _CartonInfoState extends State { final packageBox = DisplayText( text: "203FVH", labelTextKey: "box.package", + maxLines:20, //iconData: AntDesign.CodeSandbox, ); @@ -368,12 +372,19 @@ class _CartonInfoState extends State { Padding(padding: EdgeInsets.only(left: 30), child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [Expanded(child: cartonTypeBox, - flex: 1, + mainAxisAlignment: MainAxisAlignment.start, + children: [Flexible(child: cartonTypeBox, + //flex: 1, ), - Flexible( - child: cartonQrBox, + Expanded( + child: IconButton( + alignment: Alignment.centerLeft, + iconSize: 30, + icon: const Icon( AntDesign.qrcode), + onPressed: () { + // ... + }, +), ), ],)), @@ -381,9 +392,9 @@ class _CartonInfoState extends State { Padding(padding: EdgeInsets.only(left: 30), child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [Expanded(child: shipmentBox, - flex: 1, + mainAxisAlignment: MainAxisAlignment.start, + children: [Flexible(child: shipmentBox, + //flex: 1, ), Flexible( child: deliveryBox, @@ -396,14 +407,22 @@ class _CartonInfoState extends State { Flexible(child: customerNameBox, ), - Flexible( - child: consigneeNameBox, - ), - Flexible(child: + // Flexible( + // child: consigneeNameBox, + // ), + new Flexible(child: Column( - children: [ - Icon(Ionicons.document_text_outline), - Text("Bill to",style:TextStyle(color:Colors.blue)) + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + consigneeNameBox, + new Padding( + padding: const EdgeInsets.fromLTRB(0, 30.0, 0.0, 0.0), + child: + IconButton(icon:Icon(Ionicons.document_text_outline), + onPressed:() {},) + ), + // Text("Bill to",style:TextStyle(color:Color.fromARGB(255, 57, 80, 233))) + ] )), ],)), @@ -432,16 +451,16 @@ class _CartonInfoState extends State { Padding(padding: EdgeInsets.only(left: 30), child: packageBox), - isMixBox ? mixTypeBox : Container(), - isMixBox ? LocalTitle(textKey: "box.mix_caton_title") : Container(), - isMixBox - ? Column(children: _getCartons(context, _box!.mixCartons)) - : Container(), - isFromPackages || isSmallBag - ? CartonPackageTable( - packages: _box!.packages, - ) - : Container(), + // isMixBox ? mixTypeBox : Container(), + // isMixBox ? LocalTitle(textKey: "box.mix_caton_title") : Container(), + // isMixBox + // ? Column(children: _getCartons(context, _box!.mixCartons)) + // : Container(), + // isFromPackages || isSmallBag + // ? CartonPackageTable( + // packages: _box!.packages, + // ) + // : Container(), // isMixBox ? Container() : LocalTitle(textKey: "box.cargo.type"), isMixBox ? Container() : cargoTableBox, ...(isFromPackages || isFromCartons