Download as
Browse Code »

Commit 8f42ea6fdc629a43195adc4b367b2b3115b7d152

Authored by Daniela Feitosa
1 parent 5ad46e23
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Calling method instead of calculating cost on view 

(ActionItem2111)
Showing 2 changed files with 1 additions and 6 deletions   Show diff stats
app/models/input.rb
  Diff comments   View file @8f42ea6
@@ -59,9 +59,4 @@ class Input < ActiveRecord::Base @@ -59,9 +59,4 @@ class Input < ActiveRecord::Base
59 return 0 if self.amount_used.blank? || self.price_per_unit.blank? 59 return 0 if self.amount_used.blank? || self.price_per_unit.blank?
60 self.amount_used * self.price_per_unit 60 self.amount_used * self.price_per_unit
61 end 61 end
62 -  
63 - def cost  
64 - return 0 if self.amount_used.blank? || self.price_per_unit.blank?  
65 - self.amount_used * self.price_per_unit  
66 - end  
67 end 62 end
app/views/catalog/index.rhtml
  Diff comments   View file @8f42ea6
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 <% product.inputs.each do |i| %> 59 <% product.inputs.each do |i| %>
60 <div class="search-product-input-dots-to-price"> 60 <div class="search-product-input-dots-to-price">
61 <div class="search-product-input-name"><%= i.product_category.name %></div> 61 <div class="search-product-input-name"><%= i.product_category.name %></div>
62 - <%= price_span i.price_per_unit * i.amount_used, :class => 'search-product-input-price' %> 62 + <%= price_span i.cost, :class => 'search-product-input-price' %>
63 </div> 63 </div>
64 <% end %> 64 <% end %>
65 </div> 65 </div>