update order v2

New route, middleware, token table, filters for query to allow  third party to access api

See merge request CIEFWorldwideSdnBhd/shipping-portal!161

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class AmountExceed implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('amount', '>', $value);
+    }
+}

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class AmountShort implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('amount', '<', $value);
+    }
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreatedBefore implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('created_at', '<', Carbon::parse($value));
+    }
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class EmailLike implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('email', 'LIKE', '%'.$value.'%');
+    }
+
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class PaymentMethod implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('payment_method', $value);
+    }
+
+}

app/Classes/Jobs/UpdatePerfexCRM.php

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

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

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

app/Classes/Jobs/UpdatePerfexCRMPrelude.php

@@ -3,6 +3,7 @@
 namespace App\Classes\Jobs;
 
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
 use App\Models\PackingList;
 use App\Models\Transaction;
 use Illuminate\Bus\Queueable;
@@ -26,22 +27,27 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
     /** @var UpdatePerfexCRMObject */
     private $updatePerfexCRMObject;
 
-    /** @var */
-    private $nextJob;
+    /** @var UpdatePerfexCRM */
+    private $nextJob1;
+
+    /** @var UpdatePerfexCRMInvoice */
+    private $nextJob2;
 
     /**
      * UpdatePerfexCRMPrelude constructor.
      * @param $packingList
      * @param $transaction
      * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param $nextJob
+     * @param UpdatePerfexCRM $nextJob1
+     * @param UpdatePerfexCRMInvoice $nextJob2
      */
-    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob)
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob1, $nextJob2)
     {
         $this->packingList = $packingList;
         $this->transaction = $transaction;
         $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->nextJob = $nextJob;
+        $this->nextJob1 = $nextJob1;
+        $this->nextJob2 = $nextJob2;
     }
 
     public function handle()
@@ -63,7 +69,9 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
 
         $result = $this->replacePlaceholders($this->updatePerfexCRMObject->getTasks(), $data);
         $this->updatePerfexCRMObject->setTasks($result);
-        $this->nextJob::dispatch($this->updatePerfexCRMObject);
+        /** @var UpdatePerfexCRM $nextJob1 */
+        /** @var UpdatePerfexCRMInvoice $nextJob2 */
+        $this->nextJob1::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->nextJob2);
     }
 
     function replacePlaceholders($template, $data, $prefix = '')

app/Classes/Modules/Contacts/ControllersLogic/UpdateContactLogic.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\Contacts\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Contacts\Services\UpdatesContact;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Services\FetchesContact;
+use App\Http\Resources\ContactResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateContactLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Contact',
+            'message' => 'You have successfully updated the Contact'
+        ];
+    }
+
+    /** @var UpdatesContact */
+    private $updatesContact;
+
+    /** @var FetchesContact */
+    private $fetchesContact;
+
+    /**
+     * UpdateContactLogic constructor.
+     * @param UpdatesContact $updatesContact
+     * @param FetchesContact $fetchesContact
+     */
+    public function __construct(UpdatesContact $updatesContact, FetchesContact $fetchesContact)
+    {
+        $this->updatesContact = $updatesContact;
+        $this->fetchesContact = $fetchesContact;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $object = new ContactObject(
+            $request->input('reference'),
+            $request->input('phone'),
+            $request->input('email'),
+            $request->input('wechat_id')
+        );
+
+        // $this->canUpdateContact->passes($object);
+
+        $query = $this->fetchesContact->execute(['id' => $request->route('id')]);
+
+        $query = $this->updatesContact->execute($query, $object);
+
+        return $this->resourceResponse(new ContactResource($query));
+    }
+
+}

app/Classes/Modules/Contacts/Services/FetchesContact.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Contacts\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Contact;
+
+class FetchesContact extends AbstractFetchRecord
+{
+
+    /** @var Contact */
+    private $repository;
+
+    /**
+     * FetchesContact constructor.
+     * @param Contact $repository
+     */
+    public function __construct(Contact $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}

app/Classes/Modules/Contacts/Services/UpdatesContact.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Contacts\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Models\Contact;
+
+class UpdatesContact extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Contact $model
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Contact $model, ContactObject $object) 
+    {
+        $model->reference = $object->getReference();
+        $model->phone = $object->getPhone();
+        $model->email = $object->getEmail();
+        $model->wechat_id = $object->getWechatId();
+
+        return $this->handler($model);
+    }
+}

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

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Orders\Standards\Rules\CanFetchOrder;
+use App\Http\Resources\OrderV2Resource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchOrderV2Logic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Order',
+            'message' => 'You have successfully retrieved an order'
+        ];
+    }
+
+    /** @var CanFetchOrder */
+    private $canFetchOrder;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /**
+     * FetchOrderLogic constructor.
+     * @param CanFetchOrder $canFetchOrder
+     * @param FetchesOrder $fetchesOrder
+     */
+    public function __construct(CanFetchOrder $canFetchOrder, FetchesOrder $fetchesOrder)
+    {
+        $this->canFetchOrder = $canFetchOrder;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $this->canFetchOrder->passes();
+
+        $query = $this->fetchesOrder->execute(['reference' => $request->route('id'), 'with_packing_lists' => true]);
+
+        return $this->resourceResponse(new OrderV2Resource($query));
+
+    }
+
+}

app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListByPackageIdLogic.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\DeletesPackingList;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanDeletePackingList;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeletePackingListByPackageIdLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Deleted PackingList',
+            'message' => 'You have successfully deleted a PackingList'
+        ];
+    }
+
+
+    /** @var CanDeletePackingList */
+    private $canDeletePackingList;
+
+    /** @var DeletesPackingList */
+    private $deletesPackingList;
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var FetchesPackage */
+    private $fetchesPackage;
+
+    /**
+     * DeletePackingListByPackageIdLogic constructor.
+     * @param CanDeletePackingList $canDeletePackingList
+     * @param DeletesPackingList $deletesPackingList
+     * @param FetchesPackingList $fetchesPackingList
+     * @param FetchesPackage $fetchesPackage
+     */
+    public function __construct(CanDeletePackingList $canDeletePackingList, DeletesPackingList $deletesPackingList, FetchesPackingList $fetchesPackingList, FetchesPackage $fetchesPackage)
+    {
+        $this->canDeletePackingList = $canDeletePackingList;
+        $this->deletesPackingList = $deletesPackingList;
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesPackage = $fetchesPackage;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canDeletePackingList->passes();
+
+        $package = $this->fetchesPackage->execute(['id' => $request->route('id')]);
+
+        $packingList = $package->packingList;
+
+        $packingList = PackingList::where('reference', $packingList->reference)->get();
+
+        $childPackingList = PackingList::where('owner_type', PackingList::class)->whereIn('owner_id', $packingList->pluck('id'))->get();
+
+        $packingList->each->delete();
+
+        $childPackingList->each->delete();
+
+        return $this->response([]);
+    }
+
+}

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

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

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

@@ -48,7 +48,7 @@ class PackingListToPerfexCRMProcessor
                         PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
                     ]
                 );
