Another attempt to solve invoice without projectId, rewriting job chaining one after another

New merge request From dillon/crm-create-task-3-26 into master

See merge request CIEFWorldwideSdnBhd/shipping-portal!157

app/Classes/Jobs/InitializePerfexCRM.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\InitializePerfexCRMProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InitialPerfexCRMObject;
-
-class InitializePerfexCRM implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var InitialPerfexCRMObject */
-    private $initialPerfexCRMObject;
-
-    /**
-     * InitializePerfexCRM constructor.
-     * @param InitialPerfexCRMObject $initialPerfexCRMObject
-     */
-    public function __construct(InitialPerfexCRMObject $initialPerfexCRMObject)
-    {
-        $this->initialPerfexCRMObject = $initialPerfexCRMObject;
-    }
-
-    public function handle()
-    {
-        (App()->make(InitializePerfexCRMProcessor::class))->execute($this->initialPerfexCRMObject);
-    }
-}

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -9,6 +9,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
 
 class UpdatePerfexCRM implements ShouldQueue
 {
@@ -17,17 +18,37 @@ class UpdatePerfexCRM implements ShouldQueue
     /** @var UpdatePerfexCRMObject */
     private $updatePerfexCRMObject;
 
+    /** @var UpdatePerfexCRMInvoice */
+    private $nextJob;
+
+    /** @var */
+    private $transaction;
+
     /**
      * UpdatePerfexCRM constructor.
      * @param UpdatePerfexCRMObject $updatePerfexCRMObject
+     * @param UpdatePerfexCRMInvoice $nextJob
+     * @param $transaction
      */
-    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject)
+    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, $nextJob)
     {
         $this->updatePerfexCRMObject = $updatePerfexCRMObject;
+        $this->nextJob = $nextJob;
+        $this->transaction = $transaction;
     }
 
     public function handle()
     {
-        (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
+        $result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
+        if($this->nextJob != null && $this->transaction != null){
+            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
+                $this->updatePerfexCRMObject->getContactEmail(),
+                $result->projectId,
+                $this->transaction,
+                true
+            );
+            /** @var UpdatePerfexCRMInvoice $nextJob */
+            $this->nextJob::dispatch($updatePerfexCRMInvoiceOject);
+        }
     }
 }

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -47,6 +47,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
         $invoiceId = 0;
         $invoiceStatus = 0;
         $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
+        Log::error(json_encode('UpdatePerfexCRMInvoice debug $transaction->owner->bill_no: '.$transaction->owner->bill_no));
 
         if(is_null($invoice)){
             $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
@@ -58,26 +59,9 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
 
             //This only run when invoice already exist and the invoice does not have a PAID status
             if($invoiceStatus != PerfexCRMInvoiceStatus::PAID){
-                //get project
-                $projectId = "";
-                $projectName = "";
-                if($transaction->owner instanceof Transaction){
-                    $orderReference = $transaction->owner->owner->owner()->first()->reference;
-                    $packingListReference = $transaction->owner->owner->reference;
-                    $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
-                    $project = (App()->make(FetchesPerfexCRMProject::class))->execute($projectName, $customer->userid);
-                    if(!is_null($project)){
-                        $projectId = $project->id;
-                    }
-                }
-
-                if($projectId == ""){
-                    Log::error(json_encode('UpdatePerfexCRMInvoice debug: '.$projectName));
-                    Log::error(json_encode($transaction->owner));
-                }
-
+                Log::error(json_encode('UpdatePerfexCRMInvoice debug $this->updatePerfexCRMInvoiceObject->getProjectId(): '.$this->updatePerfexCRMInvoiceObject->getProjectId()));
                 //update invoice
-                (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $projectId);
+                (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $this->updatePerfexCRMInvoiceObject->getProjectId());
             }
         }
 

app/Classes/Jobs/UpdatePerfexCRMPrelude.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
+use App\Models\PackingList;
+use App\Models\Transaction;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+
+
+class UpdatePerfexCRMPrelude implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var */
+    private $packingList;
+
+    /** @var */
+    private $transaction;
+
+    /** @var UpdatePerfexCRMObject */
+    private $updatePerfexCRMObject;
+
+    /** @var UpdatePerfexCRM */
+    private $nextJob1;
+
+    /** @var UpdatePerfexCRMInvoice */
+    private $nextJob2;
+
+    /**
+     * UpdatePerfexCRMPrelude constructor.
+     * @param $packingList
+     * @param $transaction
+     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
+     * @param UpdatePerfexCRM $nextJob1
+     * @param UpdatePerfexCRMInvoice $nextJob2
+     */
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob1, $nextJob2)
+    {
+        $this->packingList = $packingList;
+        $this->transaction = $transaction;
+        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
+        $this->nextJob1 = $nextJob1;
+        $this->nextJob2 = $nextJob2;
+    }
+
+    public function handle()
+    {
+        if(is_null($this->packingList)){
+            $this->packingList = $this->transaction->owner->owner;
+        }
+        $amount = 0.00;
+        if(!is_null($this->transaction)){
+            $amount = $this->transaction->amount;
+        }
+        $data = [
+            'amount' => number_format($amount, 2, '.', ''),
+            'link_order' => config('app.url').'/order/show/'.$this->packingList->owner->reference,
+            'link_autocount_or' => 'https://docs.google.com/spreadsheets/d/1Q3rJBGQ9Bo04HZp5WR9zbLp7pIW2kfDYsabxG7JON-4/edit#gid=2013983170',
+            'link_perfex' => 'https://perfex.cief-malaysia.com/admin/projects/view/89',
+        ];
+
+
+        $result = $this->replacePlaceholders($this->updatePerfexCRMObject->getTasks(), $data);
+        $this->updatePerfexCRMObject->setTasks($result);
+        /** @var UpdatePerfexCRM $nextJob1 */
+        /** @var UpdatePerfexCRMInvoice $nextJob2 */
+        $this->nextJob1::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->nextJob2);
+    }
+
+    function replacePlaceholders($template, $data, $prefix = '')
+    {
+        foreach ($template as $key => $value) {
+            foreach ($data as $dataKey => $dataValue) {
+                if (is_array($dataValue)) {
+                    $template[$key] = $this->replacePlaceholders($template[$key], $dataValue, $dataKey);
+                } else {
+                    if ($prefix != '') {
+                        $template[$key] = str_replace('{' .$prefix. "." .$dataKey . '}', $dataValue, $template[$key]);
+                    } else {
+                        $template[$key] = str_replace('{' . $dataKey . '}', $dataValue, $template[$key]);
+                    }
+                }
+            }
+        }
+
+        return $template;
+    }
+
+}

