Attachment 72976 Details for Bug 20395 – Bug 20395: Followup to change format to use price filter

[patch] Bug 20395: Followup to change format to use price filter

Bug-20395-Followup-to-change-format-to-use-price-f.patch (text/plain), 3.28 KB, created by Mark Tompsett on 2018-03-15 16:13:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2018-03-15 16:13:04 UTC

Size: 3.28 KB

patch

obsolete

>From a09c21f1ebf8d392655fb1b4da9227f7e7908b7a Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Thu, 15 Mar 2018 16:08:45 +0000
>Subject: [PATCH] Bug 20395: Followup to change format to use price filter
>
>See comment #1.
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt      | 1 -
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 3 ++-
> koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt   | 3 ++-
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>index 2790d5a..82254c7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -1,7 +1,6 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE Price %]
>-[% USE currency = format('%.2f') -%]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>index e1a5839..8cab821 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>@@ -1,4 +1,5 @@
> [% USE Branches %]
>+[% USE Price %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules</title>
>@@ -149,7 +150,7 @@
> 							<td>[% rule.chargeperiod %]</td>
>                 <td>[% IF rule.chargeperiod_charge_at %]Start of interval[% ELSE %]End of interval[% END %]</td>
> 							<td>[% rule.firstremind %]</td>
>-                            <td>[% rule.overduefinescap FILTER format("%.2f") %]</td>
>+                            <td>[% rule.overduefinescap | $Price %]</td>
>                             <td>
>                                 [% IF rule.cap_fine_to_replacement_price %]
>                                     <input type="checkbox" checked="checked" disabled="disabled" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 4a1d6a3..a1352e5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -3,6 +3,7 @@
> [% USE Branches %]
> [% USE Categories %]
> [% USE ItemTypes %]
>+[% USE Price %]
> [% INCLUDE 'doc-head-open.inc' %]
> [% UNLESS ( multi_hold ) %]
>     <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Place a hold on [% title |html %]</title>
>@@ -340,7 +341,7 @@ function checkMultiHold() {
>     [% END %]
> 
>     [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
>-    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | format('%.2f') %]</strong></li>
>+    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | $Price %]</strong></li>
>     [% END %]
> 
>     [% IF ( diffbranch ) %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20395: 72903 | 72976 | 73057 | 73058 | 136484 | 136485 | 136503