Bugzilla – Attachment 176478 Details for
Bug 36020
Port default recall notices to Template Toolkit
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 36020: (follow-up) Fix formatting and dates
Bug-36020-follow-up-Fix-formatting-and-dates.patch (text/plain), 5.59 KB, created by
Lisette Scheer
on 2025-01-13 22:29:35 UTC
(
hide
)
Description:
Bug 36020: (follow-up) Fix formatting and dates
Filename:
MIME Type:
Creator:
Lisette Scheer
Created:
2025-01-13 22:29:35 UTC
Size:
5.59 KB
patch
obsolete
>From c96d90c212f2ca85bfeb94f0f9f5f3595eae21b0 Mon Sep 17 00:00:00 2001 >From: Lisette Scheer <lisette@bywatersolutions.com> >Date: Mon, 13 Jan 2025 22:25:19 +0000 >Subject: [PATCH] Bug 36020: (follow-up) Fix formatting and dates > >RECALL_REQUESTER_DET will need to be marked as HTML. >I fixed all the issues from Comment 14. >--- > .../mysql/en/mandatory/sample_notices.yml | 39 ++++++++++--------- > 1 file changed, 20 insertions(+), 19 deletions(-) > >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index c4e416276c8..db73631a0ba 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -2394,7 +2394,7 @@ tables: > - "" > - "[% INCLUDE 'patron-title.inc' patron => borrower, no_title => 1, no_cardnumber => 1, no_html = 1 %]," > - "" >- - "A recall has been placed on the following item: [% INCLUDE 'biblio-title.inc' biblio=biblio link = 0, no_html = 1 %] / [% biblio.author %] ([% item.barcode %]). The due date has been updated, and is now [% issue.date_due %]. Please return the item before the due date." >+ - "A recall has been placed on the following item:[% INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %] / [% biblio.author %] ([% item.barcode %]). The due date has been updated, and is now [% item.onloan | $KohaDates %]. Please return the item before the due date." > - "" > - "Thank you!" > >@@ -2407,11 +2407,12 @@ tables: > message_transport_type: email > lang: default > content: >+ - "[%- USE Branches -%]" > - "Date: [% today | $KohaDates %]" > - "" > - "[% INCLUDE 'patron-title.inc' patron => borrower, no_title => 1, no_cardnumber => 1, no_html = 1 %]," > - "" >- - "A recall that you requested on the following item: [% INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %] / [% biblio.author %] ([% item.barcode %]) is now ready for you to pick up at [% recall.pickup_library_id %]. Please pick up your item by [% recall.expiration_date %]." >+ - "A recall that you requested on the following item:[% INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %] / [% biblio.author %] ([% item.barcode %]) is now ready for you to pick up at [% Branches.GetName( recall.pickup_library_id) %]. Please pick up your item by [% recall.expiration_date | $KohaDates %]." > - "" > - "Thank you!" > >@@ -2424,7 +2425,7 @@ tables: > message_transport_type: sms > lang: default > content: >- - "Your item has been recalled: <<biblio.title>> (<<items.barcode>>). Please return it by <<issues.date_due>." >+ - "Your item has been recalled:[% INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %] ([% item.barcode %]). Please return it by [% item.onloan | $KohaDates ]" > > - module: circulation > code: PICKUP_RECALLED_ITEM >@@ -2435,31 +2436,31 @@ tables: > message_transport_type: sms > lang: default > content: >- - "A recalled item: <<biblio.title>> (<<items.barcode>>) is ready for you to pick up at <<recalls.branchcode>>. Please collect by <<recalls.expirationdate>>." >+ - "[-% USE Branches -%]A recalled item:[% INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %]([% item.barcode %]) is ready for you to pick up at [% Branches.GetName( recall.pickup_library_id ) %]. Please collect by [% recall.expirationdate | $KohaDates %]." > > - module: circulation > code: RECALL_REQUESTER_DET > branchcode: "" > name: "Details of patron who recalled item" >- is_html: 0 >+ is_html: 1 > title: "Details of patron who recalled item" > message_transport_type: print > lang: default > content: >- - "Date: [% today | $KohaDates %]" >- - "" >- - "Recall for pickup at [% branch.branchname %]" >- - "[% INCLUDE 'patron-title.inc' patron => borrower, no_title => 1, no_html = 1 %]" >- - "[% borrower.phone %]" >- - "[% borrower.streetnumber %] [% borrower.address %], [% borrower.address2 %], [% borrower.city %] [% borrower.zipcode %]" >- - "[% borrower.email %]" >- - "" >- - "ITEM RECALLED" >- - "[% INCLUDE 'biblio-title.inc' biblio=biblio link = 0, no_html = 1 %] by [% biblio.author %]" >- - "Barcode: [% item.barcode %]" >- - "Callnumber: [% item.itemcallnumber %]" >- - "Waiting since: [% recall.waiting_date %]" >- - "Notes: [% recall.notes %]" >+ - "Date: [% today | $KohaDates %]<br>" >+ - "<br>" >+ - "Recall for pickup at [% branch.branchname %]<br>" >+ - "[% INCLUDE 'patron-title.inc' patron => borrower, no_title => 1, no_html = 1 %]<br>" >+ - "[% borrower.phone %]<br>" >+ - "[% borrower.streetnumber %] [% IF borrower.address %][% borrower.address %],[% END %][% IF borrower.address2 %] [% borrower.address2 %], [% END %][% borrower.city %] [% borrower.state %] [% borrower.zipcode %]<br>" >+ - "[% borrower.email %]<br>" >+ - "<br>" >+ - "ITEM RECALLED<br>" >+ - "[% INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %] by [% biblio.author %]<br>" >+ - "Barcode: [% item.barcode %]<br>" >+ - "Callnumber: [% item.itemcallnumber %]<br>" >+ - "Waiting since: [% recall.waiting_date %]<br>" >+ - "Notes: [% recall.notes %]<br>" > > - module: members > code: 2FA_DISABLE >-- >2.39.5
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 36020
:
166784
|
166934
|
166935
|
170885
|
170886
|
170887
|
170889
|
172134
|
172135
|
172147
|
172148
| 176478 |
176479