spree_multi_currency 1.0.4 → 2.0.0

data/app/models/spree/currency_converter.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Spree
   class CurrencyConverter < ActiveRecord::Base
     belongs_to :currency

data/app/models/spree/line_item_decorator.rb

@@ -1,13 +1,26 @@
+# encoding: utf-8
+
 Spree::LineItem.class_eval do
-  extend Spree::MultiCurrency
-  multi_currency :price
 
-  def copy_price
-    self.price = variant.reade_attribute(:price) if variant && price.nil?
+  # redefine spree/core/app/models/spree/line_item.rb
+  def single_money
+    calculate_money(price)
+  end
+
+  # redefine spree/core/app/models/spree/line_item.rb
+  def money
+    calculate_money(amount)
   end
 
-  def raw_amount
-    read_attribute(:price) * self.quantity
+  def calculate_money(var)
+    current_cur = Spree::Currency.current
+    var_in_current_currency = Spree::Currency.convert(var,
+                                                      currency,
+                                                      current_cur.char_code)
+    Spree::Money.new(var_in_current_currency, { currency: current_cur })
   end
 
+  alias display_total money
+  alias display_amount money
+
 end

data/app/models/spree/money_decorator.rb

@@ -0,0 +1,15 @@
+Spree::Money.class_eval do
+
+  def initialize(amount, options = {})
+      @money = ::Money.parse([amount, Spree::Currency.current.char_code].join)
+      @options = {}
+      @options[:with_currency] = Spree::Config[:display_currency]
+      @options[:symbol_position] = Spree::Config[:currency_symbol_position].to_sym
+      @options[:no_cents] = Spree::Config[:hide_cents]
+      @options[:decimal_mark] = Spree::Config[:currency_decimal_mark]
+      @options[:thousands_separator] = Spree::Config[:currency_thousands_separator]
+      @options.merge!(options)
+      # Must be a symbol because the Money gem doesn't do the conversion
+      @options[:symbol_position] = @options[:symbol_position].to_sym
+  end
+end

data/app/models/spree/order_decorator.rb

@@ -1,83 +1,91 @@
+# encoding: utf-8
+
+Spree::OrderContents.class_eval do
+
+  def add_to_line_item(line_item, variant, quantity, currency = nil, shipment = nil)
+    if line_item
+      line_item.target_shipment = shipment
+      line_item.quantity += quantity.to_i
+      line_item.currency = currency unless currency.nil?
+      line_item.save
+    else
+      line_item = Spree::LineItem.new(quantity: quantity)
+      line_item.target_shipment = shipment
+      line_item.variant = variant
+      if currency
+        line_item.currency = currency unless currency.nil?
+        line_item.price    = variant.price_in(currency).amount
+      else
+        line_item.price    = variant.price
+      end
+      order.line_items << line_item
+      line_item
+    end
+
+    order.reload
+    line_item
+  end
+
+end
+
 Spree::Order.class_eval do
   extend Spree::MultiCurrency
   multi_currency :item_total, :total,
-                 :rate_at_date => lambda{ |t| t.created_at },
-                 :only_read => true
-
+                 rate_at_date: lambda { |t| t.created_at },
+                 only_read: true
 
   def update_totals
     # update_adjustments
     self.payment_total = payments.completed.map(&:amount).sum
-    self.item_total = line_items.map(&:raw_amount).sum
+    self.item_total = line_items.map(&:amount).sum
     self.adjustment_total = adjustments.map(&:amount).sum
     self.total = read_attribute(:item_total) + adjustment_total
   end
 
+  # this will return only the highest shipping cost
+  # if the calculator fixed price (per item) was used.
+  # not tested with any other calculators
   def rate_hash
-    @rate_hash ||= available_shipping_methods(:front_end).collect do |ship_method|
+    highest_cost = 0
+    available_shipping_methods(:front_end).map do |ship_method|
       next unless cost = ship_method.calculator.compute(self)
-      { :id => ship_method.id,
-        :shipping_method => ship_method,
-        :name => ship_method.name,
-        :cost => Spree::Currency.conversion_to_current(cost)
-      }
-    end.compact.sort_by{|r| r[:cost]}
+      if cost > highest_cost
+        highest_cost = cost
+        @ship_method = ship_method
+      end
+    end
+    @rate_hash ||= [{ id: @ship_method.id,
+                      shipping_method: @ship_method,
+                      name: @ship_method.name,
+                      cost: highest_cost }]
   end
 
   def update!
     update_totals
-    update_payment_state
+    updater.update_payment_state
 
     # give each of the shipments a chance to update themselves
