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

fix balancing and matrix since receive

Browse source
This commit is contained in:
wvengen 2014-02-13 15:59:04 +01:00
parent 0128f72103
commit 2c85618284
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/documents/order_matrix.rb
View file

@ -27,7 +27,7 @@ class OrderMatrix < OrderPdf
a.article.unit, a.article.unit,
a.price.unit_quantity, a.price.unit_quantity,
number_with_precision(a.price.fc_price, precision: 2), number_with_precision(a.price.fc_price, precision: 2),
a.units_to_order] a.units]
end end
table order_articles_data, cell_style: {size: 8, overflow: :shrink_to_fit} do |table| table order_articles_data, cell_style: {size: 8, overflow: :shrink_to_fit} do |table|

2
app/models/order.rb
View file

@ -124,7 +124,7 @@ class Order < ActiveRecord::Base
total = 0 total = 0
if type == :net || type == :gross || type == :fc if type == :net || type == :gross || type == :fc
for oa in order_articles.ordered.includes(:article, :article_price) for oa in order_articles.ordered.includes(:article, :article_price)
quantity = oa.units_to_order * oa.price.unit_quantity quantity = oa.units * oa.price.unit_quantity
case type case type
when :net when :net
total += quantity * oa.price.price total += quantity * oa.price.price