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

fix fax documents for stock orders (closes foodcoops#79)

Browse source
This commit is contained in:
wvengen 2014-09-02 15:47:01 +02:00
parent da2b5b54d0
commit a699f95903
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/orders/show.html.haml
View file

@ -55,7 +55,8 @@
%li= order_pdf(@order, :articles, t('.download.article_pdf')) %li= order_pdf(@order, :articles, t('.download.article_pdf'))
%li= order_pdf(@order, :matrix, t('.download.matrix_pdf')) %li= order_pdf(@order, :matrix, t('.download.matrix_pdf'))
%li= order_pdf(@order, :fax, t('.download.fax_pdf')) %li= order_pdf(@order, :fax, t('.download.fax_pdf'))
%li= link_to t('.download.fax_txt'), order_path(@order, format: :txt), {title: t('.download.download_file')} - unless @order.stockit?
%li= link_to t('.download.fax_txt'), order_path(@order, format: :txt), {title: t('.download.download_file')}
%li= link_to t('.download.fax_csv'), order_path(@order, format: :csv), {title: t('.download.download_file')} %li= link_to t('.download.fax_csv'), order_path(@order, format: :csv), {title: t('.download.download_file')}
- if @order.open? - if @order.open?

2
lib/order_csv.rb
View file

@ -20,7 +20,7 @@ class OrderCsv < RenderCSV
oa.article.order_number, oa.article.order_number,
oa.article.name, oa.article.name,
oa.article.unit + (oa.price.unit_quantity > 1 ? " × #{oa.price.unit_quantity}" : ''), oa.article.unit + (oa.price.unit_quantity > 1 ? " × #{oa.price.unit_quantity}" : ''),
number_to_currency(oa.article_price.price * oa.article_price.unit_quantity), number_to_currency(oa.article.price * oa.article.unit_quantity),
number_to_currency(oa.total_price) number_to_currency(oa.total_price)
] ]
end end