Merge branch 'release/v1.2.2'

ShoppinPal · Sep 28, 2016 · 0ec7030 · 0ec7030
2 parents e288f62 + ecdd057
commit 0ec7030
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,3 +3,5 @@ node_modules
 circle.yml
 README.md
 server/boot/explorer.js
+scripts
+docs
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+v1.2.2 - Sep 28, 2016
+- Hotfix bug for excel file feature which had issue of naming of products in reports not according to Vend
+
 v1.2.1 - Sep 20, 2016
 - Fix for issue #206 by adding newRelic agent for performance monitoring (PR #205)
 - Fix for issue #199 by removing caseQuantity constraints (PR #209)

diff --git a/common/models/container.js b/common/models/container.js
@@ -92,7 +92,6 @@ module.exports = function(Container) {
                   if (row.SalesOrderNumber == singleOrder.orderNumber) {
                     singleOrder.items.push({
                       sku: row.ItemNumber,
-                      name: row.ItemDescription,
                       orderQuantity: row.QtyOrdered,
                       supplyPrice: row.UnitPrice
                     });

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shoppinpal-warehouse-mongo",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "dependencies": {
     "bluebird": "2.9.14",
     "compression": "^1.0.3",

diff --git a/scripts/release/make-branch b/scripts/release/make-branch
@@ -22,8 +22,7 @@ echo "Write release notes in CHANGELOG.txt"
 $editor CHANGELOG.txt
 
 git diff
-echo "Verify changes before commit. Exit the shell to commit changes"
-$SHELL || true
+echo "Verify changes before commit."
 git commit -a -m "Bump ${RELEASE_VERSION}" --signoff --no-verify