radiant-shop-extension 0.11.5 → 0.11.6

data/app/models/shop_order.rb

@@ -2,8 +2,10 @@ class ShopOrder < ActiveRecord::Base
   
   default_scope :order => 'shop_orders.updated_at DESC'
   
-  has_one   :payment,     :class_name => 'ShopPayment',   :foreign_key => :order_id,  :dependent => :destroy
-  has_many  :line_items,  :class_name => 'ShopLineItem',  :foreign_key => :order_id,  :dependent => :destroy
+  has_one    :payment,     :class_name => 'ShopPayment',        :foreign_key => :order_id,  :dependent => :destroy
+  has_many   :line_items,  :class_name => 'ShopLineItem',       :foreign_key => :order_id,  :dependent => :destroy
+  has_many :discountables, :class_name => 'ShopDiscountable', :foreign_key  => :discounted_id
+  has_many   :discounts,   :class_name => 'ShopDiscount',     :through      => :discountables
   
   belongs_to :billing,    :class_name => 'ShopAddress'
   belongs_to :shipping,   :class_name => 'ShopAddress'
@@ -15,6 +17,34 @@ class ShopOrder < ActiveRecord::Base
   accepts_nested_attributes_for :billing,     :reject_if => :all_blank
   accepts_nested_attributes_for :shipping,    :reject_if => :all_blank
   
+  def price
+    price = 0; line_items.map { |l| price += l.price }
+    
+    price += tax if Radiant::Config['shop.tax_strategy'] === 'exclusive'
+    
+    price
+  end
+  
+  def weight
+    weight = 0; line_items.map { |l| weight += l.weight }
+    weight
+  end
+  
+  def tax
+    price      = 0; line_items.map { |l| price += l.price; }
+    tax        = 0
+    percentage = Radiant::Config['shop.tax_percentage'].to_f * 0.01
+    
+    case Radiant::Config['shop.tax_strategy']
+    when 'inclusive'
+      tax = price - (price / (1 + percentage))
+    when 'exclusive'
+      tax = price * percentage
+    end
+    
+    BigDecimal.new(tax.to_s)
+  end
+  
   def add!(id, quantity = nil, type = nil)
     result = true
     
@@ -86,18 +116,6 @@ class ShopOrder < ActiveRecord::Base
     self.line_items.sum(:quantity)
   end
   
-  def price
-    price = 0
-    self.line_items.map { |l| price += l.price }
-    price
-  end
-  
-  def weight
-    weight = 0
-    self.line_items.map { |l| weight += l.weight }
-    weight
-  end
-  
   def new?
     self.status === 'new'
   end
@@ -112,22 +130,17 @@ class ShopOrder < ActiveRecord::Base
   end
   
   class << self
-    def search(search = nil)
-      unless search.blank?
-        search = search.downcase
-        
-        queries = []
-        queries << 'LOWER(status) LIKE (:term)'
-        
-        sql = queries.join(' OR ')
-        
-        # This looks tricky, but not subject to sql injection :-)
-        conditions = [sql, {:term => "%#{search}%" }]
+    
+    # Will scope the contained find calls to a specific status
+    def scope_by_status(status)
+      case status
+      when 'new', 'shipped', 'paid'
+        with_scope(:find => { :conditions => {:status => status}}) do
+          yield
+        end
       else
-        conditions = []
+        yield
       end
-      
-      all(:conditions => conditions)
     end
     
     def params

data/app/models/shop_product.rb

@@ -14,6 +14,8 @@ class ShopProduct < ActiveRecord::Base
   has_many    :packages,    :class_name => 'ShopPackage',           :foreign_key  => :package_id,   :through   => :packings, :source => :package
   has_many    :related,     :class_name => 'ShopProduct',           :through      => :packings,     :source    => :product,  :uniq => true
   has_many    :variants,    :class_name => 'ShopProductVariant',    :foreign_key  => :product_id,   :dependent => :destroy
