From 02f4be5ef0aa4396becdbe7ddd4c45f09bf63c4e Mon Sep 17 00:00:00 2001 From: Maryse Simard 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 Signed-off-by: Martin Renvoize --- .../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 @@
  • Guarantees:
      + [% IF guarantees_fines and guarantees_fines > 0 %] +
    • + Charges: + Patron's guarantees collectively owe [% guarantees_fines | $Price %]. + See all charges. +
      • + [% END %] [% FOREACH guarantee IN guarantees %] [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
    • [% guarantee.firstname | html %] [% guarantee.surname | html %]
      • @@ -744,6 +751,11 @@ Charges ([% fines | $Price %]) [% END %] + [% IF ( guarantees_fines ) %] +
    • + Guarantees' charges ([% guarantees_fines | $Price %]) +
      • + [% END %] [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    • [% IF ( holds_count ) %] @@ -814,6 +826,34 @@ [% END %] + [% IF ( guarantees_fines ) %] +
      + + + + + + + + [% FOREACH guarantee IN guarantees %] + + [% IF logged_in_user.can_see_patron_infos( guarantee ) %] + + + [% ELSE %] + + + [% END %] + + [% END %] + + + + +
      GuaranteeAmount outstanding
      [% guarantee.firstname | html %] [% guarantee.surname | html %][% guarantee.account.balance | $Price %][% guarantee.firstname | html %] [% guarantee.surname | html %]-
      Total due[% guarantees_fines | $Price %]
      +
      + [% END %] + [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %]
      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.20.1