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

Add transport costs to Order

Browse source
This commit is contained in:
Patrick Gansterer 2020-03-19 00:22:20 +01:00
parent 8cb70d819e
commit 4c567fece1
16 changed files with 141 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/shared/articles_by/_articles.html.haml
View file

@ -12,3 +12,13 @@
= render 'shared/articles_by/article_single', order_article: order_article
%tr
%td{colspan: 4}
- if order.transport
%tbody
%tr.list-heading
%th{colspan: 4}>
%h4.name.pull-left= heading_helper GroupOrder, :transport
- for go in order.group_orders
- if go.transport
%tr
%td{colspan: 3, style: 'width:70%'}= go.ordergroup_name
%td= number_to_currency(go.transport)

7
app/views/shared/articles_by/_common.html.haml
View file

@ -27,4 +27,11 @@
el_price_sum.text(I18n.l('currency', new_price_sum));
el_price_sum.data('value', new_price_sum);
}
var el_total = $('.total', el_sum);
if (el_total.length) {
var old_total = el_total.data('value');
var new_total = old_total - old_price + e.group_order_article_price;
el_total.text(I18n.l('currency', new_total));
el_total.data('value', new_total);
}
});

10
app/views/shared/articles_by/_group_single.html.haml
View file

@ -8,8 +8,16 @@
- total += goa.total_price
= render 'shared/articles_by/group_single_goa', goa: goa
%tr{class: cycle('even', 'odd', :name => 'articles')}
%th{colspan: 7}= t 'shared.articles_by.price_sum'
%th{colspan: 7}= heading_helper GroupOrder, :price
%th.price_sum{colspan: 2, data: {value: total}}= number_to_currency(total)
- if group_order.transport
- total += group_order.transport
%tr{class: cycle('even', 'odd', :name => 'articles')}
%td{colspan: 7}= heading_helper GroupOrder, :transport
%td{colspan: 2}= number_to_currency(group_order.transport)
%tr{class: cycle('even', 'odd', :name => 'articles')}
%th{colspan: 7}= heading_helper GroupOrder, :total
%th.total{colspan: 2, data: {value: total}}= number_to_currency(total)
%tr
%th{colspan: 9}
- reset_cycle("articles")