radiant-shop-extension 0.11.5 → 0.11.6

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

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

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

@@ -0,0 +1 @@
+= link_to image('plus') + " " + t("add_package"), new_admin_shop_package_path

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

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

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

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

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

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

data/app/views/admin/shop/products/index/buttons/_add_category.html.haml

@@ -0,0 +1 @@
+= link_to image('plus') + " " + t("add_category"), new_admin_shop_category_path

data/app/views/admin/shop/products/index/buttons/_variants.html.haml

@@ -1 +1 @@
-= link_to t("variants"), admin_shop_variants_path, :class => "button #{controller.controller_name == 'variants' ? 'active' : ''}"
+= link_to t("variants"), admin_shop_variants_path

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

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

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

@@ -1,4 +1,5 @@
 %ul
   - render_region :foot do |foot|
-    - foot.add do
-      %li= link_to image('plus') + " " + t("add_variant"), new_admin_shop_variant_path
+    - foot.buttons do
+      - @buttons.each do |button|
+        %li= render :partial => "admin/shop/variants/index/buttons/#{button}"

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

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

data/app/views/admin/shop/variants/index/buttons/_add_variant.html.haml

@@ -0,0 +1 @@
+= link_to image('plus') + " " + t("add_variant"), new_admin_shop_variant_path

data/app/views/admin/shop/variants/index/buttons/_categories.html.haml

@@ -0,0 +1 @@
+= link_to t("products"), admin_shop_products_path

data/config/routes.rb

@@ -7,20 +7,26 @@ ActionController::Routing::Routes.draw do |map|
       end
       
       shop.resources :products, :except => :new, :collection => { :sort => :put } do |product|
-        product.resources :images,            :controller => 'products/images',   :collection => { :sort => :put }, :only => [:index, :create, :destroy]
-        product.resources :variants,          :controller => 'products/variants', :only => [ :create, :destroy]
-        product.resources :variant_templates, :controller => 'products/variant_templates', :only => [ :update ]
+        product.resources :images,            :controller => 'products/images',             :only => [:index, :create, :destroy],   :collection => { :sort => :put }
+        product.resources :variants,          :controller => 'products/variants',           :only => [ :create, :destroy]
+        product.resources :variant_templates, :controller => 'products/variant_templates',  :only => [ :update ]
+        product.resources :discounts,         :controller => 'products/discounts',          :only => [ :create, :destroy]
+        product.resources :discount_templates,:controller => 'products/discount_templates', :only => [ :update ]
       end
       
       shop.resources :packages, :member => { :remove => :get } do |packages|
-        packages.resources :packings,         :controller => 'packages/packings', :collection => { :sort => :put }, :only => [:create, :update, :destroy]
+        packages.resources :packings,         :controller => 'packages/packings',           :only => [:create, :update, :destroy],  :collection => { :sort => :put }
+      end
+      
+      shop.resources :discounts, :member => { :remove => :get } do |discounts|
+        discounts.resources :discountables,   :controller => 'discounts/discountables',     :only => [:create,:destroy]
       end
       
       shop.resources :variants
       
       shop.resources :customers
       
-      shop.resources :orders
+      shop.resources :orders, :except => [ :destroy ], :collection => { :export => :get }
     end
 
     admin.resources :shops, :as => 'shop', :only => [ :index ]

data/db/migrate/20101010071143_create_discounts.rb

@@ -0,0 +1,29 @@
+class CreateDiscounts < ActiveRecord::Migration
+  def self.up
+    create_table :shop_discounts do |t|
+      t.string    :name
+      t.string    :code
+      t.decimal   :amount
+      
+      t.datetime  :starts_at
+      t.datetime  :finishes_at
+      
+      t.integer   :created_by
+      t.integer   :updated_by
+      
+      t.timestamps
+    end
+    
+    create_table :shop_discountables do |t|
+      t.integer   :discount_id
+      t.integer   :discounted_id
+      t.string    :discounted_type
+    end
+    
+  end
+
+  def self.down
+    remove_table :shop_discounts
+    remove_table :shop_discounteds
+  end
+end

