radiant-shop-extension 0.10.0 → 0.11.0

data/lib/shop/interface/variants.rb

@@ -0,0 +1,34 @@
+module Shop
+  module Interface
+    module Variants
+      
+      def self.included(base)
+        base.send :include, InstanceMethods
+      end
+      
+      module InstanceMethods
+        attr_accessor :variants
+        
+        protected
+
+        def load_default_shop_variants_regions
+          returning OpenStruct.new do |variants|
+            variants.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
+            variants.new = variants.edit
+            variants.index = Radiant::AdminUI::RegionSet.new do |index|
+              index.head.concat %w{buttons}
+              index.body.concat %w{name modify}
+              index.foot.concat %w{add}
+            end
+            variants.remove = variants.index
+          end
+        end
+      end
+      
+    end
+  end
+end

data/lib/shop/models/form_extension.rb

@@ -0,0 +1,23 @@
+module Shop
+  module Models
+    module FormExtension
+      
+      def self.included(base)
+        base.class_eval do
+          # Uses the page session data to find the current order
+          def find_current_order
+            @order  = ShopOrder.find(@page.request.session[:shop_order])
+            @order.update_attribute(:customer_id, (current_customer.id rescue nil)) # either assign it to a user, or don't
+          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)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shop/models/page.rb

@@ -4,8 +4,9 @@ module Shop
     
       def self.included(base)
         base.class_eval do
-          belongs_to :shop_category,  :class_name => 'ShopCategory',  :foreign_key => 'shop_category_id'
-          belongs_to :shop_product,   :class_name => 'ShopProduct',   :foreign_key => 'shop_product_id'
+          has_one :shop_category, :dependent => :delete
+          has_one :shop_product,  :dependent => :delete
+          
         end
       end
       

data/lib/shop/tags/address.rb

@@ -6,7 +6,7 @@ module Shop
       # Expand if the address has been assigned to the order
       desc %{
         Expand if an address has been assigned to the order
-      
+        
         @type@ = (billing)|(shipping)
       }
       tag 'shop:cart:address' do |tag|
@@ -21,13 +21,13 @@ module Shop
       # Expand if an address has been assigned to the order
       desc %{ Expand if an address has been assigned to the order }
       tag 'shop:cart:address:if_address' do |tag|
-        tag.expand if tag.locals.address.present?
+        tag.expand if tag.locals.address.name.present? rescue nil
       end
       
       # Expand if an address has not been assigned to the order
       desc %{ Expand if an address has not been assigned to the order }
       tag 'shop:cart:address:unless_address' do |tag|
-        tag.expand unless tag.locals.address.present?
+        tag.expand unless tag.locals.address.name.present? rescue nil
       end
       
       [:id, :name, :email, :unit, :street, :city, :state, :country, :postcode].each do |method|

data/lib/shop/tags/cart.rb

@@ -4,23 +4,23 @@ module Shop
       include Radiant::Taggable
       include ActionView::Helpers::NumberHelper
       
+      # Expand the shopping cart instance
+      # @param [Integer] id Id of the shopping cart (ShopOrder)
+      tag 'shop:cart' do |tag|
+        tag.locals.shop_order = Helpers.current_order(tag)
+        tag.expand
+      end
+      
       # Expand if a user has started a cart
       desc %{ Expand if a user has started a cart }
-      tag 'shop:if_cart' do |tag|
-        tag.expand if Helpers.current_order(tag)
+      tag 'shop:cart:if_cart' do |tag|
+        tag.expand if tag.locals.shop_order.present?
       end
       
       # Expand unless a user has started a cart
       desc %{ Expand unless a user has started a cart }
-      tag 'shop:unless_cart' do |tag|
-        tag.expand unless Helpers.current_order(tag)
-      end
-      
-      # Expand the shopping cart instance
-      # @param [Integer] id Id of the shopping cart (ShopOrder)
-      tag 'shop:cart' do |tag|
-        tag.locals.shop_order = Helpers.current_order(tag)
-        tag.expand unless tag.locals.shop_order.nil?
+      tag 'shop:cart:unless_cart' do |tag|
+        tag.expand unless tag.locals.shop_order.present?
       end
       
       # Display the cart id / status
@@ -37,11 +37,7 @@ module Shop
         attr = tag.attr.symbolize_keys
         order = tag.locals.shop_order
         
-        number_to_currency(order.price.to_f, 
-          :precision  =>(attr[:precision] || Radiant::Config['shop.price_precision']).to_i,
-          :unit       => attr[:unit]      || Radiant::Config['shop.price_unit'],
-          :separator  => attr[:separator] || Radiant::Config['shop.price_seperator'],
-          :delimiter  => attr[:delimiter] || Radiant::Config['shop.price_delimiter'])
+        Helpers.currency(order.price,attr)
       end
       
     end

data/lib/shop/tags/category.rb

@@ -38,15 +38,13 @@ module Shop
       
       tag 'shop:category:if_current' do |tag|
         
-        if tag.locals.shop_category.handle == tag.locals.page.slug
+        if tag.locals.page.shop_category == tag.locals.shop_category
           # Looking at the shop_category generated page
           tag.expand
