radiant-shop-extension 0.94.6 → 0.94.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/lib/shop/tags/helpers.rb +9 -9
- data/radiant-shop-extension.gemspec +1 -1
- metadata +3 -3
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.94.
|
|
1
|
+
0.94.7
|
data/lib/shop/tags/helpers.rb
CHANGED
|
@@ -48,12 +48,6 @@ module Shop
|
|
|
48
48
|
:conditions => [ "pages.slug = ?", tag.attr['handle'] ]
|
|
49
49
|
)
|
|
50
50
|
|
|
51
|
-
elsif tag.locals.page.shop_category.present?
|
|
52
|
-
result = tag.locals.page.shop_category
|
|
53
|
-
|
|
54
|
-
elsif tag.locals.page.shop_product.present?
|
|
55
|
-
result = tag.locals.page.shop_product.category
|
|
56
|
-
|
|
57
51
|
# Returns the current shop_category
|
|
58
52
|
elsif tag.locals.shop_category.present?
|
|
59
53
|
result = tag.locals.shop_category
|
|
@@ -61,6 +55,12 @@ module Shop
|
|
|
61
55
|
# Returns the category of the current shop_product
|
|
62
56
|
elsif tag.locals.shop_product.present?
|
|
63
57
|
result = tag.locals.shop_product.category
|
|
58
|
+
|
|
59
|
+
elsif tag.locals.page.shop_category.present?
|
|
60
|
+
result = tag.locals.page.shop_category
|
|
61
|
+
|
|
62
|
+
elsif tag.locals.page.shop_product.present?
|
|
63
|
+
result = tag.locals.page.shop_product.category
|
|
64
64
|
|
|
65
65
|
end
|
|
66
66
|
|
|
@@ -109,9 +109,6 @@ module Shop
|
|
|
109
109
|
:joins => :page,
|
|
110
110
|
:conditions => [ "pages.slug = ?", tag.attr['sku'] ]
|
|
111
111
|
)
|
|
112
|
-
|
|
113
|
-
elsif tag.locals.page.shop_product.present?
|
|
114
|
-
result = tag.locals.page.shop_product
|
|
115
112
|
|
|
116
113
|
elsif tag.locals.shop_product.present?
|
|
117
114
|
result = tag.locals.shop_product
|
|
@@ -123,6 +120,9 @@ module Shop
|
|
|
123
120
|
|
|
124
121
|
elsif tag.locals.shop_line_item.present? and tag.locals.shop_line_item.item_type === 'ShopProduct'
|
|
125
122
|
result = tag.locals.shop_line_item.item
|
|
123
|
+
|
|
124
|
+
elsif tag.locals.page.shop_product.present?
|
|
125
|
+
result = tag.locals.page.shop_product
|
|
126
126
|
|
|
127
127
|
end
|
|
128
128
|
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{radiant-shop-extension}
|
|
8
|
-
s.version = "0.94.
|
|
8
|
+
s.version = "0.94.7"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Dirk Kelly", "John Barker", "Darcy Laycock"]
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: radiant-shop-extension
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 361
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 94
|
|
9
|
-
-
|
|
10
|
-
version: 0.94.
|
|
9
|
+
- 7
|
|
10
|
+
version: 0.94.7
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Dirk Kelly
|