data/db/migrate/20101010072225_modify_categories_remove_variant.rb

@@ -0,0 +1,9 @@
+class ModifyCategoriesRemoveVariant < ActiveRecord::Migration
+  def self.up
+    remove_column :shop_categories, :variant_id
+  end
+
+  def self.down
+    add_column :shop_categories, :variant_id, :integer
+  end
+end

data/db/migrate/20101010130034_change_discountables_add_observer.rb

@@ -0,0 +1,15 @@
+class ChangeDiscountablesAddObserver < ActiveRecord::Migration
+  def self.up
+    add_column :shop_discountables, :created_by, :integer
+    add_column :shop_discountables, :created_at, :datetime
+    add_column :shop_discountables, :updated_by, :integer
+    add_column :shop_discountables, :updated_at, :datetime
+  end
+
+  def self.down
+    remove_column :shop_discountables, :created_by
+    remove_column :shop_discountables, :created_at
+    remove_column :shop_discountables, :updated_at
+    remove_column :shop_discountables, :updated_by
+  end
+end

data/db/migrate/20101011063133_change_orders_set_limits_to_null.rb

@@ -0,0 +1,11 @@
+class ChangeOrdersSetLimitsToNull < ActiveRecord::Migration
+  def self.up
+    change_column :shop_discounts, :starts_at,   :datetime, :default => nil
+    change_column :shop_discounts, :finishes_at, :datetime, :default => nil
+  end
+
+  def self.down
+    change_column :shop_discounts, :starts_at,   :datetime
+    change_column :shop_discounts, :finishes_at, :datetime
+  end
+end

data/lib/shop/interface/discounts.rb

@@ -0,0 +1,34 @@
+module Shop
+  module Interface
+    module Discounts
+      
+      def self.included(base)
+        base.send :include, InstanceMethods
+      end
+      
+      module InstanceMethods
+        attr_accessor :discounts
+        
+        protected
+
+        def load_default_shop_discounts_regions
+          returning OpenStruct.new do |discounts|
+            discounts.edit = Radiant::AdminUI::RegionSet.new do |edit|
+              edit.main.concat %w{head form popups}
+              edit.form.concat %w{inputs meta parts foot}
+              edit.foot.concat %w{buttons timestamp}
+            end
+            discounts.new = discounts.edit
+            discounts.index = Radiant::AdminUI::RegionSet.new do |index|
+              index.head.concat %w{}
+              index.body.concat %w{name code amount modify}
+              index.foot.concat %w{buttons}
+            end
+            discounts.remove = discounts.index
+          end
+        end
+      end
+      
+    end
+  end
+end

data/lib/shop/interface/orders.rb

@@ -20,9 +20,9 @@ module Shop
             end
             orders.new = orders.edit
             orders.index = Radiant::AdminUI::RegionSet.new do |index|
-              index.head.concat %w{buttons}
+              index.head.concat %w{}
               index.body.concat %w{price status updated customer}
-              index.foot.concat %w{}
+              index.foot.concat %w{buttons}
             end
             orders.remove = orders.index
           end

data/lib/shop/interface/packages.rb

@@ -20,9 +20,9 @@ module Shop
             end
             packages.new = packages.edit
             packages.index = Radiant::AdminUI::RegionSet.new do |index|
-              index.head.concat %w{buttons}
+              index.head.concat %w{}
               index.body.concat %w{name modify}
-              index.foot.concat %w{add}
+              index.foot.concat %w{buttons}
             end
             packages.remove = packages.index
           end

data/lib/shop/interface/products.rb

@@ -20,11 +20,11 @@ module Shop
             end
             products.new = products.edit
             products.index = Radiant::AdminUI::RegionSet.new do |index|
-              index.head.concat     %w{buttons}
+              index.head.concat     %w{}
               index.category.concat %w{move name handle modify}
               index.products.concat %w{body}
               index.product.concat  %w{move icon name sku modify}
-              index.foot.concat     %w{add}
+              index.foot.concat     %w{buttons}
             end
             products.remove = products.index
           end