app/Classes/Modules/PerfexCRM/DataTransferObjects/CreateTaskPerfexCRMObject.php

@@ -36,7 +36,13 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
     /** @var string */
     private $department;
 
-    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department)
+    /** @var string */
+    private $priority;
+
+    /** @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)
     {
         $this->email = $email;
         $this->name = $name;
@@ -48,6 +54,8 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
         $this->onTaskCompletion = $onTaskCompletion;
         $this->status = $status;
         $this->department = $department;
+        $this->priority = $priority;
+        $this->duedate = $duedate;
     }
 
     /**
@@ -134,4 +142,20 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
     {
         return $this->department;
     }
+
+    /**
+     * @return string
+     */
+    public function getPriority(): string
+    {
+        return $this->priority;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDuedate(): string
+    {
+        return $this->duedate;
+    }
 }

app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMInvoiceObject.php

@@ -17,11 +17,15 @@ class UpdatePerfexCRMInvoiceObject implements DataTransferObject
     /** @var bool */
     private $isPaid;
 
-    public function __construct(string $email, Transaction $transaction, bool $isPaid)
+    /** @var string */
+    private $projectId;
+
+    public function __construct(string $email, string $projectId, Transaction $transaction, bool $isPaid)
     {
         $this->email = $email;
         $this->transaction = $transaction;
         $this->isPaid = $isPaid;
+        $this->projectId = $projectId;
     }
 
     /**
@@ -32,6 +36,14 @@ class UpdatePerfexCRMInvoiceObject implements DataTransferObject
         return $this->email;
     }
 
+    /**
+     * @return string
+     */
+    public function getProjectId(): string
+    {
+        return $this->projectId;
+    }
+
     /**
      * @return Transaction
      */

app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php

@@ -32,10 +32,10 @@ class UpdatePerfexCRMObject implements DataTransferObject
     private $milestoneNames;
 
     /** @var array */
-    private $taskNames;
+    private $tasks;
 
 
-    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $taskNames)
+    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $tasks)
     {
 
         $this->companyName = $companyName;
@@ -46,7 +46,7 @@ class UpdatePerfexCRMObject implements DataTransferObject
         $this->projectName = $projectName;
         $this->projectStatus = $projectStatus;
         $this->milestoneNames = $milestoneNames;
-        $this->taskNames = $taskNames;
+        $this->tasks = $tasks;
     }
 
     /**
@@ -116,8 +116,13 @@ class UpdatePerfexCRMObject implements DataTransferObject
     /**
      * @return array
      */
-    public function getTaskNames(): array
+    public function getTasks(): array
     {
-        return $this->taskNames;
+        return $this->tasks;
+    }
+
+    public function setTasks($tasks)
+    {
+        $this->tasks = $tasks;
     }
 }

app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php

@@ -69,7 +69,7 @@ class CreatePerfexCRMInvoiceProcessor
 
         $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
         $dueDate = Carbon::parse($transaction->created_at)->addDays(6)->startOfDay()->format('Y-m-d');
-        $currency = 1; //cief TODO: To look into Malaysia and Chinese currency
+        $currency = 1;
         $subTotal = 0.00;
         $total = 0.00;
 
@@ -80,12 +80,17 @@ class CreatePerfexCRMInvoiceProcessor
                     ->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)
                     ->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
 
-        $billingStreet = $billingStreet.$addresses->street_one;
-        $billingStreet = $billingStreet.$addresses->street_two.',';
-        $billingStreet = $billingStreet.$addresses->district()->first()->name.',';
-        $billingStreet = $billingStreet.$addresses->postcode;
-        $billingStreet = $billingStreet.$addresses->state()->first()->name.',';
-        $billingStreet = $billingStreet.$addresses->country()->first()->name;
+        if ($addresses !== null) {
+            $billingStreet = $billingStreet.$addresses->street_one;
+            $billingStreet = $billingStreet.$addresses->street_two.',';
+            $billingStreet = $billingStreet.$addresses->district()->first()->name.',';
+            $billingStreet = $billingStreet.$addresses->postcode;
+            $billingStreet = $billingStreet.$addresses->state()->first()->name.',';
+            $billingStreet = $billingStreet.$addresses->country()->first()->name;
+        }
+        else{
+            $billingStreet = "[Pending Billing Details by user]";
+        }
 
         $allowedPaymentModes = [];
         $invoiceItems = [];
@@ -106,9 +111,10 @@ class CreatePerfexCRMInvoiceProcessor
                 $orderReference = $transaction->owner->owner->reference;
                 $packingListReference = $transaction->owner->reference;
                 $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
