Bugzilla – Attachment 139712 Details for
Bug 26598
Display guarantee's fines on guarantor's details page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26598: Display guarantee's fines on guarantor's details page
Bug-26598-Display-guarantees-fines-on-guarantors-d.patch (text/plain), 6.61 KB, created by
Shi Yao Wang
on 2022-08-24 13:00:38 UTC
(
hide
)
Description:
Bug 26598: Display guarantee's fines on guarantor's details page
Filename:
MIME Type:
Creator:
Shi Yao Wang
Created:
2022-08-24 13:00:38 UTC
Size:
6.61 KB
patch
obsolete
>From 3cc1e2b127a400868b98b613334a85bcfdb52106 Mon Sep 17 00:00:00 2001 >From: Maryse Simard <maryse.simard@inlibro.com> >Date: Thu, 1 Oct 2020 23:53:17 -0400 >Subject: [PATCH] Bug 26598: Display guarantee's fines on guarantor's details > page > >A new tab is added to the details page of a patron to show, in a table, the fines of the patron's guarantees. A warning appears in the "Guarantees" section of the patron to make it obvious that fines exists. > >To test: >1) Apply patch >2) Choose a patron that has guarantees and navigate to the patron's details page >3) If the guarantees don't have any fines, the display should be unchanged >4) Add fines to the guarantee >5) Go back to the guarantor's details page > => A warning should appear in the "Guarantees" section with the total due >6) Clicking on the link accompanying the warning focuses on the new >"Guarantees' fines" tab containing a table of all guarantee's and their >fines. > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/modules/members/moremember.tt | 45 +++++++++++++++++++ > members/moremember.pl | 5 +++ > 2 files changed, 50 insertions(+) > >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 2dda38be50..f09d2c68bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -197,6 +197,13 @@ > <li> > <span class="label">Guarantees:</span> > <ul> >+ [% IF guarantees_fines and guarantees_fines > 0 %] >+ <li class="guarantees-fines"> >+ <span class="circ-hlt">Charges:</span> >+ Patron's guarantees collectively owe [% guarantees_fines | $Price %]. >+ <a id="view-guarantees-finesandcharges" href="#guarantees-finesandcharges" >See all charges.</a> >+ </li> >+ [% END %] > [% FOREACH guarantee IN guarantees %] > [% IF logged_in_user.can_see_patron_infos( guarantee ) %] > <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></li> >@@ -652,6 +659,11 @@ > <a href="#finesandcharges">Charges ([% fines | $Price %])</a> > </li> > [% END %] >+ [% IF ( guarantees_fines ) %] >+ <li id="guarantees-finestab"> >+ <a href="#guarantees-finesandcharges">Guarantees' charges ([% guarantees_fines | $Price %])</a> >+ </li> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <li> > <a href="#reserves" id="holds-tab">Holds ([% holds_count || 0 | html %])</a> >@@ -726,6 +738,34 @@ > </div> > [% END %] > >+ [% IF ( guarantees_fines ) %] >+ <div id="guarantees-finesandcharges"> >+ <table id="tguaranteesfines"> >+ <thead> >+ <tr> >+ <th>Guarantee</th> >+ <th>Amount outstanding</th> >+ </tr> >+ </thead> >+ [% FOREACH guarantee IN guarantees %] >+ <tr> >+ [% IF logged_in_user.can_see_patron_infos( guarantee ) %] >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></td> >+ <td>[% guarantee.account.balance | $Price %]</td> >+ [% ELSE %] >+ <td>[% guarantee.firstname | html %] [% guarantee.surname | html %]</td> >+ <td>-</td> >+ [% END %] >+ </tr> >+ [% END %] >+ <tfoot> >+ <td>Total due</td> >+ <td>[% guarantees_fines | $Price %]</td> >+ </tfoot> >+ </table> >+ </div> >+ [% END %] >+ > [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %] > <div id="clubs-tab"> > Loading... >@@ -903,6 +943,11 @@ > $("#view_restrictions").on("click",function(){ > $('#debarments-tab-link').click(); > }); >+ >+ $("#view-guarantees-finesandcharges").on("click",function(){ >+ $('#guarantees-finestab a').click(); >+ }); >+ > }); > function uncheck_sibling(me){ > nodename=me.getAttribute("name"); >diff --git a/members/moremember.pl b/members/moremember.pl >index 00e4c8e1af..49e6110463 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -112,6 +112,11 @@ $template->param( > my $relatives_issues_count = > Koha::Checkouts->count({ borrowernumber => \@relatives }); > >+if ( @guarantees ) { >+ my $total_amount = $patron->relationships_debt({ include_guarantors => 0, only_this_guarantor => 1, include_this_patron => 1 }); >+ $template->param( guarantees_fines => $total_amount ); >+} >+ > # Calculate and display patron's age > if ( !$patron->is_valid_age ) { > $template->param( age_limitations => 1 ); >-- >2.25.1
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 26598
:
111055
|
111320
|
112110
|
139712
|
140376
|
142655
|
144110
|
144696
|
144697
|
151499