From fc977e8e8f9754faefd522928d3e62b015755235 Mon Sep 17 00:00:00 2001 From: Lisette Scheer Date: Wed, 15 May 2024 14:37:30 +0000 Subject: [PATCH] Bug 36020: Port default recall notices to Template Toolkit The following notices relating to recalls all need to be updated to use Template Toolkit syntax: RETURN_RECALLED_ITEM PICKUP_RECALLED_ITEM RECALL_REQUESTER_DET To test: 1) Observe the default notice contains <<>> tags 2) Apply the patch 3) reset_all 4) Check that the notice is now all in template toolkit [% %] tags 5) Enable recalls 6) Check an item out to a patron 7) Make sure the patron has a primary email 8) Make sure a secondary patron has a primary email 9) Generate a recall on the checked out item for the second patron 10) Check the first patron's notices tab to confirm the return recalled item notice generated properly. 11) Check the item back in and generate the recall slip and confirm it generated correctly. 12) Check the second patron's notices tab to confirm the pickup recalled item notice generated properly. Signed-off-by: Martin Renvoize --- .../mysql/en/mandatory/sample_notices.yml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index 7e411b92279..d95f9e380de 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -2257,11 +2257,11 @@ tables: message_transport_type: email lang: default content: - - "Date: <>" + - "Date: [% today | $KohaDates %]" - "" - - "<> <>," + - "[% borrower.firstname %] [% borrower.surname %]," - "" - - "A recall has been placed on the following item: <> / <> (<>). The due date has been updated, and is now <>. Please return the item before the due date." + - "A recall has been placed on the following item: [% biblio.title %] / [% biblio.author %] ([% item.barcode %]). The due date has been updated, and is now [% issue.date_due %]. Please return the item before the due date." - "" - "Thank you!" @@ -2274,11 +2274,11 @@ tables: message_transport_type: email lang: default content: - - "Date: <>" + - "Date: [% today | $KohaDates %]" - "" - - "<> <>," + - "[% borrower.firstname %] [% borrower.surname %]," - "" - - "A recall that you requested on the following item: <> / <> (<>) is now ready for you to pick up at <>. Please pick up your item by <>." + - "A recall that you requested on the following item: [% biblio.title %] / [% biblio.author %] ([% item.barcode %]) is now ready for you to pick up at [% recall.pickup_library_id %]. Please pick up your item by [% recalls.expiration_date %]." - "" - "Thank you!" @@ -2291,20 +2291,20 @@ tables: message_transport_type: print lang: default content: - - "Date: <>" + - "Date: [% today | $KohaDates %]" - "" - - "Recall for pickup at <>" - - "<>, <> (<>)" - - "<>" - - "<> <>, <>, <> <>" - - "<>" + - "Recall for pickup at [% branche.branchname %]" + - "[% borrower.surname %], [% borrower.firstname %] ([% borrower.cardnumber %])" + - "[% borrower.phone %]" + - "[% borrower.streetnumber %] [% borrower.address %], [% borrower.address2 %], [% borrower.city %] [% borrower.zipcode %]" + - "[% borrowes.email %]" - "" - "ITEM RECALLED" - - "<> by <>" - - "Barcode: <>" - - "Callnumber: <>" - - "Waiting since: <>" - - "Notes: <>" + - "[% biblio.title %] by [% biblio.author %]" + - "Barcode: [% item.barcode %]" + - "Callnumber: [% item.itemcallnumber %]" + - "Waiting since: [% recall.waiting_date %]" + - "Notes: [% recall.notes %]" - module: members code: 2FA_DISABLE -- 2.45.1