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

(-)a/installer/data/mysql/atomicupdate/bug27696.perl (+9 lines)
Line 0 Link Here
1 
$DBversion = 'XXX'; # will be replaced by the RM
2 
if( CheckVersion( $DBversion ) ) {
3 
    $dbh->do(q{
4 
        INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type)
5 
        VALUES ('SCOSlipChoice', 'issueqslip', 'Choose the slip for SCO print receipts', 'issueqslip|issueslip', 'Choice')
6 
    });
7 
    # Always end with this (adjust the bug info)
8 
    NewVersion( $DBversion, 12345, "Add SCOSlipChoice system preference");
9 
}
(-)a/installer/data/mysql/mandatory/sysprefs.sql (+1 lines)
Lines 577-582 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
577 
('RoutingListNote','To change this note edit <a href=\"/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped\">RoutingListNote</a> system preference.','70|10','Define a note to be shown on all routing lists','Textarea'),
 577 
('RoutingListNote','To change this note edit <a href=\"/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped\">RoutingListNote</a> system preference.','70|10','Define a note to be shown on all routing lists','Textarea'),
578 
('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'),
 578 
('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'),
579 
('SCOAllowCheckin','0','','If enabled, patrons may return items through the Web-based Self Checkout','YesNo'),
 579 
('SCOAllowCheckin','0','','If enabled, patrons may return items through the Web-based Self Checkout','YesNo'),
580 
('SCOSlipChoice' , '0', 'issueqlsip', 'issueqslip|issueslip', 'Allow choice for SCO receipt print',  'Choice' ),
580 
('SCOMainUserBlock','','70|10','Add a block of HTML that will display on the self checkout screen','Textarea'),
 581 
('SCOMainUserBlock','','70|10','Add a block of HTML that will display on the self checkout screen','Textarea'),
581 
('SCOUserCSS','',NULL,'Add CSS to be included in the SCO module in an embedded <style> tag.','free'),
 582 
('SCOUserCSS','',NULL,'Add CSS to be included in the SCO module in an embedded <style> tag.','free'),
582 
('SCOUserJS','',NULL,'Define custom javascript for inclusion in the SCO module','free'),
 583 
('SCOUserJS','',NULL,'Define custom javascript for inclusion in the SCO module','free'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+7 lines)
Lines 1061-1066 Circulation: Link Here
1061 
              syntax: text/html
 1061 
              syntax: text/html
1062 
              class: code
 1062 
              class: code
1063 
        -
 1063 
        -
1064 
            - "Use the"
1065 
            - pref: SCOSlipChoice
1066 
              choices:
1067 
                  issueslip: "ISSUESLIP"
1068 
                  issueqslip: "ISSUEQSLIP"
1069 
            - "when printing a receipt from the web-based self checkout."
1070 
        -
1064 
            - "Include the following CSS on all pages in the web-based self checkout:"
 1071 
            - "Include the following CSS on all pages in the web-based self checkout:"
1065 
            - pref: SCOUserCSS
 1072 
            - pref: SCOUserCSS
1066 
              type: textarea
 1073 
              type: textarea
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-2 / +5 lines)
Lines 499-505 Link Here
499 
                    var confirmStart = Date.now();
 499 
                    var confirmStart = Date.now();
500 
                    confirmModal("", _("Would you like to print a receipt?"), _("Print receipt and end session"), _("End session"), function(result) {
 500 
                    confirmModal("", _("Would you like to print a receipt?"), _("Print receipt and end session"), _("End session"), function(result) {
501 
                        if ( result && (Date.now() - confirmStart) < [% SelfCheckTimeout | html %] ) {
 501 
                        if ( result && (Date.now() - confirmStart) < [% SelfCheckTimeout | html %] ) {
502 
                            var win = window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber | html %]&amp;print=qslip");
 502 
                            [% IF Koha.Preference( 'SCOSlipChoice' ) == 'issueqslip' %]
503 
                                var win = window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber | html %]&amp;print=qslip");
504 
                            [% ELSE %]
505 
                                var win = window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber | html %]&amp;print=slip");
506 
                            [% END %]
503 
                            location.href = '/cgi-bin/koha/sco/sco-main.pl?op=logout';
 507 
                            location.href = '/cgi-bin/koha/sco/sco-main.pl?op=logout';
504 
                        } else {
 508 
                        } else {
505 
                            location.href = '/cgi-bin/koha/sco/sco-main.pl?op=logout';
 509 
                            location.href = '/cgi-bin/koha/sco/sco-main.pl?op=logout';
506 
-

Return to bug 27696