update admin role type

New merge request From dillon/debug-and-fixes-2 into master

See merge request CIEFWorldwideSdnBhd/shipping-portal!159

.env.example

@@ -55,3 +55,7 @@ EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
 MIX_EXCHANGE_URL="${EXCHANGE_URL}"
 
 YD_API_CODE=''
+
+PERFEXCRM_BASE_URL=""
+PERFEXCRM_API_KEY=""
+PERFEXCRM_IS_ENABLED="false"

app/Classes/General/Eloquent/Filters/DoesNotHaveTransactionType.php

@@ -15,7 +15,7 @@ class DoesNotHaveTransactionType implements Filter
     public static function apply(Builder $builder, $value)
     {
         return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
-            $query->where('type', $value);
+            $query->where('type', $value)->whereIn('status', [0,1,2,3]);
         })->whereHas('containers', function ($query){
             return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
         });

app/Classes/Jobs/CreatePerfexCRMCustomer.php

@@ -3,6 +3,8 @@
 namespace App\Classes\Jobs;
 
 use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMLead;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -28,6 +30,12 @@ class CreatePerfexCRMCustomer implements ShouldQueue
 
     public function handle()
     {
-        (App()->make(CreatePerfexCRMLeadProcessor::class))->execute($this->createLeadPerfexCRMObject);
+        $lead = (App()->make(FetchesPerfexCRMLead::class))->execute($this->createLeadPerfexCRMObject->getEmail());
+        if(!is_null($lead)){
+            (App()->make(UpdatesPerfexCRMLead::class))->execute($lead, $this->createLeadPerfexCRMObject->getCompanyReference());
+        }
+        else{
+            (App()->make(CreatePerfexCRMLeadProcessor::class))->execute($this->createLeadPerfexCRMObject);
+        }
     }
 }

app/Classes/Jobs/CreatePerfexCRMInvoice.php

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

app/Classes/Jobs/CreatePerfexCRMSingleTask.php

@@ -4,12 +4,12 @@ namespace App\Classes\Jobs;
 
 use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMTaskProcessor;
 use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
 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\CreateTaskPerfexCRMObject;
 
 class CreatePerfexCRMSingleTask implements ShouldQueue
 {

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/UpdatePerfexCRMInvoice.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
+use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMInvoice;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMInvoice;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
+use App\Classes\ValueObjects\Constants\PerfexCRMInvoiceStatus;
+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 Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+
+
+class UpdatePerfexCRMInvoice implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var UpdatePerfexCRMInvoiceObject */
+    private $updatePerfexCRMInvoiceObject;
+
+    /**
+     * CreatePerfexCRMSingleTask constructor.
+     * @param UpdatePerfexCRMInvoiceObject $createTaskPerfexCRMObject
+     */
+    public function __construct(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
+    {
+        $this->updatePerfexCRMInvoiceObject = $updatePerfexCRMInvoiceObject;
+    }
+
+    public function handle()
+    {
+        //get the client id
+        $customer = (App()->make(FetchesPerfexCRMCustomer::class))->execute($this->updatePerfexCRMInvoiceObject->getEmail());
+        $transaction = $this->updatePerfexCRMInvoiceObject->getTransaction();
+
+        //get the invoice id
+        $invoiceId = 0;
+        $invoiceStatus = 0;
+        $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
+
+        if(is_null($invoice)){
+            $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
+            $invoiceId = $result->payload['id'];
+        }
+        else{
+            $invoiceId = $invoice->id;
+            $invoiceStatus = $invoice->status;
+
+            //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;
+                    $result = (App()->make(FetchesPerfexCRMProject::class))->execute($projectName, $customer->userid);
+                    if(isset($result->payload)){
+                        $project = $result->payload[0];
+                        $projectId = $project['id'];
+                    }
+                }
+
+                if($projectId == ""){
+                    Log::error(json_encode('UpdatePerfexCRMInvoice debug: '.$projectName));
+                    Log::error(json_encode($transaction->owner));
+                }
+
+                //update invoice
+                (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $projectId);
+            }
+        }
+
+        //create invoice payment
+        if($invoiceId != 0 && $invoiceStatus != PerfexCRMInvoiceStatus::PAID){
+
+            $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
+
+            $invoicePaymentPerfexCRMObject = new InvoicePaymentPerfexCRMObject(
+                $invoiceId,
+                "$transaction->amount",
+                $date,
+                1,
+                "",
+                ""
+            );
+            (App()->make(CreatesPerfexCRMInvoicePayment::class))->execute($invoicePaymentPerfexCRMObject);
+        }
+    }
+
+    public function delay($delay)
+    {
+        // Add delay in seconds to the job
+        $this->delay = $delay;
+        return $this;
+    }
+}

app/Classes/Jobs/UpdatePerfexCRMPrelude.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+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 */
+    private $nextJob;
+
+    /**
+     * UpdatePerfexCRMPrelude constructor.
+     * @param $packingList
+     * @param $transaction
+     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
+     * @param $nextJob
+     */
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob)
+    {
+        $this->packingList = $packingList;
+        $this->transaction = $transaction;
+        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
+        $this->nextJob = $nextJob;
+    }
+
+    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);
+        $this->nextJob::dispatch($this->updatePerfexCRMObject);
+    }
+
+    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/Accounts/ControllersLogic/CreateCustomerLogic.php

@@ -161,7 +161,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
                 $request->input('name'),
                 $request->input('email'),
                 $request->input('phone'),
-                $request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name')
+                $request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name'),
+                $connection->invitee_reference
             );
             CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
         }

app/Classes/Modules/Accounts/ControllersLogic/UpdateUserLogic.php

@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Accounts\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounts\Services\UpdatesUser;
+use App\Classes\Modules\Accounts\Services\UpdatesUserFullName;
 use App\Classes\Modules\Accounts\Services\FetchesUser;
 use App\Classes\Modules\Accounts\Standards\Rules\CanUpdateUser;
 use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
@@ -29,8 +29,8 @@ class UpdateUserLogic extends AbstractControllerLogic
     /** @var CanUpdateUser */
     private $canUpdateUser;
 
-    /** @var UpdatesUser */
-    private $updatesUser;
+    /** @var UpdatesUserFullName */
+    private $updatesUserFullName;
 
     /** @var FetchesUser */
     private $fetchesUser;
@@ -38,13 +38,13 @@ class UpdateUserLogic extends AbstractControllerLogic
     /**
      * UpdateAddressLogic constructor.
      * @param CanUpdateUser $canUpdateUser
-     * @param UpdatesUser $updatesUser
+     * @param UpdatesUserFullName $updatesUserFullName
      * @param FetchesUser $fetchesUSer
      */
-    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUser $updatesUser, FetchesUser $fetchesUser)
+    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUserFullName $updatesUserFullName, FetchesUser $fetchesUser)
     {
         $this->canUpdateUser = $canUpdateUser;
-        $this->updatesUser = $updatesUser;
+        $this->updatesUserFullName = $updatesUserFullName;
         $this->fetchesUser = $fetchesUser;
     }
 
@@ -64,7 +64,7 @@ class UpdateUserLogic extends AbstractControllerLogic
 
             $query = $this->fetchesUser->execute(['id' => $request->route('id')]);
 
-            $query = $this->updatesUser->execute($query, $object);
+            $query = $this->updatesUserFullName->execute($query, $object);
 
             return $this->resourceResponse(new UserResource($query));
 

app/Classes/Modules/Accounts/ControllersLogic/UpdateUserRoleLogic.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Services\UpdatesUser;
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Standards\Rules\CanUpdateUser;
+use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Http\Resources\UserResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateUserRoleLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Admin Role',
+            'message' => 'You have successfully updated the Admin Role'
+        ];
+    }
+
+    /** @var CanUpdateUser */
+    private $canUpdateUser;
+
+    /** @var UpdatesUser */
+    private $updatesUser;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /**
+     * UpdateAddressLogic constructor.
+     * @param CanUpdateUser $canUpdateUser
+     * @param UpdatesUser $updatesUser
+     * @param FetchesUser $fetchesUSer
+     */
+    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUser $updatesUser, FetchesUser $fetchesUser)
+    {
+        $this->canUpdateUser = $canUpdateUser;
+        $this->updatesUser = $updatesUser;
+        $this->fetchesUser = $fetchesUser;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->fetchesUser->execute(['id' => $request->route('id')]);
+
+        $object = new UserObject($query->name, $request->input('type'));
+
+        $this->canUpdateUser->passes($object);
+
+        $query = $this->updatesUser->execute($query, $object);
+
+        return $this->resourceResponse(new UserResource($query));
+    }
+
+}

app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class UserObject implements DataTransferObject
+{
+    /** @var string */
+    private $name;
+
+    /** @var int */
+    private $type;
+
+    /**
+     * FullNameObject constructor.
+     * @param string $name
+     */
+    public function __construct(string $name, int $type)
+    {
+        $this->name = $name;
+        $this->type = $type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+}

app/Classes/Modules/Accounts/Services/UpdatesUser.php

@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Accounts\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
 use App\Models\User;
 
 class UpdatesUser extends AbstractUpdateRecord
@@ -11,13 +11,14 @@ class UpdatesUser extends AbstractUpdateRecord
 
     /**
      * @param User $model
-     * @param FullNameObject $object
+     * @param UserObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(User $model, FullNameObject $object) {
+    public function execute(User $model, UserObject $object) {
 
         $model->name = $object->getName();
+        $model->type = $object->getType();
         return $this->handler($model);
 
     }

app/Classes/Modules/Accounts/Services/UpdatesUserFullName.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
+use App\Models\User;
+
+class UpdatesUserFullName extends AbstractUpdateRecord
+{
+
+    /**
+     * @param User $model
+     * @param FullNameObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(User $model, FullNameObject $object) {
+
+        $model->name = $object->getName();
+        return $this->handler($model);
+
+    }
+}

app/Classes/Modules/Addresses/ControllersLogic/CreateBillingAddressLogic.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\AddressResource;
+use App\Models\Address;
+use App\Models\CompanyModule;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBillingAddressLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Billing Address',
+            'message' => 'You have successfully created a new Billing Address'
+        ];
+    }
+
+    /** @var CanCreateAddress */
+    private $canCreateAddress;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
+    /**
+     * CreateAddressLogic constructor.
+     * @param CanCreateAddress $canCreateAddress
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param CreatesAddress $createsAddress
+     * @param FetchesAddress $fetchesAddress
+     */
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress)
+    {
+        $this->canCreateAddress = $canCreateAddress;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createsAddress = $createsAddress;
+        $this->fetchesAddress = $fetchesAddress;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
+        
+        $address = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
+
+        if ($address->type !== AddressType::BILLING || $address->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
+            // delete all current billing address
+            Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();
+
+            // create addrress
+            $billingAddress = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $address->reference);
+            $this->canCreateAddress->passes($billingAddress);
+            $this->createsAddress->execute($companyModule, $billingAddress);
+        }
+
+        return $this->resourceResponse(new AddressResource($address));
+    }
+
+}

app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php

@@ -23,6 +23,7 @@ use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
@@ -101,9 +102,11 @@ class CallbackBillplzLogic
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
+        $this->updatesTransactionStatus->execute($transaction, $status);
 
-        if(($invoice->amount - $transaction->amount) < 0.01) {
+        $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+
+        if(($invoice->amount - $totalPaidAmount) < 0.01) {
             $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
 
             $packingList->status = ApprovalStatus::APPROVED;

app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyTypeLogic.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Http\Resources\CompanyResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyTypeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Company Type',
+            'message' => 'You have successfully updated the Company Tyoe'
+        ];
+    }
+
+    /** @var CanUpdateCompany */
+    private $canUpdateCompany;
+ 
+    /** @var UpdatesCompany */
+    private $updatesCompany;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /**
+     * UpdateCompanyControllersLogic constructor.
+     * @param CanUpdateCompany $canUpdateCompany
+     * @param UpdatesCompany $updatesCompany
+     * @param FetchesCompany $fetchesCompany
+     */
+    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany)
+    {
+        $this->canUpdateCompany = $canUpdateCompany;
+        $this->updatesCompany = $updatesCompany;
+        $this->fetchesCompany = $fetchesCompany;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $object = new CompanyObject($query->name, $query->reference, $request->input('type'));
+
+        $this->canUpdateCompany->passes($object);
+
+        $query = $this->updatesCompany->execute($query, $object);
+
+        return $this->resourceResponse(new CompanyResource($query));
+    }
+
+}

app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php

@@ -7,6 +7,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
@@ -39,6 +40,8 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
+    /** @var NewLeadTaskToPerfexCRMProcessor */
+    private $newLeadTaskToPerfexCRMProcessor;
     /**
      * CreateOrderLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -46,22 +49,24 @@ class CreateOrderLogic extends AbstractControllerLogic
      * @param CreateOrderProcessor $createOrderProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param GeneratesOrderNumber $generatesOrderNumber
+     * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesAddress = $fetchesAddress;
         $this->createOrderProcessor = $createOrderProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesOrderNumber = $generatesOrderNumber;
+        $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
     }
 
 
     public function logic(Request $request) : JsonResponse {
 
-        
+
         $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-        
+
         $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]);
 
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
@@ -76,6 +81,10 @@ class CreateOrderLogic extends AbstractControllerLogic
 
         $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());
 
+        if(config('perfexcrm.is_enabled') == 'true'){
+            $this->newLeadTaskToPerfexCRMProcessor->execute($company);
+        }
+
         return $this->resourceResponse(new OrderResource($order));
     }
 }

app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PackingLists\Processors;
 
 
 use App\Classes\General\Interfaces\Packable;
+use App\Classes\Modules\PerfexCRM\Processors\PackingListToPerfexCRMProcessor;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
@@ -25,16 +26,20 @@ class CreatePackingListProcessor
     /** @var CreatesPackingList */
     private $createsPackingList;
 
