Attachment 110413 Details for Bug 26280 – Bug 26280: Add unique class for each problem in returns.tt

[patch] Bug 26280: Add unique class for each problem in returns.tt

Bug-26280-Add-unique-class-for-each-problem-in-ret.patch (text/plain), 11.04 KB, created by Lucas Gass (lukeg) on 2020-09-18 21:08:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas Gass (lukeg)

Created: 2020-09-18 21:08:02 UTC

Size: 11.04 KB

patch

obsolete

>From af967b4a5dd882a46c8ee39a67773f693fe429c4 Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>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'
>---
> .../intranet-tmpl/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 1e1ca7d2ff..31fed09dd6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -193,24 +193,28 @@
> [% END %]
> [% FOREACH errmsgloo IN errmsgloop %]
> [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
>- 
>+ 
> Not for loan status updated.
> Old value:
> [% IF errmsgloo.NotForLoanStatusUpdated.from %]
>- [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) | html %].
>+ 
>+ [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) | html %].
>+ 
> [% ELSE %]
> Available for loan.
> [% END %]
> New value:
> [% IF errmsgloo.NotForLoanStatusUpdated.to %]
>- [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) | html %].
>+ 
>+ [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) | html %].
>+ 
> [% ELSE %]
> Available for loan.
> [% END %]
> 
> [% END %]
> [% IF ( errmsgloo.ItemLocationUpdated ) %]
>- 
>+ 
> Item shelving location updated.
> Old value:
> [% IF errmsgloo.ItemLocationUpdated.from %]
>@@ -239,30 +243,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') %]
> <h5>Cannot check in</h5>
> 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 ) %]
>@@ -270,19 +274,19 @@
> <h5>Cannot check in</h5>
> NOT CHECKED IN
> [% END %]
>- Item is withdrawn.
>+ Item is withdrawn.
> [% END %]
> [% IF ( errmsgloo.debarred ) %]
>- <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber | uri %]">[% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].
>+ <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber | uri %]">[% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %])</a> 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 <a href="/cgi-bin/koha/about.pl#sysinfo">about page</a> 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 <a href="/cgi-bin/koha/about.pl#sysinfo">about page</a> and search for the "data problems" section
> [% END %]
> [% END # /FOREACH errmsgloo %]
> </div> 
>@@ -294,7 +298,7 @@
> [% ELSE %]
> <div class="dialog message">
> [% END %]
>- [% checkinmsg | html_line_break %]
>+ [% checkinmsg | html_line_break %]
> </div>
> [% END # /IF checkinmsg %]
> [% END # /BLOCK all_checkin_messages %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 26280: 109774 | 110413 | 110601 | 110612