Merge pull request #20 from OpenBuildings/price-validation-fix

Allow zero price for shipping group
OpenBuildings · Oct 18, 2017 · 12d9a40 · 12d9a40
2 parents 1dc9ccc + 4b74260
commit 12d9a40
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/classes/Kohana/Model/Shipping/Group.php b/classes/Kohana/Model/Shipping/Group.php
@@ -30,7 +30,8 @@ public static function initialize(Jam_Meta $meta)
 				'additional_item_price' => Jam::field('price', array('convert_empty' => FALSE)),
 				'discount_threshold' => Jam::field('price'),
 			))
-			->validator('price', 'shipping', 'location', 'method', 'delivery_time', array('present' => TRUE))
+			->validator('shipping', 'location', 'method', 'delivery_time', array('present' => TRUE))
+			->validator('price', array('present' => array('allow_zero' => TRUE)))
 			->validator('additional_item_price', 'discount_threshold', 'price', array('price' => array('greater_than_or_equal_to' => 0)))
 			->validator('delivery_time', array('range' => array('consecutive' => TRUE, 'greater_than_or_equal_to' => 0)));
 	}