sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of tzw/fcs into master

Browse Source
This commit is contained in:
sainw
2024-02-10 11:20:30 +06:30
committed by Gogs
parent b2603c02ce 02cf4b7dff
commit 1ec130bf09
33 changed files with 1053 additions and 1499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/local/localization_en.json
View File

@@ -341,7 +341,12 @@
"box.select.cargo_type":"Select surcharge item", "box.select.cargo_type":"Select surcharge item",
"box.surcharge.item":"Surcharge items", "box.surcharge.item":"Surcharge items",
"box.package.count":"Packages ({0})", "box.package.count":"Packages ({0})",
"box.bill_to":"Bill to",
"box.delvery_carton":"Delivery carton",
"box.pick_up_carton":"Pick-up carton",
"box.delete.btn":"Delete carton",
"box.update_title":"Edit carton",
"box.update.btn":"Update carton",
"Boxes End ================================================================":"", "Boxes End ================================================================":"",
"Delivery Start ================================================================":"", "Delivery Start ================================================================":"",

6
assets/local/localization_mu.json
View File

@@ -340,6 +340,12 @@
"box.select.cargo_type":"Select surcharge item", "box.select.cargo_type":"Select surcharge item",
"box.surcharge.item":"Surcharge items", "box.surcharge.item":"Surcharge items",
"box.package.count":"Packages ({0})", "box.package.count":"Packages ({0})",
"box.bill_to":"Bill to",
"box.delvery_carton":"Delivery carton",
"box.pick_up_carton":"Pick-up carton",
"box.delete.btn":"Delete carton",
"box.update_title":"Edit carton",
"box.update.btn":"Update carton",
"Boxes End ================================================================":"", "Boxes End ================================================================":"",
"Delivery Start ================================================================":"", "Delivery Start ================================================================":"",

15
lib/domain/entities/carton.dart
View File

@@ -36,8 +36,11 @@ class Carton {
String? mixCartonNumber; String? mixCartonNumber;
String? cartonSizeID; String? cartonSizeID;
String? cartonSizeName; String? cartonSizeName;
String? deliveryType;
String? cartonSizeType;
double cartonWeight; double cartonWeight;
String? billToValue; String? billTo;
bool isSelected; bool isSelected;
int rate; int rate;
@@ -149,7 +152,7 @@ class Carton {
this.packages = const [], this.packages = const [],
this.cargoTypes = const [], this.cargoTypes = const [],
this.cartonNumber, this.cartonNumber,
this.billToValue, this.billTo,
this.fcsShipmentID, this.fcsShipmentID,
this.fcsShipmentNumber, this.fcsShipmentNumber,
this.packageIDs = const [], this.packageIDs = const [],
@@ -159,10 +162,12 @@ class Carton {
this.deliveryAddress, this.deliveryAddress,
this.cartonSizeID, this.cartonSizeID,
this.cartonSizeName, this.cartonSizeName,
this.cartonSizeType,
this.deliveryType,
this.mixBoxType, this.mixBoxType,
this.mixCartons = const [], this.mixCartons = const [],
this.mixCartonIDs = const [], this.mixCartonIDs = const [],
this.cartonWeight =0, this.cartonWeight = 0,
this.photoUrls = const [], this.photoUrls = const [],
this.isSelected = false}); this.isSelected = false});
@@ -203,7 +208,7 @@ class Carton {
List<Map<String, dynamic>>.from(map['mix_cartons'] ?? []); List<Map<String, dynamic>>.from(map['mix_cartons'] ?? []);
var _mixCartons = var _mixCartons =
mixCartonsMaps.map((e) => Carton.fromMap(e, e["id"])).toList(); mixCartonsMaps.map((e) => Carton.fromMap(e, e["id"])).toList();
List<String> _photoUrls = List<String> _photoUrls =
map['photo_urls'] == null ? [] : List.from(map['photo_urls']); map['photo_urls'] == null ? [] : List.from(map['photo_urls']);
return Carton( return Carton(
@@ -237,7 +242,7 @@ class Carton {
senderName: map['sender_name'], senderName: map['sender_name'],
mixCartonIDs: List<String>.from(map['mix_carton_ids'] ?? []), mixCartonIDs: List<String>.from(map['mix_carton_ids'] ?? []),
cartonWeight: (map['carton_weight'] ?? 0).toDouble(), cartonWeight: (map['carton_weight'] ?? 0).toDouble(),
photoUrls: _photoUrls, photoUrls: _photoUrls,
); );
} }

118
lib/pages/carton/cargo_table.dart
View File

@@ -1,118 +0,0 @@
import 'package:fcs/domain/entities/cargo_type.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:flutter/material.dart';
class CargoTable extends StatefulWidget {
final List<CargoType>? cargoTypes;
const CargoTable({
Key? key,
this.cargoTypes,
}) : super(key: key);
@override
_CargoTableState createState() => _CargoTableState();
}
class _CargoTableState extends State<CargoTable> {
@override
Widget build(BuildContext context) {
return SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: DataTable(
headingRowHeight: 40,
columnSpacing: 50,
showCheckboxColumn: false,
decoration: BoxDecoration(border: Border.all(color: Colors.white)),
border: TableBorder(horizontalInside: BorderSide(color: Colors.white)),
columns: [
DataColumn(
label: LocalText(
context,
"cargo.type",
color: Colors.grey,
),
),
DataColumn(
label: LocalText(
context,
"cargo.qty",
color: Colors.grey,
),
),
DataColumn(
label: LocalText(
context,
"cargo.weight",
color: Colors.grey,
),
),
],
rows: getCargoRows(context),
),
);
}
List<DataRow> getCargoRows(BuildContext context) {
if (widget.cargoTypes == null) {
return [];
}
double total = 0;
var rows = widget.cargoTypes!.map((c) {
total += c.weight;
return DataRow(
onSelectChanged: (bool? selected) async {},
cells: [
DataCell(new Text(
c.name ?? "",
style: textStyle,
)),
DataCell(c.qty == 0
? Center(
child: Text(
"-",
style: textStyle,
),
)
: Center(
child: Text(
c.qty.toString(),
style: textStyle,
),
)),
DataCell(
Text(c.weight.toStringAsFixed(2), style: textStyle),
),
],
);
}).toList();
var totalRow = DataRow(
onSelectChanged: (bool? selected) {},
cells: [
DataCell(Align(
alignment: Alignment.centerRight,
child: LocalText(
context,
"shipment.cargo.total",
color: Colors.black87,
fontWeight: FontWeight.bold,
),
)),
DataCell(Text("")),
DataCell(
Padding(
padding: const EdgeInsets.only(right: 48.0),
child: Align(
alignment: Alignment.centerRight,
child: Text(total.toStringAsFixed(2)+" lb",
style: TextStyle(fontWeight: FontWeight.bold))),
),
),
],
);
rows.add(totalRow);
return rows;
}
}

132
lib/pages/carton/cargo_type_addtion.dart
View File

@@ -1,132 +0,0 @@
import 'package:fcs/domain/entities/cargo_type.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/local_title.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class CargoTypeAddition extends StatefulWidget {
@override
_CargoTypeAdditionState createState() => _CargoTypeAdditionState();
}
class _CargoTypeAdditionState extends State<CargoTypeAddition> {
bool _isLoading = false;
List<CargoType> cargos = [];
List<CargoType> specialCargos = [];
@override
void initState() {
super.initState();
var shipmentRateModel =
Provider.of<ShipmentRateModel>(context, listen: false);
cargos = shipmentRateModel.rate.cargoTypes.map((e) => e.clone()).toList();
specialCargos = List.from(shipmentRateModel.rate.customDuties);
specialCargos =
shipmentRateModel.rate.customDuties.map((e) => e.clone()).toList();
cargos.forEach((p) {
p.isChecked = false;
p.isCutomDuty = false;
p.weight = 0;
p.qty = 0;
});
specialCargos.forEach((p) {
p.isChecked = false;
p.isCutomDuty = true;
p.weight = 0;
p.qty = 1;
});
}
@override
void dispose() {
super.dispose();
}
@override
Widget build(BuildContext context) {
List<Widget> getCargoRowList(List<CargoType> _c) {
return _c.map((c) {
return Container(
child: Container(
padding:
EdgeInsets.only(left: 10.0, right: 5.0, top: 3.0, bottom: 3.0),
child: InkWell(
onTap: () {
setState(() {
c.isChecked = !c.isChecked;
});
},
child: Row(
children: <Widget>[
Checkbox(
value: c.isChecked,
activeColor: primaryColor,
onChanged: (bool? check) {
setState(() {
c.isChecked = check ?? false;
});
}),
new Text(c.name ?? '', style: textStyle),
],
),
),
),
);
}).toList();
}
final saveBtn = fcsButton(
context,
getLocalString(context, 'box.cargo.select.btn'),
callack: () {
List<CargoType> _cargos =
this.cargos.where((c) => c.isChecked).toList();
List<CargoType> _scargos =
this.specialCargos.where((c) => c.isChecked).toList();
_cargos.addAll(_scargos);
Navigator.pop(context, _cargos);
},
);
return LocalProgress(
inAsyncCall: _isLoading,
child: Scaffold(
appBar: LocalAppBar(
labelKey: 'cargo.form.title',
backgroundColor: Colors.white,
labelColor: primaryColor,
arrowColor: primaryColor),
body: Container(
padding: EdgeInsets.all(8),
child: ListView(
shrinkWrap: true,
children: <Widget>[
LocalTitle(
textKey: "box.select.cargo.title",
),
Column(
children: getCargoRowList(cargos),
),
LocalTitle(
textKey: "box.select.cargo.title",
),
Column(
children: getCargoRowList(specialCargos),
),
SizedBox(height: 30),
saveBtn,
SizedBox(height: 20),
],
),
),
),
);
}
}

260
lib/pages/carton/carton_cargo_table.dart
View File

