Bugzilla – Attachment 121769 Details for
Bug 22435
Clarify account_offset types by converting them to clear codes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22435: Alternative Three - Account Details
Bug-22435-Alternative-Three---Account-Details.patch (text/plain), 6.49 KB, created by
Martin Renvoize (ashimema)
on 2021-06-10 11:10:08 UTC
(
hide
)
Description:
Bug 22435: Alternative Three - Account Details
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2021-06-10 11:10:08 UTC
Size:
6.49 KB
patch
obsolete
>From a37bfb1142b9670d4130bac2546c15c8367f8d3f Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Mon, 17 May 2021 08:17:14 +0100 >Subject: [PATCH] Bug 22435: Alternative Three - Account Details > >Another alternative to try, feedback welcome. >--- > .../en/modules/members/accountline-details.tt | 51 ++++++++++++------- > 1 file changed, 34 insertions(+), 17 deletions(-) > >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 502b6a78a0..c6e9fb6285 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 >@@ -7,7 +7,7 @@ > [% SET footerjs = 1 %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Details of fee › [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha</title> >+<title>Details of [% IF type == 'credit' %]credit[% ELSE %]debit[% END %] › [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -24,24 +24,27 @@ > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> > </li> > >- [% IF type == 'credit' %] >+ >+ [% IF accountline %] >+ [% IF accountline.credit_type_code %] > <li> > <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account for [% INCLUDE 'patron-title.inc' %]</a> > </li> > <li> > <a href="#" aria-current="page"> >- Details of payment >+ Details of credit ([% accountline.id | html %]) > </a> > </li> >- [% ELSIF type == 'debit' %] >+ [% ELSIF accountline.debit_type_code %] > <li> > <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account for [% INCLUDE 'patron-title.inc' %]</a> > </li> > <li> > <a href="#" aria-current="page"> >- Details of fee >+ Details of debit ([% accountline.id | html %]) > </a> > </li> >+ [% END %] > [% ELSE %] > <li> > <a href="#" aria-current="page"> >@@ -61,16 +64,16 @@ > > [% IF accountline %] > [% IF accountline.credit_type_code %] >- <h2>Details of payment</h2> >+ <h2>Details of credit</h2> > [% ELSIF accountline.debit_type_code %] >- <h2>Details of fee</h2> >+ <h2>Details of debit</h2> > [% END %] > > <table id="table_account_fines"> > <thead> > <tr> > <th>Date</th> >- <th>Description of charges</th> >+ <th>Description</th> > <th>Barcode</th> > <th>Due date</th> > <th>Return date</th> >@@ -83,7 +86,7 @@ > <tbody> > <tr> > <td> >- [% accountline.date |$KohaDates %] >+ [% accountline.date | $KohaDates %] > </td> > <td> > [%- PROCESS account_type_description account=accountline -%] >@@ -138,11 +141,17 @@ > <table class="accountline-offsets-table" id="accountline-debits-table"> > <thead> > <tr> >- <th>Date</th> >- <th>Change</th> >- <th>Action</th> >- <th>Relation</th> >- <th>Transacting librarian</th> >+ <th rowspan="2">Date</th> >+ <th colspan="2">Change</th> >+ <th rowspan="2">Action</th> >+ <th colspan="4">Related transaction</th> >+ </tr> >+ <tr> >+ <th>Increase</th> >+ <th>Decrease</th> >+ <th>Type</th> >+ <th>Amount</th> >+ <th>Librarian</th> > <th>Note</th> > </tr> > </thead> >@@ -167,14 +176,17 @@ > > <tr> > <td>[% ao.created_on | $KohaDates with_hours => 1%]</td> >- <td>[% ao.amount | $Price %]</td> >+ <td>[%- IF ao.amount > 0 -%][% ao.amount | $Price %][% END %]</td> >+ <td>[%- IF ao.amount < 0 -%][% ao.amount | $Price %][% END %]</td> > <td> > [% PROCESS ao_description ao=ao %] > </td> >+ [%- IF offset_accountline -%] > <td> >- [%- IF offset_accountline -%] > [% 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> >+ [% offset_accountline.amount | $Price %] > </td> > <td> > [% IF offset_accountline.manager_id %] >@@ -187,6 +199,11 @@ > </a> > [% END %] > </td> >+ [%- ELSE -%] >+ <td></td> >+ <td></td> >+ <td></td> >+ [%- END -%] > <td>[% offset_accountline.note | html %]</td> > </tr> > [% END %] >-- >2.20.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 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