Attachment #84541 for bug #15565

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

Lines 16-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-5 / +11 lines)
16	[% END %]	16	[% END %]
17	[% INCLUDE 'doc-head-close.inc' %]	17	[% INCLUDE 'doc-head-close.inc' %]
18	[% Asset.css("css/datatables.css") \| $raw %]	18	[% Asset.css("css/datatables.css") \| $raw %]
		19
19	</head>	20	</head>
20		21
21	<body id="circ_request" class="catalog">	22	<body id="circ_request" class="catalog">
Lines 317-325 Link Here
317	Hold must be record level	318	Hold must be record level
318	</span>	319	</span>
319	[% ELSIF ( itemloo.available ) %]	320	[% ELSIF ( itemloo.available ) %]
320	<input type="radio" name="checkitem" value="[% itemloo.itemnumber \| html %]" />	321	<input type="checkbox" name="checkitem" value="[% itemloo.itemnumber %]" />
321	[% ELSIF ( itemloo.override ) %]	322	[% ELSIF ( itemloo.override ) %]
322	<input type="radio" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber \| html %]" />	323	<input type="checkbox" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber %]" />
323	<i class="fa fa-exclamation-triangle fa-lg" style="color:gold" alt="Requires override of hold policy"/></i>	324	<i class="fa fa-exclamation-triangle fa-lg" style="color:gold" alt="Requires override of hold policy"/></i>
324	[% ELSE %]	325	[% ELSE %]
325	<span class="error">	326	<span class="error">
Lines 671-676 Link Here
671	[% END %][% END %][% END %]	672	[% END %][% END %][% END %]
672	};	673	};
673	var MSG_NO_ITEMS_AVAILABLE = _("A hold cannot be requested on any of these items.");	674	var MSG_NO_ITEMS_AVAILABLE = _("A hold cannot be requested on any of these items.");
		675	var MSG_EXCEEDED_HOLDS_PER_RECORD = _("Patron has exceeded the number of holds for this record.");
		676	var remainingHolds = "[% remaining_holds_for_record %]";