@@ -1,260 +0,0 @@
import 'package:fcs/domain/entities/cargo_type.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/dialog_input.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:flutter/material.dart';
typedef OnRemove(CargoType cargoType);
typedef OnUpdate(CargoType cargoType);
class CargoTable extends StatefulWidget {
final List<CargoType>? cargoTypes;
final bool? isNew;
final OnRemove? onRemove;
final OnUpdate? onUpdate;
const CargoTable(
{Key? key, this.cargoTypes, this.isNew, this.onRemove, this.onUpdate})
: super(key: key);
@override
_CargoTableState createState() => _CargoTableState();
}
class _CargoTableState extends State<CargoTable> {
double totalWeight = 0;
List<CargoType>? cargoTypes;
@override
void initState() {
cargoTypes = widget.cargoTypes;
if (!widget.isNew!) {
totalWeight =
cargoTypes!.fold(0, (previous, current) => previous + current.weight);
}
super.initState();
}
@override
Widget build(BuildContext context) {
return SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: DataTable(
showCheckboxColumn: false,
headingRowHeight: 40,
// columnSpacing: 40,
decoration: BoxDecoration(border: Border.all(color: Colors.white)),
border: TableBorder(horizontalInside: BorderSide(color: Colors.white)),
columns: [
DataColumn(
label: LocalText(
context,
"cargo.type",
color: Colors.grey,
),
),
DataColumn(
label: LocalText(
context,
"cargo.qty",
color: Colors.grey,
),
),
DataColumn(
label: LocalText(
context,
"cargo.weight",
color: Colors.grey,
),
),
],
rows: getCargoRows(context),
),
);
}
List<DataRow> getCargoRows(BuildContext context) {
if (cargoTypes == null) {
return [];
}
var rows = cargoTypes!.map((c) {
return DataRow(
onSelectChanged: (bool? selected) async {},
cells: [
DataCell(
new Text(
c.name ?? '',
style: textStyle,
),
),
DataCell(
c.isCutomDuty
? GestureDetector(
onTap: () async {
String? _t = await showDialog(
context: context,
builder: (_) => DialogInput(
label: "cargo.qty", value: c.qty.toString()));
if (_t == null) return;
setState(() {
c.qty = int.tryParse(_t) ?? 0;
});
if (widget.onUpdate != null) widget.onUpdate!(c);
},
child: Center(
child: Container(
width: 40,
padding: const EdgeInsets.all(7.0),
decoration: BoxDecoration(
border: Border.all(color: primaryColor),
borderRadius: BorderRadius.all(Radius.circular(5.0)),
),
child: new Text(
c.qty.toString(),
style: textStyle,
textAlign: TextAlign.center,
),
),
),
)
: Center(
child: new Text(
"-",
style: textStyle,
),
),
),
DataCell(
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
GestureDetector(
onTap: () async {
if (this.totalWeight <= 0) {
showMsgDialog(
context, "Error", "Please insert total weight");
return;
}
String? _t = await showDialog(
context: context,
builder: (_) => DialogInput(
label: "cargo.weight",
value: c.weight.toStringAsFixed(2)));
if (_t == null) return;
setState(() {
c.weight = double.tryParse(_t) ?? 0;
});
if (c.weight != 0) {
_cal();
}
if (widget.onUpdate != null) widget.onUpdate!(c);
},
child: Container(
padding: const EdgeInsets.all(7.0),
decoration: BoxDecoration(
border: Border.all(color: primaryColor),
borderRadius: BorderRadius.all(Radius.circular(5.0)),
),
child: Text(c.weight.toStringAsFixed(2), style: textStyle),
),
),
widget.onRemove == null
? SizedBox(
width: 50,
)
: IconButton(
icon: Icon(
Icons.remove_circle,
color: primaryColor,
),
onPressed: () {
if (widget.onRemove != null) widget.onRemove!(c);
})
],
),
),
],
);
}).toList();
var totalRow = DataRow(
onSelectChanged: (bool? selected) {},
cells: [
DataCell(Align(
alignment: Alignment.centerRight,
child: LocalText(
context,
"shipment.cargo.total",
color: Colors.black87,
fontWeight: FontWeight.bold,
),
)),
DataCell(Text("")),
DataCell(
Padding(
padding: const EdgeInsets.only(right: 48.0),
child: Align(
alignment: Alignment.centerRight,
child: InkWell(
onTap: () async {
String? _t = await showDialog(
context: context,
builder: (_) => DialogInput(
label: "shipment.cargo.total",
value: totalWeight.toStringAsFixed(2)),
);
if (_t == null) return;
setState(() {
totalWeight = double.tryParse(_t) ?? 0;
});
_cal();
},
child: Container(
padding: const EdgeInsets.all(7.0),
decoration: BoxDecoration(
border: Border.all(color: primaryColor),
borderRadius: BorderRadius.all(Radius.circular(5.0)),
),
child: Text(totalWeight.toStringAsFixed(2),
style: TextStyle(fontWeight: FontWeight.bold)),
),
)),
),
),
],
);
rows.add(totalRow);
return rows;
}
_cal() {
var cargoType = autoCalWeight(cargoTypes!, totalWeight);
if (cargoType == null) return;
setState(() {
cargoTypes!.remove(cargoType);
cargoTypes!.add(cargoType);
});
if (widget.onUpdate != null) {
widget.onUpdate!(cargoType);
}
}
}
CargoType? autoCalWeight(List<CargoType> cargoTypes, double total) {
List<CargoType> noWeight = cargoTypes.where((c) => c.weight == 0).toList();
if (noWeight.length != 1) return null;
double _existing =
cargoTypes.fold(0, (previous, current) => previous + current.weight);
noWeight[0].weight = total - _existing;
return noWeight[0];
}

94
lib/pages/carton/carton_editor.dart
View File

@@ -6,7 +6,6 @@ import 'package:fcs/pages/user_search/user_search.dart';
import 'package:fcs/pages/widgets/display_text.dart'; import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/fcs_id_icon.dart'; import 'package:fcs/pages/widgets/fcs_id_icon.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart'; import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/local_radio.dart';
import 'package:fcs/pages/widgets/local_radio_buttons.dart'; import 'package:fcs/pages/widgets/local_radio_buttons.dart';
import 'package:fcs/pages/widgets/local_text.dart'; import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/local_title.dart'; import 'package:fcs/pages/widgets/local_title.dart';
@@ -15,10 +14,10 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart'; import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import '../main/util.dart'; import '../main/util.dart';
import 'carton_editor_for_package.dart'; import 'carton_package_form.dart';
import 'carton_info.dart'; import 'carton_info.dart';
import 'mix_carton/mix_carton_editor.dart'; import 'mix_carton/mix_carton_form.dart';
import 'carton_row.dart'; import 'widget/carton_row.dart';
class CartonEditor extends StatefulWidget { class CartonEditor extends StatefulWidget {
final Carton? carton; final Carton? carton;
@@ -34,7 +33,6 @@ class _CartonEditorState extends State<CartonEditor> {
bool _isLoading = false; bool _isLoading = false;
bool _isNew = false; bool _isNew = false;
String _billToValue = billToSender;
String? _selectedCartonType; String? _selectedCartonType;
User? _consignee; User? _consignee;
@@ -156,23 +154,20 @@ class _CartonEditorState extends State<CartonEditor> {
Navigator.push( Navigator.push(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => CartonEditorForPackage( builder: (context) => CartonPackageForm(
sender: _sender!, sender: _sender!,
consignee: _consignee!, consignee: _consignee!,
billToValue: _billToValue))); )));
} }
// for mix cartion // for mix cartion
else { else {
Navigator.push( Navigator.push(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => const MixCartonEditor())); builder: (context) => const MixCartonForm()));
} }
}, },
child: Icon( child: Icon(Icons.add_circle, color: primaryColor),
Icons.add_circle,
color: primaryColor,
),
), ),
)); ));
@@ -268,72 +263,6 @@ class _CartonEditorState extends State<CartonEditor> {
), ),
); );
final billRadioBox = Container(
child: Row(
children: [
Flexible(
child: InkWell(
onTap: () {
setState(() {
_billToValue = billToSender;
});
},
child: Row(children: <Widget>[
LocalRadio(
value: billToSender,
groupValue: _billToValue,
onChanged: (p0) {
setState(() {
_billToValue = billToSender;
});
},
),
Flexible(
child: Padding(
padding: const EdgeInsets.only(left: 10),
child: LocalText(context, 'box.bill_to_sender',
fontSize: 15,
color: _billToValue == billToSender
? primaryColor
: Colors.black),
),
)
]),
)),
Flexible(
child: InkWell(
onTap: () {
setState(() {
_billToValue = billToConsignee;
});
},
child: Row(children: <Widget>[
LocalRadio(
value: billToConsignee,
groupValue: _billToValue,
onChanged: (p0) {
setState(() {
_billToValue = billToConsignee;
});
},
),
Flexible(
child: Padding(
padding: const EdgeInsets.only(left: 10),
child: LocalText(context, 'box.bill_to.consignee',
fontSize: 15,
color: _billToValue == billToConsignee
? primaryColor
: Colors.black),
),
)
]),
),
)
],
),
);
return LocalProgress( return LocalProgress(
inAsyncCall: _isLoading, inAsyncCall: _isLoading,
child: Scaffold( child: Scaffold(
@@ -358,9 +287,6 @@ class _CartonEditorState extends State<CartonEditor> {
Flexible(child: consigneeBox) Flexible(child: consigneeBox)
], ],
), ),
const SizedBox(height: 5),
billRadioBox,
const SizedBox(height: 5),
], ],
) )
: Container(), : Container(),
@@ -381,7 +307,7 @@ class _CartonEditorState extends State<CartonEditor> {
onTap: () async { onTap: () async {
Navigator.push( Navigator.push(
context, context,
CupertinoPageRoute(builder: (context) => CartonInfo(box: c)), CupertinoPageRoute(builder: (context) => CartonInfo(carton: c)),
); );
}, },
child: CartonRow(box: c)); child: CartonRow(box: c));

2
lib/pages/carton/carton_filter.dart
View File

@@ -8,7 +8,7 @@ import '../../helpers/theme.dart';
import '../../localization/app_translations.dart'; import '../../localization/app_translations.dart';
import '../main/util.dart'; import '../main/util.dart';
import '../widgets/local_text.dart'; import '../widgets/local_text.dart';
import 'user_search_result.dart'; import 'widget/user_search_result.dart';
import 'model/carton_model.dart'; import 'model/carton_model.dart';
import 'model/consignee_selection_model.dart'; import 'model/consignee_selection_model.dart';

85
lib/pages/carton/carton_image_upload.dart
View File

@@ -1,85 +0,0 @@
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/material.dart';
import '../widgets/multi_img_file.dart';
typedef void FindCallBack();
class CartonImageUpload extends StatefulWidget {
final Carton? box;
const CartonImageUpload({this.box});
@override
_CartonImageUploaState createState() => _CartonImageUploaState();
}
class _CartonImageUploaState extends State<CartonImageUpload> {
bool _isLoading = false;
Carton? _box;
MultiImgController multiImgController = MultiImgController();
@override
void initState() {
super.initState();
_box = widget.box;
multiImgController.setImageUrls = _box?.photoUrls;
}
@override
Widget build(BuildContext context) {
return LocalProgress(
inAsyncCall: _isLoading,
child: Scaffold(
appBar: LocalAppBar(
labelKey: "box.imageupload.title",
backgroundColor: Colors.white,
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(
children: [
Center(
child: Text("${_box?.cartonNumber}",
style: TextStyle(
color: primaryColor,
fontSize: 25,
))),
MultiImageFile(
enabled: true,
controller: multiImgController,
title: "Receipt File",
),
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)),
),
),
],
)));
}
}

71
lib/pages/carton/carton_image_upload_editor.dart Normal file
View File

@@ -0,0 +1,71 @@
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/material.dart';
import '../widgets/local_button.dart';
import '../widgets/multi_img_file.dart';
typedef void FindCallBack();
class CartonImageUploadEditor extends StatefulWidget {
final Carton? box;
const CartonImageUploadEditor({this.box});
@override
_CartonImageUploaState createState() => _CartonImageUploaState();
}
class _CartonImageUploaState extends State<CartonImageUploadEditor> {
bool _isLoading = false;
Carton? _box;
MultiImgController multiImgController = MultiImgController();
@override
void initState() {
super.initState();
_box = widget.box;
multiImgController.setImageUrls = _box?.photoUrls;
}
@override
Widget build(BuildContext context) {
final saveBtn = Padding(
padding: const EdgeInsets.symmetric(horizontal: 30),
child: LocalButton(
textKey: "btn.save",
callBack: () {},
),
);
return LocalProgress(
inAsyncCall: _isLoading,
child: Scaffold(
appBar: LocalAppBar(
labelKey: "box.imageupload.title",
backgroundColor: Colors.white,
labelColor: primaryColor,
arrowColor: primaryColor,
actions: []),
body: Padding(
padding: EdgeInsets.only(left: 12.0, right: 12),
child: ListView(
children: [
Center(
child: Text("${_box?.cartonNumber}",
style: TextStyle(
color: primaryColor,
fontSize: 25,
))),
MultiImageFile(
enabled: true,
controller: multiImgController,
title: "Receipt File",
),
saveBtn,
],
),
)));
}
}

638
lib/pages/carton/carton_info.dart
View File