+  has_many  :discountables, :class_name => 'ShopDiscountable',      :foreign_key  => :discounted_id
+  has_many    :discounts,   :class_name => 'ShopDiscount',          :through      => :discountables
   
   before_validation             :assign_slug, :assign_breadcrumb
   validates_presence_of         :page
@@ -23,6 +25,8 @@ class ShopProduct < ActiveRecord::Base
   accepts_nested_attributes_for :page
   accepts_nested_attributes_for :variants
   
+  after_create                  :assign_discounts
+  
   # Returns the title of the product's page
   def name; page.title; end
   
@@ -122,4 +126,11 @@ class ShopProduct < ActiveRecord::Base
     end
   end
   
+  # Assigns discounts based off categories discounts
+  def assign_discounts
+    category.discounts.each do |discount|      
+      ShopDiscountable.create(:discount => discount, :discounted => self)
+    end
+  end
+  
 end

data/app/models/shop_product_variant.rb

@@ -9,6 +9,9 @@ class ShopProductVariant < ActiveRecord::Base
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
   
+  has_many    :line_items,  :class_name => 'ShopLineItem',          :foreign_key  => :item_id,      :dependent => :destroy
+  has_many    :orders,      :class_name => 'ShopOrder',             :through      => :line_items,   :uniq      => true
+  
   # Returns the price of the variant plus the product price
   def price
     price = product.price

data/app/models/shop_variant.rb

@@ -2,9 +2,7 @@ class ShopVariant < ActiveRecord::Base
   
   belongs_to  :created_by,  :class_name => 'User'
   belongs_to  :updated_by,  :class_name => 'User'
-  
-  has_many    :categories,  :class_name => 'ShopCategory', :foreign_key => 'variant_id'
-  
+
   validates_presence_of   :name
   validates_uniqueness_of :name
   validates_presence_of   :options_json

data/app/views/admin/shop/discounts/edit.html.haml

@@ -0,0 +1,11 @@
+- @page_title = @shop_discount.name
+
+- render_region :main do |main|
+  - main.head do
+    = render 'admin/shop/discounts/edit/head'
+
+  - main.popups do
+    = render 'admin/shop/discounts/edit/popups'
+
+  - main.form do
+    = render 'admin/shop/discounts/edit/form'

data/app/views/admin/shop/discounts/edit/_foot.html.haml

@@ -0,0 +1,16 @@
+- render_region :foot do |foot|
+  - foot.buttons do
+    %p.buttons
+      = save_model_button(@shop_discount)
+      = save_model_and_continue_editing_button(@shop_discount)
+      = t('or')
+      = link_to t('cancel'), admin_shop_discounts_path
+  - foot.timestamp do
+    = updated_stamp @shop_discount
+
+- unless @shop_discount.new_record?
+  :javascript
+    if(typeof(ROUTES) === 'undefined') ROUTES = new Array();
+    
+    ROUTES['admin_shop_discount_discountables_path'] = "#{admin_shop_discount_discountables_path(@shop_discount)}";
+    ROUTES['admin_shop_discount_discountable_path']  = "#{admin_shop_discount_discountable_path(@shop_discount, ':id')}";

data/app/views/admin/shop/discounts/edit/_form.html.haml

@@ -0,0 +1,15 @@
+- form_for [:admin, @shop_discount], :html => {'data-onsubmit_status'=>"Saving Changes…"} do |f|
+  = hidden_field_tag 'shop_discount_id',@shop_discount.id 
+  
+  - render_region :form do |form|  
+    - form.inputs do
+      = render :partial => '/admin/shop/discounts/edit/inputs',  :locals => { :f => f }
+
+    - form.meta do
+      = render :partial => '/admin/shop/discounts/edit/meta',    :locals => { :f => f }
+
+    - form.parts do
+      = render :partial => '/admin/shop/discounts/edit/parts',   :locals => { :f => f }
+
+    - form.foot do
+      = render :partial => 'admin/shop/discounts/edit/foot',     :locals => { :f => f }