-    shipments.each { |shipment| shipment.update!(self) }#(&:update!)
-    update_shipment_state
-    update_adjustments
-    # update totals a second time in case updated adjustments have an effect on the total
+    shipments.each { |shipment| shipment.update!(self) }
+    updater.update_shipment_state
+    updater.update_adjustments
+    # update totals a second time in case updated adjustments
+    # have an effect on the total
     update_totals
     update_attributes_without_callbacks({
-      :payment_state => payment_state,
-      :shipment_state => shipment_state,
-      :item_total => read_attribute(:item_total),
-      :adjustment_total => adjustment_total,
-      :payment_total => payment_total,
-      :total => read_attribute(:total)
+      payment_state: payment_state,
+      shipment_state: shipment_state,
+      item_total: read_attribute(:item_total),
+      adjustment_total: adjustment_total,
+      payment_total: payment_total,
+      total: read_attribute(:total)
     })
 
-    #ensure checkout payment always matches order total
-    if payment and payment.checkout? and payment.amount != total
-      payment.update_attributes_without_callbacks(:amount => total)
+    # ensure checkout payment always matches order total
+    # FIXME implement for partitial payments
+    if payment? && payments.first.checkout? && payments.first.amount != total
+      payments.first.update_attributes_without_callbacks(amount: total)
     end
 
     update_hooks.each { |hook| self.send hook }
   end
-
-  def add_variant(variant, quantity = 1)
-      current_item = contains?(variant)
-      if current_item
-        current_item.quantity += quantity
-        current_item.save
-      else
-        current_item = Spree::LineItem.new(:quantity => quantity)
-        current_item.variant = variant
-        current_item.price   = variant.read_attribute(:price)
-        self.line_items << current_item
-      end
-
-      # populate line_items attributes for additional_fields entries
-      # that have populate => [:line_item]
-      Spree::Variant.additional_fields.select { |f| !f[:populate].nil? && f[:populate].include?(:line_item) }.each do |field|
-        value = ''
-
-        if field[:only].nil? || field[:only].include?(:variant)
-          value = variant.send(field[:name].gsub(' ', '_').downcase)
-        elsif field[:only].include?(:product)
-          value = variant.product.send(field[:name].gsub(' ', '_').downcase)
-        end
-        current_item.update_attribute(field[:name].gsub(' ', '_').downcase, value)
-      end
-
-      self.reload
-      current_item
-  end
-
 end

data/app/models/spree/product_decorator.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+Spree::Product.class_eval do
+
+  # Can't use add_search_scope for this as it needs a default argument
+  def self.available(available_on = nil, currency = nil)
+    scope = joins(:master => :prices).where("#{Spree::Product.quoted_table_name}.available_on <= ?", available_on || Time.now)
+    unless Spree::Config.show_products_without_price
+      # should render product with any not null price
+      scope = scope.where('spree_prices.amount IS NOT NULL')
+    end
+    scope
+  end
+
+  # FIXME may be not require remove it from array
+  search_scopes.delete(:available)
+  search_scopes << :available
+end
+
+Spree::Core::Search::Base.class_eval do
+    def retrieve_products
+      @products_scope = get_base_scope
+      curr_page = page || 1
+
+      @products = @products_scope.includes([:master => :prices])
+      unless Spree::Config.show_products_without_price
+        @products = @products.where("spree_prices.amount IS NOT NULL")
+      end
+      @products = @products.page(curr_page).per(per_page)
+    end
+
+end
+

data/app/models/spree/stock/estimator_decorator.rb

@@ -0,0 +1,18 @@
+Spree::Stock::Estimator.class_eval do
+
+   # currency not make sence
+   # redefined spree/core/app/models/spree/stock/estimator.rb
+   # may be i something miss, but looks like should be
+   # deleted shipping method if calculator have NOT currency
+   def shipping_methods(package)
+     shipping_methods = package.shipping_methods
+     shipping_methods.delete_if do |ship_method|
+       !ship_method.calculator.available?(package) ||
+       !ship_method.include?(order.ship_address) ||
+       ship_method.calculator.preferences[:currency].nil?
+     end
+     shipping_methods
+   end
+
+end
+

data/app/models/spree/variant_decorator.rb

@@ -1,22 +1,99 @@
+# encoding: utf-8
+
 Spree::Variant.class_eval do
   extend Spree::MultiCurrency
-  multi_currency :price, :cost_price
+  multi_currency :cost_price
+
+  # if save variant - require save prices
+  after_save :save_price
+
+
+  # get spree_price for current currency or
+  # basic or
+  # any other
+  def get_price
+    char_code = current_char_code
+    current_price = prices.where(currency: char_code).first
+    if current_price && current_price.amount.present?
+      amount = current_price.amount
+      return amount
+    else
+      basic_char = Spree::Currency.basic.try(:char_code)
+      basic_price = prices.where(currency: basic_char).first
+      if basic_price
+        amount = basic_price.amount
+        return Spree::Currency.conversion_to_current(amount)
+      else
+        spree_price = prices.first
+        amount = spree_price.amount
+        res = Spree::Currency.convert(amount, spree_price.currency, char_code)
+        return res
+      end
+    end
+  end
+
+  # FIXME - may be will used in other classes
+  def current_char_code
+     Spree::Currency.current.try(:char_code) || Spree::Config[:currency]
+  end
+
+  # prices stored in spree_prices
+  def price
+    attr = read_attribute(:price)
+    if attr.nil? && !new_record?
+      get_price
+    else
+      attr
+    end
+  end
+
+  # assign price
+  # if new record - save to attribute
+  # if saved - create price
+  def price=(value)
+    write_attribute(:price,value)
+    if !new_record?
+      cur = current_char_code
+      base_price = prices.where(currency: cur).first
+      if base_price
+        base_price.amount = value
+      else
+        prices.new(amount: value,currency: cur)
+      end
+    end
+  end
+
+
+  # redefine spree method from spree/core/app/models/spree/variant.rb
   def price_in(currency)
