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

(-)a/circ/renew.pl (+5 lines)
Lines 48-53 $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespae Link Here
48
$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
48
$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
49
my $override_limit = $cgi->param('override_limit');
49
my $override_limit = $cgi->param('override_limit');
50
my $override_holds = $cgi->param('override_holds');
50
my $override_holds = $cgi->param('override_holds');
51
my $hard_due_date  = $cgi->param('hard_due_date');
51
52
52
my ( $item, $issue, $borrower );
53
my ( $item, $issue, $borrower );
53
my $error = q{};
54
my $error = q{};
Lines 99-104 if ($barcode) { Link Here
99
                    if ( $cgi->param('renewonholdduedate') ) {
100
                    if ( $cgi->param('renewonholdduedate') ) {
100
                        $date_due = dt_from_string( scalar $cgi->param('renewonholdduedate'));
101
                        $date_due = dt_from_string( scalar $cgi->param('renewonholdduedate'));
101
                    }
102
                    }
103
                    if ( C4::Context->preference('SpecifyDueDate') && $hard_due_date ) {
104
                        $date_due = dt_from_string( $hard_due_date );
105
                    }
102
                    $date_due = AddRenewal( undef, $item->itemnumber(), $branchcode, $date_due );
106
                    $date_due = AddRenewal( undef, $item->itemnumber(), $branchcode, $date_due );
103
                    $template->param( date_due => $date_due );
107
                    $template->param( date_due => $date_due );
104
                }
108
                }
Lines 125-130 if ($barcode) { Link Here
125
    );
129
    );
126
}
130
}
127
131
132
$template->param( hard_due_date => ($hard_due_date ? output_pref({ str => $hard_due_date, dateformat => 'iso' }) : undef) );
128
# Checking if there is a Fast Cataloging Framework
133
# Checking if there is a Fast Cataloging Framework
129
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
134
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
130
135
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-1 / +2 lines)
Lines 144-149 Link Here
144
                            [% END %]
144
                            [% END %]
145
145
146
                                <form method="get" action="/cgi-bin/koha/circ/renew.pl">
146
                                <form method="get" action="/cgi-bin/koha/circ/renew.pl">
147
                                    <input type="hidden" name="hard_due_date" value="[% hard_due_date | html %]" />
147
                                    <button type="submit" class="deny"><i class="fa fa-times"></i> Continue without renewing</button>
148
                                    <button type="submit" class="deny"><i class="fa fa-times"></i> Continue without renewing</button>
148
                                </form>
149
                                </form>
149
                    </div>
150
                    </div>
Lines 171-176 Link Here
171
                        [% IF Koha.Preference('SpecifyDueDate') %]
172
                        [% IF Koha.Preference('SpecifyDueDate') %]
172
                            <label for="hard_due_date">Hard due date [% INCLUDE 'date-format.inc' %]:</label>
173
                            <label for="hard_due_date">Hard due date [% INCLUDE 'date-format.inc' %]:</label>
173
                            <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | $KohaDates with_hours => 1 %]" />
174
                            <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | $KohaDates with_hours => 1 %]" />
175
                            <br/>
174
                        [% END %]
176
                        [% END %]
175
177
176
                        <label for="barcode">Enter item barcode: </label>
178
                        <label for="barcode">Enter item barcode: </label>
177
- 

Return to bug 16112