spree_zoned 0.5.16 → 0.5.17

Sign up to get free protection for your applications and to get access to all the features.
@@ -40,8 +40,8 @@ protected
40
40
  @collection = @search.result.
41
41
  joins(
42
42
  'LEFT OUTER JOIN spree_zoned_products ON spree_zoned_products.spree_product_id = spree_products.id' +
43
- " AND spree_zoned_products.spree_country_id = #{country}").where(
44
- '(spree_zoned_products.orderno IS NULL OR spree_zoned_products.orderno >= 0)').
43
+ " AND spree_zoned_products.spree_country_id = #{country}").
44
+ #where('(spree_zoned_products.orderno IS NULL OR spree_zoned_products.orderno >= 0)').
45
45
  order('spree_zoned_products.orderno').
46
46
  includes([:master, {:variants => [:images, :option_values]}]).
47
47
  page(params[:page]).
data/spree_zoned.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
  Gem::Specification.new do |s|
3
3
  s.platform = Gem::Platform::RUBY
4
4
  s.name = 'spree_zoned'
5
- s.version = '0.5.16'
5
+ s.version = '0.5.17'
6
6
  s.summary = 'A Spree extension to make your store zoned'
7
7
  s.description = "Everything you need for a zoned Spree store: zoned pricing, zoned products, zoned product ordering, zoned locales, ...\nProbalbly essential to you if you operate outside of the US."
8
8
  s.required_ruby_version = '>= 1.9.2'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_zoned
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.16
4
+ version: 0.5.17
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-06-24 00:00:00.000000000 Z
12
+ date: 2012-06-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_core
@@ -140,11 +140,9 @@ files:
140
140
  - app/models/spree/zoned/product.rb
141
141
  - app/overrides/add_country_selectbox.rb
142
142
  - app/overrides/add_delfc.rb
143
- - app/overrides/add_js_prd_index.rb
144
143
  - app/overrides/add_prd_country.rb
145
144
  - app/overrides/add_prd_handles.rb
146
145
  - app/views/spree/admin/zoned/_delfc.html.erb
147
- - app/views/spree/admin/zoned/_jstag.html.erb
148
146
  - app/views/spree/admin/zoned/_prd_country.html.erb
149
147
  - app/views/spree/admin/zoned/setcountry.js.erb
150
148
  - app/views/spree/zoned/_countryselect.html.erb
@@ -1,6 +0,0 @@
1
- Deface::Override.new(
2
- :name => "add_js_prd_index",
3
- :virtual_path => "spree/admin/products/index",
4
- :insert_before => "[data-hook='toolbar']",
5
- :partial => "spree/admin/zoned/jstag",
6
- )
File without changes