data/lib/shop/interface/variants.rb

@@ -20,9 +20,9 @@ module Shop
             end
             variants.new = variants.edit
             variants.index = Radiant::AdminUI::RegionSet.new do |index|
-              index.head.concat %w{buttons}
+              index.head.concat %w{}
               index.body.concat %w{name modify}
-              index.foot.concat %w{add}
+              index.foot.concat %w{buttons}
             end
             variants.remove = variants.index
           end

data/lib/shop/models/form_extension.rb

@@ -10,11 +10,22 @@ module Shop
             @order.update_attribute(:customer_id, (current_customer.id rescue nil)) # either assign it to a user, or don't
           end
 
+          # Uses the page session data to find or create the current order
+          def find_or_create_current_order
+            begin
+              find_current_order
+            rescue
+              @order = ShopOrder.create
+              @result[:session] = { :shop_order => @order.id }
+              @order.update_attribute(:customer_id, (current_customer.id rescue nil)) # either assign it to a user, or don't
+            end
+          end
+          
           # Returns the current logged in ShopCustomer (if it exists)
           def current_customer
             return @shop_customer if @shop_customer.present?
             return current_user if current_user.present?
-            @shop_customer = ShopCustomer.find(current_user.id)
+            @shop_customer = ShopCustomer.find(current_user.id) rescue nil
           end
         end
       end

data/lib/shop/models/user.rb

@@ -0,0 +1,18 @@
+module Shop
+  module Models
+    module User
+    
+      def self.included(base)
+        base.class_eval do
+          has_many  :orders,    :class_name => 'ShopOrder', :foreign_key => :customer_id
+          has_many  :billings,  :through    => :orders
+          has_many  :shippings, :through    => :orders
+          
+          accepts_nested_attributes_for :orders, :allow_destroy => true
+          
+        end
+      end
+      
+    end
+  end
+end

data/lib/shop/tags/cart.rb

@@ -23,6 +23,30 @@ module Shop
         tag.expand unless tag.locals.shop_order.present?
       end
       
