radiant-shop-extension 0.11.5 → 0.11.6

data/Rakefile

@@ -9,11 +9,12 @@ begin
     gem.authors = ["Dirk Kelly", "John Barker"]
     gem.add_dependency 'radiant',                     '>= 0.9.1'
     gem.add_dependency 'activemerchant',              '>= 1.8.0'
+    gem.add_dependency 'fastercsv',                   '>= 1.5.3'
     gem.add_dependency 'radiant-layouts-extension',   '>= 0.9.1'
     gem.add_dependency 'radiant-settings-extension',  '>= 1.1.1'
     gem.add_dependency 'radiant-images-extension',    '>= 0.3.2'
     gem.add_dependency 'radiant-forms-extension',     '>= 3.1.1'
-    gem.add_dependency 'radiant-scoped-extension',    '>= 0.2.1'
+    gem.add_dependency 'radiant-scoped-extension',    '>= 0.2.2'
     gem.add_dependency 'radiant-drag-extension',      '>= 0.1.0'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.11.5
+0.11.6

data/app/controllers/admin/shop/discounts/discountables_controller.rb

@@ -0,0 +1,44 @@
+class Admin::Shop::Discounts::DiscountablesController < Admin::ResourceController
+  
+  model_class ShopDiscountable
+  
+  def create
+    error = 'Could not attach Discount.'
+    begin
+      @shop_discountable.attributes = {
+        :discount_id     => params[:discount_id],
+        :discounted_id   => params[:discounted_id],
+        :discounted_type => params[:discounted_type]
+      }
+      @shop_discountable.save!
+      
+      discounted_type = @shop_discountable.discounted_type.gsub('Shop','').underscore
+      
+      respond_to do |format|
+        format.js { render :partial => "admin/shop/discounts/edit/shared/#{discounted_type}", :locals => { discounted_type.to_sym => @shop_discountable } }
+      end
+    rescue
+      respond_to do |format|
+        format.js { render :text => error, :status => :unprocessable_entity }
+      end
+    end
+  end
+  
+  def destroy
+    error = 'Could not remove Discount.'
+    begin
+      discounted_type = @shop_discountable.discounted_type.gsub('Shop','').underscore
+      
+      @shop_discountable.destroy
+      
+      respond_to do |format|
+        format.js { render :partial => "admin/shop/discounts/edit/shared/#{discounted_type}", :locals => { discounted_type.to_sym => @shop_discountable } }
+      end
+    rescue
+      respond_to do |format|
+        format.js { render :text => error, :status => :unprocessable_entity }
+      end
+    end
+  end
+  
+end

data/app/controllers/admin/shop/discounts_controller.rb

@@ -0,0 +1,64 @@
+class Admin::Shop::DiscountsController < Admin::ResourceController
+  
+  model_class ShopDiscount
+
+  before_filter :config_global
+  before_filter :config_index,  :only => [ :index ]
+  before_filter :config_new,    :only => [ :new, :create ]
+  before_filter :config_edit,   :only => [ :edit, :update ]
+  before_filter :assets_global, :except => [ :remove, :destroy ]
+  before_filter :assets_edit,   :only => [ :edit, :update ]
+  
+  private
+  
+    def config_global
+      @inputs   ||= []
+      @meta     ||= []
+      @buttons  ||= []
+      @parts    ||= []
+      @popups   ||= []
+    end
+    
+    def config_index
+      @buttons  << 'new_discount'
+    end
+    
+    def config_new
+      @inputs   << 'name'
+      @inputs   << 'amount'
+      @inputs   << 'code'
+      
+      @meta     << 'start'
+      @meta     << 'finish'
+    end
+    
+    def config_edit
+      @buttons  << 'browse_categories'
+      @buttons  << 'browse_products'
+      
+      @inputs   << 'name'
+      @inputs   << 'amount'
+      @inputs   << 'code'
+      
+      @meta     << 'start'
+      @meta     << 'finish'
+      
+      @parts    << 'categories'
+      @parts    << 'products'
+      
+      @popups   << 'browse_categories'
+      @popups   << 'browse_products'
+    end
+    
+    def assets_global
+      include_stylesheet 'admin/extensions/shop/edit'
+      include_stylesheet 'admin/extensions/shop/index'
+    end
+    
+    def assets_edit
+      include_javascript 'admin/extensions/shop/edit'
+      include_javascript 'admin/extensions/shop/discounts/edit'
+      include_stylesheet 'admin/extensions/shop/discounts/edit'
+    end
+    
+end

