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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (+1 lines)
Lines 10-15 Link Here
10
    var RETURN_CLAIMED_FAILURE = _("Unable to claim as returned");
10
    var RETURN_CLAIMED_FAILURE = _("Unable to claim as returned");
11
    var RETURN_CLAIMED_MAKE = _("Claim returned");
11
    var RETURN_CLAIMED_MAKE = _("Claim returned");
12
    var RETURN_CLAIMED_NOTES = _("Notes about return claim");
12
    var RETURN_CLAIMED_NOTES = _("Notes about return claim");
13
    var CONFIRM_RETURN = _("Confirm");
13
    var NOT_CHECKED_OUT = _("not checked out");
14
    var NOT_CHECKED_OUT = _("not checked out");
14
    var TOO_MANY_RENEWALS = _("too many renewals");
15
    var TOO_MANY_RENEWALS = _("too many renewals");
15
    var ON_RESERVE = _("on hold");
16
    var ON_RESERVE = _("on hold");
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (+11 lines)
Lines 130-135 $(document).ready(function() { Link Here
130
            }, "json")
130
            }, "json")
131
        });
131
        });
132
132
133
        $(".confirm:checked:visible").each(function() {
134
            itemnumber = $(this).val();
135
            id = "#checkin_" + itemnumber;
136
            materials = $(this).data('materials');
137
138
            $(this).replaceWith("<span class='confirm' id='checkin_" + itemnumber + "'>" + CONFIRM_RETURN + " (<span>" + materials + "</span>): <input type='checkbox' class='checkin' name='checkin' value='" + itemnumber +"'></input></span>");
139
            $(id).parent().parent().addClass('warn');
140
        });
141
133
        $(".renew:checked:visible").each(function() {
142
        $(".renew:checked:visible").each(function() {
134
            var override_limit = $("#override_limit").is(':checked') ? 1 : 0;
143
            var override_limit = $("#override_limit").is(':checked') ? 1 : 0;
135
144
Lines 543-548 $(document).ready(function() { Link Here
543
                    "mDataProp": function ( oObj ) {
552
                    "mDataProp": function ( oObj ) {
544
                        if ( oObj.can_renew_error == "on_reserve" ) {
553
                        if ( oObj.can_renew_error == "on_reserve" ) {
545
                            return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>";
554
                            return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>";
555
                        } else if ( oObj.materials ) {
556
                            return "<input type='checkbox' class='confirm' id='confirm_" + oObj.itemnumber + "' name='confirm' value='" + oObj.itemnumber + "' data-materials='" + oObj.materials.escapeHtml() + "'></input>";
546
                        } else {
557
                        } else {
547
                            return "<input type='checkbox' class='checkin' id='checkin_" + oObj.itemnumber + "' name='checkin' value='" + oObj.itemnumber +"'></input>";
558
                            return "<input type='checkbox' class='checkin' id='checkin_" + oObj.itemnumber + "' name='checkin' value='" + oObj.itemnumber +"'></input>";
548
                        }
559
                        }
(-)a/svc/checkouts (-1 / +8 lines)
Lines 104-109 my $sql = ' Link Here
104
        items.damaged,
104
        items.damaged,
105
        items.location,
105
        items.location,
106
        items.enumchron,
106
        items.enumchron,
107
        items.materials,
107
108
108
        DATEDIFF( issues.issuedate, CURRENT_DATE() ) AS not_issued_today,
109
        DATEDIFF( issues.issuedate, CURRENT_DATE() ) AS not_issued_today,
109
110
Lines 139-144 $sth->execute(@parameters); Link Here
139
140
140
my $item_level_itypes = C4::Context->preference('item-level_itypes');
141
my $item_level_itypes = C4::Context->preference('item-level_itypes');
141
my $claims_returned_lost_value = C4::Context->preference('ClaimReturnedLostValue');
142
my $claims_returned_lost_value = C4::Context->preference('ClaimReturnedLostValue');
143
my $confirm_parts_required = C4::Context->preference("CircConfirmItemParts");
142
144
143
my @checkouts_today;
145
my @checkouts_today;
144
my @checkouts_previous;
146
my @checkouts_previous;
Lines 186-191 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
186
        my $av = Koha::AuthorisedValues->search({ category => 'DAMAGED', authorised_value => $c->{damaged} });
188
        my $av = Koha::AuthorisedValues->search({ category => 'DAMAGED', authorised_value => $c->{damaged} });
187
        $damaged = $av->count ? $av->next->lib : '';
189
        $damaged = $av->count ? $av->next->lib : '';
188
    }
190
    }
191
    my $materials;
192
    if ( $c->{materials} && $confirm_parts_required ) {
193
        my $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => '', kohafield =>'items.materials', authorised_value => $c->{materials} });
194
        $materials = $descriptions->{lib} // $c->{materials};
195
    }
189
    my @subtitles = split(/ \| /, $c->{'subtitle'} // '' );
196
    my @subtitles = split(/ \| /, $c->{'subtitle'} // '' );
190
    my $checkout = {
197
    my $checkout = {
191
        DT_RowId             => $c->{itemnumber} . '-' . $c->{borrowernumber},
198
        DT_RowId             => $c->{itemnumber} . '-' . $c->{borrowernumber},
Lines 248-253 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
248
        lost    => $lost,
255
        lost    => $lost,
249
        claims_returned => $claims_returned,
256
        claims_returned => $claims_returned,
250
        damaged => $damaged,
257
        damaged => $damaged,
258
        materials => $materials,
251
        borrower => {
259
        borrower => {
252
            surname    => $c->{surname},
260
            surname    => $c->{surname},
253
            firstname  => $c->{firstname},
261
            firstname  => $c->{firstname},
254
- 

Return to bug 25261