add mix carton
This commit is contained in:
@@ -128,7 +128,7 @@ class PackageModel extends BaseModel {
|
||||
if (forCustomer) {
|
||||
q = q.where("user_id", isEqualTo: user.id);
|
||||
}
|
||||
|
||||
q = q.orderBy("tracking_id", descending: false);
|
||||
listener = q.snapshots().listen((QuerySnapshot snapshot) {
|
||||
_packages.clear();
|
||||
_packages = snapshot.documents.map((documentSnapshot) {
|
||||
@@ -197,13 +197,12 @@ class PackageModel extends BaseModel {
|
||||
return null;
|
||||
}
|
||||
|
||||
Future<List<Package>> getPackages(String userID) async {
|
||||
Future<List<Package>> getPackages(String userID, List<String> status) async {
|
||||
List<Package> packages = [];
|
||||
try {
|
||||
var snaps = await Firestore.instance
|
||||
.collection("/$packages_collection")
|
||||
.where("status",
|
||||
whereIn: [package_processed_status, package_packed_status])
|
||||
.where("status", whereIn: status)
|
||||
.where("user_id", isEqualTo: userID)
|
||||
.where("is_deleted", isEqualTo: false)
|
||||
.where("is_delivered", isEqualTo: false)
|
||||
|
||||
@@ -62,6 +62,9 @@ class _PackageInfoState extends State<PackageInfo> {
|
||||
Widget build(BuildContext context) {
|
||||
String id = Provider.of<MainModel>(context).user.id;
|
||||
bool owner = _package.userID == id;
|
||||
bool canChangeDeliveryAddress =
|
||||
_package.status == package_received_status ||
|
||||
_package.status == package_processed_status;
|
||||
|
||||
final trackingIdBox = DisplayText(
|
||||
text: _package.trackingID,
|
||||
@@ -106,7 +109,7 @@ class _PackageInfoState extends State<PackageInfo> {
|
||||
final deliveryAddressBox = DefaultDeliveryAddress(
|
||||
deliveryAddress: _package.deliveryAddress,
|
||||
labelKey: "package.delivery.address",
|
||||
onTap: owner
|
||||
onTap: owner && canChangeDeliveryAddress
|
||||
? () async {
|
||||
DeliveryAddress d = await Navigator.push<DeliveryAddress>(
|
||||
context,
|
||||
|
||||
Reference in New Issue
Block a user