spree_zoned 0.5.7 → 0.5.8

data/app/assets/javascripts/admin/zoned.js

@@ -2,9 +2,11 @@ $(function () {
   if ($("#sel-prd-country").data("prd-country") == 0)
   {
     $(".handle").hide();
+    $(".delfromcountry").hide();
   }
   else
   {
     $(".handle").show();
+    $(".delfromcountry").show();
   }  
 });

data/app/controllers/spree/admin/products_controller_decorator.rb

@@ -0,0 +1,29 @@
+module Spree
+  module Admin
+    ProductsController.class_eval do
+      
+      before_filter :filter_countries, :only => :index
+      
+      def deletefc
+        country = session[:zoned] && session[:zoned][:prd_country]
+        @product.delfrom country.to_i if country
+        respond_to do |format|
+          format.html { redirect_to collection_url }
+          format.js  { render :nothing => true }
+        end
+      end
+      
+    protected
+      
+      def filter_countries
+        country = session[:zoned] && session[:zoned][:prd_country]
+        if country
+          collection # returns immediately if already done
+          newcoll = @collection.select { |p| p.incountry? country.to_i }
+          @collection = newcoll
+        end
+      end
+    
+    end
+  end
+end

data/app/controllers/spree/admin/zoned_controller.rb

@@ -6,7 +6,6 @@ module Spree
           format.js do
             session[:zoned] ||= {}
             session[:zoned][:prd_country] = params[%s{sel-prd-country}]
-            #render :nothing => true
           end
         end
       end

data/app/controllers/spree/home_controller_decorator.rb

@@ -0,0 +1,12 @@
+module Spree
+  HomeController.class_eval do
+  
+    def index
+      p = params ? params : {}
+      @searcher = Spree::Config.searcher_class.new(p.merge({zoned_country: (session[:zoned] && session[:zoned][:current_country]) || {}}))
+      @products = @searcher.retrieve_products
+      respond_with(@products)
+    end
+
+  end
+end

data/app/controllers/spree/products_controller_decorator.rb

@@ -0,0 +1,12 @@
+module Spree
+  ProductsController.class_eval do
+  
+    def index
+      p = params ? params : {}
+      @searcher = Spree::Config.searcher_class.new(p.merge({zoned_country: (session[:zoned] && session[:zoned][:current_country]) || {}}))
+      @products = @searcher.retrieve_products
+      respond_with(@products)
+    end
+
+  end
+end

data/app/controllers/spree/zoned_controller.rb

@@ -5,7 +5,6 @@ module Spree
         format.js do
           session[:zoned] ||= {}
           session[:zoned][:current_country] = params[:id]
-          render :nothing => true
         end
       end
     end

data/app/helpers/spree/admin/navigation_helper_decorator.rb

@@ -0,0 +1,50 @@
+module Spree
+  module Admin
+    NavigationHelper.module_eval do
+
+      def link_to_deletefc(resource, options = {}, html_options={})
+        options.assert_valid_keys(:url, :caption, :title, :dataType, :success, :error, :name)
+
+        options.reverse_merge! :url => object_url(resource) + '/zoneddfc' unless options.key? :url
+        options.reverse_merge! :caption => t(:are_you_sure)
+        options.reverse_merge! :title => t(:confirm_delete)
+        options.reverse_merge! :dataType => 'script'
+        options.reverse_merge! :success => "function(r){ $('##{spree_dom_id resource}').fadeOut('hide'); }"
+        options.reverse_merge! :error => "function(jqXHR, textStatus, errorThrown){ show_flash_error(jqXHR.responseText); }"
+        options.reverse_merge! :name => icon('delete') + ' ' + t(:deletefc)
+
+        link_to_function_deletefc(options, html_options)
+        #link_to_function_delete_native(options, html_options)
+      end
+
+      # this function does not use jConfirm
+      def link_to_function_deletefc_native(options, html_options)
+        fn = %Q{
+          var answer = confirm("#{t(:are_you_sure)}");
+          if (!!answer) { #{link_to_function_deletefc_ajax(options)} };
+        }
+        link_to_function options[:name], fn, html_options
+      end
+
+      def link_to_function_deletefc(options, html_options)
+        link_to_function options[:name], "jConfirm('#{options[:caption]}', '#{options[:title]}', function(r) {
+          if(r){ #{link_to_function_deletefc_ajax(options)} }
+        });", html_options
+      end
+
+      def link_to_function_deletefc_ajax(options)
+        %Q{
+          $.ajax({
+            type: 'POST',
+            url: '#{options[:url]}',
+            data: ({_method: 'delete', authenticity_token: AUTH_TOKEN}),
+            dataType:'#{options[:dataType]}',
+            success: #{options[:success]},
+            error: #{options[:error]}
+          });
+        }
+      end
+      
+    end
+  end
+end

