Attachment #135927 for bug #24860

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

Lines 58-63 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (+3 lines)
58	</strong>	58	</strong>
59	[% END %]	59	[% END %]
60	[% HOLD.biblio.author \| html %]	60	[% HOLD.biblio.author \| html %]
		61	[% IF HOLD.item_group_id %]
		62	<p>Next available item from item group: <strong>[% HOLD.item_group.description \| html %]</strong></p>
		63	[% END %]
61	[% IF HOLD.item_level_hold %]	64	[% IF HOLD.item_level_hold %]
62	<p class="hint">Item on hold: [% HOLD.item.barcode \| html %]</p>	65	<p class="hint">Item on hold: [% HOLD.item.barcode \| html %]</p>
63	[% END %]	66	[% END %]




                                                    </li>
                                                [% END %]

                                                [% UNLESS bibitemloo.forced_hold_level && ( bibitemloo.forced_hold_level == 'item' || bibitemloo.forced_hold_level == 'record' ) %]
                                                    [% IF bibitemloo.object.item_groups %]
                                                        <li>
                                                            <label for="itemtype">Request specific item group:</label>
                                                            <select name="item_group_id_[% bibitemloo.biblionumber | html %]" id="item_group_id_[% bibitemloo.biblionumber | html %]">
                                                                <option value="">Any item group</option>
                                                                [% FOREACH g IN bibitemloo.object.item_groups.search({}, { order_by => ['display_order'] }) %]
                                                                    <option value="[% g.id | html %]">[% g.description | html %]</option>
                                                                [% END %]
                                                            </select>
                                                        </li>
                                                    [% END %]
                                                [% END %]

                                                [% IF ( OpacHoldNotes ) %]
                                                    <li>
                                                        <div class="notesrow" id="notesrow_[% bibitemloo.biblionumber | html %]">

                                                [% IF bibitemloo.itemholdable %]
                                                    <!-- ITEM HOLDS -->
                                                    <li class="lradio place_on_type" style="display:none;">
                                                        [% UNLESS bibitemloo.forced_hold_level == 'item' || bibitemloo.forced_hold_level == 'item_group' %]
                                                            <label class="radio inline" for="reqany_[% bibitemloo.biblionumber | html %]">Next available item</label>
                                                            <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
                                                                    id="reqany_[% bibitemloo.biblionumber | html %]"

            var select_specific = $("#reqspecific_"+biblioNum).is(":checked");
            // If the checkbox is checked AND we want a specific item, we display the items block
            if ( $(checkbox).is(":checked") && select_specific ) {
                if ( $(`#item_group_id_${biblioNum}`).length ) {
                    $(`#item_group_id_${biblioNum}`).val("").attr('disabled', 'disabled');
                }
                $(newCopiesRowId).show();
            } else {
                if ( $(`#item_group_id_${biblioNum}`).length ) {
                    $(`#item_group_id_${biblioNum}`).removeAttr('disabled');
                }
                $(newCopiesRowId).hide();
            }
        };

        $("#place_on_hdr").show();




            $itemNum = undef;
        }
        my $notes = $query->param('notes_'.$biblioNum)||'';
        my $item_group_id = $query->param("item_group_id_$biblioNum") || undef;

        if (   $maxreserves
            && $reserve_cnt >= $maxreserves )

                    itemnumber       => $itemNum,
                    found            => $found,
                    itemtype         => $itemtype,
                    item_group_id    => $item_group_id,
                }
            );
            $failed_holds++ unless $reserve_id;

    $biblioLoopIter{reservecount} = $biblioData->{reservecount};
    $biblioLoopIter{already_reserved} = $biblioData->{already_reserved};
    $biblioLoopIter{reqholdnotes}=0; #TODO: For future use
    $biblioLoopIter{object} = $biblio;

    if (!$itemLevelTypes && $biblioData->{itemtype}) {
        $biblioLoopIter{translated_description} = $itemtypes->{$biblioData->{itemtype}}{translated_description};

    )->forced_hold_level();
    if ($forced_hold_level) {
        $biblioLoopIter{force_hold}   = 1 if $forced_hold_level eq 'item';
        $biblioLoopIter{force_hold}   = 0 if $forced_hold_level eq 'item_group';
        $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
        $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'item_group';
        $biblioLoopIter{forced_hold_level} = $forced_hold_level;
    }

- 

Return to bug 24860

Lines 306-311 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-2 / +22 lines)
306	</li>	306	</li>
307	[% END %]	307	[% END %]
308		308
		309	[% UNLESS bibitemloo.forced_hold_level && ( bibitemloo.forced_hold_level == 'item' \|\| bibitemloo.forced_hold_level == 'record' ) %]
		310	[% IF bibitemloo.object.item_groups %]
		311	<li>
		312	<label for="itemtype">Request specific item group:</label>
		313	<select name="item_group_id_[% bibitemloo.biblionumber \| html %]" id="item_group_id_[% bibitemloo.biblionumber \| html %]">
		314	<option value="">Any item group</option>
		315	[% FOREACH g IN bibitemloo.object.item_groups.search({}, { order_by => ['display_order'] }) %]
		316	<option value="[% g.id \| html %]">[% g.description \| html %]</option>
		317	[% END %]
		318	</select>
		319	</li>
		320	[% END %]
		321	[% END %]
		322