@@ -3,12 +3,9 @@ import 'package:fcs/domain/entities/cargo_type.dart';
import 'package:fcs/domain/entities/carton.dart'; import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/package.dart'; import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/helpers/theme.dart'; import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/carton/carton_image_upload.dart'; import 'package:fcs/pages/carton/carton_image_upload_editor.dart';
import 'package:fcs/pages/carton/carton_submit.dart';
import 'package:fcs/pages/carton_size/model/carton_size_model.dart';
import 'package:fcs/pages/main/util.dart'; import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/package/model/package_model.dart'; import 'package:fcs/pages/package/model/package_model.dart';
import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
import 'package:fcs/pages/widgets/display_text.dart'; import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart'; import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/local_text.dart'; import 'package:fcs/pages/widgets/local_text.dart';
@@ -20,194 +17,167 @@ import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart'; import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../domain/entities/carton_size.dart';
import 'carton_editor.dart'; import '../widgets/local_button.dart';
import 'carton_package_editor.dart';
import 'mix_carton/mix_carton_editor.dart';
import 'model/carton_model.dart'; import 'model/carton_model.dart';
final DateFormat dateFormat = DateFormat("d MMM yyyy");
final NumberFormat numberFormatter = NumberFormat("#,###");
class CartonInfo extends StatefulWidget { class CartonInfo extends StatefulWidget {
final Package? package; final Carton carton;
final Carton box; CartonInfo({required this.carton});
final String? billToValue;
final CartonSubmit? cartonSubmit;
CartonInfo(
{required this.box, this.billToValue, this.package, this.cartonSubmit});
@override @override
_CartonInfoState createState() => _CartonInfoState(); _CartonInfoState createState() => _CartonInfoState();
} }
class _CartonInfoState extends State<CartonInfo> { class _CartonInfoState extends State<CartonInfo> {
bool _isLoading = false; final DateFormat dateFormat = DateFormat("d MMM yyyy");
Carton? _box; final NumberFormat numberFormatter = NumberFormat("#,###");
CartonSubmit? _cartonSubmit;
MultiImgController multiImgController = MultiImgController(); MultiImgController multiImgController = MultiImgController();
TextEditingController _widthController = new TextEditingController(); bool _isLoading = false;
TextEditingController _heightController = new TextEditingController(); late Carton _carton;
TextEditingController _lengthController = new TextEditingController(); List<CargoType> _cargoTypes = [];
TextEditingController _cartonSizeController = new TextEditingController(); List<CargoType> _surchareItems = [];
double volumetricRatio = 0; List<Carton> _mixCartons = [];
double shipmentWeight = 0; List<Package> _packages = [];
String? selectMixBoxType; double totalWeight = 0.0;
double totalSurchargeCount = 0.0;
bool isMixBox = false; CartonSize? standardSize;
bool isFromShipments = false;
bool isFromPackages = false;
bool isSmallBag = false;
bool isFromCartons = false;
bool isEdiable = false;
final List<CargoType> cargoTypes = [];
final List<CargoType> surchareItems = [];
@override @override
void initState() { void initState() {
_carton = widget.carton;
_init();
super.initState(); super.initState();
_box = widget.box;
_box?.billToValue = "Bill to sender";
_cartonSubmit = widget.cartonSubmit;
//initPackage(widget.package!);
//for shipment weight
volumetricRatio = Provider.of<ShipmentRateModel>(context, listen: false)
.rate
.volumetricRatio;
_lengthController.addListener(_calShipmentWeight);
_widthController.addListener(_calShipmentWeight);
_heightController.addListener(_calShipmentWeight);
multiImgController.setImageUrls = _box!.photos;
// _updateBoxData();
_loadPackages();
_loadMixCartons();
} }
_updateBoxData() { _init() async {
_widthController.text = _box!.width.toString(); _carton.billTo = billToConsignee;
_heightController.text = _box!.height.toString(); _carton.cartonSizeType = customCarton;
_lengthController.text = _box!.length.toString(); _carton.cartonType = carton_from_packages;
_cartonSizeController.text = _box!.cartonSizeName ?? ""; multiImgController.setImageUrls = _carton.photos;
isMixBox = _box!.cartonType == carton_mix_box; _cargoTypes = _carton.cargoTypes.where((e) => !e.isCutomDuty).toList();
isFromShipments = _box!.cartonType == carton_from_shipments; _surchareItems = _carton.cargoTypes.where((e) => e.isCutomDuty).toList();
isFromPackages = _box!.cartonType == carton_from_packages; if (_carton.cartonType == carton_from_packages) {
isSmallBag = _box!.cartonType == carton_small_bag; _carton.deliveryType = delivery_caton;
isFromCartons = _box!.cartonType == carton_from_cartons; _packages = await context
.read<PackageModel>()
isEdiable = (isFromPackages || isMixBox || isFromCartons) && .getPackagesByIds(_carton.packageIDs);
_box!.status == carton_packed_status;
selectMixBoxType = _box!.mixBoxType;
getCartonSize();
}
getCartonSize() {
var cartonSizeModel = Provider.of<CartonSizeModel>(context, listen: false);
cartonSizeModel.cartonSizes.forEach((c) {
if (c.length == _box!.length &&
c.width == _box!.width &&
c.height == _box!.height) {
setState(() {
_cartonSizeController.text = c.name ?? "";
});
}
});
}
_loadPackages() async {
if (!isFromPackages && !isSmallBag) return;
// if (_box!.cartonType == carton_from_packages && _box!.userID == null)
// return;
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
List<Package> packages =
await packageModel.getPackages(_box!.userID ?? "", [
package_processed_status,
package_packed_status,
package_shipped_status,
package_delivered_status
]);
packages = packages.where((p) => _box!.packageIDs.contains(p.id)).toList();
packages.forEach((p) {
p.isChecked = true;
});
setState(() {
_box!.packages = packages;
});
}
_loadMixCartons() async {
if (_box!.cartonType != carton_mix_box) return;
CartonModel cartonModel = Provider.of<CartonModel>(context, listen: false);
List<Carton> catons = [];
for (var id in _box!.mixCartonIDs) {
Carton c = await cartonModel.getCarton(id);
catons.add(c);
} }
setState(() { if (_carton.cartonType == carton_mix_carton) {
_box!.mixCartons = catons; _mixCartons = await context
}); .read<CartonModel>()
} .getCartonsByIds(_carton.mixCartonIDs);
}
_calShipmentWeight() { if (mounted) {
double l = double.tryParse(_lengthController.text) ?? 0; setState(() {});
double w = double.tryParse(_widthController.text) ?? 0; }
double h = double.tryParse(_heightController.text) ?? 0; _carton.cartonType = "Carton for packages";
setState(() { totalWeight =
shipmentWeight = l * w * h / volumetricRatio; _carton.cargoTypes.fold(0, (sum, value) => sum + value.weight);
}); totalSurchargeCount =
_surchareItems.fold(0, (sum, value) => sum + value.qty);
} }
@override
void dispose() {
super.dispose();
}
final DateFormat dateFormat = DateFormat("d MMM yyyy");
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
double totalWeight = String? boxDimension = _carton.cartonSizeType == standardCarton
_box!.cargoTypes.fold(0, (sum, value) => sum + value.weight); ? "${standardSize?.name} - ${standardSize?.length.toInt()}”x${standardSize?.width.toInt()}”x${standardSize?.height.toInt()}”"
double totalPieces = surchareItems.fold(0, (sum, value) => sum + value.qty); : _carton.cartonSizeType == customCarton
? "${_carton.length.toInt()}”x${_carton.width.toInt()}”x${_carton.height.toInt()}”"
: null;
final cartonTypeBox = DisplayText( final cartonTypeBox = DisplayText(
text: _box!.cartonNumber, text: _carton.cartonNumber,
labelTextKey: "box.number", labelTextKey: "box.number",
); );
final cartonQrBox = DisplayText(
iconData: AntDesign.qrcode, final cartonQrBox = DisplayText(iconData: AntDesign.qrcode);
final cartonSubTypeBox = DisplayText(
text: _carton.cartonType == carton_from_packages
? "Carton for packages"
: "Mix carton",
subText: boxDimension == null ? null : Text("$boxDimension"),
labelTextKey: "box.carton.type",
); );
final shipmentBox = DisplayText( final shipmentBox = DisplayText(
text: _box!.fcsShipmentNumber, text: _carton.fcsShipmentNumber,
labelTextKey: "box.fcs_shipment_num", labelTextKey: "box.fcs_shipment_num",
); );
final deliveryBox = DisplayText( final deliveryBox = DisplayText(
text: "Delivery Carton", text: _carton.deliveryType,
labelTextKey: "box.delivery_type", labelTextKey: "box.delivery_type",
); );
final customerNameBox = DisplayText( final senderBox = DisplayText(
text: _box!.userName == null ? "" : _box!.userName, text: _carton.senderName == null ? "" : _carton.senderName,
subText: Text(_box!.fcsID ?? "", style: textStyle), subText: Text(_carton.senderFCSID ?? "", style: textStyle),
labelTextKey: "box.name", labelTextKey: "box.name",
); );
final consigneeNameBox = DisplayText( final consigneeNameBox = DisplayText(
text: _box!.senderName != null ? _box!.senderName : "", text: _carton.userName != null ? _carton.userName : "",
subText: Text(_box!.senderFCSID ?? "", style: textStyle), subText: Text(_carton.fcsID ?? "", style: textStyle),
labelTextKey: "processing.consignee.name", labelTextKey: "processing.consignee.name",
); );
final packageBox = DisplayText( final billWidget = Expanded(
labelTextKey: "box.package", 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,
children: [
Expanded(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
senderBox,
],
),
),
_carton.billTo == billToSender ? billWidget : const SizedBox()
],
),
),
Expanded(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
consigneeNameBox,
],
),
),
_carton.billTo == billToConsignee ? billWidget : const SizedBox()
],
))
],
); );
final cargosBox = Padding( final cargosBox = Padding(
padding: const EdgeInsets.only(top: 10), padding: const EdgeInsets.only(top: 15),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -222,7 +192,6 @@ class _CartonInfoState extends State<CartonInfo> {
style: TextStyle(color: Colors.black54, fontSize: 15))) style: TextStyle(color: Colors.black54, fontSize: 15)))
], ],
), ),
//),
Container( Container(
child: Padding( child: Padding(
padding: const EdgeInsets.only(right: 100), padding: const EdgeInsets.only(right: 100),
@@ -230,7 +199,7 @@ class _CartonInfoState extends State<CartonInfo> {
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: _box!.cargoTypes.map((e) { children: _cargoTypes.map((e) {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 3), padding: const EdgeInsets.symmetric(vertical: 3),
child: Row( child: Row(
@@ -256,7 +225,7 @@ class _CartonInfoState extends State<CartonInfo> {
]), ]),
); );
final surchargeItemBox = Padding( final surchargeItemBox = Padding(
padding: const EdgeInsets.only(top: 10), padding: const EdgeInsets.only(top: 15),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -267,7 +236,7 @@ class _CartonInfoState extends State<CartonInfo> {
fontWeight: FontWeight.normal), fontWeight: FontWeight.normal),
Padding( Padding(
padding: EdgeInsets.only(right: 100), padding: EdgeInsets.only(right: 100),
child: Text("${removeTrailingZeros(totalPieces)} pcs", child: Text("${removeTrailingZeros(totalSurchargeCount)} pcs",
style: TextStyle(color: Colors.black54, fontSize: 15))) style: TextStyle(color: Colors.black54, fontSize: 15)))
], ],
), ),
@@ -279,7 +248,7 @@ class _CartonInfoState extends State<CartonInfo> {
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: surchareItems.map((e) { children: _surchareItems.map((e) {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 3), padding: const EdgeInsets.symmetric(vertical: 3),
child: Row( child: Row(
@@ -301,7 +270,7 @@ class _CartonInfoState extends State<CartonInfo> {
const SizedBox(height: 10), const SizedBox(height: 10),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: surchareItems.map((e) { children: _surchareItems.map((e) {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 3), padding: const EdgeInsets.symmetric(vertical: 3),
child: Row( child: Row(
@@ -330,116 +299,52 @@ class _CartonInfoState extends State<CartonInfo> {
controller: multiImgController, controller: multiImgController,
title: "Receipt File", title: "Receipt File",
); );
final displayMixBox = Container(
child: Row( final uploadImageBtn = Padding(
children: [ padding: EdgeInsets.only(left: 200.0, right: 8.0),
Row( child: ElevatedButton(
mainAxisAlignment: MainAxisAlignment.start, style: ElevatedButton.styleFrom(
children: [ backgroundColor: Color(0xff272262),
Expanded( elevation: 3,
child: Row( shape:
//crossAxisAlignment: CrossAxisAlignment.start, RoundedRectangleBorder(borderRadius: BorderRadius.circular(5.0)),
children: [ minimumSize: Size(10, 35),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
customerNameBox,
],
),
),
_box?.billToValue == billToSender
? 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))
],
)))
: const SizedBox()
],
),
),
Expanded(
child: Padding(
padding: const EdgeInsets.only(left: 0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
consigneeNameBox,
],
),
),
_cartonSubmit?.billToValue == billToSender
? 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))
],
)))
: const SizedBox()
],
),
))
],
), ),
packageBox, onPressed: () {
Row( Navigator.push(
children: getPackageList(_box!.packages), context,
) CupertinoPageRoute(
], builder: (context) => CartonImageUploadEditor(box: _carton)),
)); );
final billWidget = Expanded( },
child: Padding( child: const Text('Upload Images'),
padding: EdgeInsets.only(left: 0, top: 15), ),
child: Row( );
mainAxisAlignment: MainAxisAlignment.start,
children: [ final deleteBtn = Padding(
Icon(Ionicons.document_text_outline, padding: const EdgeInsets.symmetric(horizontal: 30),
color: primaryColor, size: 20), child: LocalButton(
Text("Bill to", color: dangerColor,
style: TextStyle(color: primaryColor, fontSize: 15)) textKey: "box.delete.btn",
], callBack: () {
))); _delete();
},
),
);
return LocalProgress( return LocalProgress(
inAsyncCall: _isLoading, inAsyncCall: _isLoading,
child: Scaffold( child: Scaffold(
appBar: LocalAppBar( appBar: LocalAppBar(
labelKey: "box.info.title", labelKey: "box.info.title",
backgroundColor: Colors.white, backgroundColor: Colors.white,
labelColor: primaryColor, labelColor: primaryColor,
arrowColor: primaryColor, arrowColor: primaryColor,
actions: isEdiable actions: <Widget>[
? <Widget>[ IconButton(
IconButton( icon: Icon(Icons.edit, color: primaryColor),
icon: Icon(Icons.edit, color: primaryColor), onPressed: _gotoEditor),
onPressed: _gotoEditor, ]),
),
IconButton(
icon: Icon(Icons.delete, color: primaryColor),
onPressed: _delete,
),
]
: [],
),
body: Container( body: Container(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
child: ListView(children: <Widget>[ child: ListView(children: <Widget>[
@@ -450,122 +355,97 @@ class _CartonInfoState extends State<CartonInfo> {
), ),
]), ]),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Flexible( Flexible(child: cartonSubTypeBox),
child: shipmentBox,
),
Flexible(
child: deliveryBox,
),
], ],
), ),
Row(
// Row( mainAxisAlignment: MainAxisAlignment.spaceBetween,
// mainAxisAlignment: MainAxisAlignment.start, children: [
// children: [ Flexible(child: shipmentBox),
// Expanded( _mixCartons.isEmpty
// child: Row( ? Flexible(child: deliveryBox)
// //crossAxisAlignment: CrossAxisAlignment.start, : const SizedBox(),
// children: [ ],
// Expanded(
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// customerNameBox,
// ],
// ),
// ),
// _box?.billToValue == billToSender
// ? billWidget
// : const SizedBox()
// ],
// ),
// ),
// Expanded(
// child: Padding(
// padding: const EdgeInsets.only(left: 0),
// child: Row(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Expanded(
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// consigneeNameBox,
// ],
// ),
// ),
// _cartonSubmit?.billToValue == billToSender
// ? billWidget
// : const SizedBox()
// ],
// ),
// ))
// ],
// ),
// packageBox,
// Row(
// children: getPackageList(_box!.packages),
// ),
// ]):Container(),
cargosBox,
surchargeItemBox,
Padding(
padding: EdgeInsets.only(left: 200.0, right: 8.0),
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Color(0xff272262),
elevation: 3,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(5.0)),
minimumSize: Size(10, 35), //////// HERE
),
onPressed: () {
Navigator.push(
context,
CupertinoPageRoute(
builder: (context) =>
CartonImageUpload(box: _box)),
);
},
child: const Text('Upload Images'),
),
), ),
_mixCartons.isEmpty ? userRowBox : const SizedBox(),
_packages.isEmpty
? const SizedBox()
: Padding(
padding: const EdgeInsets.only(top: 15),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocalText(context, "box.package",
color: Colors.black54, fontSize: 15),
const SizedBox(height: 5),
Column(
children: getPackageList(_packages),
),
],
),
),
_mixCartons.isEmpty
? const SizedBox()
: Padding(
padding: const EdgeInsets.only(top: 15),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocalText(context, "box.shipment.boxes",
color: Colors.black54, fontSize: 15),
const SizedBox(height: 5),
Column(children: getCartonList(_mixCartons)),
],
),
),
_cargoTypes.isEmpty ? const SizedBox() : cargosBox,
_surchareItems.isEmpty ? const SizedBox() : surchargeItemBox,
uploadImageBtn,
img, img,
Center( deleteBtn
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Color(0xffff0606),
elevation: 3,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(5.0)),
minimumSize: Size(300, 45), //////// HERE
),
onPressed: () {},
child: const Text('Delete Carton',
style: TextStyle(fontSize: 20)),
),
),
])))); ]))));
} }
List<Widget> getPackageList(List<Package> list) {
return list.map((p) {
return Container(
padding: EdgeInsets.only(top: 0),
child: Container(
child: Row(children: <Widget>[new Text(p.trackingID ?? "")]),
));
}).toList();
}
List<Widget> getCartonList(List<Carton> list) {
return list.map((c) {
return Container(
padding: EdgeInsets.only(top: 0),
child: Container(
child: Row(children: <Widget>[new Text(c.cartonNumber ?? '')]),
));
}).toList();
}
_gotoEditor() async { _gotoEditor() async {
_box!.mixCartons = _box!.mixCartons; bool? updated = _carton.cartonType == carton_mix_carton
bool? updated = await Navigator.push<bool>( ? await Navigator.push<bool>(
context, context,
CupertinoPageRoute(builder: (context) => CartonEditor(carton: _box)), CupertinoPageRoute(
); builder: (context) => MixCartonEditor(carton: _carton)),
)
: await Navigator.push<bool>(
context,
CupertinoPageRoute(
builder: (context) => CartonPackageEditor(carton: _carton)),
);
if (updated ?? false) { if (updated ?? false) {
var cartonModel = Provider.of<CartonModel>(context, listen: false); Carton? c =
var c = await cartonModel.getCarton(widget.box.id ?? ""); await context.read<CartonModel>().getCarton(widget.carton.id ?? "");
setState(() { if (c == null) return;
_box = c; _carton = c;
_loadPackages(); _init();
_loadMixCartons();
_updateBoxData();
});
} }
} }
@@ -580,9 +460,9 @@ class _CartonInfoState extends State<CartonInfo> {
_isLoading = true; _isLoading = true;
}); });
try { try {
var cartonModel = Provider.of<CartonModel>(context, listen: false); // var cartonModel = Provider.of<CartonModel>(context, listen: false);
await cartonModel.deleteCarton(widget.box); // await cartonModel.deleteCarton(widget.carton);
Navigator.pop(context, true); // Navigator.pop(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());
} finally { } finally {
@@ -591,28 +471,4 @@ class _CartonInfoState extends State<CartonInfo> {
}); });
} }
} }
List<Widget> getPackageList(List<Package> _p) {
return _p.map((p) {
return Container(
padding: EdgeInsets.only(top: 0),
child: Container(
//padding:
//EdgeInsets.only(top: 0.0),
child: Row(children: <Widget>[new Text(p.trackingID ?? '')]),
));
}).toList();
}
List<Widget> getCargoList(List<CargoType> _c) {
return _c.map((c) {
return Container(
padding: EdgeInsets.only(top: 0),
child: Container(
//padding:
//EdgeInsets.only(top: 0.0),
child: Row(children: <Widget>[new Text(c.name ?? '')]),
));
}).toList();
}
} }

