add shipments

lib/pages/package/model/package_model.dart

@@ -85,7 +85,7 @@ class PackageModel extends BaseModel {
     if (isCustomer) {
       pageQuery = pageQuery.where("user_id", isEqualTo: user.id);
     }
-    pageQuery = pageQuery.orderBy("current_status_date", descending: true);
+    pageQuery = pageQuery.orderBy("status_date", descending: true);
     var paginator = new Paginator(pageQuery, rowPerLoad: 20, toObj: (data, id) {
       return Package.fromMap(data, id);
     });
@@ -199,6 +199,27 @@ class PackageModel extends BaseModel {
     return null;
   }
 
+  Future<List<Package>> getPackages(String userID) async {
+    List<Package> packages = [];
+    try {
+      var snaps = await Firestore.instance
+          .collection("/$packages_collection")
+          .where("status", isEqualTo: package_processed_status)
+          .where("user_id", isEqualTo: userID)
+          .where("is_deleted", isEqualTo: false)
+          .where("is_delivered", isEqualTo: false)
+          .getDocuments(source: Source.server);
+      packages = snaps.documents.map((documentSnapshot) {
+        var p =
+            Package.fromMap(documentSnapshot.data, documentSnapshot.documentID);
+        return p;
+      }).toList();
+    } catch (e) {
+      log.warning("Error!! $e");
+    }
+    return packages;
+  }
+
   Future<List<User>> searchUser(String term) {
     return Services.instance.userService.searchUser(term);
   }

lib/pages/package/package_editor.dart

@@ -1,12 +1,11 @@
 import 'package:fcs/domain/entities/market.dart';
 import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/helpers/theme.dart';
+import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/market/market_editor.dart';
 import 'package:fcs/pages/market/model/market_model.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package/tracking_id_page.dart';
-import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
 import 'package:fcs/pages/widgets/input_text.dart';
 import 'package:fcs/pages/widgets/local_text.dart';

lib/pages/package/package_info.dart

@@ -34,7 +34,6 @@ class PackageInfo extends StatefulWidget {
 class _PackageInfoState extends State<PackageInfo> {
   var dateFormatter = new DateFormat('dd MMM yyyy');
   Package _package;
-  DeliveryAddress _deliveryAddress;
   bool _isLoading = false;
   MultiImgController multiImgController = MultiImgController();
 
@@ -49,12 +48,6 @@ class _PackageInfoState extends State<PackageInfo> {
       _package = package;
       multiImgController.setImageUrls = package.photoUrls;
     });
-    if (!widget.isSearchResult) {
-      DeliveryAddressModel deliveryAddressModel =
-          Provider.of<DeliveryAddressModel>(context, listen: false);
-      _deliveryAddress = deliveryAddressModel
-          .getLocalDeliveryAddress(package.deliveryAddressID);
-    }
   }
 
   @override
@@ -103,7 +96,7 @@ class _PackageInfoState extends State<PackageInfo> {
       title: "Receipt File",
     );
     final deliveryAddressBox = DefaultDeliveryAddress(
-      deliveryAddress: _deliveryAddress,
+      deliveryAddress: _package.deliveryAddress,
       labelKey: "package.delivery.address",
       onTap: owner
           ? () async {
@@ -111,7 +104,7 @@ class _PackageInfoState extends State<PackageInfo> {
                 context,
                 CupertinoPageRoute(
                     builder: (context) => DeliveryAddressSelection(
-                          deliveryAddress: _deliveryAddress,
+                          deliveryAddress: _package.deliveryAddress,
                         )),
               );
               if (d == null) return;
@@ -185,7 +178,7 @@ class _PackageInfoState extends State<PackageInfo> {
       var da =
           await deliveryAddressModel.getDeliveryAddress(deliveryAddress.id);
       setState(() {
-        _deliveryAddress = da;
+        _package.deliveryAddress = da;
       });
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());