Merge pull request #807 from crossroads/master

Release July#1

Author: abulsayyad123

.github/workflows/release-notes.yml

@@ -12,6 +12,7 @@ on:
 jobs:
   release-notes:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js 12.x

app/adapters/designation.js

@@ -14,7 +14,8 @@ export default ApplicationAdapter.extend({
     const params = {
       include_packages: false,
       include_order: true,
-      include_orders_packages: false
+      include_orders_packages: false,
+      include_messages: true
     };
     let baseUrl = this.buildURL(modelName, id, snapshot);
     const paramStr = _.map(params, (value, key) => `${key}=${value}`).join("&");

app/adapters/item_action.js

@@ -0,0 +1,11 @@
+import ApplicationAdapter from "./application";
+import _ from "lodash";
+import config from "stock/config/environment";
+
+export default ApplicationAdapter.extend({
+  urlForQuery(query, modelName) {
+    const { NAMESPACE, API_HOST_URL } = config.APP;
+    const paramStr = _.map(query, (value, key) => `${key}=${value}`).join("&");
+    return `${API_HOST_URL}/${NAMESPACE}/packages_inventories?${paramStr}`;
+  }
+});

app/components/async-validatable-form.js

@@ -0,0 +1,19 @@
+import ValidatableForm from "ember-cli-html5-validation/components/validatable-form";
+import AsyncMixin, { ERROR_STRATEGIES } from "stock/mixins/async";
+
+export default ValidatableForm.extend(AsyncMixin, {
+  actions: {
+    submit(eventName) {
+      if (!this.get("element").checkValidity()) {
+        this.scrollToFirstError();
+        return false;
+      }
+
+      this.runTask(async () => {
+        this.get(eventName || "onSubmit")();
+      }, ERROR_STRATEGIES.MODAL);
+
+      return false;
+    }
+  }
+});

app/components/calendar-input.js

@@ -7,7 +7,7 @@ const MIN_DATE = moment()
 const DEFAULT_PICKADATE_CONFIG = {
   selectMonths: true,
   selectYears: true,
-  format: "ddd mmm d",
+  formatSubmit: "ddd mmm d",
   monthsFull: moment.months(),
   monthsShort: moment.monthsShort(),
   weekdaysShort: moment.weekdaysShort(),
@@ -47,6 +47,14 @@ export default Ember.TextField.extend({
     return selected.getTime() === date.getTime();
   },
 
+  _cb() {
+    const onSelect = this.get("onSelect");
+    if (onSelect) {
+      const date = this.get("selection");
+      onSelect(date);
+    }
+  },
+
   onClose(pickadate) {
     Ember.$(document.activeElement).blur();
     if (this.setting) {
@@ -58,7 +66,8 @@ export default Ember.TextField.extend({
       this.set("selection", date);
       this.setting = true;
       Ember.run.next(() => {
-        pickadate.set("select", new Date(date), { format: "ddd mmm d" });
+        this._cb();
+        pickadate.set("select", moment(date).toDate(), { format: "ddd mmm d" });
         this.setting = false;
       });
     }
@@ -67,7 +76,9 @@ export default Ember.TextField.extend({
   onStart(pickadate) {
     var date = this.get("selection");
     if (date) {
-      pickadate.set("select", new Date(date), { format: "ddd mmm d" });
+      pickadate.set("select", moment(new Date(date)).toDate(), {
+        format: "ddd mmm d"
+      });
     }
   },
 
@@ -95,6 +106,9 @@ export default Ember.TextField.extend({
           },
           onOpen: function() {
             component.onStart(this);
+          },
+          onStart: function() {
+            component.onStart(this);
           }
         })
       );
@@ -105,5 +119,9 @@ export default Ember.TextField.extend({
         Ember.$("[id$=selectedDate]").trigger("blur");
       });
     });
+  },
+
+  willDestroyElement() {
+    this.set("selection", null);
   }
 });

app/components/check-box.js

@@ -0,0 +1,28 @@
+import Ember from "ember";
+
+export default Ember.Component.extend({
+  attributeBindings: ["type", "value"],
+  tagName: "input",
+  type: "checkbox",
+  checked: false,
+  selection: [],
+
+  didInsertElement() {
+    let isSelected =
+      this.get("selection").indexOf(parseInt(this.get("selected"))) >= 0;
+    if (isSelected) {
+      this.$().prop("checked", true);
+      this.sendAction("action", this.get("value"), true);
+    }
+  },
+
+  _updateElementValue: function() {
+    this.set("checked", this.$().prop("checked"));
+    let isChecked = this.get("checked");
+    this.sendAction("action", this.get("value"), isChecked);
+  }.on("didInsertElement"),
+
+  change: function(event) {
+    this._updateElementValue();
+  }
+});

app/components/date-picker.js

@@ -32,7 +32,7 @@ export default Ember.TextField.extend({
         val = null;
       }
       this.set("_model", val);
-      this.set("value", val ? moment(val).format("ddd MMM D") : "");
+      this.set("value", val ? moment(val).format("LL") : "");
       return val;
     }
   }),