data/app/views/admin/shop/discounts/edit/_head.html.haml

@@ -0,0 +1,4 @@
+%h1
+  = @page_title
+  - @buttons.each do |button|
+    = render :partial => "admin/shop/discounts/edit/buttons/#{button}"

data/app/views/admin/shop/discounts/edit/_inputs.html.haml

@@ -0,0 +1,2 @@
+- @inputs.each do |input|
+  = render :partial => "admin/shop/discounts/edit/inputs/#{input}", :locals => { :f => f }

data/app/views/admin/shop/discounts/edit/_meta.html.haml

@@ -0,0 +1,8 @@
+- if @meta.present?
+  .drawer
+    .drawer_contents#attributes
+      %table.fieldset
+        - @meta.each do |meta|
+          = render :partial => "admin/shop/discounts/edit/meta/#{meta}", :locals => { :f => f }
+    .drawer_handle
+      %a.toggle{:href=>'#attributes', :rel=>"toggle[attributes]", :class=>"#{(meta_errors? ? 'less' : 'more')}"}= meta_label

data/app/views/admin/shop/discounts/edit/_parts.html.haml

@@ -0,0 +1,9 @@
+#tab_control
+  #tabs.tabs
+    #tab_toolbar
+  #pages.pages
+    = hidden_field_tag 'page_part_index_field' #important
+    - @parts.each do |part|
+      .page{:id => "product_page_#{part}", 'data-caption'=>h(part)}
+        .part{:id => "product_part_#{part}"}
+          = render :partial => "admin/shop/discounts/edit/parts/#{part}", :locals => { :f => f }

data/app/views/admin/shop/discounts/edit/_popups.html.haml

@@ -0,0 +1,4 @@
+#popups
+  - @popups.each do |popup|
+    .popup{ :id => "#{popup}_popup"}
+      = render :partial => "admin/shop/discounts/edit/popups/#{popup}"

data/app/views/admin/shop/discounts/edit/buttons/_browse_categories.html.haml

@@ -0,0 +1 @@
+= link_to t('browse_categories'), '#browse_categories_popup', :class => 'popup button'

data/app/views/admin/shop/discounts/edit/buttons/_browse_products.html.haml

@@ -0,0 +1 @@
+= link_to t('browse_products'), '#browse_products_popup', :class => 'popup button'

data/app/views/admin/shop/discounts/edit/inputs/_amount.html.haml

@@ -0,0 +1,3 @@
+%p.title
+  = f.label :amount, t('amount')
+  = f.text_field :amount, :class => 'textbox', :maxlenth => 255

data/app/views/admin/shop/discounts/edit/inputs/_code.html.haml

@@ -0,0 +1,3 @@
+%p.title
+  = f.label :code, t('code')
+  = f.text_field :code, :class => 'textbox', :maxlenth => 255

data/app/views/admin/shop/discounts/edit/inputs/_name.html.haml

@@ -0,0 +1,3 @@
+%p.title
+  = f.label :name, t('name')
+  = f.text_field :name, :class => 'textbox', :maxlenth => 255

data/app/views/admin/shop/discounts/edit/meta/_finish.html.haml

@@ -0,0 +1,5 @@
+%tr
+  %th.label
+    = f.label :finishes_at, t('finishes')
+  %td.field
+    = f.text_field :finishes_at, :class => 'date'

data/app/views/admin/shop/discounts/edit/meta/_start.html.haml

@@ -0,0 +1,5 @@
+%tr
+  %th.label
+    = f.label :starts_at, t('starts')
+  %td.field
+    = f.text_field :starts_at, :class => 'date'

data/app/views/admin/shop/discounts/edit/parts/_categories.html.haml

