Attachment 79686 Details for Bug 21346 – Bug 21346: Update/Fix dialogs - Fix hold waiting

[patch] Bug 21346: Update/Fix dialogs - Fix hold waiting

Bug-21346-UpdateFix-dialogs---Fix-hold-waiting.patch (text/plain), 7.28 KB, created by Christopher Brannon on 2018-10-01 01:49:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Brannon

Created: 2018-10-01 01:49:03 UTC

Size: 7.28 KB

patch

obsolete

>From e3f6196bf1fa6fbda125d884ef8e489a93c661a0 Mon Sep 17 00:00:00 2001
>From: Christopher Brannon <cbrannon@cdalibrary.org>
>Date: Mon, 1 Oct 2018 01:30:58 +0000
>Subject: [PATCH] Bug 21346: Update/Fix dialogs - Fix hold waiting
>
>TEST PLAN
>1) Place a hold on an item from Branch A to be delivered to Branch B.
>2) Checkin the item at Branch A and confifm the hold to transfer.
>3) Be human and make a mistake.  Login as Branch C and check the item in
>4) Note the great modal to redirect the hold.  Note that the old dialog
>is behind it!
>5) Check in the item at Branch B to put it in waiting status.
>6) Be human and make another mistake.  Login as Branch C and check the
>item in.  Notice it does nothing except a local use.
>7) Check out an item at Branch A.
>8) Check in the item at Branch B.  Notice the classic blue transfer
>dialog at the top of page.
>9) Apply the patch.
>10) Check everything in at their branches.
>11) Repeat steps 1-8.  Now note the classic dialogs are gone and nothing
>but the modals left.  Note that the waiting hold will now reroute back
>the place it should be waiting.
>---
> circ/returns.pl                                    |  2 +
> .../intranet-tmpl/prog/en/modules/circ/returns.tt  | 68 +++++++++-------------
> 2 files changed, 31 insertions(+), 39 deletions(-)
>
>diff --git a/circ/returns.pl b/circ/returns.pl
>index c2f20ef..cbfa556 100755
>--- a/circ/returns.pl
>+++ b/circ/returns.pl
>@@ -448,6 +448,8 @@ if ( $messages->{'ResFound'}) {
>         if ( $reserve->{'ResFound'} eq "Waiting" ) {
>             $template->param(
>                 waiting      => ($userenv_branch eq $reserve->{'branchcode'} ? 1 : 0 ),
>+                transfertodo => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ),
>+                reserved     => 1,
>             );
>         } elsif ( $reserve->{'ResFound'} eq "Reserved" ) {
>             $template->param(
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>index 74b24f6..0e524ec 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -170,36 +170,35 @@
>     </div>
> [% END %]
> 
>-
>-[% IF ( WrongTransfer ) %]
>-    <div id="return2" class="dialog message">
>-        
>-        <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]</h3>
>-            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
>-        <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% TransferWaitingAt | html %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
>-        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | html %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
>-[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>
>-        <ul>
>-            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">
>-            [% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li>
>-            [% INCLUDE display_holdpatron_address %]
>-            [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]
>-            [% IF ( patron.email ) %]<li><a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a></li>[% END %]
>-        </ul>
>-
>-    <form method="post" action="returns.pl" class="confirm">
>-            <input type="hidden" name="WT-itemNumber" value="[% WrongTransferItem | html %]" />
>-            <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt | html %]" />
>-            <input type="hidden" name="WT-From" value="[% wtransfertFrom | html %]" />
>-            <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button>
>-            <input type="hidden" name="print_slip" value="0" />
>-            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
>-            <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
>-            <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();"><i class="fa fa-print"></i> Print slip and confirm</button>
>-        <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
>-        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
>-    </form>
>-    [% END %]</div>
>+
>+[% IF ( transfer || ( WrongTransfer && !reserved ) ) %]
>+    <div id="transfer1" class="modal fade audio-alert-action">
>+        <div class="modal-dialog">
>+            <div class="modal-content">
>+                <form method="post" action="returns.pl" class="confirm">
>+                    <div class="modal-header">
>+                        <h3>
>+                            Please return item to: [% Branches.GetName( returnbranch ) | html %]
>+                            <br />
>+                            <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]
>+                            </a>
>+                        </h3>
>+                    </div>
>+                    <div class="modal-body">
>+
>+                    </div>
>+                    <div class="modal-footer">
>+                        <button type="submit" class="btn btn-default approve" data-dismiss="modal">
>+                            <i class="fa fa-check"></i> Confirm
>+                        </button>
>+                        <button type="button" class="openWin btn btn-default print" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;branchcode=[% returnbranch | html %]&amp;op=slip" onclick="this.form.submit();"><i class="fa fa-print"></i> Print slip and confirm
>+
>+                        </button>
>+                    </div>
>+                </form>
>+            </div>
>+        </div>
>+    </div>
> [% END %]
> 
> [% IF ( found ) %]
>@@ -334,15 +333,6 @@
>             <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
>             <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
>         </form>
>-		</div>
>-    [% END %]
>-
>-    [% IF ( transfer ) %]
>-    
>-        <div id="return1" class="dialog message audio-alert-action">
>-            <h3>Please return item to: [% Branches.GetName( returnbranch ) | html %]</h3>
>-            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
>-            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
>         </div>
>     [% END %]
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 21346: 78724 | 78726 | 78902 | 78915 | 78916 | 78942 | 78943 | 79685 | 79686 | 80879 | 81100 | 81836 | 81853 | 81921 | 81924 | 82049 | 82189 | 82190 | 82191 | 82192 | 82891 | 87625 | 87626 | 87627 | 87628 | 87894 | 87895 | 87896 | 87898