Attachment #24131 for bug #11415

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

Lines 332-337 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
332	('SearchEngine','Zebra','Solr\|Zebra','Search Engine','Choice'),	332	('SearchEngine','Zebra','Solr\|Zebra','Search Engine','Choice'),
333	('SearchMyLibraryFirst','0',NULL,'If ON, OPAC searches return results limited by the user\'s library by default if they are logged in','YesNo'),	333	('SearchMyLibraryFirst','0',NULL,'If ON, OPAC searches return results limited by the user\'s library by default if they are logged in','YesNo'),
334	('SelfCheckHelpMessage','','70\|10','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','Textarea'),	334	('SelfCheckHelpMessage','','70\|10','Enter HTML to include under the basic Web-based Self Checkout instructions on the Help page','Textarea'),
		335	('SelfCheckReceiptPrompt','1','NULL','If ON, print receipt dialog pops up when self checkout is finished','YesNo'),
335	('SelfCheckTimeout','120','','Define the number of seconds before the Web-based Self Checkout times out a patron','Integer'),	336	('SelfCheckTimeout','120','','Define the number of seconds before the Web-based Self Checkout times out a patron','Integer'),
336	('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'),	337	('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'),
337	('SeparateHoldingsBranch','homebranch','homebranch\|holdingbranch','Branch used to separate holdings','Choice'),	338	('SeparateHoldingsBranch','homebranch','homebranch\|holdingbranch','Branch used to separate holdings','Choice'),

Lines 7912-7917 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
7912	SetVersion($DBversion);	7912	SetVersion($DBversion);
7913	}	7913	}
7914		7914
		7915	$DBversion = "3.15.00.XXX";
		7916	if(CheckVersion($DBversion)) {
		7917	$dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('SelfCheckReceiptPrompt', '1', 'NULL', 'If ON, print receipt dialog pops up when self checkout is finished.', 'YesNo');");
		7918	print "Upgrade to $DBversion done (Bug 11415: add system preference for self checkout receipt print)\n";
		7919	SetVersion($DBversion);
		7920	}
		7921
		7922
7915	=head1 FUNCTIONS	7923	=head1 FUNCTIONS
7916		7924
7917	=head2 TableExists($table)	7925	=head2 TableExists($table)

Lines 592-597 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+7 lines)
592	- and this password	592	- and this password
593	- pref: AutoSelfCheckPass	593	- pref: AutoSelfCheckPass
594	- .	594	- .
		595	-
		596	- pref: SelfCheckReceiptPrompt
		597	choices:
		598	yes: Show
		599	no: "Don't show"
		600	- "the print receipt popup dialog when self checkout is finished"
		601
595	Course Reserves:	602	Course Reserves:
596	-	603	-
597	- pref: UseCourseReserves	604	- pref: UseCourseReserves

Lines 1-3 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (+4 lines)
		1	[% USE Koha %]
1	[% USE KohaDates %]	2	[% USE KohaDates %]
2	[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </title>	3	[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </title>
3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	4	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Lines 356-363 Link Here
356		357
357	$("#logout_form").submit(function(){	358	$("#logout_form").submit(function(){
358	clearTimeout(mainTimeout);	359	clearTimeout(mainTimeout);
		360	[% IF Koha.Preference('SelfCheckReceiptPrompt') %]
359	if(confirm("Would you like to print a receipt?")){	361	if(confirm("Would you like to print a receipt?")){
360	window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber %]&print=qslip");	362	window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber %]&print=qslip");
		363	[% END %]
		364
361	}	365	}
362	return true;	366	return true;
363	});	367	});

Lines 1-3 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt (-1 / +3 lines)
		1	[% USE Koha %]
1	[% USE KohaDates %]	2	[% USE KohaDates %]
2	[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </title>	3	[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </title>
3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	4	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Lines 90-97 $(document).ready(function() { Link Here
90	}));	91	}));
91	$("#logout_form").submit(function(){	92	$("#logout_form").submit(function(){
92	clearTimeout(mainTimeout);	93	clearTimeout(mainTimeout);
		94	[% IF Koha.Preference('SelfCheckReceiptPrompt') %]
93	if(confirm("Would you like to print a receipt?")){	95	if(confirm("Would you like to print a receipt?")){
94	window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber %]&print=qslip");	96	window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber %]&print=qslip");
		97	[%END %]
95	}	98	}
96	return true;	99	return true;
97	});	100	});
98	-

Return to bug 11415