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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
PhyoThandar
2020-10-12 13:13:55 +06:30
parent c10a2a5f29 dc79f424a5
commit af568b8adf
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,13 @@ class PackageModel extends BaseModel {
deliveredPackages = []; 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(); if (pagination != null) pagination.close();
deliveredPackages = []; deliveredPackages = [];
endOfDeliveredPackages = false; endOfDeliveredPackages = false;
@@ -57,7 +63,7 @@ class PackageModel extends BaseModel {
// .orderBy("date", descending: true); // .orderBy("date", descending: true);
.where("is_delivered", isEqualTo: true) .where("is_delivered", isEqualTo: true)
.where("is_deleted", isEqualTo: false); .where("is_deleted", isEqualTo: false);
if (user.isCustomer()) { if (!onlyFcs) {
pageQuery = pageQuery.where("user_id", isEqualTo: user.id); pageQuery = pageQuery.where("user_id", isEqualTo: user.id);
} }
pageQuery = pageQuery.orderBy("current_status_date", descending: true); pageQuery = pageQuery.orderBy("current_status_date", descending: true);
@@ -94,9 +100,8 @@ class PackageModel extends BaseModel {
Future<void> _loadPackages() async { Future<void> _loadPackages() async {
if (user == null || if (user == null ||
!user.hasPackages() || !((user.hasPackages() || user.hasReceiving() || user.hasProcessing())))
!user.hasReceiving() || return;
!user.hasProcessing()) return;
String path = "/$packages_collection"; String path = "/$packages_collection";
if (listener != null) listener.cancel(); if (listener != null) listener.cancel();
packages = []; packages = [];

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

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

2
pubspec.yaml
View File

@@ -2,7 +2,7 @@ name: fcs
description: FCS Logistics description: FCS Logistics
publish_to: 'none' # Remove this line if you wish to publish to pub.dev 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: environment:
sdk: ">=2.7.0 <3.0.0" sdk: ">=2.7.0 <3.0.0"