fix staff viewing packages

This commit is contained in:
Sai Naw Wun
2020-10-12 13:01:40 +06:30
parent ea1f384370
commit dc79f424a5
3 changed files with 13 additions and 7 deletions

View File

@@ -44,7 +44,13 @@ class PackageModel extends BaseModel {
deliveredPackages = [];
}
Future<void> initDeliveredPackages() {
Future<void> 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<void> _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 = [];

View File

@@ -29,7 +29,8 @@ class _PackageListState extends State<PackageList> {
@override
void initState() {
super.initState();
Provider.of<PackageModel>(context, listen: false).initDeliveredPackages();
Provider.of<PackageModel>(context, listen: false)
.initDeliveredPackages(widget.onlyFcs);
_controller.addListener(() {
if (_showDelivered &&
_controller.position.pixels == _controller.position.maxScrollExtent) {

View File

@@ -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"