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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-10 / +45 lines)
Lines 15-21 Link Here
15
[% INCLUDE 'calendar.inc' %]
15
[% INCLUDE 'calendar.inc' %]
16
<script type="text/javascript">
16
<script type="text/javascript">
17
    // <![CDATA[
17
    // <![CDATA[
18
var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
19
var patron_homebranch = "[% borrower_branchname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
18
var patron_homebranch = "[% borrower_branchname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
20
var override_items = {[% FOREACH bibitemloo IN bibitemloop %][% FOREACH itemloo IN bibitemloo.itemloop %][% IF ( itemloo.override ) %]
19
var override_items = {[% FOREACH bibitemloo IN bibitemloop %][% FOREACH itemloo IN bibitemloo.itemloop %][% IF ( itemloo.override ) %]
21
    [% itemloo.itemnumber %]: {
20
    [% itemloo.itemnumber %]: {
Lines 87-94 function check() { Link Here
87
		msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n");
86
		msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n");
88
    }
87
    }
89
88
90
	if (msg == "") return(true);
89
    if (msg == ""){
91
	else	{
90
        $(this).preventDoubleFormSubmit();
91
        return(true);
92
    } else {
92
		alert(msg);
93
		alert(msg);
93
		return(false);
94
		return(false);
94
	}
95
	}
Lines 164-170 function checkMultiHold() { Link Here
164
        $("#" + fieldID).val("");
165
        $("#" + fieldID).val("");
165
    });
166
    });
166
167
167
    $('#hold-request-form').preventDoubleFormSubmit();
168
    $('#hold-request-form').on("submit",function(){
169
        return check();
170
    });
171
172
    $("#multihold_request_form")
173
        .on("submit",function(){
174
            return checkMultiHold();
175
        })
176
        .preventDoubleFormSubmit();
177
178
    $(".cancel_hold").on("click",function(){
179
        return confirmDelete( _("Are you sure you want to cancel this hold?") );
180
    });
181
182
    $(".suspend_hold").on("click",function(e){
183
        e.preventDefault();
184
        var reserve_id = $(this).data("reserve_id");
185
        var biblionumber = $(this).data("biblionumber");
186
        var borrowernumber = $(this).data("borrowernumber");
187
        var reservedate = $(this).data("reservedate")
188
        window.location.href = "request.pl?action=toggleSuspend&amp;reserve_id=" + reserve_id + "&borrowernumber=" + borrowernumber + "&biblionumber=" + biblionumber + "&date=" + reservedate + "&suspend_until=" + $("#suspend_until_" + reserve_id).val();
189
    });
190
191
    $(".clear_date").on("click",function(e){
192
        e.preventDefault();
193
        var reserve_id = $(this).data("reserve_id");
194
        $("#suspend_until_" + reserve_id).val('');
195
    });
168
196
169
[% UNLESS ( borrowernumber || borrowers || noitems ) %]
197
[% UNLESS ( borrowernumber || borrowers || noitems ) %]
170
    [% IF ( CircAutocompl ) %]
198
    [% IF ( CircAutocompl ) %]
