Attachment 121004 Details for Bug 22435 – Bug 22435: Further refinements to account-details table

[patch] Bug 22435: Further refinements to account-details table

Bug-22435-Further-refinements-to-account-details-t.patch (text/plain), 5.24 KB, created by Martin Renvoize (ashimema) on 2021-05-15 07:34:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-05-15 07:34:44 UTC

Size: 5.24 KB

patch

obsolete

>From b237aef560bed428955004108abf551e7289a9eb Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Sat, 15 May 2021 08:34:05 +0100
>Subject: [PATCH] Bug 22435: Further refinements to account-details table
>
>---
> Koha/Account/Line.pm | 13 ++++++++
> .../en/modules/members/accountline-details.tt | 30 +++++++++++--------
> 2 files changed, 31 insertions(+), 12 deletions(-)
>
>diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm
>index 91e7230723..465e158f51 100644
>--- a/Koha/Account/Line.pm
>+++ b/Koha/Account/Line.pm
>@@ -58,6 +58,19 @@ sub patron {
> return Koha::Patron->_new_from_dbic( $rs );
> }
> 
>+=head3 manager
>+
>+Return the manager linked to this account line
>+
>+=cut
>+
>+sub manager {
>+ my ( $self ) = @_;
>+ my $rs = $self->_result->manager;
>+ return unless $rs;
>+ return Koha::Patron->_new_from_dbic( $rs );
>+}
>+
> =head3 item
> 
> Return the item linked to this account line if exists
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>index 7661c2fe37..4d7c8b5309 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>@@ -139,11 +139,11 @@
> <thead>
> <tr>
> <th>Date</th>
>- <th>Change amount</th>
>- <th>Change type</th>
>+ <th>Change</th>
>+ <th>Action</th>
>+ <th>Relation</th>
> <th>Transacting librarian</th>
> <th>Note</th>
>- <th>&nbsp;</th>
> </tr>
> </thead>
> 
>@@ -163,7 +163,7 @@
> [%- CASE 'Manual Debit' -%]Manual invoice
> [%- CASE 'Lost Item' -%]Lost item returned
> [%- CASE 'Writeoff' -%]Writeoff
>- [%- CASE 'Void Payment' -%]Void payment
>+ [%- CASE 'VOID' -%]Voided
> [%- CASE 'CANCELLATION' -%]Cancelled charge
> [%- CASE 'APPLY' -%]Applied
> [%- CASE 'CREATE' -%]Created
>@@ -175,19 +175,25 @@
> <td>[% ao.created_on | $KohaDates with_hours => 1%]</td>
> <td>[% ao.amount | $Price %]</td>
> <td>
>- [%- IF offset_accountline -%]
>- [% PROCESS account_type_description account=offset_accountline %] ([% PROCESS ao_description ao=ao %])
>- [%- ELSE -%]
>- [% PROCESS ao_description ao=ao %]
>- [%- END -%]
>+ [% PROCESS ao_description ao=ao %]
> </td>
>- <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td>
>- <td>[% offset_accountline.note | html %]</td>
> <td>
> [%- IF offset_accountline -%]
>- <a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]" class="btn btn-default btn-xs"> Details</a>
>+ [% PROCESS account_type_description account=offset_accountline %] (<a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]">[% offset_accountline.id | html %]</a>)
> [%- END -%]
> </td>
>+ <td>
>+ [% IF offset_accountline.manager_id %]
>+ <a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">
>+ [% IF offset_accountline.manager.firstname %]
>+ [% offset_accountline.manager.firstname | html %] [% offest_accountline.manager.surname | html %]
>+ [% ELSE %]
>+ [% offset_accountline.manager.surname | html %]
>+ [% END %]
>+ </a>
>+ [% END %]
>+ </td>
>+ <td>[% offset_accountline.note | html %]</td>
> </tr>
> [% END %]
> </tbody>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 22435: 118340 | 118341 | 118541 | 118542 | 118543 | 118544 | 118545 | 118546 | 118547 | 120040 | 120041 | 120042 | 120043 | 120044 | 120045 | 120046 | 120963 | 120964 | 120965 | 120966 | 120967 | 120968 | 120969 | 120970 | 120979 | 120980 | 120981 | 120982 | 120983 | 120984 | 120985 | 120986 | 120987 | 120988 | 120989 | 120990 | 120991 | 121004 | 121005 | 121006 | 121007 | 121008 | 121009 | 121010 | 121011 | 121012 | 121013 | 121014 | 121015 | 121016 | 121028 | 121757 | 121758 | 121759 | 121760 | 121761 | 121762 | 121763 | 121764 | 121765 | 121766 | 121767 | 121768 | 121769 | 121960 | 121961 | 121962 | 121963 | 121964 | 121965 | 121966 | 121967 | 121968 | 121969 | 121970 | 121971 | 121972 | 122148 | 122149 | 122150 | 122151 | 122152 | 122153 | 122154 | 122155 | 122156 | 122157 | 122158 | 122159 | 122160 | 122161 | 122235 | 122236 | 122237 | 122238 | 122239 | 122240 | 122241 | 122242 | 122243 | 122244 | 122245 | 122246 | 122247 | 122248 | 122249 | 122250 | 122251 | 122252 | 122253 | 122256 | 122257 | 122258 | 122259 | 122260 | 122261 | 122262 | 122263 | 122264 | 122265 | 122266 | 122267 | 122268 | 122269 | 122270 | 122271 | 122272 | 122273 | 122274 | 122553 | 122554 | 122555 | 122556 | 122557 | 122558 | 122559 | 122560 | 122561 | 122562 | 122563 | 122564 | 122565 | 122566 | 122567 | 122568 | 122569 | 122570 | 122571 | 122586 | 122899 | 122900 | 122901 | 122902 | 122903 | 122904 | 122905 | 122906 | 122907 | 122908 | 122909 | 122910 | 122911 | 122912 | 122913 | 122914 | 122915 | 122916 | 122917 | 122918 | 122937 | 123423 | 123424 | 123425 | 123426 | 123427 | 123428 | 123429 | 123430 | 123431 | 123432 | 123433 | 123434 | 123435 | 123436 | 123437 | 123438 | 123439 | 123440 | 123441 | 123442 | 123443