+    /** @var PackingListToPerfexCRMProcessor */
+    private $packingListToPerfexCRMProcessor;
 
     /**
      * CreatePackingListProcessor constructor.
      * @param CanCreatePackingList $canCreatePackingList
      * @param CreatesPackingList $createsPackingList
+     * @param PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
      */
-    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList)
+    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
     {
         $this->canCreatePackingList = $canCreatePackingList;
         $this->createsPackingList = $createsPackingList;
+        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
     /**
@@ -59,6 +64,10 @@ class CreatePackingListProcessor
         $object = new PackingListObject($object->getReference().'_01', $appointee_id, $type, ApprovalStatus::PENDING_SUBMISSION);
         $this->createsPackingList->execute($object, $packingList);
 
+        if(config('perfexcrm.is_enabled') == 'true'){
+            $this->packingListToPerfexCRMProcessor->execute($packingList);
+        }
+
         return $packingList;
     }
 

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

@@ -19,13 +19,17 @@ class CreateLeadPerfexCRMObject implements DataTransferObject
     /** @var string */
     private $companyName;
 
-    public function __construct(string $name, string $email, string $phone, string $companyName)
+    /** @var string */
+    private $companyReference;
+
+    public function __construct(string $name, string $email, string $phone, string $companyName, string $companyReference)
     {
 
         $this->name = $name;
         $this->email = $email;
         $this->phone = $phone;
         $this->companyName = $companyName;
+        $this->companyReference = $companyReference;
     }
 
     /**
@@ -60,4 +64,11 @@ class CreateLeadPerfexCRMObject implements DataTransferObject
         return $this->companyName;
     }
 
+    /**
+     * @return string
+     */
+    public function getCompanyReference(): string
+    {
+        return $this->companyReference;
+    }
 }

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

@@ -33,8 +33,16 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
     /** @var string */
     private $status;
 
+    /** @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)
+    /** @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;
@@ -45,6 +53,9 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
         $this->reference = $reference;
         $this->onTaskCompletion = $onTaskCompletion;
         $this->status = $status;
+        $this->department = $department;
+        $this->priority = $priority;
+        $this->duedate = $duedate;
     }
 
     /**
@@ -124,4 +135,27 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
         return $this->status;
     }
 
+    /**
+     * @return string
+     */
+    public function getDepartment(): string
+    {
+        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/InitialPerfexCRMObject.php

@@ -25,6 +25,9 @@ class InitialPerfexCRMObject implements DataTransferObject
     /** @var string */
     private $projectName;
 
+    /** @var int */
+    private $projectStatus;
+
     /** @var array */
     private $milestoneNames;
 
@@ -32,7 +35,7 @@ class InitialPerfexCRMObject implements DataTransferObject
     private $taskNames;
 
 
-    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, array $milestoneNames, array $taskNames)
+    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $taskNames)
     {
 
         $this->companyName = $companyName;
@@ -41,6 +44,7 @@ class InitialPerfexCRMObject implements DataTransferObject
         $this->contactEmail = $contactEmail;
         $this->bookingMarking = $bookingMarking;
         $this->projectName = $projectName;
+        $this->projectStatus = $projectStatus;
         $this->milestoneNames = $milestoneNames;
         $this->taskNames = $taskNames;
     }
@@ -93,6 +97,14 @@ class InitialPerfexCRMObject implements DataTransferObject
         return $this->projectName;
     }
 
+    /**
+     * @return string
+     */
+    public function getProjectStatus(): int
+    {
+        return $this->projectStatus;
+    }
+
     /**
      * @return array
      */

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

@@ -7,7 +7,7 @@ use App\Classes\General\Interfaces\DataTransferObject;
 
 class InvoicePerfexCRMObject implements DataTransferObject
 {
-    /** @var int */
+    /** @var string */
     private $clientId;
 
     /** @var string */
@@ -56,9 +56,9 @@ class InvoicePerfexCRMObject implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return string
      */
-    public function getClientId(): int
+    public function getClientId(): string
     {
         return $this->clientId;
     }

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

@@ -14,7 +14,7 @@ class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
     /** @var string */
     public $longDescription;
 
-    /** @var int */
+    /** @var float */
     public $qty;
 
     /** @var float */
@@ -26,7 +26,7 @@ class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
     /** @var string */
     public $unit;
 
-    public function __construct(string $description, string $longDescription, int $qty, float $rate, int $order, string $unit)
+    public function __construct(string $description, string $longDescription, float $qty, float $rate, int $order, string $unit)
     {
         $this->description = $description;
         $this->longDescription = $longDescription;
@@ -53,9 +53,9 @@ class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return float
      */
-    public function getQty(): int
+    public function getQty(): float
     {
         return $this->qty;
     }

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

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
+
+use Illuminate\Http\Request;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Models\Transaction;
+
+class UpdatePerfexCRMInvoiceObject implements DataTransferObject
+{
+    /** @var string */
+    private $email;
+
+    /** @var Transaction */
+    private $transaction;
+
+    /** @var bool */
+    private $isPaid;
+
+    public function __construct(string $email, Transaction $transaction, bool $isPaid)
+    {
+        $this->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;
+    }
+}

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

@@ -13,6 +13,9 @@ class UpdatePerfexCRMObject implements DataTransferObject
     /** @var string */
     private $companyReference;
 
+    /** @var string */
+    private $contactName;
+
     /** @var string */
     private $contactEmail;
 
@@ -22,23 +25,28 @@ class UpdatePerfexCRMObject implements DataTransferObject
     /** @var string */
     private $projectName;
 
-    /** @var string */
-    private $milestoneName;
+    /** @var int */
+    private $projectStatus;
 
-    /** @var string */
-    private $taskName;
+    /** @var array */
+    private $milestoneNames;
+
+    /** @var array */
+    private $tasks;
 
 
-    public function __construct(string $companyName, string $companyReference, string $contactEmail, string $bookingMarking, string $projectName, string $milestoneName, string $taskName)
+    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $tasks)
     {
 
         $this->companyName = $companyName;
         $this->companyReference = $companyReference;
+        $this->contactName = $contactName;
         $this->contactEmail = $contactEmail;
         $this->bookingMarking = $bookingMarking;
         $this->projectName = $projectName;
-        $this->milestoneName = $milestoneName;
-        $this->taskName = $taskName;
+        $this->projectStatus = $projectStatus;
+        $this->milestoneNames = $milestoneNames;
+        $this->tasks = $tasks;
     }
 
     /**
@@ -57,6 +65,14 @@ class UpdatePerfexCRMObject implements DataTransferObject
         return $this->companyReference;
     }
 
+    /**
+     * @return string
+     */
+    public function getContactName(): string
+    {
+        return $this->contactName;
+    }
+
     /**
      * @return string
      */
@@ -82,19 +98,31 @@ class UpdatePerfexCRMObject implements DataTransferObject
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getMilestoneName(): string
+    public function getProjectStatus(): int
     {
-        return $this->milestoneName;
+        return $this->projectStatus;
     }
 
     /**
-     * @return string
+     * @return array
      */
-    public function getTaskName(): string
+    public function getMilestoneNames(): array
     {
-        return $this->taskName;
+        return $this->milestoneNames;
     }
 
+    /**
+     * @return array
+     */
+    public function getTasks(): array
+    {
+        return $this->tasks;
+    }
+
+    public function setTasks($tasks)
+    {
+        $this->tasks = $tasks;
+    }
 }

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

@@ -2,14 +2,19 @@
 
 namespace App\Classes\Modules\PerfexCRM\Processors;
 
-// use App\Classes\Modules\PerfexCRM\DataTransferObjects\ContactObject;
+use App\Models\Transaction;
 use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoice;
 use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
 use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoiceSingleItemPerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
