Skip to content

Commit 33796b0

Browse files
olsenrasmusolsenrasmus
authored
Merge pull request #364 from navikt/Email-failer-fix
Email failer fix
2 parents bfff23e + b73bb88 commit 33796b0

File tree

5 files changed

+41
-41
lines changed

5 files changed

+41
-41
lines changed

‎force-app/components/emailScheduling/classes/EmailSchedulingHelper.cls

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public with sharing class EmailSchedulingHelper {
4343
OR (EmailBeforeDate__c = TODAY
4444
AND EmailBeforeSent__c = FALSE
4545
AND EmailBeforeConfirmation__c = TRUE)
46-
OR (EmailManualDate__c = LAST_N_DAYS:10
46+
OR (EmailManualDate__c = TODAY
4747
AND EmailManualSent__c = FALSE
4848
AND EmailManualConfirmation__c = TRUE)
4949
OR (EmailReminderDate__c = TODAY

‎force-app/main/default/objects/Course__c/fields/EmailAfterStatus__c.field-meta.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
33
<fullName>EmailAfterStatus__c</fullName>
44
<externalId>false</externalId>
55
<formula>IF ( EmailAfterSendDatePassed__c,
66

7-
IF ( EmailAfterConfirmation__c,
7+
IF ( EmailAfterConfirmation__c,
88

9-
IF ( EmailAfterSent__c, &apos;✅ &apos; + $Label.EmailConfirmation_Sent ,
9+
IF ( EmailAfterSent__c, &apos;✅ &apos; + $Label.EmailConfirmation_Sent ,
1010

11-
IF ( TODAY() = EmailAfterDate__c,
12-
IF ( TIMENOW() &gt;= TIMEVALUE(&quot;09:15:00.000&quot;),
13-
&apos;❌ &apos; + $Label.EmailConfirmation_SendError,
14-
&apos;⏳ &apos; + $Label.EmailConfirmation_Scheduled),
11+
IF ( TODAY() = EmailAfterDate__c,
12+
IF ( TIMENOW() &gt;= TIMEVALUE(&quot;18:00:00.000&quot;),
13+
&apos;❌ &apos; + $Label.EmailConfirmation_SendError,
14+
&apos;⏳ &apos; + $Label.EmailConfirmation_Scheduled),
1515
&apos;❌ &apos; + $Label.EmailConfirmation_SendError)
16-
), &apos;💤 &apos; + $Label.EmailConfirmation_NotScheduled ),
17-
&apos;&apos;)</formula>
16+
), &apos;💤 &apos; + $Label.EmailConfirmation_NotScheduled ),
17+
&apos;&apos;)</formula>
1818
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
1919
<label>Status</label>
2020
<required>false</required>
2121
<trackTrending>false</trackTrending>
2222
<type>Text</type>
2323
<unique>false</unique>
24-
</CustomField>
24+
</CustomField>

‎force-app/main/default/objects/Course__c/fields/EmailBeforeStatus__c.field-meta.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
33
<fullName>EmailBeforeStatus__c</fullName>
44
<externalId>false</externalId>
55
<formula>IF ( EmailBeforeSendDatePassed__c,
66

7-
IF ( EmailBeforeConfirmation__c,
7+
IF ( EmailBeforeConfirmation__c,
88

9-
IF ( EmailBeforeSent__c, &apos;✅ &apos; + $Label.EmailConfirmation_Sent ,
9+
IF ( EmailBeforeSent__c, &apos;✅ &apos; + $Label.EmailConfirmation_Sent ,
1010

11-
IF ( TODAY() = EmailBeforeDate__c,
12-
IF ( TIMENOW() &gt;= TIMEVALUE(&quot;09:15:00.000&quot;),
13-
&apos;❌ &apos; + $Label.EmailConfirmation_SendError,
14-
&apos;⏳ &apos; + $Label.EmailConfirmation_Scheduled),
11+
IF ( TODAY() = EmailBeforeDate__c,
12+
IF ( TIMENOW() &gt;= TIMEVALUE(&quot;18:00:00.000&quot;),
13+
&apos;❌ &apos; + $Label.EmailConfirmation_SendError,
14+
&apos;⏳ &apos; + $Label.EmailConfirmation_Scheduled),
1515
&apos;❌ &apos; + $Label.EmailConfirmation_SendError)
16-
), &apos;💤 &apos; + $Label.EmailConfirmation_NotScheduled ),
17-
&apos;&apos;)</formula>
16+
), &apos;💤 &apos; + $Label.EmailConfirmation_NotScheduled ),
17+
&apos;&apos;)</formula>
1818
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
1919
<label>Status</label>
2020
<required>false</required>
2121
<trackTrending>false</trackTrending>
2222
<type>Text</type>
2323
<unique>false</unique>
24-
</CustomField>
24+
</CustomField>

‎force-app/main/default/objects/Course__c/fields/EmailManualStatus__c.field-meta.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
33
<fullName>EmailManualStatus__c</fullName>
44
<externalId>false</externalId>
55
<formula>IF ( EmailManualSendDatePassed__c,
66

7-
IF ( EmailManualConfirmation__c,
7+
IF ( EmailManualConfirmation__c,
88

9-
IF ( EmailManualSent__c, &apos;✅ &apos; + $Label.EmailConfirmation_Sent ,
9+
IF ( EmailManualSent__c, &apos;✅ &apos; + $Label.EmailConfirmation_Sent ,
1010

11-
IF ( TODAY() = EmailManualDate__c,
12-
IF ( TIMENOW() &gt;= TIMEVALUE(&quot;09:15:00.000&quot;),
13-
&apos;❌ &apos; + $Label.EmailConfirmation_SendError,
14-
&apos;⏳ &apos; + $Label.EmailConfirmation_Scheduled),
11+
IF ( TODAY() = EmailManualDate__c,
12+
IF ( TIMENOW() &gt;= TIMEVALUE(&quot;18:00:00.000&quot;),
13+
&apos;❌ &apos; + $Label.EmailConfirmation_SendError,
14+
&apos;⏳ &apos; + $Label.EmailConfirmation_Scheduled),
1515
&apos;❌ &apos; + $Label.EmailConfirmation_SendError)
16-
), &apos;💤 &apos; + $Label.EmailConfirmation_NotScheduled ),
17-
&apos;&apos;)</formula>
16+
), &apos;💤 &apos; + $Label.EmailConfirmation_NotScheduled ),
17+
&apos;&apos;)</formula>
1818
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
1919
<label>Status</label>
2020
<required>false</required>
2121
<trackTrending>false</trackTrending>
2222
<type>Text</type>
2323
<unique>false</unique>
24-
</CustomField>
24+
</CustomField>

‎force-app/main/default/objects/Course__c/fields/EmailReminderStatus__c.field-meta.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
33
<fullName>EmailReminderStatus__c</fullName>
44
<externalId>false</externalId>
55
<formula>IF ( EmailReminderSendDatePassed__c,
66

7-
IF ( EmailReminderConfirmation__c,
7+
IF ( EmailReminderConfirmation__c,
88

9-
IF ( EmailReminderSent__c, &apos;✅ &apos; + $Label.EmailConfirmation_Sent ,
9+
IF ( EmailReminderSent__c, &apos;✅ &apos; + $Label.EmailConfirmation_Sent ,
1010

11-
IF ( TODAY() = EmailReminderDate__c,
12-
IF ( TIMENOW() &gt;= TIMEVALUE(&quot;09:15:00.000&quot;),
13-
&apos;❌ &apos; + $Label.EmailConfirmation_SendError,
14-
&apos;⏳ &apos; + $Label.EmailConfirmation_Scheduled),
11+
IF ( TODAY() = EmailReminderDate__c,
12+
IF ( TIMENOW() &gt;= TIMEVALUE(&quot;18:00:00.000&quot;),
13+
&apos;❌ &apos; + $Label.EmailConfirmation_SendError,
14+
&apos;⏳ &apos; + $Label.EmailConfirmation_Scheduled),
1515
&apos;❌ &apos; + $Label.EmailConfirmation_SendError)
16-
), &apos;💤 &apos; + $Label.EmailConfirmation_NotScheduled ),
17-
&apos;&apos;)</formula>
16+
), &apos;💤 &apos; + $Label.EmailConfirmation_NotScheduled ),
17+
&apos;&apos;)</formula>
1818
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
1919
<label>Status</label>
2020
<required>false</required>
2121
<trackTrending>false</trackTrending>
2222
<type>Text</type>
2323
<unique>false</unique>
24-
</CustomField>
24+
</CustomField>

0 commit comments

Comments
 (0)