Merge pull request #514 from crossroads/master

[Release] 0.18.3

.circleci/config.yml

@@ -329,12 +329,12 @@ jobs:
             case "$CIRCLE_BRANCH" in
               master)
                 echo 'export ENVIRONMENT=staging' >> $BASH_ENV
-                echo 'export CERTIFICATE=GoodCity_2020_Development.p12' >> $BASH_ENV
+                echo 'export CERTIFICATE=hk.goodcity.dev.p12' >> $BASH_ENV
                 echo 'export PROVISIONING_PROFILE=GoodcityAdminStaging.mobileprovision' >> $BASH_ENV
                 ;;
               live)
                 echo 'export ENVIRONMENT=production' >> $BASH_ENV
-                echo 'export CERTIFICATE=Goodcity_2020.p12' >> $BASH_ENV
+                echo 'export CERTIFICATE=hk.goodcity.p12' >> $BASH_ENV
                 echo 'export PROVISIONING_PROFILE=GoodCityAdmin.mobileprovision' >> $BASH_ENV
                 ;;
               *)

Gemfile.lock

@@ -17,16 +17,16 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.1.1)
-    aws-partitions (1.438.0)
-    aws-sdk-core (3.113.1)
+    aws-partitions (1.446.0)
+    aws-sdk-core (3.114.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-kms (1.43.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.93.0)
+    aws-sdk-s3 (1.93.1)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -80,27 +80,30 @@ GEM
       highline (~> 1.7.2)
     concurrent-ruby (1.1.8)
     declarative (0.0.20)
-    declarative-option (0.1.0)
     digest-crc (0.6.3)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     emoji_regex (3.2.2)
     escape (0.0.4)
-    excon (0.79.0)
-    faraday (1.3.0)
+    excon (0.80.1)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
+    faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.2.3)
-    fastlane (2.179.0)
+    fastlane (2.181.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       artifactory (~> 3.0)
@@ -159,7 +162,7 @@ GEM
       rexml
       signet (~> 0.14)
       webrick
-    google-apis-iamcredentials_v1 (0.2.0)
+    google-apis-iamcredentials_v1 (0.3.0)
       google-apis-core (~> 0.1)
     google-apis-storage_v1 (0.3.0)
       google-apis-core (~> 0.1)
@@ -177,7 +180,7 @@ GEM
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.16.0)
+    googleauth (0.16.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -192,10 +195,10 @@ GEM
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.5.1)
-    jwt (2.2.2)
+    jwt (2.2.3)
     memoist (0.16.2)
     mini_magick (4.11.0)
-    mini_mime (1.0.3)
+    mini_mime (1.1.0)
     mini_portile2 (2.5.0)
     minitest (5.14.4)
     molinillo (0.6.6)
@@ -218,12 +221,12 @@ GEM
     public_suffix (4.0.6)
     racc (1.5.2)
     rake (13.0.3)
-    representable (3.0.4)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rouge (2.0.7)
     ruby-macho (1.4.0)
     ruby2_keywords (0.0.4)
@@ -245,6 +248,7 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
+    trailblazer-option (0.1.1)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)

app/components/add-edit-message-overlay.js