309	[% IF ( OpacHoldNotes ) %]	323	[% IF ( OpacHoldNotes ) %]
310	<li>	324	<li>
311	<div class="notesrow" id="notesrow_[% bibitemloo.biblionumber \| html %]">	325	<div class="notesrow" id="notesrow_[% bibitemloo.biblionumber \| html %]">
Lines 321-327 Link Here
321	[% IF bibitemloo.itemholdable %]	335	[% IF bibitemloo.itemholdable %]
322	<!-- ITEM HOLDS -->	336	<!-- ITEM HOLDS -->
323	<li class="lradio place_on_type" style="display:none;">	337	<li class="lradio place_on_type" style="display:none;">
324	[% IF NOT bibitemloo.force_hold %]	338	[% UNLESS bibitemloo.forced_hold_level == 'item' \|\| bibitemloo.forced_hold_level == 'item_group' %]
325	<label class="radio inline" for="reqany_[% bibitemloo.biblionumber \| html %]">Next available item</label>	339	<label class="radio inline" for="reqany_[% bibitemloo.biblionumber \| html %]">Next available item</label>
326	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"	340	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"
327	id="reqany_[% bibitemloo.biblionumber \| html %]"	341	id="reqany_[% bibitemloo.biblionumber \| html %]"
Lines 591-600 Link Here
591	var select_specific = $("#reqspecific_"+biblioNum).is(":checked");	605	var select_specific = $("#reqspecific_"+biblioNum).is(":checked");
592	// If the checkbox is checked AND we want a specific item, we display the items block	606	// If the checkbox is checked AND we want a specific item, we display the items block
593	if ( $(checkbox).is(":checked") && select_specific ) {	607	if ( $(checkbox).is(":checked") && select_specific ) {
		608	if ( $(`#item_group_id_${biblioNum}`).length ) {
		609	$(`#item_group_id_${biblioNum}`).val("").attr('disabled', 'disabled');
		610	}
594	$(newCopiesRowId).show();	611	$(newCopiesRowId).show();
595	} else {	612	} else {
		613	if ( $(`#item_group_id_${biblioNum}`).length ) {
		614	$(`#item_group_id_${biblioNum}`).removeAttr('disabled');
		615	}
596	$(newCopiesRowId).hide();	616	$(newCopiesRowId).hide();
597	}	617	}
598	};	618	};
599		619
600	$("#place_on_hdr").show();	620	$("#place_on_hdr").show();

Lines 290-295 if ( $query->param('place_reserve') ) { Link Here

(-)a/opac/opac-reserve.pl (-1 / +5 lines)
290	$itemNum = undef;	290	$itemNum = undef;
291	}	291	}
292	my $notes = $query->param('notes_'.$biblioNum)\|\|'';	292	my $notes = $query->param('notes_'.$biblioNum)\|\|'';
		293	my $item_group_id = $query->param("item_group_id_$biblioNum") \|\| undef;
293		294
294	if ( $maxreserves	295	if ( $maxreserves
295	&& $reserve_cnt >= $maxreserves )	296	&& $reserve_cnt >= $maxreserves )
Lines 321-326 if ( $query->param('place_reserve') ) { Link Here
321	itemnumber => $itemNum,	322	itemnumber => $itemNum,
322	found => $found,	323	found => $found,
323	itemtype => $itemtype,	324	itemtype => $itemtype,
		325	item_group_id => $item_group_id,
324	}	326	}
325	);	327	);
326	$failed_holds++ unless $reserve_id;	328	$failed_holds++ unless $reserve_id;
Lines 442-447 foreach my $biblioNum (@biblionumbers) { Link Here
442	$biblioLoopIter{reservecount} = $biblioData->{reservecount};	444	$biblioLoopIter{reservecount} = $biblioData->{reservecount};
443	$biblioLoopIter{already_reserved} = $biblioData->{already_reserved};	445	$biblioLoopIter{already_reserved} = $biblioData->{already_reserved};
444	$biblioLoopIter{reqholdnotes}=0; #TODO: For future use	446	$biblioLoopIter{reqholdnotes}=0; #TODO: For future use
		447	$biblioLoopIter{object} = $biblio;
445		448
446	if (!$itemLevelTypes && $biblioData->{itemtype}) {	449	if (!$itemLevelTypes && $biblioData->{itemtype}) {
447	$biblioLoopIter{translated_description} = $itemtypes->{$biblioData->{itemtype}}{translated_description};	450	$biblioLoopIter{translated_description} = $itemtypes->{$biblioData->{itemtype}}{translated_description};
Lines 668-674 foreach my $biblioNum (@biblionumbers) { Link Here
668	)->forced_hold_level();	671	)->forced_hold_level();
669	if ($forced_hold_level) {	672	if ($forced_hold_level) {
670	$biblioLoopIter{force_hold} = 1 if $forced_hold_level eq 'item';	673	$biblioLoopIter{force_hold} = 1 if $forced_hold_level eq 'item';
		674	$biblioLoopIter{force_hold} = 0 if $forced_hold_level eq 'item_group';
671	$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';	675	$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
		676	$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'item_group';
672	$biblioLoopIter{forced_hold_level} = $forced_hold_level;	677	$biblioLoopIter{forced_hold_level} = $forced_hold_level;
673	}	678	}
674		679
675	-