-                $project = $this->fetchesPerfexCRMProject->execute($projectName, $clientId);
-                if(!is_null($project)){
-                    $projectId = $project->id;
+                $result = $this->fetchesPerfexCRMProject->execute($projectName, $clientId);
+                if(isset($result->payload)){
+                    $project = $result->payload[0];
+                    $projectId = $project['id'];
                 }
                 else{
                     $result = $this->createsPerfexCRMCustomerProject->execute($projectName, PerfexCRMProjectStatus::NOT_STARTED, $clientId);

app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php

@@ -35,6 +35,8 @@ class CreatePerfexCRMTaskProcessor
             $createTaskPerfexCRMObject->getOnTaskCompletion(),
             $createTaskPerfexCRMObject->getDepartment(),
             $createTaskPerfexCRMObject->getStatus(),
+            $createTaskPerfexCRMObject->getPriority(),
+            $createTaskPerfexCRMObject->getDuedate()
         );
         return true;
    }

app/Classes/Modules/PerfexCRM/Processors/InitializePerfexCRMProcessor.php

@@ -1,195 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerContact;
-use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InitialPerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMMilestones;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Http\Request;
-
-class InitializePerfexCRMProcessor
-{
-    /** @var ConvertsPerfexCRMLeadToCustomer */
-    private $convertsPerfexCRMLeadToCustomer;
-
-    /** @var CreatesPerfexCRMCustomerProject */
-    private $createsPerfexCRMCustomerProject;
-
-    /** @var CreatesPerfexCRMMilestone */
-    private $createsPerfexCRMMilestone;
-
-    /** @var CreatesPerfexCRMTask */
-    private $createsPerfexCRMTask;
-
-    /** @var FetchesPerfexCRMProject */
-    private $fetchesPerfexCRMProject;
-
-    /** @var FetchesPerfexCRMMilestone */
-    private $fetchesPerfexCRMMilestone;
-
-    /** @var FetchesPerfexCRMTask */
-    private $fetchesPerfexCRMTask;
-
-    /** @var CreatesPerfexCRMCustomer */
-    private $createsPerfexCRMCustomer;
-
-    /** @var CreatesPerfexCRMCustomerContact */
-    private $createsPerfexCRMCustomerContact;
-
-    /** @var UpdatesPerfexCRM */
-    private $updatePerfexCRM;
-
-    /** @var UpdatesPerfexCRMCustomer */
-    private $updatesPerfexCRMCustomer;
-
-   /**
-     * @param ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer
-     * @param CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject
-     * @param CreatesPerfexCRMMilestone $createsPerfexCRMMilestone
-     * @param CreatesPerfexCRMTask $createsPerfexCRMTask
-     * @param FetchesPerfexCRMProject $fetchesPerfexCRMProject
-     * @param FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone
-     * @param FetchesPerfexCRMTask $fetchesPerfexCRMTask
-     * @param CreatesPerfexCRMCustomer $createsPerfexCRMCustomer
-     * @param CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact
-     * @param UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer
-    */
-    public function __construct(ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
-        CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject,
-        CreatesPerfexCRMMilestone $createsPerfexCRMMilestone,
-        CreatesPerfexCRMTask $createsPerfexCRMTask,
-        FetchesPerfexCRMProject $fetchesPerfexCRMProject,
-        FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone,
-        FetchesPerfexCRMTask $fetchesPerfexCRMTask,
-        CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
-        CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
-        UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer)
-   {
-        $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
-        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
-        $this->createsPerfexCRMMilestone = $createsPerfexCRMMilestone;
-        $this->createsPerfexCRMTask = $createsPerfexCRMTask;
-        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
-        $this->fetchesPerfexCRMMilestone = $fetchesPerfexCRMMilestone;
-        $this->fetchesPerfexCRMTask = $fetchesPerfexCRMTask;
-        $this->createsPerfexCRMCustomer = $createsPerfexCRMCustomer;
-        $this->createsPerfexCRMCustomerContact = $createsPerfexCRMCustomerContact;
-        $this->updatesPerfexCRMCustomer = $updatesPerfexCRMCustomer;
-    }
-
-   /**
-    * @param InitialPerfexCRMObject $initialPerfexCRMObject
-    * @return null|object
-    * @throws \App\Classes\Exceptions\MalformedRequestException
-    */
-   public function execute(InitialPerfexCRMObject $initialPerfexCRMObject) {
-
-       // Customer has to exist first before Project can appear under it
-       // Check with Perfex CRM, if this user (email) was previously a lead, should automatically now become a customer
-       $crmCompany = $initialPerfexCRMObject->getCompanyName();
-       $result = $this->convertsPerfexCRMLeadToCustomer->execute($initialPerfexCRMObject->getContactEmail());
-       if(isset($result->payload)){
-           $crmClientId = $result->payload['client_id'];
-           if (isset($result->payload['company'])) {
-               $crmCompany = $result->payload['company'];
-           }
-       }
-       else{
-           //if reach this point, this means this user is not a official customer nor is a lead in crm
-           //Create Customer has 2 parts: Create Company (client), Create Contact
-           $result = $this->createsPerfexCRMCustomer->execute($crmCompany);
-           if(is_null($result)){
-                $crmCompany = $crmCompany." 2";
-                $result = $this->createsPerfexCRMCustomer->execute($crmCompany);
-           }
-
-           $crmClientId = $result->payload['clientId'];
-
-           $customerContactObject = new CustomerContactObject(
-               $crmClientId,
-               $initialPerfexCRMObject->getContactName(),
-               $initialPerfexCRMObject->getContactName(),
-               $initialPerfexCRMObject->getContactEmail(),
-               "pU^T@sC#9Q",
-               "on",
-               "on"
-           );
-           $result = $this->createsPerfexCRMCustomerContact->execute($customerContactObject);
-       }
-
-       //Update custom fields to identify company reference from exchange or shipping portal
-       $value_exists = false;
-       if (isset($result->payload['customfields'])) {
-           foreach ($result->payload['customfields'] as $element) {
-               if ($element['value'] === $initialPerfexCRMObject->getCompanyReference()) {
-                   $value_exists = true;
-                   break;
-               }
-           }
-       }
-       if(!$value_exists);
-       {
-           $result = $this->updatesPerfexCRMCustomer->execute($crmClientId, $crmCompany, $initialPerfexCRMObject->getCompanyReference());
-       }
-
-       // Get existing or create project, project has to exist first before milestone can appear under it
-       $result = $this->createsPerfexCRMCustomerProject->execute($initialPerfexCRMObject->getProjectName(), $initialPerfexCRMObject->getProjectStatus(), $crmClientId);
-       if(isset($result->payload)){  //Here means project creation successful
-            $projectId = $result->payload['project_id'];
-       }
-       else{
-            $projectId = $this->fetchesPerfexCRMProject->execute($initialPerfexCRMObject->getProjectName(), $crmClientId)->id;
-       }
-
-       $tasks = $initialPerfexCRMObject->getTaskNames();
-       if(count($tasks) > 0){
-
-            //Create tasks with milestone
-            for($count=0; $count < count($tasks); $count++) {
-                $milestoneId = 0; //By default milestoneId is 0, having this set at individual task is optional
-                if($tasks[$count]['milestone'] != "") //Create milestone only if it is defined
-                {
-                    // Get existing or create milestone, milestone has to exist first before task can appear under it
-                    $result = $this->createsPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId, $count);
-                    if(isset($result->payload)){
-                        $milestoneId = $result->payload['milestone_id'];
-                    }
-                    else{
-                        $milestone = $this->fetchesPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId);
-                        $array = json_decode(json_encode($milestone), true);
-                        $milestoneId = $array[0]['id'];
-                    }
-                }
-
-                $taskStatus = PerfexCRMTaskStatus::NOT_STARTED;
-                if($tasks[$count]['status'] != ''){
-                    $taskStatus = $tasks[$count]['status'];
-                }
-
-                // Get existing or create task
-                $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'],$tasks[$count]['department'], $taskStatus);
-                if(is_null($result)){
-                    break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
-                }
-            }
-        }
-        return true;
-   }
-
-}

