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

(-)a/circ/renew.pl (-1 / +1 lines)
Lines 93-99 if ($barcode) { Link Here
93
                }
93
                }
94
                if ($can_renew) {
94
                if ($can_renew) {
95
                    my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
95
                    my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
96
                    my $date_due = AddRenewal( undef, $item->itemnumber(), $branchcode );
96
                    my $date_due = AddRenewal( undef, $item->itemnumber(), $branchcode, dt_from_string( scalar $cgi->param('renewonholdduedate')) );
97
                    $template->param( date_due => $date_due );
97
                    $template->param( date_due => $date_due );
98
                }
98
                }
99
            }
99
            }
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+19 lines)
Lines 3843-3854 span { Link Here
3843
    }
3843
    }
3844
}
3844
}
3845
3845
3846
input.renew {
3847
    margin-right: 1em;
3848
}
3849
3846
.renewals {
3850
.renewals {
3847
    display: block;
3851
    display: block;
3848
    font-size: .8em;
3852
    font-size: .8em;
3849
    padding: .5em;
3853
    padding: .5em;
3850
}
3854
}
3851
3855
3856
.dialog input#renewonholdduedate {
3857
    padding: 2px;
3858
}
3859
3860
.date-select {
3861
    label {
3862
        display: inline-block;
3863
        width: 40%;
3864
    }
3865
}
3866
3867
#newonholdduedate {
3868
    display: none;
3869
}
3870
3852
#transport-types {
3871
#transport-types {
3853
    padding-top: .5px;
3872
    padding-top: .5px;
3854
}
3873
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-4 / +6 lines)
Lines 4-13 Link Here
4
        <td id="totaldue" style="text-align: right;">[% totaldue | html %]</td>
4
        <td id="totaldue" style="text-align: right;">[% totaldue | html %]</td>
5
        <td id="totalfine" style="text-align: right;">[% finetotal | html %]</td>
5
        <td id="totalfine" style="text-align: right;">[% finetotal | html %]</td>
6
        <td id="totalprice" style="text-align: right;">[% totalprice | html %]</td>
6
        <td id="totalprice" style="text-align: right;">[% totalprice | html %]</td>
7
                <td colspan="3"><div class="date-select">
7
        <td colspan="3">
8
            <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate | html %]" />
8
            <div class="date-select">
9
</p>
9
                <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate | html %]" /></p>
10
            <p><label for="exemptfine">Forgive fines on return: <input type="checkbox" id="exemptfine" name="exemptfine" value="1" /></label></p></div>
10
                <p id="newonholdduedate"><label for="newonholdduedate">On hold due date:</label> <input type="text" size="12" name="newonholdduedate" value="" /></p>
11
                <p><label for="exemptfine">Forgive fines on return:</label> <input type="checkbox" id="exemptfine" name="exemptfine" value="1" /></p>
12
            </div>
11
		</td>
13
		</td>
12
	</tr>
14
	</tr>
13
</tfoot>
15
</tfoot>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
Lines 1000-1005 No patron matched <span class="ex">[% message | html %]</span> Link Here
1000
        var branchcode = "[% branch | html %]";
1000
        var branchcode = "[% branch | html %]";
1001
        var exports_enabled = "[% Koha.Preference('ExportCircHistory') | html %]";
1001
        var exports_enabled = "[% Koha.Preference('ExportCircHistory') | html %]";
1002
        var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 | html %];
1002
        var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 | html %];
1003
        var AllowRenewalOnHoldOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalOnHoldOverride') )? 1: 0 | html %];
1003
        var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 | html %];
1004
        var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 | html %];
1004
        var script = "circulation";
1005
        var script = "circulation";
1005
        var relatives_borrowernumbers = new Array();
1006
        var relatives_borrowernumbers = new Array();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (+22 lines)
Lines 1-3 Link Here
1
[% USE raw %]
2
[% USE Asset %]
1
[% USE Koha %]
3
[% USE Koha %]
2
[% USE KohaDates %]
4
[% USE KohaDates %]
3
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
Lines 118-123 Link Here
118
                                    <input type="hidden" name="barcode" value="[% item.barcode | html %]"/>
