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

null safety

Browse Source
This commit is contained in:
phyothandar
2021-09-10 16:48:21 +06:30
parent 03c5fc5016
commit bb4f4ad7c2
40 changed files with 393 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pages/invoice/invoice_list_row.dart
View File

@@ -58,7 +58,9 @@ class InvoiceListRow extends StatelessWidget {
fontSize: 13.0, color: primaryColor), fontSize: 13.0, color: primaryColor),
), ),
new Text( new Text(
dateFormatter.format(invoice!.invoiceDate!), invoice!.invoiceDate != null
? dateFormatter.format(invoice!.invoiceDate!)
: '',
style: new TextStyle( style: new TextStyle(
fontSize: 15.0, color: Colors.grey), fontSize: 15.0, color: Colors.grey),
) )

2
lib/pages/invoice/invoice_shipment_list_row.dart
View File

@@ -86,7 +86,7 @@ class _InvoiceShipmentListRowState extends State<InvoiceShipmentListRow> {
), ),
Padding( Padding(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
child: getStatus(_fcsShipment.status!), child: getStatus(_fcsShipment.status??"")
), ),
], ],
), ),

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

@@ -16,9 +16,9 @@ import 'package:path/path.dart' as Path;
class PackageModel extends BaseModel { class PackageModel extends BaseModel {
final log = Logger('PackageModel'); final log = Logger('PackageModel');
PaginatorListener? packages; late PaginatorListener<Package> packages;
PaginatorListener? customerPackages; late PaginatorListener<Package> customerPackages;
PaginatorListener? activePackages; late PaginatorListener<Package> activePackages;
bool isLoading = false; bool isLoading = false;
int _menuSelectedIndex = 1; int _menuSelectedIndex = 1;
@@ -63,15 +63,16 @@ class PackageModel extends BaseModel {
@override @override
logout() async { logout() async {
if (customerPackages != null) customerPackages!.close(); if (customerPackages != null) customerPackages.close();
if (packages != null) packages!.close(); if (packages != null) packages.close();
if (activePackages != null) activePackages!.close(); if (activePackages != null) activePackages.close();
} }
Future<void> _loadPackages(bool isDelivered) async { Future<void> _loadPackages(bool isDelivered) async {
if (user == null) return; if (user == null) return;
if (!((user!.hasPackages() || user!.hasReceiving() || user!.hasProcessing()))) if (!((user!.hasPackages() ||
return; user!.hasReceiving() ||
user!.hasProcessing()))) return;
String path = "/$packages_collection"; String path = "/$packages_collection";
try { try {
@@ -83,7 +84,7 @@ class PackageModel extends BaseModel {
.where("is_delivered", isEqualTo: isDelivered); .where("is_delivered", isEqualTo: isDelivered);
pageQuery = pageQuery.orderBy("update_time", descending: true); pageQuery = pageQuery.orderBy("update_time", descending: true);
packages!.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery); packages.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
} catch (e) { } catch (e) {
log.warning("Error!! $e"); log.warning("Error!! $e");
} }
@@ -104,7 +105,7 @@ class PackageModel extends BaseModel {
.where("user_id", isEqualTo: user!.id) .where("user_id", isEqualTo: user!.id)
.orderBy("update_time", descending: true); .orderBy("update_time", descending: true);
customerPackages!.refresh( customerPackages.refresh(
listeningQuery: listenerQuery, pageQuery: pageQuery); listeningQuery: listenerQuery, pageQuery: pageQuery);
} catch (e) { } catch (e) {
log.warning("Error!! $e"); log.warning("Error!! $e");
@@ -113,8 +114,9 @@ class PackageModel extends BaseModel {
Future<void> _loadActivePackages() async { Future<void> _loadActivePackages() async {
if (user == null) return; if (user == null) return;
if (!((user!.hasPackages() || user!.hasReceiving() || user!.hasProcessing()))) if (!((user!.hasPackages() ||
return; user!.hasReceiving() ||
user!.hasProcessing()))) return;
String path = "/$packages_collection"; String path = "/$packages_collection";
try { try {
@@ -126,7 +128,7 @@ class PackageModel extends BaseModel {
.where("is_delivered", isEqualTo: false); .where("is_delivered", isEqualTo: false);
pageQuery = pageQuery.orderBy("update_time", descending: true); pageQuery = pageQuery.orderBy("update_time", descending: true);
activePackages!.refresh( activePackages.refresh(
listeningQuery: listenerQuery, pageQuery: pageQuery); listeningQuery: listenerQuery, pageQuery: pageQuery);
} catch (e) { } catch (e) {
log.warning("Error!! $e"); log.warning("Error!! $e");
@@ -161,7 +163,8 @@ class PackageModel extends BaseModel {
.get(const GetOptions(source: Source.server)); .get(const GetOptions(source: Source.server));
if (snaps.docs.length == 1) { if (snaps.docs.length == 1) {
var snap = snaps.docs[0]; var snap = snaps.docs[0];
var package = Package.fromMap(snap.data as Map<String, dynamic>, snap.id); var package =
Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
return package; return package;
} }
} catch (e) { } catch (e) {
@@ -184,7 +187,8 @@ class PackageModel extends BaseModel {
if (qsnap.docs.length > 0) { if (qsnap.docs.length > 0) {
var snap = qsnap.docs[0]; var snap = qsnap.docs[0];
if (snap.exists) { if (snap.exists) {
var package = Package.fromMap(snap.data as Map<String, dynamic>, snap.id); var package =
Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
return package; return package;
} }
} }
@@ -198,7 +202,8 @@ class PackageModel extends BaseModel {
if (qsnap.docs.length > 0) { if (qsnap.docs.length > 0) {
var snap = qsnap.docs[0]; var snap = qsnap.docs[0];
if (snap.exists) { if (snap.exists) {
var package = Package.fromMap(snap.data as Map<String, dynamic>, snap.id); var package =
Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
return package; return package;
} }
} }
@@ -218,8 +223,8 @@ class PackageModel extends BaseModel {
.where("is_deleted", isEqualTo: false) .where("is_deleted", isEqualTo: false)
.get(const GetOptions(source: Source.server)); .get(const GetOptions(source: Source.server));
packages = snaps.docs.map((documentSnapshot) { packages = snaps.docs.map((documentSnapshot) {
var p = var p = Package.fromMap(
Package.fromMap(documentSnapshot.data as Map<String, dynamic>, documentSnapshot.id); documentSnapshot.data as Map<String, dynamic>, documentSnapshot.id);
return p; return p;
}).toList(); }).toList();
} catch (e) { } catch (e) {

10
lib/pages/package/package_editor.dart
View File

@@ -38,8 +38,8 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
super.initState(); super.initState();
_package = widget.package!; _package = widget.package!;
selectedMarket = _package!.market; selectedMarket = _package!.market;
_descCtl.text = _package!.desc; _descCtl.text = _package!.desc!;
_remarkCtl.text = _package!.remark; _remarkCtl.text = _package!.remark!;
multiImgController.setImageUrls = _package!.photoUrls; multiImgController.setImageUrls = _package!.photoUrls;
} }
@@ -157,7 +157,7 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
String? selectedMarket; String? selectedMarket;
Widget marketDropdown() { Widget marketDropdown() {
List<Market> _markets = Provider.of<MarketModel>(context).markets; List<Market> _markets = Provider.of<MarketModel>(context).markets;
List<String> markets = _markets.map((e) => e.name).toList(); List<String?> markets = _markets.map((e) => e.name).toList();
markets.insert(0, MANAGE_MARKET); markets.insert(0, MANAGE_MARKET);
if (!markets.contains(selectedMarket)) { if (!markets.contains(selectedMarket)) {
markets.insert(0, selectedMarket!); markets.insert(0, selectedMarket!);
@@ -194,10 +194,10 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
}); });
}, },
isExpanded: true, isExpanded: true,
items: markets.map<DropdownMenuItem<String>>((String value) { items: markets.map<DropdownMenuItem<String>>((String? value) {
return DropdownMenuItem<String>( return DropdownMenuItem<String>(
value: value, value: value,
child: Text(value, child: Text(value ?? "",
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
color: value == MANAGE_MARKET color: value == MANAGE_MARKET

8
lib/pages/package/package_info.dart
View File

@@ -51,10 +51,10 @@ class _PackageInfoState extends State<PackageInfo> {
initPackage(Package pkg) async { initPackage(Package pkg) async {
PackageModel packageModel = PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false); Provider.of<PackageModel>(context, listen: false);
Package package = await packageModel.getPackageByTrackingID(pkg.trackingID); Package? package = await packageModel.getPackageByTrackingID(pkg.trackingID!);
setState(() { setState(() {
_package = package; _package = package;
multiImgController.setImageUrls = package.photoUrls; multiImgController.setImageUrls = package!.photoUrls;
}); });
} }
@@ -65,7 +65,7 @@ class _PackageInfoState extends State<PackageInfo> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
String id = Provider.of<MainModel>(context).user.id; String? id = Provider.of<MainModel>(context).user!.id;
bool owner = _package?.userID == id; bool owner = _package?.userID == id;
bool canChangeDeliveryAddress = bool canChangeDeliveryAddress =
_package?.status == package_received_status || _package?.status == package_received_status ||
@@ -199,7 +199,7 @@ class _PackageInfoState extends State<PackageInfo> {
try { try {
await packageModel.changeDeliveryAddress(_package!, deliveryAddress); await packageModel.changeDeliveryAddress(_package!, deliveryAddress);
var da = var da =
await deliveryAddressModel.getDeliveryAddress(deliveryAddress.id); await deliveryAddressModel.getDeliveryAddress(deliveryAddress.id!);
setState(() { setState(() {
_package!.deliveryAddress = da; _package!.deliveryAddress = da;
}); });

2
lib/pages/package/package_list.dart
View File

@@ -97,7 +97,7 @@ class _PackageListState extends State<PackageList> {
_searchCallback(Package package) async { _searchCallback(Package package) async {
var packageModel = Provider.of<PackageModel>(context, listen: false); var packageModel = Provider.of<PackageModel>(context, listen: false);
Package _package = await packageModel.getPackage(package.id); Package? _package = await packageModel.getPackage(package.id!);
if (_package == null) return; if (_package == null) return;
Navigator.push( Navigator.push(
context, context,

14
lib/pages/package/package_list_row.dart
View File

@@ -60,7 +60,9 @@ class PackageListRow extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 8.0), padding: const EdgeInsets.only(left: 8.0),
child: new Text( child: new Text(
package!.id == null ? '' : package!.trackingID, package!.id == null
? ''
: package!.trackingID!,
style: new TextStyle( style: new TextStyle(
fontSize: 15.0, color: Colors.black), fontSize: 15.0, color: Colors.black),
), ),
@@ -68,7 +70,9 @@ class PackageListRow extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 8.0), padding: const EdgeInsets.only(left: 8.0),
child: new Text( child: new Text(
package!.market == null ? '' : package!.market, package!.market == null
? ''
: package!.market!,
style: new TextStyle( style: new TextStyle(
fontSize: 15.0, color: Colors.black), fontSize: 15.0, color: Colors.black),
), ),
@@ -84,12 +88,14 @@ class PackageListRow extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: const EdgeInsets.all(3.0), padding: const EdgeInsets.all(3.0),
child: getStatus(package!.status), child: getStatus(package!.status??""),
), ),
Padding( Padding(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
child: new Text( child: new Text(
dateFormat.format(package!.currentStatusDate), package!.currentStatusDate != null
? dateFormat.format(package!.currentStatusDate!)
: '',
style: style:
new TextStyle(fontSize: 15.0, color: Colors.grey), new TextStyle(fontSize: 15.0, color: Colors.grey),
), ),

4
lib/pages/package/package_new.dart
View File

@@ -144,8 +144,8 @@ class _PackageNewState extends State<PackageNew> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text(packages[index].market), Text(packages[index].market!),
Text(packages[index].trackingID), Text(packages[index].trackingID!),
// DisplayText( // DisplayText(
// labelText: "Tracking ID", // labelText: "Tracking ID",
// text: packages[index].trackingID, // text: packages[index].trackingID,

8
lib/pages/package/tracking_id_page.dart
View File

@@ -87,7 +87,7 @@ class _TrackingIDPageState extends State<TrackingIDPage> {
String? selectedMarket; String? selectedMarket;
Widget dropDown() { Widget dropDown() {
List<Market> _markets = Provider.of<MarketModel>(context).markets; List<Market> _markets = Provider.of<MarketModel>(context).markets;
List<String> markets = _markets.map((e) => e.name).toList(); List<String?> markets = _markets.map((e) => e.name).toList();
markets.insert(0, MANAGE_MARKET); markets.insert(0, MANAGE_MARKET);
markets.insert(0, SELECT_MARKET); markets.insert(0, SELECT_MARKET);
@@ -126,10 +126,10 @@ class _TrackingIDPageState extends State<TrackingIDPage> {
}); });
}, },
isExpanded: true, isExpanded: true,
items: markets.map<DropdownMenuItem<String>>((String value) { items: markets.map<DropdownMenuItem<String>>((String? value) {
return DropdownMenuItem<String>( return DropdownMenuItem<String>(
value: value, value: value,
child: Text(value, child: Text(value ?? "",
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
color: value == MANAGE_MARKET color: value == MANAGE_MARKET
@@ -146,7 +146,7 @@ class _TrackingIDPageState extends State<TrackingIDPage> {
_manageMarket() { _manageMarket() {
Navigator.push<Package>( Navigator.push<Package>(
context, context,
CupertinoPageRoute(builder: (context) => MarketEditor()), CupertinoPageRoute(builder: (context) => MarketEditor()),
); );
} }

13
lib/pages/payment_methods/model/payment_method_model.dart
View File

@@ -12,21 +12,22 @@ class PaymentMethodModel extends BaseModel {
List<PaymentMethod> paymentMethods = []; List<PaymentMethod> paymentMethods = [];
PaymentMethod getPaymentMethod(String id) { PaymentMethod getPaymentMethod(String id) {
return paymentMethods.firstWhere((e) => e.id == id, orElse: () => null); return paymentMethods.firstWhere((e) => e.id == id);
} }
StreamSubscription<QuerySnapshot> listener; StreamSubscription<QuerySnapshot>? listener;
PaymentMethodModel() { PaymentMethodModel() {
if (listener != null) listener.cancel(); if (listener != null) listener!.cancel();
try { try {
listener = Firestore.instance listener = FirebaseFirestore.instance
.collection("/payment_methods") .collection("/payment_methods")
.snapshots() .snapshots()
.listen((snaps) { .listen((snaps) {
paymentMethods.clear(); paymentMethods.clear();
snaps.documents.forEach((d) { snaps.docs.forEach((d) {
paymentMethods.add(PaymentMethod.fromMap(d.data, d.documentID)); paymentMethods
.add(PaymentMethod.fromMap(d.data as Map<String, dynamic>, d.id));
}); });
notifyListeners(); notifyListeners();
}); });

14
lib/pages/payment_methods/payment_method_editor.dart
View File

@@ -38,12 +38,12 @@ class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
if (widget.paymentMethod != null) { if (widget.paymentMethod != null) {
_paymentMethod = widget.paymentMethod; _paymentMethod = widget.paymentMethod;
_nameController.text = _paymentMethod!.name; _nameController.text = _paymentMethod!.name!;
_accountNameController.text = _paymentMethod!.accountName; _accountNameController.text = _paymentMethod!.accountName!;
_accountNumberController.text = _paymentMethod!.account; _accountNumberController.text = _paymentMethod!.account!;
_mailController.text = _paymentMethod!.email; _mailController.text = _paymentMethod!.email!;
_phoneController.text = _paymentMethod!.phone; _phoneController.text = _paymentMethod!.phone!;
_linkController.text = _paymentMethod!.link; _linkController.text = _paymentMethod!.link!;
} else { } else {
_paymentMethod = new PaymentMethod(); _paymentMethod = new PaymentMethod();
_nameController.text = ''; _nameController.text = '';
@@ -208,7 +208,7 @@ class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
}); });
try { try {
await Provider.of<PaymentMethodModel>(context, listen: false) await Provider.of<PaymentMethodModel>(context, listen: false)
.deletePaymentMethod(_paymentMethod!.id); .deletePaymentMethod(_paymentMethod!.id!);
Navigator.pop(context); Navigator.pop(context);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());

12
lib/pages/payment_methods/payment_method_page.dart
View File

@@ -84,13 +84,13 @@ class _PaymentMethodPageState extends State<PaymentMethodPage> {
} }
_item(PaymentMethod method, bool isEditable) { _item(PaymentMethod method, bool isEditable) {
final accountName = _itemRow(method.accountName, "pm.account.name", final accountName = _itemRow(method.accountName!, "pm.account.name",
iconData: MaterialCommunityIcons.bank); iconData: MaterialCommunityIcons.bank);
final accountNumber = _itemRow(method.account, "pm.account.no", final accountNumber = _itemRow(method.account!, "pm.account.no",
iconData: MaterialCommunityIcons.checkbook); iconData: MaterialCommunityIcons.checkbook);
final phone = _itemRow(method.phone, "pm.phone", iconData: Icons.phone); final phone = _itemRow(method.phone!, "pm.phone", iconData: Icons.phone);
final email = _itemRow(method.email, "pm.email", iconData: Icons.mail); final email = _itemRow(method.email!, "pm.email", iconData: Icons.mail);
final link = _itemRow(method.link, "pm.link", iconData: Icons.link); final link = _itemRow(method.link!, "pm.link", iconData: Icons.link);
return InkWell( return InkWell(
onTap: isEditable onTap: isEditable
@@ -110,7 +110,7 @@ class _PaymentMethodPageState extends State<PaymentMethodPage> {
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Text( child: Text(
method.name, method.name!,
style: TextStyle( style: TextStyle(
color: primaryColor, color: primaryColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

8
lib/pages/processing/model/processing_model.dart
View File

@@ -11,7 +11,7 @@ class ProcessingModel extends BaseModel {
List<Processing> processings = []; List<Processing> processings = [];
final log = Logger('ProcessingModel'); final log = Logger('ProcessingModel');
StreamSubscription<QuerySnapshot> listener; StreamSubscription<QuerySnapshot>? listener;
void initUser(user) { void initUser(user) {
super.initUser(user); super.initUser(user);
@@ -19,12 +19,12 @@ class ProcessingModel extends BaseModel {
@override @override
logout() async { logout() async {
if (listener != null) await listener.cancel(); if (listener != null) await listener!.cancel();
processings = []; processings = [];
} }
Future<void> createProcessing(Processing processing) {} Future<void> createProcessing(Processing processing) async {}
Future<void> updateProcessing(Processing processing) {} Future<void> updateProcessing(Processing processing) async {}
} }

14
lib/pages/processing/package_editor.dart
View File

@@ -44,14 +44,14 @@ class _PackageEditorState extends State<PackageEditor> {
void initState() { void initState() {
super.initState(); super.initState();
_package = Package(); _package = Package();
_loadPackageData(widget.package!.id); _loadPackageData(widget.package!.id!);
} }
_loadPackageData(String id) async { _loadPackageData(String id) async {
if (id != null) { if (id != null) {
PackageModel packageModel = PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false); Provider.of<PackageModel>(context, listen: false);
Package package = await packageModel.getPackage(id); Package? package = await packageModel.getPackage(id);
if (package != null) { if (package != null) {
if (package.status != package_received_status) { if (package.status != package_received_status) {
showMsgDialog(context, "Error", showMsgDialog(context, "Error",
@@ -65,8 +65,8 @@ class _PackageEditorState extends State<PackageEditor> {
} }
setState(() { setState(() {
selectedMarket = _package!.market ?? ""; selectedMarket = _package!.market ?? "";
_descCtl.text = _package!.desc; _descCtl.text = _package!.desc!;
_remarkCtl.text = _package!.remark; _remarkCtl.text = _package!.remark!;
multiImgController.setImageUrls = _package!.photoUrls; multiImgController.setImageUrls = _package!.photoUrls;
}); });
} }
@@ -84,7 +84,7 @@ class _PackageEditorState extends State<PackageEditor> {
IconButton( IconButton(
icon: Icon(Icons.search, color: primaryColor), icon: Icon(Icons.search, color: primaryColor),
onPressed: () => searchPackage(context, callbackPackageSelect: (u) { onPressed: () => searchPackage(context, callbackPackageSelect: (u) {
_loadPackageData(u.id); _loadPackageData(u.id!);
Navigator.pop(context); Navigator.pop(context);
})), })),
], ],
@@ -177,7 +177,7 @@ class _PackageEditorState extends State<PackageEditor> {
String? selectedMarket; String? selectedMarket;
Widget marketDropdown() { Widget marketDropdown() {
List<Market> _markets = Provider.of<MarketModel>(context).markets; List<Market> _markets = Provider.of<MarketModel>(context).markets;
List<String> markets = _markets.map((e) => e.name).toList(); List<String?> markets = _markets.map((e) => e.name).toList();
markets.insert(0, MANAGE_MARKET); markets.insert(0, MANAGE_MARKET);
if (!markets.contains(selectedMarket)) { if (!markets.contains(selectedMarket)) {
markets.insert(0, selectedMarket!); markets.insert(0, selectedMarket!);
@@ -221,7 +221,7 @@ class _PackageEditorState extends State<PackageEditor> {
}); });
}, },
isExpanded: true, isExpanded: true,
items: markets.map<DropdownMenuItem<String>>((String value) { items: markets.map<DropdownMenuItem<String>>((String? value) {
return DropdownMenuItem<String>( return DropdownMenuItem<String>(
value: value, value: value,
child: Text(value ?? "", child: Text(value ?? "",

8
lib/pages/processing/processing_edit_editor.dart
View File

@@ -42,8 +42,8 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
super.initState(); super.initState();
_package = widget.package; _package = widget.package;
selectedMarket = _package!.market ?? ""; selectedMarket = _package!.market ?? "";
_descCtl.text = _package!.desc; _descCtl.text = _package!.desc!;
_remarkCtl.text = _package!.remark; _remarkCtl.text = _package!.remark!;
multiImgController.setImageUrls = _package!.photoUrls; multiImgController.setImageUrls = _package!.photoUrls;
_user = User( _user = User(
fcsID: _package!.fcsID ?? "", fcsID: _package!.fcsID ?? "",
@@ -162,7 +162,7 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
String? selectedMarket; String? selectedMarket;
Widget marketDropdown() { Widget marketDropdown() {
List<Market> _markets = Provider.of<MarketModel>(context).markets; List<Market> _markets = Provider.of<MarketModel>(context).markets;
List<String> markets = _markets.map((e) => e.name).toList(); List<String?> markets = _markets.map((e) => e.name).toList();
markets.insert(0, MANAGE_MARKET); markets.insert(0, MANAGE_MARKET);
if (!markets.contains(selectedMarket)) { if (!markets.contains(selectedMarket)) {
markets.insert(0, selectedMarket!); markets.insert(0, selectedMarket!);
@@ -208,7 +208,7 @@ class _ProcessingEditEditorState extends State<ProcessingEditEditor> {
}); });
}, },
isExpanded: true, isExpanded: true,
items: markets.map<DropdownMenuItem<String>>((String value) { items: markets.map<DropdownMenuItem<String>>((String? value) {
return DropdownMenuItem<String>( return DropdownMenuItem<String>(
value: value, value: value,
child: Text(value ?? "", child: Text(value ?? "",

6
lib/pages/processing/processing_info.dart
View File

@@ -175,7 +175,7 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
_package!.photoUrls.length == 0 ? Container() : img, _package!.photoUrls.length == 0 ? Container() : img,
StatusTree( StatusTree(
shipmentHistory: _package!.shipmentHistory, shipmentHistory: _package!.shipmentHistory,
currentStatus: _package!.status), currentStatus: _package!.status??""),
SizedBox( SizedBox(
height: 20, height: 20,
) )
@@ -222,8 +222,8 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
} else { } else {
PackageModel packageModel = PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false); Provider.of<PackageModel>(context, listen: false);
Package p = await packageModel.getPackage(_package!.id); Package? p = await packageModel.getPackage(_package!.id!);
initPackage(p); initPackage(p!);
} }
} }
} }

2
lib/pages/processing/processing_list.dart
View File

@@ -85,7 +85,7 @@ class _ProcessingListState extends State<ProcessingList> {
_searchCallback(Package package) async { _searchCallback(Package package) async {
var packageModel = Provider.of<PackageModel>(context, listen: false); var packageModel = Provider.of<PackageModel>(context, listen: false);
Package _package = await packageModel.getPackage(package.id); Package? _package = await packageModel.getPackage(package.id!);
if (_package == null) return; if (_package == null) return;
Navigator.push( Navigator.push(
context, context,

10
lib/pages/processing/processing_list_row.dart
View File

@@ -57,7 +57,7 @@ class ProcessingListRow extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 8.0), padding: const EdgeInsets.only(left: 8.0),
child: new Text( child: new Text(
package!.id == null ? '' : package!.trackingID, package!.id == null ? '' : package!.trackingID!,
style: new TextStyle( style: new TextStyle(
fontSize: 15.0, color: Colors.black), fontSize: 15.0, color: Colors.black),
), ),
@@ -65,7 +65,7 @@ class ProcessingListRow extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 8.0), padding: const EdgeInsets.only(left: 8.0),
child: new Text( child: new Text(
package!.market == null ? '' : package!.market, package!.market == null ? '' : package!.market!,
style: new TextStyle( style: new TextStyle(
fontSize: 15.0, color: Colors.black), fontSize: 15.0, color: Colors.black),
), ),
@@ -81,12 +81,14 @@ class ProcessingListRow extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: const EdgeInsets.all(3.0), padding: const EdgeInsets.all(3.0),
child: getStatus(package!.status), child: getStatus(package!.status??""),
), ),
Padding( Padding(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
child: new Text( child: new Text(
dateFormat.format(package!.currentStatusDate), package!.currentStatusDate != null
? dateFormat.format(package!.currentStatusDate!)
: '',
style: new TextStyle(fontSize: 15.0, color: Colors.grey), style: new TextStyle(fontSize: 15.0, color: Colors.grey),
), ),
), ),

40
lib/pages/processing_old/processing_editor.dart
View File

@@ -18,12 +18,12 @@ import 'package:fcs/pages/widgets/multi_img_file.dart';
import 'package:fcs/pages/widgets/progress.dart'; import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class ProcessingEditor extends StatefulWidget { class ProcessingEditor extends StatefulWidget {
final Package package; final Package? package;
ProcessingEditor({this.package}); ProcessingEditor({this.package});
@override @override
@@ -34,22 +34,22 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
TextEditingController _remarkCtl = new TextEditingController(); TextEditingController _remarkCtl = new TextEditingController();
TextEditingController _descCtl = new TextEditingController(); TextEditingController _descCtl = new TextEditingController();
Package _package; Package? _package;
User _user; User? _user;
bool _isLoading = false; bool _isLoading = false;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_package = widget.package; _package = widget.package;
selectedMarket = _package.market ?? ""; selectedMarket = _package!.market ?? "";
_descCtl.text = _package.desc; _descCtl.text = _package!.desc!;
_remarkCtl.text = _package.remark; _remarkCtl.text = _package!.remark!;
multiImgController.setImageUrls = _package.photoUrls; multiImgController.setImageUrls = _package!.photoUrls;
_user = User( _user = User(
fcsID: _package.fcsID ?? "", fcsID: _package!.fcsID ?? "",
name: _package.userName ?? "", name: _package!.userName ?? "",
phoneNumber: _package.phoneNumber ?? ""); phoneNumber: _package!.phoneNumber ?? "");
} }
final DateFormat dateFormat = DateFormat("d MMM yyyy"); final DateFormat dateFormat = DateFormat("d MMM yyyy");
@@ -63,7 +63,7 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: DisplayText( child: DisplayText(
text: _user.fcsID, text: _user!.fcsID??"",
labelTextKey: "processing.fcs.id", labelTextKey: "processing.fcs.id",
icon: FcsIDIcon(), icon: FcsIDIcon(),
)), )),
@@ -77,18 +77,18 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
], ],
); );
final namebox = DisplayText( final namebox = DisplayText(
text: _user.name, text: _user!.name??"",
labelTextKey: "processing.name", labelTextKey: "processing.name",
iconData: Icons.person, iconData: Icons.person,
); );
final phoneNumberBox = DisplayText( final phoneNumberBox = DisplayText(
text: _user.phoneNumber, text: _user!.phoneNumber??"",
labelTextKey: "processing.phone", labelTextKey: "processing.phone",
iconData: Icons.phone, iconData: Icons.phone,
); );
final trackingIdBox = DisplayText( final trackingIdBox = DisplayText(
text: _package.trackingID, text: _package!.trackingID??"",
labelTextKey: "processing.tracking.id", labelTextKey: "processing.tracking.id",
iconData: MaterialCommunityIcons.barcode_scan, iconData: MaterialCommunityIcons.barcode_scan,
); );
@@ -152,13 +152,13 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
); );
} }
String selectedMarket; String? selectedMarket;
Widget marketDropdown() { Widget marketDropdown() {
List<Market> _markets = Provider.of<MarketModel>(context).markets; List<Market> _markets = Provider.of<MarketModel>(context).markets;
List<String> markets = _markets.map((e) => e.name).toList(); List<String?> markets = _markets.map((e) => e.name).toList();
markets.insert(0, MANAGE_MARKET); markets.insert(0, MANAGE_MARKET);
if (!markets.contains(selectedMarket)) { if (!markets.contains(selectedMarket)) {
markets.insert(0, selectedMarket); markets.insert(0, selectedMarket!);
} }
return Padding( return Padding(
@@ -190,7 +190,7 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
height: 1, height: 1,
color: Colors.grey, color: Colors.grey,
), ),
onChanged: (String newValue) { onChanged: (String? newValue) {
setState(() { setState(() {
if (newValue == MANAGE_MARKET) { if (newValue == MANAGE_MARKET) {
selectedMarket = null; selectedMarket = null;
@@ -201,7 +201,7 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
}); });
}, },
isExpanded: true, isExpanded: true,
items: markets.map<DropdownMenuItem<String>>((String value) { items: markets.map<DropdownMenuItem<String>>((String? value) {
return DropdownMenuItem<String>( return DropdownMenuItem<String>(
value: value, value: value,
child: Text(value ?? "", child: Text(value ?? "",

39
lib/pages/processing_old/processing_info.dart
View File

@@ -12,7 +12,8 @@ import 'package:fcs/pages/widgets/progress.dart';
import 'package:fcs/pages/widgets/status_tree.dart'; import 'package:fcs/pages/widgets/status_tree.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -21,7 +22,7 @@ import 'processing_editor.dart';
final DateFormat dateFormat = DateFormat("d MMM yyyy"); final DateFormat dateFormat = DateFormat("d MMM yyyy");
class ProcessingInfo extends StatefulWidget { class ProcessingInfo extends StatefulWidget {
final Package package; final Package? package;
ProcessingInfo({this.package}); ProcessingInfo({this.package});
@override @override
@@ -30,14 +31,14 @@ class ProcessingInfo extends StatefulWidget {
class _ProcessingInfoState extends State<ProcessingInfo> { class _ProcessingInfoState extends State<ProcessingInfo> {
var dateFormatter = new DateFormat('dd MMM yyyy'); var dateFormatter = new DateFormat('dd MMM yyyy');
Package _package; Package? _package;
bool _isLoading = false; bool _isLoading = false;
MultiImgController multiImgController = MultiImgController(); MultiImgController multiImgController = MultiImgController();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
initPackage(widget.package); initPackage(widget.package!);
} }
initPackage(Package package) { initPackage(Package package) {
@@ -55,37 +56,37 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final trackingIdBox = DisplayText( final trackingIdBox = DisplayText(
text: _package.trackingID, text: _package!.trackingID ?? "",
labelTextKey: "processing.tracking.id", labelTextKey: "processing.tracking.id",
iconData: MaterialCommunityIcons.barcode_scan, iconData: MaterialCommunityIcons.barcode_scan,
); );
var fcsIDBox = DisplayText( var fcsIDBox = DisplayText(
text: _package.fcsID, text: _package!.fcsID??"",
labelTextKey: "processing.fcs.id", labelTextKey: "processing.fcs.id",
icon: FcsIDIcon(), icon: FcsIDIcon(),
); );
final phoneNumberBox = DisplayText( final phoneNumberBox = DisplayText(
text: _package.phoneNumber, text: _package!.phoneNumber??"",
labelTextKey: "processing.phone", labelTextKey: "processing.phone",
iconData: Icons.phone, iconData: Icons.phone,
); );
final customerNameBox = DisplayText( final customerNameBox = DisplayText(
text: _package.userName, text: _package!.userName??"",
labelTextKey: "processing.name", labelTextKey: "processing.name",
iconData: Icons.perm_identity, iconData: Icons.perm_identity,
); );
final marketBox = DisplayText( final marketBox = DisplayText(
text: _package.market ?? "-", text: _package!.market ?? "-",
labelTextKey: "processing.market", labelTextKey: "processing.market",
iconData: Icons.store, iconData: Icons.store,
); );
final descBox = DisplayText( final descBox = DisplayText(
text: _package.desc ?? "-", text: _package!.desc ?? "-",
labelTextKey: "processing.desc", labelTextKey: "processing.desc",
iconData: MaterialCommunityIcons.message_text_outline, iconData: MaterialCommunityIcons.message_text_outline,
); );
final remarkBox = DisplayText( final remarkBox = DisplayText(
text: _package.remark ?? "-", text: _package!.remark ?? "-",
labelTextKey: "processing.remark", labelTextKey: "processing.remark",
iconData: Entypo.new_message, iconData: Entypo.new_message,
); );
@@ -137,10 +138,10 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
marketBox, marketBox,
descBox, descBox,
remarkBox, remarkBox,
_package.photoUrls.length == 0 ? Container() : img, _package!.photoUrls.length == 0 ? Container() : img,
StatusTree( StatusTree(
shipmentHistory: _package.shipmentHistory, shipmentHistory: _package!.shipmentHistory,
currentStatus: _package.status), currentStatus: _package!.status??""),
SizedBox( SizedBox(
height: 20, height: 20,
) )
@@ -164,7 +165,7 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
PackageModel packageModel = PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false); Provider.of<PackageModel>(context, listen: false);
try { try {
await packageModel.deleteProcessing(_package); await packageModel.deleteProcessing(_package!);
Navigator.pop<bool>(context, true); Navigator.pop<bool>(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());
@@ -176,19 +177,19 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
} }
_gotoEditor() async { _gotoEditor() async {
bool deleted = await Navigator.push<bool>( bool? deleted = await Navigator.push<bool>(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => ProcessingEditor( builder: (context) => ProcessingEditor(
package: widget.package, package: widget.package!,
))); )));
if (deleted ?? false) { if (deleted ?? false) {
Navigator.pop(context); Navigator.pop(context);
} else { } else {
PackageModel packageModel = PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false); Provider.of<PackageModel>(context, listen: false);
Package p = await packageModel.getPackage(_package.id); Package? p = await packageModel.getPackage(_package!.id!);
initPackage(p); initPackage(p!);
} }
} }
} }

2
lib/pages/processing_old/processing_list.dart
View File

@@ -77,7 +77,7 @@ class _ProcessingListState extends State<ProcessingList> {
_searchCallback(Package package) async { _searchCallback(Package package) async {
var packageModel = Provider.of<PackageModel>(context, listen: false); var packageModel = Provider.of<PackageModel>(context, listen: false);
Package _package = await packageModel.getPackage(package.id); Package? _package = await packageModel.getPackage(package.id!);
if (_package == null) return; if (_package == null) return;
Navigator.push( Navigator.push(
context, context,

22
lib/pages/processing_old/processing_list_row.dart
View File

@@ -3,7 +3,7 @@ import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/util.dart'; import 'package:fcs/pages/main/util.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'processing_info.dart'; import 'processing_info.dart';
@@ -11,12 +11,12 @@ import 'processing_info.dart';
typedef CallbackPackageSelect(Package package); typedef CallbackPackageSelect(Package package);
class ProcessingListRow extends StatelessWidget { class ProcessingListRow extends StatelessWidget {
final Package package; final Package? package;
final CallbackPackageSelect callbackPackageSelect; final CallbackPackageSelect? callbackPackageSelect;
final double dotSize = 15.0; final double dotSize = 15.0;
final DateFormat dateFormat = new DateFormat("dd MMM yyyy"); final DateFormat dateFormat = new DateFormat("dd MMM yyyy");
ProcessingListRow({Key key, this.package, this.callbackPackageSelect}) ProcessingListRow({Key? key, this.package, this.callbackPackageSelect})
: super(key: key); : super(key: key);
@override @override
@@ -24,7 +24,7 @@ class ProcessingListRow extends StatelessWidget {
return InkWell( return InkWell(
onTap: () { onTap: () {
if (callbackPackageSelect != null) { if (callbackPackageSelect != null) {
callbackPackageSelect(package); callbackPackageSelect!(package!);
return; return;
} }
Navigator.push( Navigator.push(
@@ -45,7 +45,7 @@ class ProcessingListRow extends StatelessWidget {
Container( Container(
padding: EdgeInsets.only(left: 5, right: 10), padding: EdgeInsets.only(left: 5, right: 10),
child: Icon( child: Icon(
FontAwesome.dropbox, FontAwesomeIcons.dropbox,
color: primaryColor, color: primaryColor,
size: 30, size: 30,
), ),
@@ -57,7 +57,7 @@ class ProcessingListRow extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 8.0), padding: const EdgeInsets.only(left: 8.0),
child: new Text( child: new Text(
package.id == null ? '' : package.trackingID, package!.id == null ? '' : package!.trackingID!,
style: new TextStyle( style: new TextStyle(
fontSize: 15.0, color: Colors.black), fontSize: 15.0, color: Colors.black),
), ),
@@ -65,7 +65,7 @@ class ProcessingListRow extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 8.0), padding: const EdgeInsets.only(left: 8.0),
child: new Text( child: new Text(
package.market == null ? '' : package.market, package!.market == null ? '' : package!.market!,
style: new TextStyle( style: new TextStyle(
fontSize: 15.0, color: Colors.black), fontSize: 15.0, color: Colors.black),
), ),
@@ -81,12 +81,14 @@ class ProcessingListRow extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: const EdgeInsets.all(3.0), padding: const EdgeInsets.all(3.0),
child: getStatus(package.status), child: getStatus(package!.status ?? ""),
), ),
Padding( Padding(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
child: new Text( child: new Text(
dateFormat.format(package.currentStatusDate), package!.currentStatusDate != null
? dateFormat.format(package!.currentStatusDate!)
: '',
style: new TextStyle(fontSize: 15.0, color: Colors.grey), style: new TextStyle(fontSize: 15.0, color: Colors.grey),
), ),
), ),

6
lib/pages/profile/profile_currency_edit.dart
View File

@@ -24,7 +24,7 @@ class _ProfileCurrencyEditState extends State<ProfileCurrencyEdit> {
void initState() { void initState() {
super.initState(); super.initState();
MainModel mainModel = Provider.of<MainModel>(context, listen: false); MainModel mainModel = Provider.of<MainModel>(context, listen: false);
if (mainModel.user.preferCurrency == "MMK") { if (mainModel.user!.preferCurrency == "MMK") {
_currency = Currency.MMK; _currency = Currency.MMK;
} else { } else {
_currency = Currency.USD; _currency = Currency.USD;
@@ -77,7 +77,7 @@ class _ProfileCurrencyEditState extends State<ProfileCurrencyEdit> {
onChanged: (Currency? value) { onChanged: (Currency? value) {
if(value != null) if(value != null)
setState(() { setState(() {
_currency = value!; _currency = value;
}); });
}, },
), ),
@@ -96,7 +96,7 @@ class _ProfileCurrencyEditState extends State<ProfileCurrencyEdit> {
onChanged: (Currency? value) { onChanged: (Currency? value) {
if(value != null) if(value != null)
setState(() { setState(() {
_currency = value!; _currency = value;
}); });
}, },
), ),

2
lib/pages/profile/profile_edit.dart
View File

@@ -24,7 +24,7 @@ class _ProfileEditState extends State<ProfileEdit> {
void initState() { void initState() {
super.initState(); super.initState();
MainModel mainModel = Provider.of<MainModel>(context, listen: false); MainModel mainModel = Provider.of<MainModel>(context, listen: false);
nameController.text = mainModel.user.name; nameController.text = mainModel.user!.name ?? "";
} }
@override @override

28
lib/pages/profile/profile_page.dart
View File

@@ -18,6 +18,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import '../../helpers/theme.dart'; import '../../helpers/theme.dart';
@@ -31,7 +32,7 @@ class Profile extends StatefulWidget {
class _ProfileState extends State<Profile> { class _ProfileState extends State<Profile> {
GlobalKey key = GlobalKey(); GlobalKey key = GlobalKey();
bool _isLoading = false; bool _isLoading = false;
String? selectedLanguage ; String? selectedLanguage;
TextEditingController bizNameController = new TextEditingController(); TextEditingController bizNameController = new TextEditingController();
static final List<String> languagesList = Translation().supportedLanguages; static final List<String> languagesList = Translation().supportedLanguages;
@@ -67,18 +68,19 @@ class _ProfileState extends State<Profile> {
Provider.of<DeliveryAddressModel>(context); Provider.of<DeliveryAddressModel>(context);
final namebox = DisplayText( final namebox = DisplayText(
text: mainModel.user.name + " (${mainModel.user.status})", text: "${mainModel.user!.name ?? ''}" +
" (${mainModel.user!.status ?? ''})",
labelTextKey: "profile.name", labelTextKey: "profile.name",
iconData: Icons.person, iconData: Icons.person,
); );
final currencyBox = DisplayText( final currencyBox = DisplayText(
text: mainModel.user.preferCurrency, text: mainModel.user!.preferCurrency ?? "",
labelTextKey: "profile.currency", labelTextKey: "profile.currency",
iconData: FontAwesome5.money_bill_alt, iconData: FontAwesome5Regular.money_bill_alt,
); );
final phonenumberbox = DisplayText( final phonenumberbox = DisplayText(
text: mainModel.user.phone, text: mainModel.user!.phone ?? "",
labelTextKey: "profile.phone", labelTextKey: "profile.phone",
iconData: Icons.phone, iconData: Icons.phone,
); );
@@ -86,15 +88,15 @@ class _ProfileState extends State<Profile> {
children: [ children: [
Expanded( Expanded(
child: DisplayText( child: DisplayText(
text: mainModel.user.fcsID, text: mainModel.user!.fcsID ?? "",
labelTextKey: "customer.fcs.id", labelTextKey: "customer.fcs.id",
icon: FcsIDIcon(), icon: FcsIDIcon(),
), ),
), ),
IconButton( IconButton(
icon: Icon(Icons.content_copy, color: Colors.grey), icon: Icon(Icons.content_copy, color: Colors.grey),
onPressed: () => _copy( onPressed: () => _copy(getLocalString(context, "customer.fcs.id"),
getLocalString(context, "customer.fcs.id"), mainModel.user.fcsID), mainModel.user!.fcsID ?? ""),
) )
], ],
); );
@@ -103,7 +105,7 @@ class _ProfileState extends State<Profile> {
children: [ children: [
Expanded( Expanded(
child: DisplayText( child: DisplayText(
text: mainModel.setting.usaAddress, text: mainModel.setting!.usaAddress ?? "",
labelTextKey: "profile.usa.shipping.address", labelTextKey: "profile.usa.shipping.address",
iconData: Icons.location_on, iconData: Icons.location_on,
), ),
@@ -112,7 +114,7 @@ class _ProfileState extends State<Profile> {
icon: Icon(Icons.content_copy, color: Colors.grey), icon: Icon(Icons.content_copy, color: Colors.grey),
onPressed: () => _copy( onPressed: () => _copy(
getLocalString(context, "profile.usa.shipping.address"), getLocalString(context, "profile.usa.shipping.address"),
mainModel.setting.usaAddress), mainModel.setting!.usaAddress ?? ""),
) )
], ],
); );
@@ -195,14 +197,14 @@ class _ProfileState extends State<Profile> {
} }
Widget getPrivilegeBox(BuildContext context) { Widget getPrivilegeBox(BuildContext context) {
User user = Provider.of<MainModel>(context, listen: false).user; User? user = Provider.of<MainModel>(context, listen: false).user;
List<Privilege> _privileges = List<Privilege> _privileges =
Provider.of<StaffModel>(context, listen: false).privileges; Provider.of<StaffModel>(context, listen: false).privileges;
if (user == null || user.isCustomer()) return Container(); if (user == null || user.isCustomer()) return Container();
List<Privilege> privileges = []; List<Privilege> privileges = [];
user.privileges.forEach((e) { user.privileges.forEach((e) {
var p = _privileges.firstWhere((p) => p.id == e, orElse: () => null); var p = _privileges.firstWhere((p) => p.id == e);
if (p != null) { if (p != null) {
privileges.add(p); privileges.add(p);
} }
@@ -270,7 +272,7 @@ class _ProfileState extends State<Profile> {
} }
_showToast(String title) { _showToast(String title) {
final ScaffoldState scaffold = key.currentState; final ScaffoldState scaffold = key.currentState as ScaffoldState;
scaffold.showSnackBar( scaffold.showSnackBar(
SnackBar( SnackBar(
content: Text('copied "$title" data to clipboard'), content: Text('copied "$title" data to clipboard'),

4
lib/pages/receiving/receiving_editor.dart
View File

@@ -42,8 +42,8 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
_isNew = widget.package == null; _isNew = widget.package == null;
if (!_isNew) { if (!_isNew) {
package = widget.package!; package = widget.package!;
_trackingIDCtl.text = package.trackingID; _trackingIDCtl.text = package.trackingID!;
_remarkCtl.text = package.remark; _remarkCtl.text = package.remark!;
_multiImgController.setImageUrls = package.photoUrls; _multiImgController.setImageUrls = package.photoUrls;
user = User( user = User(
fcsID: package.fcsID, fcsID: package.fcsID,

4
lib/pages/receiving/receiving_info.dart
View File

@@ -149,8 +149,8 @@ class _ReceivingInfoState extends State<ReceivingInfo> {
); );
PackageModel packageModel = PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false); Provider.of<PackageModel>(context, listen: false);
var pkg = await packageModel.getPackage(widget.package!.id); var pkg = await packageModel.getPackage(widget.package!.id!);
initPackage(pkg); initPackage(pkg!);
} }
_delete() { _delete() {

2
lib/pages/receiving/receiving_list.dart
View File

@@ -94,7 +94,7 @@ class _ReceivingListState extends State<ReceivingList> {
_searchCallback(Package package) async { _searchCallback(Package package) async {
var packageModel = Provider.of<PackageModel>(context, listen: false); var packageModel = Provider.of<PackageModel>(context, listen: false);
Package _package = await packageModel.getPackage(package.id); Package? _package = await packageModel.getPackage(package.id!);
if (_package == null) return; if (_package == null) return;
Navigator.push( Navigator.push(
context, context,

10
lib/pages/receiving/receiving_list_row.dart
View File

@@ -55,7 +55,7 @@ class ReceivingListRow extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 8.0), padding: const EdgeInsets.only(left: 8.0),
child: new Text( child: new Text(
package!.id == null ? '' : package!.trackingID, package!.id == null ? '' : package!.trackingID!,
style: new TextStyle( style: new TextStyle(
fontSize: 15.0, color: Colors.black), fontSize: 15.0, color: Colors.black),
), ),
@@ -63,7 +63,7 @@ class ReceivingListRow extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 8.0), padding: const EdgeInsets.only(left: 8.0),
child: new Text( child: new Text(
package!.market == null ? '' : package!.market, package!.market == null ? '' : package!.market!,
style: new TextStyle( style: new TextStyle(
fontSize: 15.0, color: Colors.black), fontSize: 15.0, color: Colors.black),
), ),
@@ -79,12 +79,14 @@ class ReceivingListRow extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: const EdgeInsets.all(3.0), padding: const EdgeInsets.all(3.0),
child: getStatus(package!.status), child: getStatus(package!.status??""),
), ),
Padding( Padding(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
child: new Text( child: new Text(
dateFormat.format(package!.currentStatusDate), package!.currentStatusDate != null
? dateFormat.format(package!.currentStatusDate!)
: '',
style: new TextStyle(fontSize: 15.0, color: Colors.grey), style: new TextStyle(fontSize: 15.0, color: Colors.grey),
), ),
), ),

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

@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
class BoxRow extends StatelessWidget { class BoxRow extends StatelessWidget {
final Carton box; final Carton box;
const BoxRow({Key key, this.box}) : super(key: key); const BoxRow({Key? key, required this.box}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

60
lib/pages/shipment/model/shipment_model.dart
View File

@@ -11,7 +11,7 @@ import 'package:logging/logging.dart';
class ShipmentModel extends BaseModel { class ShipmentModel extends BaseModel {
final log = Logger('ShipmentModel'); final log = Logger('ShipmentModel');
StreamSubscription<QuerySnapshot> listener; StreamSubscription<QuerySnapshot>? listener;
List<Shipment> get shipments => _menuSelectedIndex == 1 List<Shipment> get shipments => _menuSelectedIndex == 1
? _shipments ? _shipments
@@ -19,7 +19,7 @@ class ShipmentModel extends BaseModel {
List<Shipment> _shipments = []; List<Shipment> _shipments = [];
Paginator _delivered; late Paginator _delivered;
bool isLoading = false; bool isLoading = false;
int _menuSelectedIndex = 1; int _menuSelectedIndex = 1;
@@ -28,7 +28,7 @@ class ShipmentModel extends BaseModel {
notifyListeners(); notifyListeners();
} }
get menuSelectedIndex => _menuSelectedIndex; int get menuSelectedIndex => _menuSelectedIndex;
initData(bool forCustomer, {bool myPickup = false}) { initData(bool forCustomer, {bool myPickup = false}) {
logout(); logout();
@@ -43,11 +43,11 @@ class ShipmentModel extends BaseModel {
@override @override
logout() async { logout() async {
if (_delivered != null) _delivered.close(); if (_delivered != null) _delivered.close();
if (listener != null) await listener.cancel(); if (listener != null) await listener!.cancel();
_shipments = []; _shipments = [];
} }
Future<void> loadMore({bool isCustomer}) async { Future<void> loadMore({bool? isCustomer}) async {
if (menuSelectedIndex == 1) if (menuSelectedIndex == 1)
return; // when delivered menu is not selected return return; // when delivered menu is not selected return
if (_delivered.ended) return; if (_delivered.ended) return;
@@ -59,7 +59,7 @@ class ShipmentModel extends BaseModel {
}); });
} }
Future<void> refresh({bool isCustomer}) async { Future<void> refresh({bool? isCustomer}) async {
if (menuSelectedIndex == 1) if (menuSelectedIndex == 1)
return; // when delivered menu is not selected return return; // when delivered menu is not selected return
await _delivered.refresh(onFinished: () { await _delivered.refresh(onFinished: () {
@@ -70,16 +70,16 @@ class ShipmentModel extends BaseModel {
Paginator _getDelivered(bool isCustomer) { Paginator _getDelivered(bool isCustomer) {
if (!isCustomer) { if (!isCustomer) {
if (user == null || if (user == null ||
!((user.hasPackages() || !((user!.hasPackages() ||
user.hasReceiving() || user!.hasReceiving() ||
user.hasProcessing()))) throw "No privilege"; user!.hasProcessing()))) throw "No privilege";
} }
var pageQuery = Firestore.instance var pageQuery = FirebaseFirestore.instance
.collection("/$shipments_collection") .collection("/$shipments_collection")
.where("is_delivered", isEqualTo: true) .where("is_delivered", isEqualTo: true)
.where("is_deleted", isEqualTo: false); .where("is_deleted", isEqualTo: false);
if (isCustomer) { if (isCustomer) {
pageQuery = pageQuery.where("user_id", isEqualTo: user.id); pageQuery = pageQuery.where("user_id", isEqualTo: user!.id);
} }
pageQuery = pageQuery.orderBy("status_date", descending: true); pageQuery = pageQuery.orderBy("status_date", descending: true);
var paginator = new Paginator(pageQuery, rowPerLoad: 20, toObj: (data, id) { var paginator = new Paginator(pageQuery, rowPerLoad: 20, toObj: (data, id) {
@@ -90,30 +90,31 @@ class ShipmentModel extends BaseModel {
Future<void> _loadShipments(bool forCustomer, bool myPickup) async { Future<void> _loadShipments(bool forCustomer, bool myPickup) async {
if (user == null) return; if (user == null) return;
if (!forCustomer && !user.hasShipment()) return; if (!forCustomer && !user!.hasShipment()) return;
if (listener != null) listener.cancel(); if (listener != null) listener!.cancel();
_shipments = []; _shipments = [];
try { try {
var q = Firestore.instance var q = FirebaseFirestore.instance
.collection("$shipments_collection") .collection("$shipments_collection")
.where("is_delivered", isEqualTo: false) .where("is_delivered", isEqualTo: false)
.where("is_canceled", isEqualTo: false) .where("is_canceled", isEqualTo: false)
.where("is_deleted", isEqualTo: false); .where("is_deleted", isEqualTo: false);
if (forCustomer) { if (forCustomer) {
q = q.where("user_id", isEqualTo: user.id); q = q.where("user_id", isEqualTo: user!.id);
} }
if (myPickup) { if (myPickup) {
q = q.where("pickup_user_id", isEqualTo: user.id); q = q.where("pickup_user_id", isEqualTo: user!.id);
} }
q = q.orderBy("created_at", descending: true); q = q.orderBy("created_at", descending: true);
listener = q.snapshots().listen((QuerySnapshot snapshot) { listener = q.snapshots().listen((QuerySnapshot snapshot) {
_shipments.clear(); _shipments.clear();
_shipments = snapshot.documents.map((documentSnapshot) { _shipments = snapshot.docs.map((documentSnapshot) {
var s = Shipment.fromMap( var s = Shipment.fromMap(
documentSnapshot.data, documentSnapshot.documentID); documentSnapshot.data as Map<String, dynamic>,
documentSnapshot.id);
return s; return s;
}).toList(); }).toList();
notifyListeners(); notifyListeners();
@@ -130,18 +131,17 @@ class ShipmentModel extends BaseModel {
shipment_courier_dropoff shipment_courier_dropoff
]; ];
Shipment getActiveShipment(String shipmentID) { Shipment? getActiveShipment(String shipmentID) {
return _shipments?.firstWhere((e) => e.id == shipmentID, return _shipments.firstWhere((e) => e.id == shipmentID);
orElse: () => null);
} }
Future<Shipment> getShipment(String shipmentID) async { Future<Shipment?> getShipment(String shipmentID) async {
String path = "/$shipments_collection"; String path = "/$shipments_collection";
try { try {
var ref = Firestore.instance.collection("$path").document(shipmentID); var ref = FirebaseFirestore.instance.collection("$path").doc(shipmentID);
var snap = await ref.get(source: Source.server); var snap = await ref.get(const GetOptions(source: Source.server));
if (snap.exists) { if (snap.exists) {
var s = Shipment.fromMap(snap.data, snap.documentID); var s = Shipment.fromMap(snap.data as Map<String, dynamic>, snap.id);
return s; return s;
} }
} catch (e) { } catch (e) {
@@ -150,20 +150,20 @@ class ShipmentModel extends BaseModel {
return null; return null;
} }
Future<List<Shipment>> getShipmentWithHandlingFee( Future<List<Shipment?>?> getShipmentWithHandlingFee(
String fcsShipmentID, String userID) async { String fcsShipmentID, String userID) async {
String path = "/$shipments_collection"; String path = "/$shipments_collection";
try { try {
var q = Firestore.instance var q = FirebaseFirestore.instance
.collection("$path") .collection("$path")
.where("user_id", isEqualTo: userID) .where("user_id", isEqualTo: userID)
.where("is_deleted", isEqualTo: false) .where("is_deleted", isEqualTo: false)
.where("handling_fee", isGreaterThan: 0) .where("handling_fee", isGreaterThan: 0)
.where("fcs_shipment_id", isEqualTo: fcsShipmentID); .where("fcs_shipment_id", isEqualTo: fcsShipmentID);
var snaps = await q.getDocuments(source: Source.server); var snaps = await q.get(const GetOptions(source: Source.server));
List<Shipment> shipments = snaps.documents.map((snap) { List<Shipment?> shipments = snaps.docs.map((snap) {
if (snap.exists) { if (snap.exists) {
var s = Shipment.fromMap(snap.data, snap.documentID); var s = Shipment.fromMap(snap.data as Map<String, dynamic>, snap.id);
return s; return s;
} }
}).toList(); }).toList();

35
lib/pages/shipment/shipment_assign.dart
View File

@@ -14,14 +14,14 @@ import 'package:fcs/pages/widgets/local_title.dart';
import 'package:fcs/pages/widgets/progress.dart'; import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'widgets.dart'; import 'widgets.dart';
class ShipmentAssign extends StatefulWidget { class ShipmentAssign extends StatefulWidget {
final Shipment shipment; final Shipment? shipment;
ShipmentAssign({this.shipment}); ShipmentAssign({this.shipment});
@override @override
@@ -38,13 +38,13 @@ class _ShipmentAssignState extends State<ShipmentAssign> {
TextEditingController _pickupDate = new TextEditingController(); TextEditingController _pickupDate = new TextEditingController();
TextEditingController _handlingFee = new TextEditingController(); TextEditingController _handlingFee = new TextEditingController();
Shipment _shipment; Shipment? _shipment;
bool _isLoading = false; bool _isLoading = false;
var now = new DateTime.now(); var now = new DateTime.now();
String _selectedShipmentType; String? _selectedShipmentType;
User _user; User? _user;
List<User> _users; List<User>? _users;
@override @override
void initState() { void initState() {
@@ -53,18 +53,19 @@ class _ShipmentAssignState extends State<ShipmentAssign> {
_shipment = widget.shipment; _shipment = widget.shipment;
_loadUsers(); _loadUsers();
_selectedShipmentType = _shipment.shipmentType; _selectedShipmentType = _shipment!.shipmentType;
_fromTimeEditingController.text = _shipment.pickupTimeStart; _fromTimeEditingController.text = _shipment!.pickupTimeStart!;
_toTimeEditingController.text = _shipment.pickupTimeEnd; _toTimeEditingController.text = _shipment!.pickupTimeEnd!;
_pickupDate.text = dateFormatter.format(_shipment.pickupDate ?? now); _pickupDate.text = dateFormatter.format(_shipment!.pickupDate! ?? now);
_handlingFee.text = _shipment.handlingFee?.toString() ?? "0"; _handlingFee.text = _shipment!.handlingFee != null
? _shipment!.handlingFee.toString()
: "0";
} }
_loadUsers() async { _loadUsers() async {
StaffModel staffModel = Provider.of<StaffModel>(context, listen: false); StaffModel staffModel = Provider.of<StaffModel>(context, listen: false);
var users = await staffModel.getPickupEmployees(); var users = await staffModel.getPickupEmployees();
var selectUser = users.firstWhere((e) => e.id == _shipment.pickupUserID, var selectUser = users.firstWhere((e) => e.id == _shipment!.pickupUserID);
orElse: () => null);
setState(() { setState(() {
_users = users; _users = users;
_user = selectUser; _user = selectUser;
@@ -74,7 +75,7 @@ class _ShipmentAssignState extends State<ShipmentAssign> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ShipmentModel pickupModel = Provider.of<ShipmentModel>(context); ShipmentModel pickupModel = Provider.of<ShipmentModel>(context);
final shipmentNumberBox = getShipmentNumberStatus(context, _shipment); final shipmentNumberBox = getShipmentNumberStatus(context, _shipment!);
bool isLocalPickup = _selectedShipmentType == shipment_local_pickup; bool isLocalPickup = _selectedShipmentType == shipment_local_pickup;
bool isCourierPickup = _selectedShipmentType == shipment_courier_pickup; bool isCourierPickup = _selectedShipmentType == shipment_courier_pickup;
bool isLocalDropoff = _selectedShipmentType == shipment_local_dropoff; bool isLocalDropoff = _selectedShipmentType == shipment_local_dropoff;
@@ -146,15 +147,15 @@ class _ShipmentAssignState extends State<ShipmentAssign> {
} }
_save() async { _save() async {
_shipment.pickupUserID = this._user.id; _shipment!.pickupUserID = this._user!.id;
_shipment.handlingFee = double.tryParse(_handlingFee.text) ?? 0; _shipment!.handlingFee = double.tryParse(_handlingFee.text) ?? 0;
setState(() { setState(() {
_isLoading = true; _isLoading = true;
}); });
try { try {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
await shipmentModel.assignShipment(_shipment); await shipmentModel.assignShipment(_shipment!);
Navigator.pop(context, true); Navigator.pop(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());

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

@@ -17,11 +17,12 @@ import 'package:fcs/pages/widgets/my_data_table.dart';
import 'package:fcs/pages/widgets/progress.dart'; import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class ShipmentBoxEditor extends StatefulWidget { class ShipmentBoxEditor extends StatefulWidget {
final Carton box; final Carton? box;
ShipmentBoxEditor({this.box}); ShipmentBoxEditor({this.box});
@override @override
@@ -33,9 +34,9 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
TextEditingController _widthCtl = new TextEditingController(); TextEditingController _widthCtl = new TextEditingController();
TextEditingController _heightCtl = new TextEditingController(); TextEditingController _heightCtl = new TextEditingController();
Carton _box; Carton? _box;
bool _isLoading = false; bool _isLoading = false;
bool _isNew; late bool _isNew;
double volumetricRatio = 0; double volumetricRatio = 0;
double shipmentWeight = 0; double shipmentWeight = 0;
@@ -50,16 +51,16 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
if (widget.box != null) { if (widget.box != null) {
_box = widget.box; _box = widget.box;
_isNew = false; _isNew = false;
_lengthCtl.text = _box.length.toString(); _lengthCtl.text = _box!.length != null ? _box!.length.toString() : '';
_widthCtl.text = _box.width.toString(); _widthCtl.text = _box!.width != null ? _box!.width.toString() : '';
_heightCtl.text = _box.height.toString(); _heightCtl.text = _box!.height != null ? _box!.height.toString() : '';
} else { } else {
var shipmentModel = var shipmentModel =
Provider.of<DeliveryAddressModel>(context, listen: false); Provider.of<DeliveryAddressModel>(context, listen: false);
_isNew = true; _isNew = true;
_box = Carton(cargoTypes: []); _box = Carton(cargoTypes: []);
_box.deliveryAddress = shipmentModel.defalutAddress; _box!.deliveryAddress = shipmentModel.defalutAddress;
_lengthCtl.text = "12"; _lengthCtl.text = "12";
_widthCtl.text = "12"; _widthCtl.text = "12";
@@ -151,10 +152,11 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
color: primaryColor, color: primaryColor,
), ),
onPressed: () async { onPressed: () async {
CargoType cargo = await Navigator.push<CargoType>( CargoType? cargo = await Navigator.push<CargoType>(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => CargoTypeEditor())); builder: (context) => CargoTypeEditor()));
if (cargo == null) return;
_addCargo(cargo); _addCargo(cargo);
}), }),
), ),
@@ -186,19 +188,19 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
shipmentWeightBox, shipmentWeightBox,
LocalTitle(textKey: "shipment.box.delivery"), LocalTitle(textKey: "shipment.box.delivery"),
DefaultDeliveryAddress( DefaultDeliveryAddress(
deliveryAddress: _box.deliveryAddress, deliveryAddress: _box!.deliveryAddress,
labelKey: "shipment.box.delivery", labelKey: "shipment.box.delivery",
onTap: () async { onTap: () async {
DeliveryAddress d = await Navigator.push<DeliveryAddress>( DeliveryAddress? d = await Navigator.push<DeliveryAddress>(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => DeliveryAddressSelection( builder: (context) => DeliveryAddressSelection(
deliveryAddress: _box.deliveryAddress, deliveryAddress: _box!.deliveryAddress,
user: mainModel.user)), user: mainModel.user)),
); );
if (d == null) return; if (d == null) return;
setState(() { setState(() {
_box.deliveryAddress = d; _box!.deliveryAddress = d;
}); });
}), }),
createBtn createBtn
@@ -210,25 +212,26 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
} }
List<MyDataRow> getCargoRows(BuildContext context) { List<MyDataRow> getCargoRows(BuildContext context) {
if (_box.cargoTypes == null) { if (_box!.cargoTypes == null) {
return []; return [];
} }
double total = 0; double total = 0;
var rows = _box.cargoTypes.map((c) { var rows = _box!.cargoTypes.map((c) {
total += c.weight; total += c.weight;
return MyDataRow( return MyDataRow(
onSelectChanged: (bool selected) async { onSelectChanged: (bool selected) async {
CargoType cargo = await Navigator.push<CargoType>( CargoType? cargo = await Navigator.push<CargoType>(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => CargoTypeEditor( builder: (context) => CargoTypeEditor(
cargo: c, cargo: c,
))); )));
if (cargo == null) return;
_addCargo(cargo); _addCargo(cargo);
}, },
cells: [ cells: [
MyDataCell(new Text( MyDataCell(new Text(
c.name == null ? "" : c.name, c.name == null ? "" : c.name!,
style: textStyle, style: textStyle,
)), )),
MyDataCell( MyDataCell(
@@ -281,14 +284,14 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
_addCargo(CargoType cargo) { _addCargo(CargoType cargo) {
if (cargo == null) return; if (cargo == null) return;
setState(() { setState(() {
_box.cargoTypes.remove(cargo); _box!.cargoTypes.remove(cargo);
_box.cargoTypes.add(cargo); _box!.cargoTypes.add(cargo);
}); });
} }
_removeCargo(CargoType cargo) { _removeCargo(CargoType cargo) {
setState(() { setState(() {
_box.cargoTypes.remove(cargo); _box!.cargoTypes.remove(cargo);
}); });
} }
@@ -296,9 +299,9 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
double l = double.parse(_lengthCtl.text, (s) => 0); double l = double.parse(_lengthCtl.text, (s) => 0);
double w = double.parse(_widthCtl.text, (s) => 0); double w = double.parse(_widthCtl.text, (s) => 0);
double h = double.parse(_heightCtl.text, (s) => 0); double h = double.parse(_heightCtl.text, (s) => 0);
_box.length = l; _box!.length = l;
_box.width = w; _box!.width = w;
_box.height = h; _box!.height = h;
Navigator.pop(context, _box); Navigator.pop(context, _box);
} }
} }

17
lib/pages/shipment/shipment_confirm.dart
View File

@@ -8,14 +8,15 @@ import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/progress.dart'; import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'widgets.dart'; import 'widgets.dart';
class ShipmentConfirm extends StatefulWidget { class ShipmentConfirm extends StatefulWidget {
final Shipment shipment; final Shipment? shipment;
ShipmentConfirm({this.shipment}); ShipmentConfirm({this.shipment});
@override @override
@@ -27,7 +28,7 @@ class _ShipmentConfirmState extends State<ShipmentConfirm> {
var timeFormatter = new DateFormat('jm'); var timeFormatter = new DateFormat('jm');
TextEditingController _handlingFee = new TextEditingController(); TextEditingController _handlingFee = new TextEditingController();
Shipment _shipment; Shipment? _shipment;
bool _isLoading = false; bool _isLoading = false;
var now = new DateTime.now(); var now = new DateTime.now();
@@ -36,17 +37,17 @@ class _ShipmentConfirmState extends State<ShipmentConfirm> {
super.initState(); super.initState();
_shipment = widget.shipment; _shipment = widget.shipment;
_handlingFee.text = _shipment.handlingFee?.toString() ?? "0"; _handlingFee.text = _shipment!.handlingFee?.toString() ?? "0";
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final shipmentNumberBox = getShipmentNumberStatus(context, _shipment); final shipmentNumberBox = getShipmentNumberStatus(context, _shipment!);
final handlingFeeBox = InputText( final handlingFeeBox = InputText(
labelTextKey: "shipment.handling.fee", labelTextKey: "shipment.handling.fee",
controller: _handlingFee, controller: _handlingFee,
iconData: FontAwesome.truck, iconData: FontAwesomeIcons.truck,
); );
final confirmbtn = LocalButton( final confirmbtn = LocalButton(
textKey: "shipment.confirm.btn", textKey: "shipment.confirm.btn",
@@ -94,14 +95,14 @@ class _ShipmentConfirmState extends State<ShipmentConfirm> {
} }
_save() async { _save() async {
_shipment.handlingFee = double.tryParse(_handlingFee.text) ?? 0; _shipment!.handlingFee = double.tryParse(_handlingFee.text) ?? 0;
setState(() { setState(() {
_isLoading = true; _isLoading = true;
}); });
try { try {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
await shipmentModel.confirmShipment(_shipment); await shipmentModel.confirmShipment(_shipment!);
Navigator.pop(context, true); Navigator.pop(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());

57
lib/pages/shipment/shipment_editor.dart
View File

@@ -29,7 +29,7 @@ import 'shipment_box_editor.dart';
import 'widgets.dart'; import 'widgets.dart';
class ShipmentEditor extends StatefulWidget { class ShipmentEditor extends StatefulWidget {
final Shipment shipment; final Shipment? shipment;
ShipmentEditor({this.shipment}); ShipmentEditor({this.shipment});
@override @override
@@ -45,12 +45,12 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
TextEditingController _toTimeEditingController = new TextEditingController(); TextEditingController _toTimeEditingController = new TextEditingController();
TextEditingController _pickupDate = new TextEditingController(); TextEditingController _pickupDate = new TextEditingController();
Shipment _shipment; Shipment? _shipment;
bool _isLoading = false; bool _isLoading = false;
var now = new DateTime.now(); var now = new DateTime.now();
bool _isNew; late bool _isNew;
String _selectedShipmentType; String? _selectedShipmentType;
@override @override
void initState() { void initState() {
@@ -59,20 +59,21 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
if (widget.shipment != null) { if (widget.shipment != null) {
_isNew = false; _isNew = false;
_shipment = widget.shipment; _shipment = widget.shipment;
_selectedShipmentType = _shipment.shipmentType; _selectedShipmentType = _shipment!.shipmentType;
_fromTimeEditingController.text = _shipment.pickupTimeStart; _fromTimeEditingController.text = _shipment!.pickupTimeStart ?? "";
_toTimeEditingController.text = _shipment.pickupTimeEnd; _toTimeEditingController.text = _shipment!.pickupTimeEnd ?? "";
_pickupDate.text = dateFormatter.format(_shipment.pickupDate ?? now); _pickupDate.text = dateFormatter.format(_shipment!.pickupDate ?? now);
} else { } else {
_isNew = true; _isNew = true;
_selectedShipmentType = shipment_local_pickup; _selectedShipmentType = shipment_local_pickup;
_pickupDate.text = dateFormatter.format(now); _pickupDate.text = dateFormatter.format(now);
_fromTimeEditingController.text = "${timeFormatter.format(now)}"; _fromTimeEditingController.text = "${timeFormatter.format(now)}";
_toTimeEditingController.text = "${timeFormatter.format(now)}"; _toTimeEditingController.text = "${timeFormatter.format(now)}";
_shipment = Shipment(boxes: []); // _shipment = Shipment(boxes: []);
var shipmentModel = var shipmentModel =
Provider.of<DeliveryAddressModel>(context, listen: false); Provider.of<DeliveryAddressModel>(context, listen: false);
_shipment.pickupAddress = shipmentModel.defalutAddress; _shipment!.pickupAddress = shipmentModel.defalutAddress;
_shipment!.boxes = [];
_pickupDate.text = dateFormatter.format(now); _pickupDate.text = dateFormatter.format(now);
} }
} }
@@ -86,7 +87,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
MainModel mainModel = Provider.of<MainModel>(context); MainModel mainModel = Provider.of<MainModel>(context);
ShipmentModel pickupModel = Provider.of<ShipmentModel>(context); ShipmentModel pickupModel = Provider.of<ShipmentModel>(context);
final shipmentNumberBox = getShipmentNumberStatus(context, _shipment); final shipmentNumberBox = getShipmentNumberStatus(context, _shipment!);
bool isLocalPickup = _selectedShipmentType == shipment_local_pickup; bool isLocalPickup = _selectedShipmentType == shipment_local_pickup;
bool isCourierPickup = _selectedShipmentType == shipment_courier_pickup; bool isCourierPickup = _selectedShipmentType == shipment_courier_pickup;
bool isLocalDropoff = _selectedShipmentType == shipment_local_dropoff; bool isLocalDropoff = _selectedShipmentType == shipment_local_dropoff;
@@ -121,20 +122,20 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
backgroundColor: Colors.white, backgroundColor: Colors.white,
)); ));
final pickupAddressBox = DefaultDeliveryAddress( final pickupAddressBox = DefaultDeliveryAddress(
deliveryAddress: _shipment.pickupAddress, deliveryAddress: _shipment!.pickupAddress,
iconData: Icons.location_on, iconData: Icons.location_on,
labelKey: "shipment.location", labelKey: "shipment.location",
onTap: () async { onTap: () async {
DeliveryAddress address = await Navigator.push<DeliveryAddress>( DeliveryAddress? address = await Navigator.push<DeliveryAddress>(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => DeliveryAddressSelection( builder: (context) => DeliveryAddressSelection(
deliveryAddress: _shipment.pickupAddress, deliveryAddress: _shipment!.pickupAddress,
user: mainModel.user)), user: mainModel.user)),
); );
if (address == null) return; if (address == null) return;
setState(() { setState(() {
_shipment.pickupAddress = address; _shipment!.pickupAddress = address;
}); });
}, },
); );
@@ -142,7 +143,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
FcsIDIcon(), FcsIDIcon(),
Expanded( Expanded(
child: DisplayText( child: DisplayText(
text: mainModel.setting.usaAddress, text: mainModel.setting!.usaAddress,
), ),
) )
]); ]);
@@ -194,7 +195,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
LocalRadioButtons( LocalRadioButtons(
values: pickupModel.shipmentTypes, values: pickupModel.shipmentTypes,
selectedValue: _selectedShipmentType, selectedValue: _selectedShipmentType,
callback: (v) { callback: (String? v) {
setState(() { setState(() {
_selectedShipmentType = v; _selectedShipmentType = v;
}); });
@@ -239,7 +240,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
), ),
), ),
Column( Column(
children: getBoxList(context, _shipment.boxes), children: getBoxList(context, _shipment!.boxes),
), ),
_isNew ? createBtn : updateBtn, _isNew ? createBtn : updateBtn,
], ],
@@ -276,7 +277,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
_addBox(Carton box) { _addBox(Carton box) {
if (box == null) return; if (box == null) return;
box.cartonType = carton_from_shipments; box.cartonType = carton_from_shipments;
_shipment.boxes.add(box); _shipment!.boxes.add(box);
setState(() {}); setState(() {});
} }
@@ -287,15 +288,15 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
_removeBox(Carton box) { _removeBox(Carton box) {
if (box == null) return; if (box == null) return;
_shipment.boxes.remove(box); _shipment!.boxes.remove(box);
setState(() {}); setState(() {});
} }
_save() async { _save() async {
_shipment.shipmentType = this._selectedShipmentType; _shipment!.shipmentType = this._selectedShipmentType;
_shipment.pickupDate = dateFormatter.parse(_pickupDate.text); _shipment!.pickupDate = dateFormatter.parse(_pickupDate.text);
_shipment.pickupTimeStart = _fromTimeEditingController.text; _shipment!.pickupTimeStart = _fromTimeEditingController.text;
_shipment.pickupTimeEnd = _toTimeEditingController.text; _shipment!.pickupTimeEnd = _toTimeEditingController.text;
setState(() { setState(() {
_isLoading = true; _isLoading = true;
}); });
@@ -303,9 +304,9 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
if (_isNew) { if (_isNew) {
await shipmentModel.createShipment(_shipment); await shipmentModel.createShipment(_shipment!);
} else { } else {
await shipmentModel.updateShipment(_shipment); await shipmentModel.updateShipment(_shipment!);
} }
Navigator.pop(context, true); Navigator.pop(context, true);
} catch (e) { } catch (e) {
@@ -319,10 +320,10 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
_openCourierWebsite() { _openCourierWebsite() {
MainModel mainModel = Provider.of<MainModel>(context, listen: false); MainModel mainModel = Provider.of<MainModel>(context, listen: false);
launch("${mainModel.setting.courierWebsite}"); launch("${mainModel.setting!.courierWebsite}");
} }
isDataChanged() { isDataChanged() {
return _shipment.boxes.isNotEmpty; return _shipment!.boxes.isNotEmpty;
} }
} }

148
lib/pages/shipment/shipment_info.dart
View File

@@ -20,7 +20,7 @@ import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/progress.dart'; import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
@@ -32,8 +32,8 @@ import 'shipment_editor.dart';
import 'widgets.dart'; import 'widgets.dart';
class ShipmentInfo extends StatefulWidget { class ShipmentInfo extends StatefulWidget {
final bool isCustomer; final bool? isCustomer;
final Shipment shipment; final Shipment? shipment;
ShipmentInfo({this.shipment, this.isCustomer}); ShipmentInfo({this.shipment, this.isCustomer});
@override @override
@@ -62,39 +62,42 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
TextEditingController _pickupDate = new TextEditingController(); TextEditingController _pickupDate = new TextEditingController();
TextEditingController _handlingFeeController = new TextEditingController(); TextEditingController _handlingFeeController = new TextEditingController();
Shipment _shipment; Shipment? _shipment;
bool _isLoading = false; bool _isLoading = false;
bool _isCustomer; late bool _isCustomer;
var now = new DateTime.now(); var now = new DateTime.now();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_shipment = widget.shipment; _shipment = widget.shipment;
_isCustomer = widget.isCustomer; _isCustomer = widget.isCustomer!;
_loadCartons(_shipment.id); _loadCartons(_shipment!.id!);
_addressEditingController.text = _shipment.address; _addressEditingController.text = _shipment!.address ?? "";
_fromTimeEditingController.text = _shipment.pickupTimeStart; _fromTimeEditingController.text = _shipment!.pickupTimeStart ?? "";
_toTimeEditingController.text = _shipment.pickupTimeEnd; _toTimeEditingController.text = _shipment!.pickupTimeEnd ?? "";
_noOfPackageEditingController.text = _shipment.numberOfPackage.toString(); _noOfPackageEditingController.text = _shipment!.numberOfPackage != null
_weightEditingController.text = _shipment.weight.toString(); ? _shipment!.numberOfPackage.toString()
_pickupDate.text = dateFormatter.format(_shipment.pickupDate ?? now); : "";
_weightEditingController.text =
_shipment!.weight != null ? _shipment!.weight.toString() : "";
_pickupDate.text = dateFormatter.format(_shipment!.pickupDate ?? now);
} }
_loadCartons(String shipmentID) async { _loadCartons(String shipmentID) async {
CartonModel cartonModel = Provider.of<CartonModel>(context, listen: false); CartonModel cartonModel = Provider.of<CartonModel>(context, listen: false);
var cartons = await cartonModel.getCartons(shipmentID); var cartons = await cartonModel.getCartons(shipmentID);
setState(() { setState(() {
_shipment.boxes = cartons; _shipment!.boxes = cartons;
}); });
} }
_loadShipment(String id) async { _loadShipment(String id) async {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
Shipment s = await shipmentModel.getShipment(id); Shipment? s = await shipmentModel.getShipment(id);
s.boxes = _shipment.boxes; s!.boxes = _shipment!.boxes;
setState(() { setState(() {
_shipment = s; _shipment = s;
}); });
@@ -109,31 +112,34 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
MainModel mainModel = Provider.of<MainModel>(context); MainModel mainModel = Provider.of<MainModel>(context);
ShipmentModel pickupModel = Provider.of<ShipmentModel>(context); ShipmentModel pickupModel = Provider.of<ShipmentModel>(context);
bool isLocalPickup = _shipment.shipmentType == shipment_local_pickup; bool isLocalPickup = _shipment!.shipmentType == shipment_local_pickup;
bool isCourierPickup = _shipment.shipmentType == shipment_courier_pickup; bool isCourierPickup = _shipment!.shipmentType == shipment_courier_pickup;
bool isLocalDropoff = _shipment.shipmentType == shipment_local_dropoff; bool isLocalDropoff = _shipment!.shipmentType == shipment_local_dropoff;
bool isCourierDropoff = _shipment.shipmentType == shipment_courier_dropoff; bool isCourierDropoff = _shipment!.shipmentType == shipment_courier_dropoff;
bool isEditable = widget.isCustomer bool isEditable = widget.isCustomer!
? (_shipment.isPending || _shipment.isAssigned) ? (_shipment!.isPending || _shipment!.isAssigned)
: (_shipment.isPending || _shipment.isAssigned || _shipment.isPickuped); : (_shipment!.isPending ||
_shipment!.isAssigned ||
_shipment!.isPickuped);
bool canCancel = bool canCancel =
_shipment.isPending || _shipment.isConfirmed || _shipment.isAssigned; _shipment!.isPending || _shipment!.isConfirmed || _shipment!.isAssigned;
final popupMenu = LocalPopupMenuButton( final popupMenu = LocalPopupMenuButton(
popmenus: [ popmenus: [
LocalPopupMenu( LocalPopupMenu(
enabled: _shipment.isPending && isLocalPickup, enabled: _shipment!.isPending && isLocalPickup,
id: 1, id: 1,
textKey: "shipment.assign.for.pickup", textKey: "shipment.assign.for.pickup",
), ),
LocalPopupMenu( LocalPopupMenu(
enabled: enabled:
(_shipment.isPickuped && isLocalPickup) || _shipment.isReceived, (_shipment!.isPickuped && isLocalPickup) || _shipment!.isReceived,
id: 3, id: 3,
textKey: "shipment.pack.menuitem", textKey: "shipment.pack.menuitem",
), ),
LocalPopupMenu( LocalPopupMenu(
enabled: _shipment.isPending && (isCourierPickup || isCourierDropoff), enabled:
_shipment!.isPending && (isCourierPickup || isCourierDropoff),
id: 4, id: 4,
textKey: "shipment.confirm.menuitem", textKey: "shipment.confirm.menuitem",
), ),
@@ -149,7 +155,11 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
? _gotoAssign() ? _gotoAssign()
: p.id == 2 : p.id == 2
? _cancel() ? _cancel()
: p.id == 3 ? _gotoPack() : p.id == 4 ? _gotoConfirm() : null, : p.id == 3
? _gotoPack()
: p.id == 4
? _gotoConfirm()
: null,
); );
final popupMenuCustomer = LocalPopupMenuButton( final popupMenuCustomer = LocalPopupMenuButton(
popmenus: [ popmenus: [
@@ -163,29 +173,31 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
buttonIcon: Icons.more_vert, buttonIcon: Icons.more_vert,
popupMenuCallback: (p) => p.id == 2 ? _cancel() : null, popupMenuCallback: (p) => p.id == 2 ? _cancel() : null,
); );
final shipmentNumberBox = getShipmentNumberStatus(context, _shipment); final shipmentNumberBox = getShipmentNumberStatus(context, _shipment!);
final fromTimeBox = DisplayText( final fromTimeBox = DisplayText(
labelTextKey: 'shipment.from', labelTextKey: 'shipment.from',
iconData: Icons.timer, iconData: Icons.timer,
text: _shipment.pickupTimeStart, text: _shipment!.pickupTimeStart ?? "",
); );
final toTimeBox = DisplayText( final toTimeBox = DisplayText(
labelTextKey: 'shipment.to', labelTextKey: 'shipment.to',
iconData: Icons.timer_off, iconData: Icons.timer_off,
text: _shipment.pickupTimeEnd, text: _shipment!.pickupTimeEnd ?? "",
); );
final pickupDateBox = DisplayText( final pickupDateBox = DisplayText(
labelTextKey: "shipment.date", labelTextKey: "shipment.date",
iconData: Icons.date_range, iconData: Icons.date_range,
text: dateFormatter.format(_shipment.pickupDate), text: _shipment!.pickupDate != null
? dateFormatter.format(_shipment!.pickupDate!)
: '',
); );
var localDropoffAddressBox = Row(children: [ var localDropoffAddressBox = Row(children: [
FcsIDIcon(), FcsIDIcon(),
Expanded( Expanded(
child: DisplayText( child: DisplayText(
text: mainModel.setting.usaAddress, text: mainModel.setting!.usaAddress ?? "",
), ),
) )
]); ]);
@@ -201,17 +213,17 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
backgroundColor: Colors.white, backgroundColor: Colors.white,
)); ));
final pickupAddressBox = DefaultDeliveryAddress( final pickupAddressBox = DefaultDeliveryAddress(
deliveryAddress: _shipment.pickupAddress, deliveryAddress: _shipment!.pickupAddress,
iconData: Icons.location_on, iconData: Icons.location_on,
labelKey: "shipment.location", labelKey: "shipment.location",
); );
var usersBox = DisplayText( var usersBox = DisplayText(
labelTextKey: "shipment.staff", labelTextKey: "shipment.staff",
text: _shipment.pickupUserName, text: _shipment!.pickupUserName ?? "",
iconData: MaterialCommunityIcons.worker); iconData: MaterialCommunityIcons.worker);
var handlingFeeBox = DisplayText( var handlingFeeBox = DisplayText(
labelTextKey: "shipment.handling.fee", labelTextKey: "shipment.handling.fee",
text: (_shipment.handlingFee ?? 0).toString(), text: (_shipment!.handlingFee ?? 0).toString(),
iconData: FontAwesome.truck); iconData: FontAwesome.truck);
final assignCompleteBtn = LocalButton( final assignCompleteBtn = LocalButton(
@@ -232,7 +244,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
); );
final fcsShipmentNumberBox = DisplayText( final fcsShipmentNumberBox = DisplayText(
text: _shipment.fcsShipmentNumber, text: _shipment!.fcsShipmentNumber ?? "",
labelTextKey: "FCSshipment.number", labelTextKey: "FCSshipment.number",
iconData: Ionicons.ios_airplane, iconData: Ionicons.ios_airplane,
); );
@@ -267,7 +279,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
color: isEditable ? primaryColor : Colors.grey), color: isEditable ? primaryColor : Colors.grey),
onPressed: isEditable ? _edit : null, onPressed: isEditable ? _edit : null,
), ),
widget.isCustomer ? popupMenuCustomer : popupMenu, widget.isCustomer! ? popupMenuCustomer : popupMenu,
]), ]),
body: Padding( body: Padding(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
@@ -278,7 +290,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
LocalRadioButtons( LocalRadioButtons(
readOnly: true, readOnly: true,
values: pickupModel.shipmentTypes, values: pickupModel.shipmentTypes,
selectedValue: _shipment.shipmentType, selectedValue: _shipment!.shipmentType,
), ),
...(isLocalDropoff ...(isLocalDropoff
? [ ? [
@@ -305,13 +317,13 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
LocalTitle( LocalTitle(
textKey: "boxes.name", textKey: "boxes.name",
trailing: Text( trailing: Text(
"${_shipment.totalCount} Cartons - ${_shipment.totalWeight} lb"), "${_shipment!.totalCount} Cartons - ${_shipment!.totalWeight} lb"),
), ),
Column( Column(
children: getBoxList(context, _shipment.boxes), children: getBoxList(context, _shipment!.boxes),
), ),
!_isCustomer ? fcsShipmentNumberBox : Container(), !_isCustomer ? fcsShipmentNumberBox : Container(),
...(!_shipment.isPending ...(!_shipment!.isPending
? [ ? [
handlingFeeBox, handlingFeeBox,
] ]
@@ -324,22 +336,22 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
: []), : []),
...(isLocalPickup && !_isCustomer ...(isLocalPickup && !_isCustomer
? [ ? [
_shipment.isPending ? assignCompleteBtn : Container(), _shipment!.isPending ? assignCompleteBtn : Container(),
_shipment.isAssigned ? completePickupBtn : Container(), _shipment!.isAssigned ? completePickupBtn : Container(),
_shipment.isPickuped ? completePackBtn : Container(), _shipment!.isPickuped ? completePackBtn : Container(),
] ]
: []), : []),
...((isCourierPickup || isCourierDropoff) && !_isCustomer ...((isCourierPickup || isCourierDropoff) && !_isCustomer
? [ ? [
_shipment.isPending ? confirmCompleteBtn : Container(), _shipment!.isPending ? confirmCompleteBtn : Container(),
_shipment.isConfirmed ? completeReceiveBtn : Container(), _shipment!.isConfirmed ? completeReceiveBtn : Container(),
_shipment.isReceived ? completePackBtn : Container(), _shipment!.isReceived ? completePackBtn : Container(),
] ]
: []), : []),
...((isLocalDropoff) && !_isCustomer ...((isLocalDropoff) && !_isCustomer
? [ ? [
_shipment.isPending ? completeReceiveBtn : Container(), _shipment!.isPending ? completeReceiveBtn : Container(),
_shipment.isReceived ? completePackBtn : Container(), _shipment!.isReceived ? completePackBtn : Container(),
] ]
: []), : []),
], ],
@@ -361,7 +373,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
} }
_edit() async { _edit() async {
bool updated = await Navigator.push<bool>( bool? updated = await Navigator.push<bool>(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => ShipmentEditor( builder: (context) => ShipmentEditor(
@@ -369,8 +381,8 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
)), )),
); );
if (updated ?? false) { if (updated ?? false) {
await _loadShipment(_shipment.id); await _loadShipment(_shipment!.id!);
await _loadCartons(_shipment.id); await _loadCartons(_shipment!.id!);
} }
} }
@@ -387,7 +399,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
try { try {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
await shipmentModel.cancelShipment(_shipment); await shipmentModel.cancelShipment(_shipment!);
Navigator.pop(context, true); Navigator.pop(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());
@@ -400,11 +412,11 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
_openCourierWebsite() { _openCourierWebsite() {
MainModel mainModel = Provider.of<MainModel>(context, listen: false); MainModel mainModel = Provider.of<MainModel>(context, listen: false);
launch("${mainModel.setting.courierWebsite}"); launch("${mainModel.setting!.courierWebsite}");
} }
_gotoAssign() async { _gotoAssign() async {
bool assigned = await Navigator.push<bool>( bool? assigned = await Navigator.push<bool>(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => ShipmentAssign( builder: (context) => ShipmentAssign(
@@ -412,7 +424,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
)), )),
); );
if (assigned ?? false) { if (assigned ?? false) {
await _loadShipment(_shipment.id); await _loadShipment(_shipment!.id!);
} }
} }
@@ -429,7 +441,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
try { try {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
await shipmentModel.completeAssignShipment(_shipment); await shipmentModel.completeAssignShipment(_shipment!);
Navigator.pop(context, true); Navigator.pop(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());
@@ -453,7 +465,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
try { try {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
await shipmentModel.completePickupShipment(_shipment); await shipmentModel.completePickupShipment(_shipment!);
Navigator.pop(context, true); Navigator.pop(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());
@@ -465,16 +477,16 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
} }
_gotoPack() async { _gotoPack() async {
bool assigned = await Navigator.push<bool>( bool? assigned = await Navigator.push<bool>(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => ShipmentPack( builder: (context) => ShipmentPack(
shipment: _shipment, shipment: _shipment!,
)), )),
); );
if (assigned ?? false) { if (assigned ?? false) {
await _loadShipment(_shipment.id); await _loadShipment(_shipment!.id!);
await _loadCartons(_shipment.id); await _loadCartons(_shipment!.id!);
} }
} }
@@ -491,7 +503,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
try { try {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
await shipmentModel.completePackShipment(_shipment); await shipmentModel.completePackShipment(_shipment!);
Navigator.pop(context, true); Navigator.pop(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());
@@ -503,7 +515,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
} }
_gotoConfirm() async { _gotoConfirm() async {
bool assigned = await Navigator.push<bool>( bool? assigned = await Navigator.push<bool>(
context, context,
CupertinoPageRoute( CupertinoPageRoute(
builder: (context) => ShipmentConfirm( builder: (context) => ShipmentConfirm(
@@ -511,7 +523,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
)), )),
); );
if (assigned ?? false) { if (assigned ?? false) {
await _loadShipment(_shipment.id); await _loadShipment(_shipment!.id!);
} }
} }
@@ -528,7 +540,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
try { try {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
await shipmentModel.completeConfirmShipment(_shipment); await shipmentModel.completeConfirmShipment(_shipment!);
Navigator.pop(context, true); Navigator.pop(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());
@@ -552,7 +564,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
try { try {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
await shipmentModel.completeReceiveShipment(_shipment); await shipmentModel.completeReceiveShipment(_shipment!);
Navigator.pop(context, true); Navigator.pop(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());

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

@@ -17,7 +17,7 @@ import 'shipment_list_row.dart';
class ShipmentList extends StatefulWidget { class ShipmentList extends StatefulWidget {
final bool forCustomer; final bool forCustomer;
const ShipmentList({Key key, this.forCustomer = true}) : super(key: key); const ShipmentList({Key? key, this.forCustomer = true}) : super(key: key);
@override @override
_ShipmentListState createState() => _ShipmentListState(); _ShipmentListState createState() => _ShipmentListState();
} }

12
lib/pages/shipment/shipment_list_row.dart
View File

@@ -2,15 +2,15 @@ import 'package:fcs/domain/entities/shipment.dart';
import 'package:fcs/helpers/theme.dart'; import 'package:fcs/helpers/theme.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
import '../main/util.dart'; import '../main/util.dart';
import 'shipment_info.dart'; import 'shipment_info.dart';
class ShipmentListRow extends StatelessWidget { class ShipmentListRow extends StatelessWidget {
final Shipment shipment; final Shipment? shipment;
final bool isCustomer; final bool? isCustomer;
const ShipmentListRow({Key key, this.shipment, this.isCustomer}) const ShipmentListRow({Key? key, this.shipment, this.isCustomer})
: super(key: key); : super(key: key);
@override @override
@@ -45,7 +45,7 @@ class ShipmentListRow extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 8.0), padding: const EdgeInsets.only(left: 8.0),
child: new Text( child: new Text(
shipment.shipmentNumber ?? "", shipment!.shipmentNumber ?? "",
style: new TextStyle( style: new TextStyle(
fontSize: 15.0, color: Colors.black), fontSize: 15.0, color: Colors.black),
), ),
@@ -69,7 +69,7 @@ class ShipmentListRow extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
child: getStatus(shipment.status ?? ""), child: getStatus(shipment!.status ?? ""),
), ),
// Padding( // Padding(
// padding: const EdgeInsets.only(left: 8.0, top: 5, bottom: 5), // padding: const EdgeInsets.only(left: 8.0, top: 5, bottom: 5),

20
lib/pages/shipment/shipment_pack.dart
View File

@@ -11,14 +11,14 @@ import 'package:fcs/pages/widgets/local_title.dart';
import 'package:fcs/pages/widgets/progress.dart'; import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'widgets.dart'; import 'widgets.dart';
class ShipmentPack extends StatefulWidget { class ShipmentPack extends StatefulWidget {
final Shipment shipment; final Shipment? shipment;
ShipmentPack({this.shipment}); ShipmentPack({this.shipment});
@override @override
@@ -29,12 +29,12 @@ class _ShipmentPackState extends State<ShipmentPack> {
var dateFormatter = new DateFormat('dd MMM yyyy'); var dateFormatter = new DateFormat('dd MMM yyyy');
var timeFormatter = new DateFormat('jm'); var timeFormatter = new DateFormat('jm');
Shipment _shipment; Shipment? _shipment;
bool _isLoading = false; bool _isLoading = false;
var now = new DateTime.now(); var now = new DateTime.now();
FcsShipment _fcsShipment; FcsShipment? _fcsShipment;
List<FcsShipment> _fcsShipments; List<FcsShipment>? _fcsShipments;
@override @override
void initState() { void initState() {
@@ -48,8 +48,8 @@ class _ShipmentPackState extends State<ShipmentPack> {
FcsShipmentModel fcsShipmentModel = FcsShipmentModel fcsShipmentModel =
Provider.of<FcsShipmentModel>(context, listen: false); Provider.of<FcsShipmentModel>(context, listen: false);
var fcsShipments = await fcsShipmentModel.getActiveFcsShipments(); var fcsShipments = await fcsShipmentModel.getActiveFcsShipments();
var fcsShipment = fcsShipments var fcsShipment =
.firstWhere((e) => e.id == _shipment.fcsShipmentID, orElse: () => null); fcsShipments.firstWhere((e) => e.id == _shipment?.fcsShipmentID);
setState(() { setState(() {
_fcsShipments = fcsShipments; _fcsShipments = fcsShipments;
_fcsShipment = fcsShipment; _fcsShipment = fcsShipment;
@@ -58,7 +58,7 @@ class _ShipmentPackState extends State<ShipmentPack> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final shipmentNumberBox = getShipmentNumberStatus(context, _shipment); final shipmentNumberBox = getShipmentNumberStatus(context, _shipment!);
var fcsShipmentsBox = LocalDropdown<FcsShipment>( var fcsShipmentsBox = LocalDropdown<FcsShipment>(
callback: (v) { callback: (v) {
@@ -120,14 +120,14 @@ class _ShipmentPackState extends State<ShipmentPack> {
} }
_save() async { _save() async {
_shipment.fcsShipmentID = this._fcsShipment.id; _shipment!.fcsShipmentID = this._fcsShipment!.id;
setState(() { setState(() {
_isLoading = true; _isLoading = true;
}); });
try { try {
ShipmentModel shipmentModel = ShipmentModel shipmentModel =
Provider.of<ShipmentModel>(context, listen: false); Provider.of<ShipmentModel>(context, listen: false);
await shipmentModel.packShipment(_shipment); await shipmentModel.packShipment(_shipment!);
Navigator.pop(context, true); Navigator.pop(context, true);
} catch (e) { } catch (e) {
showMsgDialog(context, "Error", e.toString()); showMsgDialog(context, "Error", e.toString());

4
lib/pages/widgets/multi_img_controller.dart
View File

@@ -78,9 +78,9 @@ class MultiImgController {
} }
} }
List<File> get getUpdatedFile { List<File?> get getUpdatedFile {
List<File?> _addfiles = getAddedFile; List<File?> _addfiles = getAddedFile;
this.imageFiles.addAll(_addfiles); this.imageFiles!.addAll(_addfiles);
return this.imageFiles; return this.imageFiles;
} }