Makes price details to work with "other costs"

closes ActionItem2519

Makes price details to work with "other costs"
closes ActionItem2519
Aurélio A. Heckert · Rodrigo Souto
1 parent 2a82af5f
Showing 8 changed files with 36 additions and 19 deletions Show diff stats
app/models/price_detail.rb
app/models/product.rb
app/views/manage_products/_display_price_details.rhtml
app/views/manage_products/_edit_price_details.rhtml
app/views/manage_products/_manage_product_details.rhtml
public/javascripts/manage-products.js
public/stylesheets/application.css
test/unit/price_detail_test.rb
@@ -4,11 +4,11 @@ class PriceDetail &lt; ActiveRecord::Base
   validates_presence_of :product_id
   belongs_to :production_cost
-  validates_presence_of :production_cost
+  # Do not validates_presence_of production_cost. We may have undefined other costs.
   validates_uniqueness_of :production_cost_id, :scope => :product_id
   def name
-    production_cost.name
+    production_cost.nil? ? _('other costs') : production_cost.name
   end
   def price
@@ -191,11 +191,13 @@ class Product &lt; ActiveRecord::Base
     (price - total_production_cost.to_f).zero?
   end
-  def update_price_details(price_details)
-    self.price_details.destroy_all
-    price_details.each do |price_detail|
-      self.price_details.create(price_detail)
+  def update_price_details(new_price_details)
+    price_details.destroy_all
+    new_price_details.each do |detail|
+      price_details.create(detail)
     end
+    reload # to remove temporary duplicated price_details
+    price_details
   end
   def price_description_percentage
@@ -10,7 +10,7 @@
     </li>
     <% @product.price_details.each do |price_detail| %>
       <li>
-        <div class='price-detail-name'><%= "%s:" % price_detail.production_cost.name %></div>
+        <div class='price-detail-name'><%= "%s:" % price_detail.name %></div>
         <div class='price-detail-price'><%= float_to_currency(price_detail.price) %></div>
       </li>
     <% end %>
 <% price_details.each do |price_detail| %>
   <tr id='<%= "price-detail-#{price_detail.id}" %>'>
     <td><%= select_production_cost(@product, price_detail.production_cost_id) %></td>
-    <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price')) %></td>
+    <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price', :size => 6)) %></td>
     <td>
       <%= link_to_remote(_('Remove'),
                          :update => "price-detail-#{price_detail.id}",
@@ -34,7 +34,7 @@
   <table id='new-cost-fields'>
     <tr>
       <td><%= select_production_cost(@product) %></td>
-      <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price')) %></td>
+      <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price', :size => 6)) %></td>
       <td><%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %></td>
     </tr>
   </table>
@@ -23,13 +23,24 @@
     return false;
   });
