Stop using application helper

(ActionItem1970)

Stop using application helper
(ActionItem1970)
Rodrigo Souto
1 parent 82653b80
Showing 6 changed files with 22 additions and 19 deletions Show diff stats
plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb
plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb
plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
@@ -16,7 +16,7 @@ class ShoppingCartPluginProfileController &lt; 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 &lt; 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 &lt; ProfileController
   end
   def buy
+    @environment = profile.environment
     render :layout => false
   end
@@ -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)
     '<table id="cart-items-table" cellpadding="2" cellspacing="0"
     border="'+(by_mail ? '1' : '0')+'"
     style="'+(by_mail ? 'border-collapse:collapse' : '')+'">' +
@@ -33,12 +33,18 @@ module ShoppingCartPlugin::CartHelper
       content_tag('tr',
                   content_tag('td', product.name) +
                   content_tag('td', quantity, quantity_opts ) +
-                  content_tag('td', get_price(product), price_opts )
+                  content_tag('td', get_price(product, environment), price_opts )
                  )
     end.join("\n") +
     content_tag('th', _('Total:'), :colspan => 2, :class => 'cart-table-total-label') +
-    content_tag('th', get_total(items), :class => 'cart-table-total-value') +
+    content_tag('th', get_total(items, environment), :class => 'cart-table-total-value') +
     '</table>'
   end
+  private
+
+  def float_to_currency_cart(value, environment)
+    number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :format => "%u %n")
+  end
+
 end
-include ApplicationHelper
-
 class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase
   prepend_view_path(ShoppingCartPlugin.root_path+'/views')
@@ -4,7 +4,6 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   </head>
   <body>
-    <% environment = @environment %>
     <h4><%= _('Hi %s!') % @customer[:name] %></h4>
     <p>
@@ -22,13 +21,13 @@
     </ul>
     <p><%=_('Here are the products you bought:')%></p>
-    <%= items_table(@items, true) %>
+    <%= items_table(@items, @environment, true) %>
     <p>
       --<br/>
       <%=_('Thanks for buying with us!')%><br/>
       <%= link_to @supplier.name, @supplier.url %>
     </p>
-    <small style="color: #888"><%= _('A service of %s.') % environment.name %></small>
+    <small style="color: #888"><%= _('A service of %s.') % @environment.name %></small>
   </body>
 </html>
@@ -4,7 +4,6 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   </head>
   <body>
-    <% environment = @environment %>
     <h4><%= _('Hi %s!') % @supplier.name %></h4>
     <p>
@@ -22,12 +21,12 @@
     </ul>
     <p><%=_('And here are the items bought by this customer:')%></p>
-    <%= items_table(@items, true) %>
+    <%= items_table(@items, @environment, true) %>
     <p>
       --<br/>
-      <%=_('If there are any problems with this email contact the admin of %s.') % environment.name %>
+      <%=_('If there are any problems with this email contact the admin of %s.') % @environment.name %>
     </p>
-    <small style="color: #888"><%= _('A service of %s.') % environment.name %></small>
+    <small style="color: #888"><%= _('A service of %s.') % @environment.name %></small>
   </body>
 </html>
@@ -18,7 +18,7 @@
       <%= submit_button(:send, _('Send buy request')) %>
     </div>
   <% end %>
-  <%= items_table(session[:cart][:items]) %>
+  <%= items_table(session[:cart][:items], @environment) %>
 </div>
 <script type="text/javascript">
1	-include ApplicationHelper
2	-
3	class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase	1	class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase
4		2
5	prepend_view_path(ShoppingCartPlugin.root_path+'/views')	3	prepend_view_path(ShoppingCartPlugin.root_path+'/views')
	@@ -18,7 +18,7 @@		@@ -18,7 +18,7 @@
18	<%= submit_button(:send, _('Send buy request')) %>	18	<%= submit_button(:send, _('Send buy request')) %>
19	</div>	19	</div>
20	<% end %>	20	<% end %>
21	- <%= items_table(session[:cart][:items]) %>	21	+ <%= items_table(session[:cart][:items], @environment) %>
22	</div>	22	</div>
23		23
24	<script type="text/javascript">	24	<script type="text/javascript">