@@ -0,0 +1,3 @@
+%ul#discount_categories.categories.discounteds
+  - @shop_discount.discountables.for('ShopCategory').each do |category|
+    = render :partial => 'admin/shop/discounts/edit/shared/category', :locals => { :category => category }

data/app/views/admin/shop/discounts/edit/parts/_products.html.haml

@@ -0,0 +1,3 @@
+%ul#discount_products.products.discounteds
+  - @shop_discount.discountables.for('ShopProduct').each do |product|
+    = render :partial => 'admin/shop/discounts/edit/shared/product', :locals => { :product => product }

data/app/views/admin/shop/discounts/edit/popups/_browse_categories.html.haml

@@ -0,0 +1,6 @@
+%h3.title Browse Categories
+
+%ul#available_categories.availables
+  = render :partial => '/admin/shop/discounts/edit/shared/category', :collection => @shop_discount.available_categories
+
+%a#browse_categories_popup_close.close{ :href => '#browse_categories_popup_close' }

data/app/views/admin/shop/discounts/edit/popups/_browse_products.html.haml

@@ -0,0 +1,6 @@
+%h3.title Browse Products
+
+%ul#available_products.availables
+  = render :partial => '/admin/shop/discounts/edit/shared/product', :collection => @shop_discount.available_products
+
+%a#browse_products_popup_close.close{ :href => '#browse_products_popup_close' }

data/app/views/admin/shop/discounts/edit/shared/_category.html.haml

@@ -0,0 +1,11 @@
+- discounted_type = category.class.to_s
+- discounted_id   = discounted_type == "ShopCategory" ? category.id           : category.discounted_id
+- discountable_id = discounted_type == "ShopCategory" ? nil                   : category.id
+- success_element = discounted_type == "ShopCategory" ? 'discount_categories' : 'available_categories'
+- class_type      = discounted_type == "ShopCategory" ? "available"           : "discounted"
+
+%li.category{:class => "discountable #{class_type} category", :id => "#{discounted_type}_#{category.id}", :'data-discounted_id' => discounted_id, :'data-discounted_type' => discounted_type, :'data-discounted_type_human' => 'Category', :'data-discountable_id' => discountable_id, :'data-success_element' => success_element }
+  %span.name= truncate((category.name rescue category.discounted.name), 30, '...')
+  %span.handle= (category.handle rescue category.discounted.handle)
+  .actions
+    %span.delete

data/app/views/admin/shop/discounts/edit/shared/_product.html.haml

@@ -0,0 +1,12 @@
+- discounted_type = product.class.to_s
+
+- discounted_id   = discounted_type == "ShopProduct" ? product.id          : product.discounted_id
+- discountable_id = discounted_type == "ShopProduct" ? nil                 : product.id
+- success_element = discounted_type == "ShopProduct" ? 'discount_products' : 'available_products'
+- class_type      = discounted_type == "ShopProduct" ? "available"         : "discounted"
+
+%li.product{:class => "discountable #{class_type} product", :id => "#{class_type}_#{product.id}", :'data-discounted_id' => discounted_id, :'data-discounted_type' => discounted_type, :'data-discounted_type_human' => 'Product', :'data-discountable_id' => discountable_id, :'data-success_element' => success_element }
+  %span.name= truncate((product.name rescue product.discounted.name), 30, '...')
+  %span.sku= (product.sku rescue product.discounted.sku)
+  .actions
+    %span.delete

data/app/views/admin/shop/discounts/index.html.haml

@@ -0,0 +1,13 @@
+- @page_title = t('discounts') + ' - ' + default_page_title
+
+.outset
+
+  #head.min
+    = render :partial => '/admin/shop/discounts/index/head'
+
+  #discounts_map.map
+    %ul#discounts
+      = render :partial => '/admin/shop/discounts/index/discount', :collection => @shop_discounts
+
+  #actions
+    = render :partial => '/admin/shop/discounts/index/foot'

data/app/views/admin/shop/discounts/index/_discount.html.haml