data/app/controllers/admin/shop/orders_controller.rb

@@ -1,3 +1,5 @@
+require 'fastercsv'
+
 class Admin::Shop::OrdersController < Admin::ResourceController
   model_class ShopOrder
 
@@ -9,7 +11,21 @@ class Admin::Shop::OrdersController < Admin::ResourceController
   before_filter :assets_index,  :only => [ :index ]
   before_filter :assets_edit,   :only => [ :edit, :update ]
   
-  private
+  alias_method :resource_controller_loads_models, :load_models
+  # Applies a scope to the orders result based on the params status
+  def load_models
+    model_class.scope_by_status(params[:status]) do
+      resource_controller_loads_models
+    end
+  end
+
+  # You can overide this to export what you desire
+  def export
+    
+  end
+  
+  
+  protected
   
     def config_global
       @inputs   ||= []
@@ -20,10 +36,10 @@ class Admin::Shop::OrdersController < Admin::ResourceController
     end
     
     def config_index
+      @buttons  << 'all'
+      @buttons  << 'new'
       @buttons  << 'shipped'
       @buttons  << 'paid'
-      @buttons  << 'new'
-      @buttons  << 'all'
     end
     
     def config_new

data/app/controllers/admin/shop/packages_controller.rb

@@ -25,9 +25,7 @@ private
   end
   
   def config_index
-    @buttons  << 'packages'
-    @buttons  << 'variants'
-    @buttons  << 'discounts'
+    @buttons  << 'new_package'
   end
   
   def config_new

data/app/controllers/admin/shop/products_controller.rb

@@ -163,9 +163,8 @@ private
   end
   
   def config_index
-    @buttons  << 'packages'
+    @buttons  << 'add_category'
     @buttons  << 'variants'
-    @buttons  << 'discounts'
   end
   
   def config_new

data/app/controllers/admin/shop/variants_controller.rb

@@ -1,7 +1,7 @@
 class Admin::Shop::VariantsController < Admin::ResourceController
   
   model_class ShopVariant
-
+  
   before_filter :config_global
   before_filter :config_index,  :only => [ :index ]
   before_filter :config_new,    :only => [ :new, :create ]
@@ -24,9 +24,8 @@ class Admin::Shop::VariantsController < Admin::ResourceController
     end
     
     def config_index
-      @buttons  << 'packages'
-      @buttons  << 'variants'
-      @buttons  << 'discounts'
+      @buttons  << 'add_variant'
+      @buttons  << 'categories'
     end
     
     def config_new

data/app/models/form_address.rb

@@ -51,8 +51,9 @@ class FormAddress
   
   # Attaches a billing address to the order (and current customer)
   def create_order_billing_address
+    
     # Billing Address
-    if billing[:id]
+    if billing[:id] and current_customer.present?
       begin
         # Use an existing Address and update its values
         @billing = current_customer.billings.find(billing[:id])
@@ -63,6 +64,7 @@ class FormAddress
       end
       
     elsif @order.billing.present?
+      
       # Use the current billing and update its values
       @billing = @order.billing
       @billing.update_attributes(billing)
@@ -73,8 +75,8 @@ class FormAddress
       if @billing.save
         @order.update_attribute(:billing, @billing)
       end
-      
     end
+    
   end
   
   # Attaches a shipping address to the order (and current customer)

data/app/models/form_discount.rb

@@ -0,0 +1,39 @@
+class FormDiscount
+  include Forms::Models::Extension
+  include Shop::Models::FormExtension
+  
+  def create
+    @result ||= { process.to_sym => false }
+    
+    find_current_order
+    
+    case process
+    when 'add'
+      if @discount = ShopDiscount.find_by_code(discount_code)
+        @discountable = @discount.discountables.create(:discounted_id => @order.id, :discounted_type => @order.class.name)
+        @result[process.to_sym] = @discountable.valid?
+      end
+    when 'remove'
+      if @discountable = @order.discountables.find(discountable_id)
+        @result[process.to_sym] = @discountable.destroy
+      end
+    end
+    
+    @result
+  end
+  
+  protected
+  
+  def process
+    @config[:process]
+  end
+  
+  def discount_code
+    @data[:discount][:code]
+  end
+  
+  def discountable_id
+    @data[:discountable][:id]
+  end
+  
+end

data/app/models/form_line_item.rb

