[spalenque] - #14456 * add rsvp waitlist template

santipalenque · santipalenque · commit deb78ec401d2 · 2018-11-14T09:41:44.000-03:00
diff --git a/summit/_config.php b/summit/_config.php
@@ -507,6 +507,7 @@
 define('MEMBER_PROMO_CODE_EMAIL', 'member-promo-code');
 define('MEMBER_NOTIFICATION_PROMO_CODE_EMAIL_FROM', 'speakersupport@openstack.org');
 define('SUMMIT_ATTENDEE_RSVP_EMAIL','summit-attendee-rsvp');
+define('SUMMIT_ATTENDEE_RSVP_WAITLIST_EMAIL','summit-attendee-rsvp-waitlist');
 define('SUMMIT_ATTENDEE_RSVP_EMAIL_FROM','summit@openstack.org');
 
 // Second Break Out Email Templates
diff --git a/summit/code/infrastructure/services/SummitAttendeeRSVPEmailSender.php b/summit/code/infrastructure/services/SummitAttendeeRSVPEmailSender.php
@@ -22,25 +22,26 @@ public function send($subject)
     {
 
         if(!is_array($subject)) return;
-        if(!isset($subject['Event']) || !isset($subject['Member']) || !isset($subject['RsvpID'])) return;
+        if(!isset($subject['Event']) || !isset($subject['Member']) || !isset($subject['Rsvp'])) return;
         $event     = $subject['Event'];
         $member    = $subject['Member'];
-        $rsvp_id   = $subject['RsvpID'];
+        $rsvp      = $subject['Rsvp'];
 
         //create confirmation number
         $summit_title = substr($event->Summit()->Title,0,3);
         $summit_year = date('y', strtotime($event->Summit()->SummitBeginDate));
-        $confirmation_nbr = strtoupper($summit_title).$summit_year.$rsvp_id;
+        $confirmation_nbr = strtoupper($summit_title).$summit_year.$rsvp->ID;
+        $emailTemplate = ($rsvp->SeatType == IRSVP::SeatTypeRegular) ? SUMMIT_ATTENDEE_RSVP_EMAIL : SUMMIT_ATTENDEE_RSVP_WAITLIST_EMAIL;
 
-        $email = PermamailTemplate::get()->filter('Identifier', SUMMIT_ATTENDEE_RSVP_EMAIL)->first();
-        if(is_null($email)) throw new Exception(sprintf('Email Template %s does not exists on DB!', SUMMIT_ATTENDEE_RSVP_EMAIL));
+        $email = PermamailTemplate::get()->filter('Identifier', $emailTemplate)->first();
+        if(is_null($email)) throw new Exception(sprintf('Email Template %s does not exists on DB!', $emailTemplate));
 
         $email = EmailFactory::getInstance()->buildEmail(SUMMIT_ATTENDEE_RSVP_EMAIL_FROM, $member->getEmail());
 
         $schedule_page = SummitAppSchedPage::getBy($event->Summit());
         if(is_null($schedule_page)) throw new NotFoundEntityException('Summit Schedule page does not exists!');
 
-        $email->setUserTemplate(SUMMIT_ATTENDEE_RSVP_EMAIL)->populateTemplate(
+        $email->setUserTemplate($emailTemplate)->populateTemplate(
             array
             (
                 'Event'                => $event,
diff --git a/summit/code/models/managers/ScheduleManager.php b/summit/code/models/managers/ScheduleManager.php
@@ -290,7 +290,7 @@ public function addRSVP(array $data, IMessageSenderService $sender_service)
 
             if (!is_null($sender_service)) {
                 $rsvp->BeenEmailed = true;
-                $sender_service->send(['Event' => $event, 'Member' => $member, 'RsvpID' => $rsvp->ID]);
+                $sender_service->send(['Event' => $event, 'Member' => $member, 'Rsvp' => $rsvp]);
             }
 
             return $rsvp;
@@ -387,7 +387,7 @@ public function updateRSVP(array $data, IMessageSenderService $sender_service)
 
             if (!is_null($sender_service)) {
                 $rsvp->BeenEmailed = true;
-                $sender_service->send(['Event' => $event, 'Member' => $member, 'RsvpID' => $rsvp->ID]);
+                $sender_service->send(['Event' => $event, 'Member' => $member, 'Rsvp' => $rsvp]);
             }
 
             return $rsvp;

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ public function addRSVP(array $data, IMessageSenderService $sender_service)`
`290`	`290`
`291`	`291`	`if (!is_null($sender_service)) {`
`292`	`292`	`$rsvp->BeenEmailed = true;`
`293`		`- $sender_service->send(['Event' => $event, 'Member' => $member, 'RsvpID' => $rsvp->ID]);`
	`293`	`+ $sender_service->send(['Event' => $event, 'Member' => $member, 'Rsvp' => $rsvp]);`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`return $rsvp;`
`@@ -387,7 +387,7 @@ public function updateRSVP(array $data, IMessageSenderService $sender_service)`
`387`	`387`
`388`	`388`	`if (!is_null($sender_service)) {`
`389`	`389`	`$rsvp->BeenEmailed = true;`
`390`		`- $sender_service->send(['Event' => $event, 'Member' => $member, 'RsvpID' => $rsvp->ID]);`
	`390`	`+ $sender_service->send(['Event' => $event, 'Member' => $member, 'Rsvp' => $rsvp]);`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`return $rsvp;`