radiant-shop_discounts-extension 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/app/models/shop_discount.rb

@@ -9,13 +9,18 @@ class ShopDiscount < ActiveRecord::Base
   belongs_to  :created_by,  :class_name => 'User'
   belongs_to  :updated_by,  :class_name => 'User'
   
-  has_many    :discountables, :class_name => 'ShopDiscountable', :foreign_key  => :discount_id
+  has_many    :discountables,            :class_name => 'ShopDiscountable',         :foreign_key  => :discount_id
   
-  has_many    :categories,  :through => :discountables, :source => :category, :conditions => "shop_discountables.discounted_type = 'ShopCategory'"
   has_many    :products,    :through => :discountables, :source => :product,  :conditions => "shop_discountables.discounted_type = 'ShopProduct'"
-  has_many    :orders,      :through => :discountables, :source => :order,    :conditions => "shop_discountables.discounted_type = 'ShopOrder'"
-  has_many    :line_items,  :through => :discountables, :source => :line_item,:conditions => "shop_discountables.discounted_type = 'ShopLineItem'"
   has_many    :users,       :through => :discountables, :source => :user,     :conditions => "shop_discountables.discounted_type = 'User'"
+  has_many    :line_items,  :through => :discountables, :source => :line_item,:conditions => "shop_discountables.discounted_type = 'ShopLineItem'"
+  
+  has_many    :discountables_categories, :class_name => 'ShopDiscountableCategory', :foreign_key  => :discount_id
+  has_many    :categories,  :through => :discountables_categories, :source => :category, :conditions => "shop_discountables.discounted_type = 'ShopCategory'"
+  
+  has_many    :discountables_orders,      :class_name => 'ShopDiscountableOrder',    :foreign_key  => :discount_id
+  has_many    :orders,      :through => :discountable_orders, :source => :order, :conditions => "shop_discountables.discounted_type = 'ShopOrder'"
+
   
   validates_presence_of     :name, :code, :amount
   validates_uniqueness_of   :name, :code

data/app/models/shop_discountable.rb

@@ -3,9 +3,7 @@ class ShopDiscountable < ActiveRecord::Base
   belongs_to :discount,   :class_name => 'ShopDiscount',  :foreign_key => :discount_id
   belongs_to :discounted, :foreign_key => :discounted_id, :polymorphic => true
   
-  belongs_to :category,   :class_name => 'ShopCategory',  :foreign_key => :discounted_id
   belongs_to :product,    :class_name => 'ShopProduct',   :foreign_key => :discounted_id
-  belongs_to :order,      :class_name => 'ShopOrder',     :foreign_key => :discounted_id
   belongs_to :line_item,  :class_name => 'ShopLineItem',  :foreign_key => :discounted_id
   belongs_to :user,       :class_name => 'User',          :foreign_key => :discounted_id
   

data/app/models/{category_shop_discountable.rb → shop_discountable_category.rb}

@@ -1,8 +1,10 @@
-class CategoryShopDiscountable < ShopDiscount
+class ShopDiscountableCategory < ShopDiscountable
   
   before_validation       :create_shop_products
   before_destroy          :destroy_shop_products
   
+  belongs_to :category,   :class_name => 'ShopCategory',  :foreign_key => :discounted_id
+  
   # Adds discount to a category's products
   def create_shop_products
     discounted.products.each do |product|

data/app/models/{order_shop_discountable.rb → shop_discountable_order.rb}

@@ -1,8 +1,10 @@
-class OrderShopDiscountable < ShopDiscountable
+class ShopDiscountableOrder < ShopDiscountable
     
   before_validation       :create_shop_line_items
   before_destroy          :destroy_shop_line_items
   
+  belongs_to :order,      :class_name => 'ShopOrder',     :foreign_key => :discounted_id
+  
   # Adds discount to an order's line_items
   def create_shop_line_items
     discounted.line_items.each do |line_item|

data/lib/shop_discounts/models/category_discountable.rb

@@ -4,7 +4,7 @@ module ShopDiscounts
       
       def self.included(base)
         base.class_eval do
-          has_many  :discountables, :class_name => 'CategoryShopDiscountable', :foreign_key  => :discounted_id, :dependent => :destroy
+          has_many  :discountables, :class_name => 'ShopDiscountableCategory', :foreign_key  => :discounted_id, :dependent => :destroy
           has_many  :discounts,     :class_name => 'ShopDiscount',             :through      => :discountables          
         end
       end

data/lib/shop_discounts/models/order_discountable.rb

@@ -4,7 +4,7 @@ module ShopDiscounts
       
       def self.included(base)
         base.class_eval do
-          has_many  :discountables, :class_name => 'OrderShopDiscountable', :foreign_key  => :discounted_id, :dependent => :destroy
+          has_many  :discountables, :class_name => 'ShopDiscountableOrder', :foreign_key  => :discounted_id, :dependent => :destroy
           has_many  :discounts,     :class_name => 'ShopDiscount',          :through      => :discountables          
         end
       end

data/lib/shop_discounts/models/shop_product.rb

@@ -8,7 +8,7 @@ module ShopDiscounts
           
           # Assigns discounts based off categories discounts
           def assign_discounts
-            category.discounts.each do |discount|      
+            category.discounts.each do |discount|
               ShopDiscountable.create(:discount => discount, :discounted => self)
             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.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly"]
@@ -22,11 +22,11 @@ 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/models/shop_discountable_category.rb",
+    "app/models/shop_discountable_order.rb",
     "app/views/admin/shop/discounts/edit.html.haml",
     "app/views/admin/shop/discounts/edit/_foot.html.haml",
     "app/views/admin/shop/discounts/edit/_form.html.haml",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop_discounts-extension
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -49,11 +49,11 @@ 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/models/shop_discountable_category.rb
+- app/models/shop_discountable_order.rb
 - app/views/admin/shop/discounts/edit.html.haml
 - app/views/admin/shop/discounts/edit/_foot.html.haml
 - app/views/admin/shop/discounts/edit/_form.html.haml