spree_multi_currency 1.0.4 → 2.0.0

data/app/views/spree/admin/currency_converters/new.html.erb

@@ -10,7 +10,7 @@
 
 <%= form_for(:currency_converter, :url => collection_url) do |f| %>
 	<fieldset class="no-border-top">
-	  <%= render :partial => "form", :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+	  <%= render 'form', :f => f %>
+    <%= render 'spree/admin/shared/new_resource_links' %>
   </fieldset>
-<% end %>
+<% end %>

data/config/routes.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Put your extension routes here.
 Spree::Core::Engine.routes.prepend do
   match "currency/:id" => "currency#set", :as => :currency

data/db/migrate/20101109134351_create_currencies.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # -*- coding: utf-8 -*-
 class CreateCurrencies < ActiveRecord::Migration
   def self.up

data/db/migrate/20101109134453_create_currency_converters.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class CreateCurrencyConverters < ActiveRecord::Migration
   def self.up
     create_table :spree_currency_converters do |t|

data/db/seeds.rb

@@ -1,2 +1,4 @@
+# encoding: utf-8
+
 # Use this file to load your own seed data from extensions.
 # See the db/seeds.rb file in the Spree core for some ideas on what you can do here.

data/features/step_definitions/product.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Given /^the custom taxons and custom products exist$/ do
   Fixtures.reset_cache
   fixtures_folder = File.join(Rails.root.to_s, 'db', 'sample')

data/features/support/env.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 FEATURES_PATH = File.expand_path('../..', __FILE__)
 # require define path to spree project
 ENV['SPREE_GEM_PATH'] = "/home/dima/project/spree"

data/features/support/paths.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module NavigationHelpers
   # Maps a name to a path. Used by the
   #

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

@@ -1,28 +1,40 @@
+# encoding: utf-8
 module SpreeMultiCurrency
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      class_option :auto_run_migrations, type: :boolean, default: true
 
-      # def add_javascripts
-      #   append_file "app/assets/javascripts/store/all.js", "//= require store/spree_multi_lingual\n"
-      #   append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_multi_lingual\n"
-      # end
-      #
-      # def add_stylesheets
-      #   inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_multi_lingual\n", :before => /\*\//, :verbose => true
-      #   inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_multi_lingual\n", :before => /\*\//, :verbose => true
-      # end
+      def add_javascripts
+        append_file 'app/assets/javascripts/store/all.js',
+                    "//= require store/spree_frontend\n"
+        append_file 'app/assets/javascripts/admin/all.js',
+                    "//= require admin/spree_backend\n"
+      end
+
+      def add_stylesheets
+        inject_into_file  'app/assets/stylesheets/store/all.css',
+                          " *= require store/spree_frontend\n",
+                          before: /\*\//,
+                          verbose: true
+        inject_into_file  'app/assets/stylesheets/admin/all.css',
+                          " *= require admin/spree_backend\n",
+                          before: /\*\//,
+                          verbose: true
+      end
 
       def add_migrations
         run 'bundle exec rake railties:install:migrations FROM=spree_multi_currency'
       end
 
       def run_migrations
-         res = ask "Would you like to run the migrations now? [Y/n]"
-         if res == "" || res.downcase == "y"
-           run 'bundle exec rake db:migrate'
-         else
-           puts "Skipping rake db:migrate, don't forget to run it!"
-         end
+        message = 'Would you like to run the migrations now? [Y/n]'
+        run_migrations = options[:auto_run_migrations] ||
+          ['', 'y', 'Y'].include?(ask message)
+        if run_migrations
+          run 'bundle exec rake db:migrate'
+        else
+          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+        end
       end
     end
   end

data/lib/spree_multi_currency.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # -*- coding: utf-8 -*-
 require 'spree/core'
 require 'spree_multi_currency/engine'
@@ -12,25 +14,27 @@ module Spree::MultiCurrency
   #  rate_at_date - use the exchange rate at the specified date
   def multi_currency(*args)
     options = args.extract_options!
+
     [args].flatten.compact.each do |number_field|
+
+      # define for example method price
       define_method(number_field.to_sym) do
-        if options.has_key?(:rate_at_date) && options[:rate_at_date].is_a?(Proc)
+        num_field = read_attribute(number_field.to_sym)
+        if options.has_key?(:rate_at_date) &&
+              options[:rate_at_date].is_a?(Proc)
           Spree::Currency.conversion_to_current(
-          	read_attribute(number_field.to_sym),
-          	{ :date => options[:rate_at_date].call(self) }
+            num_field,
+            { date: options[:rate_at_date].call(self) }
           )
         else