app/Classes/Modules/PerfexCRM/Processors/NewLeadTaskToPerfexCRMProcessor.php

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Processors;
 
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
 use App\Classes\Jobs\CreatePerfexCRMSingleTask;
+use App\Classes\ValueObjects\Constants\PerfexCRMTaskPriority;
 use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
 use App\Models\Company;
 
@@ -30,7 +31,9 @@ class NewLeadTaskToPerfexCRMProcessor
             "",
             "",
             PerfexCRMTasks::TASK_IDENTIFICATION_1['status'],
-            PerfexCRMTasks::TASK_IDENTIFICATION_1['department']
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['department'],
+            PerfexCRMTaskPriority::DEFAULT,
+            "0"
         );
 
         CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);

app/Classes/Modules/PerfexCRM/Processors/PackingListToPerfexCRMProcessor.php

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\PerfexCRM\Processors;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
 use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
 use App\Classes\Jobs\UpdatePerfexCRM;
+use App\Classes\Jobs\UpdatePerfexCRMPrelude;
 use App\Models\PackingList;
 use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
 use Illuminate\Support\Facades\Log;
@@ -20,7 +21,6 @@ class PackingListToPerfexCRMProcessor
     {
         try {
             if($packingList->owner instanceof \App\Models\Order) {
-                Log::error(json_encode($packingList));
                 $order = $packingList->owner;
                 $companyModule  = $order->companyModule()->first();
                 $connection = $companyModule->inviters()->withPivot('invitee_reference')->first();
@@ -48,7 +48,7 @@ class PackingListToPerfexCRMProcessor
                         PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
                     ]
                 );
-                UpdatePerfexCRM::dispatch($updatePerfexCRMObject);
+                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, UpdatePerfexCRM::class, null);
             }
         } catch (\Exception $exception){
             Log::error(json_encode('PackingListToPerfexCRMProcessor debug:'));

app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php

@@ -2,47 +2,19 @@
 
 namespace App\Classes\Modules\PerfexCRM\Processors;
 
-use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Processors\InitializePerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Services\Init;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\PerfexCRMMilestones;
 use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
 use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Jobs\UpdatePerfexCRMInvoice;
 use App\Classes\Jobs\UpdatePerfexCRM;
+use App\Classes\Jobs\UpdatePerfexCRMPrelude;
+use App\Classes\Jobs\CreatePerfexCRMInvoice;
 use App\Models\Transaction;
 use Illuminate\Support\Facades\Log;
 
 class TransactionToPerfexCRMProcessor
 {
-    /** @var FetchesCompany  */
-    private $fetchesCompany;
-
-    /** @var UpdatePerfexCRMProcessor */
-    private $updatePerfexCRMProcessor;
-
-    /** @var InitializePerfexCRMProcessor */
-    private $initializePerfexCRMProcessor;
-
-    /**
-     * TransactionToPerfexCRMProcessor constructor.
-     * @param UpdatePerfexCRMProcessor $updatePerfexCRMProcessor
-     * @param InitializePerfexCRMProcessor $initializePerfexCRMProcessor
-     * @param FetchesCompany $fetchesCompany
-     */
-    public function __construct(UpdatePerfexCRMProcessor $updatePerfexCRMProcessor, InitializePerfexCRMProcessor $initializePerfexCRMProcessor, FetchesCompany $fetchesCompany)
-    {
-        $this->updatePerfexCRMProcessor = $updatePerfexCRMProcessor;
-        $this->initializePerfexCRMProcessor = $initializePerfexCRMProcessor;
-        $this->fetchesCompany = $fetchesCompany;
-    }
-
-
     /**
      * @param Transaction $model
      * @param int $status
@@ -51,50 +23,53 @@ class TransactionToPerfexCRMProcessor
      */
     public function execute(Transaction $model, int $status)
     {
-        if($model->owner instanceof \App\Models\Transaction && $status == ApprovalStatus::APPROVED)
+        try
         {
-            $packingList = $model->owner->owner;
-            $order = $packingList->owner()->first();
-            $companyModule = $order->companyModule()->first();
-            $companyName = $companyModule->name;
-            $companyReference = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-            $employee = $companyModule->employees()->first();
-            $contactEmail = $employee->email;
-            $contactName = $employee->name;
+            if($model->owner instanceof \App\Models\Transaction && $status == ApprovalStatus::APPROVED)
+            {
+                $packingList = $model->owner->owner;
+                $order = $packingList->owner()->first();
+                $companyModule = $order->companyModule()->first();
+                $companyName = $companyModule->name;
+                $companyReference = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+                $employee = $companyModule->employees()->first();
+                $contactEmail = $employee->email;
+                $contactName = $employee->name;
 
-            $orderReference = $order->reference;
-            $packingListReference = $packingList->reference;
-            $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                $orderReference = $order->reference;
+                $packingListReference = $packingList->reference;
+                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
 
-            $bookingMarking = $packingList->id."-".$packingList->owner->id;
-            $updatePerfexCRMObject = new UpdatePerfexCRMObject(
-                $companyName,
-                $companyReference,
-                $contactName,
-                $contactEmail,
-                $bookingMarking,
-                $projectName,
-                PerfexCRMProjectStatus::IN_PROGRESS,
-                [],
-                [
-                    PerfexCRMTasks::TASK_1,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_1,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_2,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_3,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_4,
-                ]
-            );
+                $bookingMarking = $packingList->id."-".$packingList->owner->id;
+                $updatePerfexCRMObject = new UpdatePerfexCRMObject(
+                    $companyName,
+                    $companyReference,
+                    $contactName,
+                    $contactEmail,
+                    $bookingMarking,
+                    $projectName,
+                    PerfexCRMProjectStatus::IN_PROGRESS,
+                    [],
+                    [
+                        PerfexCRMTasks::TASK_1,
+                        PerfexCRMTasks::TASK_POST_PAYMENT_1,
+                        PerfexCRMTasks::TASK_POST_PAYMENT_2,
+                        PerfexCRMTasks::TASK_POST_PAYMENT_3,
+                        PerfexCRMTasks::TASK_POST_PAYMENT_4,
+                        ]
+                );
 
-            UpdatePerfexCRM::dispatch($updatePerfexCRMObject);
-
-            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
-                $contactEmail,
-                $model,
-                true
-            );
-            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject)->delay(6);
+                UpdatePerfexCRMPrelude::dispatch(null, $model, $updatePerfexCRMObject, UpdatePerfexCRM::class, UpdatePerfexCRMInvoice::class);
+            }
+            else if($model->owner instanceof \App\Models\PackingList && $model->status == ApprovalStatus::PENDING_SUBMISSION && $status == ApprovalStatus::APPROVED)
+            {
+                CreatePerfexCRMInvoice::dispatch($model);
+            }
+        }
+        catch (\Exception $exception) {
+            Log::error('TransactionToPerfexCRMProcessor debug:');
+            Log::error($exception);
         }
-
         return true;
     }
 }

