From 5354f36df1d5bb5472c4a548c54164e73d0cd9ae Mon Sep 17 00:00:00 2001 From: romanetar Date: Thu, 21 Nov 2024 14:27:58 +0100 Subject: [PATCH 1/2] feat: new variable for venue address in email ticket template Signed-off-by: romanetar --- app/Jobs/Emails/IMailTemplatesConstants.php | 1 + .../Registration/Attendees/SummitAttendeeTicketEmail.php | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/app/Jobs/Emails/IMailTemplatesConstants.php b/app/Jobs/Emails/IMailTemplatesConstants.php index 829962f50..3ea5b11c8 100644 --- a/app/Jobs/Emails/IMailTemplatesConstants.php +++ b/app/Jobs/Emails/IMailTemplatesConstants.php @@ -197,6 +197,7 @@ interface IMailTemplatesConstants const type = 'type'; const until_date = 'until_date'; const virtual_event_site_link = 'virtual_event_site_link'; + const venue_address = 'venue_address'; const summit_marketing_site_url_magic_link = 'summit_marketing_site_url_magic_link'; const edit_ticket_link = 'edit_ticket_link'; diff --git a/app/Jobs/Emails/Registration/Attendees/SummitAttendeeTicketEmail.php b/app/Jobs/Emails/Registration/Attendees/SummitAttendeeTicketEmail.php index cfe5220f2..9c9bdc03c 100644 --- a/app/Jobs/Emails/Registration/Attendees/SummitAttendeeTicketEmail.php +++ b/app/Jobs/Emails/Registration/Attendees/SummitAttendeeTicketEmail.php @@ -18,6 +18,7 @@ use Illuminate\Support\Facades\Log; use libs\utils\FormatUtils; use models\summit\SummitAttendeeTicket; +use models\summit\SummitVenue; use SimpleSoftwareIO\QrCode\Facades\QrCode; /** * Class SummitAttendeeTicketEmail @@ -98,6 +99,13 @@ public function __construct(SummitAttendeeTicket $ticket, array $payload = [], ? $payload[IMailTemplatesConstants::promo_code] = ($ticket->hasPromoCode()) ? $ticket->getPromoCode()->getCode() : ''; + $main_venue_addresses = collect($ticket->getOrder()->getSummit()->getMainVenues()) + ->map(function(SummitVenue $venue) { + return $venue->getAddress1() . ' ' . $venue->getAddress2() . ', ' . $venue->getCity() . ', ' . $venue->getState(); + })->toArray(); + + $payload[IMailTemplatesConstants::venue_address] = implode('-', $main_venue_addresses); + $support_email = $summit->getSupportEmail(); $payload[IMailTemplatesConstants::support_email] = !empty($support_email) ? $support_email : Config::get("registration.support_email", null); @@ -196,6 +204,7 @@ public static function getEmailTemplateSchema(): array{ $payload[IMailTemplatesConstants::owner_full_name]['type'] = 'string'; $payload[IMailTemplatesConstants::owner_company]['type'] = 'string'; $payload[IMailTemplatesConstants::promo_code]['type'] = 'string'; + $payload[IMailTemplatesConstants::venue_address]['type'] = 'string'; $payload[IMailTemplatesConstants::support_email]['type'] = 'string'; $payload[IMailTemplatesConstants::message]['type'] = 'string'; From 6b497faf00b0424d26996672eed4ab1d1bd37432 Mon Sep 17 00:00:00 2001 From: romanetar Date: Thu, 21 Nov 2024 14:34:12 +0100 Subject: [PATCH 2/2] fix: new variable for venue address in email ticket template Signed-off-by: romanetar --- app/Jobs/Emails/IMailTemplatesConstants.php | 2 +- .../Registration/Attendees/SummitAttendeeTicketEmail.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Jobs/Emails/IMailTemplatesConstants.php b/app/Jobs/Emails/IMailTemplatesConstants.php index 3ea5b11c8..02437f2be 100644 --- a/app/Jobs/Emails/IMailTemplatesConstants.php +++ b/app/Jobs/Emails/IMailTemplatesConstants.php @@ -78,6 +78,7 @@ interface IMailTemplatesConstants const net_selling_price = 'net_selling_price'; const new_category = 'new_category'; const number = 'number'; + const main_venue_address = 'main_venue_address'; const old_category = 'old_category'; const order_amount = 'order_amount'; const order_amount_adjusted = 'order_amount_adjusted'; @@ -197,7 +198,6 @@ interface IMailTemplatesConstants const type = 'type'; const until_date = 'until_date'; const virtual_event_site_link = 'virtual_event_site_link'; - const venue_address = 'venue_address'; const summit_marketing_site_url_magic_link = 'summit_marketing_site_url_magic_link'; const edit_ticket_link = 'edit_ticket_link'; diff --git a/app/Jobs/Emails/Registration/Attendees/SummitAttendeeTicketEmail.php b/app/Jobs/Emails/Registration/Attendees/SummitAttendeeTicketEmail.php index 9c9bdc03c..98e6adcc2 100644 --- a/app/Jobs/Emails/Registration/Attendees/SummitAttendeeTicketEmail.php +++ b/app/Jobs/Emails/Registration/Attendees/SummitAttendeeTicketEmail.php @@ -104,7 +104,7 @@ public function __construct(SummitAttendeeTicket $ticket, array $payload = [], ? return $venue->getAddress1() . ' ' . $venue->getAddress2() . ', ' . $venue->getCity() . ', ' . $venue->getState(); })->toArray(); - $payload[IMailTemplatesConstants::venue_address] = implode('-', $main_venue_addresses); + $payload[IMailTemplatesConstants::main_venue_address] = implode(' - ', $main_venue_addresses); $support_email = $summit->getSupportEmail(); $payload[IMailTemplatesConstants::support_email] = !empty($support_email) ? $support_email : Config::get("registration.support_email", null); @@ -204,7 +204,7 @@ public static function getEmailTemplateSchema(): array{ $payload[IMailTemplatesConstants::owner_full_name]['type'] = 'string'; $payload[IMailTemplatesConstants::owner_company]['type'] = 'string'; $payload[IMailTemplatesConstants::promo_code]['type'] = 'string'; - $payload[IMailTemplatesConstants::venue_address]['type'] = 'string'; + $payload[IMailTemplatesConstants::main_venue_address]['type'] = 'string'; $payload[IMailTemplatesConstants::support_email]['type'] = 'string'; $payload[IMailTemplatesConstants::message]['type'] = 'string';