-                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, UpdatePerfexCRM::class);
+                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, UpdatePerfexCRM::class, null);
             }
         } catch (\Exception $exception){
             Log::error(json_encode('PackingListToPerfexCRMProcessor debug:'));

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

@@ -2,13 +2,7 @@
 
 namespace App\Classes\Modules\PerfexCRM\Processors;
 
-use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Services\Init;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\PerfexCRMMilestones;
 use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
 use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
@@ -21,25 +15,6 @@ use Illuminate\Support\Facades\Log;
 
 class TransactionToPerfexCRMProcessor
 {
-    /** @var FetchesCompany  */
-    private $fetchesCompany;
-
-    /** @var UpdatePerfexCRMProcessor */
-    private $updatePerfexCRMProcessor;
-
-
-    /**
-     * TransactionToPerfexCRMProcessor constructor.
-     * @param UpdatePerfexCRMProcessor $updatePerfexCRMProcessor
-     * @param FetchesCompany $fetchesCompany
-     */
-    public function __construct(UpdatePerfexCRMProcessor $updatePerfexCRMProcessor, FetchesCompany $fetchesCompany)
-    {
-        $this->updatePerfexCRMProcessor = $updatePerfexCRMProcessor;
-        $this->fetchesCompany = $fetchesCompany;
-    }
-
-
     /**
      * @param Transaction $model
      * @param int $status
@@ -84,14 +59,7 @@ class TransactionToPerfexCRMProcessor
                         ]
                 );
 
-                UpdatePerfexCRMPrelude::dispatch(null, $model, $updatePerfexCRMObject, UpdatePerfexCRM::class);
-
-                $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
-                    $contactEmail,
-                    $model,
-                    true
-                );
-                UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject)->delay(6);
+                UpdatePerfexCRMPrelude::dispatch(null, $model, $updatePerfexCRMObject, UpdatePerfexCRM::class, UpdatePerfexCRMInvoice::class);
             }
             else if($model->owner instanceof \App\Models\PackingList && $model->status == ApprovalStatus::PENDING_SUBMISSION && $status == ApprovalStatus::APPROVED)
             {

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

@@ -108,6 +108,7 @@ class UpdatePerfexCRMProcessor
     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
    public function execute(UpdatePerfexCRMObject $updatePerfexCRMObject) {
+        $projectId = "";
 
        // Customer has to exist first before Project can appear under it
        // Check with Perfex CRM, if this user (email) was previously a lead, should automatically now become a customer
@@ -221,7 +222,10 @@ class UpdatePerfexCRMProcessor
                 }
             }
         }
-        return true;
+
+        $payload = [];
+        $payload['projectId'] = $projectId;
+        return (object) $payload;
    }
 
 }

app/Classes/Modules/Transactions/ControllersLogic/DeleteTransactionLogic.php

@@ -0,0 +1,52 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteTransactionLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Delete Transaction',
+            'message' => 'You have successfully deleted the transaction'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+
+    /**
+     * SuspendTransactionLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
+
+        $transaction->delete();
+
+        return $this->response([]);
+    }
+}

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -27,4 +27,9 @@ final class TransactionType {
 
     // public const SHIPPING_COST = 9;
 
+    public const TRANSACTION_TYPE_ID = [
+        self::SHIPPING_INVOICE   => "Shipping Invoice",
+        self::PAYMENT            => "Payment",
+    ];
+
 }

app/Console/Commands/AuditBillplzInvoice.php

@@ -24,7 +24,7 @@ class AuditBillplzInvoice extends Command
      *
      * @var string
      */
-    protected $description = 'Check all unpaid invoice but marked at paid at out system';
+    protected $description = 'Check all unpaid invoice but marked paid at our system';
 
     /**
      * Create a new command instance.

app/Console/Commands/CheckDeletedInvoiceButPaid.php

@@ -0,0 +1,86 @@
+<?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\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Http;
+
+class CheckDeletedInvoiceButPaid extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'check-deleted-paid-invoice';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check all deleted invoice but has completed payment';
+
+    /**
+     * 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() . ' : Start Check all deleted invoice but has completed payment.');
+        $start   = new Carbon();
+
+        $totalAmount = 0;
+
+        $softDeletedTransactions = Transaction::onlyTrashed()->where('type', TransactionType::SHIPPING_INVOICE)->whereHas('transactions', function (Builder $query) {
+            $query->where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY);
+        })->get();
+
+        foreach ($softDeletedTransactions as $invoice) {
+            $invoice_payments = $invoice->transactions()->payments()->get();
+
+            foreach($invoice_payments as $invoice_payment) {
+
+                $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$invoice_payment->payment_reference);
+    
+                if($response->successful()){
+                    $data = $response->json();
+
+                    $orderReference = $invoice->owner->owner->reference ?? null;
+
+                    if($data['paid']){
+                        $this->info('Invoice id: ' . $invoice->id. '. Payment id: ' . $invoice_payment->id . '. Order: ' . $orderReference);
+                    } else {
+                       
+                    }
+                }else{
+                    $this->info("billplz error</br>");
+                }
+            }
+        }
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done Check all deleted invoice but has completed payment. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+    }
+}

app/Console/Commands/FixBillplzFailedCallbackPayment.php

@@ -112,7 +112,7 @@ class FixBillplzFailedCallbackPayment extends Command
 
                     $order = $transaction->owner->owner->owner;
 
-                    if ($invoiceStatus == 'Pending Payment') {
+                    if (in_array($invoiceStatus , ['Pending Payment', 'Payment Completed'])) {
                         // code here
 
                         // $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
@@ -152,9 +152,12 @@ class FixBillplzFailedCallbackPayment extends Command
                                 $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 {
+                            $this->info('Failed to update invoice due to unsufficeint payment ' . $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);
                         }
 
-                        $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) {

app/Console/Commands/ShowBillplzPaymentStatus.php

@@ -0,0 +1,69 @@
+<?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 ShowBillplzPaymentStatus extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz-payment-status {billplz_id}`    ';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Show Billplz payment status';
+
+    /**
+     * 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() . ' : Show Billplz payment status started.');
+        $start   = new Carbon();
+
+        $billplz_id = $this->argument('billplz_id');
+        $billplz_id = explode(",", $billplz_id);
+
+        foreach ($billplz_id as $payment) {
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$payment);
+            if($response->successful()){
+                $data = $response->json();
+                dump($data);
+            }else{
+                $this->info("billplz error</br>");
+            }
+        }
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done Showing Billplz payment status. ElapsedTime: ' . $elapsedTime);
+    }
+}

app/Console/Commands/SuccessUpdatePaymentStatusButFailedCallback.php

@@ -0,0 +1,138 @@
+<?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\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Http;
+
+class SuccessUpdatePaymentStatusButFailedCallback extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix-invoice-status';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Success Updated Payment Status But Inoie stat';
+
+    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)
+        ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+        ->get();
+
+        foreach ($transactions as $payment) {
+            $invoice = $payment->owner ?? null;
+            if (!$invoice) {
+                $this->info('Payment has no owner. Payment ID: ' . $payment->id);
+                continue;
+            }
+
+            $packingList = $invoice->owner ?? null;
+            if (!$packingList) {
+                $this->info('Invoice has no owner. Invoice ID: ' . $invoice->id);
+                continue;
+            }
+
+            $order = $packingList->owner;
+            if (!$invoice) {
+                $this->info('PackingList has no owner. PackingList ID: ' . $packingList->id);
+                continue;
+            }
+            
+            if ($invoice->status == ApprovalStatus::APPROVED) {
+
+                $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);
+                    }
+    
+                    dump('Updated invoice ' . $invoice->id . '. Order: '. $order->reference);
+                } else {
+                    $this->info('Failed Update invoice ' . $invoice->id . ' because payment not enough. Invoice Amount: ' . $invoice->amount . ' . Paid Amount: ' . $totalPaidAmount . ' . Order: '. $order->reference);
+                }
+            } 
+        }
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime );
+    }
+}

app/Console/Commands/debugBillplzFailedPayment.php

@@ -1,77 +0,0 @@
-<?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/Contacts/UpdateContactController.php

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

app/Http/Controllers/Orders/FetchOrderV2Controller.php

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

app/Http/Controllers/PackingLists/DeletePackingListByPackageIdController.php

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

app/Http/Controllers/Transactions/DeleteTransactionController.php

@@ -0,0 +1,21 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Transactions\ControllersLogic\DeleteTransactionLogic;
+
+
+class DeleteTransactionController
+{
+    /**
+     * @param Request $request
+     * @param DeleteTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function delete(Request $request, DeleteTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Kernel.php

@@ -44,6 +44,11 @@ class Kernel extends HttpKernel
             'throttle:300,1',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
+
+        'apipub' => [
+            // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        ],
     ];
 
     /**
@@ -63,6 +68,7 @@ class Kernel extends HttpKernel
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'valid.token' => ValidateToken::class
+        'valid.token' => ValidateToken::class,
+        'token.check' => \App\Http\Middleware\TokenCheckerMiddleware::class,
     ];
 }

app/Http/Middleware/TokenCheckerMiddleware.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Models\PersonalAccessTokens;
+use Closure;
+use Illuminate\Http\Request;
+
+class TokenCheckerMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        //Method 1: Token pass via query parameter
+        // Check if the api_key query parameter is present
+        if (!$request->query('api-key')) {
+            return response()->json(['message' => 'Invalid API key.'], 401);
+        }
+
+        // Check if the api_key is valid
+        $apiKey = $request->query('api-key');
+        $personalAccessToken = PersonalAccessTokens::where('token', $apiKey)->first();
+
+        if (!$personalAccessToken) {
+            return response()->json(['error' => 'Unauthorized'], 401);
+        }
+        return $next($request);
+
+        //Method 2: Token pass via request header
+        /*
+        $authHeader = $request->header('Authorization');
+        if (preg_match('/Bearer\s+(.*)$/i', $authHeader, $matches)) {
+            $token = $matches[1];
+            // validate the token here
+
+            $personalAccessToken = PersonalAccessToken::where('token', $token)->first();
+
+            if (!$personalAccessToken) {
+                return response()->json(['error' => 'Unauthorized'], 401);
+            }
+
+
+            // if the token is valid, you can attach it to the request
+            $request->attributes->add(['bearerToken' => $token]);
+            return $next($request);
+        }
+        return response()->json(['error' => 'Unauthorized'], 401);
+        */
+    }
+}

