radiant-shop-extension 0.94.5 → 0.94.6

data/VERSION

@@ -1 +1 @@
-0.94.5
+0.94.6

data/app/models/shop_category.rb

@@ -1,7 +1,6 @@
 class ShopCategory < ActiveRecord::Base
   
-  default_scope :joins => 'JOIN pages AS page ON page.id = shop_categories.page_id JOIN pages AS parent ON page.parent_id = parent.id',
-    :order => 'parent.position, page.position ASC'
+  default_scope :order => 'shop_categories.position ASC'
   
   belongs_to  :page,            :dependent => :destroy
   belongs_to  :created_by,      :class_name => 'User'
@@ -68,9 +67,9 @@ class ShopCategory < ActiveRecord::Base
     
     # Sorts a group of categories based on their ID and position in an array
     def sort(category_ids)
-      category_ids.each_with_index do |id, index|
-        ShopCategory.find(id).page.update_attributes!(
-          :position  => index+1
+      category_ids.each_with_index do |id,index|
+        ShopCategory.find(id).update_attributes!(
+          :position  => index
         )
       end
     end

data/app/views/admin/shop/categories/index/_category.html.haml

@@ -6,7 +6,7 @@
       - body.name do
         %span.name.attribute= link_to category.name, edit_admin_shop_category_path(category)
       - body.handle do
-        %span.handle.attribute= category.handle
+        %span.handle.attribute= category.page.url
       - body.modify do
         .modify
           %span.add_child= link_to t('add_product'), new_admin_shop_category_product_path(category)

data/db/migrate/20110119095350_add_position_to_shop_category.rb

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

data/lib/shop/tags/address.rb

@@ -30,7 +30,12 @@ module Shop
       
         [:id, :name, :phone, :email, :unit, :street_1, :street_2, :city, :state, :country, :postcode].each do |method|
           tag "shop:cart:#{of_type}:#{method}" do |tag|
-            tag.locals.send(of_type).send(method) rescue nil # Rescue is so we can have null inputs if no address exists
+            # Rescue is so we can have null inputs if no address exists
+            result = (tag.locals.send(of_type).send(method) rescue nil)
+            result = (Forms::Tags::Responses.current(tag,request).result[of_type.to_sym][method] rescue nil) unless result.present?
+            result = (UserActionObserver.current_user.send(of_type).send(method) rescue nil) unless result.present?
+            
+            result
           end
         end
       end

data/lib/shop/tags/helpers.rb

@@ -48,6 +48,12 @@ module Shop
                        :conditions => [ "pages.slug = ?", tag.attr['handle'] ]
                      )
           
+           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
+          
           # Returns the current shop_category    
           elsif tag.locals.shop_category.present?
             result = tag.locals.shop_category
@@ -55,12 +61,6 @@ module Shop
           # Returns the category of the current shop_product
           elsif tag.locals.shop_product.present?
              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
             
           end
           
@@ -73,7 +73,7 @@ module Shop
           if tag.attr['category']
             result = ShopCategory.first(
                        :joins      => :page,
-                       :conditions => [ 'page.slug = ?', tag.attr['category'] ]
+                       :conditions => [ 'pages.slug = ?', tag.attr['category'] ]
                      ).products
           
           elsif tag.locals.shop_products.present?
@@ -109,6 +109,9 @@ module Shop
                        :joins      => :page,
                        :conditions => [ "pages.slug = ?", tag.attr['sku'] ]
                      )
+                     
+          elsif tag.locals.page.shop_product.present?
+            result = tag.locals.page.shop_product
           
           elsif tag.locals.shop_product.present?
             result = tag.locals.shop_product
@@ -120,9 +123,6 @@ module Shop
             
           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
             
           end
           

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.94.5"
+  s.version = "0.94.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "John Barker", "Darcy Laycock"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-02-21}
   s.description = %q{Radiant Shop is an attempt at a simple but complete store. It includes Products, Categories, Orders and Credit Card Payments}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [
@@ -142,6 +142,7 @@ Gem::Specification.new do |s|
     "db/migrate/20101208045754_address_changes.rb",
     "db/migrate/20101208121105_move_to_page_attachments.rb",
     "db/migrate/20101214023052_fix_addressable_column_type.rb",
+    "db/migrate/20110119095350_add_position_to_shop_category.rb",
     "db/seed.rb",
     "db/seeds/forms.rb",
     "db/seeds/layouts.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 365
+  hash: 363
   prerelease: 
   segments: 
   - 0
   - 94
-  - 5
-  version: 0.94.5
+  - 6
+  version: 0.94.6
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +08:00
+date: 2011-02-21 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -299,6 +299,7 @@ files:
 - db/migrate/20101208045754_address_changes.rb
 - db/migrate/20101208121105_move_to_page_attachments.rb
 - db/migrate/20101214023052_fix_addressable_column_type.rb
+- db/migrate/20110119095350_add_position_to_shop_category.rb
 - db/seed.rb
 - db/seeds/forms.rb
 - db/seeds/layouts.rb