radiant-shop-extension 0.92.11 → 0.93.0

data/VERSION

@@ -1 +1 @@
-0.92.11
+0.93.0

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

@@ -166,7 +166,7 @@ private
     @shop_category.page = Page.new(
       :layout_id  => (Layout.find_by_name(Radiant::Config['shop.layout_category']).id rescue nil),
       :parent_id  => (Radiant::Config['shop.root_page_id'] rescue 1),
-      :parts      => [PagePart.new(:name => 'description')]
+      :parts      => [PagePart.new(:name => 'description', :filter_id => Radiant::Config['default.page.filter'])]
     )
     @shop_category.product_layout = (Layout.find_by_name(Radiant::Config['shop.layout_product']) rescue nil)
   end

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

@@ -223,7 +223,7 @@ private
     @shop_product.page = Page.new(
       :parent_id  => @shop_category.page_id,
       :layout_id  => @shop_category.product_layout_id,
-      :parts      => [PagePart.new(:name => 'description')]
+      :parts      => [PagePart.new(:name => 'description', :filter_id => Radiant::Config['default.page.filter'])]
     )
   end
   

data/app/views/admin/shop/categories/edit/parts/_description.html.haml

@@ -2,4 +2,5 @@
   - pf.fields_for :parts do |pfp|
     - if pfp.object.name == 'description'
       = pfp.hidden_field :name, :value => pfp.object.name
+      = pfp.hidden_field :filter_id, :value => pfp.object.filter_id
       ~ pfp.text_area :content, :class => "textarea large", :style => "width: 100%"

data/app/views/admin/shop/orders/edit/parts/_items.html.haml

@@ -1,7 +1,7 @@
 %ul#items
   - @shop_order.line_items.each do |item|
     %li.item
-      %h3= link_to item.item.name, [:edit_admin, item.item]
+      %h3= link_to %{#{item.item.name} (#{item.item.sku})}, [:edit_admin, item.item]
       %span.quantity== #{item.quantity}x
       %span.price_each== #{number_to_currency item.item.price} Ea.,
       %span.total== #{number_to_currency item.price}

data/app/views/admin/shop/products/edit/parts/_description.html.haml

@@ -2,4 +2,5 @@
   - pf.fields_for :parts do |pfp|
     - if pfp.object.name == 'description'
       = pfp.hidden_field :name, :value => pfp.object.name
+      = pfp.hidden_field :filter_id, :value => pfp.object.filter_id
       ~ pfp.text_area :content, :class => "textarea large", :style => "width: 100%"

data/lib/shop/tags/category.rb

@@ -82,7 +82,7 @@ module Shop
       
       desc %{ outputs the description of the current shop category }
       tag "shop:category:description" do |tag|
-        parse(TextileFilter.filter(tag.locals.shop_category.description))
+        tag.locals.shop_category.page.parts('description').render rescue nil
       end
       
       desc %{ returns a link to the current category }

data/lib/shop/tags/product.rb

@@ -64,7 +64,7 @@ module Shop
       
       desc %{ outputs the description of the current shop product}
       tag "shop:product:description" do |tag|
-        parse(TextileFilter.filter(tag.locals.shop_product.description))
+        tag.locals.shop_product.page.parts('description').render rescue nil
       end
       
       desc %{ generates a link to the products generated page }

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.92.11"
+  s.version = "0.93.0"
 
   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{2010-12-29}
+  s.date = %q{2010-12-30}
   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 = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 377
+  hash: 363
   prerelease: false
   segments: 
   - 0
-  - 92
-  - 11
-  version: 0.92.11
+  - 93
+  - 0
+  version: 0.93.0
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 +08:00
+date: 2010-12-30 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency