spree_zoned 0.5.24 → 0.5.25

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

@@ -15,16 +15,11 @@ Spree::Admin::ProductsController.class_eval do
   end
 
   def update
-    puts "Here spree/admin/products_controller/update"
-    puts "BEFORE: @product.price: #{@product.price}"
-    puts "params[:product][:price]: #{params[:product][:price]}"
     params[:product][:price] = Delocalize::LocalizedNumericParser.parse(params[:product][:price])
-    puts "params[:product][:price] after parse: #{params[:product][:price]}"
     # delete cprice to prevent mass assignemnt error in ActiveModel
     # cprice has already been handled in before_filter "delocSetrPrice"
     params[:product].delete :cprice
     @product.update_attributes(params[:product])
-    puts "AFTER: @product.price: #{@product.price}"
     redirect_to :action => 'edit'
   end
 
@@ -108,7 +103,6 @@ protected
   def delocSetPrice
     country = session[:zoned] && session[:zoned][:prd_country]
     if country && country.to_i != 0 && params[:product] && params[:product][:cprice]
-      puts "Here delocSetPrice before setprice: params[:product][:cprice]: #{params[:product][:cprice]}"
       @product.setprice(country.to_i, BigDecimal.new(Delocalize::LocalizedNumericParser.parse(params[:product][:cprice])))
     end
  end

data/app/controllers/spree/base_controller_decorator.rb

@@ -0,0 +1,16 @@
+Spree::BaseController.class_eval do
+  before_filter :set_locale  #, :if => proc { !session[:locale] }
+
+  protected
+
+  def set_locale
+    I18n.locale = extract_locale || I18n.default_locale
+  end
+
+  def extract_locale
+    parsed_locale = (session[:zoned] && session[:zoned][:current_language]) || I18n.default_locale
+    #I18n.available_locales.include?(parsed_locale.to_sym) ? parsed_locale  : nil
+    parsed_locale ? parsed_locale.to_sym : nil
+  end
+
+end

data/app/controllers/spree/zoned_controller.rb

@@ -1,12 +1,29 @@
 module Spree
   class ZonedController < BaseController
+
+    def availLangs(country)
+      Rails.configuration.availableLanguages[country] || ["English", "en"]
+    end
+
     def setcountry
       respond_to do |format|
         format.js do
           session[:zoned] ||= {}
-          session[:zoned][:current_country] = params[:id]
+          c = session[:zoned][:current_country] = params[:id]
+          c = c.to_i
+          session[:zoned][:current_language] = (availLangs(c) && availLangs(c)[0][1]) || "en"
+        end
+      end
+    end
+
+    def setlanguage
+      respond_to do |format|
+        format.js do
+          session[:zoned] ||= {}
+          session[:zoned][:current_language] = params[:lgid]
         end
       end
     end
+
   end
 end

data/app/helpers/spree/base_helper_decorator.rb

@@ -1,7 +1,13 @@
 module Spree
   BaseHelper.module_eval do
+
     def countrylist
       @zonedCountrylist ||= Country.order :name
     end
+
+    def hlpAvailLangs(country)
+      Rails.configuration.availableLanguages[country] || ["English", "en"]
+    end
+
   end
 end

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

@@ -1,11 +1,12 @@
 <div id="zoned-countryselect" class="columns omega ten">
+  <%  c = ((session[:zoned] && session[:zoned][:current_country]) || -214) %>
   <%= label_tag t('country') + ": "  %>
   <%= select_tag 'id',
     options_for_select( # common countries have negative id
       Rails.application.config.commonCountriesForSelect +
         [["-----------------", 0]] +
         countrylist.map { |country| [country.name, country.id] },
-      (session[:zoned] && session[:zoned][:current_country]) || -214, # Unites States
+      c,
     ),
     :data => {
 	    :remote => true,
@@ -15,4 +16,18 @@
 		  ),
 		}
   %>