app/Http/Resources/CompanyModuleResource.php

@@ -49,6 +49,7 @@ class CompanyModuleResource extends JsonResource
             'marking' => $marking,
             'warehouseCharges' => array_key_exists($this->id, $segmentConstant) ? $segmentConstant[$this->id] : null,
             'connections' => $this->connections,
+            'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
         ];
 
     }

app/Http/Resources/OrderV2Resource.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class OrderV2Resource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'reference' => $this->reference,
+            'reference_contract' => (int) $this->type,
+            'type' => (int) $this->type,
+            'status' => (int) $this->status,
+            'company_module' => new CompanyModuleResource($this->companyModule),
+            'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee),
+            'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
+            'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
+            'invoices' => $this->whenLoaded('packingLists', function() {
+                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->get());
+            }),
+            'remarks' => RemarkResource::collection($this->remarks),
+            'created_at' => $this->created_at->format('d-m-Y')
+        ];
+
+    }
+}

app/Models/PersonalAccessTokens.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Models;
+
+class PersonalAccessTokens extends AbstractModel
+{
+    protected $table = 'personal_access_tokens';
+
+}

app/Providers/RouteServiceProvider.php

@@ -43,6 +43,11 @@ class RouteServiceProvider extends ServiceProvider
                 ->namespace($this->namespace)
                 ->group(base_path('routes/api.php'));
 
+            Route::prefix('public/api')
+                ->middleware('apipub')
+                ->namespace($this->namespace)
+                ->group(base_path('routes/apipub.php'));
+
             Route::middleware('web')
                 ->namespace($this->namespace)
                 ->group(base_path('routes/web.php'));

database/migrations/2023_04_06_000001_create_personal_access_tokens_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreatePersonalAccessTokensTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('personal_access_tokens', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            // $table->morphs('tokenable');
+            $table->string('name');
+            $table->string('token', 64)->unique();
+            $table->text('abilities')->nullable();
+            $table->timestamp('last_used_at')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('personal_access_tokens');
+    }
+}

resources/assets/vue/components/addresses/elements/DisplayWarehouseAddressComponent.vue

