Merge pull request #596 from crossroads/master

Jan2020 Release#3

app/controllers/orders/active_items.js

@@ -1,3 +1,33 @@
 import detail from "./detail";
+import _ from "lodash";
 
-export default detail.extend();
+export default detail.extend({
+  autoLoad: true,
+  /*
+   * @type {Number}, perPage in response
+   */
+  perPage: 25,
+  ordersPkgLength: 0,
+  sortProperties: ["id"],
+  sortedGcRequests: Ember.computed.sort(
+    "model.goodcityRequests",
+    "sortProperties"
+  ),
+
+  actions: {
+    loadOrdersPackages(pageNo) {
+      const params = this.trimQuery(
+        _.merge(
+          { order_id: this.get("orderId") },
+          this.getPaginationQuery(pageNo)
+        )
+      );
+      return this.get("store")
+        .query("orders_package", params)
+        .then(ordersPkgs => {
+          this.set("ordersPkgLength", ordersPkgs.meta.orders_packages_count);
+          return ordersPkgs;
+        });
+    }
+  }
+});

app/controllers/orders/detail.js

@@ -7,12 +7,6 @@ import _ from "lodash";
 const { getOwner } = Ember;
 
 export default GoodcityController.extend(SearchMixin, {
-  autoLoad: true,
-  /*
-   * @type {Number}, perPage in response
-   */
-  perPage: 25,
-  ordersPkgLength: 0,
   backLinkPath: "",
   displayAllItems: false,
   isMobileApp: config.cordova.enabled,
@@ -121,21 +115,6 @@ export default GoodcityController.extend(SearchMixin, {
   },
 
   actions: {
-    loadOrdersPackages(pageNo) {
-      const params = this.trimQuery(
-        _.merge(
-          { order_id: this.get("orderId") },
-          this.getPaginationQuery(pageNo)
-        )
-      );
-      return this.get("store")
-        .query("orders_package", params)
-        .then(ordersPkgs => {
-          this.set("ordersPkgLength", ordersPkgs.meta.orders_packages_count);
-          return ordersPkgs;
-        });
-    },
-
     openSchedulePopup() {
       const scheduledAt = this.get("model.orderTransport.scheduledAt");
       try {

app/routes/orders/active_items.js

@@ -3,6 +3,7 @@ import detail from "./detail";
 export default detail.extend({
   async setupController(controller, model = {}) {
     await this._super(controller, model);
+    controller.set("ordersPkgLength", 0);
     controller.on();
   },
 

app/routes/orders/requested_items.js

@@ -1,3 +1,5 @@
 import detail from "./detail";
 
-export default detail.extend({});
+export default detail.extend({
+  controllerName: "orders/active_items"
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stock",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "private": true,
   "directories": {
     "doc": "doc",