From 6120cca18431de7bbd40f6bf72c7d1f3a59bd021 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Mon, 30 Aug 2010 12:26:19 +1200 Subject: [PATCH] Bug 5173 - allow the discount to be editing on acq order This allows the discount to be edited on the ACQ order page. If the discount is edited, the other fields will update as appropriate. Note that if you re-visit the order later, the discount will be set to 0.00%. Saving it requires a database change, and so will be included in another commit. --- acqui/neworderempty.pl | 3 ++- koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 5 +++++ .../prog/en/modules/acqui/neworderempty.tmpl | 17 ++++++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index a580ae7..9fc1ecb 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -329,7 +329,8 @@ $template->param( authorisedbyname => $borrower->{'firstname'} . " " . $borrower->{'surname'}, biblioitemnumber => $data->{'biblioitemnumber'}, discount_2dp => sprintf( "%.2f", $bookseller->{'discount'}) , # for display - discount => $bookseller->{'discount'}, + discount => defined($data->{'discount'}) ? + $data->{'discount'} : $bookseller->{'discount'}, listincgst => $bookseller->{'listincgst'}, invoiceincgst => $bookseller->{'invoiceincgst'}, name => $bookseller->{'name'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js index 4b65f82..d8fe386 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js @@ -676,6 +676,11 @@ function calcNeworderTotal(){ if (f.GST) { f.GST.value=GST; } + + // In case the discount changed, we should update the message + var discount_2dp = discount.toFixed(2); + $('#discount_value').html(discount_2dp); + return true; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl index 603d517..a564fb0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -125,7 +125,6 @@ ff.submit(); " /> " /> " /> - " /> " /> " /> " /> @@ -292,15 +291,27 @@ ff.submit(); " /> (adjusted for ) + + +
  • - + + Discount: + " />" + + + " onchange="calcNeworderTotal()"/> + +
  • +
  • + " readonly="readonly" /> " /> - (adjusted for % discount) + (adjusted for % discount)
  • -- 1.7.0.4