Attachment 78766 Details for Bug 19532 – Bug 19532: Cancel recall and see recalls in OPAC

[patch] Bug 19532: Cancel recall and see recalls in OPAC

Bug-19532-Cancel-recall-and-see-recalls-in-OPAC.patch (text/plain), 12.85 KB, created by Chris Cormack on 2018-09-14 22:23:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2018-09-14 22:23:37 UTC

Size: 12.85 KB

patch

obsolete

>From e39c66fe9a6336bc07e8f750c12368d4cc2622e9 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Mon, 13 Nov 2017 02:22:09 +0000
>Subject: [PATCH] Bug 19532: Cancel recall and see recalls in OPAC
>
>This patch adds ability for user to cancel a recall
>They can also see their recalls in the user summary
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> Koha/Recall.pm                                     | 43 ++++++++++
> .../opac-tmpl/bootstrap/en/modules/opac-user.tt    | 97 +++++++++++++++++++++-
> opac/opac-recall.pl                                |  4 +
> opac/opac-user.pl                                  |  8 ++
> 4 files changed, 150 insertions(+), 2 deletions(-)
>
>diff --git a/Koha/Recall.pm b/Koha/Recall.pm
>index 596aafa065..64779c8943 100644
>--- a/Koha/Recall.pm
>+++ b/Koha/Recall.pm
>@@ -41,6 +41,49 @@ sub _type {
>     return 'Recall';
> }
> 
>+=head3 biblio
>+
>+Returns the related Koha::Biblio object for this hold
>+
>+=cut
>+
>+sub biblio {
>+    my ($self) = @_;
>+
>+    $self->{_biblio} ||= Koha::Biblios->find( $self->biblionumber() );
>+
>+    return $self->{_biblio};
>+}
>+
>+=head3 item
>+
>+Returns the related Koha::Item object for this Hold
>+
>+=cut
>+
>+sub item {
>+
>+    my ($self) = @_;
>+
>+    $self->{_item} ||= Koha::Items->find( $self->itemnumber() );
>+
>+    return $self->{_item};
>+}
>+
>+=head3 branch
>+
>+Returns the related Koha::Library object for this Hold
>+
>+=cut
>+
>+sub branch {
>+    my ($self) = @_;
>+
>+    $self->{_branch} ||= Koha::Libraries->find( $self->branchcode() );
>+
>+    return $self->{_branch};
>+}
>+
> =head3 is_waiting
> 
> Returns true if recall is awaiting pickup
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index 728ddaf171..9abf36f55b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -159,7 +159,8 @@
>                             [% END %]
> 
>                             [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count | html %])</a></li>[% END %]
>-                            [% IF Koha.Preference('ArticleRequests') && logged_in_user.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% logged_in_user.article_requests_current.count | html %])</a></li>[% END %]
>+                            [% IF ( RECALLS.count ) %]<li><a href="#opac-user-recalls">Recalls ([% RECALLS.count | html %])</a></li>[% END %]
>+                            [% IF Koha.Preference('ArticleRequests') && borrower.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% borrower.article_requests_current.count | html %])</a></li>[% END %]
>                             [% IF ( OverDriveCirculation ) %]
>                             <li><a href="#opac-user-overdrive">OverDrive Account</a></li>
>                             [% END %]
>@@ -239,7 +240,8 @@
> 
>                                                 <td class="title">
>                                                     <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber | html %]">[% ISSUE.title | html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield | html %][% END %]</a>
>-                                                    [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron | html %][% END %]
>+                                                    [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron %][% END %]
>+                                                    [% IF ( ISSUE.recalled ) %]This item has been recalled. Please return by the new due date.[% END %]
>                                                 </td>
> 
>                                                 <td class="author">[% ISSUE.author | html %]</td>
>@@ -781,6 +783,92 @@
>                         </div> 
>                         [% END # / #RESERVES.count %]
> 
>+                        [% IF RECALLS.count %]
>+                            <div id="opac-user-recalls">
>+                                <table id="recalls-table" class="table table-bordered table-striped">
>+                                    <caption>Recalls <span class="count">([% RECALLS.count %])</span></caption>
>+                                    <thead>
>+                                        <tr>
>+                                            <th class="anti-the">Title</th>
>+                                            <th class="psort title-string">Placed on</th>
>+                                            <th class="title-string">Expires on</th>
>+                                            <th>Pick up location</th>
>+                                            <th>Status</th>
>+                                            <th>Cancel</th>
>+                                        </tr>
>+                                    </thead>
>+                                    <tbody>
>+                                        [% FOREACH RECALL IN RECALLS %]
>+                                            <td class="title">
>+                                                <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber %]">
>+                                                    [% RECALL.biblio.title %]
>+                                                    [% FOREACH s IN RECALL.biblio.subtitles %]
>+                                                        [% s %]
>+                                                    [% END %]
>+                                                    [% RECALL.item.enumchron %]
>+                                                </a>
>+                                                [% RECALL.biblio.author %]
>+                                            </td>
>+                                            <td class="recalldate">
>+                                                <span title="[% RECALL.recalldate %]">
>+                                                    <span class="tdlabel">Recall date:</span>
>+                                                    [% RECALL.recalldate | $KohaDates %]
>+                                                </span>
>+                                            </td>
>+                                            <td class="expirationdate">
>+                                                [% IF ( RECALL.is_waiting ) %]
>+                                                    [% IF ( RECALL.expirationdate ) %]
>+                                                        <span title="[% RECALL.expirationdate %]">
>+                                                            <span class="tdlabel">Expiration:</span>
>+                                                                [% RECALL.expirationdate | $KohaDates %]
>+                                                        </span>
>+                                                    [% ELSE %]
>+                                                        <span title="0000-00-00">
>+                                                            <span class="tdlabel">Expiration:</span>
>+                                                            Never expires
>+                                                        </span>
>+                                                    [% END %]
>+                                                [% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %]
>+                                                    <span title="[% RECALL.expirationdate %]" class="overdue">
>+                                                        <span class="tdlabel">Expiration:</span>
>+                                                        [% RECALL.expirationdate | $KohaDates %]
>+                                                    </span>
>+                                                [% ELSE %]
>+                                                    <span title="0000-00-00">-</span>
>+                                                [% END %]
>+                                            </td>
>+                                            <td class="branch">
>+                                                <span class="tdlabel">Pick up location:</span>
>+                                                [% RECALL.branch.branchname %]
>+                                            </td>
>+                                            <td class="status">
>+                                                <span class="tdlabel">Status:</span>
>+                                                [% IF ( RECALL.is_requested ) %]
>+                                                    Requested
>+                                                [% ELSIF ( RECALL.is_waiting ) %]
>+                                                    Ready for pickup
>+                                                [% ELSIF ( RECALL.has_expired ) %]
>+                                                    Expired
>+                                                [% END %]
>+                                            </td>
>+                                            <td class="cancelrecall">
>+                                                [% IF ( !RECALL.cancellationdate ) %]
>+                                                    <form action="/cgi-bin/koha/opac-recall.pl" method="post">
>+                                                        <input type="hidden" name="op" value="cancel">
>+                                                        <input type="hidden" name="recall_id" value="[% RECALL.recall_id %]">
>+                                                        <input type="hidden" name="itemnumber" value="[% RECALL.itemnumber %]">
>+                                                        <button type="submit" name="submit" class="btn btn-sm btn-danger" id="cancel_recall"><i class="icon-remove icon-white"></i> Cancel</button>
>+                                                    </form>
>+                                                [% ELSE %]
>+                                                    Cancelled
>+                                                [% END %]
>+                                            </td>
>+                                        [% END %]
>+                                    </tbody>
>+                                <table>
>+                            </div>
>+                        [% END # / # RECALLS.count %]
>+
>                         [% IF Koha.Preference('ArticleRequests') %]
>                             <div id="opac-user-article-requests">
>                                 [% IF logged_in_user.article_requests_current.count %]
>@@ -906,6 +994,7 @@
>         var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
>         var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?");
>         var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended holds?");
>+        var MSG_CONFIRM_CANCEL_RECALL = _("Are you sure you want to undo this recall?");
> 
>         $(document).ready(function(){
>             $('#opac-user-views').tabs();
>@@ -914,6 +1003,10 @@
>             $(".modal-nojs").addClass("modal").addClass("hide").removeClass("modal-nojs");
>             $(".suspend-until").prop("readonly",1);
> 
>+            $("#cancel_recall").click(function(e){
>+                return confirmDelete(MSG_CONFIRM_CANCEL_RECALL);
>+            });
>+
>             var dTables = $("#checkoutst,#holdst,#overduest,#opac-user-relative-issues-table");
>             dTables.each(function(){
>                 var thIndex = $(this).find("th.psort").index();
>diff --git a/opac/opac-recall.pl b/opac/opac-recall.pl
>index 72602a5755..09e15d6a44 100755
>--- a/opac/opac-recall.pl
>+++ b/opac/opac-recall.pl
>@@ -85,6 +85,10 @@ if ($op eq 'request'){
>             $error = 'failed';
>         }
>     }
>+} elsif ($op eq 'cancel'){
>+    my $recall_id = $query->param('recall_id');
>+    Koha::Recalls->find($recall_id)->delete;
>+    print $query->redirect('/cgi-bin/koha/opac-user.pl');
> }
> 
> $template->param(
>diff --git a/opac/opac-user.pl b/opac/opac-user.pl
>index e599cecf18..78b3fb6a11 100755
>--- a/opac/opac-user.pl
>+++ b/opac/opac-user.pl
>@@ -42,6 +42,7 @@ use Koha::Patron::Attribute::Types;
> use Koha::Patron::Messages;
> use Koha::Patron::Discharge;
> use Koha::Patrons;
>+use Koha::Recalls;
> 
> use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
> 
>@@ -247,6 +248,11 @@ if ( $pending_checkouts->count ) { # Useless test
>             }
>         }
> 
>+        my $recall = Koha::Recalls->find($issue->{itemnumber});
>+        if (defined $recall){
>+            $issue->{recalled} = 1;
>+        }
>+
>         if ( $c->is_overdue ) {
>             push @overdues, $issue;
>             $overdues_count++;
>@@ -299,9 +305,11 @@ $template->param( show_barcode => 1 ) if $show_barcode;
> 
> # now the reserved items....
> my $reserves = Koha::Holds->search( { borrowernumber => $borrowernumber } );
>+my $recalls = Koha::Recalls->search( { borrowernumber => $borrowernumber } );
> 
> $template->param(
>     RESERVES       => $reserves,
>+    RECALLS        => $recalls,
>     showpriority   => $show_priority,
> );
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 19532: 68569 | 68570 | 68571 | 68572 | 68642 | 68643 | 68644 | 68645 | 68653 | 69100 | 69102 | 69147 | 69148 | 69149 | 69170 | 69172 | 69221 | 69222 | 69223 | 69322 | 69353 | 69354 | 69405 | 69409 | 69410 | 69411 | 69841 | 69872 | 69873 | 69874 | 69875 | 69876 | 69877 | 69878 | 69879 | 69880 | 69881 | 69882 | 69883 | 69884 | 69885 | 69886 | 69887 | 69888 | 69889 | 69890 | 69986 | 70093 | 71409 | 71574 | 71575 | 71576 | 71577 | 71578 | 71579 | 71580 | 71581 | 71582 | 71583 | 71584 | 71585 | 71586 | 71587 | 71588 | 71589 | 71590 | 71591 | 71592 | 72244 | 72311 | 72312 | 72313 | 72314 | 72315 | 72316 | 72317 | 72318 | 72319 | 72320 | 72321 | 72322 | 72323 | 72324 | 72325 | 72326 | 72327 | 72328 | 72329 | 72330 | 72331 | 72332 | 72333 | 72334 | 72335 | 72336 | 72337 | 72338 | 72527 | 76817 | 76818 | 76819 | 76820 | 76821 | 76822 | 76823 | 76824 | 76825 | 76826 | 76827 | 76828 | 76829 | 76830 | 76831 | 76832 | 76833 | 76834 | 76835 | 76836 | 76837 | 76838 | 76839 | 76840 | 76841 | 76842 | 76843 | 76844 | 76845 | 76846 | 76847 | 77177 | 77178 | 77179 | 78755 | 78757 | 78759 | 78761 | 78763 | 78765 | 78766 | 78768 | 78770 | 78772 | 78773 | 78774 | 78775 | 78776 | 78777 | 78778 | 78780 | 78782 | 78785 | 78787 | 78789 | 78790 | 78792 | 78794 | 78797 | 78800 | 78801 | 78802 | 78803 | 78804 | 78805 | 78806 | 78807 | 78808 | 80763 | 80764 | 80765 | 80766 | 80767 | 80768 | 80769 | 80770 | 80771 | 80772 | 80773 | 80774 | 80775 | 80776 | 80777 | 80778 | 80779 | 80780 | 80781 | 80782 | 80783 | 80784 | 80785 | 80786 | 80787 | 80788 | 80789 | 80793 | 80878 | 81204 | 81205 | 81206 | 81207 | 81208 | 81209 | 81210 | 81211 | 81212 | 81213 | 81214 | 81215 | 81216 | 81217 | 81218 | 81219 | 81220 | 81221 | 81222 | 81223 | 81224 | 81225 | 81226 | 81227 | 81228 | 81229 | 81230 | 81231 | 81232 | 81233 | 81234 | 81235 | 81236 | 81237 | 81238 | 81239 | 81240 | 81241 | 81242 | 81243 | 81244 | 81245 | 81246 | 81247 | 81547 | 81548 | 81549 | 81550 | 81551 | 81552 | 81553 | 81554 | 81555 | 81556 | 81557 | 81558 | 81559 | 81560 | 81561 | 81562 | 81563 | 81564 | 81565 | 81566 | 81567 | 81568 | 81569 | 81583 | 81584 | 81585 | 81586 | 81587 | 81588 | 81595 | 81618 | 81652 | 81653 | 81654 | 81655 | 81656 | 81657 | 81658 | 81659 | 81660 | 81661 | 81662 | 81663 | 81664 | 81665 | 81666 | 81667 | 81668 | 81669 | 81670 | 81671 | 81672 | 81673 | 81674 | 81675 | 81676 | 81677 | 81678 | 81679 | 81680 | 81681 | 81682 | 81683 | 103887 | 103888 | 103890 | 103899 | 103900 | 103901 | 103999 | 104000 | 104001 | 104002 | 104005 | 104006 | 104007 | 104066 | 104067 | 104068 | 104069 | 104070 | 104071 | 104246 | 104247 | 104248 | 104249 | 104250 | 104322 | 104323 | 104324 | 104325 | 104326 | 104327 | 104328 | 104329 | 104330 | 104331 | 104332 | 104333 | 104334 | 104335 | 104336 | 104391 | 104392 | 104393 | 104394 | 104395 | 104396 | 104397 | 104398 | 104474 | 104475 | 104476 | 104477 | 104478 | 104479 | 104480 | 104481 | 104545 | 104546 | 104547 | 104548 | 104549 | 104550 | 104551 | 104552 | 104646 | 104647 | 104648 | 104649 | 104650 | 104651 | 104652 | 104653 | 104722 | 104723 | 104724 | 104725 | 104726 | 104727 | 104728 | 104729 | 104806 | 104807 | 104808 | 104809 | 104810 | 104811 | 104812 | 104813 | 104814 | 104815 | 104816 | 104817 | 104818 | 104819 | 104820 | 104821 | 104863 | 104864 | 104865 | 104866 | 104867 | 104868 | 104869 | 104870 | 104902 | 104903 | 104904 | 104905 | 104906 | 104907 | 104908 | 104909 | 104910 | 104913 | 104914 | 104915 | 104916 | 104917 | 104918 | 104919 | 104920 | 104988 | 104989 | 104990 | 104991 | 104992 | 106268 | 106269 | 106371 | 106372 | 106373 | 106374 | 106375 | 106376 | 106377 | 106378 | 106810 | 106811 | 106812 | 106813 | 106814 | 106815 | 106816 | 106817 | 106857 | 107198 | 107199 | 107200 | 107201 | 107202 | 107203 | 107204 | 107205 | 107807 | 107808 | 107809 | 107810 | 107811 | 107812 | 107813 | 107814 | 107918 | 107919 | 107920 | 107921 | 107922 | 107923 | 107924 | 107925 | 108222 | 108223 | 108224 | 108225 | 108226 | 108227 | 108228 | 108229 | 108980 | 108981 | 108982 | 109306 | 109307 | 109308 | 109309 | 109310 | 109311 | 109312 | 109313 | 109314 | 109315 | 109316 | 109317 | 109318 | 109463 | 109464 | 109465 | 109466 | 109467 | 109468 | 109469 | 109775 | 109776 | 109777 | 109778 | 109779 | 109780 | 109781 | 109782 | 109783 | 109784 | 109785 | 111199 | 111200 | 111201 | 111202 | 111203 | 111204 | 111205 | 111206 | 112316 | 112317 | 112321 | 112322 | 112323 | 112324 | 112325 | 112326 | 112346 | 112472 | 112491 | 112540 | 112612 | 112613 | 112614 | 112615 | 112616 | 112617 | 112618 | 112619 | 112620 | 112621 | 112622 | 113195 | 113196 | 113197 | 113198 | 113199 | 113200 | 113201 | 113202 | 113203 | 113204 | 113205 | 113286 | 113287 | 113288 | 113289 | 113290 | 113291 | 113292 | 113293 | 113294 | 113295 | 113296 | 113297 | 113298 | 113335 | 113351 | 113352 | 113353 | 113354 | 113355 | 113356 | 113357 | 113358 | 113359 | 113361 | 113362 | 113363 | 113364 | 113365 | 113430 | 113431 | 113432 | 113433 | 113434 | 113435 | 113436 | 113437 | 113438 | 113439 | 113440 | 113441 | 113442 | 113443 | 113444 | 113445 | 116121 | 116122 | 116123 | 116124 | 116125 | 116126 | 116127 | 116128 | 116129 | 116130 | 116131 | 116132 | 116133 | 116134 | 118267 | 118268 | 118269 | 118270 | 118271 | 118272 | 118273 | 118274 | 118275 | 118276 | 118277 | 118278 | 118279 | 118280 | 122993 | 122994 | 122995 | 122996 | 122997 | 122998 | 122999 | 123000 | 123001 | 123002 | 123003 | 123004 | 123005 | 126244 | 126245 | 126246 | 126247 | 126248 | 126249 | 126250 | 126251 | 126252 | 126253 | 126254 | 126255 | 126256 | 126257 | 126453 | 126454 | 126455 | 126456 | 126457 | 126458 | 126459 | 126460 | 126469 | 126470 | 126565 | 126566 | 126568 | 126569 | 126570 | 126571 | 126572 | 126573 | 126574 | 126575 | 126576 | 126577 | 126578 | 126579 | 126580 | 129305 | 129306 | 129307 | 129308 | 129309 | 129310 | 129311 | 129312 | 129313 | 129314 | 129315 | 129316 | 129317 | 129318 | 129319 | 130641 | 130642 | 130643 | 130644 | 130645 | 130646 | 130647 | 130648 | 130649 | 130650 | 130651 | 130652 | 130653 | 130654 | 130655 | 130656 | 131108 | 131156 | 131157 | 131158 | 131159 | 131160 | 131193 | 131213 | 131257 | 131260 | 131261 | 131262 | 131263 | 131264 | 131265 | 131266 | 131267 | 131268 | 131269 | 131270 | 131271 | 131272 | 131273 | 131274 | 131275 | 131276 | 131277 | 131278 | 131279 | 131280 | 131281 | 131282 | 131330 | 131629 | 131630 | 131631 | 131664 | 131665 | 131666 | 131701 | 132332