Lines 320-328 function checkMultiHold() { Link Here
320
  <fieldset class="rows left">
348
  <fieldset class="rows left">
321
    <legend>Hold details</legend>
349
    <legend>Hold details</legend>
322
        [% UNLESS ( multi_hold ) %]
350
        [% UNLESS ( multi_hold ) %]
323
            <form action="placerequest.pl" method="post" onsubmit="return check();" name="form" id="hold-request-form">
351
            <form action="placerequest.pl" method="post" name="form" id="hold-request-form">
324
        [% ELSE %]
352
        [% ELSE %]
325
            <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form">
353
            <form action="placerequest.pl" method="post" name="form" id="multihold_request_form">
326
        [% END %]
354
        [% END %]
327
355
328
        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
356
        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
Lines 521-527 function checkMultiHold() { Link Here
521
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
549
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
522
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">[% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %]
550
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">[% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %]
523
                    since
551
                    since
524
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]"  onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a>
552
                    [% IF ( itemloo.waitingdate ) %]
553
                        [% itemloo.waitingdate | $KohaDates %]
554
                    [% ELSE %]
555
                        [% IF ( itemloo.reservedate ) %]
556
                            [% itemloo.reservedate | $KohaDates %]
557
                        [% END %]
558
                    [% END %].
559
                    <a class="info cancel_hold" href="request.pl?action=cancel&amp;borrowernumber=[% itemloo.ReservedForBorrowernumber %]&amp;biblionumber=[% itemloo.biblionumber %]&amp;reserve_id=[% itemloo.reserve_id %]&amp;date=[% itemloo.reservedate  %]">Cancel hold</a>
525
560
526
                    [% END %]
561
                    [% END %]
527
                 [% ELSE %]
562
                 [% ELSE %]
Lines 798-804 function checkMultiHold() { Link Here
798
    [% END %]
833
    [% END %]
799
834
800
	<td>
835
	<td>
801
           <a title="Cancel hold" href="request.pl?action=cancel&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
836
           <a class="cancel_hold" title="Cancel hold" href="request.pl?action=cancel&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
802
                    <img src="[% interface %]/[% theme %]/img/x.png" alt="Cancel" />
837
                    <img src="[% interface %]/[% theme %]/img/x.png" alt="Cancel" />
803
                </a>
838
                </a>
804
	</td>
839
	</td>
Lines 806-817 function checkMultiHold() { Link Here
806
        [% IF SuspendHoldsIntranet %]
841
        [% IF SuspendHoldsIntranet %]
807
	<td>
842
	<td>
808
        [% UNLESS ( reserveloo.found ) %]
843
        [% UNLESS ( reserveloo.found ) %]
809
            <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&amp;reserve_id=[% reserveloo.reserve_id %]&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]&amp;suspend_until=' + $('#suspend_until_[% reserveloo.reserve_id %]').val()" />
844
            <input type="button" class="suspend_hold" data-reserve_id="[% reserveloo.reserve_id %]" data-biblionumber="[% reserveloo.biblionumber %]" data-reservedate="[% reserveloo.date %]" data-borrowernumber="[% reserveloo.borrowernumber %]" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" />
810
845
811
            [% IF AutoResumeSuspendedHolds %]
846
            [% IF AutoResumeSuspendedHolds %]
812
                <label for="suspend_until_[% reserveloo.reserve_id %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label>
847
                <label for="suspend_until_[% reserveloo.reserve_id %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label>
813
                <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" />
848
                <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" />
814
                <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a>
849
                <a href="#" class="clear_date" data-reserve_id="[% reserveloo.reserve_id %]">Clear date</a>
815
            [% ELSE %]
850
            [% ELSE %]
816
                <input type="hidden" name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" value=""/>
851
                <input type="hidden" name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" value=""/>
817
            [% END %]
852
            [% END %]
(-)a/reserve/request.pl (-2 / +2 lines)
Lines 382-391 foreach my $biblionumber (@biblionumbers) { Link Here
382
                my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor );
382
                my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor );
383
383
384
                $item->{backgroundcolor} = 'reserved';
384
                $item->{backgroundcolor} = 'reserved';
385
                $item->{reservedate}     = output_pref({ dt => dt_from_string( $reservedate ), dateonly => 1 });
385
                $item->{reservedate}     = $reservedate;
386
                $item->{ReservedForBorrowernumber}     = $reservedfor;
386
                $item->{ReservedForBorrowernumber}     = $reservedfor;
387
                $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
387
                $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
388
                $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
388
                $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
389
                $item->{reserve_id}     = $reserve_id;
389
                $item->{ExpectedAtLibrary}     = $branches->{$expectedAt}{branchname};
390
                $item->{ExpectedAtLibrary}     = $branches->{$expectedAt}{branchname};
390
                $item->{waitingdate} = $wait;
391
                $item->{waitingdate} = $wait;
391
            }
392
            }
392
- 

Return to bug 17057