data/app/models/spree/product_decorator.rb

@@ -0,0 +1,23 @@
+module Spree
+  Product.class_eval do
+    
+    def incountry?(country)
+      clist = Spree::Zoned::Product.where "spree_product_id = ? AND spree_country_id = ?", id, country
+      clist == [] || clist[0].orderno >= 0
+    end
+    
+    def delfrom(country)
+      clist = Spree::Zoned::Product.where "spree_product_id = ? AND spree_country_id = ?", id, country
+      if clist == []
+        zp = Spree::Zoned::Product.new
+        zp.spree_country_id = country
+        zp.spree_product_id = id
+      else
+        zp = clist[0]
+      end
+      zp.orderno = -1
+      zp.save!
+    end
+    
+  end
+end

data/app/overrides/add_delfc.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  :name          => "add_delfc",
+  :virtual_path  => "spree/admin/products/index",
+  :insert_bottom => "[data-hook='admin_products_index_row_actions']",
+  :partial       => "spree/admin/zoned/delfc",
+)

data/app/views/spree/admin/zoned/_delfc.html.erb

@@ -0,0 +1,4 @@
+<span class='delfromcountry'>
+	&nbsp;
+  <%= link_to_deletefc product unless product.deleted? %>
+</span>

data/app/views/spree/admin/zoned/_prd_country.html.erb

@@ -3,7 +3,7 @@
   <% selected = ((session[:zoned] && session[:zoned][:prd_country]) || 0) # preselect item "No country selected" %>
   <%= select_tag 'sel-prd-country',
     options_for_select( # common countries have negative id
-      [["Kein Land ausgewählt", 0]] +
+      [[t(:nocountrysel), 0]] +
       Rails.application.config.commonCountriesForSelect,
       selected,
     ),

data/app/views/spree/admin/zoned/setcountry.js.erb

@@ -1,5 +1,8 @@
 <% if session[:zoned] && session[:zoned][:prd_country].to_i == 0 %>
   $(".handle").hide();
+  $(".delfromcountry").hide();
 <% else %>
   $(".handle").show();
-<% end %>  
+  $(".delfromcountry").show();
+<% end %>
+location.href = "/admin/products"

data/app/views/spree/zoned/setcountry.js.erb

@@ -0,0 +1 @@
+location.reload();

data/config/initializers/zoned_init.rb

@@ -1,3 +1,5 @@
+require "spree/zoned/search/base"
+
 #
 # ZONED_COMMON_COUNTRIES is the list of countries that will be separately listed
 # in the beginning of the country select box for easy selection.
@@ -34,3 +36,5 @@ ZONED_COMMON_LOCALES =
 Rails.configuration.commonCountriesForSelect = ZONED_COMMON_COUNTRIES.map do |id|
   [ Spree::Country.find_by_id(id).name, -id ]
 end
+
+Spree::Config.searcher_class = Spree::Zoned::Search::Base

data/config/locales/de.yml

@@ -0,0 +1,7 @@
+# Sample localization file for German. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+---
+de:
+  nocountrysel: "Kein Land ausgewählt"
+  deletefc: "Aus Land löschen"
+  

data/config/locales/en.yml

@@ -1,5 +1,6 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
+---
 en:
-  hello: "Hello world"
+  nocountrysel: "No country selected"
+  deletefc: "Delete from country"

data/config/routes.rb

@@ -2,5 +2,6 @@ Spree::Core::Engine.routes.draw do
   match '/zonedcs' => "zoned#setcountry"
   namespace :admin do
     match '/zonedcs' => "zoned#setcountry"
+    match '/products/:id/zoneddfc' => "products#deletefc", :via => :delete
   end
 end