app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php

@@ -11,6 +11,7 @@ use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMMilestone;
 use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMTask;
 use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomer;
 use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerContact;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMTask;
 use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMCustomer;
 use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMProject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
@@ -51,8 +52,8 @@ class UpdatePerfexCRMProcessor
     /** @var CreatesPerfexCRMCustomerContact */
     private $createsPerfexCRMCustomerContact;
 
-    /** @var UpdatesPerfexCRM */
-    private $updatePerfexCRM;
+    /** @var UpdatesPerfexCRMTask */
+    private $updatesPerfexCRMTask;
 
     /** @var UpdatesPerfexCRMCustomer */
     private $updatesPerfexCRMCustomer;
@@ -70,6 +71,7 @@ class UpdatePerfexCRMProcessor
      * @param FetchesPerfexCRMTask $fetchesPerfexCRMTask
      * @param CreatesPerfexCRMCustomer $createsPerfexCRMCustomer
      * @param CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact
+     * @param UpdatesPerfexCRMTask $updatesPerfexCRMTask
      * @param UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer
      * @param UpdatesPerfexCRMProject $updatesPerfexCRMProject
     */
@@ -82,6 +84,7 @@ class UpdatePerfexCRMProcessor
         FetchesPerfexCRMTask $fetchesPerfexCRMTask,
         CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
         CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
+        UpdatesPerfexCRMTask $updatesPerfexCRMTask,
         UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer,
         UpdatesPerfexCRMProject $updatesPerfexCRMProject)
    {
@@ -94,6 +97,7 @@ class UpdatePerfexCRMProcessor
         $this->fetchesPerfexCRMTask = $fetchesPerfexCRMTask;
         $this->createsPerfexCRMCustomer = $createsPerfexCRMCustomer;
         $this->createsPerfexCRMCustomerContact = $createsPerfexCRMCustomerContact;
+        $this->updatesPerfexCRMTask = $updatesPerfexCRMTask;
         $this->updatesPerfexCRMCustomer = $updatesPerfexCRMCustomer;
         $this->updatesPerfexCRMProject = $updatesPerfexCRMProject;
     }
