diff --git a/app/Classes/Jobs/UpdatePerfexCRMPrelude.php b/app/Classes/Jobs/UpdatePerfexCRMPrelude.php index efb16fcd..6ca33eae 100644 --- a/app/Classes/Jobs/UpdatePerfexCRMPrelude.php +++ b/app/Classes/Jobs/UpdatePerfexCRMPrelude.php @@ -11,7 +11,6 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Log; - class UpdatePerfexCRMPrelude implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; @@ -40,14 +39,6 @@ class UpdatePerfexCRMPrelude implements ShouldQueue public function handle() { - // //dd(json_encode($supplier)); - // // if($this->transaction->payment_method == PaymentMethodType::CASH) - // $supplier = (App()->make(FetchesCompany::class))->execute(['id' => $this->transaction->receiver]); - // $purchaseOrder = $booking->transactions() - // ->where('type', TransactionType::PURCHASE_ORDER) - // ->complete() - // ->first(); - $serviceTypeName = $this->transaction->owner->company->services()->where('id', $this->transaction->owner->service_id)->first()->name; $booking = $this->transaction->booking; $bank = $booking->bank; @@ -82,28 +73,9 @@ class UpdatePerfexCRMPrelude implements ShouldQueue $result = $this->replacePlaceholders($this->updatePerfexCRMObject->getTasks(), $data); $this->updatePerfexCRMObject->setTasks($result); - - //cief todo: cleanup - // // Do some work here - // $result = 'some result'; - - // // Return the result - // return $result; - - // dd(json_encode($this->updatePerfexCRMObject->getTasks())); - // return $this->updatePerfexCRMObject; $this->nextJob::dispatch($this->updatePerfexCRMObject); } - // public function then($callback) - // { - // $result = $this->result; - - // dd(json_encode($result)); - // // Execute the callback with the result - // $callback($result); - // } - function replacePlaceholders($template, $data, $prefix = '') { foreach ($template as $key => $value) { diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php index f09b9d75..dcd7a0d2 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php @@ -88,7 +88,7 @@ class CreatePerfexCRMInvoiceProcessor $number = 'EXC-'.$number; $date = Carbon::parse($booking->created_at)->format('Y-m-d'); $dueDate = Carbon::parse($booking->created_at)->format('Y-m-d'); - $currency = 1; //cief TODO: To look into Malaysia and Chinese currency + $currency = 1; $subTotal = 0.00; $total = 0.00; diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php index 0ade1e80..4bf3e699 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php @@ -50,6 +50,7 @@ class TransactionToPerfexCRMProcessor PerfexCRMTasks::TASK_1_DAY_TRANSFER_1, PerfexCRMTasks::TASK_1_DAY_TRANSFER_2, PerfexCRMTasks::TASK_1_DAY_TRANSFER_3, + PerfexCRMTasks::TASK_1_DAY_TRANSFER_3_1, PerfexCRMTasks::TASK_1_DAY_TRANSFER_4, PerfexCRMTasks::TASK_1_DAY_TRANSFER_5, PerfexCRMTasks::TASK_1_DAY_TRANSFER_6, @@ -61,6 +62,7 @@ class TransactionToPerfexCRMProcessor PerfexCRMTasks::TASK_3_DAY_TRANSFER_1, PerfexCRMTasks::TASK_3_DAY_TRANSFER_2, PerfexCRMTasks::TASK_3_DAY_TRANSFER_3, + PerfexCRMTasks::TASK_3_DAY_TRANSFER_3_1, PerfexCRMTasks::TASK_3_DAY_TRANSFER_4, PerfexCRMTasks::TASK_3_DAY_TRANSFER_5, PerfexCRMTasks::TASK_3_DAY_TRANSFER_6, @@ -72,6 +74,7 @@ class TransactionToPerfexCRMProcessor PerfexCRMTasks::TASK_1688_PAYMENT_1, PerfexCRMTasks::TASK_1688_PAYMENT_2, PerfexCRMTasks::TASK_1688_PAYMENT_3, + PerfexCRMTasks::TASK_1688_PAYMENT_3_1, PerfexCRMTasks::TASK_1688_PAYMENT_4, PerfexCRMTasks::TASK_1688_PAYMENT_5, PerfexCRMTasks::TASK_1688_PAYMENT_6, diff --git a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php index 1f5f49d2..b6fcb1ac 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php @@ -162,8 +162,6 @@ class UpdatePerfexCRMProcessor if(isset($result->payload)){ $project = $result->payload[0]; $projectId = $project['id']; - //cief todo: need to cater in case of project is completed? what situation will an update not require - //if the project status is anything but PerfexCRMProjectStatus::NOT_STARTED, update the project if($updatePerfexCRMObject->getProjectStatus() != PerfexCRMProjectStatus::NOT_STARTED && $project['status'] == PerfexCRMProjectStatus::NOT_STARTED) { $this->updatesPerfexCRMProject->execute($project, $updatePerfexCRMObject->getProjectStatus()); @@ -205,7 +203,6 @@ class UpdatePerfexCRMProcessor // Get existing or create task $result = $this->fetchesPerfexCRMTask->execute($tasks[$count]['name'], $milestoneId, 'project', $projectId); - //cief todo: need to cater in case of task is completed? what situation will an update not require if(isset($result->payload)){ if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED && $result->payload[0]['status'] == PerfexCRMTaskStatus::NOT_STARTED) { diff --git a/app/Classes/ValueObjects/Constants/PerfexCRMTasks.php b/app/Classes/ValueObjects/Constants/PerfexCRMTasks.php index 1e6bacc4..12057e39 100644 --- a/app/Classes/ValueObjects/Constants/PerfexCRMTasks.php +++ b/app/Classes/ValueObjects/Constants/PerfexCRMTasks.php @@ -61,7 +61,7 @@ class PerfexCRMTasks ○ Outcomes: An invoice will be issued in accounting software for the customer\'s payment.
', 'milestone' => '', 'reference' => 'TASK_1_DAY_TRANSFER_3', - 'on_task_completion' => 'TASK_1_DAY_TRANSFER_4', + 'on_task_completion' => 'TASK_1_DAY_TRANSFER_3_1', 'department' => 'Accounts', 'status' => '', 'priority' => PerfexCRMTaskPriority::MEDIUM, @@ -304,7 +304,7 @@ class PerfexCRMTasks ○ Outcomes: An invoice will be issued in accounting software for the customer\'s payment.
', 'milestone' => '', 'reference' => 'TASK_1688_PAYMENT_3', - 'on_task_completion' => 'TASK_1688_PAYMENT_4', + 'on_task_completion' => 'TASK_1688_PAYMENT_3_1', 'department' => 'Accounts', 'status' => '', 'priority' => PerfexCRMTaskPriority::MEDIUM,