Merge pull request #489 from crossroads/master

#AugustRelease 1

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 gem "capistrano", "3.4.0"
 gem "rake"
-gem "fastlane"
+gem "fastlane", ">= 2.127.2"
 gem "cocoapods"
 gem 'plist'

Gemfile.lock

@@ -57,9 +57,9 @@ GEM
     declarative (0.0.10)
     declarative-option (0.1.0)
     digest-crc (0.4.1)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.2)
+    dotenv (2.7.4)
     emoji_regex (1.0.1)
     escape (0.0.4)
     excon (0.64.0)
@@ -71,7 +71,7 @@ GEM
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.5)
-    fastlane (2.123.0)
+    fastlane (2.127.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -90,8 +90,8 @@ GEM
       google-cloud-storage (>= 1.15.0, < 2.0.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
-      mini_magick (~> 4.5.1)
-      multi_json
+      jwt (~> 2.1.0)
+      mini_magick (>= 4.9.4, < 5.0.0)
       multi_xml (~> 0.5)
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
@@ -121,7 +121,7 @@ GEM
       signet (~> 0.9)
     google-cloud-core (1.3.0)
       google-cloud-env (~> 1.0)
-    google-cloud-env (1.0.5)
+    google-cloud-env (1.2.0)
       faraday (~> 0.11)
     google-cloud-storage (1.16.0)
       digest-crc (~> 0.4)
@@ -147,7 +147,7 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
-    mini_magick (4.5.1)
+    mini_magick (4.9.5)
     minitest (5.11.3)
     molinillo (0.6.6)
     multi_json (1.13.1)
@@ -171,7 +171,7 @@ GEM
     retriable (3.1.2)
     rouge (2.0.7)
     ruby-macho (1.4.0)
-    rubyzip (1.2.2)
+    rubyzip (1.2.3)
     security (0.1.3)
     signet (0.11.0)
       addressable (~> 2.3)
@@ -189,10 +189,10 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tty-cursor (0.6.1)
+    tty-cursor (0.7.0)
     tty-screen (0.7.0)
-    tty-spinner (0.9.0)
-      tty-cursor (~> 0.6.0)
+    tty-spinner (0.9.1)
+      tty-cursor (~> 0.7)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
@@ -201,7 +201,7 @@ GEM
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.9.0)
+    xcodeproj (1.11.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -218,9 +218,9 @@ PLATFORMS
 DEPENDENCIES
   capistrano (= 3.4.0)
   cocoapods
-  fastlane
+  fastlane (>= 2.127.2)
   plist
   rake
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

app/app.js

@@ -1,12 +1,10 @@
-import Ember from 'ember';
-import Resolver from './resolver';
-import loadInitializers from 'ember-load-initializers';
-import config from './config/environment';
+import Ember from "ember";
+import Resolver from "./resolver";
+import loadInitializers from "ember-load-initializers";
+import config from "./config/environment";
 
 let App;
 
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
 App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,

app/locales/en/translations.js

@@ -7,6 +7,8 @@ export default {
   "language.zh": "中文",
   switch_language: "Switch language",
   loading: "Loading...",
+  loading_timeout_error: "Loading view timeout reached.",
+  loading_timeout: "This is taking too long! Click okay to reload.",
   back: "Back",
   search: "Search",
   state: "State",
@@ -724,5 +726,19 @@ export default {
       "Please ensure descriptions and images are high quality before proceeding.",
     unpublish_message:
       "You are about to unpublish this package.Clients will no longer be able to view or request it online."
+  },
+  designate_form: {
+    warning_text:
+      "Increases {{state}} quantity to {{totalQty}} for {{designationCode}}! ({{qty}} previously {{pkgState}} - item {{inventoryNumber}})",
+    warning_text_without_link:
+      "Increases {{state}} quantity to {{totalQty}} for {{orderCode}}! ({{qty}} previously {{designatedState}})",
+    designate_to: "Designate this set of items to {{orderCode}}",
+    designate_entire: "Designates entire quantity.",
+    designate_part: "Designates only part of set."
+  },
+  "dispatch-form": {
+    confirmation: "You must tick the confirmation box to proceed.",
+    dispatch_multipart: "Dispatch multi-part set to {{orderCode}}",
+    dispatch_entire: "Dispatches entire quantity."
   }
 };

app/locales/zh-tw/translations.js

@@ -3,6 +3,8 @@ export default {
   unexpected_error: "錯誤",
   okay: "確定",
   loading: "正在加載...",
+  loading_timeout_error: "讀取時限已過",
+  loading_timeout: "需時太久了！點擊重新加載",
   "language.en": "English",
   "language.zh": "中文",
   back: "返回",
@@ -712,5 +714,19 @@ export default {
       "Please ensure descriptions and images are high quality before proceeding.",
     unpublish_message:
       "You are about to unpublish this package.Clients will no longer be able to view or request it online."
+  },
+  designate_form: {
+    warning_text:
+      "增加{{state}}的數量到{{totalQty}} 對於{{designationCode}}! ({{qty}} 原本{{pkgState}}-物件{{inventory number}})",
+    warning_text_without_link:
+      "增加{{state}}的數量到{{totalQty}} 對於{{orderCode}}! ({{qty}} 原本{{designatedState}})",
+    designate_to: "指定這組物件到{{orderCode}}",
+    designate_entire: " 指定全數",
+    designate_part: "指定部份"
+  },
+  "dispatch-form": {
+    confirmation: " 您必須勾選確認方格才可繼續",
+    dispatch_multipart: " 派送多部份至{{orderCode}}",
+    dispatch_entire: "派送全部數量"
   }
 };

package.json

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