-  $("#manage-product-details-form").live('submit', function(data) {
+  $('#manage-product-details-form').live('submit', function(data) {
      var form = this;
      $(form).find('.loading-area').addClass('small-loading');
      $(form).css('cursor', 'progress');
-     $.post(form.action, $(form).serialize(), function(data) {
-       $("#display-manage-price-details").html(data);
-       $("#manage-product-details-button").show();
+     var request = $.ajax(form.action, {
+       type: 'POST',
+       dataType: 'html',
+       data: $(form).serialize()
+     });
+     request.done(function(data, textStatus, jqXHR) {
+       $('#display-manage-price-details').html(data);
+       $('#manage-product-details-button').show();
+     });
+     request.fail(function(jqXHR, textStatus, errorThrown) {
+       log.error('manage_product_details', 'Request failed', errorThrown);
+       alert('manage_product_details\nRequest failed: '+ errorThrown +
+             '\n\nPlease, contact the site administrator.');
+       $('#display-manage-price-details .loading-area').hide();
      });
      if ($('#progressbar-icon').hasClass('ui-icon-check')) {
        display_notice($('#progressbar-icon').attr('data-price-described-notice'));
@@ -3003,6 +3003,10 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   display: inline-block;
 }
+#manage-product-details-form .formfieldline {
+  white-space: nowrap;
+}
+
 #manage-product-details-form .formlabel,
 #manage-product-details-form .formfield {
   display: inline-block;
@@ -50,14 +50,14 @@ class PriceDetailTest &lt; ActiveSupport::TestCase
     assert_equal cost, PriceDetail.find(detail.id).production_cost
   end
-  should 'production cost be mandatory' do
-    p = PriceDetail.new
-    p.valid?
-
-    assert p.errors.invalid?(:production_cost)
+  should 'production cost not be mandatory' do
+    product = fast_create(Product)
+    price = PriceDetail.new :product=>product
+    price.valid?
+    assert price.errors.empty?
   end
-  should 'th production cost be unique on scope of product' do
+  should 'the production cost be unique on scope of product' do
     product = fast_create(Product)
     cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'environment')
	@@ -4,11 +4,11 @@ class PriceDetail < ActiveRecord::Base		@@ -4,11 +4,11 @@ class PriceDetail < ActiveRecord::Base
4	validates_presence_of :product_id	4	validates_presence_of :product_id
5		5
6	belongs_to :production_cost	6	belongs_to :production_cost
7	- validates_presence_of :production_cost	7	+ # Do not validates_presence_of production_cost. We may have undefined other costs.
8	validates_uniqueness_of :production_cost_id, :scope => :product_id	8	validates_uniqueness_of :production_cost_id, :scope => :product_id
9		9
10	def name	10	def name
11	- production_cost.name	11	+ production_cost.nil? ? _('other costs') : production_cost.name
12	end	12	end
13		13
14	def price	14	def price
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10	</li>	10	</li>
11	<% @product.price_details.each do \|price_detail\| %>	11	<% @product.price_details.each do \|price_detail\| %>
12	<li>	12	<li>
13	- <div class='price-detail-name'><%= "%s:" % price_detail.production_cost.name %></div>	13	+ <div class='price-detail-name'><%= "%s:" % price_detail.name %></div>
14	<div class='price-detail-price'><%= float_to_currency(price_detail.price) %></div>	14	<div class='price-detail-price'><%= float_to_currency(price_detail.price) %></div>
15	</li>	15	</li>
16	<% end %>	16	<% end %>
1	<% price_details.each do \|price_detail\| %>	1	<% price_details.each do \|price_detail\| %>
2	<tr id='<%= "price-detail-#{price_detail.id}" %>'>	2	<tr id='<%= "price-detail-#{price_detail.id}" %>'>
3	<td><%= select_production_cost(@product, price_detail.production_cost_id) %></td>	3	<td><%= select_production_cost(@product, price_detail.production_cost_id) %></td>
4	- <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price')) %></td>	4	+ <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price', :size => 6)) %></td>
5	<td>	5	<td>
6	<%= link_to_remote(_('Remove'),	6	<%= link_to_remote(_('Remove'),
7	:update => "price-detail-#{price_detail.id}",	7	:update => "price-detail-#{price_detail.id}",
	@@ -34,7 +34,7 @@		@@ -34,7 +34,7 @@
34	<table id='new-cost-fields'>	34	<table id='new-cost-fields'>
35	<tr>	35	<tr>
36	<td><%= select_production_cost(@product) %></td>	36	<td><%= select_production_cost(@product) %></td>
37	- <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price')) %></td>	37	+ <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price', :size => 6)) %></td>
38	<td><%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %></td>	38	<td><%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %></td>
39	</tr>	39	</tr>
40	</table>	40	</table>
	@@ -23,13 +23,24 @@		@@ -23,13 +23,24 @@
23	return false;	23	return false;
24	});	24	});
25		25
26	- $("#manage-product-details-form").live('submit', function(data) {	26	+ $('#manage-product-details-form').live('submit', function(data) {
27	var form = this;	27	var form = this;
28	$(form).find('.loading-area').addClass('small-loading');	28	$(form).find('.loading-area').addClass('small-loading');
29	$(form).css('cursor', 'progress');	29	$(form).css('cursor', 'progress');
30	- $.post(form.action, $(form).serialize(), function(data) {
31	- $("#display-manage-price-details").html(data);
32	- $("#manage-product-details-button").show();	30	+ var request = $.ajax(form.action, {
		31	+ type: 'POST',
		32	+ dataType: 'html',
		33	+ data: $(form).serialize()
		34	+ });
		35	+ request.done(function(data, textStatus, jqXHR) {
		36	+ $('#display-manage-price-details').html(data);
		37	+ $('#manage-product-details-button').show();
		38	+ });
		39	+ request.fail(function(jqXHR, textStatus, errorThrown) {
		40	+ log.error('manage_product_details', 'Request failed', errorThrown);
		41	+ alert('manage_product_details\nRequest failed: '+ errorThrown +
		42	+ '\n\nPlease, contact the site administrator.');
		43	+ $('#display-manage-price-details .loading-area').hide();
33	});	44	});
34	if ($('#progressbar-icon').hasClass('ui-icon-check')) {	45	if ($('#progressbar-icon').hasClass('ui-icon-check')) {
35	display_notice($('#progressbar-icon').attr('data-price-described-notice'));	46	display_notice($('#progressbar-icon').attr('data-price-described-notice'));