Attachment 111025 Details for Bug 21898 – Bug 21898: Add aqbasket to available tables for AQORDER

[patch] Bug 21898: Add aqbasket to available tables for AQORDER

Bug-21898-Add-aqbasket-to-available-tables-for-AQO.patch (text/plain), 2.24 KB, created by Martin Renvoize (ashimema) on 2020-10-01 08:17:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-10-01 08:17:06 UTC

Size: 2.24 KB

patch

obsolete

>From 383ffcab067be833c6f94b51c87bc7091f61809f Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 1 Oct 2020 09:04:43 +0100
>Subject: [PATCH] Bug 21898: Add aqbasket to available tables for AQORDER
>
>This patch should allow <<aqbasket.$field>> replacements to work in both
>email subject and email content fields for notices.
>
>Test plan
>1/ Add <<aqbasket.basketname>> into the AQORDER notice (In the subject
>line and content box)
>2/ Trigger said notice to send (before applying the patch)
>3/ Note that the replacements have not taken place..
><<aqbasket.basketname>> is present as is.
>4/ Apply patch
>5/ Trigger the notice again
>6/ Note that the replacements are now made.
>7/ Signoff
>---
> C4/Letters.pm | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/C4/Letters.pm b/C4/Letters.pm
>index dbbb6fdf9f..d2ac3857fc 100644
>--- a/C4/Letters.pm
>+++ b/C4/Letters.pm
>@@ -464,9 +464,10 @@ sub SendAlerts {
>             letter_code => $letter_code,
>             branchcode => $userenv->{branch},
>             tables => {
>-                'branches'    => $userenv->{branch},
>+                'branches'      => $userenv->{branch},
>                 'aqbooksellers' => $databookseller,
>                 'aqcontacts'    => $datacontact,
>+                'aqbasket'     => $externalid,
>             },
>             repeat => $dataorders,
>             want_librarian => 1,
>@@ -750,6 +751,7 @@ sub _parseletter_sth {
>     ($table eq 'suggestions'  )    ? "SELECT * FROM $table WHERE   suggestionid = ?"                                  :
>     ($table eq 'aqbooksellers')    ? "SELECT * FROM $table WHERE             id = ?"                                  :
>     ($table eq 'aqorders'     )    ? "SELECT * FROM $table WHERE    ordernumber = ?"                                  :
>+    ($table eq 'aqbasket'     )    ? "SELECT * FROM $table WHERE       basketno = ?"                                  :
>     ($table eq 'opac_news'    )    ? "SELECT * FROM $table WHERE          idnew = ?"                                  :
>     ($table eq 'article_requests') ? "SELECT * FROM $table WHERE             id = ?"                                  :
>     ($table eq 'borrower_modifications') ? "SELECT * FROM $table WHERE verification_token = ?" :
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 21898: 111024 | 111025 | 112027 | 112039 | 112979 | 112980