Merge branch 'release/v1.2.0'

ShoppinPal · Sep 19, 2016 · 789cf5d · 789cf5d
2 parents 140bc33 + d57eefc
commit 789cf5d
Show file tree

Hide file tree

Showing 20 changed files with 5,602 additions and 1,789 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+v1.2.0 - Sep 19, 2016
+- New feature for Excel File Import to generate orders for admin
+
 v1.1.1 - Aug 29, 2016
 - Hotfix bug that occured due to previous commits for Issue #191
 

diff --git a/Dockerfile b/Dockerfile
@@ -73,7 +73,7 @@ ENV SCHEME=http
 ####
 ### start: logically grouped section of steps
 ## Step 26
-RUN gosu node npm install
+RUN gosu node npm install --production
 ## Step 27
 RUN gosu node npm install grunt-cli
 ## Step 28

diff --git a/circle.yml b/circle.yml
@@ -0,0 +1,38 @@
+# circle.yml
+machine:
+  node:
+    version: 0.10.46
+  services:
+    - docker
+  hosts:
+    staging.warehouse.shoppinpal.com: 127.0.0.1
+
+  environment:
+    DATABASE_URL: mongodb://mongo-local:27017/test
+    DEBUG_OPTIONS: server:middleware:*,common:models:*,boot:*
+
+dependencies:
+  override:
+    # Extract the version number
+    - ./scripts/build/image $(grep version package.json | head -1 | tr -s ' ' | awk '{ print $2 }' | sed 's/[",]//g')
+    - docker run --name mongo-local -d mongo
+
+
+test:
+  override:
+     - docker run -d --link mongo-local --name=warehouse -p 3000:3000 -e "MONGOLAB_URI=mongodb://mongo-local:27017/test" -e "NODE_ENV=staging" shoppinpal/warehouse:$(grep version package.json | head -1 | tr -s ' ' | awk '{ print $2 }' | sed 's/[",]//g')
+     - docker ps | grep warehouse
+     - docker logs warehouse
+     #- curl --retry 10 --retry-delay 10 -v http://staging.warehouse.shoppinpal.com:3000
+
+
+deployment:
+  staging:
+    branch: develop
+    commands:
+        - ./scripts/deploy.sh $(grep version package.json | head -1 | tr -s ' ' | awk '{ print $2 }' | sed 's/[",]//g')
+
+  production:
+    branch: master
+    commands:
+      - ./scripts/deploy.sh $(grep version package.json | head -1 | tr -s ' ' | awk '{ print $2 }' | sed 's/[",]//g')
diff --git a/client/app/scripts/controllers/create-manual-order.js b/client/app/scripts/controllers/create-manual-order.js
@@ -81,35 +81,41 @@ angular.module('ShoppinPalApp').controller(
 
       this.uploader.onAfterAddingFile = function (fileItem) {
         var filename = fileItem.file.name;
-        var slicedFilename = filename.slice(0,-4);
-        var data = slicedFilename.split('-');
+        var re = /(?:\.([^.]+))?$/;
+        var fileExtension = re.exec(filename);
 
-        if (data[0]===undefined || data[1]===undefined) {
-          self.validUpload = false;
-          $spAlerts.addAlert('Filename is not valid', 'error', 5000);
-        }
-        else {
-          var storeName = data[0];
-          storeName = storeName.replace(/_/g, ' '); // . is treated as regex when
-          //console.log('regex with storeName', storeName);
+        if(fileExtension[1].toLowerCase() === 'csv'){
+          var slicedFilename = filename.slice(0,-4);
+          var data = slicedFilename.split('-');
+          if (data[0]===undefined || data[1]===undefined) {
+            self.validUpload = false;
+            $spAlerts.addAlert('Filename is not valid', 'error', 5000);
+          }
+          else {
 
-          var supplierName = data[1];
-          supplierName = supplierName.replace(/_/g, ' '); // . is treated as regex when
-          //console.log('regex with supplierName', supplierName);
+            var storeName = data[0];
+            storeName = storeName.replace(/_/g, ' '); // . is treated as regex when
 
-          if (storeExists(storeName,self.stores)) {
-            if (supplierExists(supplierName,self.suppliers)) {
-              self.validUpload = true;
+            var supplierName = data[1];
+            supplierName = supplierName.replace(/_/g, ' '); // . is treated as regex when
+
+            if (storeExists(storeName,self.stores)) {
+              if (supplierExists(supplierName,self.suppliers)) {
+                self.validUpload = true;
+              }
+              else {
+                self.validUpload = false;
+                $spAlerts.addAlert('Supplier Name is not valid', 'error', 5000);
+              }
             }
             else {
               self.validUpload = false;
-              $spAlerts.addAlert('Supplier Name is not valid', 'error', 5000);
+              $spAlerts.addAlert('Store Name is not valid', 'error', 5000);
             }
           }
-          else {
-            self.validUpload = false;
-            $spAlerts.addAlert('Store Name is not valid', 'error', 5000);
-          }
+        }
+        else if(fileExtension[1].toLowerCase() === 'xls' || fileExtension[1].toLowerCase() === 'xlsx'){
+          self.validUpload = true;
         }
       };
 

diff --git a/client/app/views/create-manual-order.html b/client/app/views/create-manual-order.html
@@ -61,7 +61,7 @@ <h2>New Stock Order</h2>
                     <div class="col-xs-8">
                         <input id="file-import-input"
                                type="file"
-                               accept=".csv"
+                               accept=".csv,.xls"
                                nv-file-select
                                uploader="orderController.uploader"/>
                         <span ng-if="orderController.uploader.queue.length===1 && orderController.validUpload">Ready for import: {{orderController.uploader.queue[0].file.name}}</span>