Attachment #100070 for bug #24082

View | Details | Raw Unified | Return to bug 24082
Collapse All | Expand All




$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";
}

Lines 121-126 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/userpermissions.sql (+1 lines)
121	(23, 'self_checkout_module', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID'),	121	(23, 'self_checkout_module', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID'),
122	(24, 'manage_rotas', 'Create, edit and delete rotas'),	122	(24, 'manage_rotas', 'Create, edit and delete rotas'),
123	(24, 'manage_rota_items', 'Add and remove items from rotas'),	123	(24, 'manage_rota_items', 'Add and remove items from rotas'),
		124	(25, 'anonymous_refund', 'Perform refund actions from cash registers'),
124	(25, 'cashup', 'Perform cash register cashup action'),	125	(25, 'cashup', 'Perform cash register cashup action'),
125	(25, 'takepayment', 'Access the point of sale page and take payments')	126	(25, 'takepayment', 'Access the point of sale page and take payments')
126	;	127	;

Lines 704-708 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (+5 lines)
704	Perform cash register cashup action	704	Perform cash register cashup action
705	</span>	705	</span>
706	<span class="permissioncode">([% name \| html %])</span>	706	<span class="permissioncode">([% name \| html %])</span>
		707	[%- CASE 'anonymous_refund' -%]
		708	<span class="sub_permission anonymous_refund_subpermission">
		709	Perform anonymous refund actions
		710	</span>
		711	<span class="permissioncode">([% name \| html %])</span>
707	[%- END -%]	712	[%- END -%]
708	[%- END -%]	713	[%- END -%]

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc (-1 / +1 lines)
1	<div id="navmenu">	1	<div id="navmenu">
2	<div id="navmenulist">	2	<div id="navmenulist">
3	[% IF ( CAN_user_cash_management_cashup ) %]	3	[% IF ( CAN_user_cash_management_cashup \|\| CAN_user_cash_management_anonymous_refund ) %]
4	<h5>Point of sale</h5>	4	<h5>Point of sale</h5>
5	<ul>	5	<ul>
6	<li><a href="/cgi-bin/koha/pos/register.pl">Register details</a></li>	6	<li><a href="/cgi-bin/koha/pos/register.pl">Register details</a></li>

Lines 27-35 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt (+2 lines)
27	</div>	27	</div>
28	[% ELSE %]	28	[% ELSE %]
29		29
		30	[% IF ( CAN_user_cash_management_cashup ) %]
30	<div id="toolbar" class="btn-toolbar">	31	<div id="toolbar" class="btn-toolbar">
31	<button type="button" class="btn btn-default" data-toggle="modal" data-target="#confirmCashupModal" ><i class="fa fa-money"></i> Record cashup</button>	32	<button type="button" class="btn btn-default" data-toggle="modal" data-target="#confirmCashupModal" ><i class="fa fa-money"></i> Record cashup</button>
32	</div>	33	</div>
		34	[% END %]
33		35
34	<h1>Register transaction details for [% register.name \| html %]</h1>	36	<h1>Register transaction details for [% register.name \| html %]</h1>
35		37

Lines 34-40 my ( $template, $loggedinuser, $cookie, $user_flags ) = get_template_and_user( Link Here

(-)a/pos/register.pl (-2 / +1 lines)
34	query => $input,	34	query => $input,
35	type => 'intranet',	35	type => 'intranet',
36	authnotrequired => 0,	36	authnotrequired => 0,
37	flagsrequired => { cash_management => 'cashup' },	37	flagsrequired => { cash_management => [ 'cashup', 'anonymous_refund' ] },
38	}	38	}
39	);	39	);
40	my $logged_in_user = Koha::Patrons->find($loggedinuser) or die "Not logged in";	40	my $logged_in_user = Koha::Patrons->find($loggedinuser) or die "Not logged in";
41	-

Return to bug 24082

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_24082.perl (+12 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if ( CheckVersion($DBversion) ) {
	3
	4	$dbh->do(qq{
	5	INSERT IGNORE permissions (module_bit, code, description)
	6	VALUES
	7	(25, 'anonymous_refund', 'Perform refund actions from cash registers')
	8	});
	9
	10	SetVersion($DBversion);
	11	print "Upgrade to $DBversion done (Bug 23442 - Add a refund option to the point of sale system)\n";
	12	}