Merge pull request #424 from foodcoop1040/stock_order_fixes
Add missing changes for the stock order
This commit is contained in:
commit
86d8e90c06
4 changed files with 4 additions and 3 deletions
|
@ -37,7 +37,7 @@ class OrderByGroups < OrderPdf
|
||||||
rows << [ I18n.t('documents.order_by_groups.sum'), nil, nil, nil, nil, nil, number_to_currency(total)]
|
rows << [ I18n.t('documents.order_by_groups.sum'), nil, nil, nil, nil, nil, number_to_currency(total)]
|
||||||
rows.unshift I18n.t('documents.order_by_groups.rows') # Table Header
|
rows.unshift I18n.t('documents.order_by_groups.rows') # Table Header
|
||||||
|
|
||||||
text group_order.ordergroup.name, size: fontsize(9), style: :bold
|
text group_order.ordergroup_name, size: fontsize(9), style: :bold
|
||||||
table rows, width: 500, cell_style: {size: fontsize(8), overflow: :shrink_to_fit} do |table|
|
table rows, width: 500, cell_style: {size: fontsize(8), overflow: :shrink_to_fit} do |table|
|
||||||
# borders
|
# borders
|
||||||
table.cells.borders = [:bottom]
|
table.cells.borders = [:bottom]
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
= raw t '.text0', ordergroup: @group_order.ordergroup.name, order: @order.name, when: I18n.l(@order.ends), user: show_user(@order.updated_by)
|
= raw t '.text0', ordergroup: @group_order.ordergroup_name, order: @order.name, when: I18n.l(@order.ends), user: show_user(@order.updated_by)
|
||||||
- for group_order_article in @group_order.group_order_articles.ordered.all(:include => :order_article)
|
- for group_order_article in @group_order.group_order_articles.ordered.all(:include => :order_article)
|
||||||
- article = group_order_article.order_article.article
|
- article = group_order_article.order_article.article
|
||||||
\- #{article.name}: #{group_order_article.result} x #{article.unit} = #{group_order_article.result * article.fc_price}
|
\- #{article.name}: #{group_order_article.result} x #{article.unit} = #{group_order_article.result * article.fc_price}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
%tr{class: if goa.result == 0 then 'unavailable' end, id: "goa_#{goa.id}"}
|
%tr{class: if goa.result == 0 then 'unavailable' end, id: "goa_#{goa.id}"}
|
||||||
%td{:style => "width:70%"}= goa.group_order.ordergroup.name
|
%td{:style => "width:70%"}= goa.group_order.ordergroup_name
|
||||||
%td.center= "#{goa.quantity} + #{goa.tolerance}"
|
%td.center= "#{goa.quantity} + #{goa.tolerance}"
|
||||||
%td.center.input-delta= (edit or true rescue true) ? group_order_article_edit_result(goa) : goa.result
|
%td.center.input-delta= (edit or true rescue true) ? group_order_article_edit_result(goa) : goa.result
|
||||||
%td.price{data: {value: goa.total_price}}= number_to_currency(goa.total_price)
|
%td.price{data: {value: goa.total_price}}= number_to_currency(goa.total_price)
|
||||||
|
|
|
@ -11,6 +11,7 @@ class UserNotifier
|
||||||
def self.finished_order(args)
|
def self.finished_order(args)
|
||||||
order_id = args.first
|
order_id = args.first
|
||||||
Order.find(order_id).group_orders.each do |group_order|
|
Order.find(order_id).group_orders.each do |group_order|
|
||||||
|
next if group_order.ordergroup.nil?
|
||||||
group_order.ordergroup.users.each do |user|
|
group_order.ordergroup.users.each do |user|
|
||||||
begin
|
begin
|
||||||
I18n.with_locale(user.settings['profile']['language']) do
|
I18n.with_locale(user.settings['profile']['language']) do
|
||||||
|
|
Loading…
Reference in a new issue