+      # Expand the payment context for the cart
+      desc %{ Expand the payment context for the cart }
+      tag 'shop:cart:payment' do |tag|
+        tag.expand
+      end
+      
+      # Expand if the user has paid for their cart
+      desc %{ Expand if the user has paid for their cart }
+      tag 'shop:cart:payment:if_paid' do |tag|
+        tag.expand if tag.locals.shop_order.payment.present? and tag.locals.shop_order.paid?
+      end
+      
+      # Expand unless the user has paid for their cart
+      desc %{ Expand unless the user has paid for their cart }
+      tag 'shop:cart:payment:unless_paid' do |tag|
+        tag.expand unless tag.locals.shop_order.payment.present? and tag.locals.shop_order.paid?
+      end
+      
+      # Returns the date of the payment
+      desc %{ Returns the date of the payment }
+      tag 'shop:cart:payment:date' do |tag|
+        tag.locals.shop_order.payment.created_at.to_s(:long)
+      end
+      
       # Display the cart id / status
       [:id, :status, :quantity, :weight].each do |symbol|
         desc %{ outputs the #{symbol} to the cart }

data/lib/shop/tags/helpers.rb

@@ -244,7 +244,7 @@ module Shop
           result
         end
         
-        def currency(number,attr)
+        def currency(number,attr = {})
           number_to_currency(number.to_f, 
             :precision  =>(attr[:precision] || Radiant::Config['shop.price_precision']).to_i,
             :unit       => attr[:unit]      || Radiant::Config['shop.price_unit'],

data/lib/shop/tags/item.rb

@@ -59,11 +59,35 @@ module Shop
       end
       
       # Output the related elements attributes
-      [:name, :sku, :price, :weight].each do |symbol|
+      [:name, :sku].each do |symbol|
         desc %{ outputs the #{symbol} of the current cart item }
         tag "shop:cart:item:#{symbol}" do |tag|
           tag.locals.shop_line_item.item.send(symbol)
-        end        
+        end
+      end
+      
+      [:price, :value, :discounted].each do |symbol|
+        desc %{ outputs the #{symbol} of the current cart item }
+        tag "shop:cart:item:#{symbol}" do |tag|
+          attr = tag.attr.symbolize_keys
+          item = tag.locals.shop_line_item
+
+          Helpers.currency(item.send(symbol),attr)
+        end
+      end
+      
+      desc %{ expands if the item has a discount}
+      tag "shop:cart:item:if_discounted" do |tag|
+        item = tag.locals.shop_line_item
+        
+        tag.expand if item.price != item.value
+      end
+      
+      desc %{ expands if the item has a discount}
+      tag "shop:cart:item:unless_discounted" do |tag|
+        item = tag.locals.shop_line_item
+        
+        tag.expand if item.price == item.value
       end
       
       desc %{ generates a link to the items generated page }
@@ -78,15 +102,6 @@ module Shop
         %{<a href="#{item.slug}"#{attributes}>#{text}</a>}
       end
       
-      # Output the price of the line item
-      desc %{ outputs the total price of the current cart item }
-      tag 'shop:cart:item:price' do |tag|
-        attr = tag.attr.symbolize_keys
-        item = tag.locals.shop_line_item
-        
-        Helpers.currency(item.price,attr)
-      end
-      
     end
   end
 end

data/lib/shop/tags/tax.rb

@@ -0,0 +1,73 @@
+module Shop
+  module Tags
+    module Tax
+      include Radiant::Taggable
+      
+      # Expand regardless of tax conditions
+      tag 'shop:cart:tax' do |tag|
+        tag.locals.shop_tax = {
+          :strategy   => Radiant::Config['shop.tax_strategy'],
+          :name       => Radiant::Config['shop.tax_name'],
+          :percentage => Radiant::Config['shop.tax_percentage'],
+        }
+        tag.expand
+      end
+      
+      # Expand if tax is configured
+      desc %{ Expand if tax is configured }
+      tag 'shop:cart:tax:if_tax' do |tag|
+         tag.expand if ['inclusive','exclusive'].include?(tag.locals.shop_tax[:strategy])
+      end
+      
+      # Expand unless tax is configured
+      desc %{ Expand unless tax is configured }
+      tag 'shop:cart:tax:unless_tax' do |tag|
+         tag.expand unless ['inclusive','exclusive'].include?(tag.locals.shop_tax[:strategy])
+      end
+      
+      # Return the strategy of the tax
+      desc %{ Return the name of the tax }
+      tag 'shop:cart:tax:strategy' do |tag|
+         tag.locals.shop_tax[:strategy]
+      end
+      
+      # Return the strategy of the tax
+      desc %{ Return the name of the tax }
+      tag 'shop:cart:tax:strategy' do |tag|
+         tag.locals.shop_tax[:strategy]
+      end
+      
+      # Return the name of the tax
+      desc %{ Return the name of the tax }
+      tag 'shop:cart:tax:name' do |tag|
+        tag.locals.shop_tax[:name]
+      end
+      
+      # Return the percentage of the tax
+      desc %{ Return the name of the tax }
+      tag 'shop:cart:tax:percentage' do |tag|
+         tag.locals.shop_tax[:percentage]
+      end
+      
+      # Return the cost of tax on the cart
+      desc %{ Return the cost of tax on the cart }
+      tag 'shop:cart:tax:cost' do |tag|
+        attr = tag.attr.symbolize_keys
+        Helpers.currency(tag.locals.shop_order.tax,attr)
+      end
+      
+      # Expand if tax is inclusive
+      desc %{ Expand if tax is inclusive }
+      tag 'shop:cart:tax:if_inclusive' do |tag|
+         tag.expand if tag.locals.shop_tax[:strategy] === 'inclusive'
+      end
+      
+      # Expand if tax is exclusive
+      desc %{ Expand if tax is exclusive }
+      tag 'shop:cart:tax:if_exclusive' do |tag|
+         tag.expand if tag.locals.shop_tax[:strategy] === 'exclusive'
+      end
+      
+    end
+  end
+end