diff --git a/lib/pages/package/model/package_model.dart b/lib/pages/package/model/package_model.dart index 8d71d4d..e476ce6 100644 --- a/lib/pages/package/model/package_model.dart +++ b/lib/pages/package/model/package_model.dart @@ -44,7 +44,13 @@ class PackageModel extends BaseModel { deliveredPackages = []; } - Future initDeliveredPackages() { + Future initDeliveredPackages(bool onlyFcs) { + if (onlyFcs) { + if (user == null || + !((user.hasPackages() || + user.hasReceiving() || + user.hasProcessing()))) return null; + } if (pagination != null) pagination.close(); deliveredPackages = []; endOfDeliveredPackages = false; @@ -57,7 +63,7 @@ class PackageModel extends BaseModel { // .orderBy("date", descending: true); .where("is_delivered", isEqualTo: true) .where("is_deleted", isEqualTo: false); - if (user.isCustomer()) { + if (!onlyFcs) { pageQuery = pageQuery.where("user_id", isEqualTo: user.id); } pageQuery = pageQuery.orderBy("current_status_date", descending: true); @@ -94,9 +100,8 @@ class PackageModel extends BaseModel { Future _loadPackages() async { if (user == null || - !user.hasPackages() || - !user.hasReceiving() || - !user.hasProcessing()) return; + !((user.hasPackages() || user.hasReceiving() || user.hasProcessing()))) + return; String path = "/$packages_collection"; if (listener != null) listener.cancel(); packages = []; diff --git a/lib/pages/package/package_list.dart b/lib/pages/package/package_list.dart index 8bad4bd..55db795 100644 --- a/lib/pages/package/package_list.dart +++ b/lib/pages/package/package_list.dart @@ -29,7 +29,8 @@ class _PackageListState extends State { @override void initState() { super.initState(); - Provider.of(context, listen: false).initDeliveredPackages(); + Provider.of(context, listen: false) + .initDeliveredPackages(widget.onlyFcs); _controller.addListener(() { if (_showDelivered && _controller.position.pixels == _controller.position.maxScrollExtent) { diff --git a/pubspec.yaml b/pubspec.yaml index 433121e..3e85b57 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: fcs description: FCS Logistics publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.0.0+3 +version: 1.0.0+4 environment: sdk: ">=2.7.0 <3.0.0"