diff --git a/app/Classes/Jobs/UpdatePerfexCRM.php b/app/Classes/Jobs/UpdatePerfexCRM.php index 059779e1..febcefe5 100644 --- a/app/Classes/Jobs/UpdatePerfexCRM.php +++ b/app/Classes/Jobs/UpdatePerfexCRM.php @@ -48,7 +48,7 @@ class UpdatePerfexCRM implements ShouldQueue $this->updatePerfexCRMObject->getProjectName(), $result->projectId, $this->transaction, - true, + true ); $this->nextJob::dispatch($updatePerfexCRMInvoiceOject); } diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php index 2dc4ae4b..5a53eb6a 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php +++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php @@ -74,7 +74,6 @@ class TransactionToPerfexCRMProcessorV2 $task = PerfexCRMTasks::TASK_1_DAY_TRANSFER_2; $task['status'] = PerfexCRMTaskStatus::COMPLETED; $tasks = [$task]; - Log::info(json_encode($tasks)); } return $tasks; @@ -163,10 +162,17 @@ class TransactionToPerfexCRMProcessorV2 private function dispatchUpdateJob(Transaction $model, int $status, UpdatePerfexCRMObject $updatePerfexCRMObject) { - if($status == ApprovalStatus::APPROVED){ - UpdatePerfexCRMPrelude::dispatch($model, $updatePerfexCRMObject, UpdatePerfexCRM::class, UpdatePerfexCRMInvoice::class); - } elseif($status == ApprovalStatus::PENDING_VERIFICATION){ - UpdatePerfexCRM::dispatch($updatePerfexCRMObject, null, null); + $dispatchClass = null; + + if ($model->type === TransactionType::PAYMENT && $status === ApprovalStatus::APPROVED) { + $dispatchClass = UpdatePerfexCRMInvoice::class; + } elseif (($model->type === TransactionType::PAYMENT || $model->type === TransactionType::PURCHASE_ORDER) && $status === ApprovalStatus::PENDING_VERIFICATION) { + $dispatchClass = UpdatePerfexCRM::class; + } + + if ($dispatchClass) { + UpdatePerfexCRMPrelude::dispatch($model, $updatePerfexCRMObject, $dispatchClass); } } + }