spree_restriction 1.2.3 → 1.2.4

data/app/lib/base_decorator.rb

@@ -21,3 +21,41 @@ Spree::Core::Search::Base.class_eval do
     @properties[:user_id] = params[:user_id]
   end
 end
+
+if (defined? Spree::Core::Search::ProductGroupBase)
+  Spree::Core::Search::ProductGroupBase.class_eval do
+    def get_base_scope
+      roles = @properties[:user_id] ? Spree::User.find(@properties[:user_id]).spree_roles.dup : []
+      base_scope = @cached_product_group ? @cached_product_group.products.active : Spree::Product.active
+      base_scope = base_scope.by_roles(roles)
+      base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
+      base_scope = get_products_conditions_for(base_scope, keywords) unless keywords.blank?
+
+      base_scope = base_scope.on_hand unless Spree::Config[:show_zero_stock_products]
+      base_scope = base_scope.group_by_products_id if @product_group.product_scopes.size > 1
+      base_scope
+    end
+
+    def prepare(params)
+      @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
+      @properties[:keywords] = params[:keywords]
+
+      per_page = params[:per_page].to_i
+      @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
+      @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
+
+      if !params[:order_by_price].blank?
+        @product_group = Spree::ProductGroup.new.from_route([params[:order_by_price] + '_by_master_price'])
+      elsif params[:product_group_name]
+        @cached_product_group = Spree::ProductGroup.find_by_permalink(params[:product_group_name])
+        @product_group = Spree::ProductGroup.new
+      elsif params[:product_group_query]
+        @product_group = Spree::ProductGroup.new.from_route(params[:product_group_query].split('/'))
+      else
+        @product_group = Spree::ProductGroup.new
+      end
+      @product_group = @product_group.from_search(params[:search]) if params[:search]
+      @properties[:user_id] = params[:user_id]
+    end
+  end
+end

data/config/locales/fr.yml

@@ -0,0 +1,3 @@
+fr:
+  restriction_label: "Restriction"
+  restriction_description: "Restreindre la visibilité à ces roles"

data/spree_restriction.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_restriction'
-  s.version     = '1.2.3'
+  s.version     = '1.2.4'
   s.summary     = 'Spree extension for adding visibility restriction by roles to products.'
   s.description = 'Spree extension for adding visibility restriction by roles to products.'
   s.required_ruby_version = '>= 1.8.7'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_restriction
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -51,6 +51,7 @@ files:
 - app/models/role_decorator.rb
 - app/overrides/add_restriction_to_admin.rb
 - config/locales/en.yml
+- config/locales/fr.yml
 - config/routes.rb
 - db/migrate/20120926201604_add_restrictions.rb
 - lib/generators/spree_restriction/install/install_generator.rb