Merge pull request #278 from crossroads/master

#Feb2019Release1
crossroads · Mar 6, 2019 · 562629c · 562629c
2 parents 066ee3e + 84836d5
commit 562629c
Show file tree

Hide file tree

Showing 7 changed files with 989 additions and 974 deletions.
diff --git a/app/controllers/receive_package.js b/app/controllers/receive_package.js
@@ -141,9 +141,9 @@ export default Ember.Controller.extend({
       pkg.set('inventoryNumber', null);
       pkg.save()
         .then(() => {
-          new AjaxPromise("/inventory_numbers/remove_number", "PUT", _this.get('session.authToken'), { code: inventoryNumber }).then(() => {
-            _this.transitionToRoute("review_offer.receive");
-          });
+          new AjaxPromise("/inventory_numbers/remove_number", "PUT", _this.get('session.authToken'), { code: inventoryNumber }).then(() => {})
+          .catch(() => {})
+          .finally(() => _this.transitionToRoute("review_offer.receive"));
         })
         .catch(() => {
           _this.send('pkgUpdateError', pkg);

diff --git a/config/environment.js b/config/environment.js
@@ -45,6 +45,10 @@ module.exports = function(environment) {
       // Here you can pass flags/options to your application instance
       // when it is created
       NAME: 'admin.goodcity',
+      TITLE: 'Admin',
+      IOS_APP_ID: '1013288708',
+      ANDROID_APP_ID: "hk.goodcity.admin",
+      BANNER_IMAGE: 'assets/images/admin.png',
       CLOUD_NAME: 'ddoadcjjl',
       CLOUD_API_KEY: 926849638736153,
       CLOUD_URL: 'https://api.cloudinary.com/v1_1/ddoadcjjl/auto/upload',

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -15,6 +15,7 @@ module.exports = function(defaults) {
     },
     fingerprint: {
       extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map'],
+      exclude: ['images/admin.png'],
       enabled: webRelease
     },
     gzip: {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "goodcity",
-  "version": "0.15.4",
+  "version": "0.15.5",
   "description": "The GoodCity Admin app enables administrators to process donated goods.",
   "private": true,
   "directories": {

diff --git a/public/assets/images/admin.png b/public/assets/images/admin.png
diff --git a/tests/helpers/custom-helpers.js b/tests/helpers/custom-helpers.js
@@ -38,4 +38,4 @@ export default function() {
     Ember.run.scheduleOnce('afterRender', this, callback);
   });
 
-}()
+}() // jshint ignore:line
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,4 +38,4 @@ export default function() { @@
         Ember.run.scheduleOnce('afterRender', this, callback);
       });
-    }()
+    }() // jshint ignore:line