From f3b362120f0b8a75a89ad6846e7bdad93b2e37ca Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Sun, 4 Nov 2018 03:47:30 +0000 Subject: [PATCH] Bug 21346: Convert dialogs to modals. This addresses most of the transfer dialogs. There are some dialogs that I have not converted because I don't know what triggers them, therefore I cannot test them. The following scenarios have been addresses, and should be tested: FOR TRANSFERS 1) Checkin with no issue, hold or transfer; not at home (AutomaticItemReturn set to Don't) * Should give 3 options - Yes, Yes with print, or No. * Yes and Yes with print should trigger a transfer back home. * No should do nothing. * Print should open a window for printing, with correct information. * All three options should close the modal. TO TEST: 1) Set AutomaticItemREturn to Don't. 2) Check in an item with no issues, holds or transfers set, at a location other than the owning library. 3) Test conditions above. 2) Checkin with no issue, hold or transfer; not at home (AutomaticItemReturn set to Do) * Should give 2 options - Print or OK. * Should automatically set transfer. * Print should open a window for printing, with correct information. * Both buttons should close modal. TO TEST: 1) Set AutomaticItemReturn to Do. 2) Check in an item with no issues, holds or transfers set, at a location other than the owning library. 3) Test conditions above. 3) Checkin with no issues or holds, but transfer already set * Should give 3 options - OK, Print or Cancel. * OK and print should not touch existing transfer. * Cancel should remove the exisiting transfer. * Print should open a window for printing, with correct information. * All three options should close the modal. TO TEST: 1) Check in an item following step 2 of either test above. 2) Check in item again, while a transfer exists. 3) Test conditions above. WRONG BRANCH 4) If AllowReturnToBranch is not set "to any library", and the item is not checked in at the appropriate branch, the wrong-branch-modal pops up: * Should give 1 option - OK. * Should not check anything in or initiate a transfer. * OK should close the modal. TO TEST: 1) Set AllowReturnToBranch to "only the library the item is from". You can test the other settings, as long as you pay attention to where you are checking the item in at. 2) Check in an item at a branch other than the owning library. 3) Test conditions above. Signed-off-by: Lisette Signed-off-by: Liz Rea Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 5ed171a45c46f63b18266ad3a3d0a978719ca285) Signed-off-by: Martin Renvoize --- .../prog/en/modules/circ/returns.tt | 173 +++++++++++------- 1 file changed, 107 insertions(+), 66 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 c39f8b0aba..632be38bba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -162,44 +162,70 @@ [% END %] -[% IF ( wrongbranch ) %] -

Cannot check in

-

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

-

NOT CHECKED IN

-

This item must be checked in at following library: [% Branches.GetName( rightbranch ) | html %]

+[% IF wrongbranch %] + [% END %] -[% IF ( WrongTransfer && !transfertodo ) %] -
- -

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

-

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

- - -[% IF ( patron.cardnumber ) %]
Hold for:
- - -
- - - - - - - - - - -
- [% END %]
+[% IF WrongTransfer && !transfertodo %] + [% END %] [% IF ( found ) %] @@ -337,39 +363,54 @@
[% END %] - [% IF ( transfer ) %] - -
-

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

-

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

-

+ [% IF transfer || needstransfer %] + [% END %] [% IF ( diffbranch ) %] -- 2.39.5