+use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use App\Models\PackingList;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
 
 class CreatePerfexCRMInvoiceProcessor
 {
@@ -23,84 +28,116 @@ class CreatePerfexCRMInvoiceProcessor
     /** @var ConvertsPerfexCRMLeadToCustomer */
     private $convertsPerfexCRMLeadToCustomer;
 
+    /** @var FetchesPerfexCRMProject */
+    private $fetchesPerfexCRMProject;
+
+    /** @var CreatesPerfexCRMCustomerProject */
+    private $createsPerfexCRMCustomerProject;
+
     /**
      * CreatePerfexCRMInvoiceProcessor constructor.
      * @param CreatesPerfexCRMInvoice $createsPerfexCRMInvoice
      */
     public function __construct(CreatesPerfexCRMInvoice $createsPerfexCRMInvoice,
     CreatesPerfexCRMInvoicePayment $createsPerfexCRMInvoicePayment,
-    ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer)
+    ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
+    FetchesPerfexCRMProject $fetchesPerfexCRMProject,
+    CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject)
     {
         $this->createsPerfexCRMInvoice = $createsPerfexCRMInvoice;
         $this->createsPerfexCRMInvoicePayment = $createsPerfexCRMInvoicePayment;
         $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
+        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
+        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
     }
 
     /**
-     * @param $transaction
-     * @param $purchaseOrder
-     * @param $supplier
+     * @param Transaction $transaction
+     * @param bool $isPaid, default: false
      * @return null|object
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute($transaction, $purchaseOrder, $supplier) {
+    public function execute(Transaction $transaction, bool $isPaid = false) {
         $clientId = "";
         $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));
         }
 
-        $date = Carbon::parse($transaction->booking->created_at)->format('Y-m-d');
-        $dueDate = Carbon::parse($transaction->booking->created_at)->format('Y-m-d');
-        $currency = 1; //cief TODO: To look into Malaysia and Chinese currency
+        $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;
         $subTotal = 0.00;
         $total = 0.00;
 
+        $companyModule = $transaction->owner->owner->companyModule;
         $billingStreet = "";
-        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
+        $addresses = $companyModule
+                    ->addresses()
+                    ->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]";
+        }
 
-        $projectId = "";
         $allowedPaymentModes = [];
         $invoiceItems = [];
 
-        $email = $supplier->employees()->first()->email;
-        $email = 'dillon37@yahoo.com'; //cief TODO: To be updated to user actual email address
+        $employee = $companyModule->employees()->first();
+        $email = $employee->email;
+
         $result = $this->convertsPerfexCRMLeadToCustomer->execute($email);
         if(isset($result->payload)){
             $clientId = $result->payload['client_id'];
         }
 
+        //get project
+        $projectId = ""; //Project only exist in CRM if the customer already made payment
+        $projectName = "";
+        if($isPaid){
+            if($transaction->owner instanceof PackingList){
+                $orderReference = $transaction->owner->owner->reference;
+                $packingListReference = $transaction->owner->reference;
+                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                $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);
+                    if(isset($result->payload)){  //Here means project creation successful
+                        $projectId = $result->payload['project_id'];
+                    }
+                }
+            }
+
+            if($projectId == ""){
+                Log::error(json_encode('CreatePerfexCRMInvoiceProcessor debug: '.$projectName));
+                Log::error(json_encode($transaction->owner));
+            }
+        }
+
         //newitems
-        foreach ($purchaseOrder->transactionDetails as $key => $transaction_detail){
+        foreach ($transaction->transactionDetails as $key => $transaction_detail){
             $order = $key + 1;
-            $stockCode = $transaction_detail->product_code;
-            $description = $transaction_detail->product_name;
+            $description = $transaction_detail->name;
             $quantity = $transaction_detail->quantity;
-            $unitPrice = 0.00;
-            if($transaction->booking()->first()->fix_currency_id !== 1)
-                $unitPrice = (1/$transaction->currency_rate) * $transaction_detail->price;
-            else
-                $unitPrice = $transaction_detail->price;
+            $unitPrice = $transaction_detail->price;
 
-            //$totalAmount = 0.00;
-            if($transaction->booking()->first()->fix_currency_id !== 1){
-
-                //$totalAmount = (float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity;
-                $subTotal += (1/$transaction->currency_rate) * $transaction_detail->price * $transaction_detail->quantity;
-            }
-            else
-            {
-                //$totalAmount = (float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity;
-                $subTotal += $transaction_detail->price * $transaction_detail->quantity;
-            }
+            $subTotal = $subTotal + $transaction_detail->amount;
 
             //string $description, string $longDescription, int $qty, int $rate, int $order, string $unit
             $invoiceSingleItem = new InvoiceSingleItemPerfexCRMObject(
@@ -114,16 +151,11 @@ class CreatePerfexCRMInvoiceProcessor
             array_push($invoiceItems, $invoiceSingleItem);
         }
 
-        if($transaction->booking()->first()->fix_currency_id !== 1){
-            $total = ((1/$transaction->currency_rate) * $transaction->amount) + $transaction->service_charge + $transaction->tax;
-        }
-        else{
-            $total = $transaction->amount + $transaction->service_charge + $transaction->tax;
-        }
+        $total = $transaction->amount;
 
-        //cief TODO: To be updated, temporarily hardcoded allow payment modes
+        //This setting is similar to Setup > Leads > Sources, Setup > Leads > Statuses
+        //Can be found at Finance > Payment Modes
         array_push($allowedPaymentModes, 1, 2);
-
         $invoicePerfexCRMObject = new InvoicePerfexCRMObject(
             $clientId,
             $number,
@@ -140,20 +172,7 @@ class CreatePerfexCRMInvoiceProcessor
 
         $result = $this->createsPerfexCRMInvoice->execute($invoicePerfexCRMObject);
 
-        //If there is a checking whether an payment to an invoice need to be generated, do it here
-        if(true && $result->payload['id']){
-            $invoicePaymentPerfexCRMObject = new InvoicePaymentPerfexCRMObject(
-                $result->payload['id'],
-                $total,
-                $date,
-                1,
-                "",
-                ""
-            );
-            $this->createsPerfexCRMInvoicePayment->execute($invoicePaymentPerfexCRMObject);
-        }
-
-        return true;
+        return $result;
     }
 
 }

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

@@ -33,7 +33,10 @@ class CreatePerfexCRMTaskProcessor
             $createTaskPerfexCRMObject->getProjectId(),
             $createTaskPerfexCRMObject->getReference(),
             $createTaskPerfexCRMObject->getOnTaskCompletion(),
+            $createTaskPerfexCRMObject->getDepartment(),
             $createTaskPerfexCRMObject->getStatus(),
+            $createTaskPerfexCRMObject->getPriority(),
+            $createTaskPerfexCRMObject->getDuedate()
         );
         return true;
    }

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

@@ -1,192 +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\PerfexCRMStatus;
-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(), $crmClientId);
-       if(isset($result->payload)){  //Here means project creation successful
-            $projectId = $result->payload['project_id'];
-       }
-       else{
-            $projectId = $this->fetchesPerfexCRMProject->execute($initialPerfexCRMObject->getProjectName(), $crmClientId)->id;
-       }
-
-       if(!is_null($result)){
-            $tasks = $initialPerfexCRMObject->getTaskNames();
-
-            //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 = PerfexCRMStatus::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'], $taskStatus);
-            }
-        }
-        return true;
-   }
-
-}

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

@@ -3,28 +3,37 @@
 namespace App\Classes\Modules\PerfexCRM\Processors;
 
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMStatus;
 use App\Classes\Jobs\CreatePerfexCRMSingleTask;
+use App\Classes\ValueObjects\Constants\PerfexCRMTaskPriority;
+use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
+use App\Models\Company;
 
 class NewLeadTaskToPerfexCRMProcessor
 {
     /**
-     * @param None
+     * @param Company $company
      * @return true
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute()
+    public function execute(Company $company)
     {
+        $companyModule = $company->companyModules()->first();
+        $employee = $companyModule->employees()->first();
+        $contactEmail = $employee->email;
+
         $createTaskPerfexCRMObject = new CreateTaskPerfexCRMObject(
-            "dillontest1@gmail.com",
-            "test is the name of the task",
-            "this is the description of the task",
+            $contactEmail,
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['name'],
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['description'],
             "",
             "",
             "",
             "",
             "",
-            PerfexCRMStatus::NOT_STARTED
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['status'],
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['department'],
+            PerfexCRMTaskPriority::DEFAULT,
+            "0"
         );
 
         CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);

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

@@ -0,0 +1,60 @@
+<?php
+
+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;
+
+class PackingListToPerfexCRMProcessor
+{
+    /**
+     * @param PackingList $packingList
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(PackingList $packingList)
+    {
+        try {
+            if($packingList->owner instanceof \App\Models\Order) {
+                $order = $packingList->owner;
+                $companyModule  = $order->companyModule()->first();
+                $connection = $companyModule->inviters()->withPivot('invitee_reference')->first();
+                $companyName = $companyModule->name;
+                $companyReference = $connection ? $connection->pivot->invitee_reference:'';
+                $employee = $companyModule->employees()->first();
+                $contactEmail = $employee->email;
+                $contactName = $employee->name;
+
+                $orderReference = $packingList->owner->reference;
+                $packingListReference = $packingList->reference;
+                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+
+                $updatePerfexCRMObject = new UpdatePerfexCRMObject(
+                    $companyName,
+                    $companyReference,
+                    $contactName,
+                    $contactEmail,
+                    "",
+                    $projectName,
+                    PerfexCRMProjectStatus::NOT_STARTED,
+                    [],
+                    [
+                        PerfexCRMTasks::TASK_LOADED_CONTAINER_1,
+                        PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
+                    ]
+                );
+                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, UpdatePerfexCRM::class);
+            }
+        } catch (\Exception $exception){
+            Log::error(json_encode('PackingListToPerfexCRMProcessor debug:'));
+            Log::error(json_encode($packingList));
+            Log::error($exception);
+        }
+        return true;
+    }
+}

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

@@ -3,18 +3,21 @@
 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\InitialPerfexCRMObject;
+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\Models\Transaction;
+use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Jobs\InitializePerfexCRM;
+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
 {
@@ -24,19 +27,15 @@ class TransactionToPerfexCRMProcessor
     /** @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)
+    public function __construct(UpdatePerfexCRMProcessor $updatePerfexCRMProcessor, FetchesCompany $fetchesCompany)
     {
         $this->updatePerfexCRMProcessor = $updatePerfexCRMProcessor;
-        $this->initializePerfexCRMProcessor = $initializePerfexCRMProcessor;
         $this->fetchesCompany = $fetchesCompany;
     }
 
@@ -49,40 +48,59 @@ class TransactionToPerfexCRMProcessor
      */
     public function execute(Transaction $model, int $status)
     {
-        if($model->owner instanceof \App\Models\Transaction && $status == ApprovalStatus::APPROVED){
-            //dd(json_encode($packingList->owner()->first()->companyModule()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference));
-            //dd(json_encode($model->owner->owner->owner()->first()->companyModule()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference));
-            $companyModule = $model->owner->owner->owner()->first()->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;
+        try
+        {
+            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 = $model->owner->owner->owner()->first()->reference;
-            $packingListReference = $model->owner->owner->reference;
-            $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                $orderReference = $order->reference;
+                $packingListReference = $packingList->reference;
+                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
 
-            $bookingMarking = $model->owner->owner->id."-".$model->owner->owner->owner->id;
-            $initialPerfexCRMObject = new InitialPerfexCRMObject(
-                $companyName,
-                $companyReference,
-                $contactName,
-                $contactEmail,
-                $bookingMarking,
-                $projectName,
-                [],
-                [
-                    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,
+                        ]
+                );
 
-            //$this->initializePerfexCRMProcessor->execute($initialPerfexCRMObject);
-            InitializePerfexCRM::dispatch($initialPerfexCRMObject);
+                UpdatePerfexCRMPrelude::dispatch(null, $model, $updatePerfexCRMObject, UpdatePerfexCRM::class);
+
+                $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
+                    $contactEmail,
+                    $model,
+                    true
+                );
+                UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject)->delay(6);
+            }
+            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

@@ -12,10 +12,13 @@ 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;
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMStatus;
+use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
+use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Http\Request;
@@ -52,8 +55,13 @@ class UpdatePerfexCRMProcessor
     /** @var UpdatesPerfexCRMTask */
     private $updatesPerfexCRMTask;
 
+    /** @var UpdatesPerfexCRMCustomer */
+    private $updatesPerfexCRMCustomer;
 
-    /**
+    /** @var UpdatesPerfexCRMProject */
+    private $updatesPerfexCRMProject;
+
+   /**
      * @param ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer
      * @param CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject
      * @param CreatesPerfexCRMMilestone $createsPerfexCRMMilestone
@@ -64,17 +72,21 @@ class UpdatePerfexCRMProcessor
      * @param CreatesPerfexCRMCustomer $createsPerfexCRMCustomer
      * @param CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact
      * @param UpdatesPerfexCRMTask $updatesPerfexCRMTask
+     * @param UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer
+     * @param UpdatesPerfexCRMProject $updatesPerfexCRMProject
     */
     public function __construct(ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
-    CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject,
-    CreatesPerfexCRMMilestone $createsPerfexCRMMilestone,
-    CreatesPerfexCRMTask $createsPerfexCRMTask,
-    FetchesPerfexCRMProject $fetchesPerfexCRMProject,
-    FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone,
-    FetchesPerfexCRMTask $fetchesPerfexCRMTask,
-    CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
-    CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
-    UpdatesPerfexCRMTask $updatesPerfexCRMTask)
+        CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject,
+        CreatesPerfexCRMMilestone $createsPerfexCRMMilestone,
+        CreatesPerfexCRMTask $createsPerfexCRMTask,
+        FetchesPerfexCRMProject $fetchesPerfexCRMProject,
+        FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone,
+        FetchesPerfexCRMTask $fetchesPerfexCRMTask,
+        CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
+        CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
+        UpdatesPerfexCRMTask $updatesPerfexCRMTask,
+        UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer,
+        UpdatesPerfexCRMProject $updatesPerfexCRMProject)
    {
         $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
         $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
@@ -86,54 +98,130 @@ class UpdatePerfexCRMProcessor
         $this->createsPerfexCRMCustomer = $createsPerfexCRMCustomer;
         $this->createsPerfexCRMCustomerContact = $createsPerfexCRMCustomerContact;
         $this->updatesPerfexCRMTask = $updatesPerfexCRMTask;
-   }
+        $this->updatesPerfexCRMCustomer = $updatesPerfexCRMCustomer;
+        $this->updatesPerfexCRMProject = $updatesPerfexCRMProject;
+    }
 
    /**
-    * @param PerfexCRMObject $perfexCRMObject
+    * @param UpdatePerfexCRMObject $updatePerfexCRMObject
     * @return null|object
     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
-    public function execute(UpdatePerfexCRMObject $updatePerfexCRMObject) {
+   public function execute(UpdatePerfexCRMObject $updatePerfexCRMObject) {
+
+       // 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 = $updatePerfexCRMObject->getCompanyName();
+       $result = $this->convertsPerfexCRMLeadToCustomer->execute($updatePerfexCRMObject->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,
+               $updatePerfexCRMObject->getContactName(),
+               $updatePerfexCRMObject->getContactName(),
+               $updatePerfexCRMObject->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'] === $updatePerfexCRMObject->getCompanyReference()) {
+                   $value_exists = true;
+                   break;
+               }
+           }
+       }
+       if(!$value_exists);
+       {
+           $result = $this->updatesPerfexCRMCustomer->execute($crmClientId, $crmCompany, $updatePerfexCRMObject->getCompanyReference());
+       }
+
+       // Get existing or create project, project has to exist first before milestone can appear under it
+        $result = $this->fetchesPerfexCRMProject->execute($updatePerfexCRMObject->getProjectName(), $crmClientId);
 
-        // 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
-        $result = $this->convertsPerfexCRMLeadToCustomer->execute($updatePerfexCRMObject->getContactEmail());
         if(isset($result->payload)){
-            $crmClientId = $result->payload['client_id'];
+            $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 && $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'];
+            }
         }
 
-         // Get existing or create project, project has to exist first before milestone can appear under it
-         $result = $this->createsPerfexCRMCustomerProject->execute($updatePerfexCRMObject->getProjectName(), $crmClientId);
-         if(isset($result->payload)){
-             $projectId = $result->payload['project_id'];
-         }
-         else{
-             $projectId = $this->fetchesPerfexCRMProject->execute($updatePerfexCRMObject->getProjectName(), $crmClientId)->id;
-         }
 
-         // Get existing or create milestone, milestone has to exist first before task can appear under it
-         $result = $this->createsPerfexCRMMilestone->execute($updatePerfexCRMObject->getMilestoneName(), $projectId);
-         if(isset($result->payload)){
-             $milestoneId = $result->payload['milestone_id'];
-         }
-         else{
-             $milestone = $this->fetchesPerfexCRMMilestone->execute($updatePerfexCRMObject->getMilestoneName(), $projectId);
-             $array = json_decode(json_encode($milestone), true);
-             $milestoneId = $array[0]['id'];
-         }
+       $tasks = $updatePerfexCRMObject->getTasks();
+       if(count($tasks) > 0){
 
-         // Get existing or create task
-         $result = $this->createsPerfexCRMTask->execute($updatePerfexCRMObject->getTaskName(), $milestoneId, $projectId);
-         if(isset($result->payload)){
-             $taskId = $result->payload['task_id'];
-         }
-         else{
-             $taskId = $this->fetchesPerfexCRMTask->execute($updatePerfexCRMObject->getTaskName(), $milestoneId)->id;
-         }
+            //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->fetchesPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId);
+                    if(isset($result->payload)){
+                        $array = json_decode(json_encode($result->payload[0]), true);
+                        $milestoneId = $array['id'];
+                    }
+                    else{
+                        $result = $this->createsPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId, $count);
+                        if(isset($result->payload)){
+                            $milestoneId = $result->payload['milestone_id'];
+                        }
+                    }
+                }
 
-         $this->updatesPerfexCRMTask->execute($taskId, $updatePerfexCRMObject->getTaskName(), $milestoneId, $projectId, PerfexCRMStatus::COMPLETED);
+                $taskStatus = PerfexCRMTaskStatus::NOT_STARTED;
+                if($tasks[$count]['status'] != ''){
+                    $taskStatus = $tasks[$count]['status'];
+                }
 
-         return null;
-    }
+                // Get existing or create task
+                $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;
+   }
 
 }

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

@@ -14,7 +14,7 @@ class CreatesPerfexCRMCustomerProject
      * @return null|object
      * @throws MalformedRequestException
      */
