spree_zoned 0.5.4 → 0.5.5

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

@@ -4,7 +4,8 @@ module Spree
       def setcountry
         respond_to do |format|
           format.js do
-            @current_country = params[:id]
+            session[:zoned] ||= {}
+            session[:zoned][:prd_country] = params[:id]
             render :nothing => true
           end
         end

data/app/controllers/spree/zoned_controller.rb

@@ -1,17 +1,13 @@
 module Spree
-  
-  module Zoned
-
-    class ZonedController < BaseController
-
-      def setcountry
-        respond_to do |format|
-          format.js { render :nothing => true }
+  class ZonedController < BaseController
+    def setcountry
+      respond_to do |format|
+        format.js do
+          session[:zoned] ||= {}
+          session[:zoned][:current_country] = params[:id]
+          render :nothing => true
         end
       end
-
     end
-    
   end
-
 end

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

@@ -1,10 +1,10 @@
-<li id="zoned-prd-country"">
+<li id="zoned-prd-country">
   <%= label_tag t('country') + ": "  %>
   <%= select_tag 'id',
     options_for_select( # common countries have negative id
       [["Kein Land ausgewählt", 0]] +
       Rails.application.config.commonCountriesForSelect,
-      @current_country || 0, # preselect item "No country selected"
+      (session[:zoned] && session[:zoned][:prd_country]) || 0, # preselect item "No country selected"
     ),
     :data => {
 	    :remote => true,

data/app/views/spree/zoned/_countryselect.html.erb

@@ -5,7 +5,7 @@
       Rails.application.config.commonCountriesForSelect +
         [["-----------------", 0]] +
         countrylist.map { |country| [country.name, country.id] },
-      -214, # Unites States
+      (session[:zoned] && session[:zoned][:current_country]) || -214, # Unites States
     ),
     :data => {
 	    :remote => true,

data/lib/generators/spree_zoned/install/install_generator.rb

@@ -5,7 +5,7 @@ module SpreeZoned
       source_root File.expand_path("../assets", __FILE__)
 
       def add_javascripts
-        res = ask 'Would you like to append spree_zoned to your js manifests now?\n(only answer no if you you\'ve already done it) [Y/n]'
+        res = ask "Would you like to append spree_zoned to your js manifests now?\n(only answer no if you you've already done it) [Y/n]"
         if res == '' || res.downcase == 'y'
           append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_zoned\n"
           append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_zoned\n"
@@ -13,7 +13,7 @@ module SpreeZoned
       end
 
       def add_stylesheets
-        res = ask 'Would you like to inject spree_zoned into your css manifests now?\n(only answer no if you you\'ve already done it) [Y/n]'
+        res = ask "Would you like to inject spree_zoned into your css manifests now?\n(only answer no if you you've already done it) [Y/n]"
         if res == '' || res.downcase == 'y'
           inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_zoned\n", :before => /\*\//, :verbose => true                
           inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_zoned\n", :before => /\*\//, :verbose => true

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.4'
+  s.version     = '0.5.5'
   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.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core