From ead2d3b3464ec9c270d9897c28bad15c2b2b0da2 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Tue, 2 May 2017 20:20:14 +0000 Subject: [PATCH] Bug 18503: Fixes confusing dialog and other minor This corrects the returns2 dialog logic, and cleans up a few pieces of code. Patch also updates some buttons and fixes check in layout. To Test: 1) Check out an item. 2) Check item in. Note old buttons (Submit next to barcode, Clear). Note message next to calendar is wrapping to next line. Note Clear button is next to the check box rather than next to the calendar. 3) Check in item at a different branch both with AllowReturnToBranch in all four settings and with AutomaticItemReturn set to Do and Don't. Note old style buttons on all dialogs. 4) Place a hold on an item for pickup at another library. 5) Trigger the hold and confirm. 6) Check in item at another library (not the pickup location). 7) Note the confusing transfer/hold buttons and message. 8) Apply patch 9) Repeat steps 1-8. Note changes to the items pointed out in those steps. --- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 130 ++++++++++++--------- 1 file changed, 78 insertions(+), 52 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 63bee06..03eaf56 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -183,12 +183,12 @@ $(document).ready(function () { [% END %] -[% IF ( collectionItemNeedsTransferred ) %] +[% IF collectionItemNeedsTransferred %]

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

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

This item is part of a rotating collection.

-

+

[% END %] @@ -203,7 +203,7 @@ $(document).ready(function () { [% END %] -[% IF ( fines ) %] +[% IF fines %]

Patron has outstanding fines of [% fines %].

Make payment.

@@ -211,7 +211,7 @@ $(document).ready(function () { [% END %] -[% IF ( waiting_holds ) %] +[% IF waiting_holds %]

[% holdsfirstname %] [% holdssurname %] has [% waiting_holds %] hold(s) waiting for pickup.

Check out to this patron.

@@ -230,7 +230,7 @@ $(document).ready(function () {
[% END %] -[% IF ( wrongbranch ) %] +[% IF wrongbranch %]

Cannot check in

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

NOT CHECKED IN

@@ -238,40 +238,60 @@ $(document).ready(function () {
[% END %] - -[% IF ( WrongTransfer ) %] -
- -

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

-

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

- - - [% IF ( wborcnum ) %]
Hold for:
- - -
- - - - - - - - - - -
- [% END %] -
+ +[% IF WrongTransfer %] + [% IF !wborcnum %] + +
+

Transfer in progress to:
+ [% Branches.GetName( TransferWaitingAt ) %]

+

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

+ + +
+ [% ELSIF wborcnum %] + + + [% END %] [% END %] [% IF ( found ) %] @@ -387,11 +407,11 @@ $(document).ready(function () { [% END %]
- + - + [% FOREACH inputloo IN inputloop %] @@ -409,26 +429,31 @@ $(document).ready(function () {
[% END %] - [% IF ( transfer ) %] + [% IF transfer || ( WrongTransfer && !wborcnum ) %]

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

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

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

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

- Transfer now?
+
+

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

+ Transfer now?
+

[% IF itemnumber %] - + [% END %] - - + + @@ -688,19 +713,20 @@ $(document).ready(function () { [% ELSE %] [% END %] - + [% IF Koha.Preference('SpecifyReturnDate') %]
Specify return date [% INCLUDE 'date-format.inc' %]:
+ +
[% IF ( return_date_override_remember ) %] [% ELSE %] [% END %] -
[% END %] [% FOREACH inputloo IN inputloop %] -- 2.1.4