add priority to promotions

OpenBuildings · Nov 1, 2013 · 9ef19d7 · 9ef19d7
1 parent 340e155
commit 9ef19d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/classes/Kohana/Jam/Behavior/Promotable/Store/Purchase.php b/classes/Kohana/Jam/Behavior/Promotable/Store/Purchase.php
@@ -81,6 +81,6 @@ public function update_promotion_items(Model_Store_Purchase $store_purchase)
 	 */
 	public function available_promotions()
 	{
-		return Jam::all('promotion')->not_expired();
+		return Jam::all('promotion')->not_expired()->order_by('priority', 'ASC');
 	}
 }
diff --git a/classes/Kohana/Model/Promotion.php b/classes/Kohana/Model/Promotion.php
@@ -32,6 +32,7 @@ public static function initialize(Jam_Meta $meta)
 				'currency' => Jam::field('string'),
 				'identifier' => Jam::field('string'),
 				'description' => Jam::field('text'),
+				'priority' => Jam::field('integer', array('default' => 1)),
 				'model' => Jam::field('polymorphic'),
 				'created_at' => Jam::field('timestamp', array(
 					'format' => 'Y-m-d H:i:s',

diff --git a/tests/test_data/structure.sql b/tests/test_data/structure.sql
@@ -126,6 +126,7 @@ CREATE TABLE `promotions` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(255) DEFAULT NULL,
   `identifier` varchar(255) DEFAULT NULL,
+  `priority` int(11) DEFAULT 0,
   `model` varchar(100) DEFAULT NULL,
   `requirement` varchar(255) DEFAULT NULL,
   `amount` int(11) DEFAULT NULL,