Attachment 118151 Details for Bug 26273 – Bug 26273: (follow-up) Add 'Cashier' to the cashups table

[patch] Bug 26273: (follow-up) Add 'Cashier' to the cashups table

Bug-26273-follow-up-Add-Cashier-to-the-cashups-tab.patch (text/plain), 3.50 KB, created by Jonathan Druart on 2021-03-11 15:34:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2021-03-11 15:34:02 UTC

Size: 3.50 KB

patch

obsolete

>From f6bf9c2893ca3d81e57867c6599d25a0e074b8d5 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 11 Feb 2021 10:19:57 +0000
>Subject: [PATCH] Bug 26273: (follow-up) Add 'Cashier' to the cashups table
>
>This patch adds the 'Cashier' field as discussed on the bug report.
>
>Test plan
>1/ Apply patch and reload the register page to refresh the table
>2/ Note that a 'Cashier' field now appears in the table
>3/ Sorting and searching on 'Cashier' should work as expected
>4/ Default sorting should remain as 'Date' order.
>5/ Signoff
>
>Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>Bug 26273: (QA follow-up) Check for null firstname
>
>This patch adds a test for firstname being defined before constructing
>fullname from it.
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> api/v1/swagger/paths/cash_registers.json      |  5 +++-
> .../prog/en/modules/pos/register.tt           | 24 +++++++++++++++++--
> 2 files changed, 26 insertions(+), 3 deletions(-)
>
>diff --git a/api/v1/swagger/paths/cash_registers.json b/api/v1/swagger/paths/cash_registers.json
>index 837f1ad35b..5466cd18be 100644
>--- a/api/v1/swagger/paths/cash_registers.json
>+++ b/api/v1/swagger/paths/cash_registers.json
>@@ -57,7 +57,10 @@
>                 "permissions": {
>                     "cash_management": "cashup"
>                 }
>-            }
>+            },
>+            "x-koha-embed": [
>+                "manager"
>+            ]
>         }
>     },
>     "/cashups/{cashup_id}": {
>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 aa2e47f837..3b06a6eb4b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>@@ -229,6 +229,7 @@
>                 <thead>
>                     <tr>
>                         <th>Date</th>
>+                        <th>Cashier</th>
>                         <th>Amount</th>
>                         <th data-class-name="actions">Actions</th>
>                     </tr>
>@@ -408,9 +409,13 @@
>             "ajax": {
>                 "url": cashups_table_url
>             },
>-            "order": [[ 1, "asc" ]],
>+            "header_filter": true,
>+            "embed": [
>+               "manager"
>+            ],
>+            "order": [[ 0, "asc" ]],
>             "columnDefs": [ {
>-                "targets": [0,1],
>+                "targets": [0,1,2],
>                 "render": function (data, type, row, meta) {
>                     if ( type == 'display' ) {
>                         return data.escapeHtml();
>@@ -427,6 +432,21 @@
>                         return $datetime(row.timestamp);
>                     }
>                 },
>+                {
>+                    "data": "manager.firstname:manager.surname",
>+                    "searchable": true,
>+                    "orderable": true,
>+                    "render": function(data, type, row, meta) {
>+                        var fullname;
>+                        if ( row.manager.firstname == null ) {
>+                            fullname = row.manager.surname;
>+                        }
>+                        else {
>+                            fullname = row.manager.firstname + " " + row.manager.surname;
>+                        }
>+                        return fullname;
>+                    }
>+                },
>                 {
>                     "data": "amount",
>                     "searchable": true,
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 26273: 116176 | 116640 | 116685 | 116691 | 116692 | 116697 | 116698 | 116699 | 116710 | 116771 | 116772 | 116773 | 117449 | 117450 | 117451 | 117787 | 117793 | 117809 | 117810 | 117811 | 117829 | 117830 | 117831 | 117832 | 117833 | 117834 | 118125 | 118129 | 118130 | 118149 | 118150 | 118151 | 118152 | 120403 | 120404