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

(-)a/C4/Circulation.pm (-3 / +2 lines)
Lines 1189-1199 AddIssue does the following things : Link Here
1189
1189
1190
sub AddIssue {
1190
sub AddIssue {
1191
    my ( $borrower, $barcode, $datedue, $cancelreserve, $issuedate, $sipmode, $params ) = @_;
1191
    my ( $borrower, $barcode, $datedue, $cancelreserve, $issuedate, $sipmode, $params ) = @_;
1192
    my $onsite_checkout = $params->{onsite_checkout};
1192
    my $onsite_checkout = $params && $params->{onsite_checkout} ? 1 : 0;
1193
    my $auto_renew = $params->{auto_renew};
1193
    my $auto_renew = $params && $params->{auto_renew};
1194
    my $dbh = C4::Context->dbh;
1194
    my $dbh = C4::Context->dbh;
1195
    my $barcodecheck=CheckValidBarcode($barcode);
1195
    my $barcodecheck=CheckValidBarcode($barcode);
1196
    $onsite_checkout = ( $onsite_checkout ? 1 : 0 );
1197
1196
1198
    if ($datedue && ref $datedue ne 'DateTime') {
1197
    if ($datedue && ref $datedue ne 'DateTime') {
1199
        $datedue = dt_from_string($datedue);
1198
        $datedue = dt_from_string($datedue);
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (-5 / +5 lines)
Lines 307-317 $(document).ready(function() { Link Here
307
                            span_class = "renewals-allowed";
307
                            span_class = "renewals-allowed";
308
                        }
308
                        }
309
309
310
                        content += "<span class='" + span_class + "' style='" + span_style + "'>"
310
                        if ( oObj.renewals_remaining && oObj.onsite_checkout == 0 ) {
311
                                +  "<input type='checkbox' class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
311
                            content += "<span class='" + span_class + "' style='" + span_style + "'>"
312
                                +  "</span>";
312
                                    +  "<input type='checkbox' class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
313
                                    +  "</span>";
313
314
314
                        if ( oObj.renewals_remaining && onsite_checkout == 0 ) {
315
                            content += "<span class='renewals'>("
315
                            content += "<span class='renewals'>("
316
                                    + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
316
                                    + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
317
                                    + ")</span>";
317
                                    + ")</span>";
Lines 444-450 $(document).ready(function() { Link Here
444
444
445
                            var onsite_checkout = '';
445
                            var onsite_checkout = '';
446
                            if ( oObj.onsite_checkout == 1 ) {
446
                            if ( oObj.onsite_checkout == 1 ) {
447
                                onsite_checkout += " <span class='onsite_checkout'>("+INHOUSE_USE+")</span>";
447
                                onsite_checkout += " <span class='onsite_checkout'>(" + INHOUSE_USE + ")</span>";
448
                            }
448
                            }
449
449
450
                            title += " "
450
                            title += " "
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 549-555 No patron matched <span class="ex">[% message %]</span> Link Here
549
          <button class="btn btn-small action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button>
549
          <button class="btn btn-small action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button>
550
</div>[% END %]
550
</div>[% END %]
551
551
552
      [% IF onsite_checkout_feature %]
552
      [% IF Koha.Preference('On-site checkouts') %]
553
        <div class="onsite_checkout-select">
553
        <div class="onsite_checkout-select">
554
          [% IF noissues %]
554
          [% IF noissues %]
555
            <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkout</label>
555
            <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkout</label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-7 / +6 lines)
Lines 17-27 Link Here
17
        ]
17
        ]
18
    }));
18
    }));
19
    var tabs = $("#tabs").tabs({
19
    var tabs = $("#tabs").tabs({
20
        select: function(e, ui) {
20
        activate: function(e, ui) {
21
            var id = $(ui.tab).attr("id");
21
            var active = tabs.tabs("option", "active" );
22
            if ( id == "tab_checkout" ) {
22
            if ( active == 1 ) {
23
                table.fnFilter("checkout", 0);
23
                table.fnFilter("standard_checkout", 0);
24
            } else if ( id == "tab_onsite_checkout" ) {
24
            } else if ( active == 2 ) {
25
                table.fnFilter("onsite_checkout", 0);
25
                table.fnFilter("onsite_checkout", 0);
26
            } else { // all
26
            } else { // all
27
                table.fnFilter('', 0);
27
                table.fnFilter('', 0);
Lines 82-88 Link Here
82
            [% IF issue.onsite_checkout %]
82
            [% IF issue.onsite_checkout %]
83
              onsite_checkout
83
              onsite_checkout
84
            [% ELSE %]
84
            [% ELSE %]
85
              checkout
85
              standard_checkout
86
            [% END %]
86
            [% END %]
87
          </td>
87
          </td>
88
          <td>
88
          <td>
Lines 105-111 Link Here
105
          <td>
105
          <td>
106
            <span title="[% issue.issuedate %]">[% issue.issuedate | $KohaDates %]</span></td>
106
            <span title="[% issue.issuedate %]">[% issue.issuedate | $KohaDates %]</span></td>
107
          </td>
107
          </td>
108
          <td>[% issue.issuedate | $KohaDates %]</td>
109
          <td>[% issue.issuingbranch %]</td>
108
          <td>[% issue.issuingbranch %]</td>
110
          <td>
109
          <td>
111
            [% IF issue.date_due %]
110
            [% IF issue.date_due %]
(-)a/t/db_dependent/Circulation.t (-2 / +1 lines)
Lines 338-344 C4::Context->dbh->do("DELETE FROM accountlines"); Link Here
338
        $biblionumber
338
        $biblionumber
339
    );
339
    );
340
340
341
    AddIssue( $renewing_borrower, $barcode4, undef, undef, undef, undef, 1 );
341
    AddIssue( $renewing_borrower, $barcode4, undef, undef, undef, undef, { auto_renew => 1 } );
342
    ( $renewokay, $error ) =
342
    ( $renewokay, $error ) =
343
      CanBookBeRenewed( $renewing_borrowernumber, $itemnumber4 );
343
      CanBookBeRenewed( $renewing_borrowernumber, $itemnumber4 );
344
    is( $renewokay, 0, 'Cannot renew, renewal is automatic' );
344
    is( $renewokay, 0, 'Cannot renew, renewal is automatic' );
345
- 

Return to bug 10860