resolve conflit

2020-12-01 10:38:12 +06:30
parent 9ffd727e86 b5a1369297
commit a2c9e41f55
5 changed files with 54 additions and 34 deletions
--- a/lib/pages/package/model/package_model.dart
+++ b/lib/pages/package/model/package_model.dart
@@ -156,6 +156,7 @@ class PackageModel extends BaseModel {
      var snaps = await Firestore.instance
          .collection("$path")
          .where("tracking_id", isEqualTo: trackingID)
+          .where("is_deleted", isEqualTo: false)
          .getDocuments(source: Source.server);
      if (snaps.documents.length == 1) {
        var snap = snaps.documents[0];