fix staff viewing packages
This commit is contained in:
@@ -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 = [];
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user