Changed validation to work on inventory received screen

Fixes #139
HospitalRun · Jul 14, 2015 · 66b4005 · 66b4005
1 parent 31ce852
commit 66b4005
Showing 1 changed file with 11 additions and 20 deletions.
diff --git a/app/models/inventory.js b/app/models/inventory.js
@@ -1,5 +1,11 @@
 import AbstractModel from "hospitalrun/models/abstract";
-
+var validateIfNewItem = {
+    if: function validateNewItem(object) {
+        var skipSavePurchase = object.get('skipSavePurchase');
+        //Only validate on new items and only if we are saving a purchase.        
+        return (!skipSavePurchase && object.get('isNew'));
+    }
+};
 export default AbstractModel.extend({
     purchases: DS.hasMany('inv-purchase'),
     locations: DS.hasMany('inv-location'),
@@ -26,31 +32,21 @@ export default AbstractModel.extend({
             presence: true,
         },
         purchaseCost: {
-            numericality: {
-                if: function(object) {
-                    //Only validate on new items
-                    return (object.get('isNew'));
-                }
-            }
+            numericality: validateIfNewItem
         },
         name: {
             presence: true,
         },
         quantity: {
-            numericality: true
+            numericality: validateIfNewItem
         },
         price: {
             numericality: {
                 allowBlank: true
             }
         },
         originalQuantity: {
-            presence: {
-                if: function(object) {
-                    //Only validate on new items
-                    return (object.get('isNew'));
-                }
-            }            
+            presence: validateIfNewItem         
         },
         reorderPoint: {
             numericality: {
@@ -61,12 +57,7 @@ export default AbstractModel.extend({
             presence: true,
         },
         vendor: {
-            presence: {
-                if: function(object) {
-                    //Only validate on new items
-                    return (object.get('isNew'));
-                }
-            }          
+            presence: validateIfNewItem
         }
     },