Bugzilla – Attachment 50718 Details for
Bug 14497
Add warning to patron details page if patron's fines exceed noissuescharge
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14497 [QA Followup] - Refactor code to have a single source for message
Bug-14497-QA-Followup---Refactor-code-to-have-a-si.patch (text/plain), 4.83 KB, created by
Kyle M Hall (khall)
on 2016-04-26 14:30:30 UTC
(
hide
)
Description:
Bug 14497 [QA Followup] - Refactor code to have a single source for message
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2016-04-26 14:30:30 UTC
Size:
4.83 KB
patch
obsolete
>From 9d9af69958c42b4b48122c05fbaea3bbc181407b Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Tue, 26 Apr 2016 14:29:40 +0000 >Subject: [PATCH] Bug 14497 [QA Followup] - Refactor code to have a single > source for message > >--- > .../prog/en/includes/blocked-fines.inc | 22 ++++++++++++++++++++++ > .../prog/en/modules/circ/circulation.tt | 14 +++++--------- > .../prog/en/modules/members/moremember.tt | 19 +------------------ > 3 files changed, 28 insertions(+), 27 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >new file mode 100644 >index 0000000..596c0c7 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >@@ -0,0 +1,22 @@ >+[% USE Price %] >+[% SET NoIssuesCharge = Koha.Preference('noissuescharge') %] >+ >+[% IF NoIssuesCharge && fines > NoIssuesCharge %] >+ <li> >+ <span class="circ-hlt">Fees & Charges:</span> >+ Patron has <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]"> >+ Outstanding fees & charges >+ [% IF ( fines ) %] >+ of [% fines | $Price %] >+ [% END %] >+ </a>. >+ >+ [% IF !Koha.Preference('AllowFineOverride') %] >+ <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> >+ [% END %] >+ >+ <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a> >+ or >+ <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]">Pay all fines</a></li> >+ </li> >+[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index ec3a1d9..ed94d5b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -783,15 +783,11 @@ No patron matched <span class="ex">[% message %]</span> > [% IF ( odues ) %]<li>[% IF ( nonreturns ) %]<span class="circ-hlt">Overdues: Patron has ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a>[% END %]</li> > [% END %] > >- [% IF ( charges ) %] >- <li> >- <span class="circ-hlt">Fees & Charges:</span> Patron has <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Outstanding fees & charges[% IF ( chargesamount ) %] of [% chargesamount %][% END %]</a>. >- [% IF ( charges_is_blocker ) %] >- <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> >- [% END %] >- <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a> or >- <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]">Pay all fines</a></li> >- [% END %] >+ [% IF ( charges ) %] >+ [% INCLUDE 'blocked-fines.inc' >+ fines = chargesamount >+ %] >+ [% END %] > > [% IF ( credits ) %] > <li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 9f52f2a..ed1b613 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -174,24 +174,7 @@ function validate1(date) { > [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry | $KohaDates %]</div>[% END %] > > [% IF fines %] >- [% SET NoIssuesCharge = Koha.Preference('noissuescharge') %] >- [% IF NoIssuesCharge && fines > NoIssuesCharge %] >- <li> >- <span class="circ-hlt">Fees & Charges:</span> >- Patron has <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]"> >- Outstanding fees & charges >- [% IF ( chargesamount ) %] >- of [% chargesamount %] >- [% END %] >- </a>. >- [% IF !Koha.Preference('AllowFineOverride') %] >- <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> >- [% END %] >- <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a> >- or >- <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]">Pay all fines</a></li> >- </li> >- [% END %] >+ [% INCLUDE 'blocked-fines.inc' %] > [% END %] > > [% IF ( flagged ) %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14497
:
40806
|
45127
|
50396
|
50431
|
50461
|
50718
|
50748
|
50749