Attachment 118149 Details for Bug 26273 – Bug 26273: Add historic cashups table to register page

[patch] Bug 26273: Add historic cashups table to register page

Bug-26273-Add-historic-cashups-table-to-register-p.patch (text/plain), 3.96 KB, created by Jonathan Druart on 2021-03-11 15:33:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2021-03-11 15:33:53 UTC

Size: 3.96 KB

patch

obsolete

>From 8e28789825d7e8021e32ecfb72fb693ab6729cb0 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 1 Feb 2021 14:50:02 +0000
>Subject: [PATCH] Bug 26273: Add historic cashups table to register page
>
>This patch adds a historic cashups table to the bottom of the register
>transaction details page.  It will only display if one or more cashups
>have taken place and contains links to allow display of the summary
>detail modal for each cashup.
>
>Test plan
>1/ Enable UseCashRegisters
>2/ Undertake a few transactions and cashups
>3/ View the 'Register details' page
>4/ Note the appearance of a 'Cashup history' section at the bottom of
>the page
>5/ Note that 'Summary' button displays the relevant modal
>6/ Signoff
>
>Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
>Signed-off-by: Daniel Jones <daniel.jones@cheshiresharedservices.gov.uk>
>Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>Bug 26273: (QA follow-up) Remove unrequired table_controls div
>
>Looks like a copy/paste issue.. I don't believe we need this div at all
>for the table to function as expected and adding it just creates uneeded
>whitespace.
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>Bug 26273: (QA follow-up) Add horizontal rule to distinguish tables
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/pos/register.tt           | 50 +++++++++++++++++++
> 1 file changed, 50 insertions(+)
>
>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 ebee5bd376..0907f6764f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>@@ -223,6 +223,17 @@
>             </table>
>             [% END %]
> 
>+            <hr/>
>+            <h2>Cashup history</h2>
>+            <table id="table_cashups">
>+                <thead>
>+                    <tr>
>+                        <th>Date</th>
>+                        <th>Amount</th>
>+                        <th data-class-name="actions">Actions</th>
>+                    </tr>
>+                </thead>
>+            </table>
>             [% END %]
>         </div>
> 
>@@ -390,6 +401,45 @@
>             window.print();
>         });
> 
>+
>+        var cashups_table_url = "/api/v1/cash_registers/[% register.id | html %]/cashups?";
>+        var cashups_table = $("#table_cashups").api({
>+            "ajax": {
>+                "url": cashups_table_url
>+            },
>+            "order": [[ 1, "asc" ]],
>+            "columnDefs": [ {
>+                "targets": [0,1],
>+                "render": function (data, type, row, meta) {
>+                    if ( type == 'display' ) {
>+                        return data.escapeHtml();
>+                    }
>+                    return data;
>+                }
>+            } ],
>+            "columns": [
>+                {
>+                    "data": "timestamp",
>+                    "searchable": true,
>+                    "orderable": true
>+                },
>+                {
>+                    "data": "amount",
>+                    "searchable": true,
>+                    "orderable": true
>+                },
>+                {
>+                    "data": function( row, type, val, meta ) {
>+                        var result = '<a class="btn btn-default btn-xs" role="button" data-toggle="modal" data-cashup="'+encodeURIComponent(row.cashup_id)+'" data-register="[% register.description | html %]" href="#cashupSummaryModal"><i class="fa fa-pencil" aria-hidden="true"></i> '+_("Summary")+'</a>\n';
>+                        return result;
>+
>+                    },
>+                    "searchable": false,
>+                    "orderable": false
>+                }
>+            ]
>+        }, [], 1);
>+
>         $(document).ready(function() {
>             // http://jqueryui.com/demos/datepicker/#date-range
>             var dates = $( "#from, #to" ).datepicker({
>-- 
>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