674		677
675	$(document).ready(function() {	678	$(document).ready(function() {
676	function ToggleHoldsToPlace() {	679	function ToggleHoldsToPlace() {
Lines 795-811 Link Here
795	}	798	}
796	});	799	});
797	$("input[name=checkitem]").click(function() {	800	$("input[name=checkitem]").click(function() {
798	onechecked = 0;	801	numchecked = 0;
799	$("input[name=checkitem]").each(function() {	802	$("input[name=checkitem]").each(function() {
800	if(this.checked){	803	if(this.checked){
801	onechecked = 1;	804	numchecked = 1;
802	}	805	}
803	});	806	});
804	if(onechecked == 1){	807	if(numchecked == 1){
805	$("#requestany").prop("checked", false);	808	$("#requestany").prop("checked", false);
806	} else {	809	} else {
807	$("#requestany").prop("checked",true);	810	$("#requestany").prop("checked",true);
808	}	811	}
		812	if (remainingHolds - numchecked < 0) {
		813	alert(MSG_EXCEEDED_HOLDS_PER_RECORD);
		814	}
809	});	815	});
810	var prev_rank_request;	816	var prev_rank_request;
811	$("select[name=rank-request]").on("focus", function() {	817	$("select[name=rank-request]").on("focus", function() {




                        <form action="/cgi-bin/koha/opac-reserve.pl" method="post" id="hold-request-form">
                            <input type="hidden" name="place_reserve" value="1"/>
                            <!-- These values are set dynamically by js -->
                            <input type="hidden" name="biblionumbers" id="biblionumbers"/>
                            <input type="hidden" name="selecteditems" id="selections"/>
                            <div id="bigloop">

                                [% FOREACH bibitemloo IN bibitemloop %]
                                    <div class="holdrow">
                                        <input id="remaining_holds_[% bibitemloo.biblionumber %]" type="hidden" value="[% bibitemloo.remaining_holds_for_record %]"/>
                                        <p>
                                            [% IF ( bibitemloo.holdable ) %]
                                                <span title="[% bibitemloo.biblionumber %]" style="padding:.3em">
                                                    <label>
                                                        <input class="biblionumbers" name="biblionumbers" type="checkbox" value="[% bibitemloo.biblionumber %]" checked="checked">
                                                        Place a hold on
                                                    </label>
                                                    <label class="confirm_label" for="single_[% bibitemloo.biblionumber | html %]">Place a hold on </label>
                                                </span>
                                            [% END # / bibitemloo.holdable %]


                                                            <li class="branch">
                                                                <label for="branch_[% bibitemloo.biblionumber | html %]">Pick up location:</label>
                                                                [% UNLESS ( bibitemloo.holdable ) %]
                                                                    <select name="branch_[% bibitemloo.biblionumber %]" id="branch_[% bibitemloo.biblionumber | html %]" disabled="disabled">
                                                                        [% PROCESS options_for_libraries libraries => Branches.pickup_locations( biblio => bibitemloo.biblionumber, selected => branch ) %]
                                                                    </select>
                                                                [% ELSE %]

                                                            </li>
                                                        [% END # / IF OpacHoldNotes %]

                                                        <!-- ITEM HOLDS -->
                                                        <li class="lradio place_on_type" style="display:none;">
                                                                <label class="radio inline" for="reqany_[% bibitemloo.biblionumber %]">Next available item</label>
                                                                <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
                                                                        id="reqany_[% bibitemloo.biblionumber %]"
                                                                        class="selectany"
                                                                        value="Any"
                                                                        checked="checked"
                                                                            value="Any"
                                                                            checked="checked"
                                                                    />
                                                                [% END %]
                                                                <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber | html %]">A specific item</label>
                                                                <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
                                                                       id="reqspecific_[% bibitemloo.biblionumber | html %]"
                                                                       class="selectspecific"
                                                                       value="Specific"
                                                                />
                                                            <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber %]">A specific item</label>
                                                            <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
                                                                   id="reqspecific_[% bibitemloo.biblionumber %]"
                                                                   class="selectspecific"
                                                                   value="Specific"
                                                            />
                                                        </li>
                                                    </ul>

                                                    [% IF bibitemloo.remaining_holds_for_record > 1 %]
                                                        [% SET count = 1 %]
                                                        <div id="holds_to_place_[% bibitemloo.biblionumber %]" class="hold-options holds-to-place">
                                                            <label>Holds to place (count)</label>
                                                            <select name="holds_to_place_count_[% bibitemloo.biblionumber %]">
                                                            [% WHILE count <= bibitemloo.remaining_holds_for_record %]
                                                                <option value="[% count %]">[% count %]</option>
                                                                [% SET count = count + 1 %]
                                                            [% END %]
                                                            </select>
                                                        </div>
                                                    [% ELSE %]
                                                        <input type="hidden" name="holds_to_place_count_[% bibitemloo.biblionumber %]" value="1" />
                                                    [% END %]

                                                        <table class="copiesrow table table-bordered table-striped" id="copiesrow_[% bibitemloo.biblionumber %]">
                                                            <caption>Select a specific item:</caption>
                                                            <tr>
                                                                <th>Copy number</th>

                                                                <tr class="[% itemLoo.backgroundcolor | html %]">
                                                                    <td class="copynumber">
                                                                        [% IF ( itemLoo.available ) %]
                                                                            <input type="checkbox" class="checkitem checkitem_[% bibitemloo.biblionumber %]" name="checkitem_[% bibitemloo.biblionumber %]" value="[% itemLoo.itemnumber %]" />
                                                                        [% ELSE %]
                                                                            <input disabled="disabled" type="checkbox" class="checkitem" name="checkitem" value="[% itemLoo.itemnumber %]"
                                                                                   style="display:none;" />
                                                                            <img src="[% interface | html %]/lib/famfamfam/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />
                                                                        [% END %]

                                                                    </td>
                                                                </tr>
                                                            [% END # / FOREACH itemLoo IN bibitemloo.itemLoop%]
                                                        </table> <!-- / #copiesrow_[% bibitemloo.biblionumber %] -->
                                                </div> <!-- / #hold-options-[% bibitemloo.biblionumber %] -->
                                                </div> <!-- / #hold-options-[% bibitemloo.biblionumber | html %] -->
                                            </fieldset>
                                        [% END # / IF ( bibitemloo.holdable ) %]
                                    </div> <!-- / .holdrow -->

<script>
// <![CDATA[
    var MSG_NO_ITEM_SELECTED = _("Expecting a specific item selection.");
    var MSG_MAX_HOLDS_EXCEEDED = _("Maximum number of reserve exceded.");

        // Clear the contents of an input field
        $(".clearfield").on("click",function(e){


    // Select the first item available
    function select_first_available(id){
        var checkboxes = $("input:checkbox[name='checkitem_" + id + "']");
        $(checkboxes).first().attr("checked", "checked");
    }

    $(document).ready(function() {

            }
        });

        $('.checkitem').click(function(e) {
            var bibNum = suffixOf($(this).attr("name"), "_");
            var nbCheked = $("input[name='checkitem_"+bibNum+"']:checked").length;
            var remaining = $("input[id='remaining_holds_"+bibNum+"']").val();
            if (nbCheked >= remaining) {
                $("input[name='checkitem_"+bibNum+"']:not(:checked)").attr('disabled', 'disabled');
            }
            else {
                $('.checkitem_'+bibNum).attr('disabled', false);
            }
        });

        $(".toggle-hold-options").on("click",function(e){

        // Hides all 'specific copy' table rows on load.
        $(".copiesrow").hide();

        $(".holds-to-place").show();
        [% FOREACH bibitemloo IN bibitemloop %]
            [% IF bibitemloo.force_hold %]
                [% IF bibitemloo.force_hold == 'item' %]
                    $("#toggle-hold-options-[% bibitemloo.biblionumber %]").click();
                    $("#reqspecific_[% bibitemloo.biblionumber %]").attr('checked', true);
                    $("#holds_to_place_[% bibitemloo.biblionumber %]").hide();
                    $("#copiesrow_[% bibitemloo.biblionumber %]").show();
                [% ELSIF bibitemloo.force_hold == 'record' %]
                    $("#toggle-hold-options-[% bibitemloo.biblionumber %]").click();
                    $("#reqany_[% bibitemloo.biblionumber %]").attr('checked', true);
                [% END %]
                $("#reqany_[% bibitemloo.biblionumber %]").attr('disabled', 'disabled');
                $("#reqspecific_[% bibitemloo.biblionumber %]").attr('disabled', 'disabled');
            [% END %]
            [% IF bibitemloo.reqholdnotes %]
                $("#holdnotes_[% bibitemloo.biblionumber %]").attr( 'required', true );
            [% END %]
        [% END %]

        $(".date-format").each(function(){

            $("#" + op + fieldID).val("");
        });

        // Replace non-JS single-selection with multi-selection capability.
        $(".reserve_mode").val("multi");
        $(".confirm_nonjs").remove();
        $(".confirmjs_hold").each(function(){
            var bib = $(this).attr("title");
            var html = "<label><input type =\"checkbox\" class=\"confirmjs\" checked=\"checked\"";
            html += "value=\"" + bib + "\" id=\"" + bib + "\" /> " + _("Place a hold on") + " </label> ";
            $(this).html(html);
        });
        $(".confirmjs_nohold").each(function(){
            var bib = $(this).attr("title");
            var html = "<label><input type =\"checkbox\" class=\"confirmjs\" disabled=\"disabled\"";
            html += "value=\"" + bib + "\" id=\"" + bib + "\" />" + _("Place a hold on: ") + "</label>";
            $(this).html(html);
        });

        // expand or collapse the copiesrow tr
        function toggle_copiesrow(biblioNum) {
            var checkbox = $("input:checkbox[value='"+biblioNum+"']");
            newCopiesRowId = "#copiesrow_" + biblioNum;
            holdsToPlaceCountId = "#holds_to_place_" + biblioNum;
            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 ) {
                $(newCopiesRowId).show();
                $(holdsToPlaceCountId).hide();
            } else {
                $(newCopiesRowId).hide();
                $(holdsToPlaceCountId).show();
             }
        };

        function total_requested() {
            var total = 0;
            $("input[name='biblionumbers']:checked").each(function() {
                var biblioNum = $(this).val();
                if ($("#reqspecific_" + biblioNum + ":checked").size() > 0) {
                    total += parseInt($("input[name='checkitem_'"+biblioNum+"]:checked").length);
                } else {
                    total += parseInt($("select[name='holds_to_place_count_"+biblioNum+"']").val());
                }
            });
            return total;
        }

        $(".place_on_type").show();
        // onload, selectany is checked
        $(".selectany").attr("checked", "checked");

        // If the user is *allowed* to choose a specific item
        // The first one is preselected

            select_first_available(id);
        });

        // On biblionumbers change
        $(".biblionumbers").change(function(){
            var id = suffixOf($(this).attr("id"), "_");
            // If I m checked, I enable radio buttons
            if ( $(this).is(":checked") ) {

            toggle_copiesrow(id);
        });

        // Show or hide holds notes
        $(".shownotes").click(function(){
            biblioNum = suffixOf($(this).attr("id"), "_");
            $("#notesrow_"+biblioNum).toggle();
        });

        // When 'Place Hold' button is clicked
        $(".placehold").click(function(){
            if (total_requested() + [% reserves_count %] > [% maxreserves %]) {
                alert(MSG_MAX_HOLDS_EXCEEDED);
                return false;
            }
                if ($(".confirmjs:checked").size() > [% new_reserves_allowed | html %] ) {
                    alert(MSG_MAX_HOLDS_EXCEEDED);
                    return false;
                }
            [% END %]

            if ($("input[name='biblionumbers']:checked").size() == 0) {
                alert(MSG_NO_RECORD_SELECTED);
                return false;
            }

            // Find the items with the 'Hold' box checked
            var badBib = null;
            $("input[name='biblionumbers']:checked").each(function() {
                var biblioNum = $(this).val();
                biblionumbers += biblioNum + "/";
                selections += biblioNum + "/";

                // If required hold note is empty, make it visible
                if( $("#holdnotes_"+biblioNum).attr( 'required' ) && $("#holdnotes_"+biblioNum).val() == '' ) {

                        alert(MSG_NO_ITEM_SELECTED);
                        badBib = biblioNum;
                        return false;
                    } else {
                      selections += $(item).val();
                    }
                }
                selections += "/";

                // Add the pickup location
                var branchSel = $("#branch_" + biblioNum);
                if (branchSel.size() > 0) {
                    selections += $(branchSel).val();
                }
                selections += "/";
                return true;
            });


                return false;
            }

            $("#selections").val(selections);
            $("#biblionumbers").val(biblionumbers);

            return true;
        });






my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };

# Coming from opac-search biblionumbers param is a string, coming from
# opac-reserve, it's an array.
my @biblionumbers = ref($query->param('biblionumbers')) eq 'Array'
    ? $query->param('biblionumbers')
    : split(/\//, $query->param('biblionumbers'));

unless (@biblionumbers) {
    push(@biblionumbers, $query->param('biblionumber'));
if (! $biblionumbers) {
    $biblionumbers = $query->param('biblionumber');
}

if ((! $biblionumbers) && (! $query->param('place_reserve'))) {
    $template->param(message=>1, no_biblionumber=>1);
    &get_out($query, $cookie, $template->output);
}

# Pass the numbers to the page so they can be fed back
# when the hold is confirmed. TODO: Not necessary?
$template->param( biblionumbers => @biblionumbers );

# Each biblio number is suffixed with '/', e.g. "1/2/3/"
my @biblionumbers = split /\//, $biblionumbers;
if (($#biblionumbers < 0) && (! $query->param('place_reserve'))) {
    # TODO: New message?
    $template->param(message=>1, no_biblionumber=>1);
    &get_out($query, $cookie, $template->output);
}


# pass the pickup branch along....

        $reserve_cnt = $patron->holds->count;
    }

    # List is composed of alternating biblio/item/branch
    my $selectedItems = $query->param('selecteditems');

    if ($query->param('reserve_mode') eq 'single') {
        # This indicates non-JavaScript mode, so there was
        # only a single biblio number selected.
        my $bib = $query->param('single_bib');
        my $item = $query->param("checkitem_$bib");
        if ($item eq 'any') {
            $item = '';
        }
        my $branch = $query->param('branch');
        $selectedItems = "$bib/$item/$branch/";
    }

    $selectedItems =~ s!/$!!;
    my @selectedItems = split /\//, $selectedItems, -1;

    # Make sure there is a biblionum/itemnum/branch triplet for each item.
    # The itemnum can be 'any', meaning next available.
    my $selectionCount = @selectedItems;
    if (($selectionCount == 0) || (($selectionCount % 3) != 0)) {
        $template->param(message=>1, bad_data=>1);
        &get_out($query, $cookie, $template->output);
    }

    my $failed_holds = 0;
    foreach my $biblioNum (@biblionumbers) {
        my $itemNum = $query->param("checkitem_$biblioNum");
        my @itemnumbers = $query->param("checkitem_$biblioNum");
        my $branch = $query->param("branch_$biblioNum");
        my $reqtype = $query->param("reqtype_$biblioNum");
        my $holds_to_place_count = $query->param("holds_to_place_count_$biblioNum") || 1;
        my $notes = $query->param('notes_'.$biblioNum) || '';
        my $nbRequested = $reqtype eq 'Specific' ? @itemnumbers : $holds_to_place_count;

        my $canreserve = 1;
        if (   $maxreserves
            && $reserve_cnt + $nbRequested >= $maxreserves )
        {
            $canreserve = 0;
        }

        my $singleBranchMode = Koha::Libraries->search->count == 1;
        if ( $singleBranchMode || ! C4::Context->preference("OPACAllowUserToChooseBranch") )

            $branch = $patron->branchcode;
        }

#item may belong to a host biblio, if yes change biblioNum to hosts bilbionumber
        if ( $itemNum ne '' ) {
            my $item = Koha::Items->find( $itemNum );
            my $hostbiblioNum = $item->biblio->biblionumber;


        my $expiration_date = $query->param("expiration_date_$biblioNum");

        # If a specific item was selected and the pickup branch is the same as the
        # holdingbranch, force the value $rank and $found.
        my $rank = $biblioData->{rank};
        if ( $reqtype eq 'Specific') {
            foreach my $itemnumber (@itemnumbers) {
                my $biblionumber = $biblioNum;

                #item may belong to a host biblio, if yes change biblioNum to hosts bilbionumber
                my $hostbiblioNum = GetBiblionumberFromItemnumber($itemnumber);
                if ( $hostbiblioNum ne $biblioNum ) {
                    $biblionumber = $hostbiblioNum;
                }

                $canreserve = 0 unless CanItemBeReserved( $borrowernumber, $itemnumber ) eq 'OK';
                $rank = '0' unless C4::Context->preference('ReservesNeedReturns');
                my $item = GetItem($itemnumber);
                if ( $item->{'holdingbranch'} eq $branch ) {
                    $found = 'W'
                      unless C4::Context->preference('ReservesNeedReturns');
                }

                if ($canreserve) {
                    my $reserve_id = AddReserve(
                        $branch,         $borrowernumber,
                        $biblionumber,
                        [$biblionumber], $rank,
                        $startdate,      $expiration_date,
                        $notes,          $biblioData->{title},
                        $itemnumber,     $found
                    );
                    $failed_holds++ unless $reserve_id;
                    ++$reserve_cnt;
                }
            }
            print $query->redirect("/cgi-bin/koha/opac-user.pl?" . ( $failed_holds ? "failed_holds=$failed_holds" : q|| ) . "#opac-user-holds");
            exit;
        }
        $canreserve = 0 unless CanBookBeReserved( $borrowernumber, $biblioNum ) eq 'OK';

        unless ( $can_place_hold_if_available_at_pickup ) {
            my $items_in_this_library = Koha::Items->search({ biblionumber => $biblioNum, holdingbranch => $branch });


        # Here we actually do the reserveration. Stage 3.
        if ($canreserve) {
            for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
                my $reserve_id = AddReserve(
                    $branch,          $borrowernumber, $biblioNum,
                    [$biblioNum],     $rank,           $startdate,
                    $expiration_date, $notes,          $biblioData->{title},
                    $itemNum,         $found,          $itemtype,
                );
                $failed_holds++ unless $reserve_id;
                ++$reserve_cnt;
            }
        }
    }


}

unless ( $noreserves ) {
    $template->param(
        maxreserves => $maxreserves,
        reserves_count => $reserves_count
    );
    my $requested_reserves_count = scalar( @biblionumbers );
    if ( $maxreserves && ( $reserves_count + $requested_reserves_count > $maxreserves ) ) {
        $template->param( new_reserves_allowed => $maxreserves - $reserves_count );

            if ( $opac_hold_policy ne 'N' ) { # If Y or F
                $itemLoopIter->{available} = 1;
                $numCopiesOPACAvailable++;
                $biblioLoopIter{force_hold} = 'item' if $opac_hold_policy eq 'F';
            }
            $numCopiesAvailable++;


    # patron placed a record level hold, all the holds the patron places must
    # be record level. If the patron placed an item level hold, all holds
    # the patron places must be item level
    my $holds = Koha::Holds->search(
        {
            borrowernumber => $borrowernumber,
            biblionumber   => $biblioNum,
            found          => undef,
        }
    );
    my $forced_hold_level = $holds->forced_hold_level();
    if ($forced_hold_level) {
        #$biblioLoopIter{force_hold}   = 1 if $forced_hold_level eq 'item';
        #$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
        $biblioLoopIter{force_hold} = $forced_hold_level;
    }

    my $max_holds_for_record = GetMaxPatronHoldsForRecord( $borrowernumber, $biblioNum );
    my $remaining_holds_for_record = $max_holds_for_record - $holds->count();
    $biblioLoopIter{remaining_holds_for_record} = $remaining_holds_for_record;


    push @$biblioLoop, \%biblioLoopIter;





my @rank           = $input->multi_param('rank-request');
my $type           = $input->param('type');
my $title          = $input->param('title');
my @checkitems     = $input->param('checkitem');
my $expirationdate = $input->param('expiration_date');
my $itemtype       = $input->param('itemtype') || undef;


my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ($biblionumber . '/');
my $bad_bibs = $input->param('bad_bibs');
my $holds_to_place_count = $input->param('holds_to_place_count') || 1;
$holds_to_place_count = scalar(@checkitems) if scalar(@checkitems);

my %bibinfos = ();
my @biblionumbers = split '/', $biblionumbers;

    $bibinfos{$bibnum} = \%bibinfo;
}

my @found;

foreach my $checkitem (@checkitems) {
    # if we have an item selectionned, and the pickup branch is the same as the holdingbranch
    # of the document, we force the value $rank and $found .
    $rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns');
    my $item = GetItem($checkitem);
    if ( $item->{'holdingbranch'} eq $branch ){
        push @found, 'W' unless C4::Context->preference('ReservesNeedReturns');
    }
}

if ( $type eq 'str8' && $borrower ) {


            }
        }

        if ( defined $checkitem && $checkitem ne '' ) {
            my $item = GetItem($checkitem);
            if ( $item->{'biblionumber'} ne $biblionumber ) {
                $biblionumber = $item->{'biblionumber'};
            }
        }

        if ($multi_hold) {
            my $bibinfo = $bibinfos{$biblionumber};
            AddReserve( $branch, $borrower->{'borrowernumber'},
                        $biblionumber, [$biblionumber],
                        $bibinfo->{rank}, $startdate, $expirationdate, $notes,$bibinfo->{title});
        } else {
            # place a request on 1st available
            for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
                my $item = GetItem($checkitems[$i]);
                AddReserve( $branch, $borrower->{'borrowernumber'},
                    $item->{biblionumber}, \@realbi, $rank[0], $startdate, $expirationdate, $notes, $title,
                    $checkitems[$i], $found[$i] );
            }
        }
    }
- 

Return to bug 15565

Lines 106-139 if ( $reservefee > 0){ Link Here

(-)a/opac/opac-reserve.pl (-83 / +83 lines)
106		106
107	my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };	107	my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
108		108
109	# There are two ways of calling this script, with a single biblio num	109	# Coming from opac-search biblionumbers param is a string, coming from
110	# or multiple biblio nums.	110	# opac-reserve, it's an array.
111	my $biblionumbers = $query->param('biblionumbers');	111	my @biblionumbers = ref($query->param('biblionumbers')) eq 'Array'
112	my $reserveMode = $query->param('reserve_mode');	112	? $query->param('biblionumbers')
113	if ($reserveMode && ($reserveMode eq 'single')) {	113	: split(/\//, $query->param('biblionumbers'));
114	my $bib = $query->param('single_bib');	114
115	$biblionumbers = "$bib/";	115	unless (@biblionumbers) {
116	}	116	push(@biblionumbers, $query->param('biblionumber'));
117	if (! $biblionumbers) {
118	$biblionumbers = $query->param('biblionumber');
119	}
120
121	if ((! $biblionumbers) && (! $query->param('place_reserve'))) {
122	$template->param(message=>1, no_biblionumber=>1);
123	&get_out($query, $cookie, $template->output);
124	}	117	}
125		118
126	# Pass the numbers to the page so they can be fed back	119	# Pass the numbers to the page so they can be fed back
127	# when the hold is confirmed. TODO: Not necessary?	120	# when the hold is confirmed. TODO: Not necessary?
128	$template->param( biblionumbers => $biblionumbers );	121	$template->param( biblionumbers => @biblionumbers );
129
130	# Each biblio number is suffixed with '/', e.g. "1/2/3/"
131	my @biblionumbers = split /\//, $biblionumbers;
132	if (($#biblionumbers < 0) && (! $query->param('place_reserve'))) {
133	# TODO: New message?
134	$template->param(message=>1, no_biblionumber=>1);
135	&get_out($query, $cookie, $template->output);
136	}
137		122
138		123
139	# pass the pickup branch along....	124	# pass the pickup branch along....
Lines 201-239 if ( $query->param('place_reserve') ) { Link Here
201	$reserve_cnt = $patron->holds->count;	186	$reserve_cnt = $patron->holds->count;
202	}	187	}
203		188
204	# List is composed of alternating biblio/item/branch
205	my $selectedItems = $query->param('selecteditems');
206
207	if ($query->param('reserve_mode') eq 'single') {
208	# This indicates non-JavaScript mode, so there was
209	# only a single biblio number selected.
210	my $bib = $query->param('single_bib');
211	my $item = $query->param("checkitem_$bib");
212	if ($item eq 'any') {
213	$item = '';
214	}
215	my $branch = $query->param('branch');
216	$selectedItems = "$bib/$item/$branch/";
217	}
218
219	$selectedItems =~ s!/$!!;
220	my @selectedItems = split /\//, $selectedItems, -1;
221
222	# Make sure there is a biblionum/itemnum/branch triplet for each item.
223	# The itemnum can be 'any', meaning next available.
224	my $selectionCount = @selectedItems;
225	if (($selectionCount == 0) \|\| (($selectionCount % 3) != 0)) {
226	$template->param(message=>1, bad_data=>1);
227	&get_out($query, $cookie, $template->output);
228	}
229
230	my $failed_holds = 0;	189	my $failed_holds = 0;
231	while (@selectedItems) {	190	foreach my $biblioNum (@biblionumbers) {
232	my $biblioNum = shift(@selectedItems);	191	my $itemNum = $query->param("checkitem_$biblioNum");
233	my $itemNum = shift(@selectedItems);	192	my @itemnumbers = $query->param("checkitem_$biblioNum");
234	my $branch = shift(@selectedItems); # i.e., branch code, not name	193	my $branch = $query->param("branch_$biblioNum");
235		194	my $reqtype = $query->param("reqtype_$biblioNum");
236	my $canreserve = 0;	195	my $holds_to_place_count = $query->param("holds_to_place_count_$biblioNum") \|\| 1;
		196	my $notes = $query->param('notes_'.$biblioNum) \|\| '';
		197	my $nbRequested = $reqtype eq 'Specific' ? @itemnumbers : $holds_to_place_count;
		198
		199	my $canreserve = 1;
		200	if ( $maxreserves
		201	&& $reserve_cnt + $nbRequested >= $maxreserves )
		202	{
		203	$canreserve = 0;
		204	}
237		205
238	my $singleBranchMode = Koha::Libraries->search->count == 1;	206	my $singleBranchMode = Koha::Libraries->search->count == 1;
239	if ( $singleBranchMode \|\| ! C4::Context->preference("OPACAllowUserToChooseBranch") )	207	if ( $singleBranchMode \|\| ! C4::Context->preference("OPACAllowUserToChooseBranch") )
Lines 241-247 if ( $query->param('place_reserve') ) { Link Here
241	$branch = $patron->branchcode;	209	$branch = $patron->branchcode;
242	}	210	}
243		211
244	#item may belong to a host biblio, if yes change biblioNum to hosts bilbionumber
245	if ( $itemNum ne '' ) {	212	if ( $itemNum ne '' ) {
246	my $item = Koha::Items->find( $itemNum );	213	my $item = Koha::Items->find( $itemNum );
247	my $hostbiblioNum = $item->biblio->biblionumber;	214	my $hostbiblioNum = $item->biblio->biblionumber;
Lines 263-285 if ( $query->param('place_reserve') ) { Link Here
263		230
264	my $expiration_date = $query->param("expiration_date_$biblioNum");	231	my $expiration_date = $query->param("expiration_date_$biblioNum");
265		232
		233	# If a specific item was selected and the pickup branch is the same as the
		234	# holdingbranch, force the value $rank and $found.
266	my $rank = $biblioData->{rank};	235	my $rank = $biblioData->{rank};
267	if ( $itemNum ne '' ) {	236	if ( $reqtype eq 'Specific') {
268	$canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum )->{status} eq 'OK';	237	foreach my $itemnumber (@itemnumbers) {
269	}	238	my $biblionumber = $biblioNum;
270	else {	239
271	$canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'OK';	240	#item may belong to a host biblio, if yes change biblioNum to hosts bilbionumber
		241	my $hostbiblioNum = GetBiblionumberFromItemnumber($itemnumber);
		242	if ( $hostbiblioNum ne $biblioNum ) {
		243	$biblionumber = $hostbiblioNum;
		244	}
272		245
273	# Inserts a null into the 'itemnumber' field of 'reserves' table.	246	$canreserve = 0 unless CanItemBeReserved( $borrowernumber, $itemnumber ) eq 'OK';
274	$itemNum = undef;	247	$rank = '0' unless C4::Context->preference('ReservesNeedReturns');
275	}	248	my $item = GetItem($itemnumber);
276	my $notes = $query->param('notes_'.$biblioNum)\|\|'';	249	if ( $item->{'holdingbranch'} eq $branch ) {
		250	$found = 'W'
		251	unless C4::Context->preference('ReservesNeedReturns');
		252	}
277		253
278	if ( $maxreserves	254	if ($canreserve) {
279	&& $reserve_cnt >= $maxreserves )	255	my $reserve_id = AddReserve(
280	{	256	$branch, $borrowernumber,
281	$canreserve = 0;	257	$biblionumber,
		258	[$biblionumber], $rank,
		259	$startdate, $expiration_date,
		260	$notes, $biblioData->{title},
		261	$itemnumber, $found
		262	);
		263	$failed_holds++ unless $reserve_id;
		264	++$reserve_cnt;
		265	}
		266	}
		267	print $query->redirect("/cgi-bin/koha/opac-user.pl?" . ( $failed_holds ? "failed_holds=$failed_holds" : q\|\| ) . "#opac-user-holds");
		268	exit;
282	}	269	}
		270	$canreserve = 0 unless CanBookBeReserved( $borrowernumber, $biblioNum ) eq 'OK';
283		271
284	unless ( $can_place_hold_if_available_at_pickup ) {	272	unless ( $can_place_hold_if_available_at_pickup ) {
285	my $items_in_this_library = Koha::Items->search({ biblionumber => $biblioNum, holdingbranch => $branch });	273	my $items_in_this_library = Koha::Items->search({ biblionumber => $biblioNum, holdingbranch => $branch });
Lines 295-308 if ( $query->param('place_reserve') ) { Link Here
295		283
296	# Here we actually do the reserveration. Stage 3.	284	# Here we actually do the reserveration. Stage 3.
297	if ($canreserve) {	285	if ($canreserve) {
298	my $reserve_id = AddReserve(	286	for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
299	$branch, $borrowernumber, $biblioNum,	287	my $reserve_id = AddReserve(
300	[$biblioNum], $rank, $startdate,	288	$branch, $borrowernumber, $biblioNum,
301	$expiration_date, $notes, $biblioData->{title},	289	[$biblioNum], $rank, $startdate,
302	$itemNum, $found, $itemtype,	290	$expiration_date, $notes, $biblioData->{title},
303	);	291	$itemNum, $found, $itemtype,
304	$failed_holds++ unless $reserve_id;	292	);
305	++$reserve_cnt;	293	$failed_holds++ unless $reserve_id;
		294	++$reserve_cnt;
		295	}
306	}	296	}
307	}	297	}
308		298
Lines 362-367 if ( $maxreserves && ( $reserves_count >= $maxreserves ) ) { Link Here
362	}	352	}
363		353
364	unless ( $noreserves ) {	354	unless ( $noreserves ) {
		355	$template->param(
		356	maxreserves => $maxreserves,
		357	reserves_count => $reserves_count
		358	);
365	my $requested_reserves_count = scalar( @biblionumbers );	359	my $requested_reserves_count = scalar( @biblionumbers );
366	if ( $maxreserves && ( $reserves_count + $requested_reserves_count > $maxreserves ) ) {	360	if ( $maxreserves && ( $reserves_count + $requested_reserves_count > $maxreserves ) ) {
367	$template->param( new_reserves_allowed => $maxreserves - $reserves_count );	361	$template->param( new_reserves_allowed => $maxreserves - $reserves_count );
Lines 536-542 foreach my $biblioNum (@biblionumbers) { Link Here
536	if ( $opac_hold_policy ne 'N' ) { # If Y or F	530	if ( $opac_hold_policy ne 'N' ) { # If Y or F
537	$itemLoopIter->{available} = 1;	531	$itemLoopIter->{available} = 1;
538	$numCopiesOPACAvailable++;	532	$numCopiesOPACAvailable++;
539	$biblioLoopIter{force_hold} = 1 if $opac_hold_policy eq 'F';	533	$biblioLoopIter{force_hold} = 'item' if $opac_hold_policy eq 'F';
540	}	534	}
541	$numCopiesAvailable++;	535	$numCopiesAvailable++;
542		536
Lines 603-620 foreach my $biblioNum (@biblionumbers) { Link Here
603	# patron placed a record level hold, all the holds the patron places must	597	# patron placed a record level hold, all the holds the patron places must
604	# be record level. If the patron placed an item level hold, all holds	598	# be record level. If the patron placed an item level hold, all holds
605	# the patron places must be item level	599	# the patron places must be item level
606	my $forced_hold_level = Koha::Holds->search(	600	my $holds = Koha::Holds->search(
607	{	601	{
608	borrowernumber => $borrowernumber,	602	borrowernumber => $borrowernumber,
609	biblionumber => $biblioNum,	603	biblionumber => $biblioNum,
610	found => undef,	604	found => undef,
611	}	605	}
612	)->forced_hold_level();	606	);
		607	my $forced_hold_level = $holds->forced_hold_level();
613	if ($forced_hold_level) {	608	if ($forced_hold_level) {
614	$biblioLoopIter{force_hold} = 1 if $forced_hold_level eq 'item';	609	#$biblioLoopIter{force_hold} = 1 if $forced_hold_level eq 'item';
615	$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';	610	#$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
		611	$biblioLoopIter{force_hold} = $forced_hold_level;
616	}	612	}
617		613
		614	my $max_holds_for_record = GetMaxPatronHoldsForRecord( $borrowernumber, $biblioNum );
		615	my $remaining_holds_for_record = $max_holds_for_record - $holds->count();
		616	$biblioLoopIter{remaining_holds_for_record} = $remaining_holds_for_record;
		617
618		618
619	push @$biblioLoop, \%biblioLoopIter;	619	push @$biblioLoop, \%biblioLoopIter;
620		620

Lines 151-170 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-105 / +95 lines)
151	<form action="/cgi-bin/koha/opac-reserve.pl" method="post" id="hold-request-form">	151	<form action="/cgi-bin/koha/opac-reserve.pl" method="post" id="hold-request-form">
152	<input type="hidden" name="place_reserve" value="1"/>	152	<input type="hidden" name="place_reserve" value="1"/>
153	<!-- These values are set dynamically by js -->	153	<!-- These values are set dynamically by js -->
154	<input type="hidden" name="biblionumbers" id="biblionumbers"/>
155	<input type="hidden" name="selecteditems" id="selections"/>
156	<div id="bigloop">	154	<div id="bigloop">
157		155
158	[% FOREACH bibitemloo IN bibitemloop %]	156	[% FOREACH bibitemloo IN bibitemloop %]
159	<div class="holdrow">	157	<div class="holdrow">
		158	<input id="remaining_holds_[% bibitemloo.biblionumber %]" type="hidden" value="[% bibitemloo.remaining_holds_for_record %]"/>
160	<p>	159	<p>
161	[% IF ( bibitemloo.holdable ) %]	160	[% IF ( bibitemloo.holdable ) %]
162	<input class="reserve_mode" name="reserve_mode" type="hidden" value="single"/>	161	<span title="[% bibitemloo.biblionumber %]" style="padding:.3em">
163	<input class="single_bib" name="single_bib" type="hidden" value="[% bibitemloo.biblionumber \| html %]"/>	162	<label>
164	<span class="confirmjs_hold" title="[% bibitemloo.biblionumber \| html %]" style="padding:.3em"></span>	163	<input class="biblionumbers" name="biblionumbers" type="checkbox" value="[% bibitemloo.biblionumber %]" checked="checked">
165	<span class="confirm_nonjs">	164	Place a hold on
166	<input type="radio" class="confirmbox checkitem [% bibitemloo.biblionumber \| html %]" name="[% bibitemloo.biblionumber \| html %]" checked="checked" id="single_[% bibitemloo.biblionumber \| html %]" value="any" />	165	</label>
167	<label class="confirm_label" for="single_[% bibitemloo.biblionumber \| html %]">Place a hold on </label>
168	</span>	166	</span>
169	[% END # / bibitemloo.holdable %]	167	[% END # / bibitemloo.holdable %]
170		168
Lines 230-236 Link Here
230	<li class="branch">	228	<li class="branch">
231	<label for="branch_[% bibitemloo.biblionumber \| html %]">Pick up location:</label>	229	<label for="branch_[% bibitemloo.biblionumber \| html %]">Pick up location:</label>
232	[% UNLESS ( bibitemloo.holdable ) %]	230	[% UNLESS ( bibitemloo.holdable ) %]
233	<select name="branch" id="branch_[% bibitemloo.biblionumber \| html %]" disabled="disabled">	231	<select name="branch_[% bibitemloo.biblionumber %]" id="branch_[% bibitemloo.biblionumber \| html %]" disabled="disabled">
234	[% PROCESS options_for_libraries libraries => Branches.pickup_locations( biblio => bibitemloo.biblionumber, selected => branch ) %]	232	[% PROCESS options_for_libraries libraries => Branches.pickup_locations( biblio => bibitemloo.biblionumber, selected => branch ) %]
235	</select>	233	</select>
236	[% ELSE %]	234	[% ELSE %]
Lines 304-333 Link Here
304	</li>	302	</li>
305	[% END # / IF OpacHoldNotes %]	303	[% END # / IF OpacHoldNotes %]
306		304
307	[% IF bibitemloo.itemholdable %]	305	<!-- ITEM HOLDS -->
308	<!-- ITEM HOLDS -->	306	<li class="lradio place_on_type" style="display:none;">
309	<li class="lradio place_on_type" style="display:none;">	307	<label class="radio inline" for="reqany_[% bibitemloo.biblionumber %]">Next available item</label>
310	[% IF NOT bibitemloo.force_hold %]	308	<input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
311	<label class="radio inline" for="reqany_[% bibitemloo.biblionumber \| html %]">Next available item</label>	309	id="reqany_[% bibitemloo.biblionumber %]"
312	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"	310	class="selectany"
313	id="reqany_[% bibitemloo.biblionumber \| html %]"	311	value="Any"
314	class="selectany"	312	checked="checked"
315	value="Any"
316	checked="checked"
317	/>
318	[% END %]
319	<label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber \| html %]">A specific item</label>
320	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"
321	id="reqspecific_[% bibitemloo.biblionumber \| html %]"
322	class="selectspecific"
323	value="Specific"
324	/>	313	/>
325	</li>	314	<label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber %]">A specific item</label>
326	[% END # / IF bibitemloo.itemholdable %]	315	<input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
		316	id="reqspecific_[% bibitemloo.biblionumber %]"
		317	class="selectspecific"
		318	value="Specific"
		319	/>
		320	</li>
327	</ul>	321	</ul>
328		322
329	[% IF bibitemloo.itemholdable %]	323	[% IF bibitemloo.remaining_holds_for_record > 1 %]
330	<table class="copiesrow table table-bordered table-striped" id="copiesrow_[% bibitemloo.biblionumber \| html %]">	324	[% SET count = 1 %]
		325	<div id="holds_to_place_[% bibitemloo.biblionumber %]" class="hold-options holds-to-place">
		326	<label>Holds to place (count)</label>
		327	<select name="holds_to_place_count_[% bibitemloo.biblionumber %]">
		328	[% WHILE count <= bibitemloo.remaining_holds_for_record %]
		329	<option value="[% count %]">[% count %]</option>
		330	[% SET count = count + 1 %]
		331	[% END %]
		332	</select>
		333	</div>
		334	[% ELSE %]
		335	<input type="hidden" name="holds_to_place_count_[% bibitemloo.biblionumber %]" value="1" />
		336	[% END %]
		337
		338	<table class="copiesrow table table-bordered table-striped" id="copiesrow_[% bibitemloo.biblionumber %]">
331	<caption>Select a specific item:</caption>	339	<caption>Select a specific item:</caption>
332	<tr>	340	<tr>
333	<th>Copy number</th>	341	<th>Copy number</th>
Lines 353-361 Link Here
353	<tr class="[% itemLoo.backgroundcolor \| html %]">	361	<tr class="[% itemLoo.backgroundcolor \| html %]">
354	<td class="copynumber">	362	<td class="copynumber">
355	[% IF ( itemLoo.available ) %]	363	[% IF ( itemLoo.available ) %]
356	<input type="radio" class="checkitem checkitem_[% bibitemloo.biblionumber \| html %]" name="checkitem_[% bibitemloo.biblionumber \| html %]" value="[% itemLoo.itemnumber \| html %]" />	364	<input type="checkbox" class="checkitem checkitem_[% bibitemloo.biblionumber %]" name="checkitem_[% bibitemloo.biblionumber %]" value="[% itemLoo.itemnumber %]" />
357	[% ELSE %]	365	[% ELSE %]
358	<input disabled="disabled" type="radio" class="checkitem" name="checkitem" value="[% itemLoo.itemnumber \| html %]"	366	<input disabled="disabled" type="checkbox" class="checkitem" name="checkitem" value="[% itemLoo.itemnumber %]"
359	style="display:none;" />	367	style="display:none;" />
360	<img src="[% interface \| html %]/lib/famfamfam/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />	368	<img src="[% interface \| html %]/lib/famfamfam/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />
361	[% END %]	369	[% END %]
Lines 431-439 Link Here
431	</td>	439	</td>
432	</tr>	440	</tr>
433	[% END # / FOREACH itemLoo IN bibitemloo.itemLoop%]	441	[% END # / FOREACH itemLoo IN bibitemloo.itemLoop%]
434	</table> <!-- / #copiesrow_[% bibitemloo.biblionumber \| html %] -->	442	</table> <!-- / #copiesrow_[% bibitemloo.biblionumber %] -->
435	[% END # / IF ( bibitemloo.itemholdable )%]	443	</div> <!-- / #hold-options-[% bibitemloo.biblionumber %] -->
436	</div> <!-- / #hold-options-[% bibitemloo.biblionumber \| html %] -->
437	</fieldset>	444	</fieldset>
438	[% END # / IF ( bibitemloo.holdable ) %]	445	[% END # / IF ( bibitemloo.holdable ) %]
439	</div> <!-- / .holdrow -->	446	</div> <!-- / .holdrow -->
Lines 455-460 Link Here
455	<script>	462	<script>
456	// <![CDATA[	463	// <![CDATA[
457	var MSG_NO_ITEM_SELECTED = _("Expecting a specific item selection.");	464	var MSG_NO_ITEM_SELECTED = _("Expecting a specific item selection.");
		465	var MSG_MAX_HOLDS_EXCEEDED = _("Maximum number of reserve exceded.");
458		466
459	// Clear the contents of an input field	467	// Clear the contents of an input field
460	$(".clearfield").on("click",function(e){	468	$(".clearfield").on("click",function(e){
Lines 464-471 Link Here
464		472
465	// Select the first item available	473	// Select the first item available
466	function select_first_available(id){	474	function select_first_available(id){
467	var radios = $("input:radio[name='checkitem_" + id + "']");	475	var checkboxes = $("input:checkbox[name='checkitem_" + id + "']");
468	$(radios).first().attr("checked", "checked");	476	$(checkboxes).first().attr("checked", "checked");
469	}	477	}
470		478
471	$(document).ready(function() {	479	$(document).ready(function() {
Lines 486-499 Link Here
486	}	494	}
487	});	495	});
488		496
489	// click on a first td check the confirmjs checkbox	497	$('.checkitem').click(function(e) {
490	$("td.hold").click(function(e){	498	var bibNum = suffixOf($(this).attr("name"), "_");
491	if(e.target.tagName.toLowerCase() == 'td'){	499	var nbCheked = $("input[name='checkitem_"+bibNum+"']:checked").length;
492	$(this).find("input.confirmjs").each( function() {	500	var remaining = $("input[id='remaining_holds_"+bibNum+"']").val();
493	$(this).attr('checked', !$(this).attr('checked'));	501	if (nbCheked >= remaining) {
494	$(this).change();	502	$("input[name='checkitem_"+bibNum+"']:not(:checked)").attr('disabled', 'disabled');
495	});	503	}
496	}	504	else {
		505	$('.checkitem_'+bibNum).attr('disabled', false);
		506	}
497	});	507	});
498		508
499	$(".toggle-hold-options").on("click",function(e){	509	$(".toggle-hold-options").on("click",function(e){
Lines 508-522 Link Here
508	// Hides all 'specific copy' table rows on load.	518	// Hides all 'specific copy' table rows on load.
509	$(".copiesrow").hide();	519	$(".copiesrow").hide();
510		520
		521	$(".holds-to-place").show();
511	[% FOREACH bibitemloo IN bibitemloop %]	522	[% FOREACH bibitemloo IN bibitemloop %]
512	[% IF bibitemloo.force_hold %]	523	[% IF bibitemloo.force_hold %]
513	$("#toggle-hold-options-[% bibitemloo.biblionumber \| html %]").click();	524	[% IF bibitemloo.force_hold == 'item' %]
514	$("#reqspecific_[% bibitemloo.biblionumber \| html %]").click();	525	$("#toggle-hold-options-[% bibitemloo.biblionumber %]").click();
515	$("#copiesrow_[% bibitemloo.biblionumber \| html %]").show();	526	$("#reqspecific_[% bibitemloo.biblionumber %]").attr('checked', true);
516	[% END %]	527	$("#holds_to_place_[% bibitemloo.biblionumber %]").hide();
517	[% IF bibitemloo.reqholdnotes %]	528	$("#copiesrow_[% bibitemloo.biblionumber %]").show();
518	$("#holdnotes_[% bibitemloo.biblionumber \| html %]").attr( 'required', true );	529	[% ELSIF bibitemloo.force_hold == 'record' %]
519	[% END %]	530	$("#toggle-hold-options-[% bibitemloo.biblionumber %]").click();
		531	$("#reqany_[% bibitemloo.biblionumber %]").attr('checked', true);
		532	[% END %]
		533	$("#reqany_[% bibitemloo.biblionumber %]").attr('disabled', 'disabled');
		534	$("#reqspecific_[% bibitemloo.biblionumber %]").attr('disabled', 'disabled');
		535	[% END %]
		536	[% IF bibitemloo.reqholdnotes %]
		537	$("#holdnotes_[% bibitemloo.biblionumber %]").attr( 'required', true );
		538	[% END %]
520	[% END %]	539	[% END %]
521		540
522	$(".date-format").each(function(){	541	$(".date-format").each(function(){
Lines 533-572 Link Here
533	$("#" + op + fieldID).val("");	552	$("#" + op + fieldID).val("");
534	});	553	});
535		554
536	// Replace non-JS single-selection with multi-selection capability.
537	$(".reserve_mode").val("multi");
538	$(".confirm_nonjs").remove();
539	$(".confirmjs_hold").each(function(){
540	var bib = $(this).attr("title");
541	var html = "<label><input type =\"checkbox\" class=\"confirmjs\" checked=\"checked\"";
542	html += "value=\"" + bib + "\" id=\"" + bib + "\" /> " + _("Place a hold on") + " </label> ";
543	$(this).html(html);
544	});
545	$(".confirmjs_nohold").each(function(){
546	var bib = $(this).attr("title");
547	var html = "<label><input type =\"checkbox\" class=\"confirmjs\" disabled=\"disabled\"";
548	html += "value=\"" + bib + "\" id=\"" + bib + "\" />" + _("Place a hold on: ") + "</label>";
549	$(this).html(html);
550	});
551
552	// expand or collapse the copiesrow tr	555	// expand or collapse the copiesrow tr
553	function toggle_copiesrow(biblioNum) {	556	function toggle_copiesrow(biblioNum) {
554	var checkbox = $("input:checkbox[value='"+biblioNum+"']");	557	var checkbox = $("input:checkbox[value='"+biblioNum+"']");
555	newCopiesRowId = "#copiesrow_" + biblioNum;	558	newCopiesRowId = "#copiesrow_" + biblioNum;
		559	holdsToPlaceCountId = "#holds_to_place_" + biblioNum;
556	var select_specific = $("#reqspecific_"+biblioNum).is(":checked");	560	var select_specific = $("#reqspecific_"+biblioNum).is(":checked");
557	// If the checkbox is checked AND we want a specific item, we display the items block	561	// If the checkbox is checked AND we want a specific item, we display the items block
558	if ( $(checkbox).is(":checked") && select_specific ) {	562	if ( $(checkbox).is(":checked") && select_specific ) {
559	$(newCopiesRowId).show();	563	$(newCopiesRowId).show();
		564	$(holdsToPlaceCountId).hide();
560	} else {	565	} else {
561	$(newCopiesRowId).hide();	566	$(newCopiesRowId).hide();
		567	$(holdsToPlaceCountId).show();
562	}	568	}
563	};	569	};
564		570
565	$("#place_on_hdr").show();	571	function total_requested() {
		572	var total = 0;
		573	$("input[name='biblionumbers']:checked").each(function() {
		574	var biblioNum = $(this).val();
		575	if ($("#reqspecific_" + biblioNum + ":checked").size() > 0) {
		576	total += parseInt($("input[name='checkitem_'"+biblioNum+"]:checked").length);
		577	} else {
		578	total += parseInt($("select[name='holds_to_place_count_"+biblioNum+"']").val());
		579	}
		580	});
		581	return total;
		582	}
566		583
567	$(".place_on_type").show();	584	$(".place_on_type").show();
568	// onload, selectany is checked	585	// onload, selectany is checked
569	$(".selectany").attr("checked", "checked");
570		586
571	// If the user is allowed to choose a specific item	587	// If the user is allowed to choose a specific item
572	// The first one is preselected	588	// The first one is preselected
Lines 575-582 Link Here
575	select_first_available(id);	591	select_first_available(id);
576	});	592	});
577		593
578	// On confirmsjs change	594	// On biblionumbers change
579	$(".confirmjs").change(function(){	595	$(".biblionumbers").change(function(){
580	var id = suffixOf($(this).attr("id"), "_");	596	var id = suffixOf($(this).attr("id"), "_");
581	// If I m checked, I enable radio buttons	597	// If I m checked, I enable radio buttons
582	if ( $(this).is(":checked") ) {	598	if ( $(this).is(":checked") ) {
Lines 598-632 Link Here
598	toggle_copiesrow(id);	614	toggle_copiesrow(id);
599	});	615	});
600		616
601	// Show or hide holds notes
602	$(".shownotes").click(function(){
603	biblioNum = suffixOf($(this).attr("id"), "_");
604	$("#notesrow_"+biblioNum).toggle();
605	});
606
607	// When 'Place Hold' button is clicked	617	// When 'Place Hold' button is clicked
608	$(".placehold").click(function(){	618	$(".placehold").click(function(){
609	var biblionumbers = "";	619	if (total_requested() + [% reserves_count %] > [% maxreserves %]) {
610	var selections = "";	620	alert(MSG_MAX_HOLDS_EXCEEDED);
611		621	return false;
612	[% IF new_reserves_allowed %]	622	}
613	if ($(".confirmjs:checked").size() > [% new_reserves_allowed \| html %] ) {
614	alert(MSG_MAX_HOLDS_EXCEEDED);
615	return false;
616	}
617	[% END %]
618		623
619	if ($(".confirmjs:checked").size() == 0) {	624	if ($("input[name='biblionumbers']:checked").size() == 0) {
620	alert(MSG_NO_RECORD_SELECTED);	625	alert(MSG_NO_RECORD_SELECTED);
621	return false;	626	return false;
622	}	627	}
623		628
624	// Find the items with the 'Hold' box checked	629	// Find the items with the 'Hold' box checked
625	var badBib = null;	630	var badBib = null;
626	$(".confirmjs:checked").each(function() {	631	$("input[name='biblionumbers']:checked").each(function() {
627	var biblioNum = $(this).val();	632	var biblioNum = $(this).val();
628	biblionumbers += biblioNum + "/";
629	selections += biblioNum + "/";
630		633
631	// If required hold note is empty, make it visible	634	// If required hold note is empty, make it visible
632	if( $("#holdnotes_"+biblioNum).attr( 'required' ) && $("#holdnotes_"+biblioNum).val() == '' ) {	635	if( $("#holdnotes_"+biblioNum).attr( 'required' ) && $("#holdnotes_"+biblioNum).val() == '' ) {
Lines 643-660 Link Here
643	alert(MSG_NO_ITEM_SELECTED);	646	alert(MSG_NO_ITEM_SELECTED);
644	badBib = biblioNum;	647	badBib = biblioNum;
645	return false;	648	return false;
646	} else {
647	selections += $(item).val();
648	}	649	}
649	}	650	}
650	selections += "/";
651
652	// Add the pickup location
653	var branchSel = $("#branch_" + biblioNum);
654	if (branchSel.size() > 0) {
655	selections += $(branchSel).val();
656	}
657	selections += "/";
658	return true;	651	return true;
659	});	652	});
660		653
Lines 662-670 Link Here
662	return false;	655	return false;
663	}	656	}
664		657
665	$("#selections").val(selections);
666	$("#biblionumbers").val(biblionumbers);
667
668	return true;	658	return true;
669	});	659	});
670		660

Lines 47-53 my $startdate = $input->param('reserve_date') \|\| ''; Link Here

(-)a/reserve/placerequest.pl (-14 / +19 lines)
47	my @rank = $input->multi_param('rank-request');	47	my @rank = $input->multi_param('rank-request');
48	my $type = $input->param('type');	48	my $type = $input->param('type');
49	my $title = $input->param('title');	49	my $title = $input->param('title');
50	my $checkitem = $input->param('checkitem');	50	my @checkitems = $input->param('checkitem');
51	my $expirationdate = $input->param('expiration_date');	51	my $expirationdate = $input->param('expiration_date');
52	my $itemtype = $input->param('itemtype') \|\| undef;	52	my $itemtype = $input->param('itemtype') \|\| undef;
53		53
Lines 58-63 my $multi_hold = $input->param('multi_hold'); Link Here
58	my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ($biblionumber . '/');	58	my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ($biblionumber . '/');
59	my $bad_bibs = $input->param('bad_bibs');	59	my $bad_bibs = $input->param('bad_bibs');
60	my $holds_to_place_count = $input->param('holds_to_place_count') \|\| 1;	60	my $holds_to_place_count = $input->param('holds_to_place_count') \|\| 1;
		61	$holds_to_place_count = scalar(@checkitems) if scalar(@checkitems);
61		62
62	my %bibinfos = ();	63	my %bibinfos = ();
63	my @biblionumbers = split '/', $biblionumbers;	64	my @biblionumbers = split '/', $biblionumbers;
Lines 68-74 foreach my $bibnum (@biblionumbers) { Link Here
68	$bibinfos{$bibnum} = \%bibinfo;	69	$bibinfos{$bibnum} = \%bibinfo;
69	}	70	}
70		71
71	my $found;	72	my @found;
		73
		74	foreach my $checkitem (@checkitems) {
		75	# if we have an item selectionned, and the pickup branch is the same as the holdingbranch
		76	# of the document, we force the value $rank and $found .
		77	$rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns');
		78	my $item = GetItem($checkitem);
		79	if ( $item->{'holdingbranch'} eq $branch ){
		80	push @found, 'W' unless C4::Context->preference('ReservesNeedReturns');
		81	}
		82	}
72		83
73	if ( $type eq 'str8' && $borrower ) {	84	if ( $type eq 'str8' && $borrower ) {
74		85
Lines 86-108 if ( $type eq 'str8' && $borrower ) { Link Here
86	}	97	}
87	}	98	}
88		99
89	if ( defined $checkitem && $checkitem ne '' ) {
90	my $item = GetItem($checkitem);
91	if ( $item->{'biblionumber'} ne $biblionumber ) {
92	$biblionumber = $item->{'biblionumber'};
93	}
94	}
95
96	if ($multi_hold) {	100	if ($multi_hold) {
97	my $bibinfo = $bibinfos{$biblionumber};	101	my $bibinfo = $bibinfos{$biblionumber};
98	AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],	102	AddReserve( $branch, $borrower->{'borrowernumber'},
99	$bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);	103	$biblionumber, [$biblionumber],
		104	$bibinfo->{rank}, $startdate, $expirationdate, $notes,$bibinfo->{title});
100	} else {	105	} else {
101	# place a request on 1st available	106	# place a request on 1st available
102	for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {	107	for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
		108	my $item = GetItem($checkitems[$i]);
103	AddReserve( $branch, $borrower->{'borrowernumber'},	109	AddReserve( $branch, $borrower->{'borrowernumber'},
104	$biblionumber, \@realbi, $rank[0], $startdate, $expirationdate, $notes, $title,	110	$item->{biblionumber}, \@realbi, $rank[0], $startdate, $expirationdate, $notes, $title,
105	$checkitem, $found, $itemtype );	111	$checkitems[$i], $found[$i] );
106	}	112	}
107	}	113	}
108	}	114	}
109	-