Merge pull request #546 from SFDO-Community/2024_jan_fix_before_release

2024 jan fix before release

force-app/main/default/classes/SummitEventsAdditionalQuestionsCtlr.cls

@@ -21,7 +21,7 @@ public with sharing class SummitEventsAdditionalQuestionsCtlr {
     public List<questionItem> questionWrapper { get; set; }
     private Id incomingRegId { get; set; }
     public Map<String, String> lookUpDisplayValue { get; set; }
-
+    public String nextUrl { get; set; }
 
     public class questionItem {
         public String questionId { get; set; }
@@ -85,6 +85,7 @@ public with sharing class SummitEventsAdditionalQuestionsCtlr {
 
             templateSelected = SummitEventsShared.getTemplate(eventPage.Template__c);
             pageFlow = SummitEventsShared.getPageFlow(eventInformation.eventId, eventInstance.Instance_Title__c, ApexPages.currentPage(), eventInstance.Instance_Start_Date__c, eventInstance.Instance_End_Date__c);
+            nextUrl = pageFlow.get('Next').getUrl().toLowerCase();
             formattedNavDate = SummitEventsShared.navBreadcrumbBuilder(eventInstance);
             instanceName = eventInstance.Name;
             startTimeString = SummitEventsShared.formatTime(eventInstance.Instance_Start_Time__c, false);

force-app/main/default/classes/SummitEventsRegistration.cls

@@ -87,37 +87,38 @@ public class SummitEventsRegistration {
         ];
 
         List<Task> activityUpdates = new List<Task>();
+        List<Messaging.SingleEmailMessage> emailsToSend = new List<Messaging.SingleEmailMessage>();
 
         //loop through affected event registrations - have status change from old
-        for (Summit_Events_Registration__c areg : affectedRegs) {
+        for (Summit_Events_Registration__c registration : affectedRegs) {
             //Loop through gather email templates to get template and use registration fields to fill in hooks
             for (Summit_Events_Email__c em : matchEmail) {
                 Boolean statusMatch = false;
                 Boolean bccRegStatusMatch = false;
                 List<String> BCCsToGo = new List<String>();
-                if (em.Event__c.equals(areg.Event__c)) {
+                if (em.Event__c.equals(registration.Event__c)) {
 
                     statusMatch = false;
 
-                    if (String.isNotBlank(em.Action_Sub_status__c) && String.isNotBlank(areg.Substatus__c)) {
-                        if (em.Action_Sub_status__c.equals(areg.Substatus__c) && em.Action_Status__c.equalsIgnoreCase(areg.Status__c)) {
+                    if (String.isNotBlank(em.Action_Sub_status__c) && String.isNotBlank(registration.Substatus__c)) {
+                        if (em.Action_Sub_status__c.equals(registration.Substatus__c) && em.Action_Status__c.equalsIgnoreCase(registration.Status__c)) {
                             statusMatch = true;
                         }
-                    } else if (em.Action_Status__c.equals(areg.Status__c) && String.isBlank(em.Action_Sub_status__c) && String.isBlank(areg.Substatus__c)) {
+                    } else if (em.Action_Status__c.equals(registration.Status__c) && String.isBlank(em.Action_Sub_status__c) && String.isBlank(registration.Substatus__c)) {
                         statusMatch = true;
-                        if (String.isNotBlank(areg.BCC_Transactional_Email_Statuses__c)) {
-                            if (areg.BCC_Transactional_Email_Statuses__c.contains(em.Action_Status__c)) {
+                        if (String.isNotBlank(registration.BCC_Transactional_Email_Statuses__c)) {
+                            if (registration.BCC_Transactional_Email_Statuses__c.contains(em.Action_Status__c)) {
                                 bccRegStatusMatch = true;
                             }
                         }
                     }
 
                     //Build the BCC list. No duplicate emails. Split strings.
                     BCCsToGo = addToEmailList(em.BCC_Email__c, BCCsToGo);
-                    BCCsToGo = addToEmailList(areg.Registrant_Other_Email__c, BCCsToGo);
-                    BCCsToGo = addToEmailList(areg.Registrant_Parent_Email__c, BCCsToGo);
+                    BCCsToGo = addToEmailList(registration.Registrant_Other_Email__c, BCCsToGo);
+                    BCCsToGo = addToEmailList(registration.Registrant_Parent_Email__c, BCCsToGo);
                     if (bccRegStatusMatch) {
-                        BCCsToGo = addToEmailList(areg.BCC_Transactional_Emails__c, BCCsToGo);
+                        BCCsToGo = addToEmailList(registration.BCC_Transactional_Emails__c, BCCsToGo);
                     }
 
                     if (statusMatch) {
@@ -147,7 +148,7 @@ public class SummitEventsRegistration {
                                 //Get the value for hook from registration have to remove any registration object names since we are already in the object
                                 String found = matcher2.group(1).replace(namespace + 'Summit_Events_Registration__c.', '');
                                 try {
-                                    found = String.valueOf(areg.get(found));
+                                    found = String.valueOf(registration.get(found));
                                 } catch (Exception e) {
                                     found = '';
                                 }
@@ -156,8 +157,8 @@ public class SummitEventsRegistration {
                                 if (String.isBlank(found)) {
                                     found = '';
                                 }
-                                //replace all hooks with found values from regstration
 
+                                //replace all hooks with found values from registration
                                 if (emailTags.contains(matcher2.group(1))) {
                                     found = found.replace('_HL_ENCODED_', '<a href="');
                                     found = found.replace('_HL__blank_HL_', '</a>');
@@ -172,13 +173,28 @@ public class SummitEventsRegistration {
                         //put email content (after hooks have been replaced with values) into the email template
                         originalTemplate = originalTemplate.replaceAll('\\[\\[DONT_DELETE_CONTENT_HERE\\]\\]', emailContent);
 
-                        //send the message
-                        String emailMessage = sendEmail2(areg.Registrant_Email__c, originalTemplate, emailContent, em.Email_Subject__c, em.Org_Email_Id__c, BCCsToGo);
+                        //Create the email
+                        Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
+                        mail.setToAddresses(new String[]{
+                                registration.Registrant_Email__c
+                        });
+                        mail.setSubject(em.Email_Subject__c);
+                        mail.setBccAddresses(BCCsToGo);
+                        mail.setPlainTextBody(emailContent);
+                        if (String.isBlank(originalTemplate)) {
+                            mail.setHtmlBody(emailContent);
+                        } else {
+                            mail.setHtmlBody(originalTemplate);
+                        }
+                        mail.setOrgWideEmailAddressId(em.Org_Email_Id__c);
+
+                        //Add the email to the list of emails to send
+                        emailsToSend.add(mail);
 
                         //Create an activity task
                         Task nt = new Task();
-                        nt.WhatId = areg.Id;
-                        nt.WhoId = areg.Contact__c;
+                        nt.WhatId = registration.Id;
+                        nt.WhoId = registration.Contact__c;
                         nt.Type = 'Email';
                         nt.ActivityDate = Date.today();
                         nt.Subject = 'Event status email: ' + em.Action_Status__c + ' - ' + em.Email_Subject__c;
@@ -187,17 +203,34 @@ public class SummitEventsRegistration {
 
                         nt.Description = emailContent.replaceAll('</p>', '\n'); // Replaces </p> (the paragraph closing tag) with a line break, since it is functionally identical to a line break
                         nt.Description = nt.Description.replaceAll('<(.*?)>', ''); // Replaces angled brackets and everything between with an empty string
-                        nt.Description += '\n\n' + 'Registrant Email: ' + areg.Registrant_Email__c;
-                        nt.Description = emailMessage + '\n\n' + nt.Description;
+                        nt.Description += '\n\n' + 'Registrant Email: ' + registration.Registrant_Email__c;
+                        nt.Description = nt.Description;
 
+                        //Add the activity task to the list of activity tasks to save
                         activityUpdates.add(nt);
                     }
 
                 }
             }
         }
 
+        String emailMessage = 'Email successfully sent!';
+
+        if (emailsToSend.size() > 0) {
+            try {
+                Messaging.sendEmail(emailsToSend);
+            } catch (Exception ex) {
+                //If the email fails, we want to add the error message to the activity task description
+                emailMessage = 'Email failed with this error: ' + ex.getMessage();
+                System.debug(ex.getMessage());
+            }
+        }
+
         if (activityUpdates.size() > 0) {
+            //Add email status message to the activity task description
+            for (Task t : activityUpdates) {
+                t.Description = emailMessage + '\n\n' + t.Description;
+            }
             doCRUD crudToDo = new doCRUD();
             crudToDo.savTask(activityUpdates);
         }
@@ -248,32 +281,6 @@ public class SummitEventsRegistration {
         return res;
     }
 
-    public static String sendEmail2(String EmailTo, String HTMLBody, String plainBody, String Subject, Id OrgEmailId, List<String> BccList) {
-        String emailMessage = 'Email successfully sent!';
-        try {
-            Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
-            mail.setToAddresses(new String[]{
-                    EmailTo
-            });
-            mail.setSubject(Subject);
-            mail.setBccAddresses(BccList);
-            mail.setPlainTextBody(plainBody);
-            if (String.isBlank(HTMLBody)) {
-                mail.setHtmlBody(plainBody);
-            } else {
-                mail.setHtmlBody(HTMLBody);
-            }
-            mail.setOrgWideEmailAddressId(OrgEmailId);
-            Messaging.SendEmailResult [] r = Messaging.sendEmail(new Messaging.SingleEmailMessage[]{
-                    mail
-            });
-        } catch (Exception ex) {
-            emailMessage = 'Email failed with this error: ' + ex.getMessage();
-            System.debug(ex.getMessage());
-        }
-        return emailMessage;
-    }
-
     private without sharing class doCRUD {
 
         public void savTask(List<Task> taskToSave) {

force-app/main/default/classes/SummitEventsShared.cls

@@ -127,7 +127,7 @@ public with sharing class SummitEventsShared {
         }
 
         //If event has more than 1 item in list then submit page
-        if (pagesInEvent.size() > 1) {
+        if (pagesInEvent.size() > 1 && !(pagesInEvent.size() == 2 && pagesInEvent.contains(namespace + 'SummitEventsRegister') && pagesInEvent.contains(namespace + 'SummitEventsAdditionalQuestions'))) {
             pagesInEvent.add(namespace + 'SummitEventsSubmit');
         }
 

force-app/main/default/objects/Summit_Events_Registration__c/fields/Number_of_Guests__c.field-meta.xml

@@ -5,7 +5,7 @@
     <externalId>false</externalId>
     <inlineHelpText>Total Number of Guests not including the Registrant</inlineHelpText>
     <label>Number of Guests</label>
-    <precision>2</precision>
+    <precision>4</precision>
     <required>false</required>
     <scale>0</scale>
     <trackHistory>false</trackHistory>

force-app/main/default/objects/Summit_Events_Registration__c/fields/Preferred_First_Name_Formatted__c.field-meta.xml

@@ -5,7 +5,7 @@
     <formula>IF(!ISBLANK(Registrant_Preferred_First_Name__c), Registrant_Preferred_First_Name__c, Registrant_First_Name__c) + &apos; &apos; +
 Registrant_Last_Name__c</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
-    <label>Preferred First Name Formatted</label>
+    <label>Preferred Full Name Formatted</label>
     <required>false</required>
     <trackHistory>false</trackHistory>
     <trackTrending>false</trackTrending>

force-app/main/default/pages/GeneralSLDS.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>GeneralSLDS</label>
 </ApexPage>

force-app/main/default/pages/SummitEvents.page

@@ -26,7 +26,7 @@ Created by Thaddaeus Dahlberg on 5/1/2018.
                 const communityBaseURL = '{!communityBaseURL}';
             </script>
             <link href="{!URLFOR($Resource.SummitEventsAssets, '/css/calendar.css')}" rel="stylesheet" type="text/css"/>
-            <script src="{!URLFOR($Resource.SummitEventsAssets, '/fullcalendar/dist/index.global.min.js')}"></script>
+            <script src="{!URLFOR($Resource.SummitEventsAssets, '/fullcalendar/index.global.min.js')}"></script>
             <script src="{!URLFOR($Resource.SummitEventsAssets, '/js/moment.min.js')}"></script>
             <script src="{!URLFOR($Resource.SummitEventsAssets, '/js/calendar.js')}"></script>
             <!-- end copy -->

force-app/main/default/pages/SummitEvents.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEvents</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsAddToCalendar.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsAddToCalendar</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsAdditionalQuestions.page

@@ -277,7 +277,7 @@
                         </apex:repeat>
                         <div class="slds-col slds-size_1-of-1 slds-clearfix slds-p-around_x-small slds-p-vertical_xx-small">
                             <p class="slds-text-body slds-p-vertical_xx-small">
-                                <apex:commandButton action="{!submitAdditionalQuestions}" onClick="fadeout();" Value="Next" id="submitQuestions" styleClass="slds-button slds-button_brand slds-p-horizontal_xx-large slds-p-vertical_xx-small"/>
+                                <apex:commandButton action="{!submitAdditionalQuestions}" onClick="fadeout();" Value="{!IF(CONTAINS(nextUrl,'summiteventsconfirmation'), 'Register', 'Next')}" id="submitQuestions" styleClass="slds-button slds-button_brand slds-p-horizontal_xx-large slds-p-vertical_xx-small"/>
                                 <apex:commandLink action="{!previousPage}" onClick="fadeout();" Value="Previous" id="previousPage" styleClass="slds-button slds-button_neutral slds-p-horizontal_xx-large slds-p-vertical_xx-small" immediate="true"/>
                             </p>
                         </div>

force-app/main/default/pages/SummitEventsAdditionalQuestions.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsAdditionalQuestions</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsCancelReview.page

@@ -30,7 +30,7 @@ Created by Thaddaeus Dahlberg on 5/1/2018.
         <apex:define name="sectionNav"/>
         <apex:define name="body">
             <div class="slds-col slds-size_1-of-1 slds-p-vertical_x-small slds-p-vertical_xx-small">
-                <apex:messages/>
+                <apex:messages />
             </div>
             <apex:form id="SummitEventsRegistrationCancelReview" rendered="{!!eventOver && !eventNotFound && eventRegistration.Status__c != 'Cancelled'}" styleClass="slds-grid slds-wrap">
                 <div class="slds-col slds-size_1-of-1 slds-p-vertical_x-small slds-p-vertical_xx-small">

force-app/main/default/pages/SummitEventsCancelReview.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsCancelReview</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsConfirmation.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsConfirmation</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsDonation.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsDonation</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsHostAssignment.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsHostAssignment</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsLetterheadLookup.page-meta.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>51.0</apiVersion>
+    <apiVersion>56.0</apiVersion>
     <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsLetterheadLookup</label>

force-app/main/default/pages/SummitEventsParkingPass.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsParkingPass</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsPrintItineraries.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsPrintItineraries</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsRegister.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsRegister</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsRegisterAppointments.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsRegisterAppointments</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsRegisterGuests.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsGuestRegistration</label>
 </ApexPage>

force-app/main/default/pages/SummitEventsSubmit.page-meta.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>56.0</apiVersion>
-    <availableInTouch>false</availableInTouch>
+    <availableInTouch>true</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>SummitEventsSubmit</label>
 </ApexPage>

force-app/main/default/pages/crowncollege2020.page-meta.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>49.0</apiVersion>
+    <apiVersion>56.0</apiVersion>
     <availableInTouch>false</availableInTouch>
     <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>crowncollege2020</label>