4
lib/pages/carton/carton_list.dart
View File

@@ -17,7 +17,7 @@ import '../fcs_shipment/model/fcs_shipment_model.dart';
import 'carton_editor.dart'; import 'carton_editor.dart';
import 'carton_filter.dart'; import 'carton_filter.dart';
import 'carton_info.dart'; import 'carton_info.dart';
import 'carton_list_row.dart'; import 'widget/carton_list_row.dart';
class CartonList extends StatefulWidget { class CartonList extends StatefulWidget {
@override @override
@@ -104,7 +104,7 @@ class _CartonListState extends State<CartonList> {
Navigator.push( Navigator.push(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => CartonInfo(box: c)), builder: (context) => CartonInfo(carton: c)),
); );
}); });
}), }),

289
lib/pages/carton/carton_package_editor.dart Normal file
View File

@@ -0,0 +1,289 @@
// ignore_for_file: deprecated_member_use
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import '../../../domain/constants.dart';
import '../../../domain/entities/carton_size.dart';
import '../../../domain/entities/fcs_shipment.dart';
import '../../../domain/vo/local_step.dart';
import '../../../helpers/theme.dart';
import '../../domain/entities/cargo_type.dart';
import '../../domain/entities/carton.dart';
import '../../domain/entities/package.dart';
import '../../domain/entities/user.dart';
import '../fcs_shipment/model/fcs_shipment_model.dart';
import '../main/util.dart';
import '../package/model/package_model.dart';
import '../widgets/local_text.dart';
import '../widgets/progress.dart';
import '../widgets/step_widget.dart';
import 'cargo_widget.dart';
import 'carton_size_widget.dart';
import 'carton_submit.dart';
import 'model/package_selection_model.dart';
import 'package_selection_widget.dart';
class CartonPackageEditor extends StatefulWidget {
final Carton carton;
const CartonPackageEditor({Key? key, required this.carton}) : super(key: key);
@override
State<CartonPackageEditor> createState() => _CartonPackageEditorState();
}
class _CartonPackageEditorState extends State<CartonPackageEditor> {
var dateFormatter = DateFormat('dd MMM yyyy');
final NumberFormat numberFormatter = NumberFormat("#,###");
List<LocalStep> steps = [
LocalStep(lable: 'Size', stepType: StepType.SIZE),
LocalStep(lable: 'Packages', stepType: StepType.PACKAGES),
LocalStep(lable: 'Cargos', stepType: StepType.CARGOS),
LocalStep(lable: 'Submit', stepType: StepType.SUBMIT)
];
List<Package> _packages = [];
List<CargoType> _cargoTypes = [];
List<CargoType> _surchareItems = [];
int currentStep = 0;
double _length = 0;
double _width = 0;
double _height = 0;
String _selectedDeliveryType = delivery_caton;
String _billToValue = billToSender;
FcsShipment? _shipment;
String _cartonSizeType = standardCarton;
CartonSize? _standardSize;
bool _isLoading = false;
User? _consignee;
User? _sender;
@override
void initState() {
_init();
super.initState();
}
_init() async {
context.read<PackageSelectionModel>().clearSelection();
_sender = User(
name: widget.carton.senderName,
fcsID: widget.carton.senderFCSID,
id: widget.carton.senderID);
_consignee = User(
id: widget.carton.userID,
name: widget.carton.userName,
fcsID: widget.carton.fcsID);
_billToValue = widget.carton.billTo ?? billToSender;
_selectedDeliveryType = widget.carton.deliveryType ?? delivery_caton;
_cartonSizeType = widget.carton.cartonSizeType ?? customCarton;
_length = widget.carton.length;
_width = widget.carton.width;
_height = widget.carton.height;
_cargoTypes = widget.carton.cargoTypes.where((e) => !e.isCutomDuty).toList();
_surchareItems = widget.carton.cargoTypes.where((e) => e.isCutomDuty).toList();
var s = await context
.read<FcsShipmentModel>()
.getFcsShipment(widget.carton.fcsShipmentID ?? "");
_shipment = s;
_packages = await context
.read<PackageModel>()
.getPackagesByIds(widget.carton.packageIDs);
if (mounted) {
setState(() {});
}
}
@override
Widget build(BuildContext context) {
return WillPopScope(
onWillPop: () {
if (currentStep == 0) {
Navigator.of(context).pop();
}
if (currentStep > 0) {
setState(() {
currentStep -= 1;
});
}
return Future.value(false);
},
child: LocalProgress(
inAsyncCall: _isLoading,
child: Scaffold(
appBar: AppBar(
elevation: 0,
centerTitle: true,
leading: IconButton(
icon: const Icon(CupertinoIcons.back,
color: primaryColor, size: 25),
onPressed: () {
if (currentStep == 0) {
Navigator.of(context).pop();
}
if (currentStep > 0) {
setState(() {
currentStep -= 1;
});
}
},
),
backgroundColor: Colors.white,
title: LocalText(context, 'box.update_title',
color: primaryColor, fontSize: 20),
),
body: Column(
children: [
StepperWidget(
labels: steps.map((e) => e.lable).toList(),
currentStep: currentStep,
eachStepWidth: MediaQuery.of(context).size.width / 4,
onChange: (index) {
if (index > currentStep) {
return;
}
setState(() {
currentStep = index;
});
},
),
getContent(currentStep)
],
))),
);
}
Widget getContent(int index) {
var step = steps[index];
if (step.stepType == StepType.SIZE) {
return Expanded(
child: CartonSizeWidget(
deliveryType: _selectedDeliveryType,
billType: _billToValue,
sender: _sender!,
consignee: _consignee!,
shipment: _shipment,
cartonSizeType: _cartonSizeType,
standardSize: _standardSize,
length: _length,
width: _width,
height: _height,
onPrevious: () {
Navigator.pop(context);
},
onContinue: (deliveryType, billType, shipment, cartonSizeType,
{standardSize, length, width, height}) {
setState(() {
_selectedDeliveryType = deliveryType;
_billToValue = billType;
_shipment = shipment;
_cartonSizeType = cartonSizeType;
_standardSize = standardSize;
_length = length ?? 0;
_width = width ?? 0;
_height = height ?? 0;
currentStep += 1;
});
},
));
} else if (step.stepType == StepType.PACKAGES) {
return Expanded(
child: PackageSelectionWidget(
sender: _sender!,
consignee: _consignee!,
shipment: _shipment!,
packages: _packages,
onContinue: (packages) {
setState(() {
_packages = List.from(packages);
currentStep += 1;
});
},
onPrevious: (packages) {
setState(() {
_packages = List.from(packages);
currentStep -= 1;
});
},
),
);
} else if (step.stepType == StepType.CARGOS) {
return Expanded(
child: CargoWidget(
sender: _sender!,
consignee: _consignee!,
cargoTypes: _cargoTypes,
surchargeItems: _surchareItems,
onContinue: (cargoTypes, customDuties) {
setState(() {
_cargoTypes = List.from(cargoTypes);
_surchareItems = List.from(customDuties);
currentStep += 1;
});
},
onPrevious: (cargoTypes, customDuties) {
setState(() {
_cargoTypes = List.from(cargoTypes);
_surchareItems = List.from(customDuties);
currentStep -= 1;
});
},
),
);
} else {
return Expanded(
child: CartonSubmit(
isNew: false,
sender: _sender!,
consingee: _consignee!,
billToValue: _billToValue,
cartonSizeType: _cartonSizeType,
standardSize: _standardSize,
length: _length,
width: _width,
height: _height,
deliveryType: _selectedDeliveryType,
shipment: _shipment!,
packages: _packages,
cargoTypes: _cargoTypes,
surchareItems: _surchareItems,
onCreate: () {
_create();
},
onPrevious: () {
setState(() {
currentStep -= 1;
});
},
),
);
}
}
_create() async {
setState(() {
_isLoading = true;
});
try {
Navigator.pop(context, true);
} catch (e) {
showMsgDialog(context, "Error", e.toString());
} finally {
setState(() {
_isLoading = false;
});
}
}
}