@@ -0,0 +1,76 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <div class="row">
+               <div class="col-auto">
+                   <div class="row">
+                        <div class="col">
+                            <h6 class="no-margin fs-12 text-black">{{item.street_one}} {{item.street_two}}, {{item.district.name}}, {{item.post_code}} {{item.state.name}}, {{item.country.name}}</h6>
+                        </div>
+                   </div>
+               </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <!-- <div class="col-auto p-r-5">
+                            <i class="fa m-r-10" data-type="defaultAddress" :class="{'fa-star': item.default, 'requestModal': !item.default, 'fa-star-o': !item.default, 'pointer': !item.default, 'text-warning': item.default}" ></i>
+                        </div> -->
+                        <div class="col-auto no-padding p-r-5 p-l-5 pointer">
+                            <i class="fa fa-pencil-square-o text-complete m-r-10" @click="expanded = !expanded"></i>
+                        </div>
+                        <!-- <div class="col-auto p-l-5">
+                            <i class="fa fa-trash-o text-danger requestModal" data-type="deleteAddress"></i>
+                        </div> -->
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-if="expanded">
+                <div class="col">
+                    <warehouse-address-form-component :company_module_id="company_module_id" :data="item" :section="section" @input="updateAddress($event)"></warehouse-address-form-component>
+                </div>
+            </div>
+            <!-- <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteAddress">
+                <delete-address-form-component :data="item" :section="section" class="text-center"></delete-address-form-component>
+            </modal-component>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="defaultAddress">
+                <set-default-address-form-component :data="item" :section="section" class="text-center"></set-default-address-form-component>
+            </modal-component> -->
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            company_module_id: {
+                type: Number,
+                required: true
+            },
+            section: {
+                type: String,
+                required: true
+            }
+
+        },
+        data(){
+            return {
+                expanded: false
+            }
+        },
+        watch: {
+            value: function(value){
+                this.value = value;
+                if(value !== this.item.id){
+                    this.expanded = false;
+                }
+            }
+        },
+        methods: {
+            updateAddress(id){
+                this.expanded = false;
+                this.$emit('input', id);
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>

resources/assets/vue/components/addresses/forms/WarehouseAddressFormComponent.vue

@@ -0,0 +1,230 @@
+<template>
+    <div class="row p-t-25 text-left">
+        <div class="col">
+            <div class="row" v-if="![7,8].includes($store.getters.getCompanyModuleType)">
+                <div class="col">
+                    <!-- <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.reference">
+                                <label>Address Reference/Label</label>
+                                <input class="form-control" name="reference" v-model="parameters.reference">
+                            </validation-wrapper-component>
+                        </div>
+                    </div> -->
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.street_one">
+                                <label>Address Line 1</label>
+                                <input class="form-control" name="street_one" v-model="parameters.street_one">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.street_two">
+                                <label>Address Line 2</label>
+                                <input class="form-control" name="street_two" v-model="parameters.street_two">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                            <validation-wrapper-component selectable :validator="$v.parameters.district_id">
+                                <label>District</label>
+                                <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md pl-md-1">
+                            <validation-wrapper-component :validator="$v.parameters.post_code">
+                                <label>Post Code</label>
+                                <input class="form-control" name="post_code" v-model="parameters.post_code">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <!-- <div class="row">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row m-b-15">
+                                        <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                                            <validation-wrapper-component :validator="$v.parameters.person_in_charge">
+                                                <label>Person In Charge</label>
+                                                <input class="form-control" name="person_in_charge" v-model="parameters.person_in_charge">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-12 col-md pl-md-1">
+                                            <validation-wrapper-component :validator="$v.parameters.phone">
+                                                <label>Phone</label>
+                                                <input class="form-control" name="phone" v-model="parameters.phone">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-15">
+                                        <div class="col">
+                                            <validation-wrapper-component :validator="$v.parameters.remark">
+                                                <label>Delivery Remark</label>
+                                                <input class="form-control" name="remark" v-model="parameters.remark">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div> -->
+                </div>
+            </div>
+            <div class="row" v-if="[7,8].includes($store.getters.getCompanyModuleType)">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.reference">
+                                <label>Company Name</label>
+                                <input class="form-control" name="reference" v-model="parameters.reference">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.person_in_charge">
+                                <label>Name</label>
+                                <input class="form-control" name="person_in_charge" v-model="parameters.person_in_charge">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md pl-md-1">
+                            <validation-wrapper-component :validator="$v.parameters.phone">
+                                <label>Phone</label>
+                                <input class="form-control" name="phone" v-model="parameters.phone">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col-12 col-md-3 pr-md-1 pb-3 pb-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.street_one">
+                                <label>Unit No.</label>
+                                <input class="form-control" name="street_one" v-model="parameters.street_one">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md pl-md-1">
+                            <validation-wrapper-component :validator="$v.parameters.street_two">
+                                <label>Street Address</label>
+                                <input class="form-control" name="street_two" v-model="parameters.street_two">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                            <validation-wrapper-component selectable :validator="$v.parameters.district_id">
+                                <label>City/Town</label>
+                                <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md pl-md-1">
+                            <validation-wrapper-component :validator="$v.parameters.post_code">
+                                <label>Post Code</label>
+                                <input class="form-control" name="post_code" v-model="parameters.post_code">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.remark">
+                                <label>Remark</label>
+                                <input class="form-control" name="remark" v-model="parameters.remark">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="row">
+                        <div class="col"></div>
+                        <div class="col-auto">
+                            <button type="button" class="btn btn-sm btn-complete b-rad-none" @click="submitForm()">{{ this.data ? "Update" : "Save" }} Address</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required, requiredIf, numeric } from "vuelidate/lib/validators";
+    import componentHandler from '../../../general/mixins/componentHandler';
+
+    export default {
+        props: {
+            company_module_id: {
+                type: Number,
+                required: true
+            },
+            type: {
+                type: Number,
+                default: 2
+            },
+            data: {
+                type: Object,
+                default: null
+            },
+            section:{
+                type: String,
+                required: true
+            },
+        },
+        data() {
+			return {
+                parameters : {
+                    company_module_id: this.company_module_id,
+                    street_one: '',
+                    street_two: '',
+                    district_id: '',
+                    post_code: '',
+                    type: this.type,
+                    // reference: null,
+                    // remark: null,
+                    // phone: null,
+                    // person_in_charge: null,
+				}
+
+            }            
+		},
+        created(){
+            if(this.data){
+                this.parameters.reference = this.data.reference;
+                this.parameters.street_one = this.data.street_one;
+                this.parameters.street_two = this.data.street_two;
+                this.parameters.district_id = this.data.district.id;
+                this.parameters.post_code = this.data.post_code;
+                this.parameters.type = this.data.type;
+                this.parameters.phone = this.data.contact ? this.data.contact.phone : '';
+                this.parameters.person_in_charge = this.data.contact ? this.data.contact.reference : '';
+                this.parameters.remark = this.data.remark ? this.data.remark.content : '';
+            }
+        },
+        validations: {
+            parameters: {
+                // reference: {
+                //     required: requiredIf(function(){
+                //         return ![7,8].includes(this.$store.getters.getCompanyModuleType);
+                //     })
+                // },
+                street_one: { required },
+                street_two: {
+                    required: requiredIf(function(){
+                        return [7,8].includes(this.$store.getters.getCompanyModuleType);
+                    })
+                },
+                district_id: { required },
+                post_code: { required },
+                // remark: {},
+                // phone: {required, numeric},
+                // person_in_charge: { required },
+            }
+        },
+        methods:{
+            submitForm(){
+                this.submit(this.data ? (this.route('api.address.update', this.data.id)) : (this.route('api.address.create')), this.data ? 'put' : 'post', this.section, true, true);
+            },
+        },
+    }
+</script>

resources/assets/vue/components/companies/forms/ContactFormComponent.vue

@@ -0,0 +1,89 @@
+<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 Contact</h3>
+                </div>
+            </div>
+            <div class="row m-b-15">
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.parameters.reference">
+                        <label>Reference</label>
+                        <input class="form-control" name="street_one" v-model="parameters.reference">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row m-b-15">
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.parameters.phone">
+                        <label>Phone</label>
+                        <input class="form-control" name="street_one" v-model="parameters.phone">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row m-b-15">
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.parameters.email">
+                        <label>Email</label>
+                        <input class="form-control" name="street_one" v-model="parameters.email">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row m-b-15">
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.parameters.wechat_id">
+                        <label>Wechat ID</label>
+                        <input class="form-control" name="street_one" v-model="parameters.wechat_id">
+                    </validation-wrapper-component>
+                </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 } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            company_module_id: {
+                type: Number,
+                required: true
+            },
+        },
+        data() {
+            return {
+                parameters: {
+                    reference: this.data.reference,
+                    phone: this.data.phone,
+                    email: this.data.email,
+                    wechat_id: this.data.wechat_id,
+                }
+            };
+        },
+        methods: {
+            submitForm() {
+                this.submit(this.route('api.contact.update', this.data.id), 'put', this.section, true, true)
+            },
+        },
+        validations: {
+            parameters: {
+                reference: {  },
+                phone: {  },
+                email: {  },
+                wechat_id: {  },
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>

resources/assets/vue/components/general/elements/BoxLoadingComponent.vue

@@ -0,0 +1,126 @@
+<template>
+    <div class="row align-items-center justify-content-center w-100">
+        <div class="col">
+            <div class='tetrominos'>
+                <div class='tetromino box1'></div>
+                <div class='tetromino box2'></div>
+                <div class='tetromino box3'></div>
+                <div class='tetromino box4'></div>
+            </div>
+        </div>
+    </div>
+</template>
+<style>
+.tetrominos {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-112px, -96px);
+}
+
+.tetromino {
+    width: 96px;
+    height: 112px;
+    position: absolute;
+    transition: all ease 0.3s;
+    background: url('data:image/svg+xml;utf-8,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612 684"%3E%3Cpath fill="%23010101" d="M305.7 0L0 170.9v342.3L305.7 684 612 513.2V170.9L305.7 0z"/%3E%3Cpath fill="%23fff" d="M305.7 80.1l-233.6 131 233.6 131 234.2-131-234.2-131"/%3E%3C/svg%3E') no-repeat top center;
+}
+
+.box1 {
+    animation: tetromino1 1.5s ease-out infinite;
+}
+
+.box2 {
+    animation: tetromino2 1.5s ease-out infinite;
+}
+
+.box3 {
+    animation: tetromino3 1.5s ease-out infinite;
+    z-index: 2;
+}
+
+.box4 {
+    animation: tetromino4 1.5s ease-out infinite;
+}
+
+@keyframes tetromino1 {
+
+    /* compose logo */
+    /* 1 on 3 */
+    /* L-shape */
+    0%,
+    40% {
+        transform: translate(0, 0);
+    }
+
+    50% {
+        /* pre-box */
+        transform: translate(48px, -27px);
+    }
+
+    60%,
+    100% {
+        /* box */
+        /* compose logo */
+        transform: translate(96px, 0);
+    }
+}
+
+@keyframes tetromino2 {
+
+    /* compose logo */
+    /* 1 on 3 */
+    0%,
+    20% {
+        transform: translate(96px, 0px);
+    }
+
+    40%,
+    100% {
+        /* L-shape */
+        /* box */
+        /* compose logo */
+        transform: translate(144px, 27px);
+    }
+}
+
+@keyframes tetromino3 {
+
+    /* compose logo */
+    0% {
+        transform: translate(144px, 27px);
+    }
+
+    20%,
+    60% {
+        /* 1 on 3 */
+        /* L-shape */
+        /* box */
+        transform: translate(96px, 54px);
+    }
+
+    90%,
+    100% {
+        /* compose logo */
+        transform: translate(48px, 27px);
+    }
+}
+
+@keyframes tetromino4 {
+
+    /* compose logo */
+    /* 1 on 3 */
+    /* L-shape */
+    /* box */
+    0%,
+    60% {
+        transform: translate(48px, 27px);
+    }
+
+    90%,
+    100% {
+        /* compose logo */
+        transform: translate(0, 0);
+    }
+}
+</style>

resources/assets/vue/components/general/sections/SupportSectionComponent.vue

@@ -0,0 +1,83 @@
+<template>
+    <div class="row parentContainer" @keyup.enter="search">
+        <div class="col">
+            <div class="row">
+                <div class="col p-r-0">
+                    <div class="row">
+                        <!-- <div class="col">
+                            <div class="form-group no-margin form-group-default b-rad-none">
+                                <label class="text-primary">Customer Marking</label>
+                                <input type="text" class="form-control" v-model="parameters.customerMarking"
+                                    @click="clearAll('customerMarking')" />
+                            </div>
+                        </div>
+                        <div class="col">
+                            <div class="form-group no-margin form-group-default b-rad-none">
+                                <label class="text-primary">Email</label>
+                                <input type="text" class="form-control" v-model="parameters.email"
+                                    @click="clearAll('email')" />
+                            </div>
+                        </div> -->
+                        <div class="col">
+                            <div class="form-group no-margin form-group-default b-rad-none">
+                                <label class="text-primary">Order No</label>
+                                <input type="text" class="form-control" v-model="parameters.orderNo"
+                                    @click="clearAll('orderNo')" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto p-l-0">
+                    <div class="btn btn-primary b-rad-none" @click="search">
+                        <i class="fa fa-search lh-40"></i>
+                    </div>
+                    <div class="btn btn-default b-rad-none lh-40" @click="reset">
+                        Reset
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        section: {
+            default: 'addressList'
+        },
+    },
+    data() {
+        return {
+            isLoading: false,
+            parameters: {
+                customerMarking: null,
+                email: null,
+                orderNo: null,
+            }
+        }
+    },
+    methods: {
+        clearAll(input) {
+            var parameters = this.parameters;
+            $.each(this.parameters, function (key, value) {
+                if (key != input) {
+                    parameters[key] = null;
+                }
+            });
+            this.parameters = parameters;
+        },
+        reset() {
+            this.parameters.customerMarking = null;
+            this.parameters.email = null;
+            this.parameters.orderNo = null;
+        },
+        search() {
+            if (this.parameters.orderNo) {
+                window.location.href = this.route('order.show', this.parameters.orderNo);
+                return;
+            }
+        }
+    },
+}
+</script>

resources/assets/vue/components/orders/elements/ParcelComponent.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="row">
+    <div class="row parentContainer">
         <div class="col">
             <div class="row align-items-center p-t-5 p-b-5">
                 <div class="col-auto p-r-0" v-if="!$store.getters.isAdmin">
@@ -38,6 +38,14 @@
                         <div class="col-auto text-right">
                             <div class="btn btn-xs btn-default" @click="expanded = !expanded"><i class="fa" :class="{'fa-angle-up': expanded, 'fa-angle-down': !expanded}"></i></div>
                         </div>
