From 0d2ecffd8ca7f07483dc8e786b9a4e3fe808d1d9 Mon Sep 17 00:00:00 2001
From: Dillon <dillonngoweijoon@gmail.com>
Date: Sat, 5 Aug 2023 03:16:27 +0800
Subject: [PATCH] Fix error from production logs

---
 .../Processors/TransactionToPerfexCRMProcessorV2.php | 12 ++++++------
 .../Processors/UpdatePerfexCRMProcessor.php          |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php
index 7ec712c6..bc747720 100644
--- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php
+++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php
@@ -162,12 +162,12 @@ class TransactionToPerfexCRMProcessorV2
             $tasks = array_merge($tasks, $this->payment1688Tasks());
         }
 
-        if ($model->owner->service_id === 1 || $model->owner->service_id === 3) {
-            $purchaseOrder = $model->booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->complete()->first();
-            if(is_null($purchaseOrder)){
-                $tasks = array_merge($tasks, $this->purchaseOrderTasks());
-            }
-        }
+        // if ($model->owner->service_id === 1 || $model->owner->service_id === 3) {
+        //     $purchaseOrder = $model->booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->complete()->first();
+        //     if(is_null($purchaseOrder)){
+        //         $tasks = array_merge($tasks, $this->purchaseOrderTasks());
+        //     }
+        // }
 
         return $tasks;
     }
diff --git a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
index 1852eb72..127b712f 100644
--- a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
+++ b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
@@ -209,7 +209,9 @@ class UpdatePerfexCRMProcessor
                 if($updatePerfexCRMObject->getInvoiceId() != 0){
                     $taskName = $taskName." (".$updatePerfexCRMObject->getInvoiceId().")";
                     $taskReference = $taskReference."_".$updatePerfexCRMObject->getInvoiceId();
-                    $taskOnTaskCompletion = $taskOnTaskCompletion."_".$updatePerfexCRMObject->getInvoiceId();
+                    if($taskOnTaskCompletion){
+                        $taskOnTaskCompletion = $taskOnTaskCompletion."_".$updatePerfexCRMObject->getInvoiceId();
+                    }
                 }
 
                 $result = $this->fetchesPerfexCRMTask->execute($taskName, $milestoneId, 'project', $projectId, $updatePerfexCRMObject->getInvoiceId());