From aa329bcc4a810c236c461797f078d21a95f18a50 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Fri, 18 Sep 2020 21:06:03 +0000 Subject: [PATCH] Bug 26280: Add unique class for each problem in returns.tt 1. Checkin an item with a bad barcode and see the prolem class also has a class called 'ret_badbarcode' 2. Checkin an item that triggers a lotforloan updated via UpdateNotForLoanStatusOnCheckin, notice the class 'ret_nflupdate'. 3. You should also see an updated_from and updated_to class. This should make it easier to target those for audio alerts 4. Checkin an item that triggers an location update and see the class 'ret_locationupdate' 5. Checkin an item that is not at its permenat location and you should see the class 'ret_ispermenant'. 6. Checkin an item that is not checkout and you should see the class 'ret_notissued' 7. Checkin lost items with BlockReturnOfLostItems set to 'Dont block' and see the class 'ret_checkedin' 8. Checkin lost items with BlockReturnOfLostItems set to 'block' and see the class 'ret_blocked' 9. Checkin lost items with a fee on the patron's account for that lost item and see the class 'ret_feeremains' 10. Checkin item that is withdrawn and see the class 'ret_withdrawn' Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../prog/en/modules/circ/returns.tt | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 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 fefcc8f02e..31c03fa898 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -192,24 +192,28 @@ [% END %] [% FOREACH errmsgloo IN errmsgloop %] [% IF ( errmsgloo.NotForLoanStatusUpdated ) %] -

+

Not for loan status updated.
Old value: [% IF errmsgloo.NotForLoanStatusUpdated.from %] - [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => errmsgloo.NotForLoanStatusUpdated.from ) | html %]. + + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => errmsgloo.NotForLoanStatusUpdated.from ) | html %]. + [% ELSE %] Available for loan. [% END %]
New value: [% IF errmsgloo.NotForLoanStatusUpdated.to %] - [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => errmsgloo.NotForLoanStatusUpdated.to ) | html %]. + + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => errmsgloo.NotForLoanStatusUpdated.to ) | html %]. + [% ELSE %] Available for loan. [% END %]

[% END %] [% IF ( errmsgloo.ItemLocationUpdated ) %] -

+

Item shelving location updated.
Old value: [% IF errmsgloo.ItemLocationUpdated.from %] @@ -240,30 +244,30 @@

[% END %] [% IF ( errmsgloo.badbarcode ) %] -

No item with barcode: [% errmsgloo.msg | html %]

+

No item with barcode: [% errmsgloo.msg | html %]

[% END %] [% IF ( errmsgloo.ispermanent ) %] -

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

+

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

[% END %] [% IF ( errmsgloo.notissued ) %] -

Not checked out.

+

Not checked out.

[% END %] [% IF ( errmsgloo.localuse) %] -

Local use recorded

+

Local use recorded

[% END %] [% IF ( errmsgloo.waslost ) %] [% IF Koha.Preference('BlockReturnOfLostItems') %] -

Item is lost, cannot be checked in.

+

Item is lost, cannot be checked in.

[% ELSE %] -

Item was lost, now found.

+

Item was lost, now found.

[% END %] [% IF LostItemFeeRefunded and not Koha.Preference('BlockReturnOfLostItems') %] -

A refund has been applied to the borrowing patron's account.

+

A refund has been applied to the borrowing patron's account.

[% ELSIF Koha.Preference('BlockReturnOfLostItems') %]
Cannot check in

NOT CHECKED IN

[% ELSE %] -

Any lost item fees for this item will remain on the patron's account.

+

Any lost item fees for this item will remain on the patron's account.

[% END %] [% END %] [% IF ( errmsgloo.withdrawn ) %] @@ -271,19 +275,19 @@
Cannot check in

NOT CHECKED IN

[% END %] -

Item is withdrawn.

+

Item is withdrawn.

[% END %] [% IF ( errmsgloo.debarred ) %] -

[% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %]) is now debarred until [% errmsgloo.debarred | $KohaDates %].

+

[% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %]) is now debarred until [% errmsgloo.debarred | $KohaDates %].

[% END %] [% IF ( errmsgloo.prevdebarred ) %] -

Reminder: Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].

+

Reminder: Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].

[% END %] [% IF ( errmsgloo.foreverdebarred ) %] -

Reminder: Patron has an indefinite restriction.

+

Reminder: Patron has an indefinite restriction.

[% END %] [% IF errmsgloo.data_corrupted %] -

The item has not been checked in due to a configuration issue in your system. You must ask an administrator to take a look at the about page and search for the "data problems" section

+

The item has not been checked in due to a configuration issue in your system. You must ask an administrator to take a look at the about page and search for the "data problems" section

[% END %] [% END # /FOREACH errmsgloo %] @@ -295,7 +299,7 @@ [% ELSE %]
[% END %] -

[% checkinmsg | html_line_break %]

+

[% checkinmsg | html_line_break %]

[% END # /IF checkinmsg %] [% END # /BLOCK all_checkin_messages %] -- 2.39.5