@@ -104,6 +108,7 @@ class UpdatePerfexCRMProcessor
     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
    public function execute(UpdatePerfexCRMObject $updatePerfexCRMObject) {
+        $projectId = "";
 
        // Customer has to exist first before Project can appear under it
        // Check with Perfex CRM, if this user (email) was previously a lead, should automatically now become a customer
@@ -154,21 +159,27 @@ class UpdatePerfexCRMProcessor
        }
 
        // Get existing or create project, project has to exist first before milestone can appear under it
-       $result = $this->createsPerfexCRMCustomerProject->execute($updatePerfexCRMObject->getProjectName(), $updatePerfexCRMObject->getProjectStatus(), $crmClientId);
-       if(isset($result->payload)){  //Here means project creation successful
-            $projectId = $result->payload['project_id'];
-       }
-       else{
-            $project = $this->fetchesPerfexCRMProject->execute($updatePerfexCRMObject->getProjectName(), $crmClientId);
-            $projectId = $project->id;
+        $result = $this->fetchesPerfexCRMProject->execute($updatePerfexCRMObject->getProjectName(), $crmClientId);
+
+        if(isset($result->payload)){
+            $project = $result->payload[0];
+            $projectId = $project['id'];
+
             //if the project status is anything but PerfexCRMProjectStatus::NOT_STARTED, update the project
-            if($updatePerfexCRMObject->getProjectStatus() != PerfexCRMProjectStatus::NOT_STARTED)
+            if($updatePerfexCRMObject->getProjectStatus() != PerfexCRMProjectStatus::NOT_STARTED && $project['status'] == PerfexCRMProjectStatus::NOT_STARTED)
             {
                 $this->updatesPerfexCRMProject->execute($project, $updatePerfexCRMObject->getProjectStatus());
             }
-       }
+        }
+        else{
+            $result = $this->createsPerfexCRMCustomerProject->execute($updatePerfexCRMObject->getProjectName(), $updatePerfexCRMObject->getProjectStatus(), $crmClientId);
+            if(isset($result->payload)){  //Here means project creation successful
+                    $projectId = $result->payload['project_id'];
+            }
+        }
 
-       $tasks = $updatePerfexCRMObject->getTaskNames();
+
+       $tasks = $updatePerfexCRMObject->getTasks();
        if(count($tasks) > 0){
 
             //Create tasks with milestone
@@ -177,14 +188,16 @@ class UpdatePerfexCRMProcessor
                 if($tasks[$count]['milestone'] != "") //Create milestone only if it is defined
                 {
                     // Get existing or create milestone, milestone has to exist first before task can appear under it
-                    $result = $this->createsPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId, $count);
+                    $result = $this->fetchesPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId);
                     if(isset($result->payload)){
-                        $milestoneId = $result->payload['milestone_id'];
+                        $array = json_decode(json_encode($result->payload[0]), true);
+                        $milestoneId = $array['id'];
                     }
                     else{
-                        $milestone = $this->fetchesPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId);
-                        $array = json_decode(json_encode($milestone), true);
-                        $milestoneId = $array[0]['id'];
+                        $result = $this->createsPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId, $count);
+                        if(isset($result->payload)){
+                            $milestoneId = $result->payload['milestone_id'];
+                        }
                     }
                 }
 
@@ -194,13 +207,25 @@ class UpdatePerfexCRMProcessor
                 }
 
                 // Get existing or create task
-                $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $tasks[$count]['department'], $taskStatus);
-                if(is_null($result)){
+                $result = $this->fetchesPerfexCRMTask->execute($tasks[$count]['name'], $milestoneId, 'project', $projectId);
+                if(isset($result->payload)){
                     break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
+                    //The following are code not needed at Shipping Portal, Exchange need certain task's status to be updated dynamically
+                    // 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, $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']);
                 }
             }
         }
-        return true;
+
+        $payload = [];
+        $payload['projectId'] = $projectId;
+        return (object) $payload;
    }
 
 }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php

@@ -15,13 +15,16 @@ class CreatesPerfexCRMTask
      * @param string $leadId
      * @param string $milestoneId
      * @param string $projectId
