Attachment 111055 Details for Bug 26598 – Bug 26598: Display guarantee's fines on guarantor's details page

[patch] Bug 26598: Display guarantee's fines on guarantor's details page

Bug-26598-Display-guarantees-fines-on-guarantors-d.patch (text/plain), 6.40 KB, created by Maryse Simard on 2020-10-02 04:23:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maryse Simard

Created: 2020-10-02 04:23:41 UTC

Size: 6.40 KB

patch

obsolete

>From b0854b17d7f3a97c20c3fadb8df147d224ee350a 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.
>---
> .../prog/en/modules/members/moremember.tt     | 44 +++++++++++++++++++
> members/moremember.pl                         |  8 ++++
> 2 files changed, 52 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 4bf7ba95f7..112324b5ca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -281,6 +281,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>
>@@ -744,6 +751,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>
>                                     [% IF ( holds_count ) %]
>@@ -814,6 +826,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...
>@@ -998,6 +1038,10 @@
>                 $("#picture-upload, #show-picture-upload").toggle();
>             });
> 
>+            $("#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 8f6e959850..bf7ba960fa 100755
>--- a/members/moremember.pl
>+++ b/members/moremember.pl
>@@ -116,6 +116,14 @@ $template->param(
> my $relatives_issues_count =
>     Koha::Checkouts->count({ borrowernumber => \@relatives });
> 
>+if ( @guarantees ) {
>+    my $total_amount = 0;
>+    foreach my $guarantee (@guarantees){
>+        $total_amount += $guarantee->account->balance;
>+    }
>+    $template->param( guarantees_fines => $total_amount );
>+}
>+
> # Calculate and display patron's age
> if ( !$patron->is_valid_age ) {
>     $template->param( age_limitations => 1 );
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 26598: 111055 | 111320 | 112110 | 139712 | 140376 | 142655 | 144110 | 144696 | 144697 | 151499