+                        <div class="col-auto p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
+                            <span class="d-inline-block m-r-15 pointer requestModal bg-white btn-xs" data-type="deleteParcel">
+                                <i class="fa fa-close"></i>
+                            </span>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteParcel">
+                                <delete-parcel-form-component :data="item" :section="section"></delete-parcel-form-component>
+                            </modal-component>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -104,6 +112,12 @@
                 expanded: false
             }
         },
+        props: {
+            section:{
+                type: String,
+                default: null,
+            }
+        },
         mixins: [componentHandler]
     }
 </script>

resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue

@@ -301,7 +301,7 @@
                                                             </div>
                                                             <div class="row">
                                                                 <div class="col">
-                                                                    <parcel-component v-for="parcel in order.parcels.received_packages.flatMap(packing_list => packing_list.packages)" :data="parcel" :key="parcel.id"></parcel-component>
+                                                                    <parcel-component :section="section" v-for="parcel in order.parcels.received_packages.flatMap(packing_list => packing_list.packages)" :data="parcel" :key="parcel.id"></parcel-component>
                                                                 </div>
                                                             </div>
                                                         </div>

resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue

@@ -0,0 +1,203 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" v-if="isLoading"></loading-component>
+            <div class="row flex-wrap"  v-if="!isLoading && order">
+                <div class="col">
+                    <div class="row m-b-30">
+                        <div class="col bg-master-lightest padding-25">
+                            <div class="row align-items-center">
+                                <div class="col-12 col-lg-3">
+                                    <div class="row justify-content-center">
+                                        <div class="col-10">
+                                            <a :href="route('order.qr.download', order.id)" target="_blank">
+                                                <div class="peelable-corner overflow-hidden relative">
+                                                    <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100">
+                                                </div>
+                                            </a>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row m-b-20">
+                                        <div class="col-auto">
+                                            <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
+                                        </div>
+                                        <div class="col d-flex">
+                                            <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo" v-if="$store.getters.isSuperAdmin">Change Order Number</div>
+                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
+                                                <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
+                                            </modal-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col-12">
+                                            <div class="row">
+                                                <div class="col-auto d-flex align-items-center">
+                                                    <h6 class="no-margin"><b>Remark:</b></h6>
+                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" type="orderRemark">
+                                                        <remark-form-component module_type="Order" :data="order" :section="section"></remark-form-component>
+                                                    </modal-component>
+                                                </div>
+                                                <div class="col-auto p-l-0" v-if="order.remarks.length == 0">
+                                                    <div class="btn btn-xs btn-outline-info b-rad-none pointer requestModal" data-type="orderRemark">Add a Remark</div>
+                                                </div>
+                                                <div class="col d-flex align-items-center pl-3 pl-md-0" v-if="order.remarks.length >= 1">
+                                                    <h6 class="no-margin">{{ order.remarks[0].content }}</h6>
+                                                    <span class="btn btn-md btn-default m-l-10 requestModal" data-type="orderRemark">
+                                                        <i class="fa fa-edit"></i>
+                                                    </span>
+                                                    <span class="btn btn-md btn-default m-l-5 requestModal" data-type="deleteOrderRemark">
+                                                        <i class="fa fa-trash"></i>
+                                                    </span>
+                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" type="deleteOrderRemark">
+                                                        <delete-remark-form-component :section="section" :data="order.remarks[0]"></delete-remark-form-component>
+                                                    </modal-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col-12 col-sm-auto">
+                                            <h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
+                                        </div>
+                                        <div class="col-12 col-sm-auto">
+                                            <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.name}} {{$store.getters.isAdmin ? order.warehouse.reference : ''}}</h6>
+                                        </div>
+                                        <div class="col col-sm" v-if="$store.getters.isAdmin">
+                                            <a :href="route('customer.profile', order.company_module.marking)">
+                                                <h6 class="no-margin"><b>Customer Marking:</b> {{order.company_module.marking}}</h6>
+                                            </a>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-10 align-items-center parentContainer" >
+                                        <div class="col-auto">
+                                            <h6 class="no-margin">
+                                                <div class="row">
+                                                    <div class="col-12 col-sm-auto pr-sm-0"><b>Delivery Address:</b>&nbsp;</div>
+                                                    <div class="col-12 col-sm-auto pl-sm-0">{{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i></div>
+                                                </div>
+                                            </h6>
+                                        </div>
+                                        <div class="col">
+                                            <div class="row" v-if="!order.address_change_request">
+                                                <div class="col">
+                                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal m-t-10 mt-sm-0" data-type="updateDeliveryAddress">Change Delivery Address</div>
+                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="updateDeliveryAddress" size="large">
+                                                        <change-order-address-form-component :data="order" :section="section" class="text-center"></change-order-address-form-component>
+                                                    </modal-component>
+                                                </div>
+                                            </div>
+                                            <div class="row parentContainer" v-if="order.address_change_request">
+                                                <div class="col-auto p-r-0">
+                                                    <div class="p-t-10 p-b-10 p-l-15 p-r-15 b-a b-danger fs-10 text-danger requestModal"  data-type="updateDeliveryAddress"><i class="fa fa-exclamation-circle m-r-10"></i>Your Delivery address change request is being reviewed</div>
+                                                </div>
+                                                <div class="col-auto bg-danger-light pointer requestModal" data-type="cancelAddressChangeRequest">
+                                                    <i class="fa fa-times text-white lh-38"></i>
+                                                </div>
+                                                <modal-component small type="cancelAddressChangeRequest">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row">
+                                                                <div class="col text-center">
+                                                                    <div class="row m-b-20">
+                                                                        <div class="col">
+                                                                            <h5 class="all-caps">Cancel Address Change Request</h5>
+                                                                            <div class="fs-11">Are you sure you want to cancel your order delivery address change request?</div>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="row">
+                                                                        <div class="col p-r-5">
+                                                                            <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                        </div>
+                                                                        <div class="col p-l-5">
+                                                                            <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.order.address.status.update', order.address_change_request.id, 6), 'put', section, true, true)">Confirm</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </modal-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-center">
+                                        <div class="col-10">
+                                            <h6 class="text-info"><span class="text-danger bold">Gentle reminder:</span> You need to send the QR code to your supplier to print and stick on your packages, this QR code is required for us to identify your packages when they arrives at our warehouse!</h6>
+                                            <a :href="route('order.qr.download', order.id)" target="_blank">
+                                                <button class="btn btn-sm btn-success bg-master b-rad-none all-caps">Download QR Code Pdf</button>
+                                            </a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="row m-b-30" v-if="order.invoices.length">
+                        <div class="col">
+                            <div class="row m-b-20">
+                                <div class="col">
+                                    <h4 class="bold">Invoices</h4>
+                                    <p>You can view your invoices here and make payment.</p>
+                                </div>
+                            </div>
+                            <div class="row bg-master-lightest p-t-15" v-for="invoice in order.invoices">
+                                <div class="col">
+                                    <customer-payments-billing-component :data="invoice" invoice_status="Pending Payment" :section="section"></customer-payments-billing-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <order-package-v2-section-component v-if="!isLoading" :order_number="order_number"></order-package-v2-section-component>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        props: {
+            order_number: {
+                type: Number,
+                required: true,
+            }
+        },
+        data(){
+            return {
+                section: 'orderProfileV2Section',
+                isLoading: true,
+                order: null,
+                addComment: false,
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchCompany();
+                }
+            }
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            fetchCompany(){
+                this.isLoading = true;
+                this.submit(route('api.order.v2.show', this.order_number), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+                this.isLoading = false;
+                this.order = response.payload.data;
+            }
+        }
+    }
+</script>

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

@@ -63,6 +63,14 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="col-auto p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
+                            <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="deleteInvoice">
+                                <i class="fa fa-close"></i>
+                            </span>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteInvoice">
+                                <delete-invoice-form-component :data="item" :section="section"></delete-invoice-form-component>
+                            </modal-component>
+                        </div>
                         <div class="col-auto hide">
                             <div class="btn btn-sm all-caps b-rad-none btn-block" :class="{'btn-success': !expanded, 'btn-default': expanded}" @click="expanded = !expanded">
                                 {{ expanded ? 'Cancel' : 'Make Payment' }}</div>

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

@@ -0,0 +1,31 @@
+<template>
+    <div class="row" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row">
+                <div class="col text-center">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h5 class="all-caps">Delete Invoice</h5>
+                            <div class="fs-11">Are you sure you want to delete this invoice?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-danger w-100 btn-sm" @click="submit(route('api.transaction.delete', data.id), 'delete', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [modalFormHandler]
+    }
+
+</script>

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

@@ -0,0 +1,31 @@
+<template>
+    <div class="row" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row">
+                <div class="col text-center">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h5 class="all-caps">Delete Parcel</h5>
+                            <div class="fs-11">Are you sure you want to delete this Parcel?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-danger w-100 btn-sm" @click="submit(route('api.packing_list.delete.by_package_id', data.id), 'delete', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [modalFormHandler]
+    }
+
+</script>

resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue

@@ -1,9 +1,9 @@
 <template>
-    <div class="row m-b-15 parentContainer">
+    <div class="row m-b-15 parentContainer bg-white padding-10 rounded m-b-10">
         <div class="col">
             <div class="row align-items-center">
                 <div class="col-auto p-r-0">
-                    <div class="padding-5 bg-master-lightest">
+                    <div class="padding-5 bg-master-lightest rounded">
                         <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#333333"><path d="M15.05,25.8v105.35h4.3v2.15c0,3.53669 2.91331,6.45 6.45,6.45h50.5376c1.67444,3.75213 5.30105,6.45 9.6624,6.45c4.36203,0 7.98734,-2.69797 9.6624,-6.45h50.5376c3.53669,0 6.45,-2.91331 6.45,-6.45v-2.15h4.3v-105.35h-64.5c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643zM19.35,30.1h60.2c2.40083,0 4.3,1.89917 4.3,4.3c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-2.40083 1.89917,-4.3 4.3,-4.3h60.2v96.75h-60.2c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643h-60.2zM86,40.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,49.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,53.57363v4.12783c-8.0754,0.7482 -12.97979,5.32437 -12.97979,12.23232c0,5.8351 3.64818,9.8429 10.31748,11.54785l2.66231,0.68867v13.63906c-4.45695,-0.50955 -7.33113,-2.99253 -7.62998,-6.55078h-6.33662c0.0301,6.9402 5.41175,11.63533 13.9666,12.20293v3.88428h4.09844v-3.91367c8.7634,-0.7482 13.81963,-5.32289 13.81963,-12.65224c0,-6.192 -3.53195,-9.99125 -11.03975,-11.8166l-2.77988,-0.62568v-12.8958c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.24844c-0.1806,-6.67145 -5.26273,-11.39315 -13.00918,-12.08115v-4.12783zM86,58.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,63.4124v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM86,66.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,75.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.78037,82.94717c5.08475,1.01695 7.44521,3.07924 7.44521,6.52139c0,3.79905 -2.71951,6.12871 -7.44521,6.39961zM86,83.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,92.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,101.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,109.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,118.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM23.65,131.15h55.9c2.40083,0 4.3,1.89917 4.3,4.3h4.3c0,-2.40083 1.89917,-4.3 4.3,-4.3h55.9v2.15c0,1.21481 -0.93519,2.15 -2.15,2.15h-53.56523l-0.41992,1.6083c-0.72235,2.78276 -3.19533,4.8417 -6.21484,4.8417c-3.01952,0 -5.49455,-2.05645 -6.21484,-4.8375l-0.41992,-1.6125h-53.56523c-1.21481,0 -2.15,-0.93519 -2.15,-2.15z"></path></g></g></svg>
                     </div>
                 </div>
@@ -68,6 +68,95 @@
                     </div>
                 </div>
             </div>
+            <div class="row m-t-10">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-0 invisible">
+                            <div class="padding-5 bg-master-lightest">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#333333"><path d="M15.05,25.8v105.35h4.3v2.15c0,3.53669 2.91331,6.45 6.45,6.45h50.5376c1.67444,3.75213 5.30105,6.45 9.6624,6.45c4.36203,0 7.98734,-2.69797 9.6624,-6.45h50.5376c3.53669,0 6.45,-2.91331 6.45,-6.45v-2.15h4.3v-105.35h-64.5c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643zM19.35,30.1h60.2c2.40083,0 4.3,1.89917 4.3,4.3c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-2.40083 1.89917,-4.3 4.3,-4.3h60.2v96.75h-60.2c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643h-60.2zM86,40.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,49.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,53.57363v4.12783c-8.0754,0.7482 -12.97979,5.32437 -12.97979,12.23232c0,5.8351 3.64818,9.8429 10.31748,11.54785l2.66231,0.68867v13.63906c-4.45695,-0.50955 -7.33113,-2.99253 -7.62998,-6.55078h-6.33662c0.0301,6.9402 5.41175,11.63533 13.9666,12.20293v3.88428h4.09844v-3.91367c8.7634,-0.7482 13.81963,-5.32289 13.81963,-12.65224c0,-6.192 -3.53195,-9.99125 -11.03975,-11.8166l-2.77988,-0.62568v-12.8958c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.24844c-0.1806,-6.67145 -5.26273,-11.39315 -13.00918,-12.08115v-4.12783zM86,58.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,63.4124v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM86,66.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,75.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.78037,82.94717c5.08475,1.01695 7.44521,3.07924 7.44521,6.52139c0,3.79905 -2.71951,6.12871 -7.44521,6.39961zM86,83.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,92.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,101.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,109.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,118.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM23.65,131.15h55.9c2.40083,0 4.3,1.89917 4.3,4.3h4.3c0,-2.40083 1.89917,-4.3 4.3,-4.3h55.9v2.15c0,1.21481 -0.93519,2.15 -2.15,2.15h-53.56523l-0.41992,1.6083c-0.72235,2.78276 -3.19533,4.8417 -6.21484,4.8417c-3.01952,0 -5.49455,-2.05645 -6.21484,-4.8375l-0.41992,-1.6125h-53.56523c-1.21481,0 -2.15,-0.93519 -2.15,-2.15z"></path></g></g></svg>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <div class="row">
+                                <div class="col-auto p-r-10">
+                                    <div class="font-heading all-caps fs-8 muted">Address</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <display-warehouse-address-component :data="data.address" :company_module_id="data.id" :section="section"></display-warehouse-address-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row m-t-10">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-0 invisible">
+                            <div class="padding-5 bg-master-lightest">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#333333"><path d="M15.05,25.8v105.35h4.3v2.15c0,3.53669 2.91331,6.45 6.45,6.45h50.5376c1.67444,3.75213 5.30105,6.45 9.6624,6.45c4.36203,0 7.98734,-2.69797 9.6624,-6.45h50.5376c3.53669,0 6.45,-2.91331 6.45,-6.45v-2.15h4.3v-105.35h-64.5c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643zM19.35,30.1h60.2c2.40083,0 4.3,1.89917 4.3,4.3c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-2.40083 1.89917,-4.3 4.3,-4.3h60.2v96.75h-60.2c-2.60352,0 -4.86855,1.23893 -6.45,3.08643c-1.58145,-1.8475 -3.84648,-3.08643 -6.45,-3.08643h-60.2zM86,40.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,49.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,53.57363v4.12783c-8.0754,0.7482 -12.97979,5.32437 -12.97979,12.23232c0,5.8351 3.64818,9.8429 10.31748,11.54785l2.66231,0.68867v13.63906c-4.45695,-0.50955 -7.33113,-2.99253 -7.62998,-6.55078h-6.33662c0.0301,6.9402 5.41175,11.63533 13.9666,12.20293v3.88428h4.09844v-3.91367c8.7634,-0.7482 13.81963,-5.32289 13.81963,-12.65224c0,-6.192 -3.53195,-9.99125 -11.03975,-11.8166l-2.77988,-0.62568v-12.8958c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.24844c-0.1806,-6.67145 -5.26273,-11.39315 -13.00918,-12.08115v-4.12783zM86,58.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM119.68193,63.4124v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM86,66.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,75.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.78037,82.94717c5.08475,1.01695 7.44521,3.07924 7.44521,6.52139c0,3.79905 -2.71951,6.12871 -7.44521,6.39961zM86,83.85c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,92.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,101.05c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,109.65c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86,118.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM23.65,131.15h55.9c2.40083,0 4.3,1.89917 4.3,4.3h4.3c0,-2.40083 1.89917,-4.3 4.3,-4.3h55.9v2.15c0,1.21481 -0.93519,2.15 -2.15,2.15h-53.56523l-0.41992,1.6083c-0.72235,2.78276 -3.19533,4.8417 -6.21484,4.8417c-3.01952,0 -5.49455,-2.05645 -6.21484,-4.8375l-0.41992,-1.6125h-53.56523c-1.21481,0 -2.15,-0.93519 -2.15,-2.15z"></path></g></g></svg>
+                            </div>
+                        </div>
+                        <div class="col-auto">
+                            <div class="row">
+                                <div class="col-auto p-r-10">
+                                    <div class="font-heading all-caps fs-8 muted">Reference</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    {{ data.contact.reference ? data.contact.reference : "-" }}
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto">
+                            <div class="row">
+                                <div class="col-auto p-r-10">
+                                    <div class="font-heading all-caps fs-8 muted">Phone</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    {{ data.contact.phone ? data.contact.phone : '-' }}
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto">
+                            <div class="row">
+                                <div class="col-auto p-r-10">
+                                    <div class="font-heading all-caps fs-8 muted">Email</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    {{ data.contact.email ? data.contact.email : '-' }}
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto">
+                            <div class="row">
+                                <div class="col-auto p-r-10">
+                                    <div class="font-heading all-caps fs-8 muted">Wechat ID</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    {{ data.contact.wechat_id ? data.contact.wechat_id : '-' }}
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col"></div>
+                        <div class="col-auto">
+                            <div class="btn btn-xs btn-default pointer m-t-10 b-primary b-a text-primary requestModal" data-type="warehouseContact">Edit Contact</div>
+                        </div>
+                        <modal-component class="animate__animated animate__fast animate__fadeIn" type="warehouseContact" styleType="fill-in">
+                            <contact-form-component :section="section" :data="data.contact" :company_module_id="data.id"></contact-form-component>
+                        </modal-component>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
@@ -79,10 +168,10 @@
         props: {
             data: {
                 type: Object,
-                required: false
-            },
-            section: {
-                default: 'warhouseListSection'
+                required: false,
+                parameters: {
+                    
+                }
             },
         },
         mixins: [modalFormHandler]

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

@@ -1,7 +1,34 @@
 <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 }">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col p-r-0">