-          Spree::Currency.conversion_to_current(read_attribute(number_field.to_sym))
+          Spree::Currency.conversion_to_current(num_field)
         end
       end
 
-      define_method("base_#{number_field}") do
-        read_attribute(number_field.to_sym)
-      end
-
       unless options[:only_read]
         define_method(:"#{number_field}=") do |value|
-          write_attribute(number_field.to_sym, Spree::Currency.conversion_from_current(value))
+          write_attribute(number_field.to_sym,
+                          Spree::Currency.conversion_from_current(value))
         end
       end
 

data/lib/spree_multi_currency/engine.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module SpreeMultiCurrency
   # mattr_reader :languages
   # @@languages = [:en]
@@ -21,6 +23,10 @@ module SpreeMultiCurrency
       Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
+
+      Dir[File.join(File.dirname(__FILE__), "../../app/assets/**/**/**.*")].sort.each do |c|
+        Rails.env.production? ? require(c) : load(c)
+      end
     end
 
     # after rails config/initializers loading, setup spree_multi_lingual's language by getting

data/lib/tasks/spree_multi_currency.rake

@@ -4,88 +4,109 @@ require 'open-uri'
 require 'nokogiri'
 # add custom rake tasks here
 namespace :spree_multi_currency do
+  eur_hash = { num_code: '978', char_code: 'EUR', name: 'Euro' }
 
   namespace :currency do
     desc "Общероссийский классификатор валют (сокращ. ОКВ) - http://ru.wikipedia.org/wiki/Общероссийский_классификатор_валют"
 
+    task :from_moneylib => :environment do
+      ::Money::Currency.table.each do |x|
+        Spree::Currency.create(char_code: x[1][:iso_code],
+                               name: x[0],
+                               num_code: x[1][:iso_numeric])
+      end
+    end
+
     task :okv => :environment do
-      url = "http://ru.wikipedia.org/wiki/%D0%9E%D0%B1%D1%89%D0%B5%D1%80%D0%BE%D1%81%D1%81%D0%B8%D0%B9%D1%81%D0%BA%D0%B8%D0%B9_%D0%BA%D0%BB%D0%B0%D1%81%D1%81%D0%B8%D1%84%D0%B8%D0%BA%D0%B0%D1%82%D0%BE%D1%80_%D0%B2%D0%B0%D0%BB%D1%8E%D1%82"
+      url = 'http://ru.wikipedia.org/wiki/%D0%9E%D0%B1%D1%89%D0%B5%D1%80%D0%BE%D1%81%D1%81%D0%B8%D0%B9%D1%81%D0%BA%D0%B8%D0%B9_%D0%BA%D0%BB%D0%B0%D1%81%D1%81%D0%B8%D1%84%D0%B8%D0%BA%D0%B0%D1%82%D0%BE%D1%80_%D0%B2%D0%B0%D0%BB%D1%8E%D1%82'
       data = Nokogiri::HTML.parse(open(url))
       keys = [:char_code, :num_code, :discharge, :name, :countries ]
-      data.css("table:first tr")[1..-1].map{ |d|
-        Hash[*keys.zip(d.css("td").map {|x| x.text.strip }).flatten]
-      }.each { |n|
-        Spree::Currency.find_by_num_code(n[:num_code]) ||  Spree::Currency.create(n.except(:discharge).except(:countries))
-      }
+      data.css('table:first tr')[1..-1].map{ |d|
+        Hash[*keys.zip(d.css('td').map { |x| x.text.strip }).flatten]
+      }.each do |n|
+        Spree::Currency.find_by_num_code(n[:num_code]) ||
+          Spree::Currency.create(n.except(:discharge).except(:countries))
+      end
 
     end
 
-    desc "Load currency ISO4217 http://en.wikipedia.org/wiki/ISO_4217"
+    desc 'Load currency ISO4217 http://en.wikipedia.org/wiki/ISO_4217'
     task :iso4217 => :environment do
-      url = "http://en.wikipedia.org/wiki/ISO_4217"
+      url = 'http://en.wikipedia.org/wiki/ISO_4217'
       data = Nokogiri::HTML.parse(open(url))
       keys = [:char_code, :num_code, :discharge, :name, :countries ]
