Bugzilla – Attachment 98026 Details for
Bug 23355
Add a 'cashup' process to accounts
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24082: Add `anonymous_refund` permission to `cash_management`
Bug-24082-Add-anonymousrefund-permission-to-cashma.patch (text/plain), 4.94 KB, created by
Martin Renvoize (ashimema)
on 2020-01-28 13:53:59 UTC
(
hide
)
Description:
Bug 24082: Add `anonymous_refund` permission to `cash_management`
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-01-28 13:53:59 UTC
Size:
4.94 KB
patch
obsolete
>From 2e5b5b7dd1b2c0592ebaeb4d28c2b22ccce68940 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 23 Jan 2020 15:52:25 +0000 >Subject: [PATCH] Bug 24082: Add `anonymous_refund` permission to > `cash_management` > >This patch adds the new `anonymous_refund` permission to the >`cash_management` flag and binds it to the visability of the register >details page. > >https://bugs.koha-community.org/show_bug.cgi?id=23355 >--- > installer/data/mysql/atomicupdate/bug_24082.perl | 12 ++++++++++++ > installer/data/mysql/userpermissions.sql | 1 + > .../intranet-tmpl/prog/en/includes/permissions.inc | 5 +++++ > .../intranet-tmpl/prog/en/includes/pos-menu.inc | 2 +- > .../intranet-tmpl/prog/en/modules/pos/register.tt | 2 ++ > pos/register.pl | 2 +- > 6 files changed, 22 insertions(+), 2 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug_24082.perl > >diff --git a/installer/data/mysql/atomicupdate/bug_24082.perl b/installer/data/mysql/atomicupdate/bug_24082.perl >new file mode 100644 >index 0000000000..be66c07777 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_24082.perl >@@ -0,0 +1,12 @@ >+$DBversion = 'XXX'; # will be replaced by the RM >+if ( CheckVersion($DBversion) ) { >+ >+ $dbh->do(qq{ >+ INSERT IGNORE permissions (module_bit, code, description) >+ VALUES >+ (25, 'anonymous_refund', 'Perform refund actions from cash registers') >+ }); >+ >+ SetVersion($DBversion); >+ print "Upgrade to $DBversion done (Bug 23442 - Add a refund option to the point of sale system)\n"; >+} >diff --git a/installer/data/mysql/userpermissions.sql b/installer/data/mysql/userpermissions.sql >index ebf869641f..2b41fa24b1 100644 >--- a/installer/data/mysql/userpermissions.sql >+++ b/installer/data/mysql/userpermissions.sql >@@ -121,6 +121,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (23, 'self_checkout_module', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID'), > (24, 'manage_rotas', 'Create, edit and delete rotas'), > (24, 'manage_rota_items', 'Add and remove items from rotas'), >+ (25, 'anonymous_refund', 'Perform refund actions from cash registers'), > (25, 'cashup', 'Perform cash register cashup action'), > (25, 'takepayment', 'Access the point of sale page and take payments') > ; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >index 25943655fd..942fd5b6f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >@@ -701,5 +701,10 @@ > Perform cash register cashup action > </span> > <span class="permissioncode">([% name | html %])</span> >+ [%- CASE 'anonymous_refund' -%] >+ <span class="sub_permission anonymous_refund_subpermission"> >+ Perform anonymous refund actions >+ </span> >+ <span class="permissioncode">([% name | html %])</span> > [%- END -%] > [%- END -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >index c9579b5492..c2ad730e5a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >@@ -1,6 +1,6 @@ > <div id="navmenu"> > <div id="navmenulist"> >- [% IF ( CAN_user_cash_management_cashup ) %] >+ [% IF ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) %] > <h5>Point of sale</h5> > <ul> > <li><a href="/cgi-bin/koha/pos/register.pl">Register details</a></li> >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 8a4b09f4e0..dc3685e9f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >@@ -27,9 +27,11 @@ > </div> > [% ELSE %] > >+ [% IF ( CAN_user_cash_management_cashup ) %] > <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> > </div> >+ [% END %] > > <h1>Register transaction details for [% register.name | html %]</h1> > >diff --git a/pos/register.pl b/pos/register.pl >index 8ad143a5b7..a7fde86ce2 100755 >--- a/pos/register.pl >+++ b/pos/register.pl >@@ -35,7 +35,7 @@ my ( $template, $loggedinuser, $cookie, $user_flags ) = get_template_and_user( > query => $input, > type => 'intranet', > authnotrequired => 0, >- flagsrequired => { cash_management => 'cashup' }, >+ flagsrequired => { cash_management => [ 'cashup', 'anonymous_refund' ] }, > } > ); > my $logged_in_user = Koha::Patrons->find($loggedinuser) or die "Not logged in"; >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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