Attachment #9445 for bug #8058

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

Lines 705-710 $template->param( Link Here

(-)a/circ/circulation.pl (+1 lines)
705	fast_cataloging => $fast_cataloging,	705	fast_cataloging => $fast_cataloging,
706	CircAutoPrintQuickSlip => C4::Context->preference("CircAutoPrintQuickSlip"),	706	CircAutoPrintQuickSlip => C4::Context->preference("CircAutoPrintQuickSlip"),
707	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),	707	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
		708	CircPayFinesRedirect => (C4::Context->preference('CircPayFinesRedirect') ? $total : 0),
708	);	709	);
709		710
710	# save stickyduedate to session	711	# save stickyduedate to session

Lines 362-364 INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES(' Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
362	INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('AutoResumeSuspendedHolds', '1', NULL , 'Allow suspended holds to be automatically resumed by a set date.', 'YesNo');	362	INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('AutoResumeSuspendedHolds', '1', NULL , 'Allow suspended holds to be automatically resumed by a set date.', 'YesNo');
363	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacStarRatings','all',NULL,'disable\|all\|details','Choice');	363	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacStarRatings','all',NULL,'disable\|all\|details','Choice');
364	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacBrowseResults','1','Disable/enable browsing and paging search results from the OPAC detail page.',NULL,'YesNo');	364	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacBrowseResults','1','Disable/enable browsing and paging search results from the OPAC detail page.',NULL,'YesNo');
		365	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('CircPayFindsRedirect','0','When an empty barcode is entered into the checkout field will redirect to pay fines page if borrowser has fines to pay (after quickslip if enabled)',NULL,'YesNo');

Lines 5212-5217 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
5212	SetVersion($DBversion);	5212	SetVersion($DBversion);
5213	}	5213	}
5214		5214
		5215	$DBversion = "3.08.00.XXX";
		5216	if( C4::Context->preference("Version") < TransformToNum($DBversion) ){
		5217	$dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('CircPayFindsRedirect','0','When an empty barcode is entered into the checkout field will redirect to pay fines page if borrowser has fines to pay (after quickslip if enabled)',NULL,'YesNo')");
		5218	print "Upgrade to $Dbversion done\n";
		5219	SetVersion($DBversion);
		5220	}
		5221
5215	=head1 FUNCTIONS	5222	=head1 FUNCTIONS
5216		5223
5217	=head2 TableExists($table)	5224	=head2 TableExists($table)

Lines 99-104 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+7 lines)
99	no: "clear the screen"	99	no: "clear the screen"
100	- .	100	- .
101	-	101	-
		102	- When an empty barcode field is submitted in circulation (and after any quick slip printing, if enabled)
		103	- pref: CircPayFinesRedirect
		104	choices:
		105	yes: "redirect to pay fines screen if borrower has fines to pay"
		106	no: "do nothing"
		107	- .
		108	-
102	- Include the stylesheet at	109	- Include the stylesheet at
103	- pref: NoticeCSS	110	- pref: NoticeCSS
104	class: url	111	class: url




        // listen submit to trigger qslip on empty checkout
        $('#mainform').bind('submit',function() {
          if ($('#barcode').val() == '') {
            var code = printx_window('qslip');
		[% IF (CircPayFinesRedirect) %]
 		window.location = "/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %];";
		[% END %]
		return code;
	}
        });
	[% ELSIF ( CircPayFinesRedirect ) %]
	$('#mainform').bind('submit', function(){
		if ($('#barcode').val() == '') {
			window.location = "/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]";
		}
	});
	[% END %]


var allcheckboxes = $(".checkboxed");
- 

Return to bug 8058

Lines 50-57 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-3 / +14 lines)
50	// listen submit to trigger qslip on empty checkout	50	// listen submit to trigger qslip on empty checkout
51	$('#mainform').bind('submit',function() {	51	$('#mainform').bind('submit',function() {
52	if ($('#barcode').val() == '') {	52	if ($('#barcode').val() == '') {
53	return printx_window('qslip'); }	53	var code = printx_window('qslip');
54	});[% END %]	54	[% IF (CircPayFinesRedirect) %]
		55	window.location = "/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %];";
		56	[% END %]
		57	return code;
		58	}
		59	});
		60	[% ELSIF ( CircPayFinesRedirect ) %]
		61	$('#mainform').bind('submit', function(){
		62	if ($('#barcode').val() == '') {
		63	window.location = "/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]";
		64	}
		65	});
		66	[% END %]
55		67
56		68
57	var allcheckboxes = $(".checkboxed");	69	var allcheckboxes = $(".checkboxed");
58	-