120
                                    <input type="hidden" name="barcode" value="[% item.barcode | html %]"/>
119
                                    <input type="hidden" name="override_limit" value="1" />
121
                                    <input type="hidden" name="override_limit" value="1" />
120
                                    <input type="hidden" name="override_holds" value="1" />
122
                                    <input type="hidden" name="override_holds" value="1" />
123
                                    <div>
124
                                        <label for="renewonholdduedate">Renewal due date:</label> <input type="text" size="12" id="renewonholdduedate" name="renewonholdduedate" value="" />
125
                                    </div>
121
                                    <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
126
                                    <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
122
                                </form>
127
                                </form>
123
128
Lines 188-193 Link Here
188
    </div> <!-- /.row -->
193
    </div> <!-- /.row -->
189
194
190
[% MACRO jsinclude BLOCK %]
195
[% MACRO jsinclude BLOCK %]
196
    [% INCLUDE 'calendar.inc' %]
197
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
198
    [% INCLUDE 'timepicker.inc' %]
191
    [% IF error %]
199
    [% IF error %]
192
        <script>
200
        <script>
193
            $( document ).ready(function() {
201
            $( document ).ready(function() {
Lines 195-200 Link Here
195
            });
203
            });
196
        </script>
204
        </script>
197
    [% END %]
205
    [% END %]
206
    <script type="text/javascript">
207
        $( document ).ready(function() {
208
            $("#renewonholdduedate").datetimepicker({
209
                onClose: function(dateText, inst) {
210
                    validate_date(dateText, inst);
211
                },
212
                minDate: 1, // require that renewal date is after today
213
                hour: 23,
214
                minute: 59
215
            }).on('change', function(e) {
216
                if ( ! is_valid_date( $(this).val() ) ) {$(this).val('');}
217
            });
218
        });
219
    </script>
198
[% END %]
220
[% END %]
199
221
200
[% INCLUDE 'intranet-bottom.inc' %]
222
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+1 lines)
Lines 842-847 Link Here
842
        var exports_enabled = "[% Koha.Preference('ExportCircHistory') | html %]";
842
        var exports_enabled = "[% Koha.Preference('ExportCircHistory') | html %]";
843
        var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 | html %]
843
        var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 | html %]
844
        var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 | html %];
844
        var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 | html %];
845
        var AllowRenewalOnHoldOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalOnHoldOverride') )? 1: 0 | html %];
845
        var script = "moremember";
846
        var script = "moremember";
846
        var relatives_borrowernumbers = new Array();
847
        var relatives_borrowernumbers = new Array();
847
        [% FOREACH b IN relatives_borrowernumbers %]
848
        [% FOREACH b IN relatives_borrowernumbers %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-22 / +79 lines)
Lines 3-16 $(document).ready(function() { Link Here
3
3
4
    var barcodefield = $("#barcode");
4
    var barcodefield = $("#barcode");
5
5
6
    var onHoldDueDateSet = false;
7
8
    var onHoldChecked = function() {
9
        var isChecked = false;
10
        $('input[data-on-reserve]').each(function() {
11
            if ($(this).is(':checked')) {
12
                isChecked=true;
13
            }
14
        });
15
        return isChecked;
16
    };
17
18
    var showHideOnHoldRenewal = function() {
19
        // Display the date input
20
        if (onHoldChecked()) {
21
            $('#newonholdduedate').show()
22
        } else {
23
            $('#newonholdduedate').hide();
24
        }
25
    };
26
6
    // Handle the select all/none links for checkouts table columns
27
    // Handle the select all/none links for checkouts table columns
7
    $("#CheckAllRenewals").on("click",function(){
28
    $("#CheckAllRenewals").on("click",function(){
8
        $("#UncheckAllCheckins").click();
29
        $("#UncheckAllCheckins").click();
9
        $(".renew:visible").prop("checked", true);
30
        $(".renew:visible").prop("checked", true);
31
        showHideOnHoldRenewal();
10
        return false;
32
        return false;
11
    });
33
    });
12
    $("#UncheckAllRenewals").on("click",function(){
34
    $("#UncheckAllRenewals").on("click",function(){
13
        $(".renew:visible").prop("checked", false);
35
        $(".renew:visible").prop("checked", false);
36
        showHideOnHoldRenewal();
14
        return false;
37
        return false;
15
    });
38
    });
16
39
Lines 24-29 $(document).ready(function() { Link Here
24
        return false;
47
        return false;
25
    });
48
    });