-      data.css("table:eq(2) tr")[1..-1].map{|d|
-        Hash[*keys.zip(d.css("td").map {|x| x.text.strip }).flatten]
-      }.each { |n|
-        Spree::Currency.find_by_num_code(n[:num_code]) ||  Spree::Currency.create(n.except(:discharge).except(:countries))
-      }
+      data.css('table:eq(1) tr')[1..-1].map{|d|
+        Hash[*keys.zip(d.css('td').map {|x| x.text.strip }).flatten]
+      }.each do  |n|
+        Spree::Currency.find_by_num_code(n[:num_code]) ||
+          Spree::Currency.create(n.except(:discharge).except(:countries))
+      end
     end
 
   end
 
   namespace :rates do
-    desc "Курс Сбербанка РФ http://www.cbr.ru"
+    desc 'Курс Сбербанка РФ http://www.cbr.ru'
     task :cbr => :environment do
-      rub  = Spree::Currency.get("643", { :num_code => "643", :char_code => "RUB", :name => "Российский рубль"})
+      rub  = Spree::Currency.get('643', { num_code: '643', char_code: 'RUB', name: 'Российский рубль' })
       rub.basic!
       url = "http://www.cbr.ru/scripts/XML_daily.asp?date_req=#{Time.now.strftime('%d/%m/%Y')}"
       data = Nokogiri::XML.parse(open(url))
-      date_str = data.xpath("//ValCurs").attr("Date").to_s
+      date_str = data.xpath('//ValCurs').attr('Date').to_s
       date = Date.strptime(date_str, (date_str =~ /\./ ? '%d.%m.%Y' : '%d/%m/%y'))
-      data.xpath("//ValCurs/Valute").each do |valute|
-        char_code  = valute.xpath("./CharCode").text.to_s
-        num_code   = valute.xpath("./NumCode").text.to_s
-        name       = valute.xpath("./Name").text.to_s
-        value      = valute.xpath("./Value").text.gsub(',','.').to_f
-        nominal    = valute.xpath("./Nominal").text
-        currency   = Spree::Currency.get(num_code, { :num_code => num_code, :char_code => char_code, :name => name})
+      data.xpath('//ValCurs/Valute').each do |valute|
+        char_code  = valute.xpath('./CharCode').text.to_s
+        num_code   = valute.xpath('./NumCode').text.to_s
+        name       = valute.xpath('./Name').text.to_s
+        value      = valute.xpath('./Value').text.gsub(',', '.').to_f
+        nominal    = valute.xpath('./Nominal').text
+        currency   = Spree::Currency.get(num_code, { num_code: num_code,
+                                                     char_code: char_code,
+                                                     name: name })
         currency && Spree::CurrencyConverter.add(currency, date, value, nominal)
       end
     end
 
-    desc "Rates from European Central Bank"
+    desc 'Rates from European Central Bank'
     task :ecb, [:load_currencies] => :environment do |t, args|
-      Rake::Task["spree_multi_currency:currency:iso4217"].invoke if args.load_currencies
-      euro  = Spree::Currency.get("978", { :num_code => "978", :char_code => "EUR", :name => "Euro"})
+      if args.load_currencies
+        Rake::Task['spree_multi_currency:currency:iso4217'].invoke
+      end
+
+      euro  = Spree::Currency.get('978', eur_hash)
       euro.basic!
       url = 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml'
       data = Nokogiri::XML.parse(open(url))
-      date = Date.strptime(data.xpath('gesmes:Envelope/xmlns:Cube/xmlns:Cube').attr("time").to_s, "%Y-%m-%d")
+      date = Date.strptime(data.xpath('gesmes:Envelope/xmlns:Cube/xmlns:Cube').attr('time').to_s, "%Y-%m-%d")
       data.xpath('gesmes:Envelope/xmlns:Cube/xmlns:Cube//xmlns:Cube').each do |exchange_rate|
-        char_code      = exchange_rate.attribute("currency").value.to_s.strip
-        nominal, value = exchange_rate.attribute("rate").value.to_f, 1
+        char_code      = exchange_rate.attribute('currency').value.to_s.strip
+        nominal, value = exchange_rate.attribute('rate').value.to_f, 1
         currency = Spree::Currency.find_by_char_code(char_code)
         currency && Spree::CurrencyConverter.add(currency, date, value, nominal)
       end
 
     end
 