-    public function execute(string $projectName, string $clientId) {
+    public function execute(string $projectName, int $status, string $clientId) {
         try{
             $data = [
                 'name' => $projectName,
@@ -22,7 +22,7 @@ class CreatesPerfexCRMCustomerProject
                 'billing_type' => 1,
                 'clientid' => $clientId,
                 'start_date' => date('Y-m-d'),
-                'status' => 1
+                'status' => $status
             ];
 
             $response = Http::asForm()->withHeaders([

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

@@ -16,14 +16,17 @@ class CreatesPerfexCRMInvoice
      */
     public function execute(InvoicePerfexCRMObject $invoicePerfexCRMObject) {
         try{
+            $subtotal = floor($invoicePerfexCRMObject->getSubTotal() * 100) / 100;
+            $total = floor($invoicePerfexCRMObject->getTotal() * 100) / 100;
+
             $data = [
                 'clientid' => $invoicePerfexCRMObject->getClientId(),
                 'number' => $invoicePerfexCRMObject->getNumber(),
                 'date' => $invoicePerfexCRMObject->getDate(),
                 'duedate' => $invoicePerfexCRMObject->getDueDate(),
                 'currency' => $invoicePerfexCRMObject->getCurrency(),
-                'subtotal' => $invoicePerfexCRMObject->getSubTotal(),
-                'total' => $invoicePerfexCRMObject->getTotal(),
+                'subtotal' => number_format($subtotal, 2, '.', ''),
+                'total' => number_format($total, 2, '.', ''),
                 'billing_street' => $invoicePerfexCRMObject->getBillingStreet(),
                 'project_id' => $invoicePerfexCRMObject->getProjectId(),
                 'allowed_payment_modes[0]' => 1,

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

@@ -18,7 +18,7 @@ class CreatesPerfexCRMInvoicePayment
         try{
             $data = [
                 'invoiceid' => $invoicePaymentPerfexCRMObject->getInvoiceId(),
-                'amount' => $invoicePaymentPerfexCRMObject->getAmount(),
+                'amount' => number_format($invoicePaymentPerfexCRMObject->getAmount(), 2, '.', ''),
                 'date' => $invoicePaymentPerfexCRMObject->getDate(),
                 'paymentmode' => $invoicePaymentPerfexCRMObject->getPaymentMode(),
                 'transactionid' => $invoicePaymentPerfexCRMObject->getTransactionId(),

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

@@ -16,13 +16,20 @@ class CreatesPerfexCRMLead
      */
     public function execute(CreateLeadPerfexCRMObject $createLeadPerfexCRMObject) {
         try{
+            $custom_fields = [
+                "leads" => [
+                    4 => $createLeadPerfexCRMObject->getCompanyReference()
+                ]
+            ];
+
             $data = [
                 'name' => $createLeadPerfexCRMObject->getName(),
                 'email' => $createLeadPerfexCRMObject->getEmail(),
                 'phonenumber' => $createLeadPerfexCRMObject->getPhone(),
                 'company' => $createLeadPerfexCRMObject->getCompanyName(),
                 'source' => 2, //1: Exchange, 2: Shipping Portal
-                'status' => 2 //2: Lead, 1: Customer
+                'status' => 2, //2: Lead, 1: Customer
+                'custom_fields' => $custom_fields
             ];
 
             $response = Http::asForm()->withHeaders([

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

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Support\Facades\Log;
+use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;
 
 class CreatesPerfexCRMTask
 {
@@ -14,14 +15,26 @@ 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 $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 != ""){
+                $custom_fields = [
+                    "tasks" => [
+                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $department
+                    ]
+                ];
+            }
+
             $data = [
                 'name' => $taskName,
                 'description' => $taskDescription,
@@ -32,7 +45,10 @@ class CreatesPerfexCRMTask
                 'status' => $status,
                 'is_system_created' => 1,
                 'reference' => $reference,
-                'on_task_completion' => $on_task_completion
+                'on_task_completion' => $on_task_completion,
+                'custom_fields' => $custom_fields,
+                'priority' => $priority,
+                'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
             ];
 
             if($leadId != '') {
@@ -46,7 +62,10 @@ class CreatesPerfexCRMTask
                     'status' => $status,
                     'is_system_created' => 1,
                     'reference' => $reference,
-                    'on_task_completion' => $on_task_completion
+                    'on_task_completion' => $on_task_completion,
+                    'custom_fields' => $custom_fields,
+                    'priority' => $priority,
+                    'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
                 ];
             }
 

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

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class FetchesPerfexCRMCustomer
+{
+    /**
+     * @param string $email
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $email) {
+        try{
+            $response = Http::withHeaders([
+                'authtoken' => config('perfexcrm.api_key'),])
+            ->get(config('perfexcrm.base_url').'/api/customers/byemail/'.$email);
+
+            if($response->successful()){
+                $data = $response->json();
+
+                return (object) $data;
+            }else{
+                Log::error($response);
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class FetchesPerfexCRMInvoice
+{
+    /**
+     * @param string $clientId
+     * @param string $invoicePrefix
+     * @param string $invoiceNumber
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $clientId, string $invoicePrefix, string $invoiceNumber) {
+        try{
+            $response = Http::withHeaders([
+                'authtoken' => config('perfexcrm.api_key'),])
+            ->get(config('perfexcrm.base_url').'/api/invoices/customsearch/'.$clientId.'/'.$invoicePrefix.'/'.$invoiceNumber);
+
+            if($response->successful()){
+                $data = $response->json();
+
+                return (object) $data;
+            }else{
+                Log::error($response);
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
+        }
+    }
+}

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/UpdatesPerfexCRMCustomer.php

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Support\Facades\Log;
+use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;
 
 class UpdatesPerfexCRMCustomer
 {
@@ -19,7 +20,7 @@ class UpdatesPerfexCRMCustomer
         try{
             $custom_fields = [
                 "customers" => [
-                    2 => $companyReference
+                    PerfexCRMCustomFields::CUSTOMERS_SHIPPING_PORTAL_REFERENCE => $companyReference
                 ]
             ];
 

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

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class UpdatesPerfexCRMInvoice
+{
+
+    /**
+     * @param $invoice
+     * @param string $projectId
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute($invoice, string $projectId) {
+        try{
+            // <p>The Invoice number field is required.<\/p>
+            // <p>The Invoice date field is required.<\/p>
+            // <p>The Currency field is required.<\/p>
+            // <p>The Items field is required.<\/p>
+            // <p>The Allow Payment Mode field is required.<\/p>
+            // <p>The Billing Street field is required.<\/p>
+            // <p>The Sub Total field is required.<\/p>
+            // <p>The Total field is required.<\/p>
+
+            $newInvoiceItems = [];
+            foreach ($invoice->items as $item) {
+                $item['itemid'] = $item['id'];
+                unset($item['id']);
+                $item['order'] = $item['item_order'];
+                unset($item['item_order']);
+                array_push($newInvoiceItems,$item);
+            }
+
+            $allowedPaymentModes = [];
+            array_push($allowedPaymentModes, 1, 2);
+
+            $data = [
+                'number' => $invoice->number,
+                'date' => $invoice->date,
+                'duedate' => $invoice->duedate,
+                'currency' => $invoice->currency,
+                'subtotal' => $invoice->subtotal,
+                'total' => $invoice->total,
+                'billing_street' => $invoice->billing_street,
+                'shipping_street' => $invoice->billing_street,
+                'project_id' => $projectId,
+                'items' => $newInvoiceItems,
+                'allowed_payment_modes' => $allowedPaymentModes,
+            ];
+
+            $response = Http::asJson()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->put(config('perfexcrm.base_url').'/api/invoices/'.$invoice->id, $data);
+
+            if($response->successful()){
+                $data = $response->json();
+                return (object) $data;
+            }else{
+                Log::error($response);
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;
+
+class UpdatesPerfexCRMLead
+{
+    /**
+     * @param $lead
+     * @param string $companyReference
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute($lead, string $companyReference) {
+        try{
+            $custom_fields = [
+                "leads" => [
+                    PerfexCRMCustomFields::LEADS_SHIPPING_PORTAL_REFERENCE => $companyReference
+                ]
+            ];
+
+            $data = [
+                'name' => $lead->name,
+                'email' => $lead->email,
+                'phonenumber' => $lead->phonenumber,
+                'company' => $lead->company,
+                'custom_fields' => $custom_fields,
+                'source' => $lead->source,
+                'status' => $lead->status,
+            ];
+
+            $response = Http::asJson()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->put(config('perfexcrm.base_url').'/api/leads/'.$lead->id, $data);
+
+            if($response->successful()){
+                $data = $response->json();
+                return (object) $data;
+            }else{
+                Log::error($response);
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class UpdatesPerfexCRMProject
+{
+    /**
+     * @param $project
+     * @param int $status
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute($project, int $status) {
+        try{
+            $data = [
+                'name' => $project['name'],
+                'clientid' => $project['clientid'],
+                // 'rel_type' => 'customer',
+                'billing_type' => 1,
+                '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);
+
+            if($response->successful()){
+                $data = $response->json();
+                return (object) $data;
+            }else{
+                Log::error($response);
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
+        }
+    }
+}

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

@@ -5,17 +5,8 @@ namespace App\Classes\Modules\Segments\ControllersLogic;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use App\Http\Resources\ConstantResource;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Segments\Services\FetchesConstant;
-use App\Classes\Modules\Segments\Services\UpdatesConstant;
-use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
-use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
-use App\Classes\Modules\Segments\Services\AddItemToConstantValueArray;
-use App\Classes\Modules\Segments\Services\RemoveItemFromConstantValueArray;
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Processors\UpdatePostcodeSegmentProcessor;
 
 class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
 {
@@ -30,54 +21,17 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
         ];
     }
 
-    /** @var CanUpdateConstant */
-    private $canUpdateConstant;
-
-    /** @var UpdatesConstant */
-    private $updatesConstant;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /** @var FetchesConstant */
-    private $fetchesConstant;
-
-    /** @var AddItemToConstantValueArray */
-    private $addItemToConstantValueArray;
-
-    /** @var RemoveItemFromConstantValueArray */
-    private $removeItemFromConstantValueArray;
-
-    /** @var CreatesConstant */
-    private $createsConstant;
+    /** @var UpdatePostcodeSegmentProcessor */
+    private $updatePostcodeSegmentProcessor;
 
     /**
      * UpdateConstantLogic constructor.
-     * @param CanUpdateConstant $canUpdateConstant
-     * @param UpdatesConstant $updatesConstant
-     * @param FetchesSegment $fetchesSegment
-     * @param FetchesConstant $fetchesConstant
-     * @param AddItemToConstantValueArray $addItemToConstantValueArray
-     * @param CreatesConstant $createsConstant
-     * @param RemoveItemFromConstantValueArray $removeItemFromConstantValueArray
+     * @param UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor
      */
     public function __construct(
-        CanUpdateConstant $canUpdateConstant, 
-        UpdatesConstant $updatesConstant, 
-        FetchesSegment $fetchesSegment, 
-        FetchesConstant $fetchesConstant,
-        AddItemToConstantValueArray $addItemToConstantValueArray, 
-        RemoveItemFromConstantValueArray $removeItemFromConstantValueArray,
-        CreatesConstant $createsConstant
-    )
+        UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor)
     {
-        $this->canUpdateConstant = $canUpdateConstant;
-        $this->updatesConstant = $updatesConstant;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->fetchesConstant = $fetchesConstant;
-        $this->addItemToConstantValueArray = $addItemToConstantValueArray;
-        $this->removeItemFromConstantValueArray = $removeItemFromConstantValueArray;
-        $this->createsConstant = $createsConstant;
+        $this->updatePostcodeSegmentProcessor = $updatePostcodeSegmentProcessor;
     }
     /**
      * @param Request $request
@@ -88,44 +42,9 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
-
-        try {
-            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
-
-            $constantValue = $this->addItemToConstantValueArray->execute($constant->value, $request->input('postcode'));
-
-            $object = new ConstantObject($request->input('reference'), $constantValue);
-
-        } catch (ResourceNotFoundException $exception){
-
-            $constantObject = [$request->input('postcode')];
-
-            $object = new ConstantObject(
-                $request->input('reference'),
-                $constantObject
-            );
-
-            $constant = $this->createsConstant->execute($segment, $object);
-        }
-
-        try {
-            // check if postcode exist in the opposite constant, and delete it
-            $oppositeConstant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE]);
-
-            $oppositeConstantValue = $this->removeItemFromConstantValueArray->execute($oppositeConstant->value, $request->input('postcode'));
-
-            $oppositeObject = new ConstantObject($request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE, $oppositeConstantValue);
-
-            $this->updatesConstant->execute($oppositeConstant, $oppositeObject);
-
-        } catch (ResourceNotFoundException $exception){
-            // if opposite constant does not exist, do nothing
-        }
-
-        $constant = $this->updatesConstant->execute($constant, $object);
+        $constant = $this->updatePostcodeSegmentProcessor->execute($request->route('id'), $request->input('reference'), $request->input('postcode'));
 
         return $this->resourceResponse(new ConstantResource($constant));
     }
 
-}
+}

app/Classes/Modules/Segments/Processors/UpdatePostcodeSegmentProcessor.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Processors;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Http\Resources\ConstantResource;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\AddItemToConstantValueArray;
+use App\Classes\Modules\Segments\Services\RemoveItemFromConstantValueArray;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+
+class UpdatePostcodeSegmentProcessor
+{
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var AddItemToConstantValueArray */
+    private $addItemToConstantValueArray;
+
+    /** @var RemoveItemFromConstantValueArray */
+    private $removeItemFromConstantValueArray;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+    /**
+     * UpdatePostcodeSegmentProcessor constructor.
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param AddItemToConstantValueArray $addItemToConstantValueArray
+     * @param CreatesConstant $createsConstant
+     * @param RemoveItemFromConstantValueArray $removeItemFromConstantValueArray
+     */
+    public function __construct(
+        CanUpdateConstant $canUpdateConstant, 
+        UpdatesConstant $updatesConstant, 
+        FetchesSegment $fetchesSegment, 
+        FetchesConstant $fetchesConstant,
+        AddItemToConstantValueArray $addItemToConstantValueArray, 
+        RemoveItemFromConstantValueArray $removeItemFromConstantValueArray,
+        CreatesConstant $createsConstant
+    )
+    {
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->addItemToConstantValueArray = $addItemToConstantValueArray;
+        $this->removeItemFromConstantValueArray = $removeItemFromConstantValueArray;
+        $this->createsConstant = $createsConstant;
+    }
+
+
+    /**
+     * @param string $name
+     * @param int $companyModuleId
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute($segment_id, $reference, $postcode){
+
+        $segment = $this->fetchesSegment->execute(['id' => $segment_id]);
+
+        try {
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $reference]);
+
+            $constantValue = $this->addItemToConstantValueArray->execute($constant->value, $postcode);
+
+            $object = new ConstantObject($reference, $constantValue);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $constantObject = [$postcode];
+
+            $object = new ConstantObject(
+                $reference,
+                $constantObject
+            );
+
+            $constant = $this->createsConstant->execute($segment, $object);
+        }
+
+        try {
+            // check if postcode exist in the opposite constant, and delete it
+            $oppositeConstant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $reference == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE]);
+
+            $oppositeConstantValue = $this->removeItemFromConstantValueArray->execute($oppositeConstant->value, $postcode);
+
+            $oppositeObject = new ConstantObject($reference == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE, $oppositeConstantValue);
+
+            $this->updatesConstant->execute($oppositeConstant, $oppositeObject);
+
+        } catch (ResourceNotFoundException $exception){
+            // if opposite constant does not exist, do nothing
+        }
+
+        $constant = $this->updatesConstant->execute($constant, $object);
+
+        return $constant;
+
+    }
+
+}

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

@@ -16,6 +16,7 @@ use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Jobs\CreatePerfexCRMInvoice;
 
 class ApproveShippingInvoiceTransactionProcessor
 {
@@ -29,6 +30,7 @@ class ApproveShippingInvoiceTransactionProcessor
     /** @var CreatesFiles */
     private $createsFiles;
 
+
     /**
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param CreatesDocument $createsDocument
@@ -72,6 +74,7 @@ class ApproveShippingInvoiceTransactionProcessor
         if(app()->environment(['production'])) {
             $user->notify(new InvoiceIssuedEmail($user, $packingList));
         }
+
         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/CompanyType.php

@@ -8,4 +8,9 @@ final class CompanyType {
 
     public const COMPANY_BUSINESS = 1;
 
+    public const COMPANY_TYPE_ID = [
+        self::PERSONAL_BUSINESS  => "Personal Business",
+        self::COMPANY_BUSINESS   => "Company Business",
+       
+    ];
 }

app/Classes/ValueObjects/Constants/PerfexCRMCustomFields.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class PerfexCRMCustomFields {
+
+    public const CUSTOMERS_EXCHANGE_REFERENCE = 1;
+
+    public const CUSTOMERS_SHIPPING_PORTAL_REFERENCE = 2;
+
+    public const LEADS_EXCHANGE_REFERENCE = 3;
+
+    public const LEADS_SHIPPING_PORTAL_REFERENCE = 4;
+
+    public const TICKETS_CUSTOM_TAGS = 5;
+
+    public const TASKS_DEPARTMENT = 6;
+}

app/Classes/ValueObjects/Constants/PerfexCRMInvoiceStatus.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class PerfexCRMInvoiceStatus {
+
+    public const UNPAID = 1;
+
+    public const PAID = 2;
+
+    public const PARTIALLY_PAID = 3;
+
+    public const OVERDUE = 4;
+}

app/Classes/ValueObjects/Constants/PerfexCRMProjectStatus.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class PerfexCRMProjectStatus {
+
+    public const NOT_STARTED = 1;
+
+    public const IN_PROGRESS = 2;
+
+    public const ON_HOLD = 3;
+
+    public const FINISHED = 4;
+
+    public const CANCELLED = 5;
+}

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/PerfexCRMTaskStatus.php

@@ -2,7 +2,7 @@
 
 namespace App\Classes\ValueObjects\Constants;
 
-final class PerfexCRMStatus {
+final class PerfexCRMTaskStatus {
 
     public const NOT_STARTED = 1;
 
@@ -11,7 +11,7 @@ final class PerfexCRMStatus {
     public const TESTING = 3;
 
     public const IN_PROGRESS = 4;
-    
+
     public const COMPLETED = 5;
 
 }

app/Classes/ValueObjects/Constants/PerfexCRMTasks.php

@@ -4,13 +4,19 @@ namespace App\Classes\ValueObjects\Constants;
 
 class PerfexCRMTasks
 {
+    //IMPORTANT NOTE: TASK NAME MUST BE UNIQUE ACCORDING TO REL_TYPE
+    //e.g. rel_type: lead, project
+
     public const TASK_1 = [
         'name' => 'Customer Paid',
         'description' => '',
         'milestone' => 'MILESTONE 1 - Customer Paid',
         'reference' => '',
         'on_task_completion' => '',
-        'status' => PerfexCRMStatus::COMPLETED
+        'department' => '',
+        'status' => PerfexCRMTaskStatus::COMPLETED,
+        'priority' => PerfexCRMTaskPriority::DEFAULT,
+        'duedate' => 0
     ];
 
     public const TASK_POST_PAYMENT_1 = [
@@ -26,22 +32,22 @@ class PerfexCRMTasks
         'milestone' => '',
         'reference' => 'TASK_POST_PAYMENT_1',
         'on_task_completion' => 'TASK_POST_PAYMENT_2',
-        'status' => PerfexCRMStatus::IN_PROGRESS
+        'department' => 'Accounts',
+        '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',
-        'status' => ''
+        'department' => 'Accounts',
+        'status' => '',
+        'priority' => PerfexCRMTaskPriority::HIGH,
+        'duedate' => 0
     ];
     public const TASK_POST_PAYMENT_3 = [
         'name' => 'Issue Shipping Autocount Invoince',
@@ -56,7 +62,23 @@ class PerfexCRMTasks
         'milestone' => '',
         'reference' => 'TASK_POST_PAYMENT_3',
         'on_task_completion' => 'TASK_POST_PAYMENT_4',
-        'status' => ''
+        'department' => 'Accounts',
+        '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',
@@ -71,6 +93,55 @@ class PerfexCRMTasks
         'milestone' => '',
         'reference' => 'TASK_POST_PAYMENT_4',
         'on_task_completion' => '',
-        'status' => ''
+        'department' => 'Accounts',
+        'status' => '',
+        'priority' => PerfexCRMTaskPriority::MEDIUM,
+        'duedate' => 1
+    ];
+
+    public const TASK_LOADED_CONTAINER_1 = [
+        'name' => 'Generate Shipping Invoices',
+        'description' => '○ Purpose: -<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,
+        'priority' => PerfexCRMTaskPriority::HIGH,
+        'duedate' => 1
+    ];
+
+    public const TASK_LOADED_CONTAINER_2 = [
+        'name' => 'Approve Shipping Invoices',
+        'description' => '○ Purpose: -<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' => '',
+        'priority' => PerfexCRMTaskPriority::HIGH,
+        'duedate' => 1
+    ];
+
+
+    public const TASK_IDENTIFICATION_1 = [
+        'name' => 'Approve Identification Verification (Shipping)',
+        'description' => '○ Purpose: To ensure the customer submit information matches the information in their identification document.<br>
+        ○ Initial Status: In Progress<br>
+        ○ Deadline: Same Day<br>
+        ○ Responsible department: Operation<br>
+        ○ Next step: None<br>
+        ○ Additional details: ** Any specific requirements or notes for the operation.**<br>
+        ○ Dependencies: None<br>
+        ○ Outcomes: Customer account identification is verified<br>',
+        'milestone' => '',
+        'reference' => 'TASK_IDENTIFICATION_1',
+        'on_task_completion' => '',
+        'department' => 'Operations',
+        'status' => PerfexCRMTaskStatus::IN_PROGRESS,
+        'priority' => PerfexCRMTaskPriority::DEFAULT,
+        'duedate' => 0
     ];
 }

app/Classes/ValueObjects/Constants/RoleTypes.php

@@ -16,4 +16,10 @@ final class RoleTypes
 
     public const USER = 3;
 
+    public const USER_TYPE_ID = [
+        self::SHADOW_ADMIN => "Shadow Admin",
+        self::SUPER_ADMIN  => "Super Admin",
+        self::ADMIN        => "Admin",
+        self::USER         => "User",
+    ];
 }

app/Console/Commands/AuditBillplzInvoice.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class AuditBillplzInvoice extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz-invoice:audit';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check all unpaid invoice but marked at paid at out system';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1'); 
+
+        $this->info(Carbon::now() . ' : Audit Billplz Invoice cron started.');
+        $start   = new Carbon();
+
+        $transactions = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::COMPLETED)->whereHas('transactions', function($query){
+            return $query->where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->where('status', ApprovalStatus::REJECTED);
+        })->get();
+
+        $totalTransactions = count($transactions);
+        $counter = 1;
+        $totalAmount = 0;
+        foreach ($transactions as $transaction){
+            $payment_transaction = $transaction->transactions->sortByDesc('created_at')->first();
+
+            if ($payment_transaction->status === ApprovalStatus::REJECTED) {
+                $this->info($counter . ' of ' . $totalTransactions . '. Order Marking: '. $payment_transaction->owner->owner->owner->reference . '. Transaction Id: '. $payment_transaction->id . '. Invoice Id: '. $transaction->id . ' - Date: '.$payment_transaction->created_at->format('d-m-Y').' - Amount: '. $payment_transaction->amount);
+    
+                $totalAmount += $transaction->amount;
+                
+                $counter++;
+            }
+        }
+    
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done Audit Billplz. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+    }
+}

app/Console/Commands/AuditBillplzPayment.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class AuditBillplzPayment extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz-payment:audit';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check all failed payment in billplz, but marked at success at our system';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1'); 
+
+        $this->info(Carbon::now() . ' : Audit Billplz Payment cron started.');
+        $start   = new Carbon();
+
+        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->get();
+        $totalTransactions = count($transactions);
+        $counter = 1;
+        $totalAmount = 0;
+        foreach ($transactions as $transaction){
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
+    
+            if($response->successful()){
+                $data = $response->json();
+                if($data['paid']){
+    
+                } else {
+                    $totalAmount += $transaction->amount;
+                    $this->info($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
+                }
+            }else{
+                $this->info("billplz error</br>");
+            }
+            $counter++;
+        }
+    
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done Audit Billplz. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+    }
+}

app/Console/Commands/FixBillplzFailedCallbackPayment.php

@@ -0,0 +1,182 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
+use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class FixBillplzFailedCallbackPayment extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz-failed-callback:fix';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check all failled callback from billplz';
+
+    protected $output = null;
+
+    protected $outputArray = [];
+
+    /** @var GetBillplzBill */
+    private $getBillplzBill;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor ;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
+    {
+        parent::__construct();
+        $this->getBillplzBill = $getBillplzBill;
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1'); 
+
+        $this->info(Carbon::now() . ' : Billplz Failled Callback cron started.');
+        $this->outputArray = []; 
+        $start   = new Carbon();
+
+        $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
+
+        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+        $totalTransactions = count($transactions);
+        $counter = 1;
+        $totalAmount = 0;
+        foreach ($transactions as $transaction){
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
+    
+            if($response->successful()){
+                $data = $response->json();
+                if($data['paid']){
+                    $totalAmount += $transaction->amount;
+                    $invoiceStatus = null;
+
+                    switch($transaction->owner->status) {
+                        case 3:
+                        $invoiceStatus = 'Payment Completed';
+                        break;
+                        case 5:
+                        $invoiceStatus = 'Dispute in progress';
+                        break;
+                        case 6:
+                        $invoiceStatus = 'Cancelled Invoice';
+                        break;
+                        default:
+                        $invoiceStatus = 'Pending Payment';
+                    }
+
+                    $order = $transaction->owner->owner->owner;
+
+                    if ($invoiceStatus == 'Pending Payment') {
+                        // code here
+
+                        // $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
+
+                        // if(!$billPlz) throw new ResourceNotFoundException('Billplz bill not found.');
+                
+                        // $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
+
+                        $invoice = $transaction->owner;
+                        $packingList = $invoice->owner;
+                        $order = $packingList->owner;
+                
+                        $status = ApprovalStatus::PENDING_VERIFICATION;
+                
+                        if($data['state'] === 'paid') {
+                            $status = ApprovalStatus::APPROVED;
+                        }
+                
+                        // if($data->state === 'due') {
+                        //     $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
+                        // }
+                
+                        // $token = Auth::fromUser(User::find(1));
+                        // $request->headers->set('Authorization', 'Bearer '.$token);
+                
+                        $this->updatesTransactionStatus->execute($transaction, $status);
+                
+                        $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+                
+                        if(($invoice->amount - $totalPaidAmount) < 0.01) {
+                            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+                
+                            $packingList->status = ApprovalStatus::APPROVED;
+                            $packingList->save();
+                
+                            if(app()->environment('production')){
+                                $this->updateDoFromVTPortalProcessor->execute($packingList);
+                                $this->updateDoFromYDPortalProcessor->execute($packingList);
+                            }
+                        }
+
+                        $this->info('Updated invoice ' . $counter . ' of ' . $totalTransactions . '. Order: '. $order->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Status: ' . $approvalStatusArray[$transaction->status] . '. Invoice Status: ' . $invoiceStatus);
+
+                    } else {
+                        if(!$order instanceof Order) {
+                            $this->info("Error transaction id:" . $transaction->id . 'Type: ' . get_class($order));
+                        } else {
+                            $this->info($counter . ' of ' . $totalTransactions . '. Order: '. $order->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Status: ' . $approvalStatusArray[$transaction->status] . '. Invoice Status: ' . $invoiceStatus);
+                        }
+                    }
+                    
+                } else {
+                    // $totalAmount += $transaction->amount;
+                    // $this->appendToOutput($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
+                }
+            }else{
+                $this->info("billplz error</br>");
+            }
+            $counter++;
+        }
+    
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+    }
+}

app/Console/Commands/FixInvoice.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
+use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\CompanyConnection;
+use App\Models\Order;
+use Carbon\Carbon;
+use Exception;
+use Illuminate\Console\Command;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+
+class FixInvoice extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'invoice:fix {--marking=}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fix Invoice By Company Module Marking';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $connection = CompanyConnection::where('invitee_reference', $this->option('marking'))->first();
+        $company_module_id = $connection->invitee->id;
+
+        $orders = Order::where('company_module_id', $company_module_id)->get();
+
+        foreach ($orders as $order){
+            $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
+            foreach ($invoices as $invoice){
+    
+                dump($invoice->id);
+                
+                $invoice->documents()->delete();
+    
+                $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
+    
+                $document_object = new DocumentObject(
+                    DocumentType::SHIPPING_INVOICE,
+                    [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
+                    '',
+                    ApprovalStatus::COMPLETED,
+                    'shipping_invoice'
+                );
+    
+                /** @var Document $document */
+                $document = (App()->make(CreatesDocument::class))->execute($invoice, $document_object);
+    
+                (App()->make(CreatesFiles::class))->execute($document, $document_object);
+            }
+        }
+    }
+}

app/Console/Commands/ShowFixBillplzFailedCallbackPayment.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
+use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class ShowFixBillplzFailedCallbackPayment extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz-failed-callback:show';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check all failled callback from billplz';
+
+    protected $output = null;
+
+    protected $outputArray = [];
+
+    /** @var GetBillplzBill */
+    private $getBillplzBill;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor ;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
+    {
+        parent::__construct();
+        $this->getBillplzBill = $getBillplzBill;
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1'); 
+
+        $this->info(Carbon::now() . ' : Billplz Failled Callback cron started.');
+        $this->outputArray = []; 
+        $start   = new Carbon();
+
+        $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
+
+        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+        $totalTransactions = count($transactions);
+        $counter = 1;
+        $totalAmount = 0;
+        foreach ($transactions as $transaction){
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
+    
+            if($response->successful()){
+                $data = $response->json();
+                if($data['paid']){
+                    $totalAmount += $transaction->amount;
+                    $invoiceStatus = null;
+
+                    switch($transaction->owner->status) {
+                        case 3:
+                        $invoiceStatus = 'Payment Completed';
+                        break;
+                        case 5:
+                        $invoiceStatus = 'Dispute in progress';
+                        break;
+                        case 6:
+                        $invoiceStatus = 'Cancelled Invoice';
+                        break;
+                        default:
+                        $invoiceStatus = 'Pending Payment';
+                    }
+
+                    $order = $transaction->owner->owner->owner;
+
+                    if(!$order instanceof Order) {
+                        $this->info("Error transaction id:" . $transaction->id . 'Type: ' . get_class($order));
+                    } else {
+                        $this->info($counter . ' of ' . $totalTransactions . '. Order: '. $order->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Status: ' . $approvalStatusArray[$transaction->status] . '. Invoice Status: ' . $invoiceStatus);
+                    }
+
+                } else {
+                    // $totalAmount += $transaction->amount;
+                    // $this->appendToOutput($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
+                }
+            }else{
+                $this->info("billplz error</br>");
+            }
+            $counter++;
+        }
+    
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+    }
+}

app/Console/Commands/debugBillplzFailedPayment.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class debugBillplzFailedPayment extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz-failed-payment:debug';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->get();
+    
+        $i = 0;
+        $totalAmount = 0;
+        foreach ($transactions as $transaction){
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
+    
+            // dd($response);
+
+            // dd($transaction->owner->owner->owner->reference);
+    
+            if($response->successful()){
+                $data = $response->json();
+                if($data['paid']){
+                    if (!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                        $this->returnLog('Paid transaction', $transaction);
+                    }
+                } 
+                // else {
+                //     $totalAmount += $transaction->amount;
+                //     $this->returnLog('Unpaid Transaction', $transaction);
+                // }
+            }else{
+                $this->returnLog('billplz error', $transaction);
+            }
+        }
+    }
+
+    public function returnLog($text, $transaction) {
+        $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
+        $this->info($text . ' - id: '. $transaction->id . '. Order Marking: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Current Status: ' . $approvalStatusArray[$transaction->status]);
+    }
+}

app/Http/Controllers/Accounts/UpdateUserRoleController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\UpdateUserRoleLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateUserRoleController
+{
+    /**
+     * @param Request $request
+     * @param UpdateUserLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateUserRoleLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Addresses/CreateBillingAddressController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Addresses;
+
+use App\Classes\Modules\Addresses\ControllersLogic\CreateBillingAddressLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBillingAddressController
+{
+    /**
+     * @param Request $request
+     * @param CreateBillingAddressLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateBillingAddressLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Companies/UpdateCompanyTypeController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyTypeLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyTypeController
+{
+    /**
+     * @param Request $request
+     * @param AddNewMemberLogic $execute
+     * @return JsonResponse
+     */
+    public function create(Request $request, UpdateCompanyTypeLogic $execute) : JsonResponse
+    {
+        return $execute->execute($request);
+    }
+}

app/Http/Resources/CompanyResource.php

@@ -4,6 +4,7 @@ namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Crypt;
@@ -19,6 +20,8 @@ class CompanyResource extends JsonResource
     public function toArray($request)
     {
         $companyModule = $this->companyModules()->first();
+        $companyTypeArray = CompanyType::COMPANY_TYPE_ID;
+        
         return [
             'id' => $this->id,
             'hash_id' => Crypt::encryptString($this->id),
@@ -26,6 +29,7 @@ class CompanyResource extends JsonResource
             'debtor' => $this->debtor,
             'reference' => $this->reference,
             'type' => (int) $this->type,
+            'type_name' => ($companyTypeArray[(int) $this->type]),
             'business_type' => (int) $this->business_type,
             'status' => (int) $this->status,
             'segments' => SegmentResource::collection($companyModule->connections()->first()->segments),

app/Http/Resources/UserResource.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\ValueObjects\Constants\RoleTypes;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserResource extends JsonResource
@@ -14,11 +15,13 @@ class UserResource extends JsonResource
      */
     public function toArray($request)
     {
+        $userTypeArray = RoleTypes::USER_TYPE_ID;
         return [
             'id' => $this->id,
             'name' => $this->name,
             'email' => $this->email,
             'type' => (int) $this->type,
+            'type_name' => ($userTypeArray[(int) $this->type]),
             'status' => (int) $this->status
         ];
     }

database/seeders/DummyDataSeeder.php

@@ -46,19 +46,23 @@ use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
 use App\Classes\ValueObjects\Constants\TransportType;
+use App\Classes\Modules\Segments\Processors\UpdatePostcodeSegmentProcessor;
 use App\Models\Address;
 use App\Models\Company;
 use App\Models\CompanyModule;
 use App\Models\Container;
 use App\Models\Document;
 use App\Models\PackingList;
+use App\Models\SegmentConstant;
 use App\Models\Transport;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Database\Seeder;
 
 use Faker\Generator as Faker;
+use Illuminate\Support\Facades\Artisan;
 
 class DummyDataSeeder extends Seeder
 {
@@ -583,6 +587,32 @@ class DummyDataSeeder extends Seeder
             // 3. overweight cbm
         }
 
+        // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //
+        //       Generate and Approve Dummmy Invoice       //
+        // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //
+        ini_set('memory_limit', '-1'); 
+        $randomCompanyModule = CompanyModule::latest('id')->take(5)->get();
+
+        $centerPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::CENTER_POSTCODE)->get();
+        $centerPostcodeConstant = $centerPostcodeConstantObject->isEmpty() ? [] : (array)$centerPostcodeConstantObject->first()->value;
+    
+        foreach($randomCompanyModule as $companyModule) {
+            foreach($companyModule->addresses as $address) {
+                $postcode = $address->postcode;
+                $postcodeArea = in_array($postcode, $centerPostcodeConstant) ? 'CENTER_POSTCODE' : null;
+        
+                if (!$postcodeArea) {
+                    $random = rand(0, 1);
+                    $postcodeArray = ['OUTSTATION_POSTCODE', 'CENTER_POSTCODE'];
+                    (App()->make(UpdatePostcodeSegmentProcessor::class))->execute('1', $postcodeArray[$random],$postcode);
+                    $this->command->info($postcodeArray[$random]);
+                }
+            }
+        }
+    
+        Artisan::call('invoice:generate');
+        Artisan::call('approve:invoice');
+
     }
 
 }

database/seeders/SegmentConstantsTableSeeder.php

@@ -38,7 +38,7 @@ class SegmentConstantsTableSeeder extends Seeder
         Segmentconstant::create( [
             'segment_id'=>1,
             'reference'=>'STATE_RATE',
-            'value'=>'[{"state_id":1,"center":"10.00","outstation":"2.00"},{"center":"10.00","outstation":"0.00"},{"center":"10.00","outstation":"0.00"},{"center":"50.00","outstation":"0.00"},{"center":"0.00","outstation":"0.00"},{"center":"345.00","outstation":"0.00"},{"center":"10.00","outstation":"0.00"},{"center":"10.00","outstation":"0.00"},{"center":"10.00","outstation":"0.00"},{"center":"10.00","outstation":"0.00"},{"center":"10.00","outstation":"0.00"},{"center":"10.00","outstation":"0.00"},{"center":"0.00","outstation":"0.00"},{"center":"185.00","outstation":"0.00"},{"center":"185.00","outstation":"0.00"},{"center":"0.00","outstation":"0.00"},{"center":"50.00","outstation":"0.00"}]',
+            'value'=>'[{"state_id":1,"center":"10.00","outstation":"2.00"},{"center":"10.00","outstation":"10.00"},{"center":"10.00","outstation":"10.00"},{"center":"50.00","outstation":"50.00"},{"center":"12.00","outstation":"12.00"},{"center":"345.00","outstation":"345.00"},{"center":"10.00","outstation":"10.00"},{"center":"10.00","outstation":"10.00"},{"center":"10.00","outstation":"30.00"},{"center":"10.00","outstation":"20.00"},{"center":"10.00","outstation":"10.00"},{"center":"10.00","outstation":"10.00"},{"center":"15.00","outstation":"15.00"},{"center":"185.00","outstation":"23.00"},{"center":"185.00","outstation":"185.00"},{"center":"30.00","outstation":"30.00"},{"center":"50.00","outstation":"50.00"}]',
             'deleted_at'=>NULL,
             'created_at'=>NULL,
             'updated_at'=>'2022-09-27 01:18:15'
@@ -71,7 +71,7 @@ class SegmentConstantsTableSeeder extends Seeder
         Segmentconstant::create( [
             'segment_id'=>1,
             'reference'=>'OUTSTATION_POSTCODE',
-            'value'=>'["93250","93350","94200","94300","94600","78556","78557","94700","94750","94760","93050","93250","94000","94500","93050","93350","93350","79466","93050","94100","94500","93050","93050","93250","93350","93050","94200","94200","93010","93010","94700","94800","94807","94809","93250","94000","93050","93050","93250","86900","82300","86800","86810","81600","86800","71600","71650","72400","71600","72200","72300","71750","71770","69000","26800","26810","26820","39000","39007","39009","39010","33300","33310","33320","33100"]',
+            'value'=>'["93250","93350","94200","94300","94600","78556","78557","94700","94750","94760","93050","93250","94000","94500","93050","93350","93350","79466","93050","94100","94500","93050","93050","93250","93350","93050","94200","94200","93010","93010","94700","94800","94807","94809","93250","94000","93050","93050","93250","86900","82300","86800","86810","81600","86800","71600","71650","72400","71600","72200","72300","71750","71770","69000","26800","26810","26820","39000","39007","39009","39010","33300","33310","33320","33100","42425","42500","42507","42509","42800","45500","43950","47507","47600","47610","47620","47640","47650","47200","40000","40100","40470","40500","40502","40503","40505","40512","40517","40520","40529","40542","40548","40550","40551","40560","40564","40570","40572","40576","40578","40582","40590","40592","40594","40596","40598","40604","40607","40608","40610","40612","40620","40622","40626","40632","40646","40648","40660","40664","40670","40672","40673","40674","40675","40676","40680","40690","40700","40702","40704","40706","40708","40710","40712","40714","40716","40718","40720","40722","40724","40726","40728","40730","40732","40800","40802","40804","40806","40808","40810","40990"]',
             'deleted_at'=>NULL,
             'created_at'=>NULL,
             'updated_at'=>'2022-09-21 03:35:19'

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;
     }
 }

resources/assets/vue/components/addresses/sections/BillingAddressSectionComponent.vue

@@ -0,0 +1,123 @@
+<style>
+    @media screen and (min-width: 570px) {
+        .extend-modal-body{
+            width: 700px;
+            max-width: calc(100% - 20px);
+        }
+    }
+</style>
+<template>
+    <div class="row m-b-20 bg-white text-black padding-15 rounded extend-modal-body">
+        <div class="col">
+            <div class="row m-b-20 text-info">
+                <div class="col text-center">
+                    <h3>Please select the <b>Billing Address</b></h3>
+                </div>
+            </div>
+            <div class="row b-rounded justify-content-center m-b-15" @click="updateBillingAddressFilters">
+                <div class="col col-md-10 bg-master-lightest margin-auto padding-15">
+                    <div class="row justify-content-center">
+                        <div class="col pointer d-flex justtify-content-center align-items-center">
+                            <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !useDeliveryAddress, 'fa-check-square': useDeliveryAddress, 'text-primary':useDeliveryAddress}" ></i>
+                            <p class="m-b-0">Use Delivery Address</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row justify-content-center m-b-15" v-if="error">
+                <div class="col-10">
+                    <small class="text-danger">{{error}}</small>
+                </div>
+            </div>
+            <div class="row justify-content-center">
+                <div class="col col-md-10">
+                    <list-component :key="currentKey" style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="billingAddressFilters">
+                        <template slot="list" slot-scope="{data}">
+                            <select-address-component :data="data" :value="parameters.billing_address_id" v-model="parameters.billing_address_id"></select-address-component>
+                        </template>
+                    </list-component>
+                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
+                        <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.billing_address_id, 'b-grey': parameters.billing_address_id}" @click="parameters.billing_address_id = null">
+                            <div class="row align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.billing_address_id, 'fa-check-circle': !parameters.billing_address_id, 'text-primary': !parameters.billing_address_id}"></i>
+                                </div>
+                                <div class="col-auto semi-bold">New Address</div>
+                            </div>
+                            <div class="row" v-show="!parameters.billing_address_id">
+                                <div class="col">
+                                    <address-form-component :type="1" :id="company_module_id" section="addressList" @input="parameters.billing_address_id = $event"></address-form-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col"></div>
+                <div class="col-auto">
+                    <button type="button" class="btn btn-lg rounded btn-primary" v-if="parameters.billing_address_id" @click="submitForm()">Confirm</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            section: {
+                type: String,
+                default: 'addressList'
+            },
+            company_module_id: {
+                type: Number,
+                default: 1
+            },
+        },
+        data(){
+            return {
+                useDeliveryAddress: false,
+                isLoading: false,
+                error: '',
+                billingAddressFilters: {
+                    per_page: 10, 
+                    HasMorphCompanyModule: this.company_module_id,
+                    type: 1
+                },
+                parameters : {
+                    company_module_id: this.company_module_id,
+                    billing_address_id: '',
+                },
+                item:{
+                    id:null
+                },
+                currentKey: 1,
+            }
+        },
+        methods: {
+            updateBillingAddressFilters(){
+                if(this.useDeliveryAddress) {
+                    // if use delivery address
+                    this.billingAddressFilters = {
+                        per_page: 10, 
+                        HasMorphCompanyModule: this.company_module_id,
+                        type: 1
+                    }
+                    this.parameters.billing_address_id = '';
+                } else {
+                    this.billingAddressFilters = {per_page: 10, HasMorphCompanyModule: this.company_module_id,};
+                }
+                this.useDeliveryAddress = !this.useDeliveryAddress;
+                this.currentKey++;
+            },
+            submitForm(){
+                this.submit(this.route('api.address.billingAddress.create'), 'post', this.section, true, true)
+            },
+            successHandler(response){
+                this.closeModal();
+                location.reload();
+            },
+        }
+    }
+</script>

resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue

@@ -16,8 +16,9 @@
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeCustomerName">
                                 <change-customer-name-form-component :section="'customerProfileSection'" :data="item"></change-customer-name-form-component>
                             </modal-component>
-                            <div class="font-heading fs-20 light">{{item.name}}  
-                                <div class="btn btn-xs b-rad-none pointer requestModal d-inline rounded no-border hover-primary" data-type="changeCustomerName" >
+                            <div class="font-heading fs-20 light">
+                                {{item.name}}  
+                                <div class="btn btn-xs b-rad-none pointer requestModal d-inline rounded no-border hover-primary bg-transparent" data-type="changeCustomerName" >
                                     <i class="fa fa-edit pointer fa-fw fs-15 m-l-5"></i>
                                 </div>
                             </div>
@@ -92,10 +93,24 @@
                             <h6 class="no-margin">{{item.contact.phone}}</h6>
                         </div>
                     </div>
+                    <!-- <div class="row align-items-center">
+                        <div class="col">
+                            <h6 class="no-margin fs-12">WeChat ID</h6> 
+                            <h6 class="no-margin">{{item.contact.wechat_id}}</h6>
+                        </div>
+                    </div> -->
                     <div class="row align-items-center">
                         <div class="col">
-                            <h6 class="no-margin fs-12">WeChat ID</h6>
-                            <h6 class="no-margin">{{item.contact.wechat_id}}</h6>
+                            <h6 class="no-margin fs-12">Company Type </h6> 
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeBusinessType">
+                                <change-business-type-form-component :section="'customerProfileSection'" :data="item"></change-business-type-form-component>
+                            </modal-component>
+                            <h6 class="no-margin">
+                                {{item.type_name}}
+                                <div class="btn btn-xs b-rad-none pointer requestModal d-inline rounded no-border hover-primary bg-transparent" data-type="changeBusinessType" v-if="$store.getters.isAdmin">
+                                    <i class="fa fa-edit pointer fa-fw fs-15 m-l-5"></i>
+                                </div>
+                            </h6>
                         </div>
                     </div>
                 </div>

resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue

@@ -58,6 +58,12 @@
                                                                         </div>
                                                                     </div>
                                                                 </div>
+                                                                <div class="col-auto">
+                                                                    <div class="btn-lg btn-primary b-a b-white pointer fs-14 position-relative bg-transparent requestModal" data-type="billingAddressComponent" style="z-index: 2;">Change Billing Address</div>
+                                                                </div>
+                                                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="billingAddressComponent">
+                                                                    <billing-address-section-component :company_module_id="company.company_module.id" :section="section"></billing-address-section-component>
+                                                                </modal-component>
                                                             </div>
                                                         </div>
                                                     </div>

resources/assets/vue/components/orders/forms/ChangeAdminRoleTypeFormComponent.vue

@@ -0,0 +1,62 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col text-center">
+                    <h3>Edit Role Type</h3>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="row m-t-15 m-b-15">
+                <div class="col p-r-5">
+                    <div class="b-grey b-a w-100 text-center p-l-15 p-r-15 p-t-10 p-b-10 pointer fs-15" :class="[{'b-primary': parameters.type === 2}]" @click="updateRoleType(2)">Admin</div>
+                </div> 
+                <div class="col p-l-5"> 
+                    <div class="b-grey b-a w-100 text-center p-l-15 p-r-15 p-t-10 p-b-10 pointer fs-15" :class="[{'b-primary': parameters.type === 1}]" @click="updateRoleType(1)">Super Admin</div>
+                </div>
+            </div>
+                </div>
+            </div>
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
+                    <div class="btn btn-primary w-100 btn-lg" @click="submitForm">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, minLength } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            data:{
+                type: Object,
+                required: true,
+            }
+        },
+        data() {
+            return {
+                parameters: {
+                    type: this.data.type, 
+                }
+            };
+        },
+        
+        methods: {
+            submitForm() {
+                this.submit(this.route('api.account.user.update.role', this.data.id), 'put', this.section, true, true)
+            },
+            updateRoleType(type){
+                this.parameters.type=type;
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>

resources/assets/vue/components/orders/forms/ChangeBusinessTypeFormComponent.vue

@@ -0,0 +1,49 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col text-center">
+                    <h3>Edit Company Type</h3>
+                </div>
+            </div>
+            <div class="row m-t-15 m-b-15">
+                <div class="col p-r-5">
+                    <div class="b-grey b-a w-100 text-center p-l-15 p-r-15 p-t-10 p-b-10 pointer fs-15" :class="[{'b-primary': parameters.type === 0}]" @click="updateType(0)">Personal<br>Business</div>
+                </div> 
+                <div class="col p-l-5"> 
+                    <div class="b-grey b-a w-100 text-center p-l-15 p-r-15 p-t-10 p-b-10 pointer fs-15" :class="[{'b-primary': parameters.type === 1}]" @click="updateType(1)">Company<br>Business</div>
+                </div>
+            </div>
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
+                    <div class="btn btn-primary w-100 btn-lg" @click="submitForm">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        data() {
+            return {
+                parameters: {
+                    type: this.data.type,
+                }
+            };
+        },
+        methods: {
+            submitForm() {
+                this.submit(this.route('api.company.update.type', this.data.id), 'put', this.section, true, true)
+            },
+            updateType(type) {
+                this.parameters.type = type;
+            },
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>

resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue

@@ -60,9 +60,6 @@
             }
         },
         methods: {
-            successHandler(response) {
-                window.location.replace(this.route('customers', response.payload.data.reference));
-            },
             submitForm() {
                 this.submit(this.route('api.company.update.nameAndDebtor', this.data.id), 'put', this.section, true, true)
             }

resources/assets/vue/components/paymentsBilling/elements/AdminDisputePaymentsBillingComponent.vue

@@ -27,10 +27,6 @@
                             <div v-if="!item.suspended_invoice">n/a</div>
                             <div v-if="item.suspended_invoice">MYR  {{ item.suspended_invoice.amount.toFixed(2) }}</div>
                         </div>
-                        <div class="col" v-if="invoice_status == 'Suspended Invoice'">
-                            <p class="no-margin fs-10 all-caps">Billing Question</p>
-                            <div>{{ latestComment ? latestComment.content : '' }} </div>
-                        </div>
                         <div class="col-auto p-l-0 p-r-0" v-if="['Suspended Invoice'].includes(invoice_status)">
                             <div class="btn bg-grey no-border muted requestModal" data-type="deleteDispute">
                                 <i class="fa fa-close"></i>
@@ -64,6 +60,12 @@
                             </div>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="col" v-if="invoice_status == 'Suspended Invoice'">
+                            <p class="no-margin fs-10 all-caps">Billing Question</p>
+                            <div>{{ latestComment ? latestComment.content : '' }} </div>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded">

resources/assets/vue/components/paymentsBilling/forms/BillingAddressFormComponent.vue

@@ -1,66 +0,0 @@
-<template>
-    <div class="row bg-white padding-25">
-        <div class="col">
-            <div class="row m-b-20 text-info">
-                <div class="col text-center">
-                    <h3>Please select the address where you want to receive this order</h3>
-                </div>
-            </div>
-            <div class="row justify-content-center m-b-15" v-if="error">
-                <div class="col-10">
-                    <small class="text-danger">{{error}}</small>
-                </div>
-            </div>
-            <div class="row justify-content-center">
-                <div class="col col-md-10">
-                    <list-component style="min-height: 50px;" class="m-b-20" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 5, HasMorphCompanyModule: data.order.company_module.id}">
-                        <template slot="list" slot-scope="{data}">
-                            <select-address-component :data="data" :value="parameters.address_id" v-model="parameters.address_id"></select-address-component>
-                        </template>
-                    </list-component>
-                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
-                        <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.address_id, 'b-grey': parameters.address_id}" @click="parameters.address_id = null">
-                            <div class="row align-items-center">
-                                <div class="col-auto p-r-0">
-                                    <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.address_id, 'fa-check-circle': !parameters.address_id, 'text-primary': !parameters.address_id}"></i>
-                                </div>
-                                <div class="col-auto semi-bold">New Address</div>
-                            </div>
-                            <div class="row" v-show="!parameters.address_id">
-                                <div class="col">
-                                    <address-form-component :id="data.order.company_module.id" section="addressList" @input="parameters.address_id = $event"></address-form-component>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row m-t-15 justify-content-center">
-                <div class="col-6 col-md-4 p-r-5">
-                    <div class="btn btn-default w-100 btn-lg b-rad-none" data-dismiss="modal">Cancel</div>
-                </div>
-                <div class="col-6 col-md-4 p-l-5">
-                    <!-- <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.segment.constant.update.postcode', 1), 'put', section, true, true)">Confirm</div> -->
-                    <div class="btn btn-primary w-100 btn-lg">Confirm</div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import modalFormHandler from '../../../general/mixins/modalFormHandler';
-    export default {
-        data() {
-            return {
-                error: '',
-                parameters : {
-                    warehouse_id: '',
-                    address_id: '',
-                }
-            }
-        },
-        mixins: [modalFormHandler]
-    }
-
-</script>

resources/assets/vue/components/user/elements/ListAdminComponent.vue

@@ -0,0 +1,39 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col">
+            <list-component :section="section" :endpoint="route('api.account.user.list')" :options="{ 'type_in': adminTypeArray }">
+                <template slot="list" slot-scope="{data}">
+                    <user-component :data="data"></user-component>
+                </template>
+            </list-component>
+        </div>
+    </div>
+</template>
+
+<script>
+import componentHandler from '../../../general/mixins/componentHandler';
+export default {
+    props: {
+        section: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            expanded: false,
+            isSuperAdmin: this.$store.getters.isSuperAdmin,
+        }
+    },
+    computed: {
+        adminTypeArray() {
+            if (this.isSuperAdmin) {
+                return [1, 2];
+            } else {
+                return [2];
+            }
+        },
+    },
+    mixins: [componentHandler]
+}
+</script>

resources/assets/vue/components/user/elements/UserComponent.vue

@@ -31,10 +31,30 @@
                         </div>
                     </div>
                 </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Role Type</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">
+                                {{item.type_name }}
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeAdminRoleType">
+                                    <change-admin-role-type-form-component :section="'changeAdminRoleType'" :data="item"></change-admin-role-type-form-component>
+                                </modal-component>
+                                <div class="btn btn-xs b-rad-none pointer requestModal d-inline rounded no-border bg-transparent hover-primary" data-type="changeAdminRoleType" v-if="$store.getters.isSuperAdmin">
+                                    <i class="fa fa-edit pointer fa-fw fs-15 m-l-5"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="col-auto">
                     <div class="row">
                         <div class="col">
-                            <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteSupplier">
+                            <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteSupplier" v-if="item.type !== 0">
                                 <i class="fa fa-times"></i>
                             </button>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteSupplier">

resources/views/pages/settings.blade.php

@@ -251,11 +251,7 @@
                                     </div>
                                     <div class="row m-b-20">
                                         <div class="col">
-                                            <list-component section="accountsSection" :endpoint="route('api.account.user.list')" :options="{'type': 2}">
-                                                <template slot="list" slot-scope="{data}">
-                                                    <user-component :data="data"></user-component>
-                                                </template>
-                                            </list-component>
+                                            <list-admin-component section="accountsSection"></list-admin-component>
                                         </div>
                                     </div>
                                 </div>

routes/account.php

@@ -35,12 +35,14 @@ Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account
     });
 
     Route::group(['middleware' => 'valid.token', 'prefix' => 'user', 'as' => 'user.'], function () {
-        Route::get('/{email}', 'FetchUserByEmailController@fetch')->name('company');
+        Route::get('/email/{email}', 'FetchUserByEmailController@fetch')->name('company');
         Route::post('/show', 'FetchUserController@fetch')->name('show');
         Route::get('/list', 'ListUsersController@list')->name('list');
         Route::put('/update/{id}', 'UpdateUserController@update')->name('update');
         Route::post('/admin/create', 'CreateAdminUserController@create')->name('admin.create');
         Route::delete('/delete/{id}', 'DeleteUserController@delete')->name('delete');
+
+        Route::put('/update/{id}/role', 'UpdateUserRoleController@update')->name('update.role');
     });
 
 });

