Merge branch 'release/v1.2.3'

ShoppinPal · Oct 5, 2016 · 642905b · 642905b
2 parents 0ec7030 + dea6aa0
commit 642905b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+v1.2.3 - Oct 05,2016
+- Bug fix for additional checking required for backordered items
+
 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
 

diff --git a/common/models/container.js b/common/models/container.js
@@ -89,7 +89,7 @@ module.exports = function(Container) {
 
               orders.forEach(function (singleOrder) {
                 excelRows.forEach(function (row) {
-                  if (row.SalesOrderNumber == singleOrder.orderNumber) {
+                  if (row.QtyBackordered==0 && row.SalesOrderNumber == singleOrder.orderNumber) {
                     singleOrder.items.push({
                       sku: row.ItemNumber,
                       orderQuantity: row.QtyOrdered,

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.2",
+  "version": "1.2.3",
   "dependencies": {
     "bluebird": "2.9.14",
     "compression": "^1.0.3",