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

fix tiny issue where flash alert not shown

Browse source
This commit is contained in:
Viehlieb 2021-12-24 13:17:45 +01:00
parent 06eb56acf4
commit f592b27f92
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/finance/balancing_controller.rb
View file

@ -5,7 +5,7 @@ class Finance::BalancingController < Finance::BaseController
def new def new
@order = Order.find(params[:order_id]) @order = Order.find(params[:order_id])
flash.now.alert = t('finance.balancing.new.alert') if @order.closed? flash.now.alert = t('finance.balancing.new.alert') if @order.closed? && flash[:alert].blank?
@comments = @order.comments @comments = @order.comments
@articles = @order.order_articles.ordered_or_member.includes(:article, :article_price, @articles = @order.order_articles.ordered_or_member.includes(:article, :article_price,
@ -81,21 +81,24 @@ class Finance::BalancingController < Finance::BaseController
@order = Order.find(params[:id]) @order = Order.find(params[:id])
@type = FinancialTransactionType.find_by_id(params.permit(:type)[:type]) @type = FinancialTransactionType.find_by_id(params.permit(:type)[:type])
@order.close!(@current_user, @type) @order.close!(@current_user, @type)
note = t('finance.balancing.close.notice') note = t('finance.balancing.close.notice')
if @order.closed? if @order.closed?
if FoodsoftConfig[:group_order_invoices]&.[](:use) && FoodsoftConfig[:contact]&.[](:tax_number) alert = t('finance.balancing.close.alert')
if FoodsoftConfig[:group_order_invoices]&.[](:use)
@order.group_orders.each do |go| @order.group_orders.each do |go|
alert = t('finance.balancing.close.settings_not_set')
goi = GroupOrderInvoice.find_or_create_by!(group_order_id: go.id) goi = GroupOrderInvoice.find_or_create_by!(group_order_id: go.id)
if goi.save! if goi.save!
NotifyGroupOrderInvoiceJob.perform_later(goi) NotifyGroupOrderInvoiceJob.perform_later(goi)
note = t('finance.balancing.close.notice_mail') note = t('finance.balancing.close.notice_mail')
end end
end end
end end
end end
alert ||= t('finance.balancing.close.alert')
redirect_to finance_order_index_url, notice: note redirect_to finance_order_index_url, notice: note
rescue => error rescue => error
redirect_to new_finance_order_url(order_id: @order.id), notice: note, alert: t('finance.balancing.close.alert', message: error.message) redirect_to new_finance_order_url(order_id: @order.id), notice: note, alert: alert, msg: error.message
end end
# Close the order directly, without automaticly updating ordergroups account balances # Close the order directly, without automaticly updating ordergroups account balances