Attachment 147757 Details for Bug 33090 – Bug 33090: Add page-section to accountline-details

[patch] Bug 33090: Add page-section to accountline-details

Bug-33090-Add-page-section-to-accountline-details.patch (text/plain), 18.29 KB, created by Katrin Fischer on 2023-03-04 13:40:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-03-04 13:40:17 UTC

Size: 18.29 KB

patch

obsolete

>From 9d30a2523f4699aed50e1b35b30665d28e7cb647 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 28 Feb 2023 16:40:34 +0000
>Subject: [PATCH] Bug 33090: Add page-section to accountline-details
>
>This patch adds page-section containers to the accountlines details
>display page.
>
>Note: This patch contains whitespace changes, so use diff accordingly.
>
>To test, apply the patch and locate a patron with charges on their
>account (lost item fee, account renewal fee, overdue fine, etc).
>
>- From the patron detail page, click the "Accounting" tab in the sidebar
>  menu.
>- Click the "Transactions" tab.
>- Click the "Details" button for an individual charge.
>- On the transaction detail page, confirm that the page sections look
>  correct.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../en/modules/members/accountline-details.tt | 275 +++++++++---------
> 1 file changed, 140 insertions(+), 135 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 4890fd27e9..55385bd360 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
>@@ -81,159 +81,164 @@
>                     <h2>Details of debit</h2>
>                 [% END %]
> 
>-                <table id="table_account_fines">
>-                    <thead>
>-                        <tr>
>-                            <th>Date</th>
>-                            <th>Description</th>
>-                            <th>Barcode</th>
>-                            <th>Due date</th>
>-                            <th>Return date</th>
>-                            <th>Note</th>
>-                            [% FOREACH value IN af_values %]
>-                                <th>[% value.field.name | html %]</th>
>-                            [% END %]
>-                            <th>Amount</th>
>-                            <th>Outstanding</th>
>-                        </tr>
>-                    </thead>
>-
>-                    <tbody>
>-                        <tr>
>-                            <td>
>-                                [% accountline.date | $KohaDates %]
>-                            </td>
>-                            <td>
>-                                [%- PROCESS account_type_description account=accountline -%]
>-                                [%- IF accountline.payment_type -%]
>-                                    , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', accountline.payment_type) | html %]
>-                                [%- END =%]
>-                                [%- IF accountline.description -%]
>-                                    , [% accountline.description | html %]
>-                                [%- END -%]
>+                <div class="page-section">
> 
>-                                &nbsp;
>-                                [% IF ( accountline.itemnumber ) %]
>-                                    [% SET biblio = accountline.item.biblio %]
>-                                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]&amp;itemnumber=[% accountline.itemnumber | uri %]">[% biblio.title | html %]</a>
>+                    <table id="table_account_fines">
>+                        <thead>
>+                            <tr>
>+                                <th>Date</th>
>+                                <th>Description</th>
>+                                <th>Barcode</th>
>+                                <th>Due date</th>
>+                                <th>Return date</th>
>+                                <th>Note</th>
>+                                [% FOREACH value IN af_values %]
>+                                    <th>[% value.field.name | html %]</th>
>                                 [% END %]
>-                            </td>
>+                                <th>Amount</th>
>+                                <th>Outstanding</th>
>+                            </tr>
>+                        </thead>
> 
>-                            <td>
>-                                [% IF ( accountline.itemnumber ) %]
>-                                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% accountline.item.biblionumber | uri %]&amp;itemnumber=[% accountline.itemnumber | uri %]#item[% accountline.itemnumber | uri %]">[% accountline.item.barcode | html %]</a>
>-                                [% END %]
>-                            </td>
>+                        <tbody>
>+                            <tr>
>+                                <td>
>+                                    [% accountline.date | $KohaDates %]
>+                                </td>
>+                                <td>
>+                                    [%- PROCESS account_type_description account=accountline -%]
>+                                    [%- IF accountline.payment_type -%]
>+                                        , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', accountline.payment_type) | html %]
>+                                    [%- END =%]
>+                                    [%- IF accountline.description -%]
>+                                        , [% accountline.description | html %]
>+                                    [%- END -%]
> 
>-                            <td>
>-                                [% IF ( accountline.issue_id ) %]
>-                                    [% accountline.checkout.date_due | $KohaDates as_due_date => 1 %]
>-                                [% END %]
>-                            </td>
>+                                    &nbsp;
>+                                    [% IF ( accountline.itemnumber ) %]
>+                                        [% SET biblio = accountline.item.biblio %]
>+                                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]&amp;itemnumber=[% accountline.itemnumber | uri %]">[% biblio.title | html %]</a>
>+                                    [% END %]
>+                                </td>
> 
>-                            <td>
>-                                [% IF ( accountline.issue_id ) %]
>-                                    [% accountline.checkout.returndate | $KohaDates with_hours => 1 %]
>-                                [% END %]
>-                            </td>
>+                                <td>
>+                                    [% IF ( accountline.itemnumber ) %]
>+                                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% accountline.item.biblionumber | uri %]&amp;itemnumber=[% accountline.itemnumber | uri %]#item[% accountline.itemnumber | uri %]">[% accountline.item.barcode | html %]</a>
>+                                    [% END %]
>+                                </td>
> 
>-                            <td>
>-                                [% accountline.note | html_line_break %]
>-                            </td>
>+                                <td>
>+                                    [% IF ( accountline.issue_id ) %]
>+                                        [% accountline.checkout.date_due | $KohaDates as_due_date => 1 %]
>+                                    [% END %]
>+                                </td>
> 
>-                            [% FOREACH value IN af_values %]
>                                 <td>
>-                                    [% IF value.field.authorised_value_category %]
>-                                        [% AuthorisedValues.GetByCode( value.field.authorised_value_category, value.value ) | html %]
>-                                    [% ELSE %]
>-                                        [% value.value | html %]
>+                                    [% IF ( accountline.issue_id ) %]
>+                                        [% accountline.checkout.returndate | $KohaDates with_hours => 1 %]
>                                     [% END %]
>                                 </td>
>-                            [% END %]
> 
>-                            <td>
>-                                [% accountline.amount | $Price %]
>-                            </td>
>+                                <td>
>+                                    [% accountline.note | html_line_break %]
>+                                </td>
> 
>-                            <td>
>-                                [% accountline.amountoutstanding | $Price %]
>-                            </td>
>-                        </tr>
>-                    </tbody>
>-                </table>
>+                                [% FOREACH value IN af_values %]
>+                                    <td>
>+                                        [% IF value.field.authorised_value_category %]
>+                                            [% AuthorisedValues.GetByCode( value.field.authorised_value_category, value.value ) | html %]
>+                                        [% ELSE %]
>+                                            [% value.value | html %]
>+                                        [% END %]
>+                                    </td>
>+                                [% END %]
> 
>-                <h3>History</h3>
>-                <table class="accountline-offsets-table" id="accountline-debits-table">
>-                    <thead>
>-                        <tr>
>-                            <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>
>+                                <td>
>+                                    [% accountline.amount | $Price %]
>+                                </td>
> 
>-                    <tbody>
>-                        [% FOREACH ao IN account_offsets %]
>-                                [% IF ao.credit_id == accountline.accountlines_id %]
>-                                    [% SET offset_accountline = ao.debit %]
>-                                [% ELSIF ao.debit_id == accountline.accountlines_id %]
>-                                    [% SET offset_accountline = ao.credit %]
>-                                [% END %]
>+                                <td>
>+                                    [% accountline.amountoutstanding | $Price %]
>+                                </td>
>+                            </tr>
>+                        </tbody>
>+                    </table>
>+                </div> 
>+
>+                <div class="page-section">
>+                    <h3>History</h3>
>+                    <table class="accountline-offsets-table" id="accountline-debits-table">
>+                        <thead>
>+                            <tr>
>+                                <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>
> 
>-                                [%- BLOCK ao_description -%]
>-                                    [%- SWITCH ao.type -%]
>-                                        [%- CASE 'CREATE'           -%]<span>Created</span>
>-                                        [%- CASE 'OVERDUE_INCREASE' -%]<span>Increase</span>
>-                                        [%- CASE 'OVERDUE_DECREASE' -%]<span>Decrease</span>
>-                                        [%- CASE 'APPLY'            -%]<span>Applied</span>
>-                                        [%- CASE 'VOID'             -%]<span>Reversed</span>
>+                        <tbody>
>+                            [% FOREACH ao IN account_offsets %]
>+                                    [% IF ao.credit_id == accountline.accountlines_id %]
>+                                        [% SET offset_accountline = ao.debit %]
>+                                    [% ELSIF ao.debit_id == accountline.accountlines_id %]
>+                                        [% SET offset_accountline = ao.credit %]
>+                                    [% END %]
>+
>+                                    [%- BLOCK ao_description -%]
>+                                        [%- SWITCH ao.type -%]
>+                                            [%- CASE 'CREATE'           -%]<span>Created</span>
>+                                            [%- CASE 'OVERDUE_INCREASE' -%]<span>Increase</span>
>+                                            [%- CASE 'OVERDUE_DECREASE' -%]<span>Decrease</span>
>+                                            [%- CASE 'APPLY'            -%]<span>Applied</span>
>+                                            [%- CASE 'VOID'             -%]<span>Reversed</span>
>+                                        [%- END -%]
>                                     [%- END -%]
>-                                [%- END -%]
> 
>-                                <tr>
>-                                    <td>[% ao.created_on | $KohaDates with_hours => 1%]</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>
>-                                        [% PROCESS account_type_description account=offset_accountline %] (<a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]">[% offset_accountline.id | html %]</a>)
>-                                    </td>
>-                                    <td>
>-                                        [% offset_accountline.amount | $Price %]
>-                                    </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 %]
>+                                    <tr>
>+                                        <td>[% ao.created_on | $KohaDates with_hours => 1%]</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>
>+                                            [% PROCESS account_type_description account=offset_accountline %] (<a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]">[% offset_accountline.id | html %]</a>)
>+                                        </td>
>+                                        <td>
>+                                            [% offset_accountline.amount | $Price %]
>+                                        </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 %]
>-                                        </a>
>-                                        [% END %]
>-                                    </td>
>-                                    [%- ELSE -%]
>-                                    <td></td>
>-                                    <td></td>
>-                                    <td></td>
>-                                    [%- END -%]
>-                                    <td>[% offset_accountline.note | html %]</td>
>-                                </tr>
>-                        [% END %]
>-                    </tbody>
>-                </table>
>+                                        </td>
>+                                        [%- ELSE -%]
>+                                        <td></td>
>+                                        <td></td>
>+                                        <td></td>
>+                                        [%- END -%]
>+                                        <td>[% offset_accountline.note | html %]</td>
>+                                    </tr>
>+                            [% END %]
>+                        </tbody>
>+                    </table>
>+                </div> 
>             [% ELSE %]
>                 <div class="dialog message">
>                     Account not found
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33090: 147506 | 147561 | 147757