radiant-shop_discounts-extension 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/app/models/category_shop_discountable.rb

@@ -0,0 +1,21 @@
+class CategoryShopDiscountable < ShopDiscount
+  
+  before_validation       :create_shop_products
+  before_destroy          :destroy_shop_products
+  
+  # Adds discount to a category's products
+  def create_shop_products
+    discounted.products.each do |product|
+      # Attach discount to the child product
+      ShopDiscountable.create(:discount => discount, :discounted => product)
+    end
+  end
+  
+  # Removes discount from a category's products
+  def destroy_shop_products
+    discounted.discountables.for('ShopProduct').each do |discountable|
+      discountable.destroy
+    end
+  end
+  
+end

data/app/models/order_shop_discountable.rb

@@ -0,0 +1,23 @@
+class OrderShopDiscountable < ShopDiscountable
+    
+  before_validation       :create_shop_line_items
+  before_destroy          :destroy_shop_line_items
+  
+  # Adds discount to an order's line_items
+  def create_shop_line_items
+    discounted.line_items.each do |line_item|
+      if line_item.item.discounts.include?(discount)
+        # We're here if the item associated with the line item can be discounted
+        discount = ShopDiscountable.create(:discount_id => discount_id, :discounted => line_item)
+      end
+    end
+  end
+  
+  # Removes discount from an order's line_items
+  def destroy_shop_line_items
+    discounted.discountables.for('ShopLineItem').each do |discountable|
+      discountable.destroy
+    end
+  end
+  
+end

data/app/models/shop_discountable.rb

@@ -12,55 +12,9 @@ class ShopDiscountable < ActiveRecord::Base
   validates_presence_of   :discount, :discounted
   validates_uniqueness_of :discounted_id, :scope => [ :discount_id, :discounted_type ]
   
-  before_validation       :create_shop_products_if_shop_category
-  before_destroy          :destroy_shop_products_if_shop_category
-  
-  before_validation       :create_shop_line_items_if_shop_order
-  before_destroy          :destroy_shop_line_items_if_shop_order
-  
   # Returns discount of a class
   def self.for(type)
     all(:conditions => { :discounted_type => type.pluralize.classify })
   end
   
-  # Adds discount to a category's products
-  def create_shop_products_if_shop_category
-    if discounted_type === 'ShopCategory'
-      discounted.products.each do |product|
-        # Attach discount to the child product
-        ShopDiscountable.create(:discount => discount, :discounted => product)
-      end
-    end
-  end
-  
-  # Removes discount from a category's products
-  def destroy_shop_products_if_shop_category
-    if discounted_type === 'ShopCategory'
-      discount.discountables.for('ShopProduct').each do |discountable|
-        discountable.destroy
-      end
-    end
-  end
-  
-  # Adds discount to an order's line_items
-  def create_shop_line_items_if_shop_order
-    if discounted_type === 'ShopOrder'
-      discounted.line_items.each do |line_item|
-        if line_item.item.discounts.include?(discount)
-          # We're here if the item associated with the line item can be discounted
-          discount = ShopDiscountable.create(:discount_id => discount_id, :discounted => line_item)
-        end
-      end
-    end
-  end
-  
-  # Removes discount from an order's line_items
-  def destroy_shop_line_items_if_shop_order
-    if discounted_type === 'ShopOrder'
-      discounted.discountables.for('ShopLineItem').each do |discountable|
-        discountable.destroy
-      end
-    end
-  end
-  
 end

data/lib/shop_discounts/models/category_discountable.rb

@@ -0,0 +1,14 @@
+module ShopDiscounts
+  module Models
+    module CategoryDiscountable
+      
+      def self.included(base)
+        base.class_eval do
+          has_many  :discountables, :class_name => 'CategoryShopDiscountable', :foreign_key  => :discounted_id, :dependent => :destroy
+          has_many  :discounts,     :class_name => 'ShopDiscount',             :through      => :discountables          
+        end
+      end
+      
+    end
+  end
+end

data/lib/shop_discounts/models/order_discountable.rb

@@ -0,0 +1,14 @@
+module ShopDiscounts
+  module Models
+    module OrderDiscountable
+      
+      def self.included(base)
+        base.class_eval do
+          has_many  :discountables, :class_name => 'OrderShopDiscountable', :foreign_key  => :discounted_id, :dependent => :destroy
+          has_many  :discounts,     :class_name => 'ShopDiscount',          :through      => :discountables          
+        end
+      end
+      
+    end
+  end
+end

data/radiant-shop_discounts-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop_discounts-extension}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly"]
@@ -22,7 +22,9 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/controllers/admin/shop/discounts/discountables_controller.rb",
     "app/controllers/admin/shop/discounts_controller.rb",
+    "app/models/category_shop_discountable.rb",
     "app/models/form_discount.rb",
+    "app/models/order_shop_discountable.rb",
     "app/models/shop_discount.rb",
     "app/models/shop_discountable.rb",
     "app/views/admin/shop/discounts/edit.html.haml",
@@ -64,8 +66,10 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "features/support/paths.rb",
     "lib/radiant-shop_discounts-extension.rb",
+    "lib/shop_discounts/models/category_discountable.rb",
     "lib/shop_discounts/models/discountable.rb",
     "lib/shop_discounts/models/form_line_item.rb",
+    "lib/shop_discounts/models/order_discountable.rb",
     "lib/shop_discounts/models/purchaseable.rb",
     "lib/shop_discounts/models/shop_order.rb",
     "lib/shop_discounts/models/shop_product.rb",

data/shop_discounts_extension.rb

@@ -19,8 +19,8 @@ class ShopDiscountsExtension < Radiant::Extension
     ShopLineItem.send :include, ShopDiscounts::Models::Discountable, ShopDiscounts::Models::Purchaseable
     
     ShopProduct.send  :include, ShopDiscounts::Models::Discountable, ShopDiscounts::Models::ShopProduct
-    ShopOrder.send    :include, ShopDiscounts::Models::Discountable, ShopDiscounts::Models::ShopOrder
-    ShopCategory.send :include, ShopDiscounts::Models::Discountable
+    ShopOrder.send    :include, ShopDiscounts::Models::OrderDiscountable, ShopDiscounts::Models::ShopOrder
+    ShopCategory.send :include, ShopDiscounts::Models::CategoryDiscountable
     User.send         :include, ShopDiscounts::Models::Discountable
     
     Page.send         :include, ShopDiscounts::Tags::Cart, ShopDiscounts::Tags::Item

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop_discounts-extension
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -49,7 +49,9 @@ files:
 - VERSION
 - app/controllers/admin/shop/discounts/discountables_controller.rb
 - app/controllers/admin/shop/discounts_controller.rb
+- app/models/category_shop_discountable.rb
 - app/models/form_discount.rb
+- app/models/order_shop_discountable.rb
 - app/models/shop_discount.rb
 - app/models/shop_discountable.rb
 - app/views/admin/shop/discounts/edit.html.haml
@@ -91,8 +93,10 @@ files:
 - features/support/env.rb
 - features/support/paths.rb
 - lib/radiant-shop_discounts-extension.rb
+- lib/shop_discounts/models/category_discountable.rb
 - lib/shop_discounts/models/discountable.rb
 - lib/shop_discounts/models/form_line_item.rb
+- lib/shop_discounts/models/order_discountable.rb
 - lib/shop_discounts/models/purchaseable.rb
 - lib/shop_discounts/models/shop_order.rb
 - lib/shop_discounts/models/shop_product.rb