routes/address.php

@@ -14,6 +14,8 @@ Route::group(['prefix' => 'address', 'as' => 'address.', 'namespace' => 'Address
     Route::get('state/list', 'ListStatesController@list')->name('state.list');
 
     Route::post('/create', 'CreateAddressController@create')->name('create');
+    
+    Route::post('billingAddress/create', 'CreateBillingAddressController@create')->name('billingAddress.create');
 
     Route::put('/update/{id}', 'UpdateAddressController@update')->name('update');
 

routes/company.php

@@ -9,6 +9,7 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
     Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
     Route::put('/name-and-debtor/update/{id}', 'UpdateCompanyNameAndDebtorController@update')->name('update.nameAndDebtor');
+    Route::put('/type/update/{id}', 'UpdateCompanyTypeController@create')->name('update.type');
 
     Route::post('/team/create', 'AddNewMemberController@create')->name('team.create');
 

routes/web.php

@@ -727,6 +727,8 @@ Route::get('/invoices/fix/{company_module_id}', function($company_module_id) {
             $document = (App()->make(CreatesDocument::class))->execute($invoice, $document_object);
 
             (App()->make(CreatesFiles::class))->execute($document, $document_object);
+
+            dump($document);
         }
     }
 
@@ -800,40 +802,31 @@ Route::get('/invoices/approve', function(Request $request){
 Route::get('/invoices/show-duplicated', function(Request $request){
     $transactionWithMultipleInvoice = DB::table('transactions')
         ->where('type', TransactionType::SHIPPING_INVOICE)
-        ->where('status', '!=' , ApprovalStatus::COMPLETED)
+        ->where('status', '!=' , ApprovalStatus::EXPIRED)
         ->where('deleted_at', null)
         ->select('owner_id', DB::raw('count(*) as count'))
         ->groupBy('owner_id')
         ->having('count', '>', 1)
         ->get();
 
-        // delete invoice type suspended
-
-    echo '<table>';
-    echo "<tr>";
-    echo "<td style='border:1px solid'>owner_id</td>";
-    echo "<td  style='border:1px solid'>count</td>";
-    echo "</tr>";
+    echo 'Total Duplicates: ' . count($transactionWithMultipleInvoice) . '<br>';
 
     $duplicatedOrderId = [];
+    $duplicatedOrderArray = [];
     foreach($transactionWithMultipleInvoice as $invoice) {
         $duplicatedOrderId[] = $invoice->owner_id;
-        echo "<tr>";
-        echo "<td style='border:1px solid'>$invoice->owner_id</td>";
-        echo "<td style='border:1px solid'>$invoice->count</td>";
-        echo "</tr>";
+        $duplicatedOrderArray[$invoice->owner_id] = $invoice->count;
     }
-    echo '</table>';
 
     $duplicatedInvoice = Transaction::whereIn('owner_id', $duplicatedOrderId)->orderByDesc('owner_id')->get();
-    // dd($duplicatedInvoice);
     echo '<br>';
     echo '<table>';
     echo "<tr>";
     echo "<td style='border:1px solid'>Order Reference</td>";
     echo "<td  style='border:1px solid'>Status</td>";
     echo "<td  style='border:1px solid'>Invoice Owner ID</td>";
-    echo "<td  style='border:1px solid'>Invoice Owner ID</td>";
+    echo "<td  style='border:1px solid'>Amount</td>";
+    echo "<td  style='border:1px solid'>Count</td>";
     echo "</tr>";
 
     foreach($duplicatedInvoice as $invoice) {
@@ -843,17 +836,16 @@ Route::get('/invoices/show-duplicated', function(Request $request){
         echo "<td style='border:1px solid'>".ApprovalStatus::APPROVAL_STATUS_ID[$invoice->status]."</td>";
         echo "<td style='border:1px solid'>$invoice->owner_id</td>";
         echo "<td style='border:1px solid'>$invoice->amount</td>";
+        echo "<td style='border:1px solid'>".$duplicatedOrderArray[$invoice->owner_id]."</td>";
         echo "</tr>";
     }
     echo '</table>';
 });
 
-
-
 Route::get('/invoices/delete-duplicated', function(Request $request){
     $duplicatedInvoices = DB::table('transactions')
         ->where('type', TransactionType::SHIPPING_INVOICE)
-        ->where('status', '!=' , ApprovalStatus::COMPLETED)
+        ->where('status', '!=' , ApprovalStatus::EXPIRED)
         ->where('deleted_at', null)
         ->select('owner_id', DB::raw('count(*) as count'))
         ->groupBy('owner_id')
@@ -868,26 +860,128 @@ Route::get('/invoices/delete-duplicated', function(Request $request){
 
         $paidInvoice = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::COMPLETED)->get();
 
-        $unpaidInvoices = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->orderBy('id', 'desc')->get();
-
+        // if have completed invoice (verified payment)
         if (count($paidInvoice)) {
             $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::COMPLETED)->delete();
             continue;
+        } else {
+            dump($order->reference . ' -no');
         }
 
-        // delete duplicated invoices
-        $unpaidInvoicesIds = $unpaidInvoices->pluck('id')->toArray();
-        array_shift($unpaidInvoicesIds);
-        Transaction::whereIn('id', $unpaidInvoicesIds)->delete();
+        // if have unverified payment
+        // $paymentHistory = $packingList->transactions()->whereHas('transactions', function($query){
+        //     return $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION ,ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
+        // })->get();
+        // if (count($paymentHistory)) {
+        //     $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('id', '!=', $paymentHistory->first()->id)->delete();
+        //     continue;
+        // }
 
-        // delete expired invoices
-        $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::EXPIRED)->delete();
+        // // delete duplicated invoices
+        // $unpaidInvoices = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->orderBy('id', 'desc')->get();
 
-        // delete suspended invoices
-        $suspendedInvoices = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::SUSPENDED)->orderBy('id', 'desc')->get();
-        $suspendedInvoicesIds = $suspendedInvoices->pluck('id')->toArray();
-        array_shift($suspendedInvoicesIds);
-        Transaction::whereIn('id', $suspendedInvoicesIds)->delete();
+        // $unpaidInvoicesIds = $unpaidInvoices->pluck('id')->toArray();
+        // array_shift($unpaidInvoicesIds);
+        // Transaction::whereIn('id', $unpaidInvoicesIds)->delete();
 
+        // // delete expired invoices
+        // $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::EXPIRED)->delete();
+
+        // // delete suspended invoices
+        // $suspendedInvoices = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::SUSPENDED)->orderBy('id', 'desc')->get();
+        // $suspendedInvoicesIds = $suspendedInvoices->pluck('id')->toArray();
+        // array_shift($suspendedInvoicesIds);
+        // Transaction::whereIn('id', $suspendedInvoicesIds)->delete();
     }
 });
+
+Route::get('/packing-lists/show-duplicated', function(Request $request){
+    $results = PackingList::select('reference', 'type', DB::raw('count(*) as total'))
+            ->groupBy('reference', 'type')
+            ->having('total', '>', 1)
+            ->get()
+            ->toArray();
+
+    echo '<table>';
+    echo "<tr>";
+    echo "<td style='border:1px solid'>reference</td>";
+    echo "<td  style='border:1px solid'>type</td>";
+    echo "<td  style='border:1px solid'>count</td>";
+    echo "</tr>";
+
+    foreach($results as $result) {
+        // dd($result);
+        echo "<tr>";
+        echo "<td style='border:1px solid'>" . $result['reference'] . "</td>";
+        echo "<td style='border:1px solid'>" . $result['type'] . "</td>";
+        echo "<td style='border:1px solid'>" . $result['total'] . "</td>";
+        echo "</tr>";
+    }
+    echo '</table>';
+});
+
+Route::get('/packing-lists/delete-duplicated', function(Request $request){
+    $results = PackingList::select('reference', 'type', DB::raw('count(*) as total'))
+        ->groupBy('reference', 'type')
+        ->having('total', '>', 1)
+        ->get()
+        ->toArray();
+
+    foreach($results as $result) {
+        $duplicatedPackingList = PackingList::where('reference', $result['reference'])->where('type', $result['type'])->orderBy('id', 'desc')->get();
+
+        // if packinglist has paid inivoice
+        $paidPackinglist = PackingList::where('reference', $result['reference'])->where('type', $result['type'])->whereHas('transactions', function($query){
+            return $query->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::COMPLETED);
+        })->get();
+
+        if (count($paidPackinglist)) {
+            // delete all the other packing list
+            $paidPackinglistID = $paidPackinglist->first()->id;
+            $duplicatedPackingList = PackingList::where('reference', $result['reference'])->where('type', $result['type'])->where('id', '!=', $paidPackinglistID)->get();
+            // $duplicatedPackingList->delete();
+            foreach ($duplicatedPackingList as $p) {
+                $p->delete();
+                dump('have paid packinglist, deleting id:' . $p->id);
+            }
+        } else {
+            // delete all but left the latest packing list
+            $firstItem = $duplicatedPackingList->shift();
+            // dump('dont have paid packinglist, keep first and delete others');
+            foreach ($duplicatedPackingList as $p) {
+                $p->delete();
+                dump('dont have paid packinglist, keep latest id:' . $firstItem->id . ', and deleting id:' . $p->id);
+            }
+        }
+    }
+});
+
+Route::get('/billplz/audit', function (Request $request) {
+    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->get();
+    $i = 0;
+    $totalAmount = 0;
+    foreach ($transactions as $transaction){
+        $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
+
+        if($response->successful()){
+            $data = $response->json();
+            if($data['paid']){
+
+            } else {
+
+                $transaction->status = ApprovalStatus::REJECTED;
+                $transaction->save();
+
+                $invoice = $transaction->owner;
+                $invoice->status = ApprovalStatus::APPROVED;
+
+                $totalAmount += $transaction->amount;
+                echo 'Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . " </br></br>";
+            }
+        }else{
+            echo "billplz error</br>";
+        }
+    }
+
+    echo 'Total: ' . $totalAmount;
+});