@@ -1,5 +1,6 @@
 class FormLineItem
   include Forms::Models::Extension
+  include Shop::Models::FormExtension
   
   # line_item:
   #   process: add|update|remove
@@ -21,17 +22,6 @@ class FormLineItem
   end
   
   protected
-    
-  # Uses the page session data to find the current order
-  def find_or_create_current_order
-    begin
-      @order = ShopOrder.find(@page.request.session[:shop_order])
-    rescue
-      @order = ShopOrder.create
-      @result[:session] = { :shop_order => @order.id }
-    end
-    @order.update_attribute(:customer_id, (current_customer.id rescue nil)) # either assign it to a user, or don't
-  end
   
   def process
     @config[:process]

data/app/models/shop_category.rb

@@ -8,6 +8,9 @@ class ShopCategory < ActiveRecord::Base
   belongs_to  :updated_by,      :class_name => 'User'
   belongs_to  :product_layout,  :class_name => 'Layout'
   
+  has_many  :discountables, :class_name => 'ShopDiscountable',      :foreign_key  => :discounted_id
+  has_many    :discounts,   :class_name => 'ShopDiscount',          :through      => :discountables
+  
   before_validation             :assign_slug, :assign_breadcrumb
   
   accepts_nested_attributes_for :page

data/app/models/shop_customer.rb

@@ -2,15 +2,6 @@ class ShopCustomer < User
   
   include Scoped::Models::User::Scoped
   
-  has_many  :orders,    :class_name => 'ShopOrder', :foreign_key => :customer_id
-  has_many  :billings,  :through    => :orders
-  has_many  :shippings, :through    => :orders
-  
-  belongs_to  :created_by,  :class_name => 'User'
-  belongs_to  :updated_by,  :class_name => 'User'
-  
-  accepts_nested_attributes_for :orders, :allow_destroy => true
-  
   def first_name
     name = ''
     

data/app/models/shop_discount.rb

@@ -0,0 +1,37 @@
+class ShopDiscount < ActiveRecord::Base
+
+  # Return all discounts which are valid
+  default_scope :conditions => [
+    '(starts_at IS NULL and finishes_at IS NULL) OR (starts_at >= :now AND finishes_at <= :now) OR (starts_at IS NULL and finishes_at <= :now)', 
+    { :now => Time.now }
+  ]
+  
+  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    :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'"
+  
+  validates_presence_of     :name, :code, :amount
+  validates_uniqueness_of   :name, :code
+  validates_numericality_of :amount
+  
+  # This will override the default scope
+  def self.all_including_invalid(*attrs)
+    with_exclusive_scope{find(:all,*attrs)}
+  end
+  
+  # Return all categories minus its own
+  def available_categories
+    ShopCategory.all - categories
+  end
+  
+  # Returns all products minus its own
+  def available_products
+    ShopProduct.all - products
+  end
+  
+end

data/app/models/shop_discountable.rb

@@ -0,0 +1,64 @@
+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
+  
+  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'
+      discount.discountables.for('ShopLineItem').each do |discountable|
+        discountable.destroy
+      end
+    end
+  end
+  
+end

data/app/models/shop_line_item.rb

@@ -4,18 +4,41 @@ class ShopLineItem < ActiveRecord::Base
   has_one     :customer,    :class_name   => 'ShopCustomer', :through => :order, :source => :customer
   belongs_to  :item,        :polymorphic  => true
   
+  has_many :discountables, :class_name => 'ShopDiscountable', :foreign_key  => :discounted_id
+  has_many   :discounts,   :class_name => 'ShopDiscount',     :through      => :discountables
+  
   before_validation       :adjust_quantity
   validates_uniqueness_of :item_id, :scope => [ :order_id, :item_type ]
   validates_presence_of   :item
   
   def price
-    (item.price.to_f * self.quantity.to_f).to_f
+    price = value
+    price -= discounted
+    
+    # We never want to return a negative cost
+    [0.00,price.to_f].max
+  end
+  
+  def value
+    price = (item.price * self.quantity)
+  end
+  
+  def discounted
+    (item.price * self.quantity * discount)
   end
   
   def weight
     (item.weight.to_f * self.quantity.to_f).to_f
   end
   
+  def discount
+    discount = BigDecimal.new('0.00')
+    self.discounts.map { |d| discount += d.amount }
+    
+    # Convert to a percentage
+    discount * 0.01
+  end
+  
   class << self
     
     def params