From 443b7159fa214af3398bef97d5f2aaa49b2f1a55 Mon Sep 17 00:00:00 2001
From: Jon Knight <J.P.Knight@lboro.ac.uk>
Date: Wed, 28 Mar 2018 16:29:43 +0000
Subject: [PATCH] Bug 19479: Display price in basket group formatted according
 to CurrencyFormat syspref using templates.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

On the page acqui/basketgroup.pl the prices of baskets should be shown
formatted according to the selected CurrencyFormat syspref, with no
currency symbol or code.

Test plan:

1) Create a basket with items in it worth more than 1000 currency units.
2) Close the basket.
3) Go to acqui/basketgroup.pl page and check that the price format matches
   the current CurrencyFormat syspref.
4) Go to Administration and change CurrencyFormat syspref to one of the
   other available options and recheck step 3.

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Fixed some tabs.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 acqui/basketgroup.pl                                         | 1 -
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index 8c0e4c4bd5..df625af184 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -82,7 +82,6 @@ sub BasketTotal {
             $total = $total + ( $order->{ecost_tax_excluded} * $order->{quantity} );
         }
     }
-    $total .= " " . ($bookseller->invoiceprice // 0);
     return $total;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index d872672ad0..4c3e833455 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -1,5 +1,6 @@
 [% USE Asset %]
 [% USE Branches %]
+[% USE Price %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
 [% Asset.css("css/datatables.css") %]
@@ -174,7 +175,7 @@ function submitForm(form) {
                                                                         No name, basketnumber: [% basket.basketno %]
                                                                     [% END %]
                                                                 </a>, <br />
-                                                                Total: [% basket.total %]
+                                                                Total: [% basket.total | $Price %]
                                                                 <input type="hidden" class="basket" name="basket" value="[% basket.basketno %]" />
                                                             </li>
                                                         [% END %]
@@ -260,7 +261,7 @@ function submitForm(form) {
                                                                 No name, basketnumber: [% selectedbasket.basketno %]
                                                             [% END %]
                                                         </a>, <br />
-                                                        Total: [% selectedbasket.total %]
+                                                        Total: [% selectedbasket.total | $Price %]
                                                         <input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno %]" />
                                                     </li>
                                                 [% END %]
-- 
2.20.1