CRM tie invoice to project

Add new tasks post payment into CRM + Add task append to lead

See merge request CIEFWorldwideSdnBhd/shipping-portal!146

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

@@ -0,0 +1,92 @@
+<?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;
+
+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 = "";
+                if($transaction->owner instanceof Transaction){
+                    $orderReference = $transaction->owner->owner->owner()->first()->reference;
+                    $packingListReference = $transaction->owner->owner->reference;
+                    $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                    $project = (App()->make(FetchesPerfexCRMProject::class))->execute($projectName, $customer->userid);
+                    if(!is_null($project)){
+                        $projectId = $project->id;
+                    }
+                }
+
+                //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);
+        }
+    }
+}

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/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/Processors/CreatePerfexCRMInvoiceProcessor.php

@@ -2,13 +2,15 @@
 
 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\Models\PackingList;
 use Carbon\Carbon;
 
 class CreatePerfexCRMInvoiceProcessor
@@ -23,42 +25,52 @@ class CreatePerfexCRMInvoiceProcessor
     /** @var ConvertsPerfexCRMLeadToCustomer */
     private $convertsPerfexCRMLeadToCustomer;
 
+    /** @var FetchesPerfexCRMProject */
+    private $fetchesPerfexCRMProject;
+
     /**
      * CreatePerfexCRMInvoiceProcessor constructor.
      * @param CreatesPerfexCRMInvoice $createsPerfexCRMInvoice
      */
     public function __construct(CreatesPerfexCRMInvoice $createsPerfexCRMInvoice,
     CreatesPerfexCRMInvoicePayment $createsPerfexCRMInvoicePayment,
-    ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer)
+    ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
+    FetchesPerfexCRMProject $fetchesPerfexCRMProject)
     {
         $this->createsPerfexCRMInvoice = $createsPerfexCRMInvoice;
         $this->createsPerfexCRMInvoicePayment = $createsPerfexCRMInvoicePayment;
         $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
+        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
     }
 
     /**
-     * @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');
+        $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
+        $dueDate = Carbon::parse($transaction->created_at)->format('Y-m-d');
         $currency = 1; //cief TODO: To look into Malaysia and Chinese currency
         $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.',';
@@ -67,40 +79,40 @@ class CreatePerfexCRMInvoiceProcessor
         $billingStreet = $billingStreet.$addresses->state()->first()->name.',';
         $billingStreet = $billingStreet.$addresses->country()->first()->name;
 
-        $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
+        if($isPaid){
+            if($transaction->owner instanceof PackingList){
+                $orderReference = $transaction->owner->owner->reference;
+                $packingListReference = $transaction->owner->reference;
+                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                $project = (App()->make(FetchesPerfexCRMProject::class))->execute($projectName, $clientId);
+                if(!is_null($project)){
+                    $projectId = $project->id;
+                }
+            }
+        }
+
         //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){
+            $subTotal = $transaction_detail->amount;
 
-                //$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;
-            }
 
             //string $description, string $longDescription, int $qty, int $rate, int $order, string $unit
             $invoiceSingleItem = new InvoiceSingleItemPerfexCRMObject(
@@ -114,16 +126,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 +147,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/TransactionToPerfexCRMProcessor.php

@@ -8,13 +8,15 @@ 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\ApprovalStatus;
 use App\Classes\Jobs\InitializePerfexCRM;
+use App\Classes\Jobs\UpdatePerfexCRMInvoice;
 use App\Classes\Jobs\UpdatePerfexCRM;
+use App\Models\Transaction;
 
 class TransactionToPerfexCRMProcessor
 {
@@ -83,7 +85,15 @@ class TransactionToPerfexCRMProcessor
 
             //$this->initializePerfexCRMProcessor->execute($initialPerfexCRMObject);
             InitializePerfexCRM::dispatch($initialPerfexCRMObject);
+
+            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
+                $contactEmail,
+                $model,
+                true
+            );
+            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject);
         }
+
         return true;
     }
 }

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

@@ -22,8 +22,8 @@ class CreatesPerfexCRMInvoice
                 'date' => $invoicePerfexCRMObject->getDate(),
                 'duedate' => $invoicePerfexCRMObject->getDueDate(),
                 'currency' => $invoicePerfexCRMObject->getCurrency(),
-                'subtotal' => $invoicePerfexCRMObject->getSubTotal(),
-                'total' => $invoicePerfexCRMObject->getTotal(),
+                'subtotal' => number_format($invoicePerfexCRMObject->getSubTotal(), 2, '.', ''),
+                'total' => number_format($invoicePerfexCRMObject->getTotal(), 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/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/UpdatesPerfexCRMInvoice.php

@@ -0,0 +1,67 @@
+<?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);
+            }
+
+            $data = [
+                'number' => $invoice->number,
+                'date' => $invoice->date,
+                'duedate' => $invoice->date,
+                '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' => $invoice->allowed_payment_modes,
+            ];
+
+            $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/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,12 @@ class ApproveShippingInvoiceTransactionProcessor
         if(app()->environment(['production'])) {
             $user->notify(new InvoiceIssuedEmail($user, $packingList));
         }
+
+        // update perfex crm
+        if(config('perfexcrm.is_enabled') == 'true'){
+            CreatePerfexCRMInvoice::dispatch($invoice_transaction);
+        }
+
         return;
     }
 

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/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/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);
+    }
+
+}

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/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/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>

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