spree_zoned 0.5.12 → 0.5.13

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

@@ -1,12 +1,18 @@
 $(function () {
-  if ($("#sel-prd-country").data("prd-country") == 0)
+  if (location.href.match(/\/admin\/products$/))
   {
-    $(".handle").hide();
-    $(".delfromcountry").hide();
+    if ($("#sel-prd-country").data("prd-country") == 0)
+    {
+      $("#listing_products").removeClass("sortable");
+      $(".handle").hide();
+      $(".delfromcountry").hide();
+    }
+    else
+    {
+      $("#listing_products").addClass("sortable");
+      $("#listing_products").attr("data-sortable-link", "/admin/products/reorder");
+      $(".handle").show();
+      $(".delfromcountry").show();
+    }
   }
-  else
-  {
-    $(".handle").show();
-    $(".delfromcountry").show();
-  }  
 });

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

@@ -10,6 +10,72 @@ Spree::Admin::ProductsController.class_eval do
 
 protected
 
+  #
+  # Copied from spree_core-1.1.1/app/controllers/spree/admin/products_controller.rb
+  #
+  # changes are marked using "{ CHANGE" and "CHANGE }"
+  #
+  def collection
+    return @collection if @collection.present?
+    #
+    # Inserted retrieval of country from session
+    # { CHANGE
+    country = session[:zoned] && session[:zoned][:prd_country]
+    # CHANGE }
+    unless request.xhr?
+      params[:q] ||= {}
+      params[:q][:deleted_at_null] ||= "1"
+
+      #
+      # Appended unless clause
+      # { CHANGE
+      params[:q][:s] ||= "name asc" unless country && country.to_i != 0
+      # CHANGE }
+
+      @search = super.search(params[:q])
+      #
+      # Inserted query when country given
+      # { CHANGE
+      if country && country.to_i != 0
+        @collection = @search.result.
+          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)').
+          order('spree_zoned_products.orderno').
+          includes([:master, {:variants => [:images, :option_values]}]).
+          page(params[:page]).
+          per(Spree::Config[:admin_products_per_page])
+      else
+      # CHANGE }
+        @collection = @search.result.
+          group_by_products_id.
+          includes([:master, {:variants => [:images, :option_values]}]).
+          page(params[:page]).
+          per(Spree::Config[:admin_products_per_page])
+      # Inserted end (for if) + made params[:q][:s].include? nil-resistant
+      # { CHANGE
+      end
+      if params[:q][:s] && params[:q][:s].include?("master_price")
+      # CHANGE }
+        # By applying the group in the main query we get an undefined method gsub for Arel::Nodes::Descending
+        # It seems to only work when the price is actually being sorted in the query
+        # To be investigated later.
+        @collection = @collection.group("spree_variants.price")
+      end
+    else
+      includes = [{:variants => [:images,  {:option_values => :option_type}]}, {:master => :images}]
+
+      @collection = super.where(["name #{LIKE} ?", "%#{params[:q]}%"])
+      @collection = @collection.includes(includes).limit(params[:limit] || 10)
+
+      tmp = super.where(["#{Variant.table_name}.sku #{LIKE} ?", "%#{params[:q]}%"])
+      tmp = tmp.includes(:variants_including_master).limit(params[:limit] || 10)
+      @collection.concat(tmp)
+    end
+    @collection
+  end
+
   def inorout(m)
     country = session[:zoned] && session[:zoned][:prd_country]
     m.call(country.to_i) if country

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

@@ -1,6 +1,7 @@
 module Spree
   module Admin  
     class ZonedController < BaseController
+
       def setcountry
         respond_to do |format|
           format.js do
@@ -9,6 +10,20 @@ module Spree
           end
         end
       end
+
+      def reorder
+        country = session[:zoned] && session[:zoned][:prd_country]
+        return if !country || country.to_i >= 0
+        country = country.to_i
+        params[:positions].each do |id, index|
+          Spree::Zoned::Product.find_or_create_by_spree_product_id_and_spree_country_id(id, country).update_attributes :orderno => index.to_i
+        end
+        respond_to do |format|
+          format.html { redirect_to admin_products_url }
+          format.js  { render :text => 'Ok' }
+        end
+      end
+
     end      
   end
 end

data/app/controllers/spree/products_controller_decorator.rb

@@ -1,12 +1,13 @@
 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
+	def index
+	  p = params ? params : {}
+	  country = session[:zoned] && session[:zoned][:current_country]
+	  @searcher = Spree::Config.searcher_class.new(p.merge(country ? {zoned_country: country} : {}))
+	  @products = @searcher.retrieve_products
+	  respond_with(@products)
+	end
 
   end
 end

data/config/initializers/zoned_init.rb

@@ -38,3 +38,4 @@ Rails.configuration.commonCountriesForSelect = ZONED_COMMON_COUNTRIES.map do |id
 end
 
 Spree::Config.searcher_class = Spree::Zoned::Search::Base
+Spree::Config.admin_products_per_page = 64

data/config/routes.rb

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

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

@@ -46,6 +46,7 @@ module Spree
             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 = base_scope.order('spree_zoned_products.orderno') if country
             base_scope
           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.12'
+  s.version     = '0.5.13'
   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.12
+  version: 0.5.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core