@@ -0,0 +1,13 @@
+%li.discount.object{:id => "discount_#{discount.id}", :'data-id' => discount.id}
+  .attributes
+    %span.name.attribute
+    - render_region :body do |body|
+      - body.name do
+        %span.name.attribute= link_to discount.name, [:edit_admin, discount]
+      - body.code do
+        %span.code.attribute= discount.code
+      - body.amount do
+        %span.amount.attribute= discount.amount
+      - body.modify do
+        .modify
+          %span.remove= link_to t('remove'), [:remove_admin, discount]

data/app/views/admin/shop/discounts/index/_foot.html.haml

@@ -0,0 +1,5 @@
+%ul
+  - render_region :foot do |foot|
+    - foot.buttons do
+      - @buttons.each do |button|
+        %li= render :partial => "admin/shop/discounts/index/buttons/#{button}"

data/app/views/admin/shop/discounts/index/_head.html.haml

@@ -0,0 +1,2 @@
+- render_region :head do |head|
+  - nil

data/app/views/admin/shop/discounts/index/buttons/_new_discount.html.haml

@@ -0,0 +1 @@
+= link_to image('plus') + " " + t("add_discount"), new_admin_shop_discount_path

data/app/views/admin/shop/discounts/new.html.haml

@@ -0,0 +1,11 @@
+- @page_title = t('new_discount')
+
+- render_region :main do |main|
+  - main.head do
+    = render 'admin/shop/discounts/edit/head'
+
+  - main.popups do
+    = render 'admin/shop/discounts/edit/popups'
+
+  - main.form do
+    = render 'admin/shop/discounts/edit/form'

data/app/views/admin/shop/discounts/remove.html.haml

@@ -0,0 +1,12 @@
+%h1
+  = t('remove_discount')
+
+%p
+  = t('text.remove_discount.warning')
+
+- form_for [:admin, @shop_discount.becomes(ShopDiscount)], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing Discount…"} do
+  
+  %p.buttons
+    %input.button{:type=>"submit", :value => t('delete_variant') }/
+    = t('or')    
+    = link_to t('cancel'), admin_shop_discounts_path

data/app/views/admin/shop/orders/index.html.haml

@@ -2,7 +2,7 @@
 
 .outset
 
-  #head{ :class => "#{@buttons.empty? ? 'min' : 'full'}"}
+  #head.min
     = render :partial => '/admin/shop/orders/index/head'
   
   #orders_map.map

data/app/views/admin/shop/orders/index/_foot.html.haml

@@ -1,3 +1,5 @@
 %ul
   - render_region :foot do |foot|
-    -nil 
+    - foot.buttons do
+      - @buttons.each do |button|
+        %li= render :partial => "admin/shop/orders/index/buttons/#{button}"

data/app/views/admin/shop/orders/index/_head.html.haml

@@ -1,4 +1,2 @@
 - render_region :head do |head|
-  - head.buttons do
-    - @buttons.each do |button|
-      = render :partial => "admin/shop/orders/index/buttons/#{button}"
+  - nil

data/app/views/admin/shop/packages/index.html.haml

@@ -2,7 +2,7 @@
 
 .outset
 
-  #head{ :class => "#{@buttons.empty? ? 'min' : 'full'}"}
+  #head.min
     = render :partial => '/admin/shop/packages/index/head'
 
   #packages_map.map

data/app/views/admin/shop/packages/index/_foot.html.haml

@@ -1,7 +1,8 @@
 %ul
   - render_region :foot do |foot|
-    - foot.add do
-      %li= link_to image('plus') + " " + t("add_package"), new_admin_shop_package_path
+    - foot.buttons do
+      - @buttons.each do |button|
+        %li= render :partial => "admin/shop/packages/index/buttons/#{button}"
       
 :javascript
   if(typeof(ROUTES) === 'undefined') ROUTES = new Array();