From 01046dc4f3eb8b81c1e8effbeea883d7d084bbb5 Mon Sep 17 00:00:00 2001
From: Dillon <dillon_ngo@yahoo.com>
Date: Wed, 22 Mar 2023 23:53:32 +0800
Subject: [PATCH] Fix a inconsistency in data update for task into CRM

---
 .../PerfexCRM/Processors/UpdatePerfexCRMProcessor.php     | 2 +-
 .../Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
index af39cf62..664010d7 100644
--- a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
+++ b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
@@ -210,7 +210,7 @@ class UpdatePerfexCRMProcessor
                     if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED && $result->payload[0]['status'] == PerfexCRMTaskStatus::NOT_STARTED)
                     {
                         $task = $result->payload[0];
-                        $result = $this->updatesPerfexCRMTask->execute($task['id'], $task['name'], $task['milestone'], $task['rel_id'], $taskStatus);
+                        $result = $this->updatesPerfexCRMTask->execute($task['id'], $task['name'], $task['milestone'], $task['rel_id'], $taskStatus, $task['startdate'], is_null($task['duedate']) ? '': $task['duedate']);
                     }
                 }
                 else{
diff --git a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php
index 928f9c5a..95a09525 100644
--- a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php
+++ b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php
@@ -14,16 +14,18 @@ class UpdatesPerfexCRMTask
      * @param string $milestoneId
      * @param string $projectId
      * @param string $status, default: 1
+     * @param string $startDate
+     * @param string $dueDate
      * @return null|object
      * @throws MalformedRequestException
      */
-    public function execute(string $taskId, string $taskName, string $milestoneId, string $projectId, string $status = "1") {
+    public function execute(string $taskId, string $taskName, string $milestoneId, string $projectId, string $status, string $startDate, string $dueDate) {
         try{
             $data = [
                 'name' => $taskName,
                 'milestone' => $milestoneId,
-                'startdate' => date('Y-m-d'),
-                'duedate' => date('Y-m-d'),
+                'startdate' => $startDate,
+                'duedate' => $dueDate,
                 'rel_type' => 'project',
                 'rel_id' => $projectId,
                 'status' => $status,