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

(-)a/circ/circulation.pl (-1 / +10 lines)
Lines 98-104 for (@failedrenews) { $renew_failed{$_} = 1; } Link Here
98
my $findborrower = $query->param('findborrower');
98
my $findborrower = $query->param('findborrower');
99
$findborrower =~ s|,| |g;
99
$findborrower =~ s|,| |g;
100
my $borrowernumber = $query->param('borrowernumber');
100
my $borrowernumber = $query->param('borrowernumber');
101
102
$branch  = C4::Context->userenv->{'branch'};  
101
$branch  = C4::Context->userenv->{'branch'};  
103
$printer = C4::Context->userenv->{'branchprinter'};
102
$printer = C4::Context->userenv->{'branchprinter'};
104
103
Lines 126-131 my $issueconfirmed = $query->param('issueconfirmed'); Link Here
126
my $cancelreserve  = $query->param('cancelreserve');
125
my $cancelreserve  = $query->param('cancelreserve');
127
my $organisation   = $query->param('organisations');
126
my $organisation   = $query->param('organisations');
128
my $print          = $query->param('print');
127
my $print          = $query->param('print');
128
my $finesredirect   = $query->param('finesredirect');
129
my $newexpiry      = $query->param('dateexpiry');
129
my $newexpiry      = $query->param('dateexpiry');
130
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
130
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
131
131
Lines 176-181 if ( $print eq 'yes' && $borrowernumber ne '' ) { Link Here
176
        NetworkPrint($letter->{content});
176
        NetworkPrint($letter->{content});
177
    }
177
    }
178
    $query->param( 'borrowernumber', '' );
178
    $query->param( 'borrowernumber', '' );
179
}
180
181
if ( $finesredirect && $borrowernumber ne '' && $barcode eq '' ){
182
    print $query->redirect("/cgi-bin/koha/members/pay.pl?borrowernumber=$borrowernumber");
183
}
184
185
# this was initially inside the previous if with the same conditions but was interfering with $finesredirect
186
if ( $print eq 'yes' && $borrowernumber ne '' ) {
179
    $borrowernumber = '';
187
    $borrowernumber = '';
180
}
188
}
181
189
Lines 709-714 $template->param( Link Here
709
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
717
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
710
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
718
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
711
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
719
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
720
    CircPayFinesRedirect => (C4::Context->preference('CircPayFinesRedirect') ? $total : 0 ),
712
);
721
);
713
722
714
# save stickyduedate to session
723
# save stickyduedate to session
(-)a/installer/data/mysql/sysprefs.sql (+2 lines)
Lines 371-373 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
371
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsOpac', '1', NULL , 'Allow holds to be suspended from the OPAC.', 'YesNo');
371
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsOpac', '1', NULL , 'Allow holds to be suspended from the OPAC.', 'YesNo');
372
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('DefaultLanguageField008','','Fill in the default language for field 008 Range 35-37 (e.g. eng, nor, ger, see <a href="http://www.loc.gov/marc/languages/language_code.html">MARC Code List for Languages</a>)','','Free');
372
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('DefaultLanguageField008','','Fill in the default language for field 008 Range 35-37 (e.g. eng, nor, ger, see <a href="http://www.loc.gov/marc/languages/language_code.html">MARC Code List for Languages</a>)','','Free');
373
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OPACShowBarcode','0','Show items barcode in holding tab','','YesNo');
373
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OPACShowBarcode','0','Show items barcode in holding tab','','YesNo');
374
INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('AllowItemsOnHoldCheckout',0,'Do not generate RESERVE_WAITING and RESERVED warning when checking out items reserved to someone else. This allows self checkouts for those items.','','YesNo');
375
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('CircPayFinesRedirect','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');
(-)a/installer/data/mysql/updatedatabase.pl (+6 lines)
Lines 5391-5396 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
5391
    print "Upgrade to $DBversion done (Add customizable OpacNavRight region to the OPAC main page)\n";
5391
    print "Upgrade to $DBversion done (Add customizable OpacNavRight region to the OPAC main page)\n";
5392
    SetVersion ($DBversion);
5392
    SetVersion ($DBversion);
5393
}
5393
}
5394
$DBversion = "3.06.04.001";
5395
if( C4::Context->preference("Version") < TransformToNum($DBversion) ){
5396
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('CircPayFinesRedirect','    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')");
5397
    print "Upgrade to $DBversion done\n";
5398
    SetVersion ($Dbversion);
5399
}
5394
5400
5395
=head1 FUNCTIONS
5401
=head1 FUNCTIONS
5396
5402
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+6 lines)
Lines 103-108 Circulation: Link Here
103
            - pref: NoticeCSS
103
            - pref: NoticeCSS
104
              class: url
104
              class: url
105
            - on Notices. (This should be a complete URL, starting with <code>http://</code>)
105
            - on Notices. (This should be a complete URL, starting with <code>http://</code>)
106
        -
107
            - pref: CircPayFinesRedirect
108
              choices:
109
                  yes: "Redirect to pay to fines screen if borrower has outstanding fines"
110
                  no: "do nothing"
111
            - .
106
    Checkout Policy:
112
    Checkout Policy:
107
        -
113
        -
108
            - pref: AllowNotForLoanOverride
114
            - pref: AllowNotForLoanOverride
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +3 lines)
Lines 52-61 Link Here
52
        // listen submit to trigger qslip on empty checkout
52
        // listen submit to trigger qslip on empty checkout
53
        $('#mainform').bind('submit',function() {
53
        $('#mainform').bind('submit',function() {
54
          if ($('#barcode').val() == '') {
54
          if ($('#barcode').val() == '') {
55
            return printx_window('qslip'); }
55
            printx_window('qslip'); }
56
        });[% END %]
56
        });[% END %]
57
57
58
58
59
59
var allcheckboxes = $(".checkboxed");
60
var allcheckboxes = $(".checkboxed");
60
	$("#renew_all").click(function(){
61
	$("#renew_all").click(function(){
61
		$(allcheckboxes).checkCheckboxes(":input[name*=items]"); 
62
		$(allcheckboxes).checkCheckboxes(":input[name*=items]"); 
Lines 484-489 No patron matched <span class="ex">[% message %]</span> Link Here
484
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
485
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
485
    [% END %]
486
    [% END %]
486
    <input type="submit" value="Check Out" />
487
    <input type="submit" value="Check Out" />
488
    <input type="hidden" name="finesredirect" value="[% CircPayFinesRedirect %]" />
487
489
488
    [% IF ( SpecifyDueDate ) %]<div class="date-select">
490
    [% IF ( SpecifyDueDate ) %]<div class="date-select">
489
        <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
491
        <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
490
- 

Return to bug 8058