+                                    <div class="form-group no-margin form-group-default b-rad-none">
+                                        <label class="text-primary">Email Like</label>
+                                        <input type="text" class="form-control" v-model="email" @keyup.enter="search"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto p-l-0 p-r-0">
+                            <div class="btn btn-primary b-rad-none" @click="search">
+                                <i class="fa fa-search lh-40"></i>
+                            </div>
+                        </div>
+                        <div class="col-auto p-l-0">
+                            <div class="btn btn-secondary b-rad-none" @click="reset">
+                                <i class="fa fa-remove lh-40"></i>
+                            </div>
+                        </div>
+                        <div class="col"></div>
+                    </div>
+                </div>
+            </div>
+            <list-component :key="currentKey" :section="section" :endpoint="route('api.account.user.list')" :options="options">
                 <template slot="list" slot-scope="{data}">
                     <user-component :data="data"></user-component>
                 </template>
@@ -11,29 +38,35 @@
 </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];
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            section: {
+                type: String,
+                required: true
             }
         },
-    },
-    mixins: [componentHandler]
-}
+        data() {
+            return {
+                expanded: false,
+                currentKey: 1,
+                email: '',
+                options: {
+                    'type_in': this.$store.getters.isSuperAdmin ? [1, 2] : [2],
+                }
+            }
+        },
+        methods: {
+            search() {
+                this.options['email_like'] = this.email;
+                this.currentKey+=1;
+            },
+            reset() {
+                this.email = '';
+                delete(this.options['email_like']);
+                this.currentKey+=1;
+            },
+        },
+        mixins: [componentHandler]
+    }
 </script>

