From 3a9aadf44e4c7fd7c0bf9b8324cd2809004d4d03 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Mon, 24 Apr 2017 23:52:14 +0000 Subject: [PATCH] [Bug 18490] Change transfer message/show cancel This patch changes the transfer message and shows the cancel button on the first checkin. I've also cleaned up some formatting in the code. To test: Test A: 1) Check in an item at a library other than its homebranch. Test B: 2) Place an item on hold to be picked up at another library. 3) Check in the item at a library other than the home branch or pickup loccation. Test C: 4) Add item to a rotating collection. 5) Transfer collection to another library. 6) Check in the item to trigger the transfer. 7) On each test, notice the phrase "Please transfer item to:" and notice that the Cancel transfer button does not appear on the first checkin. 8) Apply patch. 9) Repeat steps 1-6. 10) On each test notice the phrase is now "Transferring item to:" and notice that the Cancel transfer button now shows after the first checkin. --- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 163 +++++++++++---------- 1 file changed, 83 insertions(+), 80 deletions(-) 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 ba284bc..72739d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -183,7 +183,7 @@ $(document).ready(function () { [% IF ( collectionItemNeedsTransferred ) %]
-

Please transfer item to: [% Branches.GetName( collectionBranch ) %]

+

Transferring item to: [% Branches.GetName( collectionBranch ) %]

[% itembarcode |html %]: [% title |html %]

This item is part of a rotating collection.

@@ -229,32 +229,36 @@ $(document).ready(function () { [% IF ( WrongTransfer ) %]
-

Please return item to: [% Branches.GetName( TransferWaitingAt ) %]

-

[% itembarcode |html %]: [% title |html %]

+

Transferring item to: [% Branches.GetName( TransferWaitingAt ) %]

+

[% itembarcode |html %]: [% title |html %]

-[% IF ( wborcnum ) %]
Hold for:
- - -
- - - - - - - - - - -
- [% END %]
+ [% IF ( wborcnum ) %]
Hold for:
+ + +
+ + + + + + + + + + +
+ [% END %] +
[% END %] [% IF ( found ) %] @@ -350,7 +354,7 @@ $(document).ready(function () { [% END %] [% IF ( diffbranch ) %] - +

Hold needing transfer found

[% itembarcode |html %]: [% title |html %]

@@ -389,46 +393,48 @@ $(document).ready(function () { -
+ [% END %] [% IF ( transfer ) %]
-

Please return item to: [% Branches.GetName( returnbranch ) %]

+

Transferring item to: [% Branches.GetName( returnbranch ) %]

[% itembarcode |html %]: [% title |html %]

-

+ +
[% END %] [% IF ( needstransfer ) %] - -

This item needs to be transferred to [% Branches.GetName( returnbranch ) %]

- Transfer now?
-
- [% IF itemnumber %] - - [% END %] - - - - - - - - [% FOREACH inputloo IN inputloop %] - - - - [% END %] - - - -
+ +

This item needs to be transferred to [% Branches.GetName( returnbranch ) %]

+ Transfer now?
+
+ [% IF itemnumber %] + + [% END %] + + + + + + + + [% FOREACH inputloo IN inputloop %] + + + + [% END %] + + + +
+
[% END %] [% IF ( diffbranch ) %] - +

Item consigned:

@@ -456,7 +462,7 @@ $(document).ready(function () { [% IF ( reserved ) %] - +
[% title |html %]