-     * @param string $reference, default: ''
-     * @param string $on_task_completion, default: ''
-     * @param string $status, default: 1
+     * @param string $reference
+     * @param string $on_task_completion
+     * @param string $department
+     * @param string $status
+     * @param string $priority
+     * @param string $duedate
      * @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 = "1") {
+    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) {
         try{
             $custom_fields = [];
             if($department != ""){
@@ -43,7 +46,9 @@ class CreatesPerfexCRMTask
                 'is_system_created' => 1,
                 'reference' => $reference,
                 'on_task_completion' => $on_task_completion,
-                'custom_fields' => $custom_fields
+                'custom_fields' => $custom_fields,
+                'priority' => $priority,
+                'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
             ];
 
             if($leadId != '') {
@@ -58,7 +63,9 @@ class CreatesPerfexCRMTask
                     'is_system_created' => 1,
                     'reference' => $reference,
                     'on_task_completion' => $on_task_completion,
-                    'custom_fields' => $custom_fields
+                    'custom_fields' => $custom_fields,
+                    'priority' => $priority,
+                    'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
                 ];
             }
 

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMMilestone.php

@@ -16,9 +16,14 @@ class FetchesPerfexCRMMilestone
      */
     public function execute(string $milestoneName, string $projectId) {
         try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/milestones/bynameandprojectid/'.rawurlencode($milestoneName).'/'.$projectId);
+            $data = [
+                'name' => $milestoneName,
+                'project_id' => $projectId,
+            ];
+
+            $response = Http::asForm()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->post(config('perfexcrm.base_url').'/api/milestones/bynameandprojectid', $data);
 
             if($response->successful()){
                 $data = $response->json();

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php

@@ -11,14 +11,27 @@ class FetchesPerfexCRMTask
     /**
      * @param string $taskName
      * @param string $milestoneId
+     * @param string $relType
+     * @param string $relId
      * @return null|object
      * @throws MalformedRequestException
      */
-    public function execute(string $taskName, string $milestoneId) {
+    public function execute(string $taskName, string $milestoneId, string $relType, string $relId) {
         try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/tasks/bynameandmilestoneid/'.rawurlencode($taskName).'/'.$milestoneId);
+            $data = [
+                'name' => $taskName,
+                'rel_type' => $relType,
+                'rel_id' => $relId,
+            ];
+
+            if($milestoneId != '') {
+                $newItem = ['milestone' =>  $milestoneId ];
+                $data = array_merge($data, $newItem);
+            }
+
+            $response = Http::asForm()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->post(config('perfexcrm.base_url').'/api/tasks/customsearch', $data);
 
             if($response->successful()){
                 $data = $response->json();

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMProject.php

@@ -17,17 +17,17 @@ class UpdatesPerfexCRMProject
     public function execute($project, int $status) {
         try{
             $data = [
-                'name' => $project->name,
-                'clientid' => $project->clientid,
+                'name' => $project['name'],
+                'clientid' => $project['clientid'],
                 // 'rel_type' => 'customer',
                 'billing_type' => 1,
-                'start_date' => $project->start_date,
+                'start_date' => $project['start_date'],
                 'status' => $status
             ];
 
             $response = Http::asJson()->withHeaders([
                 'authtoken' => config('perfexcrm.api_key')])
-            ->put(config('perfexcrm.base_url').'/api/projects/'.$project->id, $data);
+            ->put(config('perfexcrm.base_url').'/api/projects/'.$project['id'], $data);
 
             if($response->successful()){
                 $data = $response->json();

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php

@@ -29,8 +29,7 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
      * @param UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor
      */
     public function __construct(
-        UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor,
-    )
+        UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor)
     {
         $this->updatePostcodeSegmentProcessor = $updatePostcodeSegmentProcessor;
     }
@@ -48,4 +47,4 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
         return $this->resourceResponse(new ConstantResource($constant));
     }
 
-}
+}

app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php

@@ -75,11 +75,6 @@ class ApproveShippingInvoiceTransactionProcessor
             $user->notify(new InvoiceIssuedEmail($user, $packingList));
         }
 
-        // update perfex crm
-        if(config('perfexcrm.is_enabled') == 'true'){
-            CreatePerfexCRMInvoice::dispatch($invoice_transaction);
-        }
-
         return;
     }
 

app/Classes/Modules/Transactions/Services/UpdatesTransactionStatus.php

@@ -5,25 +5,19 @@ namespace App\Classes\Modules\Transactions\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Models\Transaction;
 use App\Classes\Modules\PerfexCRM\Processors\TransactionToPerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
 
 class UpdatesTransactionStatus extends AbstractUpdateRecord
 {
     /** @var TransactionToPerfexCRMProcessor */
     private $transactionToPerfexCRMProcessor;
 
-    /** @var NewLeadTaskToPerfexCRMProcessor */
-    private $newLeadTaskToPerfexCRMProcessor;
-
     /**
      * UpdatesTransactionStatus constructor.
      * @param TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor
-     * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
      */
-    public function __construct(TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor, NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
+    public function __construct(TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor)
     {
         $this->transactionToPerfexCRMProcessor = $transactionToPerfexCRMProcessor;
-        $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
     }
 
     /**
@@ -34,11 +28,13 @@ class UpdatesTransactionStatus extends AbstractUpdateRecord
      */
     public function execute(Transaction $model, int $status)
     {
-        if(config('perfexcrm.is_enabled') == 'true'){
-            $this->transactionToPerfexCRMProcessor->execute($model, $status);
-            // $this->newLeadTaskToPerfexCRMProcessor->execute();
-        }
+        $transaction = clone($model);
         $model->status = $status;
-        return $this->handler($model);
+        $result = $this->handler($model);
+
+        if(config('perfexcrm.is_enabled') == 'true'){
+            $this->transactionToPerfexCRMProcessor->execute($transaction, $status);
+        }
+        return $result;
     }
 }

app/Classes/ValueObjects/Constants/PerfexCRMTaskPriority.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class PerfexCRMTaskPriority {
+
+    public const DEFAULT = 0;
+
+    public const LOW = 1;
+
+    public const MEDIUM = 2;
+
+    public const HIGH = 3;
+
+    public const URGENT = 4;
+
+}

app/Classes/ValueObjects/Constants/PerfexCRMTasks.php

@@ -14,7 +14,9 @@ class PerfexCRMTasks
         'reference' => '',
         'on_task_completion' => '',
         'department' => '',
-        'status' => PerfexCRMTaskStatus::COMPLETED
+        'status' => PerfexCRMTaskStatus::COMPLETED,
+        'priority' => PerfexCRMTaskPriority::DEFAULT,
+        'duedate' => 0
     ];
 
     public const TASK_POST_PAYMENT_1 = [
@@ -31,23 +33,21 @@ class PerfexCRMTasks
         'reference' => 'TASK_POST_PAYMENT_1',
         'on_task_completion' => 'TASK_POST_PAYMENT_2',
         'department' => 'Accounts',
-        'status' => PerfexCRMTaskStatus::IN_PROGRESS
+        'status' => PerfexCRMTaskStatus::IN_PROGRESS,
+        'priority' => PerfexCRMTaskPriority::HIGH,
+        'duedate' => 0
     ];
     public const TASK_POST_PAYMENT_2 = [
         'name' => 'Approve Payment',
         'description' => '○ Purpose: To verify and approve the customer\'s payment on IZYIM<br>
-        ○ Initial Status: Not Started<br>
-        ○ Deadline:Same day<br>
-        ○ Responsible department: Accounts<br>
-        ○ Next step: Change the status of the Issue Shipping Autocount Invoice operation to "In Progress"<br>
-        ○ Additional details: When the payment method is FPX or Wallet this task is performed automatically by the system.<br>
-        ○ Dependencies: Map Transaction operation must be completed before this operation can begin.<br>
-        ○ Outcomes: The payment will be approved in IZYIM, which will release the customer’s goods for delivery.<br>',
+        ○ Amount To be Approve: RM {amount}<br>',
         'milestone' => '',
         'reference' => 'TASK_POST_PAYMENT_2',
         'on_task_completion' => 'TASK_POST_PAYMENT_3',
         'department' => 'Accounts',
-        'status' => ''
+        'status' => '',
+        'priority' => PerfexCRMTaskPriority::HIGH,
+        'duedate' => 0
     ];
     public const TASK_POST_PAYMENT_3 = [
         'name' => 'Issue Shipping Autocount Invoince',
@@ -63,7 +63,22 @@ class PerfexCRMTasks
         'reference' => 'TASK_POST_PAYMENT_3',
         'on_task_completion' => 'TASK_POST_PAYMENT_4',
         'department' => 'Accounts',
-        'status' => ''
+        'status' => '',
+        'priority' => PerfexCRMTaskPriority::MEDIUM,
+        'duedate' => 1
+    ];
+    public const TASK_POST_PAYMENT_3_1 = [
+        'name' => 'Issue Shipping Autocount OR',
+        'description' => '○ Purpose: To issue an invoice for the customer\'s payment in accounting software.<br>
+        ○ Note: Customer Actually Upload Bank Slip or Not, If not, Invoice Will Not be Exported<br>
+        ○ {link_autocount_or}<br>',
+        'milestone' => '',
+        'reference' => 'TASK_POST_PAYMENT_3_1',
+        'on_task_completion' => 'TASK_POST_PAYMENT_4',
+        'department' => 'Accounts',
+        'status' => '',
+        'priority' => PerfexCRMTaskPriority::DEFAULT,
+        'duedate' => 0
     ];
     public const TASK_POST_PAYMENT_4 = [
         'name' => 'Knockoff Invoice',
@@ -79,36 +94,35 @@ class PerfexCRMTasks
         'reference' => 'TASK_POST_PAYMENT_4',
         'on_task_completion' => '',
         'department' => 'Accounts',
-        'status' => ''
+        'status' => '',
+        'priority' => PerfexCRMTaskPriority::MEDIUM,
+        'duedate' => 1
     ];
 
     public const TASK_LOADED_CONTAINER_1 = [
         'name' => 'Generate Shipping Invoices',
         'description' => '○ Purpose: -<br>
-        ○ Initial Status: In Progress<br>
-        ○ Deadline: Next day<br>
-        ○ Responsible department: Operation<br>
-        ○ Assignee: -<br>
-        ○ Next step: Approve Shipping Invoice change to in progress.<br>',
+        ○ Link to order page: {link_order}<br>',
         'milestone' => '',
         'reference' => 'TASK_LOADED_CONTAINER_1',
         'on_task_completion' => 'TASK_LOADED_CONTAINER_2',
         'department' => 'Operations',
-        'status' => PerfexCRMTaskStatus::IN_PROGRESS
+        'status' => PerfexCRMTaskStatus::IN_PROGRESS,
+        'priority' => PerfexCRMTaskPriority::HIGH,
+        'duedate' => 1
     ];
 
     public const TASK_LOADED_CONTAINER_2 = [
         'name' => 'Approve Shipping Invoices',
         'description' => '○ Purpose: -<br>
-        ○ Initial Status: Not Starteds<br>
-        ○ Deadline: Next day<br>
-        ○ Responsible department: Customer Services<br>
-        ○ Next step: -<br>',
+        ○ Link to refer Pay On Behalf or Any extra charge: : {link_perfex}<br>',
         'milestone' => '',
         'reference' => 'TASK_LOADED_CONTAINER_2',
         'on_task_completion' => '',
         'department' => 'Customer Services',
-        'status' => ''
+        'status' => '',
+        'priority' => PerfexCRMTaskPriority::HIGH,
+        'duedate' => 1
     ];
 
 
@@ -126,6 +140,8 @@ class PerfexCRMTasks
         'reference' => 'TASK_IDENTIFICATION_1',
         'on_task_completion' => '',
         'department' => 'Operations',
-        'status' => PerfexCRMTaskStatus::IN_PROGRESS
+        'status' => PerfexCRMTaskStatus::IN_PROGRESS,
+        'priority' => PerfexCRMTaskPriority::DEFAULT,
+        'duedate' => 0
     ];
 }

docker-setup/nginx/default.conf

@@ -23,5 +23,9 @@ server {
         fastcgi_intercept_errors on;
         fastcgi_keep_conn on;
         fastcgi_param PHP_VALUE "auto_prepend_file= \n allow_url_include=Off \n  output_buffering=Off \n output_buffering=4096";
+        proxy_send_timeout 3600;
+        proxy_read_timeout 3600;
+        fastcgi_send_timeout 3600;
+        fastcgi_read_timeout 3600;
     }
 }