23
lib/pages/carton/carton_editor_for_package.dart → lib/pages/carton/carton_package_form.dart
View File

@@ -23,19 +23,22 @@ import 'carton_submit.dart';
import 'model/package_selection_model.dart'; import 'model/package_selection_model.dart';
import 'package_selection_widget.dart'; import 'package_selection_widget.dart';
class CartonEditorForPackage extends StatefulWidget { class CartonPackageForm extends StatefulWidget {
final User sender; final User sender;
final User consignee; final User consignee;
final String billToValue;
const CartonEditorForPackage( const CartonPackageForm(
{Key? key, required this.sender, required this.consignee, required this.billToValue}) {Key? key,
required this.sender,
required this.consignee,
})
: super(key: key); : super(key: key);
@override @override
State<CartonEditorForPackage> createState() => _CartonEditorForPackageState(); State<CartonPackageForm> createState() => _CartonPackageFormState();
} }
class _CartonEditorForPackageState extends State<CartonEditorForPackage> { class _CartonPackageFormState extends State<CartonPackageForm> {
var dateFormatter = DateFormat('dd MMM yyyy'); var dateFormatter = DateFormat('dd MMM yyyy');
final NumberFormat numberFormatter = NumberFormat("#,###"); final NumberFormat numberFormatter = NumberFormat("#,###");
List<LocalStep> steps = [ List<LocalStep> steps = [
@@ -54,6 +57,8 @@ class _CartonEditorForPackageState extends State<CartonEditorForPackage> {
double _height = 0; double _height = 0;
String _selectedDeliveryType = delivery_caton; String _selectedDeliveryType = delivery_caton;
String _billToValue = billToSender;
FcsShipment? _shipment; FcsShipment? _shipment;
String _cartonSizeType = standardCarton; String _cartonSizeType = standardCarton;
CartonSize? _standardSize; CartonSize? _standardSize;
@@ -131,6 +136,7 @@ class _CartonEditorForPackageState extends State<CartonEditorForPackage> {
return Expanded( return Expanded(
child: CartonSizeWidget( child: CartonSizeWidget(
deliveryType: _selectedDeliveryType, deliveryType: _selectedDeliveryType,
billType: _billToValue,
sender: widget.sender, sender: widget.sender,
consignee: widget.consignee, consignee: widget.consignee,
shipment: _shipment, shipment: _shipment,
@@ -142,10 +148,11 @@ class _CartonEditorForPackageState extends State<CartonEditorForPackage> {
onPrevious: () { onPrevious: () {
Navigator.pop(context); Navigator.pop(context);
}, },
onContinue: (deliveryType, shipment, cartonSizeType, onContinue: (deliveryType,billType ,shipment, cartonSizeType,
{standardSize, length, width, height}) { {standardSize, length, width, height}) {
setState(() { setState(() {
_selectedDeliveryType = deliveryType; _selectedDeliveryType = deliveryType;
_billToValue = billType;
_shipment = shipment; _shipment = shipment;
_cartonSizeType = cartonSizeType; _cartonSizeType = cartonSizeType;
_standardSize = standardSize; _standardSize = standardSize;
@@ -205,7 +212,7 @@ class _CartonEditorForPackageState extends State<CartonEditorForPackage> {
child: CartonSubmit( child: CartonSubmit(
sender: widget.sender, sender: widget.sender,
consingee: widget.consignee, consingee: widget.consignee,
billToValue: widget.billToValue, billToValue: _billToValue,
cartonSizeType: _cartonSizeType, cartonSizeType: _cartonSizeType,
standardSize: _standardSize, standardSize: _standardSize,
length: _length, length: _length,

124
lib/pages/carton/carton_size_widget.dart
View File

@@ -21,7 +21,8 @@ import '../widgets/previous_button.dart';
typedef OnPrevious = Function(); typedef OnPrevious = Function();
typedef OnContinue = Function(String deliveryType,FcsShipment shipment, String cartonSizeType, typedef OnContinue = Function(String deliveryType, String billType,
FcsShipment shipment, String cartonSizeType,
{CartonSize? standardSize, double? length, double? width, double? height}); {CartonSize? standardSize, double? length, double? width, double? height});
class CartonSizeWidget extends StatefulWidget { class CartonSizeWidget extends StatefulWidget {
@@ -30,6 +31,7 @@ class CartonSizeWidget extends StatefulWidget {
final User sender; final User sender;
final User consignee; final User consignee;
final String deliveryType; final String deliveryType;
final String billType;
final FcsShipment? shipment; final FcsShipment? shipment;
final String cartonSizeType; final String cartonSizeType;
final CartonSize? standardSize; final CartonSize? standardSize;
@@ -49,7 +51,8 @@ class CartonSizeWidget extends StatefulWidget {
this.height, this.height,
required this.sender, required this.sender,
required this.consignee, required this.consignee,
required this.deliveryType}) required this.deliveryType,
required this.billType})
: super(key: key); : super(key: key);
@override @override
@@ -60,11 +63,12 @@ class _CartonSizeWidgetState extends State<CartonSizeWidget> {
List<String> _deliveryTypes = [delivery_caton, pickup_carton]; List<String> _deliveryTypes = [delivery_caton, pickup_carton];
FcsShipment? _shipment; FcsShipment? _shipment;
String _cartionSizeType = standardCarton; String _cartonSizeType = standardCarton;
List<FcsShipment> _shipments = []; List<FcsShipment> _shipments = [];
CartonSize? _selectStandardSize; CartonSize? _selectStandardSize;
late String _selectedDeliveryType; late String _selectedDeliveryType;
late String _billToValue;
TextEditingController _widthController = new TextEditingController(); TextEditingController _widthController = new TextEditingController();
TextEditingController _heightController = new TextEditingController(); TextEditingController _heightController = new TextEditingController();
@@ -78,34 +82,41 @@ class _CartonSizeWidgetState extends State<CartonSizeWidget> {
_init() async { _init() async {
_selectedDeliveryType = widget.deliveryType; _selectedDeliveryType = widget.deliveryType;
_shipment = widget.shipment; _billToValue = widget.billType;
_cartionSizeType = widget.cartonSizeType; _cartonSizeType = widget.cartonSizeType;
List<CartonSize> cartonSizes = context.read<CartonSizeModel>().cartonSizes; List<CartonSize> cartonSizes = context.read<CartonSizeModel>().cartonSizes;
_selectStandardSize = widget.standardSize ?? cartonSizes.first; _selectStandardSize = widget.standardSize ?? cartonSizes.first;
_lengthController.text = _lengthController.text =
widget.length == null ? "0" : widget.length.toString(); widget.length == null ? "0" : removeTrailingZeros(widget.length ?? 0);
_widthController.text = _widthController.text =
widget.width == null ? "0" : widget.width.toString(); widget.width == null ? "0" : removeTrailingZeros(widget.width ?? 0);
_heightController.text = _heightController.text =
widget.height == null ? "0" : widget.height.toString(); widget.height == null ? "0" : removeTrailingZeros(widget.height ?? 0);
var fcsShipments = var fcsShipments =
await context.read<FcsShipmentModel>().getActiveFcsShipments(); await context.read<FcsShipmentModel>().getActiveFcsShipments();
_shipments = fcsShipments; _shipments = fcsShipments;
_shipment = widget.shipment;
if (mounted) { if (mounted) {
setState(() {}); setState(() {});
} }
} }
@override
void didUpdateWidget(covariant CartonSizeWidget oldWidget) {
_init();
super.didUpdateWidget(oldWidget);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<CartonSize> cartonSizes = context.watch<CartonSizeModel>().cartonSizes; List<CartonSize> cartonSizes = context.watch<CartonSizeModel>().cartonSizes;
bool isStandardSize = _cartionSizeType == standardCarton; bool isStandardSize = _cartonSizeType == standardCarton;
bool isCustomSize = _cartionSizeType == customCarton; bool isCustomSize = _cartonSizeType == customCarton;
bool isNoneDefinedSize = _cartionSizeType == packageCartion; bool isNoneDefinedSize = _cartonSizeType == packageCartion;
final senderBox = DisplayText( final senderBox = DisplayText(
text: widget.sender.name, text: widget.sender.name,
@@ -142,6 +153,72 @@ class _CartonSizeWidgetState extends State<CartonSizeWidget> {
}); });
}); });
final billRadioBox = Container(
child: Row(
children: [
Flexible(
child: InkWell(
onTap: () {
setState(() {
_billToValue = billToSender;
});
},
child: Row(children: <Widget>[
LocalRadio(
value: billToSender,
groupValue: _billToValue,
onChanged: (p0) {
setState(() {
_billToValue = billToSender;
});
},
),
Flexible(
child: Padding(
padding: const EdgeInsets.only(left: 10),
child: LocalText(context, 'box.bill_to_sender',
fontSize: 15,
color: _billToValue == billToSender
? primaryColor
: Colors.black),
),
)
]),
)),
Flexible(
child: InkWell(
onTap: () {
setState(() {
_billToValue = billToConsignee;
});
},
child: Row(children: <Widget>[
LocalRadio(
value: billToConsignee,
groupValue: _billToValue,
onChanged: (p0) {
setState(() {
_billToValue = billToConsignee;
});
},
),
Flexible(
child: Padding(
padding: const EdgeInsets.only(left: 10),
child: LocalText(context, 'box.bill_to.consignee',
fontSize: 15,
color: _billToValue == billToConsignee
? primaryColor
: Colors.black),
),
)
]),
),
)
],
),
);
final continueBtn = ContinueButton(onTap: () { final continueBtn = ContinueButton(onTap: () {
double l = double.tryParse(_lengthController.text) ?? 0; double l = double.tryParse(_lengthController.text) ?? 0;
double w = double.tryParse(_widthController.text) ?? 0; double w = double.tryParse(_widthController.text) ?? 0;
@@ -170,7 +247,8 @@ class _CartonSizeWidgetState extends State<CartonSizeWidget> {
} }
if (widget.onContinue != null) { if (widget.onContinue != null) {
widget.onContinue!(_selectedDeliveryType,_shipment!, _cartionSizeType, widget.onContinue!(
_selectedDeliveryType, _billToValue, _shipment!, _cartonSizeType,
standardSize: _selectStandardSize, length: l, width: w, height: h); standardSize: _selectStandardSize, length: l, width: w, height: h);
} }
}); });
@@ -249,16 +327,16 @@ class _CartonSizeWidgetState extends State<CartonSizeWidget> {
InkWell( InkWell(
onTap: () { onTap: () {
setState(() { setState(() {
_cartionSizeType = standardCarton; _cartonSizeType = standardCarton;
}); });
}, },
child: Row(children: <Widget>[ child: Row(children: <Widget>[
LocalRadio( LocalRadio(
value: standardCarton, value: standardCarton,
groupValue: _cartionSizeType, groupValue: _cartonSizeType,
onChanged: (p0) { onChanged: (p0) {
setState(() { setState(() {
_cartionSizeType = standardCarton; _cartonSizeType = standardCarton;
}); });
}, },
), ),
@@ -278,16 +356,16 @@ class _CartonSizeWidgetState extends State<CartonSizeWidget> {
InkWell( InkWell(
onTap: () { onTap: () {
setState(() { setState(() {
_cartionSizeType = customCarton; _cartonSizeType = customCarton;
}); });
}, },
child: Row(children: <Widget>[ child: Row(children: <Widget>[
LocalRadio( LocalRadio(
value: customCarton, value: customCarton,
groupValue: _cartionSizeType, groupValue: _cartonSizeType,
onChanged: (p0) { onChanged: (p0) {
setState(() { setState(() {
_cartionSizeType = customCarton; _cartonSizeType = customCarton;
}); });
}, },
), ),
@@ -307,16 +385,16 @@ class _CartonSizeWidgetState extends State<CartonSizeWidget> {
InkWell( InkWell(
onTap: () { onTap: () {
setState(() { setState(() {
_cartionSizeType = packageCartion; _cartonSizeType = packageCartion;
}); });
}, },
child: Row(children: <Widget>[ child: Row(children: <Widget>[
LocalRadio( LocalRadio(
value: packageCartion, value: packageCartion,
groupValue: _cartionSizeType, groupValue: _cartonSizeType,
onChanged: (p0) { onChanged: (p0) {
setState(() { setState(() {
_cartionSizeType = packageCartion; _cartonSizeType = packageCartion;
}); });
}, },
), ),
@@ -366,7 +444,9 @@ class _CartonSizeWidgetState extends State<CartonSizeWidget> {
children: [ children: [
const SizedBox(height: 8), const SizedBox(height: 8),
userRow, userRow,
LocalTitle(textKey: "box.select.delivery", topPadding: 10), const SizedBox(height: 5),
billRadioBox,
LocalTitle(textKey: "box.select.delivery"),
const SizedBox(height: 5), const SizedBox(height: 5),
deliveryTypeBox, deliveryTypeBox,
const SizedBox(height: 5), const SizedBox(height: 5),

7
lib/pages/carton/carton_submit.dart
View File

@@ -35,6 +35,7 @@ class CartonSubmit extends StatelessWidget {
final List<CargoType> surchareItems; final List<CargoType> surchareItems;
final OnCreateCarton? onCreate; final OnCreateCarton? onCreate;
final OnPrevious? onPrevious; final OnPrevious? onPrevious;
final bool isNew;
const CartonSubmit( const CartonSubmit(
{Key? key, {Key? key,
required this.sender, required this.sender,
@@ -51,7 +52,8 @@ class CartonSubmit extends StatelessWidget {
this.width = 0, this.width = 0,
this.height = 0, this.height = 0,
this.cargoTypes = const [], this.cargoTypes = const [],
this.surchareItems = const []}) this.surchareItems = const [],
this.isNew = true})
: super(key: key); : super(key: key);
@override @override
@@ -310,7 +312,8 @@ class CartonSubmit extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Flexible( Flexible(
child: LocalText(context, 'box.crete.carton', child: LocalText(
context, isNew ? 'box.crete.carton' : "box.update.btn",
color: Colors.white, fontSize: 15), color: Colors.white, fontSize: 15),
), ),
const SizedBox(width: 5), const SizedBox(width: 5),

31
lib/pages/carton/mix_carton/mix_carton_editor.dart
View File

@@ -1,5 +1,6 @@
// ignore_for_file: deprecated_member_use // ignore_for_file: deprecated_member_use
import 'package:fcs/pages/fcs_shipment/model/fcs_shipment_model.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@@ -21,9 +22,8 @@ import 'mix_carton_submit.dart';
import 'type_widget.dart'; import 'type_widget.dart';
class MixCartonEditor extends StatefulWidget { class MixCartonEditor extends StatefulWidget {
const MixCartonEditor({ final Carton carton;
Key? key, const MixCartonEditor({Key? key, required this.carton}) : super(key: key);
}) : super(key: key);
@override @override
State<MixCartonEditor> createState() => _MixCartonEditorState(); State<MixCartonEditor> createState() => _MixCartonEditorState();
@@ -51,10 +51,26 @@ class _MixCartonEditorState extends State<MixCartonEditor> {
@override @override
void initState() { void initState() {
context.read<CartonSelectionModel>().clearSelection(); _init();
super.initState(); super.initState();
} }
_init() async {
var s = await context
.read<FcsShipmentModel>()
.getFcsShipment(widget.carton.fcsShipmentID ?? "");
_shipment = s;
_cartonSizeType = customCarton;
_length = widget.carton.length;
_width = widget.carton.width;
_height = widget.carton.height;
context.read<CartonSelectionModel>().clearSelection();
if (mounted) {
setState(() {});
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return WillPopScope(
@@ -91,7 +107,7 @@ class _MixCartonEditorState extends State<MixCartonEditor> {
}, },
), ),
backgroundColor: Colors.white, backgroundColor: Colors.white,
title: LocalText(context, 'boxes.new', title: LocalText(context, 'box.update_title',
color: primaryColor, fontSize: 20), color: primaryColor, fontSize: 20),
), ),
body: Column( body: Column(
@@ -164,6 +180,7 @@ class _MixCartonEditorState extends State<MixCartonEditor> {
} else { } else {
return Expanded( return Expanded(
child: MixCartonSubmit( child: MixCartonSubmit(
isNew: false,
cartonSizeType: _cartonSizeType, cartonSizeType: _cartonSizeType,
standardSize: _standardSize, standardSize: _standardSize,
length: _length, length: _length,
@@ -172,7 +189,7 @@ class _MixCartonEditorState extends State<MixCartonEditor> {
shipment: _shipment!, shipment: _shipment!,
cartons: _cartons, cartons: _cartons,
onCreate: () { onCreate: () {
_create(); _update();
}, },
onPrevious: () { onPrevious: () {
setState(() { setState(() {
@@ -184,7 +201,7 @@ class _MixCartonEditorState extends State<MixCartonEditor> {
} }
} }
_create() async { _update() async {
setState(() { setState(() {
_isLoading = true; _isLoading = true;
}); });

199
lib/pages/carton/mix_carton/mix_carton_form.dart Normal file
View File

@@ -0,0 +1,199 @@
// ignore_for_file: deprecated_member_use
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import '../../../domain/constants.dart';
import '../../../domain/entities/carton.dart';
import '../../../domain/entities/carton_size.dart';
import '../../../domain/entities/fcs_shipment.dart';
import '../../../domain/vo/local_step.dart';
import '../../../helpers/theme.dart';
import '../../main/util.dart';
import '../../widgets/local_text.dart';
import '../../widgets/progress.dart';
import '../../widgets/step_widget.dart';
import '../model/carton_selection_model.dart';
import 'carton_selection_widget.dart';
import 'mix_carton_submit.dart';
import 'type_widget.dart';
class MixCartonForm extends StatefulWidget {
const MixCartonForm({Key? key}) : super(key: key);
@override
State<MixCartonForm> createState() => _MixCartonFormState();
}
class _MixCartonFormState extends State<MixCartonForm> {
var dateFormatter = DateFormat('dd MMM yyyy');
final NumberFormat numberFormatter = NumberFormat("#,###");
List<LocalStep> steps = [
LocalStep(lable: 'Type', stepType: StepType.TYPE),
LocalStep(lable: 'Cartons', stepType: StepType.CARTONS),
LocalStep(lable: 'Submit', stepType: StepType.SUBMIT)
];
List<Carton> _cartons = [];
int currentStep = 0;
double _length = 0;
double _width = 0;
double _height = 0;
FcsShipment? _shipment;
String _cartonSizeType = standardCarton;
CartonSize? _standardSize;
bool _isLoading = false;
@override
void initState() {
context.read<CartonSelectionModel>().clearSelection();
super.initState();
}
@override
Widget build(BuildContext context) {
return WillPopScope(
onWillPop: () {
if (currentStep == 0) {
Navigator.of(context).pop();
}
if (currentStep > 0) {
setState(() {
currentStep -= 1;
});
}
return Future.value(false);
},
child: LocalProgress(
inAsyncCall: _isLoading,
child: Scaffold(
appBar: AppBar(
elevation: 0,
centerTitle: true,
leading: IconButton(
icon: const Icon(CupertinoIcons.back,
color: primaryColor, size: 25),
onPressed: () {
if (currentStep == 0) {
Navigator.of(context).pop();
}
if (currentStep > 0) {
setState(() {
currentStep -= 1;
});
}
},
),
backgroundColor: Colors.white,
title: LocalText(context, 'boxes.new',
color: primaryColor, fontSize: 20),
),
body: Column(
children: [
StepperWidget(
labels: steps.map((e) => e.lable).toList(),
currentStep: currentStep,
eachStepWidth: MediaQuery.of(context).size.width / 3,
onChange: (index) {
if (index > currentStep) {
return;
}
setState(() {
currentStep = index;
});
},
),
getContent(currentStep)
],
))),
);
}
Widget getContent(int index) {
var step = steps[index];
if (step.stepType == StepType.TYPE) {
return Expanded(
child: TypeWidget(
shipment: _shipment,
cartonSizeType: _cartonSizeType,
standardSize: _standardSize,
length: _length,
width: _width,
height: _height,
onPrevious: () {
Navigator.pop(context);
},
onContinue: (shipment, cartonSizeType,
{standardSize, length, width, height}) {
setState(() {
_shipment = shipment;
_cartonSizeType = cartonSizeType;
_standardSize = standardSize;
_length = length ?? 0;
_width = width ?? 0;
_height = height ?? 0;
currentStep += 1;
});
},
));
} else if (step.stepType == StepType.CARTONS) {
return Expanded(
child: CartonSelectionWidget(
shipment: _shipment!,
cartons: _cartons,
onContinue: (cartons) {
setState(() {
_cartons = List.from(cartons);
currentStep += 1;
});
},
onPrevious: (cartons) {
setState(() {
_cartons = List.from(cartons);
currentStep -= 1;
});
},
),
);
} else {
return Expanded(
child: MixCartonSubmit(
cartonSizeType: _cartonSizeType,
standardSize: _standardSize,
length: _length,
width: _width,
height: _height,
shipment: _shipment!,
cartons: _cartons,
onCreate: () {
_create();
},
onPrevious: () {
setState(() {
currentStep -= 1;
});
},
),
);
}
}
_create() async {
setState(() {
_isLoading = true;
});
try {
Navigator.pop(context, true);
} catch (e) {
showMsgDialog(context, "Error", e.toString());
} finally {
setState(() {
_isLoading = false;
});
}
}
}

7
lib/pages/carton/mix_carton/mix_carton_submit.dart
View File

@@ -18,6 +18,7 @@ typedef OnCreateMixCarton = Function();
typedef OnPrevious = Function(); typedef OnPrevious = Function();
class MixCartonSubmit extends StatefulWidget { class MixCartonSubmit extends StatefulWidget {
final bool isNew;
final FcsShipment shipment; final FcsShipment shipment;
final List<Carton> cartons; final List<Carton> cartons;
final String cartonSizeType; final String cartonSizeType;
@@ -37,7 +38,8 @@ class MixCartonSubmit extends StatefulWidget {
required this.cartonSizeType, required this.cartonSizeType,
this.length = 0, this.length = 0,
this.width = 0, this.width = 0,
this.height = 0}) this.height = 0,
this.isNew = true})
: super(key: key); : super(key: key);
@override @override
@@ -253,7 +255,8 @@ class _MixCartonSubmitState extends State<MixCartonSubmit> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Flexible( Flexible(
child: LocalText(context, 'box.crete.carton', child: LocalText(context,
widget.isNew ? 'box.crete.carton' : 'box.update.btn',
color: Colors.white, fontSize: 15), color: Colors.white, fontSize: 15),
), ),
const SizedBox(width: 5), const SizedBox(width: 5),

17
lib/pages/carton/mix_carton/type_widget.dart
View File

@@ -65,28 +65,33 @@ class _TypeWidgetState extends State<TypeWidget> {
} }
_init() async { _init() async {
_shipment = widget.shipment;
_cartionSizeType = widget.cartonSizeType;
List<CartonSize> cartonSizes = context.read<CartonSizeModel>().cartonSizes; List<CartonSize> cartonSizes = context.read<CartonSizeModel>().cartonSizes;
_selectStandardSize = widget.standardSize ?? cartonSizes.first; _selectStandardSize = widget.standardSize ?? cartonSizes.first;
_cartionSizeType = widget.cartonSizeType;
_lengthController.text = _lengthController.text =
widget.length == null ? "0" : widget.length.toString(); widget.length == null ? "0" : removeTrailingZeros(widget.length ?? 0);
_widthController.text = _widthController.text =
widget.width == null ? "0" : widget.width.toString(); widget.width == null ? "0" : removeTrailingZeros(widget.width ?? 0);
_heightController.text = _heightController.text =
widget.height == null ? "0" : widget.height.toString(); widget.height == null ? "0" : removeTrailingZeros(widget.height ?? 0);
var fcsShipments = var fcsShipments =
await context.read<FcsShipmentModel>().getActiveFcsShipments(); await context.read<FcsShipmentModel>().getActiveFcsShipments();
_shipments = fcsShipments; _shipments = fcsShipments;
_shipment = widget.shipment;
if (mounted) { if (mounted) {
setState(() {}); setState(() {});
} }
} }
@override
void didUpdateWidget(covariant TypeWidget oldWidget) {
_init();
super.didUpdateWidget(oldWidget);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<CartonSize> cartonSizes = context.watch<CartonSizeModel>().cartonSizes; List<CartonSize> cartonSizes = context.watch<CartonSizeModel>().cartonSizes;

17
lib/pages/carton/model/carton_model.dart
View File

@@ -205,7 +205,7 @@ class CartonModel extends BaseModel {
return querySnap.docs.map((e) => Carton.fromMap(e.data(), e.id)).toList(); return querySnap.docs.map((e) => Carton.fromMap(e.data(), e.id)).toList();
} }
Future<Carton> getCarton(String id) async { Future<Carton?> getCarton(String id) async {
String path = "/$cartons_collection"; String path = "/$cartons_collection";
var snap = await FirebaseFirestore.instance.collection(path).doc(id).get(); var snap = await FirebaseFirestore.instance.collection(path).doc(id).get();
return Carton.fromMap(snap.data() as Map<String, dynamic>, snap.id); return Carton.fromMap(snap.data() as Map<String, dynamic>, snap.id);
@@ -226,4 +226,19 @@ class CartonModel extends BaseModel {
Future<List<Carton>> searchCarton(String term) async { Future<List<Carton>> searchCarton(String term) async {
return Services.instance.cartonService.searchCarton(term); return Services.instance.cartonService.searchCarton(term);
} }
Future<List<Carton>> getCartonsByIds(List<String> cartonIds) async {
List<Carton> cartons = [];
try {
for (var e in cartonIds) {
Carton? c = await getCarton(e);
if (c != null) {
cartons.add(c);
}
}
} catch (e) {
log.warning("Error!! $e");
}
return cartons;
}
} }

1
lib/pages/carton/model/carton_selection_model.dart
View File

@@ -144,4 +144,5 @@ class CartonSelectionModel extends BaseModel {
cartons.clear(); cartons.clear();
query = ""; query = "";
} }
} }

4
lib/pages/carton/model/package_selection_model.dart
View File

@@ -102,6 +102,10 @@ class PackageSelectionModel extends BaseModel {
} }
} }
addSelectedPackage(List<Package> list){
selectedPackageList = list;
}
Future<void> _refresh( Future<void> _refresh(
{required String shipmentId, {required String shipmentId,
required String senderId, required String senderId,

363
lib/pages/carton/package_carton_editor.dart
View File

@@ -1,363 +0,0 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/cargo_type.dart';
import 'package:fcs/domain/entities/carton_size.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/domain/vo/delivery_address.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/carton_size/carton_size_list.dart';
import 'package:fcs/pages/carton_size/model/carton_size_model.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
import 'package:fcs/pages/widgets/delivery_address_selection.dart';
import 'package:fcs/pages/widgets/length_picker.dart';
import 'package:fcs/pages/widgets/local_button.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/local_title.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:provider/provider.dart';
import 'cargo_type_addtion.dart';
import 'carton_cargo_table.dart';
import 'model/carton_model.dart';
class PackageCartonEditor extends StatefulWidget {
final Carton? carton;
final bool? isNew;
final User? consignee;
PackageCartonEditor({this.carton, this.isNew, this.consignee});
@override
_PackageCartonEditorState createState() => _PackageCartonEditorState();
}
class _PackageCartonEditorState extends State<PackageCartonEditor> {
TextEditingController _lengthCtl = new TextEditingController();
TextEditingController _widthCtl = new TextEditingController();
TextEditingController _heightCtl = new TextEditingController();
Carton? _carton;
bool _isLoading = false;
DeliveryAddress? _deliveryAddress = new DeliveryAddress();
List<CargoType> _cargoTypes = [];
CartonSize? selectedCatonSize;
bool isFromPackages = false;
bool isFromCartons = false;
@override
void initState() {
super.initState();
_load();
}
_load() {
_carton = widget.carton;
isFromPackages = _carton!.cartonType == carton_from_packages;
isFromCartons = _carton!.cartonType == carton_from_cartons;
if (widget.isNew!) {
_lengthCtl.text = "0";
_widthCtl.text = "0";
_heightCtl.text = "0";
} else {
_cargoTypes = widget.carton!.cargoTypes.map((e) => e.clone()).toList();
_lengthCtl.text = _carton!.length.toString();
_widthCtl.text = _carton!.width.toString();
_heightCtl.text = _carton!.height.toString();
_deliveryAddress = _carton!.deliveryAddress;
_getCartonSize();
}
}
_getCartonSize() {
var cartonSizeModel = Provider.of<CartonSizeModel>(context, listen: false);
cartonSizeModel.cartonSizes.forEach((c) {
if (c.length == _carton!.length &&
c.width == _carton!.width &&
c.height == _carton!.height) {
selectedCatonSize = CartonSize(
id: c.id,
name: c.name,
length: c.length,
width: c.width,
height: c.height);
}
});
}
@override
Widget build(BuildContext context) {
final lengthBox = LengthPicker(
controller: _lengthCtl,
lableKey: "box.length",
isReadOnly: false,
);
final widthBox = LengthPicker(
controller: _widthCtl,
lableKey: "box.width",
isReadOnly: false,
);
final heightBox = LengthPicker(
controller: _heightCtl,
lableKey: "box.height",
isReadOnly: false,
);
final dimBox = Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(right: 8.0),
child: Icon(FontAwesome.arrow_circle_right, color: primaryColor),
),
SizedBox(child: lengthBox, width: 80),
SizedBox(child: widthBox, width: 80),
SizedBox(child: heightBox, width: 80),
],
);
final createBtn = LocalButton(
textKey: widget.isNew! ? "box.new_carton_btn" : "box.cargo.save.btn",
callBack: _creatCarton,
);
final cargoTableTitleBox = LocalTitle(
textKey: "box.cargo.type",
trailing: IconButton(
icon: Icon(
Icons.add_circle,
color: primaryColor,
),
onPressed: () async {
List<CargoType>? cargos = await Navigator.push<List<CargoType>>(
context,
CupertinoPageRoute(builder: (context) => CargoTypeAddition()));
if (cargos == null) return;
setState(() {
_cargoTypes.addAll(
cargos.where((e) => !_cargoTypes.contains(e)).toList());
});
}),
);
final cargoTableBox = CargoTable(
isNew: widget.isNew,
cargoTypes: _cargoTypes,
onRemove: (c) => _removeCargo(c),
onUpdate: (c) => _updateCargo(c),
);
return LocalProgress(
inAsyncCall: _isLoading,
child: Scaffold(
appBar: AppBar(
centerTitle: true,
leading: new IconButton(
icon: new Icon(
CupertinoIcons.back,
color: primaryColor,
),
onPressed: () => Navigator.of(context).pop()),
shadowColor: Colors.transparent,
backgroundColor: Colors.white,
title: LocalText(
context,
widget.isNew! ? "boxes.create.title" : "box.edit.title",
fontSize: 20,
color: primaryColor,
),
),
body: Padding(
padding: const EdgeInsets.all(8.0),
child: ListView(
children: [
cargoTableTitleBox,
cargoTableBox,
LocalTitle(textKey: "box.dimension"),
cartonSizeDropdown(),
dimBox,
LocalTitle(textKey: "box.delivery_address"),
DefaultDeliveryAddress(
deliveryAddress: _deliveryAddress,
labelKey: "box.delivery_address",
onTap: () async {
DeliveryAddress? d = await Navigator.push<DeliveryAddress>(
context,
CupertinoPageRoute(
builder: (context) => DeliveryAddressSelection(
deliveryAddress: _deliveryAddress,
user: User(
id: _carton!.userID,
name: _carton!.userName),
)),
);
if (d == null) return;
setState(() {
_deliveryAddress = d;
});
}),
SizedBox(
height: 20,
),
createBtn
],
),
),
),
);
}
Widget cartonSizeDropdown() {
List<CartonSize> _cartonSizes =
Provider.of<CartonSizeModel>(context).getCartonSizes;
return Padding(
padding: const EdgeInsets.only(top: 10),
child: Row(
children: [
Padding(
padding: const EdgeInsets.only(left: 0, right: 10),
child: Icon(AntDesign.CodeSandbox, color: primaryColor),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(right: 18.0),
child: LocalText(
context,
"box.carton_size",
color: Colors.black54,
fontSize: 16,
),
),
DropdownButton<CartonSize>(
isDense: true,
value: selectedCatonSize,
style: TextStyle(color: Colors.black, fontSize: 14),
underline: Container(
height: 1,
color: Colors.grey,
),
onChanged: (CartonSize? newValue) {
setState(() {
if (newValue!.name == MANAGE_CARTONSIZE) {
selectedCatonSize = null;
_manageCartonSize();
return;
}
selectedCatonSize = newValue;
_widthCtl.text = selectedCatonSize!.width.toString();
_heightCtl.text = selectedCatonSize!.height.toString();
_lengthCtl.text = selectedCatonSize!.length.toString();
});
},
isExpanded: true,
items: _cartonSizes
.map<DropdownMenuItem<CartonSize>>((CartonSize value) {
return DropdownMenuItem<CartonSize>(
value: value,
child: Text(value.name ?? "",
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: value.name == MANAGE_CARTONSIZE
? secondaryColor
: primaryColor)),
);
}).toList(),
),
],
),
),
],
),
);
}
_manageCartonSize() {
Navigator.push<Package>(
context,
CupertinoPageRoute(builder: (context) => CartonSizeList()),
);
}
_removeCargo(CargoType cargo) {
setState(() {
_cargoTypes.remove(cargo);
});
}
_updateCargo(CargoType cargo) {
setState(() {
var _c = _cargoTypes.firstWhere((e) => e.id == cargo.id);
_c.weight = cargo.weight;
_c.qty = cargo.qty;
});
}
_creatCarton() async {
if (_cargoTypes.length == 0) {
showMsgDialog(context, "Error", "Expect at least one cargo type");
return;
}
double l = double.parse(_lengthCtl.text);
double w = double.parse(_widthCtl.text);
double h = double.parse(_heightCtl.text);
if ((l <= 0 || w <= 0 || h <= 0)) {
showMsgDialog(context, "Error", "Invalid dimension");
return;
}
if (_deliveryAddress == null) {
showMsgDialog(context, "Error", "Invalid delivery address");
return;
}
Carton carton = Carton();
carton.id = _carton!.id;
carton.cartonType = _carton!.cartonType;
carton.fcsShipmentID = _carton!.fcsShipmentID;
carton.cargoTypes = _cargoTypes;
if (isFromPackages) {
carton.userID = _carton!.userID;
carton.packages = _carton!.packages.where((e) => e.isChecked).toList();
}
if (isFromCartons) {
carton.userID = _carton!.userID;
carton.fcsID = _carton!.fcsID;
carton.userName = _carton!.userName;
carton.senderID = _carton!.senderID;
carton.senderFCSID = _carton!.senderFCSID;
carton.senderName = _carton!.senderName;
}
carton.length = l;
carton.width = w;
carton.height = h;
carton.deliveryAddress = _deliveryAddress;
setState(() {
_isLoading = true;
});
try {
CartonModel cartonModel =
Provider.of<CartonModel>(context, listen: false);
if (widget.isNew!) {
Carton _c = await cartonModel.createCarton(carton);
Navigator.pop(context, _c);
} else {
await cartonModel.updateCarton(carton);
Carton _c = await cartonModel.getCarton(_carton!.id!);
Navigator.pop(context, _c);
}
} catch (e) {
showMsgDialog(context, "Error", e.toString());
} finally {
setState(() {
_isLoading = false;
});
}
}
}

2
lib/pages/carton/package_selection_widget.dart
View File

@@ -60,6 +60,8 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
consigneeId: widget.consignee.id!, consigneeId: widget.consignee.id!,
senderId: widget.sender.id!); senderId: widget.sender.id!);
searchModel.addSelectedPackage(widget.packages);
_controller.text = searchModel.query; _controller.text = searchModel.query;
_query = searchModel.query; _query = searchModel.query;
if (mounted) { if (mounted) {

4
lib/pages/carton/carton_list_row.dart → lib/pages/carton/widget/carton_list_row.dart
View File

@@ -4,7 +4,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart'; import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'carton_info.dart'; import '../carton_info.dart';
class CartonListRow extends StatelessWidget { class CartonListRow extends StatelessWidget {
final Carton box; final Carton box;
@@ -19,7 +19,7 @@ class CartonListRow extends StatelessWidget {
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
CupertinoPageRoute(builder: (context) => CartonInfo(box: box)), CupertinoPageRoute(builder: (context) => CartonInfo(carton: box)),
); );
}, },
child: Container( child: Container(

0
lib/pages/carton/carton_row.dart → lib/pages/carton/widget/carton_row.dart
View File

4
lib/pages/carton/user_search_result.dart → lib/pages/carton/widget/user_search_result.dart
View File

@@ -1,8 +1,8 @@
import 'package:fcs/pages/widgets/local_text.dart'; import 'package:fcs/pages/widgets/local_text.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../../helpers/theme.dart'; import '../../../../helpers/theme.dart';
import '../../domain/entities/user.dart'; import '../../../domain/entities/user.dart';
typedef OnAction = Future<void> Function(); typedef OnAction = Future<void> Function();

3
lib/pages/fcs_shipment/model/fcs_shipment_model.dart
View File

@@ -83,7 +83,7 @@ class FcsShipmentModel extends BaseModel {
try { try {
var snaps = await FirebaseFirestore.instance var snaps = await FirebaseFirestore.instance
.collection("/$fcs_shipment_collection") .collection("/$fcs_shipment_collection")
.where("status", isEqualTo: fcs_shipment_confirmed_status) // .where("status", isEqualTo: fcs_shipment_confirmed_status)
.get(const GetOptions(source: Source.server)); .get(const GetOptions(source: Source.server));
fcsShipments = snaps.docs.map((documentSnapshot) { fcsShipments = snaps.docs.map((documentSnapshot) {
var fcs = var fcs =
@@ -97,6 +97,7 @@ class FcsShipmentModel extends BaseModel {
} }
Future<FcsShipment?> getFcsShipment(String id) async { Future<FcsShipment?> getFcsShipment(String id) async {
if (id == "") return null;
try { try {
var snap = await FirebaseFirestore.instance var snap = await FirebaseFirestore.instance
.collection("/$fcs_shipment_collection") .collection("/$fcs_shipment_collection")

6
lib/pages/invoice/invoice_info.dart
View File

@@ -49,8 +49,10 @@ class _InvoiceInfoState extends State<InvoiceInfo> {
List<Carton> cartons = []; List<Carton> cartons = [];
for (var c in _invoice?.cartons ?? []) { for (var c in _invoice?.cartons ?? []) {
var _carton = await cartonModel.getCarton(c.id); var _carton = await cartonModel.getCarton(c.id);
_carton.isChecked = true; if (_carton != null) {
cartons.add(_carton); _carton.isChecked = true;
cartons.add(_carton);
}
} }
setState(() { setState(() {
_invoice!.cartons = cartons; _invoice!.cartons = cartons;

15
lib/pages/package/model/package_model.dart
View File

@@ -359,4 +359,19 @@ class PackageModel extends BaseModel {
Future<void> packageReturn(Package package) { Future<void> packageReturn(Package package) {
return Services.instance.packageService.packageReturn(package.id!); return Services.instance.packageService.packageReturn(package.id!);
} }
Future<List<Package>> getPackagesByIds(List<String> packageIds) async {
List<Package> packages = [];
try {
for (var e in packageIds) {
Package? p = await getPackage(e);
if (p != null) {
packages.add(p);
}
}
} catch (e) {
log.warning("Error!! $e");
}
return packages;
}
} }

0
lib/pages/carton/cargo_type_editor.dart → lib/pages/shipment/cargo_type_editor.dart
View File

2
lib/pages/shipment/shipment_box_editor.dart
View File

@@ -2,7 +2,7 @@ import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/cargo_type.dart'; import 'package:fcs/domain/entities/cargo_type.dart';
import 'package:fcs/domain/vo/delivery_address.dart'; import 'package:fcs/domain/vo/delivery_address.dart';
import 'package:fcs/helpers/theme.dart'; import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/carton/cargo_type_editor.dart'; import 'package:fcs/pages/shipment/cargo_type_editor.dart';
import 'package:fcs/pages/delivery_address/model/delivery_address_model.dart'; import 'package:fcs/pages/delivery_address/model/delivery_address_model.dart';
import 'package:fcs/pages/main/model/main_model.dart'; import 'package:fcs/pages/main/model/main_model.dart';
import 'package:fcs/pages/rates/model/shipment_rate_model.dart'; import 'package:fcs/pages/rates/model/shipment_rate_model.dart';