data/lib/spree/zoned/search/base.rb

@@ -0,0 +1,98 @@
+#
+# Copied from spree_core-1.1.1/lib/spree/core/search/base.rb
+#
+# changes are marked using "{ CHANGE" and "CHANGE }"
+#
+
+module Spree
+  module Zoned
+    module Search
+      class Base
+        attr_accessor :properties
+
+        def initialize(params)
+          @properties = {}
+          prepare(params)
+        end
+
+        def retrieve_products
+          @products_scope = get_base_scope
+          curr_page = page || 1
+
+          @products = @products_scope.includes([:master]).page(curr_page).per(per_page)
+        end
+
+        def method_missing(name)
+          if @properties.has_key? name
+            @properties[name]
+          else
+            super
+          end
+        end
+
+        protected
+          def get_base_scope
+            base_scope = Spree::Product.active
+            #
+            # Add scope for filtering products accoding to country setting of the spree_zoned extension
+            # { CHANGE
+            country = @properties[:zoned_country]
+            base_scope = base_scope.joins(
+              'LEFT OUTER JOIN spree_zoned_products ON spree_zoned_products.spree_product_id = spree_products.id' +
+              " AND spree_zoned_products.spree_country_id = #{country}").where(
+              '(spree_zoned_products.orderno IS NULL OR spree_zoned_products.orderno >= 0)') if country
+            # CHANGE }
+            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 = add_search_scopes(base_scope)
+            base_scope
+          end
+
+          def add_search_scopes(base_scope)
+            search.each do |name, scope_attribute|
+              next if name.to_s =~ /eval|send|system/
+
+              scope_name = name.intern
+              if base_scope.respond_to? scope_name
+                base_scope = base_scope.send(scope_name, *scope_attribute)
+              else
+                base_scope = base_scope.merge(Spree::Product.search({scope_name => scope_attribute}).result)
+              end
+            end if search
+            base_scope
+          end
+
+          # method should return new scope based on base_scope
+          def get_products_conditions_for(base_scope, query)
+            base_scope.like_any([:name, :description], query.split)
+          end
+
+          def prepare(params)
+            @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
+            @properties[:keywords] = params[:keywords]
+            @properties[:search] = params[:search]
+
+            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
+            # { CHANGE
+            @properties[:zoned_country] = params[:zoned_country]
+            # CHANGE }
+
+            # 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]
+          end
+      end
+    end
+  end
+end

data/spree_zoned.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zoned'
-  s.version     = '0.5.7'
+  s.version     = '0.5.8'
   s.summary     = 'A Spree extension to make your store zoned'
   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."
   s.required_ruby_version = '>= 1.9.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_zoned
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -129,22 +129,32 @@ files:
 - app/assets/javascripts/store/spree_zoned.js
 - app/assets/stylesheets/admin/spree_zoned.css
 - app/assets/stylesheets/store/spree_zoned.css
+- app/controllers/spree/admin/products_controller_decorator.rb
 - app/controllers/spree/admin/zoned_controller.rb
+- app/controllers/spree/home_controller_decorator.rb
+- app/controllers/spree/products_controller_decorator.rb
 - app/controllers/spree/zoned_controller.rb
+- app/helpers/spree/admin/navigation_helper_decorator.rb
 - app/helpers/spree/base_helper_decorator.rb
+- app/models/spree/product_decorator.rb
 - app/models/spree/zoned/product.rb
 - app/overrides/add_country_selectbox.rb
+- app/overrides/add_delfc.rb
 - app/overrides/add_js_prd_index.rb
 - app/overrides/add_prd_country.rb
 - app/overrides/add_prd_handles.rb
+- app/views/spree/admin/zoned/_delfc.html.erb
 - app/views/spree/admin/zoned/_prd_country.html.erb
 - app/views/spree/admin/zoned/setcountry.js.erb
 - app/views/spree/zoned/_countryselect.html.erb
+- app/views/spree/zoned/setcountry.js.erb
 - config/initializers/zoned_init.rb
+- config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20120611133806_create_spree_zoned_products.rb
 - lib/generators/spree_zoned/install/install_generator.rb
+- lib/spree/zoned/search/base.rb
 - lib/spree_zoned.rb
 - lib/spree_zoned/engine.rb
 - script/rails