[Koha-patches] [PATCH] Bug 5173 - allow the discount to be editing on acq order

[Chris Cormack]

From: Robin Sheat <robin at catalyst.net.nz>

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.

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 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();
         <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
         <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
         <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
-        <input type="hidden" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" />
         <input type="hidden" name="listinc" value="<!-- TMPL_VAR NAME="listincgst" -->" />
         <input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->" />
         <input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->" />
@@ -292,15 +291,27 @@ ff.submit();
                     <input type="text" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /> (adjusted for <!-- TMPL_VAR NAME="cur_active" -->)
                 <!--/TMPL_IF-->
             </li>
+            
+
+
             <li>
-                <!-- TMPL_IF name="close" -->
+                <!-- TMPL_IF NAME="close" -->
+                    <span class="label">Discount: </span>
+                    <input type="hidden" size="20" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /><!-- TMPL_VAR NAME="discount" -->"
+                <!-- TMPL_ELSE -->
+                    <label for="discount">Discount: </label>
+                    <input type="text" size="20" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" onchange="calcNeworderTotal()"/>
+                <!-- /TMPL_IF -->
+            </li>
+            <li>
+            <!-- TMPL_IF name="close" -->
             <label for="ecost">Budgeted cost: </label>
                     <input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />
                 <!-- TMPL_ELSE -->
                 <label for="ecost">Budgeted cost: </label>
                     <input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />
                 <!--/TMPL_IF-->
-                <!-- TMPL_IF name="discount_2dp" -->  (adjusted for <!-- TMPL_VAR name="discount_2dp" -->% discount)  <!--/TMPL_IF-->
+                <!-- TMPL_IF name="discount_2dp" -->  (adjusted for <span id="discount_value"><!-- TMPL_VAR name="discount_2dp" --></span>% discount)  <!--/TMPL_IF-->
 
             </li>
             <!-- TMPL_IF NAME="GST"-->
-- 
1.7.0.4