From c05b3e0e192ca0e50e29462d2cf619a98d122c87 Mon Sep 17 00:00:00 2001 From: Benjamin Meichsner Date: Sun, 17 Mar 2013 15:47:50 +0100 Subject: [PATCH] Balancing: Do not update oder summary automaticly when changing group orders. --- app/controllers/finance/balancing_controller.rb | 4 ++++ app/views/finance/balancing/_summary.haml | 6 +++++- app/views/finance/balancing/update_summary.js.haml | 1 + app/views/finance/group_order_articles/update.js.haml | 2 +- config/routes.rb | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 app/views/finance/balancing/update_summary.js.haml diff --git a/app/controllers/finance/balancing_controller.rb b/app/controllers/finance/balancing_controller.rb index c6e1b108..df5eb22a 100644 --- a/app/controllers/finance/balancing_controller.rb +++ b/app/controllers/finance/balancing_controller.rb @@ -30,6 +30,10 @@ class Finance::BalancingController < Finance::BaseController render layout: false if request.xhr? end + def update_summary + @order = Order.find(params[:id]) + end + def edit_note @order = Order.find(params[:id]) render :layout => false diff --git a/app/views/finance/balancing/_summary.haml b/app/views/finance/balancing/_summary.haml index b43b3e58..a3ce80a0 100644 --- a/app/views/finance/balancing/_summary.haml +++ b/app/views/finance/balancing/_summary.haml @@ -24,4 +24,8 @@ %td FC Gewinn %small mit Aufschlag: - %td#order_profit.numeric= number_to_currency(order.profit) \ No newline at end of file + %td#order_profit.numeric= number_to_currency(order.profit) +#summaryChangedWarning.alert(style="display:none;") + %strong Daten wurden verändert! + %br/ + = link_to 'Zusammenfassung neu laden', update_summary_finance_order_path(order), remote: true \ No newline at end of file diff --git a/app/views/finance/balancing/update_summary.js.haml b/app/views/finance/balancing/update_summary.js.haml new file mode 100644 index 00000000..251c73fb --- /dev/null +++ b/app/views/finance/balancing/update_summary.js.haml @@ -0,0 +1 @@ +$('#summary').html('#{j(render('finance/balancing/summary', order: @order))}'); \ No newline at end of file diff --git a/app/views/finance/group_order_articles/update.js.haml b/app/views/finance/group_order_articles/update.js.haml index b4ff3c4e..36e66ccd 100644 --- a/app/views/finance/group_order_articles/update.js.haml +++ b/app/views/finance/group_order_articles/update.js.haml @@ -1,4 +1,4 @@ $('#modalContainer').modal('hide'); $('#order_article_#{@order_article.id}').html('#{j(render('finance/balancing/order_article', order_article: @order_article))}'); $('#group_order_articles_#{@order_article.id}').html('#{j(render('finance/balancing/group_order_articles', order_article: @order_article))}'); -$('#summary').html('#{j(render('finance/balancing/summary', order: @order_article.order))}'); +$('#summaryChangedWarning').show(); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index aa8e0e29..53bc998f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -129,6 +129,7 @@ Foodsoft::Application.routes.draw do resources :order, controller: 'balancing', path: 'balancing' do member do + get :update_summary get :edit_note put :update_note