Attachment 144091 Details for Bug 32254 – Bug 32254: (follow-up) Add missing div around "Older transactions"

[patch] Bug 32254: (follow-up) Add missing div around "Older transactions"

Bug-32254-follow-up-Add-missing-div-around-Older-t.patch (text/plain), 13.02 KB, created by Katrin Fischer on 2022-11-19 20:07:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2022-11-19 20:07:22 UTC

Size: 13.02 KB

patch

obsolete

>From 582dc297d209c5602c344f77aad664969b778a16 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 18 Nov 2022 16:29:46 +0000
>Subject: [PATCH] Bug 32254: (follow-up) Add missing div around "Older
> transactions"
>
>To test:
>
>- Tools -> Cash summary for <library> and Tools -> Transaction history
>  for <register>
>  - In the "Older transactions" section, submit start and end dates
>    which will return results.
>  - The table of results should be styled correctly.
>
>Signed-off-by: David <david@davidnind.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/pos/register.tt           | 126 +++++++++---------
> 1 file changed, 64 insertions(+), 62 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>index bcc34136ae..c479770d01 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>@@ -197,73 +197,75 @@
>             </form>
> 
>             [% IF trange_f %]
>-            <table id="past_sales" class="past_sales_table">
>-                <thead>
>-                    <th>ID</th>
>-                    <th>DATA</th>
>-                    <th>Transaction</th>
>-                    <th>Description</th>
>-                    <th>Price</th>
>-                    <th>Total</th>
>-                    <th class="noExport">Actions</th>
>-                </thead>
>-                <tbody>
>-                    [% FOREACH accountline IN past_accountlines %]
>-                        [% IF accountline.is_credit %]
>-                            [% FOREACH credit IN accountline.credit_offsets %]
>-                            [% IF credit.debit %]
>-                            <tr>
>-                                <td>[% accountline.accountlines_id | html %]</td>
>-                                <td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
>-                                <td></td>
>-                                <td>
>-                                    [%- PROCESS account_type_description account=credit.debit -%]
>-                                    [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
>-                                    [%- IF ( credit.debit.itemnumber ) -%] (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% credit.debit.item.biblionumber | uri %]&amp;itemnumber=[% credit.debit.itemnumber | uri %]">[% credit.debit.item.biblio.title | html %]</a>)[%- END -%]
>-                                </td>
>-                                <td>[% credit.debit.amount | $Price %]</td>
>-                                <td></td>
>-                                <td>
>-                                    [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %]
>-                                    <button type="button" class="btn btn-default btn-xs pos_refund" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=credit.debit -%]" data-accountline="[% credit.debit.accountlines_id | html %]" data-amount="[% credit.debit.amount | $Price %]" data-amountoutstanding="[% credit.debit.amountoutstanding | $Price %]" data-member="[% credit.debit.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button>
>-                                    [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber && !(credit.debit.debit_type_code == 'PAYOUT') %]
>-                                    <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=credit.debit -%]" data-accountline="[% credit.debit.accountlines_id | html %]" data-amount="[% credit.debit.amount | $Price %]" data-amountoutstanding="[% credit.debit.amountoutstanding | $Price %]" data-member="[% credit.debit.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button>
>+                <div class="page-section">
>+                    <table id="past_sales" class="past_sales_table">
>+                        <thead>
>+                            <th>ID</th>
>+                            <th>DATA</th>
>+                            <th>Transaction</th>
>+                            <th>Description</th>
>+                            <th>Price</th>
>+                            <th>Total</th>
>+                            <th class="noExport">Actions</th>
>+                        </thead>
>+                        <tbody>
>+                            [% FOREACH accountline IN past_accountlines %]
>+                                [% IF accountline.is_credit %]
>+                                    [% FOREACH credit IN accountline.credit_offsets %]
>+                                    [% IF credit.debit %]
>+                                    <tr>
>+                                        <td>[% accountline.accountlines_id | html %]</td>
>+                                        <td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
>+                                        <td></td>
>+                                        <td>
>+                                            [%- PROCESS account_type_description account=credit.debit -%]
>+                                            [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
>+                                            [%- IF ( credit.debit.itemnumber ) -%] (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% credit.debit.item.biblionumber | uri %]&amp;itemnumber=[% credit.debit.itemnumber | uri %]">[% credit.debit.item.biblio.title | html %]</a>)[%- END -%]
>+                                        </td>
>+                                        <td>[% credit.debit.amount | $Price %]</td>
>+                                        <td></td>
>+                                        <td>
>+                                            [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %]
>+                                            <button type="button" class="btn btn-default btn-xs pos_refund" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=credit.debit -%]" data-accountline="[% credit.debit.accountlines_id | html %]" data-amount="[% credit.debit.amount | $Price %]" data-amountoutstanding="[% credit.debit.amountoutstanding | $Price %]" data-member="[% credit.debit.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button>
>+                                            [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber && !(credit.debit.debit_type_code == 'PAYOUT') %]
>+                                            <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=credit.debit -%]" data-accountline="[% credit.debit.accountlines_id | html %]" data-amount="[% credit.debit.amount | $Price %]" data-amountoutstanding="[% credit.debit.amountoutstanding | $Price %]" data-member="[% credit.debit.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button>
>+                                            [% END %]
>+                                        </td>
>+                                    </tr>
>                                     [% END %]
>-                                </td>
>-                            </tr>
>-                            [% END %]
>+                                    [% END %]
>+                                [% ELSE %]
>+                                    [% FOREACH debit IN accountline.debit_offsets %]
>+                                    [% IF debit.credit %]
>+                                    <tr>
>+                                        <td>[% accountline.accountlines_id | html %]</td>
>+                                        <td>{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
>+                                        <td></td>
>+                                        <td>
>+                                            [%- PROCESS account_type_description account=debit.credit -%]
>+                                            [%- IF debit.credit.description %][% debit.credit.description | html %][%- END -%]
>+                                            [%- IF ( debit.credit.itemnumber ) -%] (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% debit.credit.item.biblionumber | uri %]&amp;itemnumber=[% debit.credit.itemnumber | uri %]">[% debit.credit.item.biblio.title | html %]</a>)[%- END -%]
>+                                        </td>
>+                                        <td>[% debit.credit.amount | $Price %]</td>
>+                                        <td></td>
>+                                        <td>
>+                                            [%- IF debit.credit.credit_type_code == 'REFUND' -%]<a href="/cgi-bin/koha/members/accountline-details.pl?accountlines_id=[% debit.credit.accountlines_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a>[%- END -%]
>+                                        </td>
>+                                    </tr>
>+                                    [% END %]
>+                                    [% END %]
>+                                [% END %]
>                             [% END %]
>-                        [% ELSE %]
>-                            [% FOREACH debit IN accountline.debit_offsets %]
>-                            [% IF debit.credit %]
>+                        </tbody>
>+                        <tfoot>
>                             <tr>
>-                                <td>[% accountline.accountlines_id | html %]</td>
>-                                <td>{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
>+                                <td colspan="5">Total income: </td>
>+                                <td>[% past_accountlines.total * -1 | $Price %]</td>
>                                 <td></td>
>-                                <td>
>-                                    [%- PROCESS account_type_description account=debit.credit -%]
>-                                    [%- IF debit.credit.description %][% debit.credit.description | html %][%- END -%]
>-                                    [%- IF ( debit.credit.itemnumber ) -%] (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% debit.credit.item.biblionumber | uri %]&amp;itemnumber=[% debit.credit.itemnumber | uri %]">[% debit.credit.item.biblio.title | html %]</a>)[%- END -%]
>-                                </td>
>-                                <td>[% debit.credit.amount | $Price %]</td>
>-                                <td></td>
>-                                <td>
>-                                    [%- IF debit.credit.credit_type_code == 'REFUND' -%]<a href="/cgi-bin/koha/members/accountline-details.pl?accountlines_id=[% debit.credit.accountlines_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a>[%- END -%]
>-                                </td>
>                             </tr>
>-                            [% END %]
>-                            [% END %]
>-                        [% END %]
>-                    [% END %]
>-                </tbody>
>-                <tfoot>
>-                    <tr>
>-                        <td colspan="5">Total income: </td>
>-                        <td>[% past_accountlines.total * -1 | $Price %]</td>
>-                        <td></td>
>-                    </tr>
>-                </tfoot>
>-            </table>
>+                        </tfoot>
>+                    </table>
>+                </div> 
>             [% END %]
> 
>             <hr/>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32254: 144018 | 144025 | 144026 | 144074 | 144079 | 144080 | 144081 | 144091