+  <%= label_tag t('language') + ": "  %>
+  <%= select_tag 'lgid',
+    options_for_select( # common countries have negative id
+      hlpAvailLangs(c.to_i),
+      (session[:zoned] && session[:zoned][:current_language]) || "en", # English
+    ),
+    :data => {
+      :remote => true,
+      :url => url_for(
+        :controller => "zoned", 
+        :action => "setlanguage",
+      ),
+    }
+  %>
 </div>

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

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

data/config/initializers/zoned_init.rb

@@ -18,24 +18,26 @@ ZONED_COMMON_COUNTRIES =
 
 #
 # ZONED_COMMOM_LOCALES specifies - for each contry contained in ZONED_COMMON_COUNTRIES - a list (array)
-# of locales that are pobbile to select for that specific country.
+# of locales that are possibile to select for that specific country.
 # For all countries not included in ZONED_COMMON_COUNTRIES, the locale will automatically be set to :en.
 # The first locale listed for each country is considered that countrie's default locale.
 #
 ZONED_COMMON_LOCALES =
-[
-  [:en], # United States
-  [:de, :en], # Germany
-  [:de, :en], # Austria
-  [:de, :en], # Switzerland
-  [:nl, :en], # Netherlands
-  [:nl, :de, :en], # Belgium
-  [:de, :en], # Luxembourg
-]
+{
+  -214 => [:en], # United States
+  -74  => [:de, :en], # Germany
+  -13  => [:de, :en], # Austria
+  -195 => [:de, :en], # Switzerland
+  -142 => [:nl, :en], # Netherlands
+  -20  => [:nl, :de, :en], # Belgium
+  -117 => [:de, :en, :nl], # Luxembourg
+}
 
 Rails.configuration.commonCountriesForSelect = ZONED_COMMON_COUNTRIES.map do |id|
   [ Spree::Country.find_by_id(id).name, -id ]
 end
 
+Rails.configuration.availableLanguages = Hash[ZONED_COMMON_LOCALES.map { |c, lgs| [c, lgs.map { |l| [((l==:en ? "English" : (l==:de ? "Deutsch" : "Nederlands"))) ,l]}]}]
+
 Spree::Config.searcher_class = Spree::Zoned::Search::Base
 Spree::Config.admin_products_per_page = 64

data/config/locales/de.yml

@@ -6,4 +6,5 @@ de:
   deletefc: "Aus Land löschen"
   backtocountry: "Wieder ins Land"
   master_price: "Master - Preis"
-  country_price: "Länderpreis"
+  country_price: "Länderpreis"
+  language: "Sprache"

data/config/locales/en.yml

@@ -5,4 +5,5 @@ en:
   nocountrysel: "No country selected"
   deletefc: "Delete from country"
   backtocountry: "Reassign to country"
-  country_price: "Country-specific price"
+  country_price: "Country-specific price"
+  language: "Language"

data/config/routes.rb

@@ -1,5 +1,6 @@
 Spree::Core::Engine.routes.draw do
   match '/zonedcs' => "zoned#setcountry"
+  match '/zonedls' => "zoned#setlanguage"
   namespace :admin do
     match '/zonedcs' => "zoned#setcountry"
     match '/products/reorder' => "zoned#reorder", :via => :post

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.24'
+  s.version     = '0.5.25'
   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.24
+  version: 0.5.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -131,6 +131,7 @@ files:
 - 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/base_controller_decorator.rb
 - app/controllers/spree/home_controller_decorator.rb
 - app/controllers/spree/products_controller_decorator.rb
 - app/controllers/spree/zoned_controller.rb
@@ -152,6 +153,7 @@ files:
 - app/views/spree/shared/_products_list_item.html.erb
 - app/views/spree/zoned/_countryselect.html.erb
 - app/views/spree/zoned/setcountry.js.erb
+- app/views/spree/zoned/setlanguage.js.erb
 - config/initializers/zoned_init.rb
 - config/locales/de.yml
 - config/locales/en.yml