From 4c169ab8d8fc48a698242b1a0883aa993ac29699 Mon Sep 17 00:00:00 2001 From: Dillon Date: Sat, 17 Jun 2023 17:11:28 +0800 Subject: [PATCH 01/14] Quick fix where invoice not get created when user make payment --- .../PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php index cd5990f1..d2466bcf 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php +++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php @@ -233,7 +233,7 @@ class TransactionToPerfexCRMProcessorV2 private function dispatchUpdateJob(Transaction $model, int $status, UpdatePerfexCRMObject $updatePerfexCRMObject) { - $withInvoice = ($model->type === TransactionType::PAYMENT && $model->owner === Booking::class && $status === ApprovalStatus::APPROVED); + $withInvoice = ($model->type === TransactionType::PAYMENT && $model->owner instanceof Booking && $status === ApprovalStatus::APPROVED); UpdatePerfexCRMPrelude::dispatch($model, $updatePerfexCRMObject, $withInvoice); } From f6ae86bcab8127f4bfb248d5534363009f0272d3 Mon Sep 17 00:00:00 2001 From: Dillon Date: Mon, 19 Jun 2023 06:00:56 +0800 Subject: [PATCH 02/14] Enhancement to allow multiple tasks of the same name (with invoice id as distinguish marker) to be created at CRM as a result of multiple payments allowed per order --- app/Classes/Jobs/UpdatePerfexCRM.php | 17 +++++ .../CreateTaskPerfexCRMObject.php | 14 +++- .../UpdatePerfexCRMObject.php | 19 ++++- .../BookingToPerfexCRMProcessor.php | 1 + .../CreatePerfexCRMInvoiceV2Processor.php | 72 +++++++++++++++++++ .../CreatePerfexCRMTaskProcessor.php | 1 + .../NewLeadTaskToPerfexCRMProcessor.php | 3 +- .../TransactionToPerfexCRMProcessor.php | 2 + .../TransactionToPerfexCRMProcessorV2.php | 3 +- .../Processors/UpdatePerfexCRMProcessor.php | 9 +-- .../Services/CreatesPerfexCRMTask.php | 9 ++- .../Services/FetchesPerfexCRMTask.php | 7 +- 12 files changed, 146 insertions(+), 11 deletions(-) create mode 100644 app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php diff --git a/app/Classes/Jobs/UpdatePerfexCRM.php b/app/Classes/Jobs/UpdatePerfexCRM.php index 833fb365..77e19b64 100644 --- a/app/Classes/Jobs/UpdatePerfexCRM.php +++ b/app/Classes/Jobs/UpdatePerfexCRM.php @@ -3,6 +3,7 @@ namespace App\Classes\Jobs; use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor; +use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceV2Processor; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; @@ -41,6 +42,22 @@ class UpdatePerfexCRM implements ShouldQueue public function handle() { + $invoiceId = 0; + + //To use invoice as a reference to decide whether more tasks should be created + if($this->transaction != null){ + $updatePerfexCRMInvoiceObject = new UpdatePerfexCRMInvoiceObject( + $this->updatePerfexCRMObject->getContactEmail(), + $this->updatePerfexCRMObject->getProjectName(), + '', + $this->transaction, + true + ); + // UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceObject); + $invoiceId = (App()->make(CreatePerfexCRMInvoiceV2Processor::class))->execute($updatePerfexCRMInvoiceObject); + } + + $this->updatePerfexCRMObject->setInvoiceId($invoiceId); $result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject); if($this->transaction != null && $this->shouldCreateInvoice){ $updatePerfexCRMInvoiceObject = new UpdatePerfexCRMInvoiceObject( diff --git a/app/Classes/Modules/PerfexCRM/DataTransferObjects/CreateTaskPerfexCRMObject.php b/app/Classes/Modules/PerfexCRM/DataTransferObjects/CreateTaskPerfexCRMObject.php index 6c6354f1..2475ebbf 100644 --- a/app/Classes/Modules/PerfexCRM/DataTransferObjects/CreateTaskPerfexCRMObject.php +++ b/app/Classes/Modules/PerfexCRM/DataTransferObjects/CreateTaskPerfexCRMObject.php @@ -42,7 +42,10 @@ class CreateTaskPerfexCRMObject implements DataTransferObject /** @var string */ private $duedate; - public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department, string $priority, string $duedate) + /** @var int */ + private $invoiceId; + + public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department, string $priority, string $duedate, int $invoiceId) { $this->email = $email; $this->name = $name; @@ -56,6 +59,7 @@ class CreateTaskPerfexCRMObject implements DataTransferObject $this->department = $department; $this->priority = $priority; $this->duedate = $duedate; + $this->invoiceId = $invoiceId; } /** @@ -158,4 +162,12 @@ class CreateTaskPerfexCRMObject implements DataTransferObject { return $this->duedate; } + + /** + * @return int + */ + public function getInvoiceId(): int + { + return $this->invoiceId; + } } diff --git a/app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php b/app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php index 023bd786..cec82ee5 100644 --- a/app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php +++ b/app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php @@ -34,8 +34,11 @@ class UpdatePerfexCRMObject implements DataTransferObject /** @var array */ private $tasks; + /** @var int */ + private $invoiceId; - public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $tasks) + + public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, int $invoiceId, array $milestoneNames, array $tasks) { $this->companyName = $companyName; @@ -45,6 +48,7 @@ class UpdatePerfexCRMObject implements DataTransferObject $this->bookingMarking = $bookingMarking; $this->projectName = $projectName; $this->projectStatus = $projectStatus; + $this->$invoiceId = $invoiceId; $this->milestoneNames = $milestoneNames; $this->tasks = $tasks; } @@ -105,6 +109,14 @@ class UpdatePerfexCRMObject implements DataTransferObject return $this->projectStatus; } + /** + * @return int + */ + public function getInvoiceId(): int + { + return $this->invoiceId; + } + /** * @return array */ @@ -126,4 +138,9 @@ class UpdatePerfexCRMObject implements DataTransferObject $this->tasks = $tasks; } + public function setInvoiceId($invoiceId) + { + $this->invoiceId = $invoiceId; + } + } diff --git a/app/Classes/Modules/PerfexCRM/Processors/BookingToPerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/BookingToPerfexCRMProcessor.php index 930d3765..379caae7 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/BookingToPerfexCRMProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/BookingToPerfexCRMProcessor.php @@ -35,6 +35,7 @@ class BookingToPerfexCRMProcessor $bookingMarking, $projectName, PerfexCRMProjectStatus::NOT_STARTED, + 0, [], [] ); diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php new file mode 100644 index 00000000..636c1840 --- /dev/null +++ b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php @@ -0,0 +1,72 @@ +fetchesPerfexCRMCustomer = $fetchesPerfexCRMCustomer; + $this->fetchesPerfexCRMInvoice = $fetchesPerfexCRMInvoice; + $this->createPerfexCRMInvoiceProcessor = $createPerfexCRMInvoiceProcessor; + } + + public function execute(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject) + { + //get the client id + $customer = $this->fetchesPerfexCRMCustomer->execute($updatePerfexCRMInvoiceObject->getEmail()); + $transaction = $updatePerfexCRMInvoiceObject->getTransaction(); + + //get the invoice id + $invoiceId = 0; + + $number = $transaction->bill_no; + + $prefix = "INV-"; + //This will remove the prefix if prefix already exist in the string + if (substr($number, 0, strlen($prefix)) == $prefix) { + $number = substr($number, strlen($prefix)); + } + + $number = 'EXC-'.$number; + $invoice = $this->fetchesPerfexCRMInvoice->execute($customer->userid,"INV-", $number); + Log::error(json_encode('CreatePerfexCRMInvoiceV2Processor debug $number: '.$number)); + if(is_null($invoice)){ + $result = $this->createPerfexCRMInvoiceProcessor->execute($transaction, null, null, $updatePerfexCRMInvoiceObject->getIsPaid()); + if ($result) { + $invoiceId = $result->payload['id']; + } else { + $log['message'] = 'CreatePerfexCRMInvoiceV2Processor CreatePerfexCRMInvoiceProcessor failed'; + Helper::debugLoggerForPerfexCRM($log); + } + } + + return $invoiceId; + } +} diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php index e9822471..4aa5a089 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php @@ -37,6 +37,7 @@ class CreatePerfexCRMTaskProcessor $createTaskPerfexCRMObject->getStatus(), $createTaskPerfexCRMObject->getPriority(), $createTaskPerfexCRMObject->getDuedate(), + $createTaskPerfexCRMObject->getInvoiceId(), ); return true; } diff --git a/app/Classes/Modules/PerfexCRM/Processors/NewLeadTaskToPerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/NewLeadTaskToPerfexCRMProcessor.php index bd03c894..2195fc46 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/NewLeadTaskToPerfexCRMProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/NewLeadTaskToPerfexCRMProcessor.php @@ -32,7 +32,8 @@ class NewLeadTaskToPerfexCRMProcessor PerfexCRMTasks::TASK_IDENTIFICATION_1['status'], PerfexCRMTasks::TASK_IDENTIFICATION_1['department'], PerfexCRMTaskPriority::DEFAULT, - "0" + "0", + 0 ); CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject); diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php index 903c640e..b996e592 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php @@ -114,6 +114,7 @@ class TransactionToPerfexCRMProcessor $bookingMarking, $projectName, PerfexCRMProjectStatus::IN_PROGRESS, + 0, [], $tasks ); @@ -140,6 +141,7 @@ class TransactionToPerfexCRMProcessor $bookingMarking, $projectName, PerfexCRMProjectStatus::IN_PROGRESS, + 0, [], $tasks ); diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php index d2466bcf..fccdaec4 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php +++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php @@ -8,8 +8,6 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\TransactionType; use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus; use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus; -use App\Classes\Jobs\UpdatePerfexCRMInvoice; -use App\Classes\Jobs\UpdatePerfexCRM; use App\Classes\Jobs\UpdatePerfexCRMPrelude; use App\Models\Booking; use App\Models\Transaction; @@ -35,6 +33,7 @@ class TransactionToPerfexCRMProcessorV2 $bookingInfo['bookingMarking'], $projectName, PerfexCRMProjectStatus::IN_PROGRESS, + 0, [], $tasks ); diff --git a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php index 7527760f..a35debae 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php @@ -203,18 +203,19 @@ class UpdatePerfexCRMProcessor } // Get existing or create task - $result = $this->fetchesPerfexCRMTask->execute($tasks[$count]['name'], $milestoneId, 'project', $projectId); + $result = $this->fetchesPerfexCRMTask->execute($tasks[$count]['name'], $milestoneId, 'project', $projectId, $updatePerfexCRMObject->getInvoiceId()); + Log::info("UpdatePerfexCRMProcessor task: ".json_encode($taskStatus)." , ".json_encode($result)); + if(isset($result->payload)){ //&& $result->payload[0]['status'] == PerfexCRMTaskStatus::NOT_STARTED - Log::info(json_encode([$taskStatus])); - if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED ) + if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED) { $task = $result->payload[0]; $result = $this->updatesPerfexCRMTask->execute($task['id'], $task['name'], $task['milestone'], $task['rel_id'], $taskStatus, $task['startdate'], is_null($task['duedate']) ? '': $task['duedate']); } } else{ - $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $tasks[$count]['department'], $taskStatus, $tasks[$count]['priority'], $tasks[$count]['duedate']); + $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $tasks[$count]['department'], $taskStatus, $tasks[$count]['priority'], $tasks[$count]['duedate'], $updatePerfexCRMObject->getInvoiceId()); } //cief todo: to evaluate if this is still needed diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php index f2f461a4..06ca013c 100644 --- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php +++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php @@ -21,10 +21,11 @@ class CreatesPerfexCRMTask * @param string $status * @param string $priority * @param string $duedate + * @param int $invoiceId * @return null|object * @throws MalformedRequestException */ - public function execute(string $taskName, string $taskDescription, string $leadId, string $milestoneId, string $projectId, string $reference, string $on_task_completion, string $department, string $status, string $priority, string $duedate) { + public function execute(string $taskName, string $taskDescription, string $leadId, string $milestoneId, string $projectId, string $reference, string $on_task_completion, string $department, string $status, string $priority, string $duedate, int $invoiceId) { try{ $custom_fields = []; if($department != ""){ @@ -35,6 +36,10 @@ class CreatesPerfexCRMTask ]; } + if($invoiceId != 0){ + $taskName = $taskName." (".$invoiceId.")"; + } + $data = [ 'name' => $taskName, 'description' => $taskDescription, @@ -49,6 +54,7 @@ class CreatesPerfexCRMTask 'custom_fields' => $custom_fields, 'priority' => $priority, 'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')), + 'invoice_id' => $invoiceId, ]; if($leadId != '') { @@ -66,6 +72,7 @@ class CreatesPerfexCRMTask 'custom_fields' => $custom_fields, 'priority' => $priority, 'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')), + 'invoice_id' => 0 ]; } diff --git a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php index acdf1a89..ed280098 100644 --- a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php +++ b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php @@ -17,7 +17,7 @@ class FetchesPerfexCRMTask * @return null|object * @throws MalformedRequestException */ - public function execute(string $taskName, string $milestoneId, string $relType, string $relId) { + public function execute(string $taskName, string $milestoneId, string $relType, string $relId, string $invoiceId) { try{ $data = [ 'name' => $taskName, @@ -30,6 +30,11 @@ class FetchesPerfexCRMTask $data = array_merge($data, $newItem); } + if($invoiceId != 0) { + $newItem = ['invoice_id' => $invoiceId ]; + $data = array_merge($data, $newItem); + } + $response = Http::asForm()->withHeaders([ 'authtoken' => config('perfexcrm.api_key')]) ->post(config('perfexcrm.base_url').'/api/tasks/customsearch', $data); From 2091553d7b11cedec00b5ac12dfd809adf218ee4 Mon Sep 17 00:00:00 2001 From: Dillon Date: Mon, 19 Jun 2023 06:28:25 +0800 Subject: [PATCH 03/14] Debug duplicated task created --- .../PerfexCRM/Processors/UpdatePerfexCRMProcessor.php | 8 ++++++-- .../Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php index a35debae..8798d7fd 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php @@ -203,7 +203,11 @@ class UpdatePerfexCRMProcessor } // Get existing or create task - $result = $this->fetchesPerfexCRMTask->execute($tasks[$count]['name'], $milestoneId, 'project', $projectId, $updatePerfexCRMObject->getInvoiceId()); + $taskName = $tasks[$count]['name'];; + if($updatePerfexCRMObject->getInvoiceId() != 0){ + $taskName = $taskName." (".$updatePerfexCRMObject->getInvoiceId().")"; + } + $result = $this->fetchesPerfexCRMTask->execute($taskName, $milestoneId, 'project', $projectId, $updatePerfexCRMObject->getInvoiceId()); Log::info("UpdatePerfexCRMProcessor task: ".json_encode($taskStatus)." , ".json_encode($result)); if(isset($result->payload)){ @@ -215,7 +219,7 @@ class UpdatePerfexCRMProcessor } } else{ - $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $tasks[$count]['department'], $taskStatus, $tasks[$count]['priority'], $tasks[$count]['duedate'], $updatePerfexCRMObject->getInvoiceId()); + $result = $this->createsPerfexCRMTask->execute($taskName, $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $tasks[$count]['department'], $taskStatus, $tasks[$count]['priority'], $tasks[$count]['duedate'], $updatePerfexCRMObject->getInvoiceId()); } //cief todo: to evaluate if this is still needed diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php index 06ca013c..ace2aa00 100644 --- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php +++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php @@ -36,10 +36,6 @@ class CreatesPerfexCRMTask ]; } - if($invoiceId != 0){ - $taskName = $taskName." (".$invoiceId.")"; - } - $data = [ 'name' => $taskName, 'description' => $taskDescription, From d7776d90df3aa47016d9d8de46b73b9bd987e85b Mon Sep 17 00:00:00 2001 From: Dillon Date: Mon, 19 Jun 2023 06:44:59 +0800 Subject: [PATCH 04/14] Debug duplicated task created --- .../PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php index 636c1840..df73bd61 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php @@ -66,6 +66,9 @@ class CreatePerfexCRMInvoiceV2Processor Helper::debugLoggerForPerfexCRM($log); } } + else{ + $invoiceId = $invoice->id; + } return $invoiceId; } From 7e64e126d183625e867596a558b249f79ce8f8b4 Mon Sep 17 00:00:00 2001 From: Dillon Date: Mon, 19 Jun 2023 06:49:28 +0800 Subject: [PATCH 05/14] Comment logs --- .../Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php index 8798d7fd..2971e3c8 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php @@ -208,7 +208,7 @@ class UpdatePerfexCRMProcessor $taskName = $taskName." (".$updatePerfexCRMObject->getInvoiceId().")"; } $result = $this->fetchesPerfexCRMTask->execute($taskName, $milestoneId, 'project', $projectId, $updatePerfexCRMObject->getInvoiceId()); - Log::info("UpdatePerfexCRMProcessor task: ".json_encode($taskStatus)." , ".json_encode($result)); + // Log::info("UpdatePerfexCRMProcessor task: ".json_encode($taskStatus)." , ".json_encode($result)); if(isset($result->payload)){ //&& $result->payload[0]['status'] == PerfexCRMTaskStatus::NOT_STARTED From f34333f4c981454f45dc6513db4c574cff37a39b Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 2 Aug 2023 20:44:37 +0800 Subject: [PATCH 06/14] Minor rewrite --- app/Classes/Jobs/UpdatePerfexCRM.php | 32 +++++++++---------- .../UpdatePerfexCRMObject.php | 2 +- .../CreatePerfexCRMInvoiceV2Processor.php | 6 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/Classes/Jobs/UpdatePerfexCRM.php b/app/Classes/Jobs/UpdatePerfexCRM.php index 77e19b64..27357552 100644 --- a/app/Classes/Jobs/UpdatePerfexCRM.php +++ b/app/Classes/Jobs/UpdatePerfexCRM.php @@ -42,22 +42,9 @@ class UpdatePerfexCRM implements ShouldQueue public function handle() { - $invoiceId = 0; - //To use invoice as a reference to decide whether more tasks should be created - if($this->transaction != null){ - $updatePerfexCRMInvoiceObject = new UpdatePerfexCRMInvoiceObject( - $this->updatePerfexCRMObject->getContactEmail(), - $this->updatePerfexCRMObject->getProjectName(), - '', - $this->transaction, - true - ); - // UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceObject); - $invoiceId = (App()->make(CreatePerfexCRMInvoiceV2Processor::class))->execute($updatePerfexCRMInvoiceObject); - } + $this->updatePerfexCRMObject->setInvoiceId($this->getInvoiceId()); - $this->updatePerfexCRMObject->setInvoiceId($invoiceId); $result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject); if($this->transaction != null && $this->shouldCreateInvoice){ $updatePerfexCRMInvoiceObject = new UpdatePerfexCRMInvoiceObject( @@ -67,9 +54,22 @@ class UpdatePerfexCRM implements ShouldQueue $this->transaction, true ); - UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceObject); - } } + + private function getInvoiceId(){ + if($this->transaction != null){ + $updatePerfexCRMInvoiceObject = new UpdatePerfexCRMInvoiceObject( + $this->updatePerfexCRMObject->getContactEmail(), + $this->updatePerfexCRMObject->getProjectName(), + '', + $this->transaction, + true + ); + $invoiceId = (App()->make(CreatePerfexCRMInvoiceV2Processor::class))->execute($updatePerfexCRMInvoiceObject); + return $invoiceId; + } + return 0; + } } diff --git a/app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php b/app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php index cec82ee5..96bbc8bd 100644 --- a/app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php +++ b/app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php @@ -35,7 +35,7 @@ class UpdatePerfexCRMObject implements DataTransferObject private $tasks; /** @var int */ - private $invoiceId; + private $invoiceId = 0; public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, int $invoiceId, array $milestoneNames, array $tasks) diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php index df73bd61..08c74133 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php @@ -39,13 +39,13 @@ class CreatePerfexCRMInvoiceV2Processor public function execute(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject) { + //invoiceId to be returned - fetch or create + $invoiceId = 0; + //get the client id $customer = $this->fetchesPerfexCRMCustomer->execute($updatePerfexCRMInvoiceObject->getEmail()); $transaction = $updatePerfexCRMInvoiceObject->getTransaction(); - //get the invoice id - $invoiceId = 0; - $number = $transaction->bill_no; $prefix = "INV-"; From 60c6b8ea94eae5af75ef16622dd6dab75b69d9cf Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 2 Aug 2023 22:19:14 +0800 Subject: [PATCH 07/14] Minor rewrite + debug --- app/Classes/Jobs/UpdatePerfexCRM.php | 9 ++-- .../FetchPerfexCRMInvoiceObject.php | 50 +++++++++++++++++++ ...php => FetchPerfexCRMInvoiceProcessor.php} | 20 ++++---- .../TransactionToPerfexCRMProcessorV2.php | 3 ++ 4 files changed, 67 insertions(+), 15 deletions(-) create mode 100644 app/Classes/Modules/PerfexCRM/DataTransferObjects/FetchPerfexCRMInvoiceObject.php rename app/Classes/Modules/PerfexCRM/Processors/{CreatePerfexCRMInvoiceV2Processor.php => FetchPerfexCRMInvoiceProcessor.php} (73%) diff --git a/app/Classes/Jobs/UpdatePerfexCRM.php b/app/Classes/Jobs/UpdatePerfexCRM.php index 27357552..93f536c5 100644 --- a/app/Classes/Jobs/UpdatePerfexCRM.php +++ b/app/Classes/Jobs/UpdatePerfexCRM.php @@ -3,7 +3,7 @@ namespace App\Classes\Jobs; use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor; -use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceV2Processor; +use App\Classes\Modules\PerfexCRM\Processors\FetchPerfexCRMInvoiceProcessor; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; @@ -11,6 +11,7 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject; use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject; +use App\Classes\Modules\PerfexCRM\DataTransferObjects\FetchPerfexCRMInvoiceObject; use Illuminate\Support\Facades\Log; use PhpOffice\PhpSpreadsheet\Calculation\Logical\Boolean; @@ -60,14 +61,12 @@ class UpdatePerfexCRM implements ShouldQueue private function getInvoiceId(){ if($this->transaction != null){ - $updatePerfexCRMInvoiceObject = new UpdatePerfexCRMInvoiceObject( + $fetchPerfexCRMInvoiceObject = new FetchPerfexCRMInvoiceObject( $this->updatePerfexCRMObject->getContactEmail(), - $this->updatePerfexCRMObject->getProjectName(), - '', $this->transaction, true ); - $invoiceId = (App()->make(CreatePerfexCRMInvoiceV2Processor::class))->execute($updatePerfexCRMInvoiceObject); + $invoiceId = (App()->make(FetchPerfexCRMInvoiceProcessor::class))->execute($fetchPerfexCRMInvoiceObject); return $invoiceId; } return 0; diff --git a/app/Classes/Modules/PerfexCRM/DataTransferObjects/FetchPerfexCRMInvoiceObject.php b/app/Classes/Modules/PerfexCRM/DataTransferObjects/FetchPerfexCRMInvoiceObject.php new file mode 100644 index 00000000..cbb85a3e --- /dev/null +++ b/app/Classes/Modules/PerfexCRM/DataTransferObjects/FetchPerfexCRMInvoiceObject.php @@ -0,0 +1,50 @@ +email = $email; + $this->transaction = $transaction; + $this->isPaid = $isPaid; + } + + /** + * @return string + */ + public function getEmail(): string + { + return $this->email; + } + + /** + * @return Transaction + */ + public function getTransaction(): Transaction + { + return $this->transaction; + } + + /** + * @return bool + */ + public function getIsPaid(): bool + { + return $this->isPaid; + } +} diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php b/app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php similarity index 73% rename from app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php rename to app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php index 08c74133..4e0a12f8 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php @@ -6,11 +6,11 @@ namespace App\Classes\Modules\PerfexCRM\Processors; use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor; use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer; use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMInvoice; -use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject; +use App\Classes\Modules\PerfexCRM\DataTransferObjects\FetchPerfexCRMInvoiceObject; use Illuminate\Support\Facades\Log; use App\Classes\General\Helper; -class CreatePerfexCRMInvoiceV2Processor +class FetchPerfexCRMInvoiceProcessor { private $fetchesPerfexCRMCustomer; /** @var FetchesPerfexCRMCustomer */ @@ -23,7 +23,7 @@ class CreatePerfexCRMInvoiceV2Processor /** * - * CreatePerfexCRMInvoiceV2Processor constructor. + * FetchPerfexCRMInvoiceProcessor constructor. * @param FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer * @param FetchesPerfexCRMInvoice $fetchesPerfexCRMInvoice * @param CreatePerfexCRMInvoiceProcessor $createPerfexCRMInvoiceProcessor @@ -37,14 +37,14 @@ class CreatePerfexCRMInvoiceV2Processor $this->createPerfexCRMInvoiceProcessor = $createPerfexCRMInvoiceProcessor; } - public function execute(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject) + public function execute(FetchPerfexCRMInvoiceObject $fetchPerfexCRMInvoiceObject) { //invoiceId to be returned - fetch or create $invoiceId = 0; //get the client id - $customer = $this->fetchesPerfexCRMCustomer->execute($updatePerfexCRMInvoiceObject->getEmail()); - $transaction = $updatePerfexCRMInvoiceObject->getTransaction(); + $customer = $this->fetchesPerfexCRMCustomer->execute($fetchPerfexCRMInvoiceObject->getEmail()); + $transaction = $fetchPerfexCRMInvoiceObject->getTransaction(); $number = $transaction->bill_no; @@ -56,14 +56,14 @@ class CreatePerfexCRMInvoiceV2Processor $number = 'EXC-'.$number; $invoice = $this->fetchesPerfexCRMInvoice->execute($customer->userid,"INV-", $number); - Log::error(json_encode('CreatePerfexCRMInvoiceV2Processor debug $number: '.$number)); + Log::error(json_encode('FetchPerfexCRMInvoiceProcessor debug $number: '.$number)); if(is_null($invoice)){ - $result = $this->createPerfexCRMInvoiceProcessor->execute($transaction, null, null, $updatePerfexCRMInvoiceObject->getIsPaid()); + $result = $this->createPerfexCRMInvoiceProcessor->execute($transaction, null, null, $fetchPerfexCRMInvoiceObject->getIsPaid()); if ($result) { $invoiceId = $result->payload['id']; } else { - $log['message'] = 'CreatePerfexCRMInvoiceV2Processor CreatePerfexCRMInvoiceProcessor failed'; - Helper::debugLoggerForPerfexCRM($log); + $log['message'] = 'FetchPerfexCRMInvoiceProcessor CreatePerfexCRMInvoiceProcessor failed'; + Helper::debugLogger($log); } } else{ diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php index fccdaec4..65a6f545 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php +++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php @@ -12,6 +12,7 @@ use App\Classes\Jobs\UpdatePerfexCRMPrelude; use App\Models\Booking; use App\Models\Transaction; use Illuminate\Support\Facades\Log; +use App\Classes\General\Helper; class TransactionToPerfexCRMProcessorV2 { @@ -24,6 +25,8 @@ class TransactionToPerfexCRMProcessorV2 $projectName = 'Exchange | ' . $bookingInfo['serviceTypeName'] . ' | ' . $bookingInfo['bookingMarking']; $tasks = $this->defineTasks($model, $status); + Helper::debugLogger(json_encode($transaction)); //cief todo: to be removed + if(count($tasks) > 0) { $updatePerfexCRMObject = new UpdatePerfexCRMObject( $bookingInfo['companyName'], From dab9a8e810f6986880d34452d65fcf8d109c3c90 Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 2 Aug 2023 22:26:17 +0800 Subject: [PATCH 08/14] Debug --- .../Processors/TransactionToPerfexCRMProcessorV2.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php index 65a6f545..98628569 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php +++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php @@ -12,7 +12,6 @@ use App\Classes\Jobs\UpdatePerfexCRMPrelude; use App\Models\Booking; use App\Models\Transaction; use Illuminate\Support\Facades\Log; -use App\Classes\General\Helper; class TransactionToPerfexCRMProcessorV2 { @@ -25,7 +24,7 @@ class TransactionToPerfexCRMProcessorV2 $projectName = 'Exchange | ' . $bookingInfo['serviceTypeName'] . ' | ' . $bookingInfo['bookingMarking']; $tasks = $this->defineTasks($model, $status); - Helper::debugLogger(json_encode($transaction)); //cief todo: to be removed + Log::error('TransactionToPerfexCRMProcessorV2 debug: ', json_encode($transaction)); //cief todo: to be removed if(count($tasks) > 0) { $updatePerfexCRMObject = new UpdatePerfexCRMObject( @@ -44,7 +43,6 @@ class TransactionToPerfexCRMProcessorV2 } } } catch (\Exception $exception) { - Log::error('TransactionToPerfexCRMProcessor debug:'); Log::error($exception); } return true; From f4e40e556b1e00b9a226bd680791424c2213b349 Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 2 Aug 2023 22:29:24 +0800 Subject: [PATCH 09/14] Debug --- .../PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php index 98628569..27c1b356 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php +++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php @@ -24,7 +24,7 @@ class TransactionToPerfexCRMProcessorV2 $projectName = 'Exchange | ' . $bookingInfo['serviceTypeName'] . ' | ' . $bookingInfo['bookingMarking']; $tasks = $this->defineTasks($model, $status); - Log::error('TransactionToPerfexCRMProcessorV2 debug: ', json_encode($transaction)); //cief todo: to be removed + Log::error('TransactionToPerfexCRMProcessorV2 debug: ' + json_encode($transaction)); //cief todo: to be removed if(count($tasks) > 0) { $updatePerfexCRMObject = new UpdatePerfexCRMObject( From 8a679844018d2a98bc2c65fb37623f02615e8a87 Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 2 Aug 2023 22:32:44 +0800 Subject: [PATCH 10/14] Debug --- .../PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php index 27c1b356..958032f8 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php +++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php @@ -24,7 +24,7 @@ class TransactionToPerfexCRMProcessorV2 $projectName = 'Exchange | ' . $bookingInfo['serviceTypeName'] . ' | ' . $bookingInfo['bookingMarking']; $tasks = $this->defineTasks($model, $status); - Log::error('TransactionToPerfexCRMProcessorV2 debug: ' + json_encode($transaction)); //cief todo: to be removed + Log::error('TransactionToPerfexCRMProcessorV2 debug: '.json_encode($transaction)); //cief todo: to be removed if(count($tasks) > 0) { $updatePerfexCRMObject = new UpdatePerfexCRMObject( From b235304ad880f4b71a917a335277eec822b6c107 Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 2 Aug 2023 22:46:08 +0800 Subject: [PATCH 11/14] Debug and fixing a decimal problem at Invoice in CRM --- .../PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php index 4dbaa2d5..2b64aa75 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php @@ -152,7 +152,7 @@ class CreatePerfexCRMInvoiceProcessor 'Refer to booking: '.$booking->marking, "", 1.00, - $transaction->amount, + number_format($transaction->amount, 2,'.','') * 1, 1, "" ); From 4f6887ef20f960bd2aa9197f4e698aa09eb1a373 Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 2 Aug 2023 22:55:12 +0800 Subject: [PATCH 12/14] Debug and fixing a decimal problem at Invoice in CRM --- .../PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php index 2b64aa75..2bd95920 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php @@ -152,7 +152,7 @@ class CreatePerfexCRMInvoiceProcessor 'Refer to booking: '.$booking->marking, "", 1.00, - number_format($transaction->amount, 2,'.','') * 1, + $transaction->amount, 1, "" ); @@ -199,7 +199,7 @@ class CreatePerfexCRMInvoiceProcessor //When this transaction is of TransactionType::PAYMENT, the amount is actually in the currecy user choose to pay (RM) //So there is no need to convert it if ($transaction->type == TransactionType::PAYMENT){ - $total = $transaction->amount; + $total = number_format($transaction->amount, 2,'.','') * 1; } else{ if($booking->first()->fix_currency_id !== 1){ From 07eac828aa33844d8a049b10efc31e23042b6230 Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 2 Aug 2023 23:10:11 +0800 Subject: [PATCH 13/14] Debug --- .../PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php index 2bd95920..5872cf8c 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php @@ -196,6 +196,8 @@ class CreatePerfexCRMInvoiceProcessor } } + Log::error('CreatePerfexCRMInvoiceProcessor debug: '.json_encode($transaction)); //cief todo: to be removed + //When this transaction is of TransactionType::PAYMENT, the amount is actually in the currecy user choose to pay (RM) //So there is no need to convert it if ($transaction->type == TransactionType::PAYMENT){ From 43aa0cc9c192a210c94f91bee20ecd8becf3eced Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 2 Aug 2023 23:21:17 +0800 Subject: [PATCH 14/14] Debug and fixing a decimal problem at Invoice in CRM --- .../PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php | 2 -- .../PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php | 2 +- .../PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php index 5872cf8c..2bd95920 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php @@ -196,8 +196,6 @@ class CreatePerfexCRMInvoiceProcessor } } - Log::error('CreatePerfexCRMInvoiceProcessor debug: '.json_encode($transaction)); //cief todo: to be removed - //When this transaction is of TransactionType::PAYMENT, the amount is actually in the currecy user choose to pay (RM) //So there is no need to convert it if ($transaction->type == TransactionType::PAYMENT){ diff --git a/app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php index 4e0a12f8..ddf0ee55 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php +++ b/app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php @@ -62,7 +62,7 @@ class FetchPerfexCRMInvoiceProcessor if ($result) { $invoiceId = $result->payload['id']; } else { - $log['message'] = 'FetchPerfexCRMInvoiceProcessor CreatePerfexCRMInvoiceProcessor failed'; + $log['message'] = 'FetchPerfexCRMInvoiceProcessor failed'; Helper::debugLogger($log); } } diff --git a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php index 958032f8..7ec712c6 100644 --- a/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php +++ b/app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php @@ -24,8 +24,6 @@ class TransactionToPerfexCRMProcessorV2 $projectName = 'Exchange | ' . $bookingInfo['serviceTypeName'] . ' | ' . $bookingInfo['bookingMarking']; $tasks = $this->defineTasks($model, $status); - Log::error('TransactionToPerfexCRMProcessorV2 debug: '.json_encode($transaction)); //cief todo: to be removed - if(count($tasks) > 0) { $updatePerfexCRMObject = new UpdatePerfexCRMObject( $bookingInfo['companyName'],