@@ -45,7 +45,7 @@ export default Ember.TextField.extend({
       Ember.$(this.element).pickadate({
         selectMonths: !!enablePastDate,
         selectYears: !!enablePastDate,
-        format: "ddd mmm d",
+        formatSubmit: "ddd mmm d",
         monthsFull: moment.months(),
         monthsShort: moment.monthsShort(),
         weekdaysShort: moment.weekdaysShort(),
@@ -56,7 +56,7 @@ export default Ember.TextField.extend({
         onStart: function() {
           if (this.get("value")) {
             cmp.set("_model", this.get("value"));
-            cmp.set("value", moment(this.get("value")).format("ddd MMM D"));
+            cmp.set("value", moment(this.get("value")).format("LL"));
           }
         },
 
@@ -68,7 +68,7 @@ export default Ember.TextField.extend({
               this.get("val") || (this.get("select") && this.get("select").obj);
             if (isValidDate(date) && _.isFunction(onSelect)) {
               onSelect(date);
-              cmp.set("value", moment(date).format("ddd MMM D"));
+              cmp.set("value", moment(date).format("LL"));
             }
           }
         },

app/components/goodcity/add-item-overlay.js

@@ -10,11 +10,6 @@ export default Ember.Component.extend({
 
   pkgLocations: Ember.computed.alias("pkg.packagesLocations"),
 
-  pkgLocationName: Ember.computed("pkg.packagesLocations", function() {
-    let pkgLocations = this.get("pkgLocations");
-    return pkgLocations && pkgLocations.get("firstObject.location.name");
-  }),
-
   calculateSumFor(attribute) {
     let quantities = [];
     if (this.get("pkg.packagesLocations")) {

app/components/image-zoom.js

@@ -12,7 +12,9 @@ export default Ember.Component.extend({
       return this.get("item.setImages");
     }
 
-    return this.get("item.images").mapBy("imageUrl");
+    let images = this.get("item.images") || [this.get("item.image")];
+
+    return images.mapBy("imageUrl");
   }),
 
   actions: {

app/components/item-description-textarea.js

@@ -23,16 +23,19 @@ export default AutoResizableTextarea.extend({
     var item = this.get("item");
     var url = `/packages/${item.get("id")}`;
     var key = this.get("name");
-    var value = this.attrs.value.value || "";
+    const value = this.get("value") ? this.get("value").trim() : "";
     var packageParams = {};
-    packageParams[key] = this.get("value").trim() || "";
+    packageParams[key] = value;
 
+    if (value === "" && this.get("required")) {
+      this.$().focus();
+      return false;
+    }
     if (
       packageParams[key].toString() !==
-        this.get("previousValue")
-          .toString()
-          .trim() &&
-      value !== ""
+      this.get("previousValue")
+        .toString()
+        .trim()
     ) {
       var loadingView = getOwner(this)
         .lookup("component:loading")
@@ -47,22 +50,15 @@ export default AutoResizableTextarea.extend({
           loadingView.destroy();
         });
     }
-    this.element.value = value.trim();
-    if (this.element.value === "") {
-      this.$().focus();
-      return false;
-    }
-    Ember.$(this.element).removeClass("item-description-textarea");
+    Ember.$(this.element).removeClass("item-description-textarea-withbg");
   },
 
   focusIn() {
     this.addCssStyle();
   },
 
   addCssStyle() {
-    if (!this.get("noCss")) {
-      Ember.$(this.element).addClass("item-description-textarea");
-    }
+    Ember.$(this.element).addClass("item-description-textarea-withbg");
     this.set("previousValue", this.get("value") || "");
   },