-    # will use internal currency, parametr will ignored
-    currency = Spree::Currency.current
-    prices.select{ |price| price.currency == currency }.first || Spree::Price.new(:variant_id => self.id, :currency => currency, :amount => self.cost_price)
+    if currency.is_a?(String)
+        char_code = currency
+    else
+        char_code = currency.char_code
+    end
+    res = prices.where( currency: char_code ).first
+    if res.blank? || res.amount.nil? || res.amount.to_i == 0
+      res = Spree::Price.new(variant_id: self.id,
+                             currency: currency,
+                             amount: get_price)
+    end
+    res
   end
-end
 
-Spree::Money.class_eval do
-  def initialize(amount, options={})
-    @money = ::Money.parse([amount, (Spree::Currency.current.char_code)].join)
-    @options = {}
-    @options[:with_currency] = true if Spree::Config[:display_currency]
-    @options[:symbol_position] =  Spree::Config[:currency_symbol_position].to_sym
-    @options[:no_cents] = true if Spree::Config[:hide_cents]
-    @options.merge!(options)
-    # Must be a symbol because the Money gem doesn't do the conversion
-    @options[:symbol_position] = @options[:symbol_position].to_sym
-   end
+  private
+
+  def save_price
+    char_code = current_char_code
+    spree_price = self.prices.where(currency: char_code).first
+    if spree_price.blank?
+      spree_price = self.prices.new(currency: char_code)
+    end
+    spree_price.amount = read_attribute(:price)
+     if spree_price &&
+       (spree_price.changed? ||
+        spree_price.new_record? ||
+        spree_price.amount.present? )
+      spree_price.save!
+     end
+  end
 end

data/app/overrides/add_currencies_admin_configurations_menu.rb

@@ -1,10 +1,11 @@
-Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
-                     :name => "currencies_admin_configurations_menu",
-                     :insert_bottom => "ul[data-hook='admin_configurations_sidebar_menu']",
-                     :disabled => false,
-                     :text => "
-<% if current_user.has_spree_role?(:admin) %>
+# encoding: utf-8
+Deface::Override.new(virtual_path: "spree/admin/shared/_configuration_menu",
+                     name: "currencies_admin_configurations_menu",
+                     insert_bottom: "ul[data-hook='admin_configurations_sidebar_menu']",
+                     disabled: false,
+                     text: "
+<% if spree_current_user.has_spree_role?(:admin) %>
   <%= configurations_sidebar_menu_item t(:currency_settings), admin_currencies_path %>
   <%= configurations_sidebar_menu_item t(:currency_converters_settings), admin_currency_converters_path %>
 <% end %>
-")
+")

data/app/overrides/add_currency_selection.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+Deface::Override.new(virtual_path: "spree/shared/_main_nav_bar",
+                     name: "currencies_admin_configurations_menu",
+                     insert_bottom: "ul#main-nav-bar",
+                     disabled: false,
+                     text: "
+                     <li><%= select_tag 'currency', options_for_select(Spree::Currency.all_currencies, Spree::Currency.current.char_code) %></li>
+                     <script>
+                      $('#currency').on('change', function(event){
+                        window.location = '/currency/' + $(this).val();
+
+                      });
+                     </script>
+
+                     ")

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

@@ -4,13 +4,13 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to t("back_to_currencies"), collection_url, :icon => 'icon-arrow-left' %>
+    <%= button_link_to t('back_to_currencies'), collection_url, :icon => 'icon-arrow-left' %>
   </li>
 <% end %>
 
 <%= form_for(:currency, :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/app/views/spree/admin/currency_converters/edit.html.erb

@@ -4,13 +4,13 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to t("back_to_currency_converters"), collection_url, :icon => 'icon-arrow-left' %>
+    <%= button_link_to t('back_to_currency_converters'), collection_url, :icon => 'icon-arrow-left' %>
   </li>
 <% end %>
 
 <%= form_for(:currency_converter, :url => object_url, :html => { :method => :put }) do |f| %>
 	<fieldset class="no-border-top">
-	  <%= render :partial => "form", :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+	  <%= render 'form',  :f => f %>
+    <%= render 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
-<% end %>
+<% end %>