-        elsif tag.locals.page.shop_category_id == tag.locals.shop_category.id
-          # A category page which is using this category
-          tag.expand
-        elsif tag.locals.shop_product
+          
+        elsif tag.locals.page.shop_product.present?
           # A product page
-          if tag.locals.shop_product.category == tag.locals.shop_category
+          if tag.locals.page.shop_product.category == tag.locals.shop_category
             # Where the products category is this category
             tag.expand
           end

data/lib/shop/tags/helpers.rb

@@ -2,20 +2,27 @@ module Shop
   module Tags
     class Helpers
       class << self
+        include ActionView::Helpers::NumberHelper
         
         def current_categories(tag)
           result = []
           
+          # Returns the current categories if they exist
           if tag.locals.shop_categories.present?
             result = tag.locals.shop_categories
-          
-            # Page params are protected, send is used to overcome this  
-          elsif tag.locals.page.send(:params).has_key? 'query'
-            result = ShopCategory.search(tag.locals.page.send(:params)['query'])
-            
-          elsif tag.attr['key'] and tag.attr['value']
-            result = ShopCategory.all(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
             
+          # Returns categories based on the slug of their categories parent page
+          elsif tag.attr['parent']
+            result = ShopCategory.all(
+                       :joins      => 'JOIN pages AS page ON page.id = shop_categories.page_id JOIN pages AS parent ON page.parent_id = parent.id',
+                       :conditions => [ 'parent.slug = ?', tag.attr['parent'] ]
+                     )
+                  
+          # Page params are protected, send is used to overcome this  
+          # elsif tag.locals.page.send(:params).has_key? 'query'
+          #   result = ShopCategory.search(tag.locals.page.send(:params)['query'])
+           
+          # Returns all Categories
           else
             result = ShopCategory.all
             
@@ -27,24 +34,34 @@ module Shop
         def current_category(tag)
           result = nil
           
+          # Returns the current shop_category    
           if tag.locals.shop_category.present?
             result = tag.locals.shop_category
+           
+          # Returns a category based on its name (page title)  
+          elsif tag.attr['name']
+            result = ShopCategory.first(
+                       :joins      => :page,
+                       :conditions => [ "pages.title = ?", tag.attr['name'] ]
+                     )
             
+          # Returns a category based on its handle (page slug)
+          elsif tag.attr['handle']
+            result = ShopCategory.first(
+                       :joins      => :page,
+                       :conditions => [ "pages.slug = ?", tag.attr['handle'] ]
+                     )
+           
+          # Returns the category of the current shop_product
           elsif tag.locals.shop_product.present?
-            result = tag.locals.shop_product.category
-            
-          elsif tag.attr['key'] and tag.attr['value']
-            result = ShopCategory.first(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
-            
+             result = tag.locals.shop_product.category
+                     
           elsif tag.locals.page.shop_category.present?
             result = tag.locals.page.shop_category
             
           elsif tag.locals.page.shop_product.present?
             result = tag.locals.page.shop_product.category
             
-          else
-            result = ShopCategory.find_by_handle(tag.locals.page.slug)
-            
           end
           
           result
@@ -52,19 +69,19 @@ module Shop
         
         def current_products(tag)
           result = nil
-         
+          
           if tag.locals.shop_products.present?
             result = tag.locals.shop_products
+          
+          elsif tag.attr['category']
+            result = ShopCategory.first(
+                       :joins      => :page,
+                       :conditions => [ 'page.slug = ?', tag.attr['category'] ]
+                     ).products
             
           elsif tag.locals.shop_category.present?
             result = tag.locals.shop_category.products
-                        
-          elsif tag.locals.page.send(:params).has_key? 'query'
-            result = ShopProduct.search(tag.locals.page.params['query'])
-            
-          elsif tag.attr['key'] and tag.attr['value']
-            result = ShopProduct.all(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
-            
+        
           elsif tag.locals.page.shop_category.present?
             result = tag.locals.page.shop_category.products
             
@@ -81,16 +98,27 @@ module Shop
           
           if tag.locals.shop_product.present?
             result = tag.locals.shop_product
-            
-          elsif tag.attr['key'] and tag.attr['value']
-            result = ShopProduct.first(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
-            
+          
+          # Returns a product based on its name (page title)  
+          elsif tag.attr['name']
+            result = ShopProduct.first(
+                       :joins      => :page,
+                       :conditions => [ "pages.title = ?", tag.attr['name'] ]
+                     )
+
+          # Returns a product based on its sku (page slug)
+          elsif tag.attr['sku']
+            result = ShopProduct.first(
+                       :joins      => :page,
+                       :conditions => [ "pages.slug = ?", tag.attr['sku'] ]
+                     )
+          
+          elsif tag.locals.shop_line_item.present? and tag.locals.shop_line_item.item_type === 'ShopProduct'
+            result = tag.locals.shop_line_item.item
+
           elsif tag.locals.page.shop_product.present?
             result = tag.locals.page.shop_product
             
-          else
-            result = ShopProduct.find_by_sku(tag.locals.page.slug)
-            
           end
           
           result
@@ -113,6 +141,20 @@ module Shop
           
           result
         end
+        
+        def current_line_items(tag)
+          result = nil
+          
+          if tag.locals.shop_line_items.present?
+            result = tag.locals.shop_line_items
+          elsif tag.attr['key'] and tag.attr['value']
+            result = tag.locals.shop_order.line_items.all(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
+          else
+            result = tag.locals.shop_order.line_items
+          end
+          
+          result
+        end
 
         def current_line_item(tag)
           result = nil
@@ -151,6 +193,65 @@ module Shop
           result
         end
         
+        def current_packages(tag)
+          result = nil
+          
+          if tag.locals.shop_product.present?
+            result = tag.locals.shop_product.packages
+          
+          elsif tag.attr['key'] and tag.attr['value']
+            result = ShopPackage.all(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value']})
+            
+          else
+            result = ShopPackage.all
+            
+          end
+          
+          result
+        end
+        
+        def current_package(tag)
+          result = nil
+          
+          if tag.locals.shop_package.present?
+            result = tag.locals.shop_package
+            
+          elsif tag.attr['key'] and tag.attr['value']
+            result = ShopPackage.first(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value']})
+          
+          end
+          
+          result
+        end
+        
+        def current_product_variants(tag)
+          result = nil
+          
+          if tag.locals.shop_product.present?
+            result = tag.locals.shop_product.variants
+          end
+          
+          result
+        end
+        
+        def current_product_variant(tag)
+          result = nil
+          
+          if tag.locals.shop_product_variant.present?
+            result = tag.locals.shop_product_variant
+          end
+          
+          result
+        end
+        
+        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'],
+            :separator  => attr[:separator] || Radiant::Config['shop.price_separator'],
+            :delimiter  => attr[:delimiter] || Radiant::Config['shop.price_delimiter'])
+        end
+        
       end
     end
   end

data/lib/shop/tags/item.rb

@@ -4,33 +4,34 @@ module Shop
       include Radiant::Taggable
       include ActionView::Helpers::NumberHelper
       
+      # Expand to line items
+      tag 'shop:cart:items' do |tag|
+        if tag.locals.shop_order.present?
+          tag.locals.shop_line_items = Helpers.current_line_items(tag)
+          tag.expand
+        end
+      end
+      
       # Expand if items are in cart
       desc %{ Expand if the user has added items to their cart }
-      tag 'shop:cart:if_items' do |tag|
-        tag.expand unless tag.locals.shop_order.line_items.empty?
+      tag 'shop:cart:items:if_items' do |tag|
+        tag.expand unless tag.locals.shop_line_items.empty?
       end
             
       # Expand in no items are in cart
       desc %{ Expand unless a user has added items to their cart }
-      tag 'shop:cart:unless_items' do |tag|
-        tag.expand if tag.locals.shop_order.line_items.empty?
-      end
-      
-      # Expand to line items
-      tag 'shop:cart:items' do |tag|
-        tag.expand
+      tag 'shop:cart:items:unless_items' do |tag|
+        tag.expand if tag.locals.shop_line_items.empty?
       end
       
       # Iterate through each item in the cart
       desc %{ Iterate through each item in the cart }
       tag 'shop:cart:items:each' do |tag|
         content = ''
-        items = tag.locals.shop_order.line_items
+        items = tag.locals.shop_line_items
         
         items.each do |line_item|
           tag.locals.shop_line_item = line_item
-          tag.locals.shop_product = line_item.item
-          
           content << tag.expand
         end
         
@@ -42,9 +43,8 @@ module Shop
       tag 'shop:cart:item' do |tag|
         tag.locals.shop_line_item = Helpers.current_line_item(tag)
         
-        unless tag.locals.shop_line_item.nil?
-          line_item = tag.locals.shop_line_item
-          tag.locals.shop_product = line_item.item
+        if tag.locals.shop_line_item.present?
+          tag.locals.shop_product = tag.locals.shop_line_item.item
           
           tag.expand
         end
@@ -84,24 +84,7 @@ module Shop
         attr = tag.attr.symbolize_keys
         item = tag.locals.shop_line_item
         
-        number_to_currency(item.price.to_f, 
-          :precision  =>(attr[:precision] || Radiant::Config['shop.price_precision']).to_i,
-          :unit       => attr[:unit]      || Radiant::Config['shop.price_unit'],
-          :separator  => attr[:separator] || Radiant::Config['shop.price_seperator'],
-          :delimiter  => attr[:delimiter] || Radiant::Config['shop.price_delimiter'])
-      end
-      
-      # Output a link to remove the item from the cart
-      desc %{ outputs a link to remove the item from the cart }
-      tag 'shop:cart:item:remove' do |tag|
-        item = tag.locals.shop_line_item
-        options = tag.attr.dup
-        attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
-        attributes = " #{attributes}" unless attributes.empty?
-        
-        text = tag.double? ? tag.expand : 'remove'
-        
-        %{<a href="/#{Radiant::Config['shop.url_prefix']}/cart/items/#{item.id}/destroy"#{attributes}>#{text}</a>}
+        Helpers.currency(item.price,attr)
       end
       
     end