diff --git a/.dockerignore b/.dockerignore index 2fa7c4c0..3948841a 100644 --- 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 index cdff8f32..ddc623d8 100644 --- 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 index 486452b0..8f11cf82 100644 --- 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 index 991a2d24..a488c44f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "shoppinpal-warehouse-mongo", - "version": "1.2.1", + "version": "1.2.2", "dependencies": { "bluebird": { "version": "2.9.14", diff --git a/package.json b/package.json index 6c18428d..8839199c 100644 --- 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 index dd70433a..e5cc0ee6 100755 --- 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