Bugzilla – Attachment 107103 Details for
Bug 23091
Add options to charge new or restore forgiven overdues when a lost item is returned
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23091: Add template handling for new messages
Bug-23091-Add-template-handling-for-new-messages.patch (text/plain), 2.73 KB, created by
Andrew Fuerste-Henry
on 2020-07-20 13:29:00 UTC
(
hide
)
Description:
Bug 23091: Add template handling for new messages
Filename:
MIME Type:
Creator:
Andrew Fuerste-Henry
Created:
2020-07-20 13:29:00 UTC
Size:
2.73 KB
patch
obsolete
>From 53700fc0ecf63a16c7acdeecaa8ce20d203d4c02 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Fri, 5 Jun 2020 09:19:48 +0100 >Subject: [PATCH] Bug 23091: Add template handling for new messages > >This patch adds handling for the display of the two new messages added >by this patchset in the returns screen. > >Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> >--- > circ/returns.pl | 6 ++++++ > koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++++ > 2 files changed, 10 insertions(+) > >diff --git a/circ/returns.pl b/circ/returns.pl >index e1bce3c3f1..f31f163a69 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -485,6 +485,12 @@ foreach my $code ( keys %$messages ) { > elsif ( $code eq 'LostItemFeeRefunded' ) { > $template->param( LostItemFeeRefunded => 1 ); > } >+ elsif ( $code eq 'LostItemFeeCharged' ) { >+ $template->param( LostItemFeeCharged => 1 ); >+ } >+ elsif ( $code eq 'LostItemFeeRestored' ) { >+ $template->param( LostItemFeeRestored => 1 ); >+ } > elsif ( $code eq 'ResFound' ) { > ; # FIXME... anything to do here? > } >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 57ad49518a..9c91914af2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -258,6 +258,10 @@ > [% END %] > [% IF LostItemFeeRefunded and not Koha.Preference('BlockReturnOfLostItems') %] > <p class="problem">A refund has been applied to the borrowing patron's account.</p> >+ [% ELSIF LostItemFeeCharged and not Koha.Preference('BlockReturnOfLostItems') %] >+ <p class="problem">A refund for the lost item charge has been applied to the borrowing patron's account, and new overdue charge has been calculated and applied.</p> >+ [% ELSIF LostItemFeeRestored and not Koha.Preference('BlockReturnOfLostItems') %] >+ <p class="problem">A refund for the lost item charge has been applied to the borrowing patron's account and if an overdue fine was forgiven when the item was marked as lost, it has been reverted.</p> > [% ELSIF Koha.Preference('BlockReturnOfLostItems') %] > <h5>Cannot check in</h5> > <p><strong>NOT CHECKED IN</strong></p> >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23091
:
96217
|
105529
|
105530
|
105531
|
105544
|
105545
|
105546
|
105547
|
105567
|
105649
|
106871
|
106872
|
106873
|
106874
|
106875
|
106876
|
106906
|
106907
|
106908
|
106909
|
106910
|
106911
|
106912
|
106961
|
107026
|
107027
|
107028
|
107029
|
107030
|
107031
|
107032
|
107033
|
107034
|
107100
|
107101
|
107102
|
107103
|
107104
|
107105
|
107106
|
107107
|
107108
|
107335
|
107336
|
107337
|
107338
|
107339
|
107340
|
107341
|
107342
|
107343
|
108718
|
108719
|
108720
|
108721
|
108722
|
108723
|
108724
|
109571
|
109572
|
109573
|
109574
|
109575
|
109576
|
109577
|
110660
|
110661
|
110662
|
110663
|
110664
|
110665
|
110666
|
110667
|
110720
|
110721
|
110722
|
110723
|
110724
|
110725
|
110726
|
110727
|
111501
|
111502
|
111503
|
111504
|
111505
|
111506
|
111507
|
111508
|
111935
|
111936
|
111965
|
111979
|
111980
|
111981
|
111982
|
111983
|
111984
|
111985
|
111986
|
111987
|
111988
|
111989
|
113081
|
113082
|
113083
|
113084
|
113085
|
113086
|
113087
|
113088
|
113089
|
113090
|
113091