Attachment 107875 Details for Bug 19036 – Bug 19036: (QA follow-up) Add credit_number handling to POS

[patch] Bug 19036: (QA follow-up) Add credit_number handling to POS

Bug-19036-QA-follow-up-Add-creditnumber-handling-t.patch (text/plain), 5.90 KB, created by Martin Renvoize (ashimema) on 2020-08-06 11:31:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-08-06 11:31:02 UTC

Size: 5.90 KB

patch

obsolete

>From 88c143c321e58f84b61872526029aea2a073b2c5 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 6 Aug 2020 12:28:48 +0100
>Subject: [PATCH] Bug 19036: (QA follow-up) Add credit_number handling to POS
>
>This patch adds the display of 'credit_number' as a replacement for the
>internal 'accountlines_id' as the transaction identifier on the
>register summary page when using cash registers.
>---
> .../intranet-tmpl/prog/en/modules/pos/register.tt  | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 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 2d96682a2f..e5a350f5c9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>@@ -69,7 +69,7 @@
>                             [% IF credit.debit %]
>                             <tr>
>                                 <td>[% accountline.accountlines_id | html %]</td>
>-                                <td>{ "type": "credit", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</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></td>
>                                 <td>
>                                     [%- PROCESS account_type_description account=credit.debit -%]
>@@ -93,7 +93,7 @@
>                             [% IF debit.credit %]
>                             <tr>
>                                 <td>[% accountline.accountlines_id | html %]</td>
>-                                <td>{ "type": "debit", "description": "[%- PROCESS account_type_description account=accountline -%] ([% 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 -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td>
>                                 <td></td>
>                                 <td>[%- PROCESS account_type_description account=debit.credit -%]</td>
>                                 <td>
>@@ -158,7 +158,7 @@
>                             [% IF credit.debit %]
>                             <tr>
>                                 <td>[% accountline.accountlines_id | html %]</td>
>-                                <td>{ "type": "credit", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</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></td>
>                                 <td>
>                                     [%- PROCESS account_type_description account=credit.debit -%]
>@@ -180,7 +180,7 @@
>                             [% IF debit.credit %]
>                             <tr>
>                                 <td>[% accountline.accountlines_id | html %]</td>
>-                                <td>{ "type": "debit", "description": "[%- PROCESS account_type_description account=accountline -%] ([% 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 -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td>
>                                 <td></td>
>                                 <td>[%- PROCESS account_type_description account=debit.credit -%]</td>
>                                 <td>[%- IF debit.credit.description %][% debit.credit.description | html %][% END %]
>@@ -298,8 +298,9 @@
>                 dataSrc: 0,
>                 startRender: function ( rows, group ) {
>                     var details = JSON.parse(rows.data().pluck(1).pop());
>+                    var identifier = details.identifier || group;
>                     return $('<tr class="'+details.type+'"/>')
>-                        .append( '<td>'+group+'</td>' )
>+                        .append( '<td>'+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>');
>@@ -318,8 +319,9 @@
>                 dataSrc: 0,
>                 startRender: function ( rows, group ) {
>                     var details = JSON.parse(rows.data().pluck(1).pop());
>+                    var identifier = details.identifier || group;
>                     return $('<tr class="'+details.type+'"/>')
>-                        .append( '<td>'+group+'</td>' )
>+                        .append( '<td>'+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.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 19036: 99301 | 99302 | 99303 | 99676 | 101549 | 101550 | 101896 | 101897 | 106278 | 106279 | 106280 | 106281 | 106767 | 107872 | 107875 | 107877 | 108323 | 108324 | 108325 | 108326 | 108327 | 108328 | 108329 | 108525 | 108587 | 108733