From 5b65757275211d28d3a0e665b459423fd6dca3e7 Mon Sep 17 00:00:00 2001
From: luNunezProcessmaker <luciana.nunez@processmaker.com>
Date: Mon, 24 Jun 2024 17:31:33 -0400
Subject: [PATCH 1/3] feature/FOUR-16724

---
 ProcessMaker/Repositories/TokenRepository.php | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ProcessMaker/Repositories/TokenRepository.php b/ProcessMaker/Repositories/TokenRepository.php
index 77256e3447..c27ac28164 100644
--- a/ProcessMaker/Repositories/TokenRepository.php
+++ b/ProcessMaker/Repositories/TokenRepository.php
@@ -145,6 +145,8 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
             }
         }
 
+        $this->getAcionByEmail($activity);
+
         //Default 3 days of due date
         $due = $this->getDueVariable($activity, $token);
         $token->due_at = $due ? Carbon::now()->addHours($due) : null;
@@ -159,6 +161,24 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
         $this->instanceRepository->persistInstanceUpdated($token->getInstance());
     }
 
+    /**
+     * Get action by email configuration
+     *
+     * @param ActivityInterface $activity
+     */
+    private function getAcionByEmail(ActivityInterface $activity)
+    {
+        $isActionsByEmail = $activity->getProperty('isActionsByEmail', false);
+        if ($isActionsByEmail) {
+            $configEmail =  json_decode($activity->getProperty('configEmail', []));
+            // Get the parameters to send the email
+            $emailserver = $configEmail->emailServer ?? 0;
+            $subject = $configEmail->subject ?? '';
+            $emailScreen = $configEmail->screenEmailRef ?? 0;
+            $emailScreenCompleted = $configEmail->screenCompleteRef ?? 0;
+        }
+    }
+
     /**
      * Get due Variable
      *

From f2426bd99a0bf53ac0cd1ccbfb948a10d89371d3 Mon Sep 17 00:00:00 2001
From: luNunezProcessmaker <luciana.nunez@processmaker.com>
Date: Tue, 25 Jun 2024 09:29:25 -0400
Subject: [PATCH 2/3] feature/FOUR-16724

---
 ProcessMaker/Repositories/TokenRepository.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ProcessMaker/Repositories/TokenRepository.php b/ProcessMaker/Repositories/TokenRepository.php
index c27ac28164..849d7cb260 100644
--- a/ProcessMaker/Repositories/TokenRepository.php
+++ b/ProcessMaker/Repositories/TokenRepository.php
@@ -145,7 +145,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
             }
         }
 
-        $this->getAcionByEmail($activity);
+        $this->validateAndSendActionByEmail($activity);
 
         //Default 3 days of due date
         $due = $this->getDueVariable($activity, $token);
@@ -166,17 +166,20 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
      *
      * @param ActivityInterface $activity
      */
-    private function getAcionByEmail(ActivityInterface $activity)
+    private function validateAndSendActionByEmail(ActivityInterface $activity)
     {
         $isActionsByEmail = $activity->getProperty('isActionsByEmail', false);
         if ($isActionsByEmail) {
-            $configEmail =  json_decode($activity->getProperty('configEmail', []));
+            $configEmail = json_decode($activity->getProperty('configEmail', []));
             // Get the parameters to send the email
             $emailserver = $configEmail->emailServer ?? 0;
             $subject = $configEmail->subject ?? '';
             $emailScreen = $configEmail->screenEmailRef ?? 0;
             $emailScreenCompleted = $configEmail->screenCompleteRef ?? 0;
+
+            //TODO send Email
         }
+
     }
 
     /**

From c74398a06814e7a1b6a948e310c2433a8e666187 Mon Sep 17 00:00:00 2001
From: luNunezProcessmaker
 <123644082+luNunezProcessmaker@users.noreply.github.com>
Date: Thu, 27 Jun 2024 10:15:16 -0400
Subject: [PATCH 3/3] Update TokenRepository.php

---
 ProcessMaker/Repositories/TokenRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ProcessMaker/Repositories/TokenRepository.php b/ProcessMaker/Repositories/TokenRepository.php
index 849d7cb260..03c1729d68 100644
--- a/ProcessMaker/Repositories/TokenRepository.php
+++ b/ProcessMaker/Repositories/TokenRepository.php
@@ -162,7 +162,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
     }
 
     /**
-     * Get action by email configuration
+     * Validate email configuration and Send Email
      *
      * @param ActivityInterface $activity
      */