Attachment 121187 Details for Bug 28390 – Bug 28390: Move timestamp into grouping row

[patch] Bug 28390: Move timestamp into grouping row

Bug-28390-Move-timestamp-into-grouping-row.patch (text/plain), 6.12 KB, created by Lucas Gass (lukeg) on 2021-05-19 16:32:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas Gass (lukeg)

Created: 2021-05-19 16:32:41 UTC

Size: 6.12 KB

patch

obsolete

>From f841801bb373675e4d58349c5c3d2c44fef9ba0d Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 19 May 2021 14:55:01 +0100
>Subject: [PATCH] Bug 28390: Move timestamp into grouping row
>
>This patch moves the timestamp that was getting repeated for each
>transaction breakdown row into the group header row.
>
>Test plan
>1/ Add a series of transactions to to a register (via Point of Sale
>or/and Borrower Accounts)
>2/ View the transactions (and past transactions tables) on the Register
>details page
>3/ Apply the patch and compare the display
>
>Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 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 64a997685e..2b04641324 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>@@ -103,8 +103,8 @@
>                             [% 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 %]" }</td>
>-                                <td>[% IF accountline.timestamp %][% accountline.timestamp | $KohaDates with_hours => 1 %][% END %]</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 -%]
>@@ -127,7 +127,7 @@
>                             [% 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 %]" }</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 -%]</td>
>                                 <td>
>@@ -192,8 +192,8 @@
>                             [% 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 -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td>
>-                                <td>[% IF accountline.timestamp %][% accountline.timestamp | $KohaDates with_hours => 1 %][% END %]</td>
>+                                <td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% 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 -%]
>@@ -338,7 +338,7 @@
>                     var details = JSON.parse(rows.data().pluck(1).pop());
>                     var identifier = details.identifier || group;
>                     return $('<tr class="'+details.type+'"/>')
>-                        .append( '<td>'+identifier+'</td>' )
>+                        .append( '<td>'+details.timestamp+' ('+identifier+')</td>' )
>                         .append( '<td colspan="2">'+details.description+'</td>' )
>                         .append( '<td>'+details.amount+'</td>' )
>                         .append( '<td><button class="printReceipt btn btn-default btn-xs" data-accountline="'+group+'"><i class="fa fa-print"></i> ' + _("Print receipt") + '</button></td>');
>@@ -362,7 +362,7 @@
>                     var details = JSON.parse(rows.data().pluck(1).pop());
>                     var identifier = details.identifier || group;
>                     return $('<tr class="'+details.type+'"/>')
>-                        .append( '<td>'+identifier+'</td>' )
>+                        .append( '<td>'+details.timestamp+' ('+identifier+')</td>' )
>                         .append( '<td colspan="2">'+details.description+'</td>' )
>                         .append( '<td>'+details.amount+'</td>' )
>                         .append( '<td><button class="printReceipt btn btn-default btn-xs" data-accountline="'+group+'"><i class="fa fa-print"></i> Print receipt</button></td>');
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 28390: 121179 | 121187 | 123422 | 123478 | 123585