update pages for carton

This commit is contained in:
tzw
2025-03-07 17:41:09 +06:30
parent e75eacd1f9
commit ee4e670c59
13 changed files with 616 additions and 618 deletions

View File

@@ -10,7 +10,6 @@ import '../../domain/entities/user.dart';
import '../main/util.dart';
import '../widgets/barcode_scanner.dart';
import '../widgets/continue_button.dart';
import '../widgets/display_text.dart';
import '../widgets/local_title.dart';
import '../widgets/previous_button.dart';
import 'model/package_selection_model.dart';
@@ -28,14 +27,14 @@ class PackageSelectionWidget extends StatefulWidget {
final OnContinue? onContinue;
const PackageSelectionWidget({
Key? key,
super.key,
required this.packages,
this.onPrevious,
this.onContinue,
required this.shipment,
required this.sender,
required this.consignee,
}) : super(key: key);
});
@override
State<PackageSelectionWidget> createState() => _PackageSelectionWidgetState();
@@ -109,30 +108,25 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
List<Package> searchResults = model.packages;
List<Package> selectedPackageList = model.selectedPackages;
final senderBox = DisplayText(
text: widget.sender.name,
labelTextKey: "box.sender.title",
iconData: MaterialCommunityIcons.account_arrow_right,
subText: Text(widget.sender.fcsID!,
style: TextStyle(fontSize: 13, color: labelColor)),
);
final senderBox = userDisplayBox(context,
lableKey: "box.sender.title",
icon: MaterialCommunityIcons.account_arrow_right,
showLink: false,
name: widget.sender.name ?? "",
fcsID: widget.sender.fcsID ?? "");
final consigneeBox = DisplayText(
text: widget.consignee.name,
labelTextKey: "box.consignee.title",
iconData: MaterialCommunityIcons.account_arrow_left,
subText: Text(widget.consignee.fcsID!,
style: TextStyle(fontSize: 13, color: labelColor)),
);
final consigneeBox = userDisplayBox(context,
showLink: false,
lableKey: "box.consignee.title",
icon: MaterialCommunityIcons.account_arrow_left,
name: widget.consignee.name,
fcsID: widget.consignee.fcsID);
final userRow = Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: senderBox,
flex: 2,
),
Flexible(child: consigneeBox)
Expanded(flex: 2, child: consigneeBox),
Flexible(child: senderBox)
],
);