26
49
50
    $("#newduedate").on("change", function() {
51
        if (!onHoldDueDateSet) {
52
            $('#newonholdduedate input').val($('#newduedate').val());
53
        }
54
    });
55
56
    $("#newonholdduedate").on("change", function() {
57
        onHoldDueDateSet = true;
58
    });
59
27
    // Don't allow both return and renew checkboxes to be checked
60
    // Don't allow both return and renew checkboxes to be checked
28
    $(document).on("change", '.renew', function(){
61
    $(document).on("change", '.renew', function(){
29
        if ( $(this).is(":checked") ) {
62
        if ( $(this).is(":checked") ) {
Lines 36-41 $(document).ready(function() { Link Here
36
        }
69
        }
37
    });
70
    });
38
71
72
    // Display on hold due dates input when an on hold item is
73
    // selected
74
    $(document).on('change', '.renew', function(){
75
        showHideOnHoldRenewal();
76
    });
77
39
    $("#output_format > option:first-child").attr("selected", "selected");
78
    $("#output_format > option:first-child").attr("selected", "selected");
40
    $("select[name='csv_profile_id']").hide();
79
    $("select[name='csv_profile_id']").hide();
41
    $(document).on("change", '#issues-table-output-format', function(){
80
    $(document).on("change", '#issues-table-output-format', function(){
Lines 92-109 $(document).ready(function() { Link Here
92
        $(".renew:checked:visible").each(function() {
131
        $(".renew:checked:visible").each(function() {
93
            var override_limit = $("#override_limit").is(':checked') ? 1 : 0;
132
            var override_limit = $("#override_limit").is(':checked') ? 1 : 0;
94
133
134
            var isOnReserve = $(this).data().hasOwnProperty('onReserve');
135
95
            var itemnumber = $(this).val();
136
            var itemnumber = $(this).val();
96
137
97
            $(this).parent().parent().replaceWith("<img id='renew_" + itemnumber + "' src='" + interface + "/" + theme + "/img/spinner-small.gif' />");
138
            $(this).parent().parent().replaceWith("<img id='renew_" + itemnumber + "' src='" + interface + "/" + theme + "/img/spinner-small.gif' />");
98
139
99
            var params = {
140
            var params = {
100
                itemnumber:     itemnumber,
141
                itemnumber:      itemnumber,
101
                borrowernumber: borrowernumber,
142
                borrowernumber:  borrowernumber,
102
                branchcode:     branchcode,
143
                branchcode:      branchcode,
103
                override_limit: override_limit,
144
                override_limit:  override_limit,
104
                date_due:       $("#newduedate").val()
105
            };
145
            };
106
146
147
            // Determine which due date we need to use
148
            var dueDate = isOnReserve ?
149
                $("#newonholdduedate input").val() :
150
                $("#newduedate").val();
151
152
            if (dueDate && dueDate.length > 0) {
153
                params.date_due = dueDate
154
            }
155
107
            $.post( "/cgi-bin/koha/svc/renew", params, function( data ) {
156
            $.post( "/cgi-bin/koha/svc/renew", params, function( data ) {
108
                var id = "#renew_" + data.itemnumber;
157
                var id = "#renew_" + data.itemnumber;
109
158
Lines 146-151 $(document).ready(function() { Link Here
146
    $("#RenewAll").on("click",function(){
195
    $("#RenewAll").on("click",function(){
147
        $("#CheckAllRenewals").click();
196
        $("#CheckAllRenewals").click();
148
        $("#UncheckAllCheckins").click();
197
        $("#UncheckAllCheckins").click();
198
        showHideOnHoldRenewal();
149
        $("#RenewCheckinChecked").click();
199
        $("#RenewCheckinChecked").click();
150
200
151
        // Prevent form submit
201
        // Prevent form submit
Lines 351-429 $(document).ready(function() { Link Here
351
                    "bVisible": AllowCirculate ? true : false,
401
                    "bVisible": AllowCirculate ? true : false,
352
                    "mDataProp": function ( oObj ) {
402
                    "mDataProp": function ( oObj ) {
353
                        var content = "";
403
                        var content = "";
404
                        var msg = "";
354
                        var span_style = "";
405
                        var span_style = "";
355
                        var span_class = "";
406
                        var span_class = "";
356
407
357
                        content += "<span>";
358
                        content += "<span style='padding: 0 1em;'>" + oObj.renewals_count + "</span>";
359
360
                        if ( oObj.can_renew ) {
408
                        if ( oObj.can_renew ) {
361
                            // Do nothing
409
                            // Do nothing
362
                        } else if ( oObj.can_renew_error == "on_reserve" ) {
410
                        } else if ( oObj.can_renew_error == "on_reserve" ) {
363
                            content += "<span class='renewals-disabled-no-override'>"
411
                            msg += "<span class='renewals-disabled-no-override'>"
364
                                    + "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>"
412
                                    + "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>"
365
                                    + "</span>";
413
                                    + "</span>";
366
414
367
                            span_style = "display: none";
415
                            span_style = AllowRenewalLimitOverride ? "" : "display: none";
368
                            span_class = "renewals-allowed";
416
                            span_class = "renewals-allowed";
369
                        } else if ( oObj.can_renew_error == "too_many" ) {
417
                        } else if ( oObj.can_renew_error == "too_many" ) {
370
                            content += "<span class='renewals-disabled'>"
418
                            msg += "<span class='renewals-disabled'>"
371
                                    + NOT_RENEWABLE
419
                                    + NOT_RENEWABLE
372
                                    + "</span>";
420
                                    + "</span>";
373
421
374
                            span_style = "display: none";
422
                            span_style = "display: none";
375
                            span_class = "renewals-allowed";
423
                            span_class = "renewals-allowed";
376
                        } else if ( oObj.can_renew_error == "restriction" ) {
424
                        } else if ( oObj.can_renew_error == "restriction" ) {
377
                            content += "<span class='renewals-disabled'>"
425
                            msg += "<span class='renewals-disabled'>"
378
                                    + NOT_RENEWABLE_RESTRICTION
426
                                    + NOT_RENEWABLE_RESTRICTION
379
                                    + "</span>";
427
                                    + "</span>";
380
428
381
                            span_style = "display: none";
429
                            span_style = "display: none";
382
                            span_class = "renewals-allowed";
430
                            span_class = "renewals-allowed";
383
                        } else if ( oObj.can_renew_error == "overdue" ) {
431
                        } else if ( oObj.can_renew_error == "overdue" ) {
384
                            content += "<span class='renewals-disabled'>"
432
                            msg += "<span class='renewals-disabled'>"
385
                                    + NOT_RENEWABLE_OVERDUE
433
                                    + NOT_RENEWABLE_OVERDUE
386
                                    + "</span>";
434
                                    + "</span>";
387
435
388
                            span_style = "display: none";
436
                            span_style = "display: none";
389
                            span_class = "renewals-allowed";
437
                            span_class = "renewals-allowed";
390
                        } else if ( oObj.can_renew_error == "too_soon" ) {
438
                        } else if ( oObj.can_renew_error == "too_soon" ) {
391
                            content += "<span class='renewals-disabled'>"
439
                            msg += "<span class='renewals-disabled'>"
392
                                    + NOT_RENEWABLE_TOO_SOON.format( oObj.can_renew_date )
440
                                    + NOT_RENEWABLE_TOO_SOON.format( oObj.can_renew_date )
393
                                    + "</span>";
441
                                    + "</span>";
394
442
395
                            span_style = "display: none";
443
                            span_style = "display: none";
396
                            span_class = "renewals-allowed";
444
                            span_class = "renewals-allowed";
397
                        } else if ( oObj.can_renew_error == "auto_too_soon" ) {
445
                        } else if ( oObj.can_renew_error == "auto_too_soon" ) {
398
                            content += "<span class='renewals-disabled'>"
446
                            msg += "<span class='renewals-disabled'>"
399
                                    + NOT_RENEWABLE_AUTO_TOO_SOON
447
                                    + NOT_RENEWABLE_AUTO_TOO_SOON
400
                                    + "</span>";
448
                                    + "</span>";
401
449
402
                            span_style = "display: none";
450
                            span_style = "display: none";
403
                            span_class = "renewals-allowed";
451
                            span_class = "renewals-allowed";
404
                        } else if ( oObj.can_renew_error == "auto_too_late" ) {
452
                        } else if ( oObj.can_renew_error == "auto_too_late" ) {
405
                            content += "<span class='renewals-disabled'>"
453
                            msg += "<span class='renewals-disabled'>"
406
                                    + NOT_RENEWABLE_AUTO_TOO_LATE
454
                                    + NOT_RENEWABLE_AUTO_TOO_LATE
407
                                    + "</span>";
455
                                    + "</span>";
408
456
409
                            span_style = "display: none";
457
                            span_style = "display: none";
410
                            span_class = "renewals-allowed";
458
                            span_class = "renewals-allowed";
411
                        } else if ( oObj.can_renew_error == "auto_too_much_oweing" ) {
459
                        } else if ( oObj.can_renew_error == "auto_too_much_oweing" ) {
412
                            content += "<span class='renewals-disabled'>"
460
                            msg += "<span class='renewals-disabled'>"
413
                                    + NOT_RENEWABLE_AUTO_TOO_MUCH_OWEING
461
                                    + NOT_RENEWABLE_AUTO_TOO_MUCH_OWEING
414
                                    + "</span>";
462
                                    + "</span>";
415
463
416
                            span_style = "display: none";
464
                            span_style = "display: none";
417
                            span_class = "renewals-allowed";
465
                            span_class = "renewals-allowed";
418
                        } else if ( oObj.can_renew_error == "auto_account_expired" ) {
466
                        } else if ( oObj.can_renew_error == "auto_account_expired" ) {
419
                            content += "<span class='renewals-disabled'>"
467
                            msg += "<span class='renewals-disabled'>"
420
                                    + NOT_RENEWABLE_AUTO_ACCOUNT_EXPIRED
468
                                    + NOT_RENEWABLE_AUTO_ACCOUNT_EXPIRED
421
                                    + "</span>";
469
                                    + "</span>";
422
470
423
                            span_style = "display: none";
471
                            span_style = "display: none";
424
                            span_class = "renewals-allowed";
472
                            span_class = "renewals-allowed";
425
                        } else if ( oObj.can_renew_error == "auto_renew" ) {
473
                        } else if ( oObj.can_renew_error == "auto_renew" ) {
426
                            content += "<span class='renewals-disabled'>"
474
                            msg += "<span class='renewals-disabled'>"
427
                                    + NOT_RENEWABLE_AUTO_RENEW
475
                                    + NOT_RENEWABLE_AUTO_RENEW
428
                                    + "</span>";
476
                                    + "</span>";
429
477
Lines 439-445 $(document).ready(function() { Link Here
439
                            span_style = "display: none";
487
                            span_style = "display: none";
440
                            span_class = "renewals-allowed";
488
                            span_class = "renewals-allowed";
441
                        } else {
489
                        } else {
442
                            content += "<span class='renewals-disabled'>"
490
                            msg += "<span class='renewals-disabled'>"
443
                                    + oObj.can_renew_error
491
                                    + oObj.can_renew_error
444
                                    + "</span>";
492
                                    + "</span>";
445
493
Lines 447-463 $(document).ready(function() { Link Here
447
                            span_class = "renewals-allowed";
495
                            span_class = "renewals-allowed";
448
                        }
496
                        }
449
497
450
                        var can_force_renew = ( oObj.onsite_checkout == 0 ) && ( oObj.can_renew_error != "on_reserve" );
498
                        var can_force_renew = ( oObj.onsite_checkout == 0 ) &&
499
                            ( oObj.can_renew_error != "on_reserve" || (oObj.can_renew_error == "on_reserve" && AllowRenewalOnHoldOverride))
500
                            ? true : false;
451
                        var can_renew = ( oObj.renewals_remaining > 0  && !oObj.can_renew_error );
501
                        var can_renew = ( oObj.renewals_remaining > 0  && !oObj.can_renew_error );
502
                        content += "<span>";
452
                        if ( can_renew || can_force_renew ) {
503
                        if ( can_renew || can_force_renew ) {
504
                            content += "<span style='padding: 0 1em;'>" + oObj.renewals_count + "</span>";
453
                            content += "<span class='" + span_class + "' style='" + span_style + "'>"
505
                            content += "<span class='" + span_class + "' style='" + span_style + "'>"
454
                                    +  "<input type='checkbox' ";
506
                                    +  "<input type='checkbox' ";
455
                            if ( oObj.date_due_overdue && can_renew ) {
507
                            if ( oObj.date_due_overdue && can_renew ) {
456
                                content += "checked='checked' ";
508
                                content += "checked='checked' ";
457
                            }
509
                            }
510
                            if (oObj.can_renew_error == "on_reserve") {
511
                                content += "data-on-reserve ";
512
                            }
458
                            content += "class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
513
                            content += "class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
459
                                    +  "</span>";
514
                                    +  "</span>";
460
515
                        }
516
                        content += msg;
517
                        if ( can_renew || can_force_renew ) {
461
                            content += "<span class='renewals'>("
518
                            content += "<span class='renewals'>("
462
                                    + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
519
                                    + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
463
                                    + ")</span>";
520
                                    + ")</span>";
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js (-1 / +1 lines)
Lines 28-34 $(document).ready(function() { Link Here
28
        radioCheckBox($(this));
28
        radioCheckBox($(this));
29
    });
29
    });
30
30
31
    $("#newduedate").datetimepicker({
31
    $("#newduedate, #newonholdduedate input").datetimepicker({
32
        onClose: function(dateText, inst) {
32
        onClose: function(dateText, inst) {
33
            validate_date(dateText, inst);
33
            validate_date(dateText, inst);
34
        },
34
        },
(-)a/svc/renew (-1 / +6 lines)
Lines 59-64 $data->{branchcode} = $branchcode; Link Here
59
( $data->{renew_okay}, $data->{error} ) =
59
( $data->{renew_okay}, $data->{error} ) =
60
  CanBookBeRenewed( $borrowernumber, $itemnumber, $override_limit );
60
  CanBookBeRenewed( $borrowernumber, $itemnumber, $override_limit );
61
61
62
# If we're allowing reserved items to be renewed...
63
if ( $data->{error} && $data->{error} eq 'on_reserve' && C4::Context->preference('AllowRenewalOnHoldOverride')) {
64
    $data->{renew_okay} = 1;
65
    $data->{error} = undef;
66
}
67
62
if ( $data->{renew_okay} ) {
68
if ( $data->{renew_okay} ) {
63
    $date_due = AddRenewal( $borrowernumber, $itemnumber, $branchcode, $date_due );
69
    $date_due = AddRenewal( $borrowernumber, $itemnumber, $branchcode, $date_due );
64
    $data->{date_due} = output_pref( { dt => $date_due, as_due_date => 1 } );
70
    $data->{date_due} = output_pref( { dt => $date_due, as_due_date => 1 } );
65
- 

Return to bug 7088