Attachment 100030 Details for Bug 23355 – Bug 23355: (QA follow-up) Add a modal confirm to the cashup action

[patch] Bug 23355: (QA follow-up) Add a modal confirm to the cashup action

Bug-23355-QA-follow-up-Add-a-modal-confirm-to-the-.patch (text/plain), 2.80 KB, created by Tomás Cohen Arazi (tcohen) on 2020-03-03 14:15:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2020-03-03 14:15:11 UTC

Size: 2.80 KB

patch

obsolete

>From d9e2cd9c7ef9a9191bd0a4620a3cd25e2d1a824a Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 3 Mar 2020 14:09:40 +0000
>Subject: [PATCH] Bug 23355: (QA follow-up) Add a modal confirm to the cashup
> action
>
>This patch adds a simple modal to confirm the cashup action adding a
>safely measure to it.
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> .../prog/en/modules/pos/register.tt           | 21 ++++++++++++++++++-
> 1 file changed, 20 insertions(+), 1 deletion(-)
>
>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 4769ce3705..f596091ba1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>@@ -28,7 +28,7 @@
>             [% ELSE %]
> 
>             <div id="toolbar" class="btn-toolbar">
>-                <a id="cashup" href="/cgi-bin/koha/pos/register.pl?op=cashup" class="btn btn-default"><i class="fa fa-money"></i> Record cashup</a>
>+                <button type="button" class="btn btn-default" data-toggle="modal" data-target="#confirmCashupModal" ><i class="fa fa-money"></i> Record cashup</button>
>             </div>
> 
>             <h1>Register transaction details for [% register.name | html %]</h1>
>@@ -145,6 +145,25 @@
>         </div>
>     </div>
> 
>+    
>+    <div class="modal" id="confirmCashupModal" tabindex="-1" role="dialog" aria-labelledby="confirmCashupLabel">
>+        <div class="modal-dialog" role="document">
>+            <div class="modal-content">
>+                <div class="modal-header">
>+                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>+                    <h4 class="modal-title" id="confirmCashupLabel">Confirm cashup of <em>[% register.description | html %]</em></h4>
>+                </div>
>+                <div class="modal-body">
>+                    Please confirm that you have removed [% accountlines.total( payment_type => 'CASH') * -1 | $Price %] from the cash register and left a float of [% register.starting_float | $Price %].
>+                </div> 
>+                <div class="modal-footer">
>+                    <a href="/cgi-bin/koha/pos/register.pl?op=cashup" class="btn btn-default">Confirm</a>
>+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
>+                </div> 
>+            </div> 
>+        </div> 
>+    </div> 
>+
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>     [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
>-- 
>2.25.0

Actions: View | Diff | Splinter Review

Attachments on bug 23355: 92941 | 92942 | 92943 | 92944 | 92945 | 92946 | 92947 | 92948 | 92949 | 92950 | 92951 | 92952 | 92953 | 97031 | 97032 | 97033 | 97034 | 97035 | 97036 | 97037 | 97038 | 97039 | 97040 | 97041 | 97043 | 97044 | 97045 | 97046 | 97047 | 97048 | 97049 | 97050 | 97051 | 97052 | 97053 | 97054 | 97077 | 97078 | 97079 | 97080 | 97081 | 97082 | 97083 | 97084 | 97085 | 97086 | 97087 | 97088 | 97089 | 97706 | 97707 | 97708 | 97709 | 97710 | 97711 | 97712 | 97713 | 97714 | 97715 | 97716 | 97784 | 97785 | 97786 | 97787 | 97788 | 97789 | 97790 | 97791 | 97792 | 97793 | 97794 | 97816 | 97817 | 97818 | 97819 | 97820 | 97821 | 97822 | 97823 | 98026 | 98027 | 98028 | 98835 | 98836 | 98837 | 98838 | 98839 | 98840 | 98841 | 98842 | 100009 | 100010 | 100011 | 100012 | 100013 | 100014 | 100015 | 100016 | 100017 | 100018 | 100019 | 100020 | 100021 | 100030 | 100090 | 101685