-    desc "Rates from Google"
+    desc 'Rates from Google'
     task :google, [:currency, :load_currencies] => :environment do |t, args|
-      Rake::Task["spree_multi_currency:currency:iso4217"].invoke if args.load_currencies
-      default_currency = Spree::Currency.where("char_code = :currency_code or num_code = :currency_code", :currency_code => args.currency.upcase || 978).first ||
-                         Spree::Currency.get("978", { :num_code => "978", :char_code => "EUR", :name => "Euro"})
+      Rake::Task['spree_multi_currency:currency:iso4217'].invoke if args.load_currencies
+      if args.currency
+        default_currency = Spree::Currency.where('char_code = :currency_code or num_code = :currency_code', currency_code: args.currency.upcase ).first
+      else
+        default_currency = Spree::Currency.get('978', eur_hash)
+      end
       default_currency.basic!
+      # for spree 2.x require set config currency
+      Spree::Config.currency = default_currency.char_code
       date = Time.now
       puts "Loads currency data from Google using #{default_currency}"
       Spree::Currency.all.each do |currency|
         unless currency == default_currency
           url = "http://www.google.com/ig/calculator?hl=en&q=1#{ currency.char_code }%3D%3F#{ default_currency.char_code }"
           puts url
-          @data = JSON.parse(open(url).read.gsub(/lhs:|rhs:|error:|icc:/){ |x| "\"#{x[0..-2]}\":"})
-          if @data["error"].blank?
-            @value = BigDecimal(@data["rhs"].split(' ')[0])
+          @data = JSON.parse(open(url).read.gsub(/lhs:|rhs:|error:|icc:/){ |x| "\"#{x[0..-2]}\":" })
+          if @data['error'].blank?
+            @value = BigDecimal(@data['rhs'].split(' ')[0])
             Spree::CurrencyConverter.add(currency, date, @value, 1)
           end
         end
@@ -93,7 +114,5 @@ namespace :spree_multi_currency do
     end
   end
 
-
-
 end
 

data/spec/changing_currency_spec.rb

@@ -1,18 +1,47 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
-describe "Currencies changing" do
+describe 'Currencies changing' do
+    before :each do
+        Spree::Product.destroy_all
+        Spree::Currency.destroy_all
+        Spree::CurrencyConverter.destroy_all
+
+        @rub = Spree::Currency.create(name: 'rubles', char_code: 'RUB',
+                                 num_code: 623, locale: 'ru', basic: false)
+        @usd = Spree::Currency.create(name: 'dollars', char_code: 'USD',
+                                 num_code: 624, locale: 'en', basic: true)
+        Spree::CurrencyConverter.add(@rub, Time.now, 1.0, 32.0)
+        @shipping_category = create(:shipping_category)
+    end
+
+    it 'changes price when changing locale' do
+      product = FactoryGirl.create(:product, :cost_price => 1)
+      variant = product.master
+      I18n.locale = 'en'
+      variant.cost_price.should eql 1.0
+      I18n.locale = 'ru'
+      Spree::Currency.current!
+      Spree::Currency.current.should eql @rub
+      variant.cost_price.to_f.should eql 32.0
+
+    end
 
-  it "changes price when changing locale" do
-    rub = Spree::Currency.create(:name => "rubles", :char_code => "RUB", :num_code => 623, :locale => "ru", :basic => false)
-    usd = Spree::Currency.create(:name => "dollars", :char_code => "USD", :num_code => 624, :locale => "en", :basic => true)
-    Spree::CurrencyConverter.create(:nominal => 32, :value => 1.0, :currency => rub, :date_req => Time.now)
-    product = FactoryGirl.create(:product, :price => 1)
-    variant = Spree::Variant.last
-    I18n.locale = "en"
-    variant.price.should eql 1.0
-    I18n.locale = "ru"
-    Spree::Currency.current!
-    Spree::Currency.current.should eql rub
-    variant.price.to_f.should eql 32.0
-  end  
-end
+    it 'check save master_price' do
+      I18n.locale = 'en'
+      Spree::Currency.current!
+      product = Spree::Product.new( name: 'test123',
+                                    price: 123.54)
+      product.shipping_category = @shipping_category
+      product.save!
+      product.reload
+      product.price.should eql 123.54
+      product.master.price.should eql 123.54
+      I18n.locale = 'ru'
+      Spree::Currency.current!
+      Rails.logger.info "\t\n"*10
+      product.price.should eql 3953.28
+      product.master.price.should eql 3953.28
+    end
+end

