spree_zoned 0.5.8 → 0.5.9

data/.gitignore

@@ -1,4 +1,6 @@
 *.tmproj
+*.sublime-project
+*.sublime-workspace
 \#*
 *~
 .#*

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

@@ -2,28 +2,25 @@ 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
+        inorout(@product.method :delfrom)
       end
       
+      def backtocountry
+        inorout(@product.method :backtocountry)
+      end
+
     protected
-      
-      def filter_countries
+
+      def inorout(m)
         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
+        m.call(country.to_i) if country
+        respond_to do |format|
+          format.html { redirect_to collection_url }
+          format.js { render nothing: true }
         end
       end
-    
+
     end
   end
 end

data/app/controllers/spree/home_controller_decorator.rb

@@ -3,7 +3,9 @@ module Spree
   
     def index
       p = params ? params : {}
-      @searcher = Spree::Config.searcher_class.new(p.merge({zoned_country: (session[:zoned] && session[:zoned][:current_country]) || {}}))
+      @searcher = Spree::Config.searcher_class.new(
+      	p.merge(
+      	  {zoned_country: (session[:zoned] && session[:zoned][:current_country]) || -214 }))
       @products = @searcher.retrieve_products
       respond_with(@products)
     end

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

@@ -5,15 +5,27 @@ module Spree
       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)
+        country = session[:zoned] && session[:zoned][:prd_country]
+        if country && !resource.incountry?(country.to_i)
+          options.reverse_merge! :url => object_url(resource) + '/zonedbtc' unless options.key? :url
+          options.reverse_merge! :caption => t(:are_you_sure)
+          options.reverse_merge! :title => t(:backtocountry)
+          options.reverse_merge! :dataType => 'script'
+          options.reverse_merge! :success => "function(r){ location.reload(); }"
+          options.reverse_merge! :error => "function(jqXHR, textStatus, errorThrown){ show_flash_error(jqXHR.responseText); }"
+          options.reverse_merge! :name => icon('add') + ' ' + t(:backtocountry)
+          link_to_function_btc(options, html_options)
+        else
+          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}').prop('disabled', 'disabled'); location.reload(); }"
+          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)
+        end
 
-        link_to_function_deletefc(options, html_options)
         #link_to_function_delete_native(options, html_options)
       end
 
@@ -32,6 +44,12 @@ module Spree
         });", html_options
       end
 
+      def link_to_function_btc(options, html_options)
+        link_to_function options[:name], "jConfirm('#{options[:caption]}', '#{options[:title]}', function(r) {
+          if(r){ #{link_to_function_btc_ajax(options)} }
+        });", html_options
+      end
+
       def link_to_function_deletefc_ajax(options)
         %Q{
           $.ajax({
@@ -45,6 +63,19 @@ module Spree
         }
       end
       
+      def link_to_function_btc_ajax(options)
+        %Q{
+          $.ajax({
+            type: 'POST',
+            url: '#{options[:url]}',
+            data: ({_method: 'put', authenticity_token: AUTH_TOKEN}),
+            dataType:'#{options[:dataType]}',
+            success: #{options[:success]},
+            error: #{options[:error]}
+          });
+        }
+      end
+      
     end
   end
 end

data/app/models/spree/product_decorator.rb

@@ -7,6 +7,16 @@ module Spree
     end
     
     def delfrom(country)
+      setorderno country, -1
+    end
+    
+    def backtocountry(country)
+      setorderno country, 0
+    end
+
+  protected
+
+    def setorderno(country, ono)
       clist = Spree::Zoned::Product.where "spree_product_id = ? AND spree_country_id = ?", id, country
       if clist == []
         zp = Spree::Zoned::Product.new
@@ -15,9 +25,9 @@ module Spree
       else
         zp = clist[0]
       end
-      zp.orderno = -1
-      zp.save!
+      zp.orderno = ono
+      zp.save
     end
-    
+
   end
 end

data/config/locales/de.yml

@@ -4,4 +4,4 @@
 de:
   nocountrysel: "Kein Land ausgewählt"
   deletefc: "Aus Land löschen"
-  
+  backtocountry: "Wieder ins Land"

data/config/locales/en.yml

@@ -4,3 +4,4 @@
 en:
   nocountrysel: "No country selected"
   deletefc: "Delete from country"
+  backtocountry: "Reassign to country"

data/config/routes.rb

@@ -3,5 +3,6 @@ Spree::Core::Engine.routes.draw do
   namespace :admin do
     match '/zonedcs' => "zoned#setcountry"
     match '/products/:id/zoneddfc' => "products#deletefc", :via => :delete
+    match '/products/:id/zonedbtc' => "products#backtocountry", :via => :put
   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.8'
+  s.version     = '0.5.9'
   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.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core