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

(-)a/circ/circulation.pl (-1 / +10 lines)
Lines 104-110 for (@failedreturns) { $return_failed{$_} = 1; } Link Here
104
my $findborrower = $query->param('findborrower');
104
my $findborrower = $query->param('findborrower');
105
$findborrower =~ s|,| |g;
105
$findborrower =~ s|,| |g;
106
my $borrowernumber = $query->param('borrowernumber');
106
my $borrowernumber = $query->param('borrowernumber');
107
108
$branch  = C4::Context->userenv->{'branch'};  
107
$branch  = C4::Context->userenv->{'branch'};  
109
$printer = C4::Context->userenv->{'branchprinter'};
108
$printer = C4::Context->userenv->{'branchprinter'};
110
109
Lines 132-137 my $issueconfirmed = $query->param('issueconfirmed'); Link Here
132
my $cancelreserve  = $query->param('cancelreserve');
131
my $cancelreserve  = $query->param('cancelreserve');
133
my $organisation   = $query->param('organisations');
132
my $organisation   = $query->param('organisations');
134
my $print          = $query->param('print');
133
my $print          = $query->param('print');
134
my $finesredirect   = $query->param('finesredirect');
135
my $newexpiry      = $query->param('dateexpiry');
135
my $newexpiry      = $query->param('dateexpiry');
136
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
136
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
137
137
Lines 180-185 if ( $print eq 'yes' && $borrowernumber ne '' ) { Link Here
180
        NetworkPrint($letter->{content});
180
        NetworkPrint($letter->{content});
181
    }
181
    }
182
    $query->param( 'borrowernumber', '' );
182
    $query->param( 'borrowernumber', '' );
183
}
184
185
if ( $finesredirect && $borrowernumber ne '' && $barcode eq '' ){
186
    print $query->redirect("/cgi-bin/koha/members/pay.pl?borrowernumber=$borrowernumber");
187
}
188
189
# this was initially inside the previous if with the same conditions but was interfering with $finesredirect
190
if ( $print eq 'yes' && $borrowernumber ne '' ) {
183
    $borrowernumber = '';
191
    $borrowernumber = '';
184
}
192
}
185
193
Lines 716-721 $template->param( Link Here
716
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
724
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
717
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
725
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
718
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
726
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
727
    CircPayFinesRedirect => (C4::Context->preference('CircPayFinesRedirect') ? $total > 0 : 0 ),
719
);
728
);
720
729
721
# save stickyduedate to session
730
# save stickyduedate to session
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 383-385 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
383
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowLibrariesPulldownMobile','1','Show the libraries pulldown on the mobile version of the OPAC.',NULL,'YesNo');
383
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowLibrariesPulldownMobile','1','Show the libraries pulldown on the mobile version of the OPAC.',NULL,'YesNo');
384
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowFiltersPulldownMobile','1','Show the search filters pulldown on the mobile version of the OPAC.',NULL,'YesNo');
384
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowFiltersPulldownMobile','1','Show the search filters pulldown on the mobile version of the OPAC.',NULL,'YesNo');
385
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('AuthDisplayHierarchy','0','Display authority hierarchies','','YesNo');
385
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('AuthDisplayHierarchy','0','Display authority hierarchies','','YesNo');
386
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 (+7 lines)
Lines 5982-5987 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5982
    SetVersion($DBversion);
5982
    SetVersion($DBversion);
5983
}
5983
}
5984
5984
5985
$DBversion = "3.09.00.XXX";
5986
if( C4::Context->preference("Version") < TransformToNum($DBversion) ){
5987
    $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')");
5988
    print "Upgrade to $DBversion done\n";
5989
    SetVersion ($DBversion);
5990
}
5991
5985
=head1 FUNCTIONS
5992
=head1 FUNCTIONS
5986
5993
5987
=head2 TableExists($table)
5994
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+6 lines)
Lines 116-121 Circulation: Link Here
116
                yes: Export
116
                yes: Export
117
                no: "Don't export"
117
                no: "Don't export"
118
            - fields for csv or iso2709 export
118
            - fields for csv or iso2709 export
119
        -
120
            - pref: CircPayFinesRedirect
121
              choices:
122
                  yes: "Redirect to pay to fines screen if borrower has outstanding fines"
123
                  no: "do nothing"
124
            - .
119
    Checkout Policy:
125
    Checkout Policy:
120
        -
126
        -
121
            - pref: AllowNotForLoanOverride
127
            - pref: AllowNotForLoanOverride
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +3 lines)
Lines 58-67 Link Here
58
        // listen submit to trigger qslip on empty checkout
58
        // listen submit to trigger qslip on empty checkout
59
        $('#mainform').bind('submit',function() {
59
        $('#mainform').bind('submit',function() {
60
          if ($('#barcode').val() == '') {
60
          if ($('#barcode').val() == '') {
61
            return printx_window('qslip'); }
61
            printx_window('qslip'); }
62
        });[% END %]
62
        });[% END %]
63
63
64
64
65
65
var allcheckboxes = $(".checkboxed");
66
var allcheckboxes = $(".checkboxed");
66
	$("#renew_all").click(function(){
67
	$("#renew_all").click(function(){
67
		$(allcheckboxes).checkCheckboxes(":input[name*=items]"); 
68
		$(allcheckboxes).checkCheckboxes(":input[name*=items]"); 
Lines 574-579 No patron matched <span class="ex">[% message %]</span> Link Here
574
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
575
	    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
575
    [% END %]
576
    [% END %]
576
    <input type="submit" value="Check Out" />
577
    <input type="submit" value="Check Out" />
578
    <input type="hidden" name="finesredirect" value="[% CircPayFinesRedirect %]" />
577
579
578
    [% IF ( SpecifyDueDate ) %]<div class="date-select">
580
    [% IF ( SpecifyDueDate ) %]<div class="date-select">
579
        <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
581
        <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
580
- 

Return to bug 8058