diff --git a/plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb b/plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb index bf623d1..e948347 100644 --- a/plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb +++ b/plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb @@ -16,7 +16,7 @@ class ShoppingCartPluginProfileController < ProfileController :products => [{ :id => product.id, :name => product.name, - :price => get_price(product), + :price => get_price(product, profile.environment), :description => product.description, :picture => product.default_image(:minor), :quantity => session[:cart][:items][product.id] @@ -44,7 +44,7 @@ class ShoppingCartPluginProfileController < ProfileController product = Product.find(id) { :id => product.id, :name => product.name, - :price => get_price(product), + :price => get_price(product, profile.environment), :description => product.description, :picture => product.default_image(:minor), :quantity => quantity @@ -83,6 +83,7 @@ class ShoppingCartPluginProfileController < ProfileController end def buy + @environment = profile.environment render :layout => false end diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb b/plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb index 2f759be..2ece9c7 100644 --- a/plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb +++ b/plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb @@ -7,15 +7,15 @@ module ShoppingCartPlugin::CartHelper product.discount ? product.price_with_discount : product.price end - def get_price(product) - float_to_currency(sell_price(product)) + def get_price(product, environment) + float_to_currency_cart(sell_price(product), environment) end - def get_total(items) - float_to_currency(items.map { |id, quantity| sell_price(Product.find(id)) * quantity}.sum) + def get_total(items, environment) + float_to_currency_cart(items.map { |id, quantity| sell_price(Product.find(id)) * quantity}.sum, environment) end - def items_table(items, by_mail = false) + def items_table(items, environment, by_mail = false) '
@@ -22,13 +21,13 @@
<%=_('Here are the products you bought:')%>
- <%= items_table(@items, true) %> + <%= items_table(@items, @environment, true) %>
--
<%=_('Thanks for buying with us!')%>
<%= link_to @supplier.name, @supplier.url %>