Remove number_display.rb

app/documents/order_by_groups.rb

@@ -27,7 +27,7 @@ class OrderByGroups < OrderPdf
         rows <<  [goa.order_article.article.name,
                   goa.order_article.article.supplier.name,
                   group_order_article_quantity_with_tolerance(goa),
-                  goa.result,
+                  group_order_article_result(goa),
                   order_article_price_per_unit(goa.order_article),
                   number_to_currency(goa.total_price)]
       end

app/helpers/group_order_articles_helper.rb

@@ -2,11 +2,12 @@ module GroupOrderArticlesHelper
 
   # return an edit field for a GroupOrderArticle result
   def group_order_article_edit_result(goa)
+    result = number_with_precision goa.result, strip_insignificant_zeros: true
     unless goa.group_order.order.finished? && current_user.role_finance?
-      goa.result
+      result
     else
       simple_form_for goa, remote: true, html: {'data-submit-onchange' => 'changed', class: 'delta-input'} do |f|
-        f.input_field :result, as: :delta, class: 'input-nano', data: {min: 0}, id: "r_#{goa.id}"
+        f.input_field :result, as: :delta, class: 'input-nano', data: {min: 0}, id: "r_#{goa.id}", value: result
       end
     end
   end

app/views/finance/balancing/_group_order_articles.html.haml

@@ -11,7 +11,7 @@
         %td{:colspan => "3",:style => "width:14em"}
           - unless order_article.order.closed?
             = link_to t('.add_group'), new_group_order_article_path(order_article_id: order_article.id),
-              remote: true, class: 'btn btn-mini' 
+              remote: true, class: 'btn btn-mini'
     %tbody
       - totals = {result: 0}
       - for group_order_article in order_article.group_order_articles.select { |goa| goa.result > 0 }
@@ -23,7 +23,7 @@
           %td.numeric= number_to_currency(group_order_article.order_article.price.fc_price * group_order_article.result)
           %td.actions{:style=>"width:1em"}
             - unless order_article.order.closed?
-              = link_to t('ui.delete'), group_order_article_path(group_order_article), 
+              = link_to t('ui.delete'), group_order_article_path(group_order_article),
                 method: :delete, remote: true, class: 'btn btn-mini btn-danger'
           %td
         - totals[:result] += group_order_article.result
@@ -31,6 +31,6 @@
       %tr
         %td
         %td{:style => "width:8em"}= t('.total_fc')
-        %td.center= totals[:result]
+        %td.center= number_with_precision totals[:result], strip_insignificant_zeros: true
         %td.numeric= number_to_currency(order_article.group_orders_sum[:price])
         %td{:colspan => "3"}

app/views/finance/balancing/_order_article.html.haml

@@ -17,8 +17,8 @@
   :plain
     /
   = number_to_currency(order_article.total_gross_price, :unit => "")
-%td #{order_article.price.tax}%
-%td= order_article.price.deposit
+%td= number_to_percentage(order_article.price.tax) unless order_article.price.tax.zero?
+%td= number_to_currency(order_article.price.deposit, :unit => "") unless order_article.price.deposit.zero?
 %td
   = link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article), remote: true,
     class: 'btn btn-mini' unless order_article.order.closed?

config/initializers/number_display.rb

@@ -1,22 +0,0 @@
-# we'd like to show "0.0" as "0"
-
-class Float
-  alias :foodsoft_to_s :to_s
-  def to_s
-    foodsoft_to_s.gsub /(\.0*|(\.[0-9]+?)0+)$/, '\2'
-  end
-end
-
-# allow +to_s+ on bigdecimal without argument too
-if defined? BigDecimal
-  class BigDecimal
-    alias :foodsoft_to_s :to_s
-    def to_s(*args)
-      if args.present?
-        foodsoft_to_s(*args)
-      else
-        foodsoft_to_s(*args).gsub /(\.0*|(\.[0-9]+?)0+)$/, '\2'
-      end
-    end
-  end
-end

lib/order_pdf.rb

@@ -50,6 +50,10 @@ class OrderPdf < RenderPDF
     goa.tolerance > 0 ? "#{goa.quantity} + #{goa.tolerance}" : "#{goa.quantity}"
   end
 
+  def group_order_article_result(goa)
+    number_with_precision goa.result, strip_insignificant_zeros: true
+  end
+
   def group_order_articles(ordergroup)
     GroupOrderArticle.
       includes(:group_order).
@@ -107,7 +111,7 @@ class OrderPdf < RenderPDF
       results = goa_records.group_by(&:first).transform_values do |value|
         grouped_value = value.group_by(&:second)
         group_ids.map do |group_id|
-          grouped_value[group_id].try(:first).try(:third)
+          number_with_precision grouped_value[group_id].try(:first).try(:third), strip_insignificant_zeros: true
         end
       end
 

plugins/current_orders/app/documents/multiple_orders_by_articles.rb

@@ -27,7 +27,7 @@ class MultipleOrdersByArticles < OrderPdf
       each_group_order_article_for(order_article) do |goa|
         rows << [goa.group_order.ordergroup_name,
                  goa.tolerance > 0 ? "#{goa.quantity} + #{goa.tolerance}" : goa.quantity,
-                 goa.result,
+                 group_order_article_result(goa),
                  number_to_currency(goa.total_price(order_article))]
         dimrows << rows.length if goa.result == 0
       end

plugins/current_orders/app/documents/multiple_orders_by_groups.rb

@@ -38,7 +38,7 @@ class MultipleOrdersByGroups < OrderPdf
                   number_to_currency(price),
                   goa.order_article.article.unit,
                   goa.tolerance > 0 ? "#{goa.quantity} + #{goa.tolerance}" : goa.quantity,
-                  goa.result,
+                  group_order_article_result(goa),
                   number_to_currency(sub_total),
                   goa.order_article.price.unit_quantity]
         dimrows << rows.length if goa.result == 0

plugins/polls/app/views/polls/show.html.haml

@@ -53,9 +53,9 @@
         %td
           - best_sum = @poll.resistance_points? ? sums.min : sums.max
           - if sum == best_sum
-            %strong= sum
+            %strong= number_with_precision sum, strip_insignificant_zeros: true
           - else
-            = sum
+            = number_with_precision sum, strip_insignificant_zeros: true
       %td
 
 - for vote in @poll.poll_votes