@@ -16,6 +16,10 @@ export default Ember.Component.extend(AsyncTasksMixin, {
     this.set("isEnglish", true);
   },
 
+  canDelete: Ember.computed("message.id", function() {
+    return this.get("message.id") && !this.get("message.isPrivate");
+  }),
+
   disableCreateEdit: Ember.computed(
     "message.nameEn",
     "message.contentEn",

app/components/add-holiday.js

@@ -1,13 +1,12 @@
-import Ember from 'ember';
+import Ember from "ember";
 const { getOwner } = Ember;
 
 export default Ember.Component.extend({
-
   displayUserPrompt: false,
-  holidayName: '',
+  holidayName: "",
   invalidName: false,
   invalidDate: false,
-  selectedDate: '',
+  selectedDate: "",
   store: Ember.inject.service(),
 
   actions: {
@@ -28,24 +27,27 @@ export default Ember.Component.extend({
       var name = this.get("holidayName");
       var date = this.get("selectedDate");
 
-      if(name.trim().length === 0) {
-        this.set("invalidName", true);
-        return false;
-      }
+      let isNameEmpty = name.trim().length === 0;
+      let isDateEmpty = date.toString().trim().length === 0;
 
-      if(date.toString().trim().length === 0) {
-        this.set("invalidDate", true);
+      this.set("invalidName", isNameEmpty);
+      this.set("invalidDate", isDateEmpty);
+
+      if (isNameEmpty || isDateEmpty) {
         return false;
       }
 
-      var loadingView = getOwner(this).lookup('component:loading').append();
+      var loadingView = getOwner(this)
+        .lookup("component:loading")
+        .append();
 
       var holiday = this.get("store").createRecord("holiday", {
         name: name,
         holiday: date
       });
 
-      holiday.save()
+      holiday
+        .save()
         .catch(error => {
           holiday.unloadRecord();
           throw error;
@@ -57,5 +59,4 @@ export default Ember.Component.extend({
         });
     }
   }
-
 });

app/components/complete-receive-offer.js

@@ -1,11 +1,12 @@
-import Ember from 'ember';
-import AjaxPromise from 'goodcity/utils/ajax-promise';
+import Ember from "ember";
+import AjaxPromise from "goodcity/utils/ajax-promise";
+import Promisify from "goodcity/utils/promisify";
 const { getOwner } = Ember;
 
 export default Ember.Component.extend({
-
   store: Ember.inject.service(),
   i18n: Ember.inject.service(),
+  messageService: Ember.inject.service(),
   displayUserPrompt: false,
 
   invalidMessage: Ember.computed({
@@ -17,42 +18,48 @@ export default Ember.Component.extend({
     }
   }),
 
-  closeMessage: Ember.computed("offer.allPackagesMissing", {
-    get() {
-      var offer = this.get("offer");
-      if(offer.get("allPackagesMissing")) {
-        return this.get("i18n").t("review_offer.missing_offer_message").string;
-      } else {
-        return this.get("i18n").t("review_offer.receive_offer_message").string;
-      }
-    },
-    set(key, value) {
-      return value;
+  closeMessage: Ember.computed("offer.allPackagesMissing", function() {
+    const offer = this.get("offer");
+    if (offer.get("allPackagesMissing")) {
+      return Promisify(() =>
+        this.get("messageService").getSystemMessage({
+          guid: "review-offer-missing-offer-message"
+        })
+      );
+    } else {
+      return Promisify(() =>
+        this.get("messageService").getSystemMessage({
+          guid: "review-offer-receive-offer-message"
+        })
+      );
     }
   }),
 
   actions: {
-
     confirmCloseOffer() {
       this.set("displayUserPrompt", true);
     },
 
     closeOffer() {
-      var closeOfferMessage = this.get("closeMessage") || "";
+      var closeOfferMessage = this.get("closeMessage").content || "";
 
-      if(closeOfferMessage.trim().length === 0) {
+      if (closeOfferMessage.trim().length === 0) {
         this.set("invalidMessage", true);
         return false;
       }
 
       this.set("invalidMessage", false);
 
-      var loadingView = getOwner(this).lookup('component:loading').append();
-      var offerId = this.get('offer.id');
+      var loadingView = getOwner(this)
+        .lookup("component:loading")
+        .append();
+      var offerId = this.get("offer.id");
 
       var url = "/offers/" + offerId + "/receive_offer";
 
-      new AjaxPromise(url, "PUT", this.get('session.authToken'), { close_offer_message: closeOfferMessage })
+      new AjaxPromise(url, "PUT", this.get("session.authToken"), {
+        close_offer_message: closeOfferMessage
+      })
         .then(data => {
           this.get("store").pushPayload(data);
         })
@@ -61,5 +68,4 @@ export default Ember.Component.extend({
         });
     }
   }
-
 });