resources/views/pages/orders/profile_v2.blade.php

@@ -0,0 +1,4 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <order-profile-v2-section-component :order_number={{$id}}></order-profile-v2-section-component>
+@endsection

resources/views/pages/support.blade.php

@@ -0,0 +1,89 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row h-100" v-if="$store.getters.isAdmin">
+        <div class="col bg-white p-t-15 p-b-15">
+            <div class="row no-margin">
+                <div class="col-12">
+                    <form method="post">
+                        @csrf
+                        <div class="row">
+                            <div class="col">
+                                <div class="form-group no-margin form-group-default b-rad-none" onclick="clearOtherFields('marking')">
+                                    <label class="text-primary">Customer Marking</label>
+                                    <input class="form-control marking" type="text" name="marking" placeholder="" value="{{$marking}}">
+                                </div>
+                            </div>
+                            <!-- <div class="col">
+                                <div class="form-group no-margin form-group-default b-rad-none">
+                                    <label class="text-primary">Email</label>
+                                    <input class="form-control" type="text" name="email" placeholder="" value="{{$email}}">
+                                </div>
+                            </div> -->
+                            <div class="col">
+                                <div class="form-group no-margin form-group-default b-rad-none" onclick="clearOtherFields('orderNo')">
+                                    <label class="text-primary">Order No</label>
+                                    <input class="form-control orderNo" type="text" name="orderNo" placeholder="" value="{{$orderNo}}">
+                                </div>
+                            </div>
+                            <div class="col-auto">
+                                <button class="btn btn-primary lh-40" type="submit">Search</button>
+                            </div>
+                            <div class="col-auto">
+                                <a href="{{route('support')}}" class="btn btn-default lh-40" type="submit">Reset</a>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+
+            @if ($orderNoNotFound || $markingNotFound)
+                <div class="h-100 row align-items-center justify-content-center p-t-50 p-b-50">
+                    <div class="col-10">
+                        <div class="row align-items-center justify-content-center  hint-text">
+                            <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                        </div>
+                        <div class="row text-center">
+                            <div class="col">
+                                <div class="row m-t-20">
+                                    <div class="col">
+                                        <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Result Not Found</p>
+                                    </div>
+                                </div>
+                                <div class="row m-t-5 align-items-center justify-content-center hide">
+                                    <div class="col">
+                                        <small class="fs-9 muted all-caps font-lato" style="letter-spacing: 2px">There is no results found, Try adjusting your filters to find what you are looking for.</small>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @endif
+
+            @if($markingReturn && !$markingNotFound)
+                <div class="row m-t-20">
+                    <div class="col m-l-30">
+                        <user-company-component class="m-l-5" :data="{{$markingReturn}}"></user-company-component>
+                    </div>
+                </div>
+            @endif
+
+            <div class="row m-t-20">
+                <div class="col m-l-30">
+                    <search-customer-by-email-component></search-customer-by-email-component>
+                </div>
+            </div>
+        </div>
+    </div>             
+@endsection
+<script>
+    function clearOtherFields(fieldName) {
+        var allFieldNameArray = ['marking', 'orderNo'];
+
+        allFieldNameArray.forEach(function(value, key) {
+            if (value != fieldName) {
+                $('.' + value).val('');
+            }
+        });
+    }
+</script>     

routes/api.php

@@ -62,6 +62,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         require __DIR__ . '/report.php';
 
+        require __DIR__ . '/contact.php';
+
     });
 
     require __DIR__ . '/announcement.php';

routes/apipub.php

@@ -0,0 +1,9 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['middleware' => 'apipub', 'prefix' => 'v1', 'as' => 'apipub.'], function () {
+    Route::group(['middleware' => 'token.check'], function () {
+        Route::get('/list', 'Transactions\ListTransactionsController@list')->name('list');
+    });
+});

routes/contact.php

@@ -0,0 +1,11 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+
+Route::group(['prefix' => 'contact', 'as' => 'contact.', 'namespace' => 'Contacts'], function () {
+
+    Route::put('/{id}/update', 'UpdateContactController@update')->name('update');
+
+});
+

routes/order.php

