Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Remove number_display.rb

Browse source
This commit is contained in:
Patrick Gansterer 2020-03-23 12:53:21 +01:00
parent 5f2e319469
commit 67ab647eb0
9 changed files with 18 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/documents/order_by_groups.rb
View file

@ -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

5
app/helpers/group_order_articles_helper.rb
View file

@ -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

6
app/views/finance/balancing/_group_order_articles.html.haml
View file

@ -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"}

4
app/views/finance/balancing/_order_article.html.haml
View file

@ -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?