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

merge

Browse Source
This commit is contained in:
sma
2024-02-08 17:09:01 +06:30
parent 0530d401f4 324981bd6c
commit 22097f3b6c
41 changed files with 1361 additions and 1266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,10 +30,11 @@ final NumberFormat numberFormatter = NumberFormat("#,###");
class CartonInfo extends StatefulWidget {
final Package? package;
final Carton box;
final String? billToValue;
final CartonSubmit? cartonSubmit;
final String? billToValue;
final CartonSubmit? cartonSubmit;
CartonInfo({required this.box,this.billToValue,this.package,this.cartonSubmit});
CartonInfo(
{required this.box, this.billToValue, this.package, this.cartonSubmit});
@override
_CartonInfoState createState() => _CartonInfoState();
@@ -42,8 +43,8 @@ class CartonInfo extends StatefulWidget {
class _CartonInfoState extends State<CartonInfo> {
bool _isLoading = false;
Carton? _box;
CartonSubmit? _cartonSubmit;
CartonSubmit? _cartonSubmit;
MultiImgController multiImgController = MultiImgController();
TextEditingController _widthController = new TextEditingController();
@@ -62,14 +63,14 @@ class _CartonInfoState extends State<CartonInfo> {
bool isEdiable = false;
final List<CargoType> cargoTypes = [];
final List<CargoType> surchareItems = [];
@override
void initState() {
super.initState();
_box = widget.box;
_box?.billToValue="Bill to sender";
_cartonSubmit=widget.cartonSubmit;
_box?.billToValue = "Bill to sender";
_cartonSubmit = widget.cartonSubmit;
//initPackage(widget.package!);
//for shipment weight
volumetricRatio = Provider.of<ShipmentRateModel>(context, listen: false)
@@ -89,7 +90,6 @@ class _CartonInfoState extends State<CartonInfo> {
_heightController.text = _box!.height.toString();
_lengthController.text = _box!.length.toString();
_cartonSizeController.text = _box!.cartonSizeName ?? "";
isMixBox = _box!.cartonType == carton_mix_box;
isFromShipments = _box!.cartonType == carton_from_shipments;
isFromPackages = _box!.cartonType == carton_from_packages;
@@ -330,78 +330,82 @@ class _CartonInfoState extends State<CartonInfo> {
controller: multiImgController,
title: "Receipt File",
);
final displayMixBox=
Container(child:Row(children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Expanded(
child: Row(
//crossAxisAlignment: CrossAxisAlignment.start,
children: [
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()
],
),
))
],
final displayMixBox = Container(
child: Row(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Expanded(
child: Row(
//crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
customerNameBox,
],
),
),
packageBox,
Row(
children: getPackageList(_box!.packages),
)
],));
_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,
Row(
children: getPackageList(_box!.packages),
)
],
));
final billWidget = Expanded(
child: Padding(
padding: EdgeInsets.only(left: 0, top: 15),
@@ -456,8 +460,7 @@ class _CartonInfoState extends State<CartonInfo> {
),
],
),
// Row(
// mainAxisAlignment: MainAxisAlignment.start,
// children: [
@@ -506,7 +509,7 @@ class _CartonInfoState extends State<CartonInfo> {
// children: getPackageList(_box!.packages),
// ),
// ]):Container(),
cargosBox,
surchargeItemBox,
Padding(