@@ -4,6 +4,7 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], function () {
     Route::get('/show/{id}', 'FetchOrderController@fetch')->name('show');
+    Route::get('/v2/show/{id}', 'FetchOrderV2Controller@fetch')->name('v2.show');
     Route::get('/list', 'ListOrdersController@list')->name('list');
     Route::post('/create', 'CreateOrderController@create')->name('create');
     Route::put('/confirm/{id}', 'ConfirmOrderController@confirm')->name('confirm');

routes/packing_list.php

@@ -11,6 +11,7 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
     Route::put('/update/{id}', 'UpdatePackingListController@update')->name('update');
     Route::put('/status/{id}/update/{status}', 'UpdatePackingListStatusController@update')->name('status.update');
     Route::delete('/delete/{id}', 'DeletePackingListController@delete')->name('delete');
+    Route::delete('/delete-by-package-id/{id}', 'DeletePackingListByPackageIdController@delete')->name('delete.by_package_id');
 
     Route::put('/reschedule/{id}', 'ReschedulePackingListController@reschedule')->name('reschedule');
     Route::put('/update-dispatch-date/{id}', 'UpdateDispatchDatePackingListController@update')->name('update_dispatch_date');

routes/transaction.php

@@ -6,6 +6,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
 
     Route::get('/list', 'ListTransactionsController@list')->name('list');
     Route::delete('/suspend/{id}', 'SuspendTransactionController@suspend')->name('suspend');
+    Route::delete('/delete/{id}', 'DeleteTransactionController@delete')->name('delete');
     Route::put('{id}/status/update/{status}', 'UpdateTransactionStatusController@update')->where('status', 'approve|expire|reject')->name('update');
 
     Route::group(['prefix' => 'payment', 'as' => 'payment.'], function () {

routes/web.php

@@ -30,6 +30,7 @@ use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Http\Resources\CompanyResource;
 use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
 use App\Models\Document;
@@ -138,14 +139,70 @@ Route::get('/orders', function () {
     return view('pages.orders.index');
 })->name('orders');
 
+Route::get('/support', function () {
+    return view('pages.support', [
+        'email'                 => null,
+        'orderNo'               => null,
+        'orderNoNotFound'       => null,
+        'marking'               => null,
+        'markingReturn'         => null,
+        'markingNotFound'       => null,
+    ]);
+})->name('support');
+
+Route::post('/support', function (Request $request) {
+
+    $orderNoNotFound = false;
+    $orderNo         = $request->input('orderNo');
+
+    $marking         = $request->input('marking');
+    $markingReturn   = null;
+    $markingNotFound = false;
+
+    if ($orderNo) {
+        if (Order::where('reference', $orderNo)->count()) {
+            return redirect(route('order.show', $orderNo));
+        } else {
+            $orderNoNotFound = true;
+        }
+    }
+
+    if ($marking) {
+        $orderNo = null;
+        $markingReturn = CompanyConnection::where('invitee_reference', $marking)->get();
+        if (count($markingReturn)) {
+            $markingReturn = $markingReturn->first();
+            $markingReturn = $markingReturn->invitee;
+            $markingReturn->reference = $marking;
+            $markingReturn = $markingReturn->toJson();
+        } else {
+            $markingNotFound = true;
+        }
+    }
+
+    return view('pages.support', [
+        'email'                 => null,
+        'orderNo'               => $orderNo,
+        'orderNoNotFound'       => $orderNoNotFound,
+        'marking'               => $marking,
+        'markingReturn'         => $markingReturn,
+        'markingNotFound'       => $markingNotFound,
+    ]);
+})->name('support');
+
 Route::get('/orders-table', function () {
     return view('pages.orders.table');
 })->name('ordersTable');
 
 Route::get('/order/show/{order_number}', function ($orderNumber) {
-    return view('pages.orders.profile', ['id' => $orderNumber]);
+    // return view('pages.orders.profile', ['id' => $orderNumber]);
+    return view('pages.orders.profile_v2', ['id' => $orderNumber]);
 })->name('order.show');
 
+Route::get('/order/v2/show/{order_number}', function ($orderNumber) {
+    return view('pages.orders.profile_v2', ['id' => $orderNumber]);
+})->name('order.v2.show');
+
 Route::get('/address', function () {
     return view('pages.addresses.index');
 })->name('address');
@@ -375,9 +432,21 @@ Route::get('/settings', function () {
 Route::get('/customer/{company_module_id}/summary', 'Exports\ExportCompanyModuleSummaryController@export')->name('customer.summary.export');
 Route::get('/export-customer-order/{marking}', 'Exports\ExportCompanyModuleSummaryController@exportorderSummaryByMarking')->name('customer.orderSummary.export');
 
-Route::get('/customer/summary/monthly', function () {
+Route::get('/customer/summary/{year}/monthly', function ($year) {
+    if (!in_array($year, [2022, 2023])) {
+        return 'Year Error!';
+    }
+
     // $containers = Container::whereMonth('loading_date', '>=', ((float)Carbon::now()->format('m') - 2))->whereYear('loading_date', (float)Carbon::now()->format('Y'))->get();
-    $containers = Container::whereMonth('loading_date', '>=', 9)->whereYear('loading_date', 2022)->get();
+
+    if ($year == 2022) {
+        $containers = Container::whereMonth('loading_date', '>=', 9)->whereYear('loading_date', 2022)->get();
+    }
+
+    if ($year == 2023) {
+        $containers = Container::whereMonth('loading_date', '>=', 1)->whereYear('loading_date', 2023)->get();
+    }
+
     $marking = '769SMC';
     $connection = CompanyConnection::where('invitee_reference', $marking)->first();
     $companyModuleId = $connection->invitee->id;
@@ -802,7 +871,7 @@ 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::EXPIRED)
+        ->whereNotIn('status', [ApprovalStatus::EXPIRED, ApprovalStatus::SUSPENDED])
         ->where('deleted_at', null)
         ->select('owner_id', DB::raw('count(*) as count'))
         ->groupBy('owner_id')
@@ -831,9 +900,18 @@ Route::get('/invoices/show-duplicated', function(Request $request){
 
     foreach($duplicatedInvoice as $invoice) {
         $order = $invoice->owner->owner;
+
+        $billplzPaymentId = '';
+
+        if ($invoice->status == ApprovalStatus::COMPLETED) {
+            if ($invoice->transactions->first()->type == TransactionType::PAYMENT) {
+                $billplzPaymentId = $invoice->transactions->first()->payment_reference ;
+            }
+        }
+
         echo "<tr>";
         echo '<td style="border:1px solid"><a target="_blank" href="'.route('order.show', $order->reference).'">'. $order->reference.' - </a>' . $order->created_at . '</td>';
-        echo "<td style='border:1px solid'>".ApprovalStatus::APPROVAL_STATUS_ID[$invoice->status]."</td>";
+        echo "<td style='border:1px solid'>".ApprovalStatus::APPROVAL_STATUS_ID[$invoice->status]. ' Billplz reference: ' . $billplzPaymentId . "</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>";
@@ -956,32 +1034,54 @@ 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);
+Route::get('/final-duplicated-invoice-debug', function(){
+    $duplicatedTransactions = Transaction::select(DB::raw('owner_type, owner_id, receiver, type, GROUP_CONCAT(id) as transaction_ids, COUNT(*) as count'))
+    ->whereNotIn('status', [ApprovalStatus::REJECTED,ApprovalStatus::SUSPENDED,ApprovalStatus::EXPIRED])
+    ->groupBy('owner_type', 'owner_id', 'receiver', 'type')
+    ->having('count', '>', 1)
+    ->get();
 
-        if($response->successful()){
-            $data = $response->json();
-            if($data['paid']){
+    $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
 
-            } else {
+    $transactionType = TransactionType::TRANSACTION_TYPE_ID;
 
-                $transaction->status = ApprovalStatus::REJECTED;
-                $transaction->save();
+    echo '<table style="width: 100%; text-align: center; border: 1px solid black">
+    <tr>
+      <!-- <th style="border: 1px solid black" >Owner Type</th> -->
+      <!-- <th style="border: 1px solid black" >Owner Id</th> -->
+      <!--<th style="border: 1px solid black" >Reveiver</th>-->
+      <th style="border: 1px solid black" >Order</th>
+      <th style="border: 1px solid black" >Transaction type</th>
+      <th style="border: 1px solid black" >Count</th>
+      <th style="border: 1px solid black" >Invoice Ids</th>
+      <th style="border: 1px solid black" >Invoices</th>
+    </tr>';
 
-                $invoice = $transaction->owner;
-                $invoice->status = ApprovalStatus::APPROVED;
+foreach ($duplicatedTransactions as $transaction) {
+    $transactionIds = explode(',', $transaction->transaction_ids);
 
-                $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>";
-        }
+    $duplicatedInvoice = Transaction::whereIn('id', $transactionIds)->get(); 
+ 
+    $order_reference = $duplicatedInvoice->first()->owner->owner->reference ?? null; 
+
+    if ($transaction->type == TransactionType::PAYMENT) {
+        $order_reference = $duplicatedInvoice->first()->owner->owner->owner->reference ?? null; 
     }
 
-    echo 'Total: ' . $totalAmount;
+    echo '<tr>';
+        // echo '<td style="border: 1px solid black">' . $transaction->owner_type . '</td>';
+        // echo '<td style="border: 1px solid black">' . $transaction->owner_id . '</td>';
+        echo '<td style="border: 1px solid black">' . $transaction->receiver . '</td>';
+        echo '<td style="border: 1px solid black">' . '<a target="_blank" href="'.route('order.show', $order_reference).'">'. $order_reference .'</a>' . '</td>';
+        echo '<td style="border: 1px solid black">' . $transactionType[$transaction->type] . '</td>';
+        echo '<td style="border: 1px solid black">' . count($transactionIds) . '</td>';
+        echo '<td style="border: 1px solid black; text-align: left">';
+        foreach ($duplicatedInvoice as $invoice) {
+            echo '<p>ID: ' . $invoice->id . '. Status: ' . $approvalStatusArray[$invoice->status] . '. Amount: ' . $invoice->amount . '</p>';
+        }
+        echo'</td>';
+    echo '</tr>';
+}
+echo '</table>';
 });
+