Fix a problem in invoice where rounding issue cause an invoice that is fully paid to appear partially paid

CRM add department custom field to tasks

See merge request CIEFWorldwideSdnBhd/shipping-portal!152

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

@@ -18,6 +18,8 @@ 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
 {
@@ -58,6 +60,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
             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;
@@ -68,6 +71,11 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
                     }
                 }
 
+                if($projectId == ""){
+                    Log::error(json_encode('UpdatePerfexCRMInvoice debug: '.$projectName));
+                    Log::error(json_encode($transaction->owner));
+                }
+
                 //update invoice
                 (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $projectId);
             }
@@ -89,4 +97,11 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
             (App()->make(CreatesPerfexCRMInvoicePayment::class))->execute($invoicePaymentPerfexCRMObject);
         }
     }
+
+    public function delay($delay)
+    {
+        // Add delay in seconds to the job
+        $this->delay = $delay;
+        return $this;
+    }
 }

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/Billplzs/ControllersLogic/CallbackBillplzLogic.php

@@ -101,7 +101,7 @@ 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) {
             $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);

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,10 @@ 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)
+    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department)
     {
         $this->email = $email;
         $this->name = $name;
@@ -45,6 +47,7 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
         $this->reference = $reference;
         $this->onTaskCompletion = $onTaskCompletion;
         $this->status = $status;
+        $this->department = $department;
     }
 
     /**
@@ -124,4 +127,11 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
         return $this->status;
     }
 
+    /**
+     * @return string
+     */
+    public function getDepartment(): string
+    {
+        return $this->department;
+    }
 }

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

@@ -14,6 +14,7 @@ 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
 {
@@ -99,6 +100,7 @@ class CreatePerfexCRMInvoiceProcessor
 
         //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;
@@ -115,6 +117,11 @@ class CreatePerfexCRMInvoiceProcessor
                     }
                 }
             }
+
+            if($projectId == ""){
+                Log::error(json_encode('CreatePerfexCRMInvoiceProcessor debug: '.$projectName));
+                Log::error(json_encode($transaction->owner));
+            }
         }
 
         //newitems

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

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

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

@@ -183,7 +183,7 @@ class InitializePerfexCRMProcessor
                 }
 
                 // 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);
+                $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'],$tasks[$count]['department'], $taskStatus);
                 if(is_null($result)){
                     break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
                 }

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

@@ -29,7 +29,8 @@ class NewLeadTaskToPerfexCRMProcessor
             "",
             "",
             "",
-            PerfexCRMTasks::TASK_IDENTIFICATION_1['status']
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['status'],
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['department']
         );
 
         CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);

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

@@ -7,6 +7,7 @@ use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
 use App\Classes\Jobs\UpdatePerfexCRM;
 use App\Models\PackingList;
 use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use Illuminate\Support\Facades\Log;
 
 class PackingListToPerfexCRMProcessor
 {
@@ -17,35 +18,43 @@ class PackingListToPerfexCRMProcessor
      */
     public function execute(PackingList $packingList)
     {
-        $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;
+        try {
+            if($packingList->owner instanceof \App\Models\Order) {
+                Log::error(json_encode($packingList));
+                $order = $packingList->owner;
+                $companyModule  = $order->companyModule()->first();
+                $connection = $companyModule->inviters()->withPivot('invitee_reference')->first();
+                $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,
-            ]
-        );
-        UpdatePerfexCRM::dispatch($updatePerfexCRMObject);
+                $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,
+                    ]
+                );
+                UpdatePerfexCRM::dispatch($updatePerfexCRMObject);
+            }
+        } 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

@@ -16,6 +16,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Jobs\UpdatePerfexCRMInvoice;
 use App\Classes\Jobs\UpdatePerfexCRM;
 use App\Models\Transaction;
+use Illuminate\Support\Facades\Log;
 
 class TransactionToPerfexCRMProcessor
 {
@@ -91,7 +92,7 @@ class TransactionToPerfexCRMProcessor
                 $model,
                 true
             );
-            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject);
+            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject)->delay(6);
         }
 
         return true;

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

@@ -194,7 +194,7 @@ class UpdatePerfexCRMProcessor
                 }
 
                 // Get existing or create task