data/spec/controllers/spree/currency_controller_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Spree::CurrencyController do
+
+  it 'attempt to set incorrect currency' do
+    controller.stub spree_current_user: mock_model(Spree.user_class,
+                                                   has_spree_role?: true,
+                                                   last_incomplete_spree_order: nil,
+                                                   spree_api_key: 'fake')
+    spree_get 'set', id: 'RUBLI'
+    response.status.should == 302
+    flash[:error].should == I18n.t(:currency_not_found)
+  end
+
+end
+

data/spec/features/buy_spec.rb

@@ -0,0 +1,103 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+feature 'Buy' do
+  background :each do
+    # factories defined in spree/core/lib/spree/testing_support/factories
+    # @calculator = create(:calculator)
+    Spree::Config.currency = 'USD'
+    rub = Spree::Currency.create(name: 'rubles', char_code: 'RUB',
+                                 num_code: 623, locale: 'ru', basic: false)
+    usd = Spree::Currency.create(name: 'dollars', char_code: 'USD',
+                                 num_code: 624, locale: 'en', basic: true)
+
+    Spree::CurrencyConverter.create!(nominal: 1.0, value: 32.0,
+                                    currency: rub, date_req: Time.now)
+    Spree::Config.show_products_without_price = true
+
+    # FIXME looks like created default zone for country factory
+    #zone = create(:zone, name: 'CountryZone')
+    @ship_cat = create(:shipping_category,name: 'all')
+
+    @product = create(:base_product, name: 'product1')
+    @product.save!
+    stock = @product.stock_items.first
+    stock.adjust_count_on_hand(100)
+    stock.save!
+
+    @country = create(:country,
+                      iso_name: 'SWEDEN',
+                      name: 'Sweden',
+                      iso: 'SE',
+                      iso3: 'SE',
+                      numcode: 46 )
+    @country.states_required = false
+    @country.save!
+    @state = @country.states.create(name: 'Stockholm')
+
+    ship_meth=FactoryGirl.create(:shipping_method,
+        :calculator_type => 'Spree::Calculator::Shipping::FlatRate',
+        :display_on => 'both')
+    ship_meth.calculator.preferred_amount = 90
+    ship_meth.save!
+    zone = Spree::Zone.first
+    zone.members.create!(zoneable: @country,zoneable_type: 'Country')
+    ship_meth.zones << zone
+    ship_meth.shipping_categories << @ship_cat
+
+    # defined in spec/factories/klarna_payment_factory
+    @pay_method = create(:payment_method)
+  end
+
+  scenario 'visit root page' do
+    # check Spree::Config.show_products_without_price
+    @product.prices.each do |price|
+      price.amount = nil
+      price.save!
+    end
+    Spree::Config.show_products_without_price = false
+    name = @product.name
+    visit '/'
+    expect(page).to have_no_content(name)
+
+    Spree::Config.show_products_without_price = true
+    visit '/'
+    expect(page).to have_content(name)
+
+    # check change currency on product page
+    visit '/currency/RUB'
+    expect(page).to have_content('руб')
+    visit '/currency/USD'
+
+    click_link name
+    click_button 'add-to-cart-button'
+    click_button 'checkout-link'
+    fill_in 'order_email', with: 'test2@example.com'
+    click_button 'Continue'
+
+    # fill addresses
+    # copy from spree/backend/spec/requests/admin/orders/order_details_spec.rb
+    # may will in future require update
+    check 'order_use_billing'
+    fill_in 'order_bill_address_attributes_firstname', with: 'Joe'
+    fill_in 'order_bill_address_attributes_lastname', with: 'User'
+    fill_in 'order_bill_address_attributes_address1', with: '7735 Old Georgetown Road'
+    fill_in 'order_bill_address_attributes_address2', with: 'Suite 510'
+    fill_in 'order_bill_address_attributes_city', with: 'Bethesda'
+    fill_in 'order_bill_address_attributes_zipcode', with: '20814'
+    fill_in 'order_bill_address_attributes_phone', with: '301-444-5002'
+    within('fieldset#billing') do
+      select @country.name , from: 'Country'
+    end
+
+    click_button 'Save and Continue'
+
+    # shipping
+    click_button 'Save and Continue'
+
+    # payment page
+    click_button 'Save and Continue'
+    expect(page).to have_content('Your order has been processed successfully')
+  end
+end