Attachment #140951 for bug #30579

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




                <div class="dialog alert hide holdalert">
                </div>

                [% UNLESS ( multi_hold ) %]
                <fieldset class="rows">
                    <legend>Hold details</legend>
                    <form action="placerequest.pl" method="post" name="form" id="hold-request-form">

                        [% FOREACH biblionumber IN biblionumbers %]
                            <input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/>
                        [% END %]
                        [% IF ( multi_hold ) %]
                            <input type="hidden" name="multi_holds" id="multi_holds" value="1" />
                            <input type="hidden" name="request" value="any"/>
                            [% FOREACH biblioloo IN biblioloop %]
                                [% UNLESS biblioloo.none_avail %]
                                    <input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblioloo.biblionumber | html %]"/>
                                    <input type="hidden" name="title_[% biblioloo.biblionumber | html %]" value="[% biblioloo.title | html %]"/>
                                    <input type="hidden" name="rank_[% biblioloo.biblionumber | html %]" value="[% biblioloo.rank | html %]"/>
                                [% END %]
                            [% END %]
                        [% ELSE %]
                            <input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblio.biblionumber | html %]"/>
                            <input type="hidden" name="title" value="[% biblio.title | html %]" />
                            <input type="hidden" name="rank-request" value="[% fixedRank | html %]" />
                        [% END # /IF multi_hold %]

                        <ol>
                            <li>

                                [% END %]
                            </li>

                            <li>
                                <span class="label">Estimated priority:</span>
                                <strong>[% fixedRank | html %]</strong>
                            </li>
                                </li>
                            [% END %]

                            <li>
                                <label for="holdnotes">Notes:</label>

                            </li>
                            <li>
                                <label for="pickup">Pickup at:</label>
                            [% UNLESS ( multi_hold ) %]
                                <select name="pickup" id="pickup"
                                        data-biblio-id="[% biblio.biblionumber | html %]"
                                        data-patron-id="[% patron.borrowernumber | html %]"
                                        data-pickup-location-source="biblio">
                                    [% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %]
                            [% ELSE %]
                                <select name="pickup" id="pickup_multi" data-patron-id="[% patron.borrowernumber | html %]">
                                    <option value="" selected="selected"></option>
                                [% FOREACH pickup_location IN multi_pickup_locations %]
                                    <option value="[% pickup_location.branchcode | html %]">[% pickup_location.branchname | html %]</option>
                                [% END %]
                            [% END %]
                                </select>
                            </li>

                            [% UNLESS ( multi_hold ) %]
                                [% IF Koha.Preference('AllowHoldItemTypeSelection') %]
                                    <li>
                                        <label for="itemtype">Request specific item type:</label>

                                        </select>
                                    </li>
                                [% END %]
                            [% END # /UNLESS multi_hold %]

                            [% IF ( reserve_in_future ) %]
                                <li>

                                <input id="expiration_date" name="expiration_date" id="to" size="10" type="text" class="flatpickr" data-flatpickr-futuredate="true" />
                            </li>

                            [% UNLESS ( multi_hold ) %]
                                <li>
                                    <label for="requestany">Hold next available item </label>
                                    [% IF force_hold_level == 'item' %]

                                [% ELSE %]
                                    <input type="hidden" name="holds_to_place_count" value="1" />
                                [% END %]
                            [% END # /UNLESS multi_hold %]

                            <li id="non_priority_list_item">
                                <label for="non_priority">Non priority hold:</label>

                            </li>
                        </ol>

                        [% UNLESS ( multi_hold ) %]
                            <fieldset class="action">
                                [% IF ( patron.borrowernumber ) %]
                                    [% IF ( override_required ) %]

                            [% END # /IF hiddencount %]

                        [% ELSE # /UNLESS multi_hold %]
                <fieldset class="rows">
                    <legend>Hold details</legend>
                    <form action="placerequest.pl" method="post" name="form" id="hold-request-form">
                            <input type="hidden" name="multi_holds" id="multi_holds" value="1" />
                            <input type="hidden" name="request" value="any"/>
                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
                            [% FOREACH biblioloo IN biblioloop %]
                                <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblioloo.biblionumber | html %]"/>
                                [% UNLESS biblioloo.none_avail %]
                                    <input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblioloo.biblionumber | html %]"/>
                                    <input type="hidden" name="title_[% biblioloo.biblionumber | html %]" value="[% biblioloo.title | html %]"/>
                                    <input type="hidden" name="rank_[% biblioloo.biblionumber | html %]" value="[% biblioloo.rank | html %]"/>
                                [% END %]
                            [% END %]

                            <table id="requesttitles">
                                <tr>

Lines 48-53 my $checkitem = $input->param('checkitem'); Link Here

(-)a/reserve/placerequest.pl (-2 / +2 lines)
48	my $expirationdate = $input->param('expiration_date');	48	my $expirationdate = $input->param('expiration_date');
49	my $itemtype = $input->param('itemtype') \|\| undef;	49	my $itemtype = $input->param('itemtype') \|\| undef;
50	my $non_priority = $input->param('non_priority');	50	my $non_priority = $input->param('non_priority');
		51	my $multi_holds = $input->param('multi_holds');
51		52
52	my $patron = Koha::Patrons->find( $borrowernumber );	53	my $patron = Koha::Patrons->find( $borrowernumber );
53		54
Lines 102-108 if ( $patron ) { Link Here
102	}	103	}
103	}	104	}
104		105
105	} elsif (@biblionumbers > 1) {	106	} elsif (@biblionumbers > 1 \|\| $multi_holds) {
106	my $bibinfo = $bibinfos{$biblionumber};	107	my $bibinfo = $bibinfos{$biblionumber};
107	if ( $can_override \|\| CanBookBeReserved($patron->borrowernumber, $biblionumber)->{status} eq 'OK' ) {	108	if ( $can_override \|\| CanBookBeReserved($patron->borrowernumber, $biblionumber)->{status} eq 'OK' ) {
108	AddReserve(	109	AddReserve(
109	-

Return to bug 30579

Lines 504-509 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-31 / +19 lines)
504	<div class="dialog alert hide holdalert">	504	<div class="dialog alert hide holdalert">
505	</div>	505	</div>
506		506
		507	[% UNLESS ( multi_hold ) %]
507	<fieldset class="rows">	508	<fieldset class="rows">
508	<legend>Hold details</legend>	509	<legend>Hold details</legend>
509	<form action="placerequest.pl" method="post" name="form" id="hold-request-form">	510	<form action="placerequest.pl" method="post" name="form" id="hold-request-form">
Lines 512-532 Link Here
512	[% FOREACH biblionumber IN biblionumbers %]	513	[% FOREACH biblionumber IN biblionumbers %]
513	<input type="hidden" name="biblionumber" value="[% biblionumber \| html %]"/>	514	<input type="hidden" name="biblionumber" value="[% biblionumber \| html %]"/>
514	[% END %]	515	[% END %]
515	[% IF ( multi_hold ) %]
516	<input type="hidden" name="multi_holds" id="multi_holds" value="1" />
517	<input type="hidden" name="request" value="any"/>
518	[% FOREACH biblioloo IN biblioloop %]
519	[% UNLESS biblioloo.none_avail %]
520	<input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblioloo.biblionumber \| html %]"/>
521	<input type="hidden" name="title_[% biblioloo.biblionumber \| html %]" value="[% biblioloo.title \| html %]"/>
522	<input type="hidden" name="rank_[% biblioloo.biblionumber \| html %]" value="[% biblioloo.rank \| html %]"/>
523	[% END %]
524	[% END %]
525	[% ELSE %]
526	<input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblio.biblionumber \| html %]"/>	516	<input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblio.biblionumber \| html %]"/>
527	<input type="hidden" name="title" value="[% biblio.title \| html %]" />	517	<input type="hidden" name="title" value="[% biblio.title \| html %]" />
528	<input type="hidden" name="rank-request" value="[% fixedRank \| html %]" />	518	<input type="hidden" name="rank-request" value="[% fixedRank \| html %]" />
529	[% END # /IF multi_hold %]
530		519
531	<ol>	520	<ol>
532	<li>	521	<li>
Lines 538-549 Link Here
538	[% END %]	527	[% END %]
539	</li>	528	</li>
540		529
541	[% UNLESS ( multi_hold ) %]	530	<li>
542	<li>	531	<span class="label">Estimated priority:</span>
543	<span class="label">Estimated priority:</span>	532	<strong>[% fixedRank \| html %]</strong>
544	<strong>[% fixedRank \| html %]</strong>	533	</li>
545	</li>
546	[% END %]
547		534
548	<li>	535	<li>
549	<label for="holdnotes">Notes:</label>	536	<label for="holdnotes">Notes:</label>
Lines 551-573 Link Here
551	</li>	538	</li>
552	<li>	539	<li>
553	<label for="pickup">Pickup at:</label>	540	<label for="pickup">Pickup at:</label>
554	[% UNLESS ( multi_hold ) %]
555	<select name="pickup" id="pickup"	541	<select name="pickup" id="pickup"
556	data-biblio-id="[% biblio.biblionumber \| html %]"	542	data-biblio-id="[% biblio.biblionumber \| html %]"
557	data-patron-id="[% patron.borrowernumber \| html %]"	543	data-patron-id="[% patron.borrowernumber \| html %]"
558	data-pickup-location-source="biblio">	544	data-pickup-location-source="biblio">
559	[% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %]	545	[% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %]
560	[% ELSE %]
561	<select name="pickup" id="pickup_multi" data-patron-id="[% patron.borrowernumber \| html %]">
562	<option value="" selected="selected"></option>
563	[% FOREACH pickup_location IN multi_pickup_locations %]
564	<option value="[% pickup_location.branchcode \| html %]">[% pickup_location.branchname \| html %]</option>
565	[% END %]
566	[% END %]
567	</select>	546	</select>
568	</li>	547	</li>
569		548
570	[% UNLESS ( multi_hold ) %]
571	[% IF Koha.Preference('AllowHoldItemTypeSelection') %]	549	[% IF Koha.Preference('AllowHoldItemTypeSelection') %]
572	<li>	550	<li>
573	<label for="itemtype">Request specific item type:</label>	551	<label for="itemtype">Request specific item type:</label>
Lines 579-585 Link Here
579	</select>	557	</select>
580	</li>	558	</li>
581	[% END %]	559	[% END %]
582	[% END # /UNLESS multi_hold %]
583		560
584	[% IF ( reserve_in_future ) %]	561	[% IF ( reserve_in_future ) %]
585	<li>	562	<li>
Lines 593-599 Link Here
593	<input id="expiration_date" name="expiration_date" id="to" size="10" type="text" class="flatpickr" data-flatpickr-futuredate="true" />	570	<input id="expiration_date" name="expiration_date" id="to" size="10" type="text" class="flatpickr" data-flatpickr-futuredate="true" />
594	</li>	571	</li>
595		572
596	[% UNLESS ( multi_hold ) %]
597	<li>	573	<li>
598	<label for="requestany">Hold next available item </label>	574	<label for="requestany">Hold next available item </label>
599	[% IF force_hold_level == 'item' %]	575	[% IF force_hold_level == 'item' %]
Lines 615-621 Link Here
615	[% ELSE %]	591	[% ELSE %]
616	<input type="hidden" name="holds_to_place_count" value="1" />	592	<input type="hidden" name="holds_to_place_count" value="1" />
617	[% END %]	593	[% END %]
618	[% END # /UNLESS multi_hold %]
619		594
620	<li id="non_priority_list_item">	595	<li id="non_priority_list_item">
621	<label for="non_priority">Non priority hold:</label>	596	<label for="non_priority">Non priority hold:</label>
Lines 624-630 Link Here
624	</li>	599	</li>
625	</ol>	600	</ol>
626		601
627	[% UNLESS ( multi_hold ) %]
628	<fieldset class="action">	602	<fieldset class="action">
629	[% IF ( patron.borrowernumber ) %]	603	[% IF ( patron.borrowernumber ) %]
630	[% IF ( override_required ) %]	604	[% IF ( override_required ) %]
Lines 865-870 Link Here
865	[% END # /IF hiddencount %]	839	[% END # /IF hiddencount %]
866		840
867	[% ELSE # /UNLESS multi_hold %]	841	[% ELSE # /UNLESS multi_hold %]
		842	<fieldset class="rows">
		843	<legend>Hold details</legend>
		844	<form action="placerequest.pl" method="post" name="form" id="hold-request-form">
		845	<input type="hidden" name="multi_holds" id="multi_holds" value="1" />
		846	<input type="hidden" name="request" value="any"/>
		847	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />
		848	[% FOREACH biblioloo IN biblioloop %]
		849	<input type="hidden" name="biblionumber" id="biblionumber" value="[% biblioloo.biblionumber \| html %]"/>
		850	[% UNLESS biblioloo.none_avail %]
		851	<input type="hidden" name="holdable_bibs" id="holdable_bibs" value="[% biblioloo.biblionumber \| html %]"/>
		852	<input type="hidden" name="title_[% biblioloo.biblionumber \| html %]" value="[% biblioloo.title \| html %]"/>
		853	<input type="hidden" name="rank_[% biblioloo.biblionumber \| html %]" value="[% biblioloo.rank \| html %]"/>
		854	[% END %]
		855	[% END %]
868		856
869	<table id="requesttitles">	857	<table id="requesttitles">
870	<tr>	858	<tr>