-                $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $taskStatus);
+                $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $tasks[$count]['department'], $taskStatus);
                 if(is_null($result)){
                     break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
                 }

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' => number_format($invoicePerfexCRMObject->getSubTotal(), 2, '.', ''),
-                'total' => number_format($invoicePerfexCRMObject->getTotal(), 2, '.', ''),
+                '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/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
 {
@@ -20,8 +21,17 @@ class CreatesPerfexCRMTask
      * @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 = "1") {
         try{
+            $custom_fields = [];
+            if($department != ""){
+                $custom_fields = [
+                    "tasks" => [
+                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $department
+                    ]
+                ];
+            }
+
             $data = [
                 'name' => $taskName,
                 'description' => $taskDescription,
@@ -32,7 +42,8 @@ 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
             ];
 
             if($leadId != '') {
@@ -46,7 +57,8 @@ 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
                 ];
             }
 

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

@@ -35,6 +35,9 @@ class UpdatesPerfexCRMInvoice
                 array_push($newInvoiceItems,$item);
             }
 
+            $allowedPaymentModes = [];
+            array_push($allowedPaymentModes, 1, 2);
+
             $data = [
                 'number' => $invoice->number,
                 'date' => $invoice->date,
@@ -46,7 +49,7 @@ class UpdatesPerfexCRMInvoice
                 'shipping_street' => $invoice->billing_street,
                 'project_id' => $projectId,
                 'items' => $newInvoiceItems,
-                'allowed_payment_modes' => $invoice->allowed_payment_modes,
+                'allowed_payment_modes' => $allowedPaymentModes,
             ];
 
             $response = Http::asJson()->withHeaders([

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

@@ -13,6 +13,7 @@ class PerfexCRMTasks
         'milestone' => 'MILESTONE 1 - Customer Paid',
         'reference' => '',
         'on_task_completion' => '',
+        'department' => '',
         'status' => PerfexCRMTaskStatus::COMPLETED
     ];
 
@@ -29,6 +30,7 @@ class PerfexCRMTasks
         'milestone' => '',
         'reference' => 'TASK_POST_PAYMENT_1',
         'on_task_completion' => 'TASK_POST_PAYMENT_2',
+        'department' => 'Accounts',
         'status' => PerfexCRMTaskStatus::IN_PROGRESS
     ];
     public const TASK_POST_PAYMENT_2 = [
@@ -44,6 +46,7 @@ class PerfexCRMTasks
         'milestone' => '',
         'reference' => 'TASK_POST_PAYMENT_2',
         'on_task_completion' => 'TASK_POST_PAYMENT_3',
+        'department' => 'Accounts',
         'status' => ''
     ];
     public const TASK_POST_PAYMENT_3 = [
@@ -59,6 +62,7 @@ class PerfexCRMTasks
         'milestone' => '',
         'reference' => 'TASK_POST_PAYMENT_3',
         'on_task_completion' => 'TASK_POST_PAYMENT_4',
+        'department' => 'Accounts',
         'status' => ''
     ];
     public const TASK_POST_PAYMENT_4 = [
@@ -74,6 +78,7 @@ class PerfexCRMTasks
         'milestone' => '',
         'reference' => 'TASK_POST_PAYMENT_4',
         'on_task_completion' => '',
+        'department' => 'Accounts',
         'status' => ''
     ];
 
@@ -88,6 +93,7 @@ class PerfexCRMTasks
         'milestone' => '',
         'reference' => 'TASK_LOADED_CONTAINER_1',
         'on_task_completion' => 'TASK_LOADED_CONTAINER_2',
+        'department' => 'Operations',
         'status' => PerfexCRMTaskStatus::IN_PROGRESS
     ];
 
@@ -101,6 +107,7 @@ class PerfexCRMTasks
         'milestone' => '',
         'reference' => 'TASK_LOADED_CONTAINER_2',
         'on_task_completion' => '',
+        'department' => 'Customer Services',
         'status' => ''
     ];
 
@@ -118,6 +125,7 @@ class PerfexCRMTasks
         'milestone' => '',
         'reference' => 'TASK_IDENTIFICATION_1',
         'on_task_completion' => '',
+        'department' => 'Operations',
         'status' => PerfexCRMTaskStatus::IN_PROGRESS
     ];
 }

app/Console/Commands/AuditBillplz.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 AuditBillplz extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz:audit';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Audit Billplz';
+
+    /**
+     * 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 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/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]);
+    }
+}

routes/account.php

@@ -35,7 +35,7 @@ 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');

routes/web.php

@@ -868,7 +868,7 @@ Route::get('/invoices/delete-duplicated', function(Request $request){
             dump($order->reference . ' -no');
         }
 
-        // if have unverified payment 
+        // 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();
@@ -955,3 +955,33 @@ Route::get('/packing-lists/delete-duplicated', function(Request $request){
         }
     }
 });
+
+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;
+});