From cd80950d65bb5552d921a1c0e44be6611d89dbe6 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Sat, 23 Sep 2023 11:56:21 +0800
Subject: [PATCH 01/40] expired booking

---
 .../Commands/ExpiredBookingCommand.php        | 95 +++++++++++++++++++
 app/Console/Kernel.php                        |  4 +
 2 files changed, 99 insertions(+)
 create mode 100644 app/Console/Commands/ExpiredBookingCommand.php

diff --git a/app/Console/Commands/ExpiredBookingCommand.php b/app/Console/Commands/ExpiredBookingCommand.php
new file mode 100644
index 00000000..2598b380
--- /dev/null
+++ b/app/Console/Commands/ExpiredBookingCommand.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Booking;
+use Illuminate\Console\Command;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
+
+class ExpiredBookingCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'booking:expired';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Expiring booking that do not have further action by user';
+
+    /** @var UpdatesBookingStatus */
+    private $updatesBookingStatus;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(UpdatesBookingStatus $updatesBookingStatus)
+    {
+        parent::__construct();
+        $this->updatesBookingStatus = $updatesBookingStatus;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        // Cancel booking without payment & purchase order (1 month)
+        $bookings = Booking::where('status', ApprovalStatus::APPROVED)
+            ->where('created_at', '<', now()->subDays(30)->endOfDay())
+            ->where(function ($query) {
+                $query->whereDoesntHave('transactions')
+                    ->orWhereDoesntHave('transactions', function($transaction) {
+                        return $transaction->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                    });
+        })->get();
+
+        foreach ($bookings as $booking) {
+            $this->updatesBookingStatus->execute($booking, ApprovalStatus::EXPIRED);
+            Log::info("Expired Booking without payment & purchase order, booking id: " . $booking->id);
+            $transactions = $booking->transactions;
+
+            foreach ($transactions as $transaction) {
+                $transaction->status = ApprovalStatus::EXPIRED;
+                $transaction->save();
+                Log::info("Expired Transaction id: {$transaction->id} from Booking id: {$booking->id}");
+            }
+        }
+
+        // Cancel booking without payment but with purchase order (2 month)
+        $bookings = Booking::where('status', ApprovalStatus::APPROVED)
+            ->where('created_at', '<', now()->subDays(60)->endOfDay())
+            ->where(function ($query) {
+                $query->whereDoesntHave('transactions', function($transaction) {
+                        return $transaction->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                    })->whereHas('transactions', function($transaction) {
+                        return $transaction->where('type', TransactionType::PURCHASE_ORDER);
+                    });
+        })->get();
+
+        foreach ($bookings as $booking) {
+            $this->updatesBookingStatus->execute($booking, ApprovalStatus::EXPIRED);
+            Log::info("Expired Booking without payment but with purchase order, booking id: " . $booking->id);
+            $transactions = $booking->transactions;
+
+            foreach ($transactions as $transaction) {
+                $transaction->status = ApprovalStatus::EXPIRED;
+                $transaction->save();
+                Log::info("Expired Transaction id: {$transaction->id} from Booking id: {$booking->id}");
+            }
+        }
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index cb9cf060..0355aea1 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -43,6 +43,10 @@ class Kernel extends ConsoleKernel
             ->everyMinute()
             ->appendOutputTo(storage_path().'/logs/regenerateInvoice.log')
             ->withoutOverlapping();
+
+        $schedule->command('booking:expired')
+        ->dailyAt('02:00')
+        ->withoutOverlapping();
     }
 
     /**

From 32602cab31318eb8813696fdd238a17181cfd38b Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Sat, 23 Sep 2023 13:00:04 +0800
Subject: [PATCH 02/40] auto fill purchase order command

---
 .../Commands/AutoFillPurchaseOrderCommand.php | 112 ++++++++++++++++++
 .../Commands/ExpiredBookingCommand.php        |   4 +-
 2 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 app/Console/Commands/AutoFillPurchaseOrderCommand.php

diff --git a/app/Console/Commands/AutoFillPurchaseOrderCommand.php b/app/Console/Commands/AutoFillPurchaseOrderCommand.php
new file mode 100644
index 00000000..059232d2
--- /dev/null
+++ b/app/Console/Commands/AutoFillPurchaseOrderCommand.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Booking;
+use Illuminate\Console\Command;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Transactions\Processors\CreatePurchaseOrderTransactionProcessor;
+use App\Classes\Modules\Transactions\Services\GeneratesPurchaseOrderProducts;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Models\Transaction;
+use Illuminate\Support\Facades\DB;
+
+class ExpiredBookingCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'purchaseOrder:autoFill';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Auto fill up the purchase order for booking that have payment';
+
+    /** @var GeneratesPurchaseOrderProducts */
+    private $generatesPurchaseOrderProducts;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatePurchaseOrderTransactionProcessor */
+    private $createPurchaseOrderTransactionProcessor;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(GeneratesPurchaseOrderProducts $generatesPurchaseOrderProducts, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor)
+    {
+        parent::__construct();
+        $this->generatesPurchaseOrderProducts = $generatesPurchaseOrderProducts;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createPurchaseOrderTransactionProcessor = $createPurchaseOrderTransactionProcessor;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $bookings = Booking::where('status', ApprovalStatus::APPROVED)
+            ->where('created_at', '<', now()->subDays(60)->endOfDay())
+            ->whereHas('transactions', function($transaction) {
+                return $transaction->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            })
+            ->whereDoesntHave('transactions', function($transaction){
+                $transaction->where('type', TransactionType::PURCHASE_ORDER);
+                $transaction->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED]);
+            })->get();
+
+        foreach ($bookings as $booking) {
+            $po = Transaction::where('type', TransactionType::PURCHASE_ORDER)
+                ->where('status', ApprovalStatus::APPROVED)->where('issuer', $booking->company_id)
+                ->select('*', DB::raw('abs(amount - ' . $booking->fix_amount . ') as nearest_price'))->orderBy('nearest_price')->first();
+
+
+            if (!$po) {
+                $po = Transaction::where('type', TransactionType::PURCHASE_ORDER)
+                    ->where('status', ApprovalStatus::APPROVED)->select('*', DB::raw('abs(amount - ' . $booking->fix_amount . ') as nearest_price'))->orderBy('nearest_price')->first();
+            }
+
+            $products = $this->generatesPurchaseOrderProducts->execute($po, $booking->fix_amount);
+
+            $deference = $booking->fix_amount - $products->sum('total');
+
+            if($deference > -150 && $deference < 150 && $deference != 0) {
+
+                $products->push([
+                    'description' => $deference < 0 ? 'Discount':'Shipping Fee',
+                    'quantity' => 1,
+                    'stockCode' => '',
+                    'total' => $deference,
+                    'unit_price' => $deference
+                ]);
+            }
+
+            $billNumber = $this->generatesTransactionBillNumber->execute('XPO-');
+
+            $total = $products->sum('total');
+
+            $object = new TransactionObject($billNumber, TransactionType::PURCHASE_ORDER, $booking->company->id, 1,
+                1, PaymentMethodType::CASH,
+                $total, $total, $booking->fix_currency_id, $booking->fix_currency_id,
+                1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, $products->toArray());
+
+            $this->createPurchaseOrderTransactionProcessor->execute($booking, $object);
+        }
+    }
+}
diff --git a/app/Console/Commands/ExpiredBookingCommand.php b/app/Console/Commands/ExpiredBookingCommand.php
index 2598b380..37fe8612 100644
--- a/app/Console/Commands/ExpiredBookingCommand.php
+++ b/app/Console/Commands/ExpiredBookingCommand.php
@@ -55,7 +55,7 @@ class ExpiredBookingCommand extends Command
                     ->orWhereDoesntHave('transactions', function($transaction) {
                         return $transaction->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
                     });
-        })->get();
+            })->get();
 
         foreach ($bookings as $booking) {
             $this->updatesBookingStatus->execute($booking, ApprovalStatus::EXPIRED);
@@ -78,7 +78,7 @@ class ExpiredBookingCommand extends Command
                     })->whereHas('transactions', function($transaction) {
                         return $transaction->where('type', TransactionType::PURCHASE_ORDER);
                     });
-        })->get();
+            })->get();
 
         foreach ($bookings as $booking) {
             $this->updatesBookingStatus->execute($booking, ApprovalStatus::EXPIRED);

From f1c23d46dde54f6cbcd768df15370d4972624b54 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Tue, 26 Sep 2023 21:30:51 +0800
Subject: [PATCH 03/40] update

---
 app/Console/Commands/AutoFillPurchaseOrderCommand.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Console/Commands/AutoFillPurchaseOrderCommand.php b/app/Console/Commands/AutoFillPurchaseOrderCommand.php
index 059232d2..65a6fa93 100644
--- a/app/Console/Commands/AutoFillPurchaseOrderCommand.php
+++ b/app/Console/Commands/AutoFillPurchaseOrderCommand.php
@@ -16,7 +16,7 @@ use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Models\Transaction;
 use Illuminate\Support\Facades\DB;
 
-class ExpiredBookingCommand extends Command
+class AutoFillPurchaseOrderCommand extends Command
 {
     /**
      * The name and signature of the console command.
@@ -61,6 +61,7 @@ class ExpiredBookingCommand extends Command
      */
     public function handle()
     {
+        // 5. If purchase order not fill up in 2 month, auto fill up it
         $bookings = Booking::where('status', ApprovalStatus::APPROVED)
             ->where('created_at', '<', now()->subDays(60)->endOfDay())
             ->whereHas('transactions', function($transaction) {

From 75f44fae74126045ebf5ac58108e374596b7045e Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Tue, 26 Sep 2023 21:31:09 +0800
Subject: [PATCH 04/40] update

---
 app/Console/Commands/ExpiredBookingCommand.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Console/Commands/ExpiredBookingCommand.php b/app/Console/Commands/ExpiredBookingCommand.php
index 37fe8612..c5b4081c 100644
--- a/app/Console/Commands/ExpiredBookingCommand.php
+++ b/app/Console/Commands/ExpiredBookingCommand.php
@@ -47,7 +47,7 @@ class ExpiredBookingCommand extends Command
      */
     public function handle()
     {
-        // Cancel booking without payment & purchase order (1 month)
+        // 1. Cancel booking without payment & purchase order (1 month)
         $bookings = Booking::where('status', ApprovalStatus::APPROVED)
             ->where('created_at', '<', now()->subDays(30)->endOfDay())
             ->where(function ($query) {
@@ -69,7 +69,7 @@ class ExpiredBookingCommand extends Command
             }
         }
 
-        // Cancel booking without payment but with purchase order (2 month)
+        // 2. Cancel booking without payment but with purchase order (2 month)
         $bookings = Booking::where('status', ApprovalStatus::APPROVED)
             ->where('created_at', '<', now()->subDays(60)->endOfDay())
             ->where(function ($query) {

From 4be3b11a505c663a78f6f6abc42223f5fe0e1bc5 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Tue, 26 Sep 2023 21:32:20 +0800
Subject: [PATCH 05/40] add auto fill purchase order job inside kernel

---
 app/Console/Kernel.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 0355aea1..46e77f3a 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -47,6 +47,10 @@ class Kernel extends ConsoleKernel
         $schedule->command('booking:expired')
         ->dailyAt('02:00')
         ->withoutOverlapping();
+
+        $schedule->command('purchaseOrder:autoFill')
+        ->dailyAt('03:00')
+        ->withoutOverlapping();
     }
 
     /**

From a84cbdde6a09d0fecc4342f1014e868fae868f36 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Wed, 27 Sep 2023 14:12:32 +0800
Subject: [PATCH 06/40] add cancel booking for refunded payment

---
 .../Commands/ExpiredBookingCommand.php        | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/app/Console/Commands/ExpiredBookingCommand.php b/app/Console/Commands/ExpiredBookingCommand.php
index c5b4081c..d79b7b9c 100644
--- a/app/Console/Commands/ExpiredBookingCommand.php
+++ b/app/Console/Commands/ExpiredBookingCommand.php
@@ -9,6 +9,7 @@ use Illuminate\Console\Command;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
 use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
+use App\Models\Transaction;
 
 class ExpiredBookingCommand extends Command
 {
@@ -91,5 +92,62 @@ class ExpiredBookingCommand extends Command
                 Log::info("Expired Transaction id: {$transaction->id} from Booking id: {$booking->id}");
             }
         }
+
+        // 3. Cancel fully refunded payment & cancel booking
+        $transactions = Transaction::where('type', TransactionType::CREDIT_NOTE)->get();
+
+        foreach ($transactions as $transaction) {
+            // get the booking marking
+            $marking = substr($transaction->payment_reference, -5); 
+
+            // for a special payment reference on transaction id: 152013
+            if (!is_numeric($marking)) {
+                $payment_reference = explode(" ", trim($transaction->payment_reference));
+                if (count($payment_reference) > 1) {
+                    $marking = $payment_reference[count($payment_reference) - 2];    
+                }
+            }
+
+            if (is_numeric($marking)) {
+                $booking = Booking::where('marking', $marking)->first();
+
+                if ($booking) {
+                    if ($booking->status === ApprovalStatus::APPROVED) {
+                        $bookingPayment = $booking->transactions()->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->first();
+                        if (!$bookingPayment) {
+                            $bookingPayment = $booking->transactions()->payments()->count();
+                            Log::info("Credit note transaction id: {$transaction->id}, there are {$bookingPayment} payment for the booking.");
+                            $bookingPayment = $booking->transactions()->payments()->whereIn('status', [ApprovalStatus::EXPIRED, ApprovalStatus::REJECTED])->first();
+                            $status = ApprovalStatus::APPROVAL_STATUS_ID[$bookingPayment->status];
+                            Log::info("Credit note transaction id: {$transaction->id}, the payment for the booking is in status {$status}");
+                        }
+                        $bookingPaymentAmount = $bookingPayment->amount;
+                        // check if the booking is fully refund
+                        $amountDifference = bcsub($transaction->amount, $bookingPaymentAmount);
+
+                        if (abs($amountDifference) < 0.01) {
+                            // rejecting booking payment transaction
+                            $bookingPayment->status = ApprovalStatus::REJECTED;
+                            $bookingPayment->save();
+
+                            //expired booking
+                            $this->updatesBookingStatus->execute($booking, ApprovalStatus::EXPIRED);
+                            Log::info("Credit note transaction id: {$transaction->id} is fully refunded, the refunded amount was {$transaction->amount} the payment reference is: {$transaction->payment_reference}");
+                            Log::info("Credit note transaction id: {$transaction->id}, Rejected Booking Transaction Payment id: {$bookingPayment->id}, the payment amount was {$bookingPayment->amount}");
+                            Log::info("Credit note transaction id: {$transaction->id}, Expired Booking id: {$booking->id}");
+                        } else {
+                            Log::info("Credit note transaction id: {$transaction->id} is not fully refunded, the refunded amount was {$transaction->amount}, the payment amount was {$bookingPayment->amount}, the payment reference is: {$transaction->payment_reference}");
+                        }
+                    } else {
+                        $status = ApprovalStatus::APPROVAL_STATUS_ID[$booking->status];
+                        Log::info("Credit note transaction id: {$transaction->id}, booking status is {$status}");
+                    }
+                } else {
+                    Log::info("Credit note transaction id: {$transaction->id}, booking marking not found, the payment reference is: {$transaction->payment_reference}");
+                }
+            } else {
+                Log::info("Credit note transaction id: {$transaction->id} does not have booking marking, the payment reference is: {$transaction->payment_reference}");
+            }
+        }
     }
 }

From 946ee7b6f978305c69f8099aed9f8a9e33d4781c Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Fri, 29 Sep 2023 15:42:15 +0800
Subject: [PATCH 07/40] refund booking

---
 .../CreateBookingRefundLogic.php              | 20 ++++++++++---------
 .../UpdateRefundTransactionStatusLogic.php    |  4 +++-
 .../elements/PaymentHistoryComponent.vue      |  6 +++---
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
index d31ee2ce..398312c9 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
@@ -19,6 +19,7 @@ use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionRefundCalculationObject;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
 
 class CreateBookingRefundLogic extends AbstractControllerLogic
 {
@@ -84,21 +85,22 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
 
         $billNumber = $this->generatesTransactionBillNumber->execute('RFD-');
 
-        $refund = $transaction->transactions()->refunds()->sum('amount');
+        $refund = $transaction->transactions()->refunds()->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->sum('original_amount');
 
         if($refund + $request->input('amount') > $transaction->original_amount) throw new MalformedRequestException('Your refund must not be greater than '. $transaction->original_amount .'.');
 
-        $amount = $transaction->booking->fix_currency_id == 1 ? $request->input('amount') : $request->input('amount') / $transaction->currency_rate;
+        // $transactionRefundCalculationObject = new TransactionRefundCalculationObject($booking, $transaction, $request->input('amount'));
+        // $transactionRefundCalculationObject->init();
 
-
-        $transactionRefundCalculationObject = new TransactionRefundCalculationObject($booking, $transaction, $amount);
-        $transactionRefundCalculationObject->init();
+        $refundAmount = bcdiv($request->input('amount'), $transaction->currency_rate, 7);
+        // refund service charges if is fully refund
+        $refundTotal = ($refund + $request->input('amount')) == $transaction->original_amount ? $refundAmount + $transaction->service_charge + $transaction->tax : $refundAmount;
 
         $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id,
-            1, $transactionRefundCalculationObject->getConversionObject()->getPaymentMethod(),
-            $transactionRefundCalculationObject->getRefundTotalAmount(), $transactionRefundCalculationObject->getAmount(), 1,
-            $transactionRefundCalculationObject->getConversionObject()->getCurrencyId(), $transactionRefundCalculationObject->getTransaction()->currency_rate,
-            $transactionRefundCalculationObject->getRefundTax(), $transactionRefundCalculationObject->getRefundServiceCharge(), null, ApprovalStatus::PENDING_VERIFICATION, [], $transaction->bill_no);
+            1, PaymentMethodType::CASH,
+            $refundTotal, $request->input('amount'), 1,
+            $transaction->original_currency_id, $transaction->currency_rate,
+            $transaction->tax, $transaction->service_charge, null, ApprovalStatus::PENDING_VERIFICATION, [], $transaction->bill_no);
 
         $transaction = $this->createsTransaction->execute($transaction, $object);
 
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
index b86e4878..bf704359 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
@@ -73,7 +73,9 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic
 
         $booking = $transaction->owner->owner;
 
-        $reference = 'Credit Voucher for Overpaid for Ref. '.$booking->marking;
+        $paymentTransaction = $transaction->owner;
+
+        $reference = $transaction->amount == $paymentTransaction->amount ? 'Fully Refund for Ref. ' . $booking->marking : 'Partially Refund for Ref. ' . $booking->marking;
 
         if ($transaction->status == ApprovalStatus::APPROVED) {
             $this->creditWalletProcessor->execute($booking->company, $transaction->type, $transaction->amount, $reference);
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index ce4ba5a7..63cb4687 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -133,7 +133,7 @@
                             <div class="font-heading all-caps fs-10">Requested Refund Amount</div>
                         </div>
                         <div class="col-auto text-right">
-                            <div class="font-heading fs-10">{{item.currency.short_code}} {{(Math.round((totalRequestedRefund + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                            <div class="font-heading fs-10">{{item.original_currency.short_code}} {{(Math.round((totalRequestedRefund + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                         </div>
                     </div>
                     <div class="row align-items-end m-b-10 bold text-danger" v-if="totalRefunds != 0">
@@ -271,9 +271,9 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row m-t-10" v-show="[2, 3].includes(item.status) && totalRequestedConvertRefund < data.booking.amount">
+                    <div class="row m-t-10" v-show="[2, 3].includes(item.status) && (totalRequestedRefund + totalRefunds) < data.booking.amount">
                         <div class="col">
-                            <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal hide" data-type="transferSummary">Request Refund</button>
+                            <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal" data-type="transferSummary">Request Refund</button>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
                                 <refund-confirmation-component :data="data" :section="section" :totalRefunds="totalRequestedRefund + totalRefunds"></refund-confirmation-component>
                             </modal-component>

From 1ac2ac3102c3f2b5e3aff5907d4136fd362e4fb3 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 29 Nov 2023 23:39:15 +0800
Subject: [PATCH 08/40] Voucherify UI update for kexin to take a look

---
 .../forms/BookingPaymentQuotationComponent.vue       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 6f18170c..50c6c701 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -244,17 +244,17 @@
                                                             <i class="fa fa-times muted"></i>
                                                         </div>
                                                     </div>
-                                                    <!-- <div class="col-auto p-r-10 p-l-10">
+                                                    <div class="col-auto p-r-10 p-l-10">
                                                         <button class="btn btn-xs btn-outline-info b-rad-none m-r-5 requestModal" data-type="voucherList">
                                                             <i class="fa fa-list"></i>
                                                         </button>
-                                                    </div> -->
+                                                    </div>
                                                 </div>
                                             </validation-wrapper-component>
                                         </div>
-                                        <!-- <modal-component id="choose-voucher-modal" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="voucherList">
+                                        <modal-component id="choose-voucher-modal" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="voucherList">
                                             <list-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers-component>
-                                        </modal-component> -->
+                                        </modal-component>
                                     </div>
                                     <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
                                     <div class="row m-l-0 m-r-0" style="height: 20px">
@@ -262,11 +262,11 @@
                                         <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
                                         <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated">Voucher applied</span>
                                     </div>
-                                    <!-- <div class="row m-l-0 m-r-0">
+                                    <div class="row m-l-0 m-r-0">
                                         <div class="col">
                                             <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
                                         </div>
-                                    </div> -->
+                                    </div>
                                     <div class="row m-t-5">
                                         <div class="col">
                                             <div class="row p-l-15 p-r-15">

From 52c2dade88e485677bf015b4a3d0cc3d60ea5937 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 3 Dec 2023 23:13:52 +0800
Subject: [PATCH 09/40] Update UI based on kexin feedback

---
 .../elements/AvailableVouchersComponent.vue   | 19 +++++++++++--------
 .../BookingPaymentQuotationComponent.vue      | 14 +++++++-------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
index 45722aaf..7c3d5494 100644
--- a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
@@ -3,18 +3,21 @@
         <div class="col">
             <div class="row text-left no-margin bg-white" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
                 <div id="select-option" name="select-option" class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" @click="selectVoucher(item)">
-                    <div class="row parentContainer">
-                        <div class="col">
-                            <p>{{ item.voucher.code }}</p>
+                    <div class="row fs-10 p-b-5">List of Vouchers, click to select</div>
+                    <div class="row">
+                        <!-- <div class="col">
                             <p v-if="item.voucher.type == 'AMOUNT'">RM{{ item.voucher.value/100 }} Discount</p>
                             <p v-if="item.voucher.type == 'PERCENT'">{{ item.voucher.value }}% Discount</p>
-                        </div>
-                        <div class="col" v-if="item.voucher.end_date">
+                        </div> -->
+                        <span>{{ item.voucher.code }}</span>
+                    </div>
+                    <div class="row">
+                        <span v-if="item.voucher.end_date">
                             Valid till {{ item.voucher.end_date }}
-                        </div>
-                        <div class="col" v-else>
+                        </span>
+                        <span v-else>
                             No expiry date
-                        </div>
+                        </span>
                     </div>
                 </div>
             </div>
diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 50c6c701..50a421b5 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -244,11 +244,11 @@
                                                             <i class="fa fa-times muted"></i>
                                                         </div>
                                                     </div>
-                                                    <div class="col-auto p-r-10 p-l-10">
+                                                    <!-- <div class="col-auto p-r-10 p-l-10">
                                                         <button class="btn btn-xs btn-outline-info b-rad-none m-r-5 requestModal" data-type="voucherList">
                                                             <i class="fa fa-list"></i>
                                                         </button>
-                                                    </div>
+                                                    </div> -->
                                                 </div>
                                             </validation-wrapper-component>
                                         </div>
@@ -256,17 +256,17 @@
                                             <list-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers-component>
                                         </modal-component>
                                     </div>
+                                    <div class="row m-l-0 m-r-0" v-show="showApplyVoucher">
+                                        <div class="col">
+                                            <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
+                                        </div>
+                                    </div>
                                     <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
                                     <div class="row m-l-0 m-r-0" style="height: 20px">
                                         <i class="fa fa-spinner fa-spin m-b-5" v-if="voucherIsChecking"></i>
                                         <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
                                         <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated">Voucher applied</span>
                                     </div>
-                                    <div class="row m-l-0 m-r-0">
-                                        <div class="col">
-                                            <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
-                                        </div>
-                                    </div>
                                     <div class="row m-t-5">
                                         <div class="col">
                                             <div class="row p-l-15 p-r-15">

From 19d08242d52715ade37228e3fc6dc3fa88af32f8 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 3 Dec 2023 23:17:09 +0800
Subject: [PATCH 10/40] Update UI based on kexin feedback

---
 .../forms/BookingPaymentQuotationComponent.vue         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 50a421b5..e0e2ae8d 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -256,17 +256,17 @@
                                             <list-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers-component>
                                         </modal-component>
                                     </div>
-                                    <div class="row m-l-0 m-r-0" v-show="showApplyVoucher">
-                                        <div class="col">
-                                            <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
-                                        </div>
-                                    </div>
                                     <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
                                     <div class="row m-l-0 m-r-0" style="height: 20px">
                                         <i class="fa fa-spinner fa-spin m-b-5" v-if="voucherIsChecking"></i>
                                         <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
                                         <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated">Voucher applied</span>
                                     </div>
+                                    <div class="row m-l-0 m-r-0" v-show="showApplyVoucher">
+                                        <div class="col">
+                                            <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
+                                        </div>
+                                    </div>
                                     <div class="row m-t-5">
                                         <div class="col">
                                             <div class="row p-l-15 p-r-15">

From 96c00ea66b68aace86afe6272cc7ee8594739028 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 3 Dec 2023 23:19:31 +0800
Subject: [PATCH 11/40] Update UI based on kexin feedback

---
 .../bookings/forms/BookingPaymentQuotationComponent.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index e0e2ae8d..73f7a006 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -257,7 +257,7 @@
                                         </modal-component>
                                     </div>
                                     <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
-                                    <div class="row m-l-0 m-r-0" style="height: 20px">
+                                    <div class="row m-l-0 m-r-0" v-show="showApplyVoucher" style="height: 20px">
                                         <i class="fa fa-spinner fa-spin m-b-5" v-if="voucherIsChecking"></i>
                                         <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
                                         <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated">Voucher applied</span>

From 150f6a69d6dc77dcf032723aa49fec3529df3759 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 3 Dec 2023 23:34:36 +0800
Subject: [PATCH 12/40] Update UI based on kexin feedback

---
 .../bookings/elements/AvailableVouchersComponent.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
index 7c3d5494..4ac885ff 100644
--- a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
@@ -1,9 +1,9 @@
 <template>
      <div class="row">
         <div class="col">
-            <div class="row text-left no-margin bg-white" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
+            <div v-if="vouchers" class="row fs-10 p-b-5">List of Vouchers, click to select</div>
+            <div class="row text-left no-margin bg-white p-b-10" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
                 <div id="select-option" name="select-option" class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" @click="selectVoucher(item)">
-                    <div class="row fs-10 p-b-5">List of Vouchers, click to select</div>
                     <div class="row">
                         <!-- <div class="col">
                             <p v-if="item.voucher.type == 'AMOUNT'">RM{{ item.voucher.value/100 }} Discount</p>

From a6cf76ea79cae9ee7d70dc1806f2df92d087a562 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 3 Dec 2023 23:57:00 +0800
Subject: [PATCH 13/40] Update UI based on kexin feedback

---
 .../components/bookings/elements/AvailableVouchersComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
index 4ac885ff..89a56b0f 100644
--- a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
@@ -1,7 +1,7 @@
 <template>
      <div class="row">
         <div class="col">
-            <div v-if="vouchers" class="row fs-10 p-b-5">List of Vouchers, click to select</div>
+            <div v-if="vouchers && vouchers.length > 0" class="row fs-10 p-b-5">List of Vouchers, click to select</div>
             <div class="row text-left no-margin bg-white p-b-10" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
                 <div id="select-option" name="select-option" class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" @click="selectVoucher(item)">
                     <div class="row">

From c7c7ee8c0c909807624145adeaef481799bbeda8 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Mon, 4 Dec 2023 12:58:18 +0800
Subject: [PATCH 14/40] Fix a problem on voucher expiration date inaccurate

---
 .../Modules/Vouchers/DataTransferObjects/VoucherObject.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php
index f624b3cc..d4fd1e7b 100644
--- a/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php
@@ -3,6 +3,7 @@
 namespace App\Classes\Modules\Vouchers\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
+use Carbon\Carbon;
 use DateTime;
 use Illuminate\Support\Facades\Log;
 
@@ -86,7 +87,8 @@ class VoucherObject implements DataTransferObject
     {
         try {
             if(!$this->startDate) return null;
-            $dateTime = new DateTime($this->startDate);
+            // $dateTime = new DateTime($this->startDate);
+            $dateTime = Carbon::parse($this->startDate)->tz('Asia/Kuala_Lumpur');
             return $dateTime;
         } catch (\Exception $e) {
             Log::error($e);
@@ -101,7 +103,7 @@ class VoucherObject implements DataTransferObject
     {
         try {
             if(!$this->endDate) return null;
-            $dateTime = new DateTime($this->endDate);
+            $dateTime = Carbon::parse($this->endDate)->tz('Asia/Kuala_Lumpur');
             return $dateTime;
         } catch (\Exception $e) {
             Log::error($e);

From 1212ec37b8997002e1ac3c65aac0f5341eecfdf6 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 6 Dec 2023 13:37:45 +0800
Subject: [PATCH 15/40] Fix a decimal problem reported by kexin

---
 .../Vouchers/ControllersLogic/ValidateVoucherLogic.php    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php b/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php
index 4b820eb1..30e7fe12 100644
--- a/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php
+++ b/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php
@@ -44,10 +44,16 @@ class ValidateVoucherLogic extends AbstractControllerLogic
     {
         $booking = Booking::find($request->input('itemId'));
         $employee = $booking->company->employees()->first();
+        $amount = $this->floatvalue($request->input('amount'));
 
-        $validateVoucherifyVoucherObject = new ValidateVoucherifyVoucherObject($booking->company_id, $request->input('voucherCode'), $request->input('amount'), $employee);
+        $validateVoucherifyVoucherObject = new ValidateVoucherifyVoucherObject($booking->company_id, $request->input('voucherCode'), $amount, $employee);
         $result = $this->validatesVoucherifyVoucher->execute($validateVoucherifyVoucherObject);
         return $this->response(['data' => $result]);
     }
 
+    private function floatvalue($val){
+        $val = str_replace(",",".",$val);
+        $val = preg_replace('/\.(?=.*\.)/', '', $val);
+        return floatval($val);
+    }
 }

From 5d0052a6714b091d2a3d0472ea561a171970576f Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Wed, 27 Dec 2023 13:47:12 +0800
Subject: [PATCH 16/40] add reporting for download history import mapped
 invoice and receipt and with fix bug

---
 .../Eloquent/Filters/GroupByImportedDate.php  |  18 ++
 .../Eloquent/Filters/ImportedDateFrom.php     |  18 ++
 .../Eloquent/Filters/ImportedDateTo.php       |  18 ++
 .../StatementTransactionInvoiceReference.php  |  22 ++
 .../StatementTransactionOwnerReference.php    |  22 ++
 .../StatementTransactionReceiptReference.php  |  22 ++
 ...portedTransactionMappedControllerLogic.php |  49 ++++
 .../Services/ListTransactionMappingLogs.php   |  32 +++
 .../ExportsImportedInvoiceMappeds.php         |   1 -
 .../ExportsImportedReceiptMappeds.php         |  86 +++++++
 ...oryImportedTransactionMappedController.php |  20 ++
 .../ExportCustomersToExcelController.php      |   7 +
 .../ImportStatementInvoiceController.php      |   1 +
 .../ImportStatementReceiptsController.php     |   1 +
 .../TransactionMappingLogResource.php         |  23 ++
 app/Models/TransactionMappingLog.php          |   2 +-
 ...type_to_transaction_mapping_logs_table.php |  40 ++++
 .../elements/HistoryImportedInvoices.vue      |  39 +++
 .../elements/HistoryImportedReceipts.vue      |  39 +++
 .../ImportedInvoiceMappedComponent.vue        |  12 +-
 .../ImportedReceiptMappedComponent.vue        | 138 +++++++++++
 .../ReportTransactionsMappedComponent.vue     | 222 +++++++++++++++++-
 .../sections/TransactionsMappingComponent.vue |  15 +-
 routes/accounting.php                         |   3 +
 routes/web.php                                |   1 +
 25 files changed, 827 insertions(+), 24 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/GroupByImportedDate.php
 create mode 100644 app/Classes/General/Eloquent/Filters/ImportedDateFrom.php
 create mode 100644 app/Classes/General/Eloquent/Filters/ImportedDateTo.php
 create mode 100644 app/Classes/General/Eloquent/Filters/StatementTransactionInvoiceReference.php
 create mode 100644 app/Classes/General/Eloquent/Filters/StatementTransactionOwnerReference.php
 create mode 100644 app/Classes/General/Eloquent/Filters/StatementTransactionReceiptReference.php
 create mode 100644 app/Classes/Modules/Accounting/ControllersLogic/HistoryImportedTransactionMappedControllerLogic.php
 create mode 100644 app/Classes/Modules/Accounting/Services/ListTransactionMappingLogs.php
 create mode 100644 app/Classes/Modules/Exports/Services/ExportsImportedReceiptMappeds.php
 create mode 100644 app/Http/Controllers/Accounting/HistoryImportedTransactionMappedController.php
 create mode 100644 app/Http/Resources/TransactionMappingLogResource.php
 create mode 100644 database/migrations/2023_12_26_152448_add_type_to_transaction_mapping_logs_table.php
 create mode 100644 resources/assets/vue/components/accounting/elements/HistoryImportedInvoices.vue
 create mode 100644 resources/assets/vue/components/accounting/elements/HistoryImportedReceipts.vue
 create mode 100644 resources/assets/vue/components/accounting/sections/ImportedReceiptMappedComponent.vue

diff --git a/app/Classes/General/Eloquent/Filters/GroupByImportedDate.php b/app/Classes/General/Eloquent/Filters/GroupByImportedDate.php
new file mode 100644
index 00000000..25f20fa3
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/GroupByImportedDate.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class GroupByImportedDate implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->groupby('imported_date');
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/ImportedDateFrom.php b/app/Classes/General/Eloquent/Filters/ImportedDateFrom.php
new file mode 100644
index 00000000..140bbb20
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ImportedDateFrom.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class ImportedDateFrom implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDate('imported_date', '>=', date('Y-m-d',strtotime($value)));
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/ImportedDateTo.php b/app/Classes/General/Eloquent/Filters/ImportedDateTo.php
new file mode 100644
index 00000000..11bd3857
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ImportedDateTo.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class ImportedDateTo implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDate('imported_date', '<=', date('Y-m-d',strtotime($value)));
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/StatementTransactionInvoiceReference.php b/app/Classes/General/Eloquent/Filters/StatementTransactionInvoiceReference.php
new file mode 100644
index 00000000..9e3ba1e9
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/StatementTransactionInvoiceReference.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class StatementTransactionInvoiceReference implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('owners', function ($query) use ($value) {
+            return $query->where('Invoice_reference', $value);
+        });
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/StatementTransactionOwnerReference.php b/app/Classes/General/Eloquent/Filters/StatementTransactionOwnerReference.php
new file mode 100644
index 00000000..c0a7beaf
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/StatementTransactionOwnerReference.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class StatementTransactionOwnerReference implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('owners', function ($query) use ($value) {
+            return $query->where('owner_reference', $value);
+        });
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/StatementTransactionReceiptReference.php b/app/Classes/General/Eloquent/Filters/StatementTransactionReceiptReference.php
new file mode 100644
index 00000000..f808f784
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/StatementTransactionReceiptReference.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class StatementTransactionReceiptReference implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('owners', function ($query) use ($value) {
+            return $query->where('receipt_reference', $value);
+        });
+    }
+
+}
diff --git a/app/Classes/Modules/Accounting/ControllersLogic/HistoryImportedTransactionMappedControllerLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/HistoryImportedTransactionMappedControllerLogic.php
new file mode 100644
index 00000000..2f96c613
--- /dev/null
+++ b/app/Classes/Modules/Accounting/ControllersLogic/HistoryImportedTransactionMappedControllerLogic.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Classes\Modules\Accounting\ControllersLogic;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Http\Resources\TransactionMappingLogResource;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounting\Services\ListTransactionMappingLogs;
+
+
+class HistoryImportedTransactionMappedControllerLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Retrieved History Imported Invoices',
+            'message' => 'You have successfully retrieved history imported invoices'
+        ];
+    }
+
+    /** @var ListTransactionMappingLogs */
+    private $listTransactionMappingLogs;
+
+    /**
+     * UpdateAnnouncementLogic constructor.
+     * @param ListTransactionMappingLogs $listTransactionMappingLogs
+     */
+    public function __construct(
+        ListTransactionMappingLogs $listTransactionMappingLogs
+    ) {
+        $this->listTransactionMappingLogs = $listTransactionMappingLogs;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        $query = $this->listTransactionMappingLogs->execute($this->listTransactionMappingLogs->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(TransactionMappingLogResource::collection($query));
+    }
+}
diff --git a/app/Classes/Modules/Accounting/Services/ListTransactionMappingLogs.php b/app/Classes/Modules/Accounting/Services/ListTransactionMappingLogs.php
new file mode 100644
index 00000000..fdeff835
--- /dev/null
+++ b/app/Classes/Modules/Accounting/Services/ListTransactionMappingLogs.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Accounting\Services;
+
+use App\Models\TransactionMappingLog;
+use Illuminate\Database\Eloquent\Builder;
+use App\Classes\General\Eloquent\AbstractListRecord;
+
+class ListTransactionMappingLogs extends AbstractListRecord
+{
+
+    /** @var TransactionMappingLog */
+    private $repository;
+
+    /**
+     * ListsBankStatementDetails constructor.
+     * @param TransactionMappingLog $repository
+     */
+    public function __construct(TransactionMappingLog $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php b/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
index e629675f..ead22543 100644
--- a/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
+++ b/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
@@ -59,7 +59,6 @@ class ExportsImportedInvoiceMappeds implements FromQuery, WithHeadings, WithHead
      */
     public function map($transaction): array
     {
-        // dd($transaction);
         $this->count += 1;
         $data = $transaction->data;
         return [
diff --git a/app/Classes/Modules/Exports/Services/ExportsImportedReceiptMappeds.php b/app/Classes/Modules/Exports/Services/ExportsImportedReceiptMappeds.php
new file mode 100644
index 00000000..efe95fd3
--- /dev/null
+++ b/app/Classes/Modules/Exports/Services/ExportsImportedReceiptMappeds.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use Carbon\Carbon;
+use Illuminate\Support\Arr;
+use Illuminate\Http\Request;
+use App\Models\TransactionMappingLog;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+
+class ExportsImportedReceiptMappeds implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $dateTime;
+    private $count;
+    private $counter = 1;
+
+    public function __construct(Request $request)
+    {
+        $this->dateTime = $request->input('date').' '.$request->input('time');
+        $this->count = 0;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Check',
+            'Doc No',
+            'Doc Date',
+            'Debtor Code',
+            'Company Name',
+            'Description',
+            'Payment Amount',
+            'Created User',
+            'Curr.',
+            'To Home Rate',
+            'Local Payment Amount',
+            'Cancelled',
+            'Mapped Status',
+            'Mapped Reference No',
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return TransactionMappingLog::where('imported_date', $this->dateTime);
+    }
+
+    /**
+     * @param Transaction $transaction
+     *
+     * @return array
+     */
+    public function map($transaction): array
+    {
+        $this->count += 1;
+        $data = $transaction->data;
+        return [
+            $this->count,
+            Arr::get($data,'doc_no'),
+            Arr::get($data,'doc_date'),
+            Arr::get($data,'debtor_code'),
+            Arr::get($data,'company_name'),
+            Arr::get($data,'description'),
+            Arr::get($data,'payment_amount'),
+            Arr::get($data,'created_user'),
+            Arr::get($data,'curr'),
+            Arr::get($data,'to_home_rate'),
+            Arr::get($data,'local_payment_amount'),
+            Arr::get($data,'cancelled'),
+            Arr::get($data,'2nd_doc_no'),
+            Arr::get($data,'mapped_status'),
+            Arr::get($data,'mapped_result_reference'),
+        ];
+    
+    }
+}
diff --git a/app/Http/Controllers/Accounting/HistoryImportedTransactionMappedController.php b/app/Http/Controllers/Accounting/HistoryImportedTransactionMappedController.php
new file mode 100644
index 00000000..8b4a2cde
--- /dev/null
+++ b/app/Http/Controllers/Accounting/HistoryImportedTransactionMappedController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Accounting;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Classes\Modules\Accounting\ControllersLogic\HistoryImportedTransactionMappedControllerLogic;
+
+class HistoryImportedTransactionMappedController
+{
+    /**
+     * @param Request $request
+     * @param ApprovePaymentLogic $logic
+     * @return JsonResponse
+     */
+    public function getImported(Request $request, HistoryImportedTransactionMappedControllerLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
index 733c84fa..0f351c7d 100644
--- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
+++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
@@ -18,6 +18,7 @@ use Maatwebsite\Excel\Excel;
 use App\Classes\Modules\Exports\Services\ExportsImportedInvoiceMappeds;
 use App\Models\TransactionMappingLog;
 use App\Classes\Modules\Exports\Services\ExportsReceiptTransactions;
+use App\Classes\Modules\Exports\Services\ExportsImportedReceiptMappeds;
 
 class ExportCustomersToExcelController
 {
@@ -91,4 +92,10 @@ class ExportCustomersToExcelController
         ob_end_clean();
         return $response;
     }
+
+    public function importedReceiptMapped(ExportsImportedReceiptMappeds $exportsImportedReceiptMappeds, Request $request) {
+        $response = $exportsImportedReceiptMappeds->download($request->input('fileName').'.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index 75953f2b..e4c35eb5 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -100,6 +100,7 @@ class ImportStatementInvoiceController
 
                 TransactionMappingLog::create([
                     'imported_date'=>$importDate,
+                    'type' => 'invoices',
                     'data'=>$row,
                 ]);
                 array_push($data, $row);
diff --git a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
index a43f2dda..6c117642 100644
--- a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
+++ b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
@@ -69,6 +69,7 @@ class ImportStatementReceiptsController
 
                 TransactionMappingLog::create([
                     'imported_date'=>$importDate,
+                    'type' => 'receipts',
                     'data'=>$row,
                 ]);
                 array_push($data, $row);
diff --git a/app/Http/Resources/TransactionMappingLogResource.php b/app/Http/Resources/TransactionMappingLogResource.php
new file mode 100644
index 00000000..954294f1
--- /dev/null
+++ b/app/Http/Resources/TransactionMappingLogResource.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class TransactionMappingLogResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'imported_date' => $this->imported_date,
+            'type' => $this->type
+        ];
+    }
+}
diff --git a/app/Models/TransactionMappingLog.php b/app/Models/TransactionMappingLog.php
index d6093f39..e9ddab33 100644
--- a/app/Models/TransactionMappingLog.php
+++ b/app/Models/TransactionMappingLog.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class TransactionMappingLog extends Model
 {
-    protected $fillable = ['imported_by','data','imported_date'];
+    protected $fillable = ['imported_by','data','imported_date','type'];
 
     protected $casts = [
         'data' => 'array',
diff --git a/database/migrations/2023_12_26_152448_add_type_to_transaction_mapping_logs_table.php b/database/migrations/2023_12_26_152448_add_type_to_transaction_mapping_logs_table.php
new file mode 100644
index 00000000..3927920a
--- /dev/null
+++ b/database/migrations/2023_12_26_152448_add_type_to_transaction_mapping_logs_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddTypeToTransactionMappingLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('transaction_mapping_logs', function (Blueprint $table) {
+            $table->string('type',50)->default('invoices')->after('imported_date');
+        });
+
+        foreach (DB::table('transaction_mapping_logs')->get() as $key => $value) {
+            $data = json_decode($value->data);
+            DB::table('transaction_mapping_logs')->where('id',$value->id)->update([
+                'type' => (isset($data->description) ? 'receipts' : 'invoices')
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('transaction_mapping_logs', function (Blueprint $table) {
+            $table->dropColumn('type');
+        });
+    }
+}
diff --git a/resources/assets/vue/components/accounting/elements/HistoryImportedInvoices.vue b/resources/assets/vue/components/accounting/elements/HistoryImportedInvoices.vue
new file mode 100644
index 00000000..d3d68cfb
--- /dev/null
+++ b/resources/assets/vue/components/accounting/elements/HistoryImportedInvoices.vue
@@ -0,0 +1,39 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <div class="row p-b-10 b-b b-grey">
+                <div class="col-2">{{ item.imported_date }}</div>
+                <div class="col-2">                        
+                    <button class="btn btn-xs btn-outline-success b-rad-none m-r-5" @click="downloadInvoiceMapped(item.imported_date)">
+                            Download Invoices Mapped
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            stage: {
+                type: Number,
+                default: 0
+            },
+            section:{
+                type: String,
+                required: true
+            },
+        },
+        methods: {
+            downloadInvoiceMapped(importedDate) {
+                var arrDateTime = importedDate.split(" ");
+                const fileName = 'InvoiceMapped';
+                
+                window.open(this.route('importedInvoiceMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1]+'&fileName='+fileName, '_blank');
+            },
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/accounting/elements/HistoryImportedReceipts.vue b/resources/assets/vue/components/accounting/elements/HistoryImportedReceipts.vue
new file mode 100644
index 00000000..00138fa5
--- /dev/null
+++ b/resources/assets/vue/components/accounting/elements/HistoryImportedReceipts.vue
@@ -0,0 +1,39 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <div class="row p-b-10 b-b b-grey">
+                <div class="col-2">{{ item.imported_date }}</div>
+                <div class="col-2">                        
+                    <button class="btn btn-xs btn-outline-success b-rad-none m-r-5" @click="downloadInvoiceMapped(item.imported_date)">
+                            Download Receipts Mapped
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            stage: {
+                type: Number,
+                default: 0
+            },
+            section:{
+                type: String,
+                required: true
+            },
+        },
+        methods: {
+            downloadInvoiceMapped(importedDate) {
+                var arrDateTime = importedDate.split(" ");
+                const fileName = 'ReceiptMapped';
+                
+                window.open(this.route('importedReceiptMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1]+'&fileName='+fileName, '_blank');
+            },
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
index f10f9181..185da370 100644
--- a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
@@ -98,21 +98,17 @@
         },
         methods: {
             appendComponentTitle() {
-                this.componentTitle = this.section == 'importInvoiceMapping' ? 'Imported Invoices Mapped' : 'Imported Receipts Mapped';
+                this.componentTitle = 'Imported Invoices Mapped';
             },
             appendComponentTableHeader() {
-                if (this.section == 'importInvoiceMapping') {
-                    this.tableHeaders = ['No','Doc No','Date','Debtor Code','Debtor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No','Payment Received Date'];
-                } else {
-                    this.tableHeaders = ['No','OR No','Date','Creditor Code','Creditor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No'];
-                }
+                this.tableHeaders = ['No','Doc No','Date','Debtor Code','Debtor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No','Payment Received Date'];
             },
             importInvoice(){
                 this.isLoading = true;
                 this.parameters = {
                     files: this.files
                 };
-                this.submit(this.route('api.'+(this.section == 'importInvoiceMapping' ? 'import_invoices' : 'import_receipts')+'.upload'), 'post', this.section, true, false);
+                this.submit(this.route('api.import_invoices.upload'), 'post', this.section, true, false);
             },
 
             successHandler(response){
@@ -128,7 +124,7 @@
 
             downloadInvoiceMapped() {
                 var arrDateTime = this.importedDate.split(" ");
-                const fileName = this.section == 'importInvoiceMapping' ? 'InvoiceMapped' : 'ReceiptMapped';
+                const fileName = 'importInvoiceMapping';
 
                 window.open(this.route('importedInvoiceMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1]+'&fileName='+fileName, '_blank');
             },
diff --git a/resources/assets/vue/components/accounting/sections/ImportedReceiptMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ImportedReceiptMappedComponent.vue
new file mode 100644
index 00000000..25db762e
--- /dev/null
+++ b/resources/assets/vue/components/accounting/sections/ImportedReceiptMappedComponent.vue
@@ -0,0 +1,138 @@
+<template>
+    <div class="row h-100 parentContainer">
+        <div class="col-12" style="min-height: 20px;">
+            <loading-component style="height: 20px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+        </div>
+
+        <div class="col-12">
+            <div class="card">
+                <div class="card-header">
+                    <h3>{{ componentTitle }}</h3>
+                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="text-right">
+                        <button class="btn btn-xs btn-outline-success b-rad-none m-r-5" @click="downloadInvoiceMapped">
+                            Download Receipts Mapped
+                        </button>
+                    </div>
+                </div>
+                <!-- /.card-header -->
+                <div class="card-body table-responsive p-0">
+                    <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th v-for="item in tableHeaders">{{ item }}</th>
+                        </tr>
+                    </thead>
+                    <tbody v-show="!isLoading">
+                        <tr v-for="(item, index) in $store.getters.getListData(section)">
+                            <td>{{index+1}}</td>
+                            <td>{{item.check }}</td>
+                            <td>{{item.doc_no}}</td>
+                            <td>{{item.doc_date }}}</td>
+                            <td>{{item.debtor_code}}</td>
+                            <td>{{item.company_name}}</td>
+                            <td>{{item.description}}</td>
+                            <td>{{item.payment_amount}}</td>
+                            <td>{{item.created_user}}</td>
+                            <td>{{item.curr}}</td>
+                            <td>{{item.to_home_rate}}</td>
+                            <td>{{item.local_payment_amount}}</td>
+                            <td>{{item.cancelled}}</td>
+                            <td>{{item.mapped_status}}</td>
+                            <td>{{item.mapped_result_reference}}</td>
+                        </tr>
+                    </tbody>
+                    </table>
+                </div>
+                <!-- /.card-body -->
+                <div class="card-footer">
+
+                </div>
+            </div>
+        </div>
+
+        <div class="col-12">
+            <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            files: {
+                required: true
+            },
+            type: {
+                type: String,
+                required: true,
+            },
+            section:{
+                type: String,
+                required: true
+            },
+        },
+        data() {
+            return {
+                isLoading: false,
+                error: '',
+                importedDate: null,
+            }
+        },
+        computed: {
+            pendingQueue() {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingQueue(inComplete, oldValue){
+                if(inComplete){
+                    this.importInvoice();
+                }
+            },
+        },
+        created(){
+            this.appendComponentTitle();
+            this.appendComponentTableHeader();
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            appendComponentTitle() {
+                this.componentTitle = 'Imported Receipts Mapped';
+            },
+            appendComponentTableHeader() {
+                this.tableHeaders = ['Check','Doc No','Doc Date','Debtor Code','Company Name','Description','Payment Amount','Created User','Curr.','To Home Rate','Local Payment Amount','Cancelled','Mapped Status','Mapped Reference No'];
+            },
+            importInvoice(){
+                this.isLoading = true;
+                this.parameters = {
+                    files: this.files
+                };
+                this.submit(this.route('api.import_receipts.upload'), 'post', this.section, true, false);
+            },
+
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': response.payload.data});
+                this.importedDate = response.payload.importedDate;
+                this.isLoading = false;
+            },
+
+            errorHandler(error){
+                this.isLoading = false;
+                this.error = error.message;
+            },
+
+            downloadInvoiceMapped() {
+                var arrDateTime = this.importedDate.split(" ");
+                const fileName = 'ReceiptMapped';
+
+                window.open(this.route('importedReceiptMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1]+'&fileName='+fileName, '_blank');
+            },
+        }
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
index e3d4e0d2..86da623c 100644
--- a/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
@@ -3,19 +3,74 @@
         <div class="col">
             <div class="row">
                 <div class="col">
-                    <div class="row justify-content-center align-items-center m-t-50 m-b-50" v-show="step === 0">
-                        <div class="col-5">
-                            <div class="row text-center">
-                                <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getReportFilter()">Mapped Report</div>
+                    <div class="justify-content-center align-items-center m-t-50 m-b-50" v-show="step === 0">
+
+                        <div class="row">
+                            <div class="col-3">
+                                <div class="row text-center">
+                                    <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getReportFilter()">Mapped Report</div>
+                                </div>
+                            </div>
+                            <div class="col-3">
+                                <div class="row text-center">
+                                    <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getHistoryImportedInvReport()">History Imported Invoices Report</div>
+                                </div>
+                            </div>
+                            <div class="col-3">
+                                <div class="row text-center">
+                                    <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getHistoryImportedRecReport()">History Imported Receipts Report</div>
+                                </div>
                             </div>
                         </div>
+
                     </div>
                 </div>
             </div>
-            <div class="row" v-if="step == 1">
+            <div class="row" v-if="step > 0 && report == 'mappedRecords'">
                 <div class="col">
                     <div class="row">
                         <div class="col">
+                            <div class="justify-content-center align-items-center m-t-50 m-b-50">
+                                <div class="row mb-3">
+                                    <div class="col-4">
+                                        <validation-wrapper-component :validator="$v.parameters.owner_reference">
+                                        <label class="text-primary">Reference</label>
+                                            <input type="text" class="form-control" v-model="parameters.owner_reference">
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-4">
+                                        <validation-wrapper-component :validator="$v.parameters.invoice_reference">
+                                        <label class="text-primary">Invoice Reference</label>
+                                            <input type="text" class="form-control" v-model="parameters.invoice_reference">
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-4">
+                                        <validation-wrapper-component :validator="$v.parameters.receipt_reference">
+                                        <label class="text-primary">Receipt Reference</label>
+                                            <input type="text" class="form-control" v-model="parameters.receipt_reference">
+                                        </validation-wrapper-component>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.startDate">
+                                            <label class="all-caps">Start Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.endDate">
+                                            <label class="all-caps">End Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <div class="row text-center">
+                                            <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getReportFilter()">Mapped Report</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="row m-t-10 m-b-10">
                                 <div class="col">
                                     <div class="row p-t-10 p-b-10 b-b b-grey text-master-light">
@@ -35,7 +90,7 @@
                                 </div>
                             </div>
 
-                            <list-component ref="TransactionsMappedList" section="TransactionsMappedSection" :endpoint="route('api.accounting.bank.transaction')" :options="filter">
+                            <list-component :key="step" ref="TransactionsMappedList" section="TransactionsMappedSection" :endpoint="route('api.accounting.bank.transaction')" :options="filter">
                                 <template slot="list" slot-scope="{data}">
                                     <statement-transaction-mapped-component :data="data" :section="section"></statement-transaction-mapped-component>
                                 </template>
@@ -44,22 +99,175 @@
                     </div>
                 </div>
             </div>
+
+            <!-- report for imported Invoices -->
+            <div class="row" v-if="step > 0 && report == 'importedInv'">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="justify-content-center align-items-center m-t-50 m-b-50">
+                                <div class="row">
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.startDate">
+                                            <label class="all-caps">Start Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.endDate">
+                                            <label class="all-caps">End Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <div class="row text-center">
+                                            <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getHistoryImportedInvReport()">History Imported Invoices Report</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-t-10 m-b-10">
+                                <div class="col">
+                                    <div class="row p-t-10 p-b-10 b-b b-grey text-master-light">
+                                        <div class="col-2">Date</div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <list-component :key="step" ref="HistoryImportedInvList" section="HistoryImportedInvSection" :endpoint="route('api.accounting.history.imported')" :options="filter">
+                                <template slot="list" slot-scope="{data}">
+                                    <history-imported-invoices :data="data" :section="section"></history-imported-invoices>
+                                </template>
+                            </list-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- report for imported Receipts -->
+            <div class="row" v-if="step > 0 && report == 'importedRec'">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="justify-content-center align-items-center m-t-50 m-b-50">
+                                <div class="row">
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.startDate">
+                                            <label class="all-caps">Start Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.endDate">
+                                            <label class="all-caps">End Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <div class="row text-center">
+                                            <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getHistoryImportedRecReport()">History Imported Receipts Report</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-t-10 m-b-10">
+                                <div class="col">
+                                    <div class="row p-t-10 p-b-10 b-b b-grey text-master-light">
+                                        <div class="col-2">Date</div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <list-component :key="step" ref="HistoryImportedRecList" section="HistoryImportedRecSection" :endpoint="route('api.accounting.history.imported')" :options="filter">
+                                <template slot="list" slot-scope="{data}">
+                                    <history-imported-receipts :data="data" :section="section"></history-imported-receipts>
+                                </template>
+                            </list-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
 <script>
+    import { required } from "vuelidate/lib/validators";
     export default {
         data() {
             return {
+                parameters: {
+                    startDate: '',
+                    endDate: '',
+                    owner_reference: '',
+                    invoice_reference: '',
+                    receipt_reference: ''
+                },
                 step: 0,
                 filter: {},
+                report: ''
             }
         },
+        validations: {
+            parameters: {
+                startDate: {
+                    required
+                },
+                endDate: {
+                    required
+                },
+                owner_reference: {},
+                invoice_reference: {},
+                receipt_reference: {}
+            },
+        },
+        created(){
+            this.parameters.startDate = this.startDate();
+            this.parameters.endDate = this.endDate();
+        },
         methods: {
+            startDate() {
+                var date = new Date();
+                return '01-'+(date.getMonth() + 1)+'-'+date.getFullYear();
+            },
+            endDate() {
+                var date = new Date();
+                var lastDay = new Date(date.getFullYear(), date.getMonth() + 1, 0);
+                return lastDay.getDate()+'-'+(lastDay.getMonth() + 1)+'-'+lastDay.getFullYear();
+            },
             getReportFilter() {
                 this.filter = {min_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [3], per_page: 100, order_by: {column: 'posting_date', DESC: true}};
 
-                this.step = 1
+                this.filter = {...this.filter, ...{statement_transaction_posting_start: this.parameters.startDate}};
+                this.filter = {...this.filter, ...{statement_transaction_posting_end:this.parameters.endDate}}
+
+                if (typeof this.parameters.owner_reference != 'undefined' && this.parameters.owner_reference != '') this.filter = {...this.filter, ...{statement_transaction_owner_reference: this.parameters.owner_reference}};
+
+                if (typeof this.parameters.invoice_reference != 'undefined' && this.parameters.invoice_reference != '') this.filter = {...this.filter, ...{statement_transaction_invoice_reference: this.parameters.invoice_reference}};
+
+                if (typeof this.parameters.receipt_reference != 'undefined' && this.parameters.receipt_reference != '') this.filter = {...this.filter, ...{statement_transaction_receipt_reference: this.parameters.receipt_reference}};
+
+                this.step = this.step + 1;
+                this.report = 'mappedRecords';
+            },
+            getHistoryImportedRecReport() {
+                this.filter = {
+                    imported_date_from: this.parameters.startDate,
+                    imported_date_to:this.parameters.endDate,
+                    group_by_imported_date:true,
+                    type:'receipts'
+                };
+                this.step = this.step + 1;
+                this.report = 'importedRec';
+            },
+            getHistoryImportedInvReport() {
+                this.filter = {
+                    imported_date_from: this.parameters.startDate,
+                    imported_date_to:this.parameters.endDate,
+                    group_by_imported_date:true,
+                    type:'invoices'
+                };
+                this.step = this.step + 1;
+                this.report = 'importedInv';
             }
         },
     }
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index bb19b908..f7073783 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -164,7 +164,7 @@
                             <div class="row">
                                 <div class="col-12">
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="ModalImportInvoice">
-                                        <imported-invoice-mapped-component section="importInvoiceMapping" v-if="mappedTrue" :files="files"></imported-invoice-mapped-component>
+                                        <imported-invoice-mapped-component section="importInvoiceMapping" v-if="invMappedTrue" :files="files"></imported-invoice-mapped-component>
                                     </modal-component>
                                 </div>
                             </div>
@@ -192,7 +192,7 @@
                                     </file-input-component>
                                 </div>
                             </div>
-                            <div class="btn btn-lg btn-primary m-t-20 requestModal" data-type="ModalImportInvoice" @click="importReceipts">Import Receipts</div>
+                            <div class="btn btn-lg btn-primary m-t-20 requestModal" data-type="ModalImportReceipt" @click="importReceipts">Import Receipts</div>
                             <!-- todo-new: delete later --><br><div class="btn btn-lg btn-primary m-t-20" @click="exportStage++">Nest Step</div>
                             <br>
                             <div class="row">
@@ -202,8 +202,8 @@
                             </div>
                             <div class="row">
                                 <div class="col-12">
-                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="ModalImportInvoice">
-                                        <imported-invoice-mapped-component section="importReceiptMapping" v-if="mappedTrue" :files="files"></imported-invoice-mapped-component>
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="ModalImportReceipt">
+                                        <imported-receipt-mapped-component section="importReceiptMapping" v-if="recMappedTrue" :files="files"></imported-receipt-mapped-component>
                                     </modal-component>
                                 </div>
                             </div>
@@ -240,7 +240,8 @@ export default {
             files: [],
             parameters: {},
             section: 'bankTransactionSection',
-            mappedTrue: false,
+            invMappedTrue: false,
+            recMappedTrue: false,
             selectAll: false,
         }
     },
@@ -259,10 +260,10 @@ export default {
     },
     methods: {
         importInvoice(){
-            this.mappedTrue = true;
+            this.invMappedTrue = true;
         },
         importReceipts(){
-            this.mappedTrue = true;
+            this.recMappedTrue = true;
         },
         exportInvoiceToAutoCount(){
             const checkedStatementTransactions = this.getCheckedStatementOwners();
diff --git a/routes/accounting.php b/routes/accounting.php
index 4fe0a1ad..ddeecb21 100644
--- a/routes/accounting.php
+++ b/routes/accounting.php
@@ -16,4 +16,7 @@ Route::group(['prefix' => 'accounting', 'as' => 'accounting.', 'namespace' => 'A
         Route::post('/owner/group-approve', 'GroupApproveStatementTransactionController@approve')->name('owner.groupApprove');
         Route::post('/{id}/owner/{status}', 'UpdateStatementTransactionStatusController@update')->where('status', 'approve|reject')->name('owner.status.update');
     });
+
+    Route::get('history/imported', 'HistoryImportedTransactionMappedController@getImported')->name('history.imported');
+    
 });
diff --git a/routes/web.php b/routes/web.php
index ead4b3d2..674f8f0e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -263,6 +263,7 @@ Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelContro
 Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@invoiceTransactions')->name('invoiceTransactions.export');
 Route::get('/export/receipt-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@receiptTransactions')->name('receiptTransactions.export');
 Route::get('/export/imported-invoice-mapped', 'Exports\ExportCustomersToExcelController@importedInvoiceMapped')->name('importedInvoiceMapped.export');
+Route::get('/export/imported-receipt-mapped', 'Exports\ExportCustomersToExcelController@importedReceiptMapped')->name('importedReceiptMapped.export');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     $bookings = Booking::where(function($query){

From 18df0e256ba22d190fab84cf7927aa2b301b7f7d Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sat, 30 Dec 2023 01:15:27 +0800
Subject: [PATCH 17/40] Code sync from Shipping Portal, independent deployment
 of Vue Polling, checkout from dillon/34-jenkins-vapor

---
 .../JobResourceNotFoundException.php          |  11 +
 .../Abstracts/AbstractControllerLogic.php     |  15 +-
 .../General/Eloquent/AbstractFetchRecord.php  |  14 +-
 .../General/Eloquent/AbstractGetRecord.php    |  26 ++-
 .../General/Eloquent/AbstractListRecord.php   |  14 +-
 .../General/Eloquent/Filters/JobId.php        |  20 ++
 app/Classes/General/Helper.php                |  24 +++
 app/Classes/Jobs/ListBookingsJob.php          |  50 +++++
 app/Classes/Jobs/ListDocumentsJob.php         |  61 ++++++
 app/Classes/Jobs/ListTransactionsJob.php      |  50 +++++
 .../ControllersLogic/ListBookingJobLogic.php  |  56 +++++
 .../Processors/ListBookingsJobProcessor.php   |  57 +++++
 .../ControllersLogic/ListDocumentJobLogic.php |  74 +++++++
 .../Processors/ListDocumentsJobProcessor.php  |  54 +++++
 .../ControllersLogic/FetchJobResultLogic.php  |  54 +++++
 .../ListGenericJobObject.php                  |  99 +++++++++
 .../Jobs/Services/CreatesJobResult.php        |  28 +++
 .../Jobs/Services/FetchesJobResult.php        |  33 +++
 .../ListTransactionsJobLogic.php              |  47 ++++
 .../ListTransactionsJobProcessor.php          |  50 +++++
 .../Bookings/ListBookingsJobController.php    |  22 ++
 .../Documents/ListDocumentsJobController.php  |  19 ++
 .../Jobs/FetchJobResultController.php         |  19 ++
 .../ListTransactionsJobController.php         |  21 ++
 app/Http/Resources/BookingResource.php        |  10 +-
 app/Http/Resources/CompanyResource.php        |  31 ++-
 app/Http/Resources/DocumentResource.php       |   5 +-
 app/Http/Resources/JobResultResource.php      |  22 ++
 app/Models/JobResult.php                      |  13 ++
 ..._08_08_124848_create_job_results_table.php |  35 +++
 ...31_add_new_column_to_job_results_table.php |  36 ++++
 .../SupplierPendingOrdersSectionComponent.vue |  14 +-
 .../general/elements/ListPollingComponent.vue | 204 ++++++++++++++++++
 routes/api.php                                |   4 +
 routes/currency.php                           |   2 +-
 routes/document.php                           |   3 +-
 routes/job.php                                |   7 +
 37 files changed, 1281 insertions(+), 23 deletions(-)
 create mode 100644 app/Classes/Exceptions/JobResourceNotFoundException.php
 create mode 100644 app/Classes/General/Eloquent/Filters/JobId.php
 create mode 100644 app/Classes/Jobs/ListBookingsJob.php
 create mode 100644 app/Classes/Jobs/ListDocumentsJob.php
 create mode 100644 app/Classes/Jobs/ListTransactionsJob.php
 create mode 100644 app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
 create mode 100644 app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
 create mode 100644 app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
 create mode 100644 app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
 create mode 100644 app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
 create mode 100644 app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
 create mode 100644 app/Classes/Modules/Jobs/Services/CreatesJobResult.php
 create mode 100644 app/Classes/Modules/Jobs/Services/FetchesJobResult.php
 create mode 100644 app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
 create mode 100644 app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
 create mode 100644 app/Http/Controllers/Bookings/ListBookingsJobController.php
 create mode 100644 app/Http/Controllers/Documents/ListDocumentsJobController.php
 create mode 100644 app/Http/Controllers/Jobs/FetchJobResultController.php
 create mode 100644 app/Http/Controllers/Transactions/ListTransactionsJobController.php
 create mode 100644 app/Http/Resources/JobResultResource.php
 create mode 100644 app/Models/JobResult.php
 create mode 100644 database/migrations/2023_08_08_124848_create_job_results_table.php
 create mode 100644 database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php
 create mode 100644 resources/assets/vue/components/general/elements/ListPollingComponent.vue
 create mode 100644 routes/job.php

diff --git a/app/Classes/Exceptions/JobResourceNotFoundException.php b/app/Classes/Exceptions/JobResourceNotFoundException.php
new file mode 100644
index 00000000..a8ef358e
--- /dev/null
+++ b/app/Classes/Exceptions/JobResourceNotFoundException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Classes\Exceptions;
+
+use App\Classes\ValueObjects\Constants\HttpStatus;
+
+final class JobResourceNotFoundException extends ServiceApiException {
+    public function __construct(?string $message = null) {
+        parent::__construct($message ?? 'Unable to find the requested resource', HttpStatus::RESOURCE_NOT_FOUND);
+    }
+}
diff --git a/app/Classes/General/Abstracts/AbstractControllerLogic.php b/app/Classes/General/Abstracts/AbstractControllerLogic.php
index 815219c8..61c70f44 100644
--- a/app/Classes/General/Abstracts/AbstractControllerLogic.php
+++ b/app/Classes/General/Abstracts/AbstractControllerLogic.php
@@ -17,6 +17,7 @@ use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use App\Classes\Exceptions\JobResourceNotFoundException;
 
 abstract class AbstractControllerLogic
 {
@@ -67,7 +68,19 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions $exception){
-            log::error($exception);
+            if ($exception instanceof JobResourceNotFoundException) {
+                Log::error(sprintf(
+                    "Uncaught exception '%s' with message '%s' in %s:%d",
+                    get_class($exception),
+                    $exception->getMessage(),
+                    $exception->getTrace()[0]['file'],
+                    $exception->getTrace()[0]['line']
+                ));
+            }
+            else{
+                log::error($exception);
+            }
+
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
                 $exception->getCode() ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 
diff --git a/app/Classes/General/Eloquent/AbstractFetchRecord.php b/app/Classes/General/Eloquent/AbstractFetchRecord.php
index 248deee7..503fb369 100644
--- a/app/Classes/General/Eloquent/AbstractFetchRecord.php
+++ b/app/Classes/General/Eloquent/AbstractFetchRecord.php
@@ -4,9 +4,11 @@ namespace App\Classes\General\Eloquent;
 
 
 use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Exceptions\JobResourceNotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Psy\Exception\ErrorException;
+use Illuminate\Support\Facades\Log;
 
 abstract class AbstractFetchRecord extends AbstractGetRecord
 {
@@ -27,12 +29,18 @@ abstract class AbstractFetchRecord extends AbstractGetRecord
      * @return Model
      * @throws ResourceNotFoundException
      */
-    public function getResults(Builder $query): Model {
+    public function getResults(Builder $query, array $param = []): Model {
         if(!$query->exists()){
-            throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
+            $table = $query->getModel()->getTable();
+            if($table ==='job_results'){
+                throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
+            }
+            else{
+                throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
+            }
         }
 
         return $query->first();
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Classes/General/Eloquent/AbstractGetRecord.php b/app/Classes/General/Eloquent/AbstractGetRecord.php
index f927d818..1a7eac3e 100644
--- a/app/Classes/General/Eloquent/AbstractGetRecord.php
+++ b/app/Classes/General/Eloquent/AbstractGetRecord.php
@@ -30,11 +30,25 @@ abstract class AbstractGetRecord
         return $this->filters->only(self::DECORATION_FILTERS);
     }
 
+    // /**
+    //  * @param null|string $json
+    //  * @return array
+    //  */
+    // public function deserializeFilters(?string $json): array {
+    //     return $json !== null ? collect(json_decode($json))->toArray() : [];
+    // }
+
     /**
-     * @param null|string $json
+     * @param null|string $param
      * @return array
      */
-    public function deserializeFilters(?string $json): array {
+    public function deserializeFilters($param): array {
+        if(gettype($param) == "array"){
+            $json = implode(',', $param);
+        }
+        else{
+            $json = $param;
+        }
         return $json !== null ? collect(json_decode($json))->toArray() : [];
     }
 
@@ -50,9 +64,9 @@ abstract class AbstractGetRecord
      * @param array $filters
      * @return mixed
      */
-    public function handler(array $filters){
+    public function handler(array $filters, array $params = []){
         $this->filters = collect($filters);
-        return $this->getResults($this->applyFiltersToQuery());
+        return $this->getResults($this->applyFiltersToQuery(), $params);
     }
 
 
@@ -65,6 +79,6 @@ abstract class AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    abstract function getResults(Builder $query);
+    abstract function getResults(Builder $query, array $params = []);
 
-}
\ No newline at end of file
+}
diff --git a/app/Classes/General/Eloquent/AbstractListRecord.php b/app/Classes/General/Eloquent/AbstractListRecord.php
index 7b7d0df9..f898f108 100644
--- a/app/Classes/General/Eloquent/AbstractListRecord.php
+++ b/app/Classes/General/Eloquent/AbstractListRecord.php
@@ -17,11 +17,11 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @return mixed
      * @throws MalformedRequestException
      */
-    public function execute(array $filters = []){
+    public function execute(array $filters = [], array $param = []){
 
         try{
 
-            return $this->handler($filters);
+            return $this->handler($filters, $param);
 
         } catch (QueryException $exception){
             log::error($exception);
@@ -30,18 +30,24 @@ abstract class AbstractListRecord extends AbstractGetRecord
 
     }
 
+
     /**
      * @param Builder $query
      * @return mixed
      */
-    public function getResults(Builder $query) {
+    public function getResults(Builder $query, array $param = []) {
         $filters = $this->getDecorationFilters();
 
         if($filters->has('order_by')){
             $query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
         }
 
-        return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
+        if(!empty($param)){
+            return $filters->has('per_page') ? $query->paginate($filters->get('per_page'), ['*'], 'page', $param['page']) : $query->get(); //page data from query parameters e.g ?page=1
+        }
+        else{
+            return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
+        }
 
     }
 
diff --git a/app/Classes/General/Eloquent/Filters/JobId.php b/app/Classes/General/Eloquent/Filters/JobId.php
new file mode 100644
index 00000000..42ac51a4
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/JobId.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class JobId implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('job_id', $value);
+    }
+
+}
diff --git a/app/Classes/General/Helper.php b/app/Classes/General/Helper.php
index ac89540b..45c72f53 100644
--- a/app/Classes/General/Helper.php
+++ b/app/Classes/General/Helper.php
@@ -2,6 +2,7 @@
 
 namespace App\Classes\General;
 
+use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\Log;
 
 use Illuminate\Support\Str;
@@ -42,4 +43,27 @@ class Helper
             }
         }
     }
+
+    /**
+     * @param null|string $param
+     * @return array
+     */
+    static function deserializeFilters($param): array {
+        if(gettype($param) == "array"){
+            $json = implode(',', $param);
+        }
+        else{
+            $json = $param;
+        }
+        return $json !== null ? collect(json_decode($json))->toArray() : [];
+    }
+
+    /**
+     * @param ResourceCollection $collection
+     * @return array
+     */
+    static function collectionResponse(ResourceCollection $collection){
+        return json_decode($collection->response()->getContent(), true);
+    }
+
 }
diff --git a/app/Classes/Jobs/ListBookingsJob.php b/app/Classes/Jobs/ListBookingsJob.php
new file mode 100644
index 00000000..41f976a6
--- /dev/null
+++ b/app/Classes/Jobs/ListBookingsJob.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\Bookings\Processors\ListBookingsJobProcessor;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\JobResult;
+use Illuminate\Support\Facades\Log;
+
+class ListBookingsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var ListGenericJobObject */
+    private $listGenericJobObject;
+
+    private $jobId;
+
+    /**
+     * ListBookingsJob constructor.
+     * @param ListGenericJobObject $listGenericJobObject
+     */
+    public function __construct(ListGenericJobObject $listGenericJobObject)
+    {
+        $this->listGenericJobObject = $listGenericJobObject;
+    }
+
+    public function handle()
+    {
+        $rawPayload = $this->job->payload();
+        if(isset($rawPayload['data']['commandName'])){
+            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
+        }
+
+        if(isset($rawPayload['data']['command'])){
+            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
+        }
+
+        $result = (App()->make(ListBookingsJobProcessor::class))->execute($this->listGenericJobObject);
+    }
+
+    public function getJobId(){
+        return $this->job->getJobId();
+    }
+}
diff --git a/app/Classes/Jobs/ListDocumentsJob.php b/app/Classes/Jobs/ListDocumentsJob.php
new file mode 100644
index 00000000..bbadc169
--- /dev/null
+++ b/app/Classes/Jobs/ListDocumentsJob.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\Documents\Processors\ListDocumentsJobProcessor;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\JobResult;
+use Illuminate\Support\Facades\Log;
+
+class ListDocumentsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var ListGenericJobObject */
+    private $listGenericJobObject;
+
+    private $jobId;
+
+    /**
+     * ListDocumentsJob constructor.
+     * @param ListGenericJobObject $listGenericJobObject
+     */
+    public function __construct(ListGenericJobObject $listGenericJobObject)
+    {
+        $this->listGenericJobObject = $listGenericJobObject;
+    }
+
+    public function handle()
+    {
+        $rawPayload = $this->job->payload();
+        if(isset($rawPayload['data']['commandName'])){
+            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
+        }
+
+        if(isset($rawPayload['data']['command'])){
+            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
+        }
+
+        $result = (App()->make(ListDocumentsJobProcessor::class))->execute($this->listGenericJobObject);
+
+        //cief todo: Insert into DB: job id, query result, timestamp
+        // Store the result in the job_results table
+
+        //cief todo: why cannot save data in table like this
+        // $model = new JobResult();
+        // $model->job_id = $this->job->getJobId();
+        // $model->result = json_encode($result);
+        // $model->save();
+
+        // Log::error(json_encode($model->id));
+    }
+
+    public function getJobId(){
+        return $this->job->getJobId();
+    }
+}
diff --git a/app/Classes/Jobs/ListTransactionsJob.php b/app/Classes/Jobs/ListTransactionsJob.php
new file mode 100644
index 00000000..6b8913a2
--- /dev/null
+++ b/app/Classes/Jobs/ListTransactionsJob.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\Transactions\Processors\ListTransactionsJobProcessor;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\JobResult;
+use Illuminate\Support\Facades\Log;
+
+class ListTransactionsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var ListGenericJobObject */
+    private $listGenericJobObject;
+
+    private $jobId;
+
+    /**
+     * ListTransactionsJob constructor.
+     * @param ListGenericJobObject $listGenericJobObject
+     */
+    public function __construct(ListGenericJobObject $listGenericJobObject)
+    {
+        $this->listGenericJobObject = $listGenericJobObject;
+    }
+
+    public function handle()
+    {
+        $rawPayload = $this->job->payload();
+        if(isset($rawPayload['data']['commandName'])){
+            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
+        }
+
+        if(isset($rawPayload['data']['command'])){
+            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
+        }
+
+        $result = (App()->make(ListTransactionsJobProcessor::class))->execute($this->listGenericJobObject);
+    }
+
+    public function getJobId(){
+        return $this->job->getJobId();
+    }
+}
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
new file mode 100644
index 00000000..c87751a3
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
@@ -0,0 +1,56 @@
+<?php
+
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Jobs\ListBookingsJob;
+use App\Classes\Modules\Bookings\Standards\Rules\CanListBookings;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class ListBookingJobLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'List Booking Job',
+            'message' => 'You have successfully submit a job to list bookings'
+        ];
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $jobId = uniqid();
+
+        $user = Auth::user();
+        $userInfo = (object) [
+            'email' => $user->email,
+            'type' => $user->type,
+        ];
+
+        $listGenericJobObject = new ListGenericJobObject(
+            $request->fullUrl(),
+            $request->all(),
+            $jobId,
+            $userInfo
+        );
+
+        ListBookingsJob::dispatch($listGenericJobObject);
+
+        $result = [];
+        $result['job_id'] = $jobId;
+
+        return $this->response(['data' => $result]);
+    }
+
+}
diff --git a/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
new file mode 100644
index 00000000..6ded2977
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Processors;
+
+use App\Classes\Modules\Bookings\Services\ListsBookings;
+use App\Classes\Modules\Jobs\Services\CreatesJobResult;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Helper;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+use App\Http\Resources\BookingResource;
+
+class ListBookingsJobProcessor
+{
+
+    /** @var ListsBookings */
+    private $listsBookings;
+
+    /** @var CreatesJobResult */
+    private $createsJobResult;
+
+    /**
+     * ListBookingsJobProcessor constructor.
+     * @param ListsBookings $listsBookings
+     * @param CreatesJobResult $createsJobResult
+     */
+    public function __construct(ListsBookings $listsBookings, CreatesJobResult $createsJobResult)
+    {
+        $this->listsBookings = $listsBookings;
+        $this->createsJobResult = $createsJobResult;
+    }
+
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @return null|object
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject) {
+
+        $query = $this->listsBookings->execute($this->listsBookings->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
+        foreach ($query->items() as &$item) {
+            $item['userInfo'] = $listGenericJobObject->getUserInfo();
+        }
+
+        //cief todo: remove comments
+        $result = Helper::collectionResponse(BookingResource::collection($query));
+
+        // $result = new JobBookingCollectionResponse($query, $listGenericJobObject->getuserInfo());
+        // $result = $this->collectionResponse(new BookingResourceCollection(BookingResource::collection($query), $listGenericJobObject->getuserInfo()));
+
+        $create = $this->createsJobResult->execute($listGenericJobObject, json_encode($result));
+
+        return $create;
+    }
+}
diff --git a/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
new file mode 100644
index 00000000..041bb9c8
--- /dev/null
+++ b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Classes\Modules\Documents\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Documents\Services\ListsDocuments;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use App\Classes\Jobs\ListDocumentsJob;
+use App\Http\Resources\DocumentResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\General\Helper;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Auth;
+
+class ListDocumentJobLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'List Document Job',
+            'message' => 'You have successfully submit a job to list documents'
+        ];
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $jobId = uniqid();
+
+        $user = Auth::user();
+        $userInfo = (object) [
+            'email' => $user->email,
+            'type' => $user->type,
+        ];
+
+
+        $listGenericJobObject = new ListGenericJobObject(
+            $request->fullUrl(),
+            $request->all(),
+            $jobId,
+            $userInfo
+        );
+
+        ListDocumentsJob::dispatch($listGenericJobObject);
+
+        //cief todo: remove comments
+        // // Create your job instance with delay, so we can back here within delay and take control in our hands.
+        // $job = new ListDocuments($listGenericJobObject);
+        // $job->delay(now()->addSeconds(5));
+
+        // // Dispath your job with our custom_dispatch helper. This will return job id from jobs table
+        // // $jobId = $this->custom_dispatch($job);
+
+
+        $result = [];
+        $result['job_id'] = $jobId;
+
+        return $this->response(['data' => $result]);
+    }
+
+    //cief todo: no longer need jobId
+    // function custom_dispatch($job): int {
+    //     return app(\Illuminate\Contracts\Bus\Dispatcher::class)->dispatch($job);
+    // }
+}
diff --git a/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
new file mode 100644
index 00000000..eb7cf1c4
--- /dev/null
+++ b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Processors;
+
+use App\Classes\Modules\Documents\Services\ListsDocuments;
+use App\Classes\Modules\Jobs\Services\CreatesJobResult;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Helper;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use App\Http\Controllers\Documents\ListDocumentsController;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+use App\Http\Resources\DocumentResource;
+
+class ListDocumentsJobProcessor
+{
+
+    /** @var ListsDocuments */
+    private $listsDocuments;
+
+    /** @var CreatesJobResult */
+    private $createsJobResult;
+
+    /**
+     * ListDocumentsJobProcessor constructor.
+     * @param ListsDocuments $listsDocuments
+     * @param CreatesJobResult $createsJobResult
+     */
+    public function __construct(ListsDocuments $listsDocuments, CreatesJobResult $createsJobResult)
+    {
+        $this->listsDocuments = $listsDocuments;
+        $this->createsJobResult = $createsJobResult;
+    }
+
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @return null|object
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject) {
+
+        $query = $this->listsDocuments->execute($this->listsDocuments->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
+        foreach ($query->items() as &$item) {
+            $item['userInfo'] = $listGenericJobObject->getUserInfo();
+        }
+
+        $result = Helper::collectionResponse(DocumentResource::collection($query));
+
+        $create = $this->createsJobResult->execute($listGenericJobObject, json_encode($result));
+
+        return $create;
+    }
+}
diff --git a/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php b/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
new file mode 100644
index 00000000..366fda8c
--- /dev/null
+++ b/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Jobs\Services\FetchesJobResult;
+use App\Http\Resources\JobResultResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchJobResultLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Data',
+            'message' => 'You have successfully retrieved data'
+        ];
+    }
+
+    /** @var FetchesJobResult */
+    private $fetchesJobResult;
+
+    /**
+     * FetchJobResultLogic constructor.
+     * @param FetchesJobResult $fetchesJobResult
+     */
+    public function __construct(FetchesJobResult $fetchesJobResult)
+    {
+        $this->fetchesJobResult = $fetchesJobResult;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->fetchesJobResult->execute(['job_id' => $request->route('job_id')]);
+
+        return $this->resourceResponse(new JobResultResource($query));
+
+    }
+
+}
diff --git a/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php b/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
new file mode 100644
index 00000000..365cd316
--- /dev/null
+++ b/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\DataTransferObjects;
+
+use Illuminate\Http\Request;
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ListGenericJobObject implements DataTransferObject
+{
+    /** @var string */
+    private $name;
+
+    /** @var array */
+    private $payload;
+
+    /** @var string */
+    private $jobId;
+
+    /** @var object */
+    private $userInfo;
+
+    /** @var string */
+    private $jobCommandName;
+
+    /** @var string */
+    private $jobCommand;
+
+    public function __construct(string $name, array $payload, string $jobId, object $userInfo = null)
+    {
+        $this->name = $name;
+        $this->payload = $payload;
+        $this->jobId = $jobId;
+        $this->userInfo = $userInfo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return array
+     */
+    public function getPayload(): array
+    {
+        return $this->payload;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobId(): string
+    {
+        return $this->jobId;
+    }
+
+    /**
+     * @return object
+     */
+    public function getUserInfo(): object
+    {
+        return $this->userInfo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommandName(): string
+    {
+        return $this->jobCommandName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommand(): string
+    {
+        return $this->jobCommand;
+    }
+
+    // public function setJobId(int $jobId)
+    // {
+    //     $this->jobId = $jobId;
+    // }
+
+    public function setJobCommandName(string $jobCommandName)
+    {
+        $this->jobCommandName = $jobCommandName;
+    }
+
+    public function setJobCommand(string $jobCommand)
+    {
+        $this->jobCommand = $jobCommand;
+    }
+
+}
diff --git a/app/Classes/Modules/Jobs/Services/CreatesJobResult.php b/app/Classes/Modules/Jobs/Services/CreatesJobResult.php
new file mode 100644
index 00000000..00acc1eb
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Services/CreatesJobResult.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\JobResult;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+
+class CreatesJobResult extends AbstractUpdateRecord
+{
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @param string $result
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject, string $result)
+    {
+        $model = new JobResult();
+        $model->job_id = $listGenericJobObject->getJobId();
+        $model->result = $result;
+        $model->url = $listGenericJobObject->getName();
+        $model->job_command_name = $listGenericJobObject->getJobCommandName();
+        $model->job_command = $listGenericJobObject->getJobCommand();
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Services/FetchesJobResult.php b/app/Classes/Modules/Jobs/Services/FetchesJobResult.php
new file mode 100644
index 00000000..1cc99cb6
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Services/FetchesJobResult.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\JobResult;
+
+class FetchesJobResult extends AbstractFetchRecord
+{
+
+    /** @var JobResult */
+    private $repository;
+
+    /**
+     * FetchesJobResult constructor.
+     * @param JobResult $repository
+     */
+    public function __construct(JobResult $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
new file mode 100644
index 00000000..d317d7eb
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
@@ -0,0 +1,47 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Jobs\ListTransactionsJob;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListTransactionsJobLogic extends AbstractControllerLogic
+{
+  /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'List Transaction Job',
+            'message' => 'You have successfully submit a job to list transactions'
+        ];
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $jobId = uniqid();
+
+        $listGenericJobObject = new ListGenericJobObject(
+            $request->fullUrl(),
+            $request->all(),
+            $jobId
+        );
+
+        ListTransactionsJob::dispatch($listGenericJobObject);
+
+        $result = [];
+        $result['job_id'] = $jobId;
+
+        return $this->response(['data' => $result]);
+    }
+
+}
diff --git a/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
new file mode 100644
index 00000000..36671c89
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\Modules\Jobs\Services\CreatesJobResult;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Helper;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+use App\Http\Resources\TransactionResource;
+
+class ListTransactionsJobProcessor
+{
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    /** @var CreatesJobResult */
+    private $createsJobResult;
+
+    /**
+     * ListTransactionsJobProcessor constructor.
+     * @param ListsTransactions $listsTransactions
+     * @param CreatesJobResult $createsJobResult
+     */
+    public function __construct(ListsTransactions $listsTransactions, CreatesJobResult $createsJobResult)
+    {
+        $this->listsTransactions = $listsTransactions;
+        $this->createsJobResult = $createsJobResult;
+    }
+
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @return null|object
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject) {
+
+        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
+
+        $result = Helper::collectionResponse(TransactionResource::collection($query));
+
+        $create = $this->createsJobResult->execute($listGenericJobObject, json_encode($result));
+
+        return $create;
+    }
+}
diff --git a/app/Http/Controllers/Bookings/ListBookingsJobController.php b/app/Http/Controllers/Bookings/ListBookingsJobController.php
new file mode 100644
index 00000000..9b32fc77
--- /dev/null
+++ b/app/Http/Controllers/Bookings/ListBookingsJobController.php
@@ -0,0 +1,22 @@
+<?php
+
+
+namespace App\Http\Controllers\Bookings;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Bookings\ControllersLogic\ListBookingJobLogic;
+
+
+class ListBookingsJobController
+{
+    /**
+     * @param Request $request
+     * @param ListBookingJobLogic $logic
+     * @return JsonResponse
+     */
+
+    public function list(Request $request, ListBookingJobLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Documents/ListDocumentsJobController.php b/app/Http/Controllers/Documents/ListDocumentsJobController.php
new file mode 100644
index 00000000..8b763085
--- /dev/null
+++ b/app/Http/Controllers/Documents/ListDocumentsJobController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Documents;
+
+use App\Classes\Modules\Documents\ControllersLogic\ListDocumentJobLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListDocumentsJobController
+{
+    /**
+     * @param Request $request
+     * @param ListDocumentJobLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListDocumentJobLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Jobs/FetchJobResultController.php b/app/Http/Controllers/Jobs/FetchJobResultController.php
new file mode 100644
index 00000000..cfef2f5c
--- /dev/null
+++ b/app/Http/Controllers/Jobs/FetchJobResultController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Jobs;
+
+use App\Classes\Modules\Jobs\ControllersLogic\FetchJobResultLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchJobResultController
+{
+    /**
+     * @param Request $request
+     * @param FetchJobResultLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchJobResultLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Transactions/ListTransactionsJobController.php b/app/Http/Controllers/Transactions/ListTransactionsJobController.php
new file mode 100644
index 00000000..fb341d5d
--- /dev/null
+++ b/app/Http/Controllers/Transactions/ListTransactionsJobController.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\ListTransactionsJobLogic;
+
+
+class ListTransactionsJobController
+{
+    /**
+     * @param Request $request
+     * @param ListTransactionsJobLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListTransactionsJobLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index f3a7881d..c3c2e24d 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -11,10 +11,18 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Illuminate\Support\Facades\Log;
 
 class BookingResource extends JsonResource
 {
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo ?? ($resource->userInfo ?? null);
+    }
 
     /**
      * Transform the resource into an array.
@@ -27,7 +35,7 @@ class BookingResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'company' => new CompanyResource($this->company),
+            'company' => new CompanyResource($this->company, $this->userInfo),
             'bank' => new BankResource($this->bank),
             'service' => new ServiceTypeResource($this->service),
             'marking' => $this->marking,
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index 85ecee16..df3bcf49 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -19,6 +19,14 @@ use Illuminate\Support\Facades\Log;
 
 class CompanyResource extends JsonResource
 {
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo;
+    }
+
     /**
      * Transform the resource into an array.
      *
@@ -33,6 +41,26 @@ class CompanyResource extends JsonResource
         $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
         $serviceCharge = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $this->id)->first();
 
+        $userResource = null;
+
+        $userInfoEmail = $this->userInfo && isset($this->userInfo->email) ? $this->userInfo->email : null;
+        $userInfoType = $this->userInfo && isset($this->userInfo->type) ? $this->userInfo->type : null;
+
+        if(!$userInfoEmail && Auth::user()){
+            $userInfoEmail = Auth::user()->email;
+        }
+        if(!$userInfoType && Auth::user()){
+            $userInfoType = Auth::user()->type;
+        }
+
+        //cief todo: remove
+        // Log::error('CompanyResource 1: '. json_encode($userInfoEmail));
+        // Log::error('CompanyResource 2: '. json_encode($userInfoType));
+
+        if(!is_null($userInfoEmail) && !is_null($userInfoType)){
+            $userResource = new UserResource($userInfoType === RoleTypes::USER ? $this->employees()->where('email', '=',  $userInfoEmail)->first() : $this->employees()->orderBy('id', 'DESC')->first());
+        }
+
         return [
             'id' => $this->id,
             'name' => $this->name,
@@ -43,7 +71,8 @@ class CompanyResource extends JsonResource
             'status' => (int) $this->status,
             'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
             'address' => new AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())),
-            'employee' => new UserResource(Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()),
+            //cief todo: this one need to decide what to do to replace Auth:user() when it is run by job queue
+            'employee' =>  $userResource,
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
             'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
             'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
diff --git a/app/Http/Resources/DocumentResource.php b/app/Http/Resources/DocumentResource.php
index 59933a67..6f9ade71 100644
--- a/app/Http/Resources/DocumentResource.php
+++ b/app/Http/Resources/DocumentResource.php
@@ -8,6 +8,9 @@ use App\Models\Document;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 
 class DocumentResource extends JsonResource
 {
@@ -24,7 +27,7 @@ class DocumentResource extends JsonResource
             'reference' => $this->reference,
             'status' => (int) $this->status,
             'document_type' => $this->document_type,
-            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingResource($this->owner) : new CompanyResource($this->owner)) : null,
+            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingResource($this->owner, $this->userInfo) : new CompanyResource($this->owner, $this->userInfo)) : null,
             'files' => FileResource::collection($this->files),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
         ];
diff --git a/app/Http/Resources/JobResultResource.php b/app/Http/Resources/JobResultResource.php
new file mode 100644
index 00000000..51bc1898
--- /dev/null
+++ b/app/Http/Resources/JobResultResource.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class JobResultResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'job_id' => $this->job_id,
+            'result' => $this->result,
+        ];
+    }
+}
diff --git a/app/Models/JobResult.php b/app/Models/JobResult.php
new file mode 100644
index 00000000..f30b5076
--- /dev/null
+++ b/app/Models/JobResult.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+class JobResult extends AbstractModel
+{
+    protected $table = 'job_results';
+
+    public $fillable = [
+        'job_id',
+        'result'
+   ];
+}
diff --git a/database/migrations/2023_08_08_124848_create_job_results_table.php b/database/migrations/2023_08_08_124848_create_job_results_table.php
new file mode 100644
index 00000000..ef448407
--- /dev/null
+++ b/database/migrations/2023_08_08_124848_create_job_results_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateJobResultsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('job_results', function (Blueprint $table) {
+            $table->id();
+            $table->string('job_id', 50);
+            $table->longText('result')->nullable();
+            $table->timestamps();
+
+            // $table->foreign('job_id')->references('id')->on('jobs')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('job_results');
+    }
+}
diff --git a/database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php b/database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php
new file mode 100644
index 00000000..8e6b8342
--- /dev/null
+++ b/database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNewColumnToJobResultsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('job_results', function (Blueprint $table) {
+            $table->longText('url')->after('result')->nullable();
+            $table->string('job_command_name')->after('url')->nullable();
+            $table->longText('job_command')->after('job_command_name')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('job_results', function (Blueprint $table) {
+            $table->dropColumn('url');
+            $table->dropColumn('job_command_name');
+            $table->dropColumn('job_command');
+        });
+    }
+}
diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
index 7df9c125..e6b66dcf 100644
--- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -117,11 +117,17 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
+                                     <!-- CIEF TODO: For easy revert to old code -->
+                                    <!-- <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
                                         <template slot="list" slot-scope="{data}">
                                             <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
                                         </template>
-                                    </list-component>
+                                    </list-component> -->
+                                    <list-polling-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list.job')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
+                                        <template slot="list" slot-scope="{data}">
+                                            <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
+                                        </template>
+                                    </list-polling-component>
                                 </div>
                             </div>
                         </div>
@@ -165,7 +171,7 @@
             }
         },
         created(){
-            this.submit(route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]}), 'get', 'pendingOrdersSection', false, false)
+            this.submit(route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]}), 'get', 'pendingOrdersSection', false, false); //cief todo: Uncaught (in promise) null
         },
         methods: {
             successHandler(response){
@@ -210,4 +216,4 @@
 
 
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/vue/components/general/elements/ListPollingComponent.vue b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
new file mode 100644
index 00000000..98e2a44b
--- /dev/null
+++ b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
@@ -0,0 +1,204 @@
+<template>
+    <transition-component group enter-class="animate__animated animate__fadeInUp animate__delay-1 animate__faster p-r-30" leave-class="animate__animated animate__fadeOutDown animate__faster p-r-30" style="min-height: 300px;width:100%">
+        <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+        <div class="row" key="2" v-show="!$store.getters.isLoading(section)">
+            <div class="col">
+                <div class="row">
+                    <div class="col">
+                        <div class="row align-items-center justify-content-center p-t-50 p-b-50"  v-show="!$store.getters.getListData(section).length && !isLoading && emptyListSection">
+                            <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;">Nothing To Show Here</p>
+                                            </div>
+                                        </div>
+                                        <div class="row m-t-5 align-items-center justify-content-center">
+                                            <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>
+                        <div class="row" v-show="!isLoading">
+                            <div class="col">
+                                <div class="list disable-text-selection" data-check-all="checkAll">
+                                    <div class="row" ref="list" v-for="item in $store.getters.getListData(section)" v-bind:key="item.id" :data="item">
+                                        <div class="col">
+                                            <slot name="list" :data="item"></slot>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row" v-show="!isLoading">
+                            <div class="col">
+                                <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </transition-component>
+</template>
+
+<script>
+    export default {
+        props: {
+            section:{
+                type: String,
+                required: true
+            },
+            endpoint: {
+                type: String,
+                required: true
+            },
+            options: {
+                default () {
+                    return {}
+                }
+            },
+            emptyListSection: {
+                type: Boolean,
+                default: true,
+            }
+        },
+        data(){
+            return {
+                filters: this.options,
+                pollingInterval: null,
+                isPolling: false,
+                isLoading: false,
+            }
+        },
+        created(){
+            this.setDecoratorDefault();
+            this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters}); //cief todo: Uncaught (in promise) null
+        },
+        computed: {
+            pendingList () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingList(inComplete){
+                if(inComplete){
+                    this.fetchList();
+                }
+            }
+        },
+        methods: {
+            fetchList(){
+                let listDecorators = this.$store.getters.getListDetails(this.section);
+                let url = this.endpoint + '?page=' + listDecorators.page + '&filters=' + JSON.stringify(listDecorators.filters);
+                this.isLoading = true;
+                this.submitJob(url);
+            },
+            //cief todo: remove?
+            // updateFilters(filters){
+            //     this.filters = filters;
+            //     this.setDecoratorDefault();
+            //     console.log('updateFilters');
+            //     this.submit(this.endpoint + '?page=1&filters=' + JSON.stringify(this.filters), 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
+            // },
+            successHandler(response){
+                let result = JSON.parse(response.payload.data.result);
+                result.meta = {
+                    current_page: result.meta.current_page,
+                    first_page_url: result.meta.first_page_url,
+                    from: result.meta.from,
+                    last_page: result.meta.last_page,
+                    last_page_url: result.meta.last_page_url,
+                    next_page_url: result.meta.next_page_url,
+                    path: result.meta.path,
+                    per_page: result.meta.per_page,
+                    prev_page_url: result.meta.prev_page_url,
+                    to: result.meta.to,
+                    total: result.meta.total
+                };
+
+                console.log('ListPolling:', JSON.stringify(result.meta));
+                this.stopPolling();
+                this.$store.dispatch('completeList', {'name': this.section, 'data': result.data});
+                this.$refs.pagination.makePagination(result.meta, result.links);
+                this.isLoading = false;
+            },
+            errorHandler(error){
+                // console.log('ListPolling error:', JSON.stringify(error));
+                this.isPolling = false;
+                // this.isLoading = false;
+            },
+            startPolling(jobId, maxAttempts = 3) {
+                let attempts = 0;
+                const pollJobResult = () => {
+                    if (this.isPolling) {
+                        return;
+                    }
+                    this.isPolling = true;
+
+                    attempts++;
+
+                    if (attempts > maxAttempts) {
+                        clearInterval(this.pollingInterval);
+                        this.pollingInterval = null;
+                        this.isPolling = false;
+                        this.isLoading = false;
+                        console.log(`Reached maximum attempts (${maxAttempts}). Polling stopped.`);
+                        return;
+                    }
+
+                    this.fetchJobResult(jobId);
+                };
+
+                // Initial call
+                // pollJobResult();
+
+                // Set up polling interval
+                this.pollingInterval = setInterval(pollJobResult, 10000);
+
+            },
+            stopPolling() {
+                clearInterval(this.pollingInterval);
+                this.pollingInterval = null;
+                this.isPolling = false;
+            },
+            submitJob(url){
+                try {
+                    this.$store.dispatch('crudRequest', {endpoint: url, method: 'get'}).then(response => {
+                        let success = response.ok;
+                        response.json().then(response => {
+                            if(!success){return;}
+                            let jobId = response.payload.data.job_id;
+                            if(jobId){
+                                this.startPolling(jobId);
+                            }
+                        });
+                    })
+                    // this.job.progress = response.data.progress;
+                    // this.job.completed = response.data.completed;
+
+                    // if (this.job.completed) {
+                    //     this.stopPolling();
+                    // }
+                } catch (error) {
+                    console.error('Error submitJob', error);
+                }
+            },
+            fetchJobResult(jobId) {
+                try {
+                    let anotherEndpoint = route('api.job.fetch', jobId);
+                    this.submit(anotherEndpoint, 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
+                } catch (error) {
+                    console.error('Error fetchJobResult', error);
+                }
+            }
+        }
+    }
+</script>
diff --git a/routes/api.php b/routes/api.php
index 8b4bada0..460bd772 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -67,6 +67,10 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         require __DIR__ . '/milestone.php';
 
+        // require __DIR__ . '/accounting.php'; //cief todo: To check if this is needed
+
+        require __DIR__ . '/job.php';
+
 //        require __DIR__ . '/rate.php';
 //        require __DIR__ . '/receipt.php';
 
diff --git a/routes/currency.php b/routes/currency.php
index b621aad6..ba55c9a2 100644
--- a/routes/currency.php
+++ b/routes/currency.php
@@ -1,4 +1,4 @@
-    <?php
+<?php
 
 use Illuminate\Support\Facades\Route;
 
diff --git a/routes/document.php b/routes/document.php
index c186032f..07a7d18a 100644
--- a/routes/document.php
+++ b/routes/document.php
@@ -4,9 +4,10 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'document', 'as' => 'document.', 'namespace' => 'Documents'], function () {
     Route::get('/list', 'ListDocumentsController@list')->name('list');
+    Route::get('/list/job', 'ListDocumentsJobController@list')->name('list.job');
     Route::delete('/{id}/delete', 'DeleteDocumentController@delete')->name('delete');
     Route::put('/{id}/approve', 'ApproveDocumentController@approve')->name('status.approve');
     Route::put('/{id}/reject', 'RejectDocumentController@reject')->name('status.reject');
 
     Route::put('/{id}/reference/update', 'UpdateDocumentReferenceController@update')->name('reference.update');
-});
\ No newline at end of file
+});
diff --git a/routes/job.php b/routes/job.php
new file mode 100644
index 00000000..f32d142e
--- /dev/null
+++ b/routes/job.php
@@ -0,0 +1,7 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'job', 'as' => 'job.', 'namespace' => 'Jobs'], function () {
+    Route::get('/fetch/{job_id}', 'FetchJobResultController@fetch')->name('fetch');
+});

From 6da337b9dc50e1beb1cef220d2afcbafb37a698e Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sat, 30 Dec 2023 01:26:58 +0800
Subject: [PATCH 18/40] Code sync from Shipping Portal, independent deployment
 of Vue Polling, additional amendment to run Vue Polling at /billings

---
 ..._add_new_column_2_to_job_results_table.php |  34 +++++
 .../AdminPaymentsBillingSectionComponent.vue  | 136 ++++++++++++++++++
 .../vue/general/mixins/aws/requestV2.js       |  49 +++++++
 .../assets/vue/general/mixins/tabHandler.js   |  24 ++++
 .../assets/vue/vuex/modules/crudRequestV2.js  |  47 ++++++
 resources/assets/vue/vuex/store.js            |   4 +-
 resources/views/pages/billings.blade.php      | 126 +---------------
 7 files changed, 295 insertions(+), 125 deletions(-)
 create mode 100644 database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php
 create mode 100644 resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
 create mode 100644 resources/assets/vue/general/mixins/aws/requestV2.js
 create mode 100644 resources/assets/vue/general/mixins/tabHandler.js
 create mode 100644 resources/assets/vue/vuex/modules/crudRequestV2.js

diff --git a/database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php b/database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php
new file mode 100644
index 00000000..12c6d57f
--- /dev/null
+++ b/database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNewColumn2ToJobResultsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('job_results', function (Blueprint $table) {
+            $table->string('request_signature')->after('job_id')->nullable();
+            $table->string('result_signature')->after('request_signature')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('job_results', function (Blueprint $table) {
+            $table->dropColumn('request_signature');
+            $table->dropColumn('result_signature');
+        });
+    }
+}
diff --git a/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
new file mode 100644
index 00000000..03244ff4
--- /dev/null
+++ b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
@@ -0,0 +1,136 @@
+<template>
+    <div class="row tabsContainer">
+        <div class="col">
+            <div class="row m-l-0 m-r-0 d-flex">
+                <div class="col">
+                    <div class="row justify-content-end">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="invoice" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path><path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path><path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path><path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Invoice</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchase-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Purchase Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Delivery Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="supplier-delivery-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Supplier Delivery Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row no-margin">
+                <div class="col bg-white padding-25">
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice" v-if="isActiveTab('invoice') || showTabContent('invoice')">
+                        <list-polling-component key="2" section="invoiceSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                        </div>
+                        <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order" v-if="isActiveTab('purchase-order') || showTabContent('purchase-order')">
+                        <list-polling-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                        </div>
+                        <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order" v-if="isActiveTab('delivery-order') || showTabContent('delivery-order')">
+                        <list-polling-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order" v-if="isActiveTab('supplier-delivery-order') || showTabContent('supplier-delivery-order')">
+                        <list-polling-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                    </div>
+                    </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import tabHandler from '../../../general/mixins/tabHandler';
+    export default {
+        data() {
+            return {
+                activeTab: 'invoice',
+                displayedTabs: ['invoice'],
+            };
+        },
+        mixins: [tabHandler]
+    }
+</script>
diff --git a/resources/assets/vue/general/mixins/aws/requestV2.js b/resources/assets/vue/general/mixins/aws/requestV2.js
new file mode 100644
index 00000000..12b27542
--- /dev/null
+++ b/resources/assets/vue/general/mixins/aws/requestV2.js
@@ -0,0 +1,49 @@
+export default {
+    methods: {
+        poll(url, method, section, successNotification = true, errorNotification = true){
+            if(!this.validate()){ return; }
+            if (section) {
+                this.$store.dispatch('toggleLoading', {name: section, status: true})
+            }
+            this.$store.dispatch('crudRequestV2', {
+                endpoint: url,
+                method: method,
+                parameters: this.parameters
+            }).then(response => {
+                let statusCode = response.status,
+                    success = response.ok;
+
+                response.json().then(response => {
+
+                    if(!success){
+                        this.openModal();
+                        errorNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'error'}): null;
+                        this.errorHandler(response, statusCode); return;
+                    }
+
+                    successNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'success'}): null;
+                    this.successHandler(response)
+
+
+                });
+            }).catch((error) => {
+                this.$store.dispatch('createNotification', {title: 'Unexpected Error', message: 'An unexpected error has occurred. Try again!', type: 'error'});
+            }).then(() => {
+                if (section) {
+                    this.$store.dispatch('toggleLoading', {name: section, status: false})
+                }
+            })
+
+        },
+        validate() {
+            if(this.$v){
+                this.$v.$touch();
+                return !this.$v.$invalid;
+            }
+            return true;
+        },
+        successHandler(response){},
+        errorHandler(response){}
+    }
+
+}
diff --git a/resources/assets/vue/general/mixins/tabHandler.js b/resources/assets/vue/general/mixins/tabHandler.js
new file mode 100644
index 00000000..81790ed0
--- /dev/null
+++ b/resources/assets/vue/general/mixins/tabHandler.js
@@ -0,0 +1,24 @@
+export default {
+    data() {
+        return {
+            activeTab: null,
+            displayedTabs: [],
+        };
+    },
+    methods: {
+        setActiveTab(event) {
+            const tabName = event.currentTarget.getAttribute('tab-name');
+            // console.log(`Tab "${tabName}" clicked`);
+            this.activeTab = tabName;
+            if (!this.displayedTabs.includes(tabName)) {
+                this.displayedTabs.push(tabName);
+            }
+        },
+        isActiveTab(tabName) {
+            return this.activeTab === tabName;
+        },
+        showTabContent(tabName) {
+            return this.displayedTabs.includes(tabName);
+        },
+    },
+}
diff --git a/resources/assets/vue/vuex/modules/crudRequestV2.js b/resources/assets/vue/vuex/modules/crudRequestV2.js
new file mode 100644
index 00000000..2445190e
--- /dev/null
+++ b/resources/assets/vue/vuex/modules/crudRequestV2.js
@@ -0,0 +1,47 @@
+export default {
+    actions: {
+        crudRequestV2({getters, dispatch},  {endpoint, method, parameters}){
+            const queryDomain = endpoint.split('?')[0];
+            let encodedParams = endpoint.split('?')[1];
+            let decodedParams = fullyDecodeURI(encodedParams);
+            const queryParams = encodeURIComponent(decodedParams);
+            encodedParams = queryParams.toString();
+            let filteredEncodedParams = encodedParams.replace(/%3D/g,'=');
+            filteredEncodedParams = filteredEncodedParams.replace(/%26/g,'&');
+            let combinedAbsoluteUrl = queryDomain;
+            if(filteredEncodedParams !== undefined && filteredEncodedParams !== 'undefined'){
+                combinedAbsoluteUrl = queryDomain + '?' + filteredEncodedParams;
+            }
+
+            // return fetch(endpoint, {
+            return fetch(combinedAbsoluteUrl, {
+                method: method,
+                responseType: 'json',
+                body: parameters ? JSON.stringify(parameters):null,
+                headers: {
+                    'content-type': 'application/json',
+                    'Authorization': 'Bearer '+getters.getAccessToken
+                }
+            }).then(response => {
+                if(response.status === 401 && window.location.href !== route('login') && window.location.href.indexOf(route('last_mile_delivery.login')) <= -1){
+                    dispatch('userAuthentication', {access_token: '', redirect_url: [7, 8].includes(getters.getCompanyModuleType) ? route('last_mile_delivery.login') : route('login')});
+                }
+
+                return response;
+
+            })
+        }
+    }
+}
+
+function isEncoded(uri) {
+    uri = uri || '';
+    return uri !== decodeURIComponent(uri);
+}
+
+function fullyDecodeURI(uri){
+    while (isEncoded(uri)){
+        uri = decodeURIComponent(uri);
+    }
+    return uri;
+}
diff --git a/resources/assets/vue/vuex/store.js b/resources/assets/vue/vuex/store.js
index 2c3d911b..ff10c673 100644
--- a/resources/assets/vue/vuex/store.js
+++ b/resources/assets/vue/vuex/store.js
@@ -4,6 +4,7 @@ import toggleSection from './modules/toggleSection'
 import toggleLoading from './modules/toggleLoading'
 import createNotification from './modules/createNotification'
 import crudRequest from './modules/crudRequest'
+import crudRequestV2 from './modules/crudRequestV2'
 import authentication from './modules/authentication'
 import loadRequestQueue from './modules/loadRequestQueue'
 
@@ -16,6 +17,7 @@ export default new Vuex.Store({
         loadRequestQueue,
         createNotification,
         crudRequest,
+        crudRequestV2,
         authentication
     }
-})
\ No newline at end of file
+})
diff --git a/resources/views/pages/billings.blade.php b/resources/views/pages/billings.blade.php
index 4bc012d5..da84f8b9 100644
--- a/resources/views/pages/billings.blade.php
+++ b/resources/views/pages/billings.blade.php
@@ -3,129 +3,7 @@
     <div class="row" v-if="$store.getters.isAdmin">
         <div class="col p-t-15 p-b-15">
             <billing-component></billing-component>
-
-            <div class="row tabsContainer">
-                <div class="col">
-                    <div class="row m-l-0 m-r-0 d-flex">
-                        <div class="col">
-                            <div class="row justify-content-end">
-                                <div class="col">
-                                    <div class="row">
-                                        <div class="col b-r b-white">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="invoice">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                    width="35" height="35"
-                                                                    viewBox="0 0 172 172"
-                                                                    style=" fill:#000000;"><defs><linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path><path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path><path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path><path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path></g></g></svg>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5 all-caps">Invoice</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col b-r b-white">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchase-order">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                    width="35" height="35"
-                                                                    viewBox="0 0 172 172"
-                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5 all-caps">Purchase Order</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col b-r b-white">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery-order">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                    width="35" height="35"
-                                                                    viewBox="0 0 172 172"
-                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5 all-caps">Delivery Order</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col b-r b-white">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="supplier-delivery-order">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                    width="35" height="35"
-                                                                    viewBox="0 0 172 172"
-                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5 all-caps">Supplier Delivery Order</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row no-margin">
-                        <div class="col bg-white padding-25">
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice">
-                                <list-component key="2" section="invoiceSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
-                                    <template slot="list" slot-scope="{data}">
-                                        <billing-document-component :data="data"></billing-document-component>
-                                    </template>
-                                </list-component>
-                            </div>
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order">
-                                <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
-                                    <template slot="list" slot-scope="{data}">
-                                        <billing-document-component :data="data"></billing-document-component>
-                                    </template>
-                                </list-component>
-                            </div>
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order">
-                                <list-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
-                                    <template slot="list" slot-scope="{data}">
-                                        <billing-document-component :data="data"></billing-document-component>
-                                    </template>
-                                </list-component>
-                            </div>
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order">
-                                <list-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
-                                    <template slot="list" slot-scope="{data}">
-                                        <billing-document-component :data="data"></billing-document-component>
-                                    </template>
-                                </list-component>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <admin-payments-billing-section-component></admin-payments-billing-section-component>
         </div>
     </div>
-@endsection
\ No newline at end of file
+@endsection

From bf5ea2b2f23a00a49dbae4f76b628a9585ece1e6 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sat, 30 Dec 2023 18:35:17 +0800
Subject: [PATCH 19/40] Code sync from Shipping Portal, independent deployment
 of Vue Polling, Performance Improvement and tweaking for better user
 experience

---
 .../Eloquent/Filters/OrderByIdDesc.php        |  20 ++++
 .../Eloquent/Filters/RequestSignature.php     |  19 ++++
 .../Eloquent/Filters/ResultNotNull.php        |  18 ++++
 .../ControllersLogic/ListBookingJobLogic.php  |  25 ++++-
 .../Processors/ListBookingsJobProcessor.php   |  33 ++----
 .../ControllersLogic/ListDocumentJobLogic.php |  39 +++----
 .../Processors/ListDocumentsJobProcessor.php  |  31 +++---
 .../ControllersLogic/FetchJobResultLogic.php  |  17 ++-
 .../ListGenericJobObject.php                  |  31 ++++--
 .../UpdateJobResultObject.php                 |  60 +++++++++++
 .../Processors/FetchesJobResultProcessor.php  |  45 ++++++++
 .../Processors/UpdateJobResultProcessor.php   |  64 +++++++++++
 .../Jobs/Services/CreatesJobResult.php        |   8 +-
 .../Modules/Jobs/Services/ListsJobResult.php  |  33 ++++++
 .../Jobs/Services/UpdatesJobResult.php        |  28 +++++
 .../ListTransactionsJobLogic.php              |  31 +++++-
 .../ListTransactionsJobProcessor.php          |  29 +++--
 app/Http/Resources/BookingResource.php        |  12 +--
 app/Http/Resources/CompanyResource.php        |  32 +-----
 app/Http/Resources/DocumentResource.php       |   8 +-
 app/Http/Resources/ListBookingJobResource.php |  81 ++++++++++++++
 .../Resources/ListDocumentJobResource.php     |  31 ++++++
 .../Resources/ListTransactionJobResource.php  |  54 ++++++++++
 app/Http/Resources/V2/BookingV2Resource.php   |  82 ++++++++++++++
 app/Http/Resources/V2/CompanyV2Resource.php   | 100 ++++++++++++++++++
 .../assets/vue/vuex/modules/crudRequestV2.js  |  56 +++++-----
 26 files changed, 809 insertions(+), 178 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/OrderByIdDesc.php
 create mode 100644 app/Classes/General/Eloquent/Filters/RequestSignature.php
 create mode 100644 app/Classes/General/Eloquent/Filters/ResultNotNull.php
 create mode 100644 app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php
 create mode 100644 app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
 create mode 100644 app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
 create mode 100644 app/Classes/Modules/Jobs/Services/ListsJobResult.php
 create mode 100644 app/Classes/Modules/Jobs/Services/UpdatesJobResult.php
 create mode 100644 app/Http/Resources/ListBookingJobResource.php
 create mode 100644 app/Http/Resources/ListDocumentJobResource.php
 create mode 100644 app/Http/Resources/ListTransactionJobResource.php
 create mode 100644 app/Http/Resources/V2/BookingV2Resource.php
 create mode 100644 app/Http/Resources/V2/CompanyV2Resource.php

diff --git a/app/Classes/General/Eloquent/Filters/OrderByIdDesc.php b/app/Classes/General/Eloquent/Filters/OrderByIdDesc.php
new file mode 100644
index 00000000..547ec9bd
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/OrderByIdDesc.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OrderByIdDesc implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->orderBy('id', 'desc');
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/RequestSignature.php b/app/Classes/General/Eloquent/Filters/RequestSignature.php
new file mode 100644
index 00000000..67dde0a3
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/RequestSignature.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class RequestSignature implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('request_signature', $value);
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/ResultNotNull.php b/app/Classes/General/Eloquent/Filters/ResultNotNull.php
new file mode 100644
index 00000000..3f6a0341
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ResultNotNull.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class ResultNotNull implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereNotNull('result');
+    }
+}
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
index c87751a3..ef3570f7 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
@@ -5,12 +5,12 @@ namespace App\Classes\Modules\Bookings\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Jobs\ListBookingsJob;
-use App\Classes\Modules\Bookings\Standards\Rules\CanListBookings;
 use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use App\Classes\Modules\Jobs\Services\CreatesJobResult;
+
 
 class ListBookingJobLogic extends AbstractControllerLogic
 {
@@ -24,6 +24,19 @@ class ListBookingJobLogic extends AbstractControllerLogic
         ];
     }
 
+    /** @var CreatesJobResult */
+    private $createsJobResult;
+
+    /**
+     * ListPackingListsJobLogic constructor.
+     * @param CreatesJobResult $createsJobResult
+     */
+    public function __construct(CreatesJobResult $createsJobResult)
+    {
+        $this->createsJobResult = $createsJobResult;
+    }
+
+
     /**
      * @param Request $request
      * @return JsonResponse
@@ -34,13 +47,17 @@ class ListBookingJobLogic extends AbstractControllerLogic
 
         $user = Auth::user();
         $userInfo = (object) [
-            'email' => $user->email,
             'type' => $user->type,
         ];
 
+        $userInfoJson = json_encode($userInfo);
+        $requestSignature = md5($userInfoJson . $request->fullUrl());
+
         $listGenericJobObject = new ListGenericJobObject(
             $request->fullUrl(),
             $request->all(),
+            $requestSignature,
+            null,
             $jobId,
             $userInfo
         );
@@ -50,6 +67,8 @@ class ListBookingJobLogic extends AbstractControllerLogic
         $result = [];
         $result['job_id'] = $jobId;
 
+        $this->createsJobResult->execute($listGenericJobObject);
+
         return $this->response(['data' => $result]);
     }
 
diff --git a/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
index 6ded2977..2a09eb12 100644
--- a/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
+++ b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
@@ -3,14 +3,10 @@
 namespace App\Classes\Modules\Bookings\Processors;
 
 use App\Classes\Modules\Bookings\Services\ListsBookings;
-use App\Classes\Modules\Jobs\Services\CreatesJobResult;
-use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
 use App\Classes\General\Helper;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
 use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-use App\Http\Resources\BookingResource;
+use App\Http\Resources\ListBookingJobResource;
 
 class ListBookingsJobProcessor
 {
@@ -18,24 +14,25 @@ class ListBookingsJobProcessor
     /** @var ListsBookings */
     private $listsBookings;
 
-    /** @var CreatesJobResult */
-    private $createsJobResult;
+    /** @var UpdateJobResultProcessor */
+    private $updateJobResultProcessor;
 
     /**
      * ListBookingsJobProcessor constructor.
      * @param ListsBookings $listsBookings
-     * @param CreatesJobResult $createsJobResult
+     * @param UpdateJobResultProcessor $updateJobResultProcessor
      */
-    public function __construct(ListsBookings $listsBookings, CreatesJobResult $createsJobResult)
+    public function __construct(ListsBookings $listsBookings, UpdateJobResultProcessor $updateJobResultProcessor)
     {
         $this->listsBookings = $listsBookings;
-        $this->createsJobResult = $createsJobResult;
+        $this->updateJobResultProcessor = $updateJobResultProcessor;
     }
 
     /**
      * @param ListGenericJobObject $listGenericJobObject
-     * @return null|object
+     * @return void
      * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
      */
     public function execute(ListGenericJobObject $listGenericJobObject) {
 
@@ -43,15 +40,7 @@ class ListBookingsJobProcessor
         foreach ($query->items() as &$item) {
             $item['userInfo'] = $listGenericJobObject->getUserInfo();
         }
-
-        //cief todo: remove comments
-        $result = Helper::collectionResponse(BookingResource::collection($query));
-
-        // $result = new JobBookingCollectionResponse($query, $listGenericJobObject->getuserInfo());
-        // $result = $this->collectionResponse(new BookingResourceCollection(BookingResource::collection($query), $listGenericJobObject->getuserInfo()));
-
-        $create = $this->createsJobResult->execute($listGenericJobObject, json_encode($result));
-
-        return $create;
+        $resultCurrent = Helper::collectionResponse(ListBookingJobResource::collection($query));
+        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
     }
 }
diff --git a/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
index 041bb9c8..5e895ad8 100644
--- a/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
+++ b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
@@ -4,15 +4,11 @@ namespace App\Classes\Modules\Documents\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Documents\Services\ListsDocuments;
+use App\Classes\Modules\Jobs\Services\CreatesJobResult;
 use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
 use App\Classes\Jobs\ListDocumentsJob;
-use App\Http\Resources\DocumentResource;
-use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use App\Classes\General\Helper;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Auth;
 
 class ListDocumentJobLogic extends AbstractControllerLogic
@@ -28,6 +24,19 @@ class ListDocumentJobLogic extends AbstractControllerLogic
         ];
     }
 
+    /** @var CreatesJobResult */
+    private $createsJobResult;
+
+    /**
+     * ListDocumentJobLogic constructor.
+     * @param CreatesJobResult $createsJobResult
+     */
+    public function __construct(CreatesJobResult $createsJobResult)
+    {
+        $this->createsJobResult = $createsJobResult;
+    }
+
+
     /**
      * @param Request $request
      * @return JsonResponse
@@ -42,33 +51,25 @@ class ListDocumentJobLogic extends AbstractControllerLogic
             'type' => $user->type,
         ];
 
+        $userInfoJson = json_encode($userInfo);
+        $requestSignature = md5($userInfoJson . $request->fullUrl());
 
         $listGenericJobObject = new ListGenericJobObject(
             $request->fullUrl(),
             $request->all(),
+            $requestSignature,
+            null,
             $jobId,
             $userInfo
         );
 
         ListDocumentsJob::dispatch($listGenericJobObject);
 
-        //cief todo: remove comments
-        // // Create your job instance with delay, so we can back here within delay and take control in our hands.
-        // $job = new ListDocuments($listGenericJobObject);
-        // $job->delay(now()->addSeconds(5));
-
-        // // Dispath your job with our custom_dispatch helper. This will return job id from jobs table
-        // // $jobId = $this->custom_dispatch($job);
-
-
         $result = [];
         $result['job_id'] = $jobId;
 
+        $this->createsJobResult->execute($listGenericJobObject);
+
         return $this->response(['data' => $result]);
     }
-
-    //cief todo: no longer need jobId
-    // function custom_dispatch($job): int {
-    //     return app(\Illuminate\Contracts\Bus\Dispatcher::class)->dispatch($job);
-    // }
 }
diff --git a/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
index eb7cf1c4..70777f0c 100644
--- a/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
+++ b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
@@ -3,15 +3,10 @@
 namespace App\Classes\Modules\Documents\Processors;
 
 use App\Classes\Modules\Documents\Services\ListsDocuments;
-use App\Classes\Modules\Jobs\Services\CreatesJobResult;
-use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
 use App\Classes\General\Helper;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
 use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Http\Controllers\Documents\ListDocumentsController;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-use App\Http\Resources\DocumentResource;
+use App\Http\Resources\ListDocumentJobResource;
 
 class ListDocumentsJobProcessor
 {
@@ -19,24 +14,25 @@ class ListDocumentsJobProcessor
     /** @var ListsDocuments */
     private $listsDocuments;
 
-    /** @var CreatesJobResult */
-    private $createsJobResult;
+    /** @var UpdateJobResultProcessor */
+    private $updateJobResultProcessor;
 
     /**
      * ListDocumentsJobProcessor constructor.
      * @param ListsDocuments $listsDocuments
-     * @param CreatesJobResult $createsJobResult
+     * @param UpdateJobResultProcessor $updateJobResultProcessor
      */
-    public function __construct(ListsDocuments $listsDocuments, CreatesJobResult $createsJobResult)
+    public function __construct(ListsDocuments $listsDocuments, UpdateJobResultProcessor $updateJobResultProcessor)
     {
         $this->listsDocuments = $listsDocuments;
-        $this->createsJobResult = $createsJobResult;
+        $this->updateJobResultProcessor = $updateJobResultProcessor;
     }
 
     /**
      * @param ListGenericJobObject $listGenericJobObject
-     * @return null|object
+     * @return void
      * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
      */
     public function execute(ListGenericJobObject $listGenericJobObject) {
 
@@ -44,11 +40,8 @@ class ListDocumentsJobProcessor
         foreach ($query->items() as &$item) {
             $item['userInfo'] = $listGenericJobObject->getUserInfo();
         }
-
-        $result = Helper::collectionResponse(DocumentResource::collection($query));
-
-        $create = $this->createsJobResult->execute($listGenericJobObject, json_encode($result));
-
-        return $create;
+        $resultCurrent = Helper::collectionResponse(ListDocumentJobResource::collection($query));
+        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
     }
 }
+
diff --git a/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php b/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
index 366fda8c..c4b72cf0 100644
--- a/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
+++ b/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
@@ -4,9 +4,8 @@ namespace App\Classes\Modules\Jobs\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Jobs\Services\FetchesJobResult;
+use App\Classes\Modules\Jobs\Processors\FetchesJobResultProcessor;
 use App\Http\Resources\JobResultResource;
-use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -23,16 +22,16 @@ class FetchJobResultLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var FetchesJobResult */
-    private $fetchesJobResult;
+    /** @var FetchesJobResultProcessor */
+    private $fetchesJobResultProcessor;
 
     /**
      * FetchJobResultLogic constructor.
-     * @param FetchesJobResult $fetchesJobResult
+     * @param FetchesJobResultProcessor $fetchesJobResultProcessor
      */
-    public function __construct(FetchesJobResult $fetchesJobResult)
+    public function __construct(FetchesJobResultProcessor $fetchesJobResultProcessor)
     {
-        $this->fetchesJobResult = $fetchesJobResult;
+        $this->fetchesJobResultProcessor = $fetchesJobResultProcessor;
     }
 
 
@@ -45,10 +44,8 @@ class FetchJobResultLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $query = $this->fetchesJobResult->execute(['job_id' => $request->route('job_id')]);
-
+        $query = $this->fetchesJobResultProcessor->execute($request);
         return $this->resourceResponse(new JobResultResource($query));
-
     }
 
 }
diff --git a/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php b/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
index 365cd316..953d77d7 100644
--- a/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
+++ b/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
@@ -2,7 +2,6 @@
 
 namespace App\Classes\Modules\Jobs\DataTransferObjects;
 
-use Illuminate\Http\Request;
 use App\Classes\General\Interfaces\DataTransferObject;
 
 class ListGenericJobObject implements DataTransferObject
@@ -16,6 +15,12 @@ class ListGenericJobObject implements DataTransferObject
     /** @var string */
     private $jobId;
 
+    /** @var string */
+    private $requestSignature;
+
+    /** @var string */
+    private $resultSignature;
+
     /** @var object */
     private $userInfo;
 
@@ -25,11 +30,13 @@ class ListGenericJobObject implements DataTransferObject
     /** @var string */
     private $jobCommand;
 
-    public function __construct(string $name, array $payload, string $jobId, object $userInfo = null)
+    public function __construct(string $name, array $payload, string $requestSignature, ?string $resultSignature, string $jobId, object $userInfo = null)
     {
         $this->name = $name;
         $this->payload = $payload;
         $this->jobId = $jobId;
+        $this->requestSignature = $requestSignature;
+        $this->resultSignature = $resultSignature;
         $this->userInfo = $userInfo;
     }
 
@@ -57,6 +64,22 @@ class ListGenericJobObject implements DataTransferObject
         return $this->jobId;
     }
 
+    /**
+     * @return string
+     */
+    public function getRequestSignature(): string
+    {
+        return $this->requestSignature;
+    }
+
+    /**
+     * @return string
+     */
+    public function getResultSignature(): ?string
+    {
+        return $this->resultSignature;
+    }
+
     /**
      * @return object
      */
@@ -81,10 +104,6 @@ class ListGenericJobObject implements DataTransferObject
         return $this->jobCommand;
     }
 
-    // public function setJobId(int $jobId)
-    // {
-    //     $this->jobId = $jobId;
-    // }
 
     public function setJobCommandName(string $jobCommandName)
     {
diff --git a/app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php b/app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php
new file mode 100644
index 00000000..636c56b0
--- /dev/null
+++ b/app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class UpdateJobResultObject implements DataTransferObject
+{
+    /** @var string */
+    private $result;
+
+    /** @var string */
+    private $resultSignature;
+
+    /** @var string */
+    private $jobCommandName;
+
+    /** @var string */
+    private $jobCommand;
+
+    public function __construct(string $result, string $resultSignature, string $jobCommandName, string $jobCommand)
+    {
+        $this->result = $result;
+        $this->resultSignature = $resultSignature;
+        $this->jobCommandName = $jobCommandName;
+        $this->jobCommand = $jobCommand;
+    }
+
+    /**
+     * @return string
+     */
+    public function getResult(): string
+    {
+        return $this->result;
+    }
+
+    /**
+     * @return array
+     */
+    public function getResultSignature(): string
+    {
+        return $this->resultSignature;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommandName(): string
+    {
+        return $this->jobCommandName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommand(): string
+    {
+        return $this->jobCommand;
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php b/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
new file mode 100644
index 00000000..e19456e7
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Processors;
+
+use App\Classes\Modules\Jobs\Services\FetchesJobResult;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class FetchesJobResultProcessor
+{
+    /** @var FetchesJobResult */
+    private $fetchesJobResult;
+
+
+    /**
+     * FetchesJobResultProcessor constructor.
+     * @param FetchesJobResult $fetchesJobResult
+     */
+    public function __construct(FetchesJobResult $fetchesJobResult)
+    {
+        $this->fetchesJobResult = $fetchesJobResult;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
+     * @throws \App\Classes\Exceptions\ResourceNotFoundException
+     */
+    public function execute(Request $request){
+
+        $res1 = $this->fetchesJobResult->execute(['job_id' => $request->route('job_id')]);
+
+        if(!$res1->result){
+            Log::info('Job id: '.$request->route('job_id'));
+            $res2 = $this->fetchesJobResult->execute(['request_signature' => $res1->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
+            Log::info('Job id: '.$res2->id." , request_signature: ".$res2->request_signature);
+            return $res2;
+        }
+
+        return $res1;
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php b/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
new file mode 100644
index 00000000..fff83bb0
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Processors;
+
+
+use App\Classes\Modules\Jobs\Services\UpdatesJobResult;
+use App\Classes\Modules\Jobs\Services\FetchesJobResult;
+use App\Classes\Exceptions\JobResourceNotFoundException;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
+
+class UpdateJobResultProcessor
+{
+
+    /** @var FetchesJobResult */
+    private $fetchesJobResult;
+
+    /** @var UpdatesJobResult */
+    private $updatesJobResult;
+
+    /**
+     * UpdateJobResultProcessor constructor.
+     * @param FetchesJobResult $fetchesJobResult
+     * @param UpdatesJobResult $updatesJobResult
+     */
+    public function __construct(FetchesJobResult $fetchesJobResult, UpdatesJobResult $updatesJobResult)
+    {
+        $this->fetchesJobResult = $fetchesJobResult;
+        $this->updatesJobResult = $updatesJobResult;
+    }
+
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @param array $resultCurrent
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject, $resultCurrent) {
+        $jobResultCurrent = $this->fetchesJobResult->execute(['job_id' => $listGenericJobObject->getJobId()]);
+        $resultCurrentJson = json_encode($resultCurrent);
+        $resultSignatureCurrent = md5($resultCurrentJson);
+
+        try{
+            $jobResultExisting = $this->fetchesJobResult->execute(['request_signature' => $jobResultCurrent->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
+            $resultSignatureExisting = $jobResultExisting->result_signature;
+            if($resultSignatureExisting != $resultSignatureCurrent){
+                $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
+            }
+        } catch (JobResourceNotFoundException $exception){
+            $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
+        }
+    }
+
+    private function updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobCommandName, $jobCommand){
+        $updateJobResultObject = new UpdateJobResultObject(
+            $resultCurrentJson,
+            $resultSignatureCurrent,
+            $jobCommandName,
+            $jobCommand
+        );
+        $create = $this->updatesJobResult->execute($jobResultCurrent, $updateJobResultObject);
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Services/CreatesJobResult.php b/app/Classes/Modules/Jobs/Services/CreatesJobResult.php
index 00acc1eb..e70e0e6a 100644
--- a/app/Classes/Modules/Jobs/Services/CreatesJobResult.php
+++ b/app/Classes/Modules/Jobs/Services/CreatesJobResult.php
@@ -10,18 +10,16 @@ class CreatesJobResult extends AbstractUpdateRecord
 {
     /**
      * @param ListGenericJobObject $listGenericJobObject
-     * @param string $result
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(ListGenericJobObject $listGenericJobObject, string $result)
+    public function execute(ListGenericJobObject $listGenericJobObject)
     {
         $model = new JobResult();
         $model->job_id = $listGenericJobObject->getJobId();
-        $model->result = $result;
+        $model->request_signature = $listGenericJobObject->getRequestSignature();
+        $model->result_signature = $listGenericJobObject->getResultSignature();
         $model->url = $listGenericJobObject->getName();
-        $model->job_command_name = $listGenericJobObject->getJobCommandName();
-        $model->job_command = $listGenericJobObject->getJobCommand();
 
         return $this->handler($model);
     }
diff --git a/app/Classes/Modules/Jobs/Services/ListsJobResult.php b/app/Classes/Modules/Jobs/Services/ListsJobResult.php
new file mode 100644
index 00000000..55f3b267
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Services/ListsJobResult.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\JobResult;
+
+class ListsJobResult extends AbstractListRecord
+{
+
+    /** @var JobResult */
+    private $repository;
+
+    /**
+     * ListsJobResult constructor.
+     * @param JobResult $repository
+     */
+    public function __construct(JobResult $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Services/UpdatesJobResult.php b/app/Classes/Modules/Jobs/Services/UpdatesJobResult.php
new file mode 100644
index 00000000..ab3d9385
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Services/UpdatesJobResult.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
+use App\Models\JobResult;
+
+class UpdatesJobResult extends AbstractUpdateRecord
+{
+
+    /**
+     * @param JobResult $model
+     * @param UpdateJobResultObject $updateJobResultObject
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(JobResult $model, UpdateJobResultObject $updateJobResultObject) {
+
+        $model->result = $updateJobResultObject->getResult();
+        $model->result_signature = $updateJobResultObject->getResultSignature();
+        $model->job_command_name = $updateJobResultObject->getJobCommandName();
+        $model->job_command = $updateJobResultObject->getJobCommand();
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
index d317d7eb..654a360f 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
@@ -5,10 +5,11 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Jobs\ListTransactionsJob;
+use App\Classes\Modules\Jobs\Services\CreatesJobResult;
 use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class ListTransactionsJobLogic extends AbstractControllerLogic
 {
@@ -22,6 +23,19 @@ class ListTransactionsJobLogic extends AbstractControllerLogic
         ];
     }
 
+    /** @var CreatesJobResult */
+    private $createsJobResult;
+
+    /**
+     * ListTransactionsJobLogic constructor.
+     * @param CreatesJobResult $createsJobResult
+     */
+    public function __construct(CreatesJobResult $createsJobResult)
+    {
+        $this->createsJobResult = $createsJobResult;
+    }
+
+
     /**
      * @param Request $request
      * @return JsonResponse
@@ -30,10 +44,21 @@ class ListTransactionsJobLogic extends AbstractControllerLogic
     {
         $jobId = uniqid();
 
+        $user = Auth::user();
+        $userInfo = (object) [
+            'type' => $user->type,
+        ];
+
+        $userInfoJson = json_encode($userInfo);
+        $requestSignature = md5($userInfoJson . $request->fullUrl());
+
         $listGenericJobObject = new ListGenericJobObject(
             $request->fullUrl(),
             $request->all(),
-            $jobId
+            $requestSignature,
+            null,
+            $jobId,
+            $userInfo
         );
 
         ListTransactionsJob::dispatch($listGenericJobObject);
@@ -41,6 +66,8 @@ class ListTransactionsJobLogic extends AbstractControllerLogic
         $result = [];
         $result['job_id'] = $jobId;
 
+        $this->createsJobResult->execute($listGenericJobObject);
+
         return $this->response(['data' => $result]);
     }
 
diff --git a/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
index 36671c89..475d4715 100644
--- a/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
@@ -3,14 +3,10 @@
 namespace App\Classes\Modules\Transactions\Processors;
 
 use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Classes\Modules\Jobs\Services\CreatesJobResult;
-use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
 use App\Classes\General\Helper;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
 use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-use App\Http\Resources\TransactionResource;
+use App\Http\Resources\ListTransactionJobResource;
 
 class ListTransactionsJobProcessor
 {
@@ -18,33 +14,32 @@ class ListTransactionsJobProcessor
     /** @var ListsTransactions */
     private $listsTransactions;
 
-    /** @var CreatesJobResult */
-    private $createsJobResult;
+    /** @var UpdateJobResultProcessor */
+    private $updateJobResultProcessor;
 
     /**
      * ListTransactionsJobProcessor constructor.
      * @param ListsTransactions $listsTransactions
-     * @param CreatesJobResult $createsJobResult
+     * @param UpdateJobResultProcessor $updateJobResultProcessor
      */
-    public function __construct(ListsTransactions $listsTransactions, CreatesJobResult $createsJobResult)
+    public function __construct(ListsTransactions $listsTransactions, UpdateJobResultProcessor $updateJobResultProcessor)
     {
         $this->listsTransactions = $listsTransactions;
-        $this->createsJobResult = $createsJobResult;
+        $this->updateJobResultProcessor = $updateJobResultProcessor;
     }
 
     /**
      * @param ListGenericJobObject $listGenericJobObject
-     * @return null|object
+     * @return void
      * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
      */
     public function execute(ListGenericJobObject $listGenericJobObject) {
 
         $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
 
-        $result = Helper::collectionResponse(TransactionResource::collection($query));
-
-        $create = $this->createsJobResult->execute($listGenericJobObject, json_encode($result));
-
-        return $create;
+        $resultCurrent = Helper::collectionResponse(ListTransactionJobResource::collection($query));
+        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
     }
 }
+
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index c3c2e24d..70fbc95c 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -11,19 +11,9 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-use Illuminate\Support\Facades\Log;
 
 class BookingResource extends JsonResource
 {
-    private $userInfo;
-
-    public function __construct($resource, $userInfo = null)
-    {
-        parent::__construct($resource);
-        $this->userInfo = $userInfo ?? ($resource->userInfo ?? null);
-    }
-
     /**
      * Transform the resource into an array.
      *
@@ -35,7 +25,7 @@ class BookingResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'company' => new CompanyResource($this->company, $this->userInfo),
+            'company' => new CompanyResource($this->company),
             'bank' => new BankResource($this->bank),
             'service' => new ServiceTypeResource($this->service),
             'marking' => $this->marking,
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index df3bcf49..eff2bd1b 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -15,18 +15,9 @@ use App\Models\SegmentConstant;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
 
 class CompanyResource extends JsonResource
 {
-    private $userInfo;
-
-    public function __construct($resource, $userInfo = null)
-    {
-        parent::__construct($resource);
-        $this->userInfo = $userInfo;
-    }
-
     /**
      * Transform the resource into an array.
      *
@@ -41,26 +32,6 @@ class CompanyResource extends JsonResource
         $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
         $serviceCharge = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $this->id)->first();
 
-        $userResource = null;
-
-        $userInfoEmail = $this->userInfo && isset($this->userInfo->email) ? $this->userInfo->email : null;
-        $userInfoType = $this->userInfo && isset($this->userInfo->type) ? $this->userInfo->type : null;
-
-        if(!$userInfoEmail && Auth::user()){
-            $userInfoEmail = Auth::user()->email;
-        }
-        if(!$userInfoType && Auth::user()){
-            $userInfoType = Auth::user()->type;
-        }
-
-        //cief todo: remove
-        // Log::error('CompanyResource 1: '. json_encode($userInfoEmail));
-        // Log::error('CompanyResource 2: '. json_encode($userInfoType));
-
-        if(!is_null($userInfoEmail) && !is_null($userInfoType)){
-            $userResource = new UserResource($userInfoType === RoleTypes::USER ? $this->employees()->where('email', '=',  $userInfoEmail)->first() : $this->employees()->orderBy('id', 'DESC')->first());
-        }
-
         return [
             'id' => $this->id,
             'name' => $this->name,
@@ -71,8 +42,7 @@ class CompanyResource extends JsonResource
             'status' => (int) $this->status,
             'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
             'address' => new AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())),
-            //cief todo: this one need to decide what to do to replace Auth:user() when it is run by job queue
-            'employee' =>  $userResource,
+            'employee' => new UserResource(Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
             'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
             'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
diff --git a/app/Http/Resources/DocumentResource.php b/app/Http/Resources/DocumentResource.php
index 6f9ade71..c0f801bb 100644
--- a/app/Http/Resources/DocumentResource.php
+++ b/app/Http/Resources/DocumentResource.php
@@ -3,14 +3,8 @@
 namespace App\Http\Resources;
 
 use App\Models\Booking;
-use App\Models\Company;
-use App\Models\Document;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 
 class DocumentResource extends JsonResource
 {
@@ -27,7 +21,7 @@ class DocumentResource extends JsonResource
             'reference' => $this->reference,
             'status' => (int) $this->status,
             'document_type' => $this->document_type,
-            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingResource($this->owner, $this->userInfo) : new CompanyResource($this->owner, $this->userInfo)) : null,
+            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingResource($this->owner) : new CompanyResource($this->owner)) : null,
             'files' => FileResource::collection($this->files),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
         ];
diff --git a/app/Http/Resources/ListBookingJobResource.php b/app/Http/Resources/ListBookingJobResource.php
new file mode 100644
index 00000000..06f8c38d
--- /dev/null
+++ b/app/Http/Resources/ListBookingJobResource.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\Modules\Bookings\Services\CalculatesBookingFloatingAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ListBookingJobResource extends JsonResource
+{
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo ?? ($resource->userInfo ?? null);
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'company' => new CompanyResource($this->company, $this->userInfo),
+            'bank' => new BankResource($this->bank),
+            'service' => new ServiceTypeResource($this->service),
+            'marking' => $this->marking,
+            'amount' => $this->fix_amount,
+            'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'fixed_currency' => new CurrencyResource($this->fixedCurrency),
+            'convertible_currency' => new CurrencyResource($this->convertibleCurrency),
+            'conversion_currency' => new CurrencyResource($this->conversionCurrency),
+            'documents' => [
+                'purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()),
+                'delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
+                'invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
+                'supplier_delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
+                'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
+                'ecommerce_purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first()),
+            ],
+            'status' => $this->status,
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
+            'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
+            $this->mergeWhen($this->relationLoaded('transactions'), [
+                'purchase_order' => new TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()),
+                'payment_attempts' => TransactionResource::collection(
+                    $this->transactions()
+                        ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
+                        ->whereDate('expires_on', '>=', Carbon::now())
+                        ->get()
+                ),
+                'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
+                'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
+                    $query->where(function($query){
+                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
+                    })->orWhere(function($query){
+                        $query->where(function($query){
+                            $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION,  ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
+                        })->orWhere(function($query){
+                            $query->where('type', TransactionType::CREDIT_NOTE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                        });
+                    });
+                })->latest()->get())
+            ])
+        ];
+    }
+}
diff --git a/app/Http/Resources/ListDocumentJobResource.php b/app/Http/Resources/ListDocumentJobResource.php
new file mode 100644
index 00000000..edf549ef
--- /dev/null
+++ b/app/Http/Resources/ListDocumentJobResource.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\Booking;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Http\Resources\V2\BookingV2Resource;
+use App\Http\Resources\V2\CompanyV2Resource;
+
+class ListDocumentJobResource 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,
+            'status' => (int) $this->status,
+            'document_type' => $this->document_type,
+            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingV2Resource($this->owner, $this->userInfo) : new CompanyV2Resource($this->owner, $this->userInfo)) : null,
+            'files' => FileResource::collection($this->files),
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
+        ];
+    }
+}
diff --git a/app/Http/Resources/ListTransactionJobResource.php b/app/Http/Resources/ListTransactionJobResource.php
new file mode 100644
index 00000000..6c4c0ece
--- /dev/null
+++ b/app/Http/Resources/ListTransactionJobResource.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ListTransactionJobResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+
+        $booking = in_array((int)$this->type, [TransactionType::BILL, TransactionType::REFUND])? $this->owner->owner : $this->owner;
+        $days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
+
+        return [
+            'id' => $this->id,
+            'booking' => new BookingResource($booking),
+            'type' => (int) $this->type,
+            'bill_no' => $this->bill_no,
+            'payment_reference' => $this->payment_reference,
+            'payment_method' => (float) $this->payment_method,
+            'recipient_bank_account' => new BankResource($booking->bank),
+            'issuer_name' => $this->issuerCompany->name,
+            'issuer_id' => $this->issuerCompany->id,
+            'amount' => (double) $this->amount,
+            'original_amount' => (double) $this->original_amount,
+            'currency' => new CurrencyResource($this->currency),
+            'original_currency' => new CurrencyResource($this->original_currency),
+            'service_charge' => (double) $this->service_charge,
+            'tax' => (double) $this->tax,
+            'currency_rate' => (double) $this->currency_rate,
+            'status' => (int) $this->status,
+            'details' => TransactionDetailResource::collection($this->transactionDetails),
+            'documents' => new DocumentResource($this->documents()->first()),
+            'transaction_bill' => new TransactionResource($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->bills()->first())),
+            'transaction_refunds' => TransactionResource::collection($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->refunds()->get())),
+            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
+            'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
+            'interval' => [
+                'value' => $days->gt(Carbon::now()) ? '+' : '-',
+                'duration' => $days->diff(Carbon::now())->format('%d'),
+            ],
+            'redemption' => new VoucherRedemptionResource($this->voucherRedemption)
+        ];
+    }
+}
diff --git a/app/Http/Resources/V2/BookingV2Resource.php b/app/Http/Resources/V2/BookingV2Resource.php
new file mode 100644
index 00000000..ee17181e
--- /dev/null
+++ b/app/Http/Resources/V2/BookingV2Resource.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Resources\V2;
+
+use App\Classes\Modules\Bookings\Services\CalculatesBookingFloatingAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Http\Resources as V1;
+
+class BookingV2Resource extends JsonResource
+{
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo ?? ($resource->userInfo ?? null);
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'company' => new CompanyV2Resource($this->company, $this->userInfo),
+            'bank' => new V1\BankResource($this->bank),
+            'service' => new V1\ServiceTypeResource($this->service),
+            'marking' => $this->marking,
+            'amount' => $this->fix_amount,
+            'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'fixed_currency' => new V1\CurrencyResource($this->fixedCurrency),
+            'convertible_currency' => new V1\CurrencyResource($this->convertibleCurrency),
+            'conversion_currency' => new V1\CurrencyResource($this->conversionCurrency),
+            'documents' => [
+                'purchase_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()),
+                'delivery_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
+                'invoice' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
+                'supplier_delivery_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
+                'proforma_invoice' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
+                'ecommerce_purchase_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first()),
+            ],
+            'status' => $this->status,
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
+            'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
+            $this->mergeWhen($this->relationLoaded('transactions'), [
+                'purchase_order' => new V1\TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()),
+                'payment_attempts' => V1\TransactionResource::collection(
+                    $this->transactions()
+                        ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
+                        ->whereDate('expires_on', '>=', Carbon::now())
+                        ->get()
+                ),
+                'expired_payment_attempts' => V1\TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
+                'payment_history' => V1\TransactionResource::collection($this->transactions()->where(function($query){
+                    $query->where(function($query){
+                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
+                    })->orWhere(function($query){
+                        $query->where(function($query){
+                            $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION,  ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
+                        })->orWhere(function($query){
+                            $query->where('type', TransactionType::CREDIT_NOTE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                        });
+                    });
+                })->latest()->get())
+            ])
+        ];
+    }
+}
diff --git a/app/Http/Resources/V2/CompanyV2Resource.php b/app/Http/Resources/V2/CompanyV2Resource.php
new file mode 100644
index 00000000..64fca7c7
--- /dev/null
+++ b/app/Http/Resources/V2/CompanyV2Resource.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Http\Resources\V2;
+
+use App\Classes\Modules\Companies\Services\FetchesCompanyServices;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BankAccountType;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Currency;
+use App\Models\SegmentConstant;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Auth;
+use App\Http\Resources as V1;
+
+
+class CompanyV2Resource extends JsonResource
+{
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo;
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $lastPayment = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->first();
+        $totalPayments =  $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+
+        $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
+        $serviceCharge = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $this->id)->first();
+
+        $userResource = null;
+
+        $userInfoEmail = $this->userInfo && isset($this->userInfo->email) ? $this->userInfo->email : null;
+        $userInfoType = $this->userInfo && isset($this->userInfo->type) ? $this->userInfo->type : null;
+
+        if(!$userInfoEmail && Auth::user()){
+            $userInfoEmail = Auth::user()->email;
+        }
+        if(!$userInfoType && Auth::user()){
+            $userInfoType = Auth::user()->type;
+        }
+
+        if(!is_null($userInfoEmail) && !is_null($userInfoType)){
+            $userResource = new V1\UserResource($userInfoType === RoleTypes::USER ? $this->employees()->where('email', '=',  $userInfoEmail)->first() : $this->employees()->orderBy('id', 'DESC')->first());
+        }
+
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'reference' => $this->reference,
+            'debtor' => $this->debtor,
+            'type' => (int) $this->type,
+            'business_type' => (int) $this->business_type,
+            'status' => (int) $this->status,
+            'contact' => new V1\ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
+            'address' => new V1\AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())),
+            'employee' =>  $userResource,
+            'identification' => new V1\DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
+            'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
+            'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
+                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            })->count(),
+            'total_payments' => (float) $totalPayments,
+            'average_spending_per_day' => (float) $totalPayments / ($this->created_at->diff(Carbon::now())->days === 0 ? 1 : $this->created_at->diff(Carbon::now())->days),
+            'average_spending_per_booking' => (float) $totalPayments > 0 ? $totalPayments / $this->bookings()->whereHas('transactions', function ($query){
+                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                })->count() : $totalPayments,
+            'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
+            'personal_banks' => V1\BankResource::collection($this->banks->where('type', BankAccountType::PERSONAL)),
+            'recipient_banks' => [
+                'accounts' => V1\BankResource::collection($this->banks->where('type', BankAccountType::EXTERNAL)),
+                'default' => new V1\BankResource($this->banks->where('type', BankAccountType::EXTERNAL)->where('default', true)->first())
+            ],
+            'segments' => V1\SegmentResource::collection($this->segments),
+            'seasonalSegment' => $this->whenLoaded('seasonalSegments', V1\SeasonalSegmentResource::collection($this->seasonalSegments)),
+            'services' => (new FetchesCompanyServices())->getServices($this->servicesConfigurations()),
+            'wallet' => $this->whenLoaded('wallets', new V1\WalletResource($this->wallets()->with('transactions')->first()), new V1\WalletResource($this->wallets()->first())),
+            'created_at' => $this->created_at->format('d-m-Y'),
+            $this->mergeWhen($this->business_type === BusinessType::CURRENCY_VENDOR, [
+                'currencies' => $segment ? V1\CurrencyResource::collection(Currency::whereIn('id', $segment->detail->currencies)->get()) : [],
+                'service_charge' => $serviceCharge
+            ])
+
+        ];
+    }
+}
diff --git a/resources/assets/vue/vuex/modules/crudRequestV2.js b/resources/assets/vue/vuex/modules/crudRequestV2.js
index 2445190e..355b1edb 100644
--- a/resources/assets/vue/vuex/modules/crudRequestV2.js
+++ b/resources/assets/vue/vuex/modules/crudRequestV2.js
@@ -1,35 +1,39 @@
 export default {
     actions: {
         crudRequestV2({getters, dispatch},  {endpoint, method, parameters}){
-            const queryDomain = endpoint.split('?')[0];
-            let encodedParams = endpoint.split('?')[1];
-            let decodedParams = fullyDecodeURI(encodedParams);
-            const queryParams = encodeURIComponent(decodedParams);
-            encodedParams = queryParams.toString();
-            let filteredEncodedParams = encodedParams.replace(/%3D/g,'=');
-            filteredEncodedParams = filteredEncodedParams.replace(/%26/g,'&');
-            let combinedAbsoluteUrl = queryDomain;
-            if(filteredEncodedParams !== undefined && filteredEncodedParams !== 'undefined'){
-                combinedAbsoluteUrl = queryDomain + '?' + filteredEncodedParams;
-            }
-
-            // return fetch(endpoint, {
-            return fetch(combinedAbsoluteUrl, {
-                method: method,
-                responseType: 'json',
-                body: parameters ? JSON.stringify(parameters):null,
-                headers: {
-                    'content-type': 'application/json',
-                    'Authorization': 'Bearer '+getters.getAccessToken
-                }
-            }).then(response => {
-                if(response.status === 401 && window.location.href !== route('login') && window.location.href.indexOf(route('last_mile_delivery.login')) <= -1){
-                    dispatch('userAuthentication', {access_token: '', redirect_url: [7, 8].includes(getters.getCompanyModuleType) ? route('last_mile_delivery.login') : route('login')});
+            return dispatch('ensureReCaptchaIsSet').then(function () {
+                const queryDomain = endpoint.split('?')[0];
+                let encodedParams = endpoint.split('?')[1];
+                let decodedParams = fullyDecodeURI(encodedParams);
+                const queryParams = encodeURIComponent(decodedParams);
+                encodedParams = queryParams.toString();
+                let filteredEncodedParams = encodedParams.replace(/%3D/g,'=');
+                filteredEncodedParams = filteredEncodedParams.replace(/%26/g,'&');
+                let combinedAbsoluteUrl = queryDomain;
+                if(filteredEncodedParams !== undefined && filteredEncodedParams !== 'undefined'){
+                    combinedAbsoluteUrl = queryDomain + '?' + filteredEncodedParams;
                 }
 
-                return response;
+                // return fetch(endpoint, {
+                return fetch(combinedAbsoluteUrl, {
+                    method: method,
+                    responseType: 'json',
+                    body: parameters ? JSON.stringify(parameters):null,
+                    headers: {
+                        'content-type': 'application/json',
+                        'Authorization': 'Bearer '+getters.getAccessToken,
+                        'captcha-token': getters.getReCaptcha
+                    }
+                }).then(response => {
 
-            })
+                    if(response.status === 401 && window.location.href !== route('login')){
+                        dispatch('userAuthentication', {access_token: '', redirect_url: '/'});
+                    }
+
+                    return response;
+
+                })
+            });
         }
     }
 }

From 72a945613affdee69e012a863ecf5f798043c30c Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 2 Jan 2024 19:32:02 +0800
Subject: [PATCH 20/40] fix po

---
 .../pages/pdfs/purchase_order_table.blade.php |  3 ++-
 routes/web.php                                | 20 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/resources/views/pages/pdfs/purchase_order_table.blade.php b/resources/views/pages/pdfs/purchase_order_table.blade.php
index 20fac9b8..69083e93 100644
--- a/resources/views/pages/pdfs/purchase_order_table.blade.php
+++ b/resources/views/pages/pdfs/purchase_order_table.blade.php
@@ -15,11 +15,12 @@
         $subtotal = "0";
         $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
         $displayedSubtotal = 0;
+        $currency_id = $transaction->currency_id
     @endphp
 
     @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
         @php
-            $exactUnitPrice = bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
+            $exactUnitPrice = ($currency_id) === 1 : $transaction_detail->price : bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
             $displayUnitPrice = round($exactUnitPrice, 2);
             $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
             $displayedItemTotal = round(bcmul($displayUnitPrice, $transaction_detail->quantity, 7), 2);
diff --git a/routes/web.php b/routes/web.php
index 674f8f0e..bf2892bb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -112,7 +112,7 @@ Route::get('/transfer/{marking}', function ($marking) {
     return view('pages.bookings.profile', ['marking' => $marking]);
 })->name('booking.details');
 
-Route::get('/transfer/{marking}/latest-invoice', function ($marking) {
+Route::get('/transfer/{marking}/latest/{document_type}', function ($marking, $document_type) {
     $booking= Booking::where('marking', $marking)->first();
 
     $purchaseOrder = $booking->transactions()
@@ -126,7 +126,23 @@ Route::get('/transfer/{marking}/latest-invoice', function ($marking) {
 
     $supplier = Company::where('id', $transaction->receiver)->first();
 
-    $lowercaseDocumentType = strtolower(DocumentType::INVOICE);
+    $lowercaseDocumentType = null;
+    switch  ($document_type) {
+        case 'po': 
+            $lowercaseDocumentType = DocumentType::PURCHASE_ORDER;
+            break;
+        case 'do': 
+            $lowercaseDocumentType = DocumentType::DELIVER_ORDER;
+            break;
+        case 'sdo': 
+            $lowercaseDocumentType = DocumentType::SUPPLIER_DELIVER_ORDER;
+            break;
+        default: 
+            $lowercaseDocumentType = DocumentType::INVOICE;
+            break;
+    }
+
+    $lowercaseDocumentType = strtolower($lowercaseDocumentType);
 
     $voucherRedemption = $transaction->voucherRedemption;
 

From 6cac8e6e094470618aea80f93308a7f0b3520554 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 2 Jan 2024 19:36:47 +0800
Subject: [PATCH 21/40] code update

---
 resources/views/pages/pdfs/purchase_order_table.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/pdfs/purchase_order_table.blade.php b/resources/views/pages/pdfs/purchase_order_table.blade.php
index 69083e93..c570280d 100644
--- a/resources/views/pages/pdfs/purchase_order_table.blade.php
+++ b/resources/views/pages/pdfs/purchase_order_table.blade.php
@@ -15,7 +15,7 @@
         $subtotal = "0";
         $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
         $displayedSubtotal = 0;
-        $currency_id = $transaction->currency_id
+        $currency_id = $transaction->currency_id;
     @endphp
 
     @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)

From c599ae5887a98b4724c1081b471515f396369536 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 2 Jan 2024 19:40:38 +0800
Subject: [PATCH 22/40] code update

---
 resources/views/pages/pdfs/purchase_order_table.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/pdfs/purchase_order_table.blade.php b/resources/views/pages/pdfs/purchase_order_table.blade.php
index c570280d..99b28dd7 100644
--- a/resources/views/pages/pdfs/purchase_order_table.blade.php
+++ b/resources/views/pages/pdfs/purchase_order_table.blade.php
@@ -20,7 +20,7 @@
 
     @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
         @php
-            $exactUnitPrice = ($currency_id) === 1 : $transaction_detail->price : bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
+            $exactUnitPrice = ($currency_id) === 1 ? $transaction_detail->price : bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
             $displayUnitPrice = round($exactUnitPrice, 2);
             $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
             $displayedItemTotal = round(bcmul($displayUnitPrice, $transaction_detail->quantity, 7), 2);

From 74c6ca7330bd62ad385c9db3397e6c5745479120 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Wed, 3 Jan 2024 09:08:54 +0800
Subject: [PATCH 23/40] change posting date to invoice date for shipping portal
 when export invoice to autocount

---
 .../General/Services/GuzzleShippingPortal.php | 22 +++++++++++++++++++
 .../Services/ExportsInvoiceTransactions.php   | 11 +++++++---
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 app/Classes/General/Services/GuzzleShippingPortal.php

diff --git a/app/Classes/General/Services/GuzzleShippingPortal.php b/app/Classes/General/Services/GuzzleShippingPortal.php
new file mode 100644
index 00000000..d753b260
--- /dev/null
+++ b/app/Classes/General/Services/GuzzleShippingPortal.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Services;
+
+class GuzzleShippingPortal
+{
+    public function execute($route, $requests)
+    {
+        try {
+            $url = 'https://izyim.cief-malaysia.com/public/api/v1/'.$route;
+            $client = new \GuzzleHttp\Client(['verify' => false]);
+            $response = $client->request('GET', $url . '?api-key=510acd13d8d24375cf038ad626c282565451461a9c2399357e0b65365300787e&'. $requests);
+            $body = $response->getBody();
+            $data = json_decode($body, true);
+            $payload = $data['payload'];
+            return $payload['data'];
+        } catch (\Exception $exception) {
+            Log::error($exception->getMessage());
+            return [];
+        }
+    }
+}
diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index a7041b1c..ee07f435 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -19,6 +19,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use Illuminate\Support\Facades\Log;
 use App\Classes\General\Eloquent\ApplyFiltersToQuery;
 use App\Models\StatementTransaction;
+use App\Classes\General\Services\GuzzleShippingPortal;
 
 class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
 {
@@ -124,12 +125,11 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
 
                 $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Shipping Portal Respnose ' . json_encode($row) . PHP_EOL;
                 file_put_contents($errorFilePath, $textToAppend, FILE_APPEND);
-
-                Log::info('Error in Exports Invoice Transactions ' . $this->counter);
+                $transactionShippingPortal = $this->getFromShippingPortal($statementTransactionOwner->owner_id);
 
                 return [
                     'Transaction Not Found',
-                    $transaction->posting_date->format('m/d/Y H:m'),
+                    (isset($transactionShippingPortal['created_at']) ? Carbon::parse($transactionShippingPortal['created_at'])->format('m/d/Y H:m') : null),
                     $transaction->transaction_description.' - '.$transaction->transaction_description_2,
                     $statementTransactionOwner->system,
                     '',
@@ -167,4 +167,9 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
             ];
         }
     }
+
+    private function getFromShippingPortal($id){
+        $data = (new guzzleShippingPortal)->execute('transactions/mappable/query','filters={"id":'.$id.'}');
+        return (count($data) > 0 ? $data[0] : null);
+    }
 }

From b2dd059fa4e80b9f8f5dae681e6f1089a926b933 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 3 Jan 2024 10:12:06 +0800
Subject: [PATCH 24/40] update logging for GuzzleShippingPortal

---
 app/Classes/General/Services/GuzzleShippingPortal.php | 3 +++
 config/logging.php                                    | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/app/Classes/General/Services/GuzzleShippingPortal.php b/app/Classes/General/Services/GuzzleShippingPortal.php
index d753b260..2fed1e9a 100644
--- a/app/Classes/General/Services/GuzzleShippingPortal.php
+++ b/app/Classes/General/Services/GuzzleShippingPortal.php
@@ -2,6 +2,8 @@
 
 namespace App\Classes\General\Services;
 
+use Illuminate\Support\Facades\Log;
+
 class GuzzleShippingPortal
 {
     public function execute($route, $requests)
@@ -16,6 +18,7 @@ class GuzzleShippingPortal
             return $payload['data'];
         } catch (\Exception $exception) {
             Log::error($exception->getMessage());
+            Log::channel('guzzleShippingPortal')->debug($exception->getMessage());
             return [];
         }
     }
diff --git a/config/logging.php b/config/logging.php
index fb872693..d0d0a009 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -104,6 +104,10 @@ return [
             'path' => storage_path('logs/regenerateInvoice.log'),
             'level' => 'info',
         ],
+        'guzzleShippingPortal' => [
+            'driver' => 'errorlog',
+            'level' => 'debug',
+        ],
     ],
 
 ];

From 24d246d7216f627a6d05f807d6d4afeb2f822cbc Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Fri, 5 Jan 2024 12:06:08 +0800
Subject: [PATCH 25/40] fix the invoice date for IZYIM when export invoice to
 autocount and have reject function in mapping review

---
 .../General/Services/GuzzleShippingPortal.php | 25 -------
 .../UpdateStatementTransactionStatusLogic.php | 49 ++++--------
 .../ListShippingPortalTransactions.php        |  1 +
 .../FetchesBankStatementTransactionOwner.php  | 31 ++++++++
 .../Services/ExportsInvoiceTransactions.php   | 75 +++++++++----------
 .../StatementTransactionComponent.vue         | 19 ++++-
 6 files changed, 98 insertions(+), 102 deletions(-)
 delete mode 100644 app/Classes/General/Services/GuzzleShippingPortal.php
 create mode 100644 app/Classes/Modules/Accounting/Services/FetchesBankStatementTransactionOwner.php

diff --git a/app/Classes/General/Services/GuzzleShippingPortal.php b/app/Classes/General/Services/GuzzleShippingPortal.php
deleted file mode 100644
index 2fed1e9a..00000000
--- a/app/Classes/General/Services/GuzzleShippingPortal.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Classes\General\Services;
-
-use Illuminate\Support\Facades\Log;
-
-class GuzzleShippingPortal
-{
-    public function execute($route, $requests)
-    {
-        try {
-            $url = 'https://izyim.cief-malaysia.com/public/api/v1/'.$route;
-            $client = new \GuzzleHttp\Client(['verify' => false]);
-            $response = $client->request('GET', $url . '?api-key=510acd13d8d24375cf038ad626c282565451461a9c2399357e0b65365300787e&'. $requests);
-            $body = $response->getBody();
-            $data = json_decode($body, true);
-            $payload = $data['payload'];
-            return $payload['data'];
-        } catch (\Exception $exception) {
-            Log::error($exception->getMessage());
-            Log::channel('guzzleShippingPortal')->debug($exception->getMessage());
-            return [];
-        }
-    }
-}
diff --git a/app/Classes/Modules/Accounting/ControllersLogic/UpdateStatementTransactionStatusLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/UpdateStatementTransactionStatusLogic.php
index 3a006e9e..b208c2e3 100644
--- a/app/Classes/Modules/Accounting/ControllersLogic/UpdateStatementTransactionStatusLogic.php
+++ b/app/Classes/Modules/Accounting/ControllersLogic/UpdateStatementTransactionStatusLogic.php
@@ -2,16 +2,14 @@
 
 namespace App\Classes\Modules\Accounting\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounting\Services\FetchesBankStatementTransaction;
-use App\Http\Resources\BankStatementTransactionResource;
-use App\Classes\Modules\Accounting\Services\UpdatesBankStatementTransactionOwnerStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\StatementTransactionOwnerType;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-
+use Illuminate\Http\JsonResponse;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Http\Resources\BankStatementTransactionOwnerResource;
+use App\Classes\ValueObjects\Constants\StatementTransactionOwnerType;
+use App\Classes\Modules\Accounting\Services\FetchesBankStatementTransactionOwner;
+use App\Classes\Modules\Accounting\Services\UpdatesBankStatementTransactionOwnerStatus;
 
 class UpdateStatementTransactionStatusLogic extends AbstractControllerLogic
 {
@@ -27,29 +25,23 @@ class UpdateStatementTransactionStatusLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var FetchesBankStatementTransaction */
-    private $fetchesBankStatementTransaction;
+    /** @var FetchesBankStatementTransactionOwner */
+    private $fetchesBankStatementTransactionOwner;
 
     /** @var UpdatesBankStatementTransactionOwnerStatus */
     private $updatesBankStatementTransactionOwnerStatus;
 
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
     /**
      * UpdateAnnouncementLogic constructor.
-     * @param FetchesBankStatementTransaction $fetchesBankStatementTransaction
+     * @param FetchesBankStatementTransactionOwner $fetchesBankStatementTransactionOwner
      * @param UpdatesBankStatementTransactionOwnerStatus $updatesBankStatementTransactionOwnerStatus
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
      */
     public function __construct(
-        FetchesBankStatementTransaction $fetchesBankStatementTransaction,
-        UpdatesBankStatementTransactionOwnerStatus $updatesBankStatementTransactionOwnerStatus,
-        UpdatesTransactionStatus $updatesTransactionStatus
+        FetchesBankStatementTransactionOwner $fetchesBankStatementTransactionOwner,
+        UpdatesBankStatementTransactionOwnerStatus $updatesBankStatementTransactionOwnerStatus
     ) {
-        $this->fetchesBankStatementTransaction = $fetchesBankStatementTransaction;
+        $this->fetchesBankStatementTransactionOwner = $fetchesBankStatementTransactionOwner;
         $this->updatesBankStatementTransactionOwnerStatus = $updatesBankStatementTransactionOwnerStatus;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
     }
 
     /**
@@ -61,21 +53,10 @@ class UpdateStatementTransactionStatusLogic extends AbstractControllerLogic
      */
     public function logic(Request $request): JsonResponse
     {
-        $statementTrasaction = $this->fetchesBankStatementTransaction->execute(['id' => $request->route('id')]);
-
-        $statementTrasactionOwner = $statementTrasaction->owners->first();
+        $statementTrasactionOwner = $this->fetchesBankStatementTransactionOwner->execute(['id' => $request->route('id')]);
 
         $this->updatesBankStatementTransactionOwnerStatus->execute($statementTrasactionOwner, $request->route('status') == 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-        // todo-new: approve payments status, need to check the owner(if system is shipping, need to api with shipping portal)
-        // if ($request->route('status') == 'approve') {
-        //     if ($statementTrasactionOwner->transaction->type === StatementTransactionOwnerType::SALES) {
-        //         if ($statementTrasactionOwner->owner->status === ApprovalStatus::PENDING_VERIFICATION) {
-        //             $this->updatesTransactionStatus->execute($statementTrasactionOwner->owner, ApprovalStatus::APPROVED);
-        //         }
-        //     }
-        // }
-
-        return $this->resourceResponse(new BankStatementTransactionResource($statementTrasaction));
+        return $this->resourceResponse(new BankStatementTransactionOwnerResource($statementTrasactionOwner));
     }
 }
diff --git a/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php b/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php
index f80c3c0e..18ec9c36 100644
--- a/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php
+++ b/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php
@@ -13,6 +13,7 @@ class ListShippingPortalTransactions
     {
         try {
             $url = 'https://izyim.cief-malaysia.com/public/api/v1/transactions/mappable/query/with-details';
+            // $url = 'http://127.0.0.1:8001/public/api/v1/transactions/mappable/query/with-details';
             $client = new \GuzzleHttp\Client(['verify' => false]);
             $response = $client->request('GET', $url . '?api-key=510acd13d8d24375cf038ad626c282565451461a9c2399357e0b65365300787e&filters=' . json_encode($filters));
             $body = $response->getBody();
diff --git a/app/Classes/Modules/Accounting/Services/FetchesBankStatementTransactionOwner.php b/app/Classes/Modules/Accounting/Services/FetchesBankStatementTransactionOwner.php
new file mode 100644
index 00000000..17c620f5
--- /dev/null
+++ b/app/Classes/Modules/Accounting/Services/FetchesBankStatementTransactionOwner.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Modules\Accounting\Services;
+
+use App\Models\StatementTransactionOwner;
+use Illuminate\Database\Eloquent\Builder;
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+
+class FetchesBankStatementTransactionOwner extends AbstractFetchRecord
+{
+
+    /** @var StatementTransactionOwner */
+    private $repository;
+
+    /**
+     * FetchesBankStatementDetails constructor.
+     * @param StatementTransactionOwner $repository
+     */
+    public function __construct(StatementTransactionOwner $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index ee07f435..62a2c13e 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -19,7 +19,6 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use Illuminate\Support\Facades\Log;
 use App\Classes\General\Eloquent\ApplyFiltersToQuery;
 use App\Models\StatementTransaction;
-use App\Classes\General\Services\GuzzleShippingPortal;
 
 class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
 {
@@ -109,13 +108,13 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
                 '500-0000',
                 'CIEF'
             ];
-        } else {
+        } elseif ($statementTransactionOwner->owner_id) {
             $row = (App()->make(ListShippingPortalTransactions::class))->execute([
                 'id' => $statementTransactionOwner->owner_id,
                 'with_company' => true,
             ]);
 
-            if (empty($row) || $row[0]['status'] != 'success') {
+            if (!empty($row) && $row[0]['status'] != 'success') {
                 $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Fetch Shipping Transaction Fail ' . json_encode([
                     'id' => $statementTransactionOwner->owner_id,
                     'with_company' => true,
@@ -125,51 +124,45 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
 
                 $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Shipping Portal Respnose ' . json_encode($row) . PHP_EOL;
                 file_put_contents($errorFilePath, $textToAppend, FILE_APPEND);
-                $transactionShippingPortal = $this->getFromShippingPortal($statementTransactionOwner->owner_id);
 
                 return [
-                    'Transaction Not Found',
-                    (isset($transactionShippingPortal['created_at']) ? Carbon::parse($transactionShippingPortal['created_at'])->format('m/d/Y H:m') : null),
-                    $transaction->transaction_description.' - '.$transaction->transaction_description_2,
-                    $statementTransactionOwner->system,
+                    '<<New>>',
+                    Carbon::parse($row['created_at'])->format('m/d/Y H:m'),
+                    $row['debtor_code'],
+                    $row['type'] === ShippingTransactionType::PAYMENT ? $row['order_reference'] : $row['marking'],
                     '',
+                    'MYR',
+                    $row['type'] === ShippingTransactionType::PAYMENT ? $row['order_reference'] : $row['bill_no'],
+                    $row['type'] === ShippingTransactionType::PAYMENT ? '' : 'W1',
+                    $row['type'] === ShippingTransactionType::PAYMENT ? 'PLEASE REFER TO THE ATTACHED APPENDIX REF `' . $row['order_reference'] : 'CREDIT SALES',
                     '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    0,
-                    $transaction->amount,
-                    '',
-                    '',
-                    '',
-                    ''
+                    1,
+                    round($row['amount'], 2),
+                    '500-0000',
+                    'CIEF'
                 ];
+
             }
-
-            $row = $row[0];
-
-            return [
-                '<<New>>',
-                Carbon::parse($row['updated_at'])->format('m/d/Y H:m'),
-                $row['debtor_code'],
-                $row['type'] === ShippingTransactionType::PAYMENT ? $row['order_reference'] : $row['marking'],
-                '',
-                'MYR',
-                $row['type'] === ShippingTransactionType::PAYMENT ? $row['order_reference'] : $row['bill_no'],
-                $row['type'] === ShippingTransactionType::PAYMENT ? '' : 'W1',
-                $row['type'] === ShippingTransactionType::PAYMENT ? 'PLEASE REFER TO THE ATTACHED APPENDIX REF `' . $row['order_reference'] : 'CREDIT SALES',
-                '',
-                1,
-                round($row['amount'], 2),
-                '500-0000',
-                'CIEF'
-            ];
         }
+
+        return [
+            'Transaction Not Found',
+            $transaction->posting_date->format('m/d/Y H:m'),
+            $transaction->transaction_description.' - '.$transaction->transaction_description_2,
+            $statementTransactionOwner->system,
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            0,
+            $transaction->amount,
+            '',
+            '',
+            '',
+            ''
+        ];
     }
 
-    private function getFromShippingPortal($id){
-        $data = (new guzzleShippingPortal)->execute('transactions/mappable/query','filters={"id":'.$id.'}');
-        return (count($data) > 0 ? $data[0] : null);
-    }
 }
diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 0c193871..787f2f37 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -74,7 +74,7 @@
                             <div class="row parentContainer" v-for="owner in item.owners.pending_verification">
                                 <div class="col d-flex justify-content-between">
                                     <a :href="owner.reference_link" target="_blank">{{ owner.reference }}</a>
-                                    <div v-if="stage === 2">
+                                    <div v-if="stage === 2" style="display: flex;">
                                         <button class="btn btn-xs btn-outline-primary b-rad-none m-r-5 requestModal" data-type="approveCorrectMappingTransaction">
                                             <i class="fa fa-check fa-fw"></i>
                                         </button>
@@ -89,6 +89,21 @@
                                             >
                                             </general-confirmation-form-component>
                                         </modal-component>
+
+                                        <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="revertPendingMappingTransaction">
+                                            <i class="fa fa-times fa-fw"></i>
+                                        </button>
+                                        <modal-component class="animate__animated animate__fast animate__fadeIn" type="revertPendingMappingTransaction">
+                                            <general-confirmation-form-component
+                                                contentText="Are you sure you want to reject this mapping?"
+                                                modalType="delete"
+                                                class="text-center"
+                                                :apiRoute="route('api.accounting.statement_transaction.owner.status.update', owner.id, 'reject')"
+                                                apiMethod="post"
+                                                :section="section"
+                                            >
+                                            </general-confirmation-form-component>
+                                        </modal-component>
                                     </div>
                                 </div>
                             </div>
@@ -143,7 +158,7 @@
                             contentText="Are you sure you want to reject this mapping?"
                             modalType="delete"
                             class="text-center"
-                            :apiRoute="route('api.accounting.statement_transaction.owner.status.update', item.id, 'reject')"
+                            :apiRoute="route('api.accounting.statement_transaction.owner.status.update', item.owners.pending_verification[0].id, 'reject')"
                             apiMethod="post"
                             :section="section"
                         >

From 435927ba1919d367d41e6494ec6b651ceaea6f9b Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 8 Jan 2024 18:07:04 +0800
Subject: [PATCH 26/40] update code fix po

---
 resources/views/pages/pdfs/purchase_order_table.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/pdfs/purchase_order_table.blade.php b/resources/views/pages/pdfs/purchase_order_table.blade.php
index 99b28dd7..cc47100e 100644
--- a/resources/views/pages/pdfs/purchase_order_table.blade.php
+++ b/resources/views/pages/pdfs/purchase_order_table.blade.php
@@ -15,7 +15,7 @@
         $subtotal = "0";
         $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
         $displayedSubtotal = 0;
-        $currency_id = $transaction->currency_id;
+        $currency_id = $transaction->owner->fix_currency_id;
     @endphp
 
     @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)

From 8a05620edf98b8508cf3e4786d44099ebac7e252 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Mon, 8 Jan 2024 22:41:59 +0800
Subject: [PATCH 27/40] update

---
 .../Bookings/ControllersLogic/CreateBookingRefundLogic.php    | 4 ++++
 .../components/bookings/elements/PaymentHistoryComponent.vue  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
index 398312c9..b87f4331 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
@@ -81,6 +81,10 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
 
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]);
 
+        if ($transaction->transactions()->bills()->first()) {
+            throw new MalformedRequestException('Booking under white form cannot request for refund');
+        }
+
         $booking = $transaction->owner;
 
         $billNumber = $this->generatesTransactionBillNumber->execute('RFD-');
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 63cb4687..0512f768 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -272,7 +272,7 @@
                         </div>
                     </div>
                     <div class="row m-t-10" v-show="[2, 3].includes(item.status) && (totalRequestedRefund + totalRefunds) < data.booking.amount">
-                        <div class="col">
+                        <div class="col" v-if="!item.transaction_bill">
                             <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal" data-type="transferSummary">Request Refund</button>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
                                 <refund-confirmation-component :data="data" :section="section" :totalRefunds="totalRequestedRefund + totalRefunds"></refund-confirmation-component>

From 1e168729335842085df9516e20ee0f47c5264f72 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Tue, 9 Jan 2024 09:08:44 +0800
Subject: [PATCH 28/40] fix the invoice date for IZYIM when export invoice to
 autocount

---
 .../Modules/Exports/Services/ExportsInvoiceTransactions.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index 62a2c13e..836efd34 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -114,7 +114,7 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
                 'with_company' => true,
             ]);
 
-            if (!empty($row) && $row[0]['status'] != 'success') {
+            if (!empty($row) && $row[0]['status'] == 'success') {
                 $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Fetch Shipping Transaction Fail ' . json_encode([
                     'id' => $statementTransactionOwner->owner_id,
                     'with_company' => true,

From aa57a79ab75c4e344ef037b0d7e407c3f3f529a1 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 11 Jan 2024 11:22:46 +0800
Subject: [PATCH 29/40] fix ExportsInvoiceTransactions - $row is inside an
 array

---
 .../Modules/Exports/Services/ExportsInvoiceTransactions.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index 836efd34..85df0be8 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -125,6 +125,8 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
                 $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Shipping Portal Respnose ' . json_encode($row) . PHP_EOL;
                 file_put_contents($errorFilePath, $textToAppend, FILE_APPEND);
 
+                $row = $row[0];
+
                 return [
                     '<<New>>',
                     Carbon::parse($row['created_at'])->format('m/d/Y H:m'),

From e5a96e179c0f828ea667863557a7375f2f7e2730 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Sat, 13 Jan 2024 13:27:24 +0800
Subject: [PATCH 30/40] add refund transaction under booking payment history,
 update on admin currency order dashboard to show the correct amount after
 refunded

---
 .../CreateSupplierTransactionLogic.php        | 25 +++++-
 .../CreateSupplierTransactionProcessor.php    | 10 ++-
 .../elements/PaymentHistoryComponent.vue      | 85 +++++++++++++++++--
 .../SupplierPendingOrderComponent.vue         | 23 ++++-
 .../forms/SupplierPlaceOrderFormComponent.vue |  7 +-
 5 files changed, 137 insertions(+), 13 deletions(-)

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
index 2dcbd0f7..fb324267 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
@@ -3,6 +3,7 @@
 
 namespace App\Classes\Modules\Transactions\ControllersLogic;
 
+use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\Modules\Transactions\Processors\CreateSupplierTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Models\Document;
@@ -18,6 +19,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 
 class CreateSupplierTransactionLogic extends AbstractControllerLogic
 {
@@ -48,6 +50,9 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
     /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNumber;
 
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
 
     /**
      * CreateSupplierTransactionLogic constructor.
@@ -56,14 +61,16 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
      * @param CreatesDocument $createsDocument
      * @param CreatesFiles $createsFile
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param FetchesTransaction $fetchesTransaction
      */
-    public function __construct(FetchesCompany $fetchesCompany, CreateSupplierTransactionProcessor $createSupplierTransactionProcessor, CreatesDocument $createsDocument, CreatesFiles $createsFile, GeneratesTransactionBillNumber $generatesTransactionBillNumber)
+    public function __construct(FetchesCompany $fetchesCompany, CreateSupplierTransactionProcessor $createSupplierTransactionProcessor, CreatesDocument $createsDocument, CreatesFiles $createsFile, GeneratesTransactionBillNumber $generatesTransactionBillNumber, FetchesTransaction $fetchesTransaction)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->createSupplierTransactionProcessor = $createSupplierTransactionProcessor;
         $this->createsDocument = $createsDocument;
         $this->createsFile = $createsFile;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->fetchesTransaction = $fetchesTransaction;
     }
 
     public function logic(Request $request) : JsonResponse
@@ -75,6 +82,22 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
 
         $payments = $request->input('payments');
 
+        foreach($payments as $payment){
+            $payment = $this->fetchesTransaction->execute(['id' => $payment['id']]);
+
+            $pendingRefundRequest = $payment->transactions()->refunds()->where('status', ApprovalStatus::PENDING_VERIFICATION)->first();
+
+            if ($pendingRefundRequest) {
+                throw new MalformedRequestException('Unable to create supplier order for pending refund request payment');
+            }
+
+            $totalRefund = $payment->transactions()->refunds()->where('status', ApprovalStatus::APPROVED)->sum('original_amount');
+
+            if ($payment->original_amount - $totalRefund <= 0) {
+                throw new MalformedRequestException('Unable to create supplier order for fully refunded payment');
+            }
+        }
+
         $this->createSupplierTransactionProcessor->execute($supplier, $rate, $payments);
 
         if(!count($this->createSupplierTransactionProcessor->getBills())) return $this->response([]);
diff --git a/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
index 9b944a5b..b514b404 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
@@ -81,15 +81,19 @@ class CreateSupplierTransactionProcessor
 
             if($payment->status !== ApprovalStatus::APPROVED) continue;
 
+            $totalRefund = $payment->transactions()->refunds()->where('status', ApprovalStatus::APPROVED)->sum('original_amount');
+
+            $original_amount_after_refund = $payment->original_amount - $totalRefund;
+
             $this->updatesTransactionStatus->execute($payment, ApprovalStatus::COMPLETED);
             $billNumber = $this->generatesTransactionBillNumber->execute('SPLR-');
             $constant = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $supplier->id)->first();
 
-            $serviceCharge = $this->calculatesTransactionServiceCharge->execute($payment->original_amount, $rate, $constant);
+            $serviceCharge = $this->calculatesTransactionServiceCharge->execute($original_amount_after_refund, $rate, $constant);
 
             $object = new TransactionObject($billNumber, TransactionType::BILL, $supplier->id, 1,
                 $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH,
-                $payment->original_amount * (1 / $rate), $payment->original_amount, 1, $payment->original_currency_id,
+                $original_amount_after_refund * (1 / $rate), $original_amount_after_refund, 1, $payment->original_currency_id,
                 $rate, 0, $serviceCharge, null, ApprovalStatus::PENDING_SUBMISSION);
 
             /** @var Transaction $billTransaction */
@@ -101,7 +105,7 @@ class CreateSupplierTransactionProcessor
             $transferFee = $this->calculatesTransactionTransferFee->execute($billTransaction->original_amount, $constant);
             $object = new TransactionObject($transferFeeNumber, TransactionType::TRANSFER_FEE, 1, $supplier->id,
                 $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH,
-                $payment->original_amount, $payment->original_amount, $payment->original_currency_id, $payment->original_currency_id,
+                $original_amount_after_refund, $original_amount_after_refund, $payment->original_currency_id, $payment->original_currency_id,
                 1, 0, $transferFee, null, ApprovalStatus::PENDING_VERIFICATION);
 
             $this->pushTransferFee($this->createsTransaction->execute($billTransaction, $object));
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 0512f768..2649edcf 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -24,7 +24,7 @@
                                 <div class="col-auto p-l-0" v-if="totalRefunds !== 0">
                                     <div class="font-heading fs-8 muted all-caps">Refunded Amount</div>
                                     <div class="font-heading fs-10 bold text-danger">
-                                        {{item.original_currency.short_code}} {{(Math.round((totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                        {{item.currency.short_code}} {{(Math.round((totalConvertRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
                                     </div>
                                 </div>
                             </div>
@@ -136,6 +136,12 @@
                             <div class="font-heading fs-10">{{item.original_currency.short_code}} {{(Math.round((totalRequestedRefund + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                         </div>
                     </div>
+                    <div class="row align-items-end m-b-10 bold text-danger" v-if="totalRequestedRefund != 0">
+                        <div class="col"></div>
+                        <div class="col-auto text-right">
+                            <div class="font-heading fs-10">{{item.currency.short_code}} {{(Math.round((totalRequestedConvertRefund + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                        </div>
+                    </div>
                     <div class="row align-items-end m-b-10 bold text-danger" v-if="totalRefunds != 0">
                         <div class="col">
                             <div class="font-heading all-caps fs-10">Refunded Amount</div>
@@ -144,6 +150,12 @@
                             <div class="font-heading fs-12">{{item.original_currency.short_code}} {{(Math.round((totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                         </div>
                     </div>
+                    <div class="row align-items-end m-b-10 bold text-danger" v-if="totalRefunds != 0">
+                        <div class="col"></div>
+                        <div class="col-auto text-right">
+                            <div class="font-heading fs-12">{{item.currency.short_code}} {{(Math.round((totalConvertRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                        </div>
+                    </div>
                     <div class="row align-items-end bold m-b-10 text-primary">
                         <div class="col">
                             <div class="font-heading all-caps fs-10">Rate</div>
@@ -187,6 +199,14 @@
                             <div class="font-heading fs-12">MYR {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                         </div>
                     </div>
+                    <div class="row align-items-end m-b-10 bold text-success" v-if="totalRefunds != 0">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">Your Payment After Refund</div>
+                        </div>
+                        <div class="col-auto text-right">
+                            <div class="font-heading fs-12">MYR {{(Math.round((item.amount - totalConvertRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                        </div>
+                    </div>
                     <div class="row">
                         <div class="col">
                             <div class="font-heading all-caps fs-10 m-b-5">Your Payment Proof</div>
@@ -279,6 +299,47 @@
                             </modal-component>
                         </div>
                     </div>
+                    <div class="row m-t-10" v-if="totalRefunds !== 0">
+                        <div class="col">
+                            <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border" @click="clickExpandRefundTransactions">Show Refund Transactions</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-if="totalRefunds != 0 && expandRefundTransactions">
+                <div class="col bg-white padding-15">
+                    <div v-for="(refund, index) in data.transaction_refunds">
+                        <div class="row align-items-end m-b-10 bold">
+                            <div class="col">
+                                <div class="font-heading all-caps fs-10">{{ index + 1 }}. Refund updated on</div>
+                            </div>
+                            <div class="col-auto text-right">
+                                <div class="font-heading fs-10">{{ refund.updated_at }}</div>
+                            </div>
+                        </div>
+                        <div class="row align-items-end m-b-10 bold">
+                            <div class="col">
+                                <div class="font-heading all-caps fs-10">&nbsp;&nbsp;&nbsp; Refund status</div>
+                            </div>
+                            <div class="col-auto text-right">
+                                <div class="font-heading fs-10" :class="[{'text-warning': refund.status === 1}, {'text-success': refund.status === 2}, {'text-danger': refund.status === 4}]">{{ refund.status === 1 ? 'Pending Verification' : refund.status === 2 ? 'Approved' : 'Rejected'}}</div>
+                            </div>
+                        </div>
+                        <div class="row align-items-end m-b-10 bold text-danger">
+                            <div class="col">
+                                <div class="font-heading all-caps fs-10">&nbsp;&nbsp;&nbsp; Requested Refund Amount</div>
+                            </div>
+                            <div class="col-auto text-right">
+                                <div class="font-heading fs-10">{{refund.original_currency.short_code}} {{(Math.round((refund.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                            </div>
+                        </div>
+                        <div class="row align-items-end m-b-10 bold text-danger">
+                            <div class="col"></div>
+                            <div class="col-auto text-right">
+                                <div class="font-heading fs-10">{{refund.currency.short_code}} {{(Math.round((refund.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -291,6 +352,7 @@
         data(){
             return {
                 expandPaymentDetails: false,
+                expandRefundTransactions: false,
                 amount: (Math.round(1000 * 100) / 100).toFixed(2),
                 parameters: {
                     amount: (Math.round(1000 * 100) / 100).toFixed(2),
@@ -313,12 +375,12 @@
                 let vm = this;
                 var TotalRequestedRefund = 0;
                 this.data.transaction_refunds.forEach(function(refunds) {
-                    TotalRequestedRefund += refunds.status === 1 ? refunds.original_amount : 0;
+                    TotalRequestedRefund += refunds.status === 1 ? refunds.amount : 0;
                 });
-                if (vm.data.booking.fixed_currency.id != 1 && this.data.transaction_refunds[0]) {
-                    TotalRequestedRefund = (TotalRequestedRefund * this.data.transaction_refunds[0].currency_rate);
-                }
-                return ((Math.round((TotalRequestedRefund + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","));
+                // if (vm.data.booking.fixed_currency.id != 1 && this.data.transaction_refunds[0]) {
+                //     TotalRequestedRefund = (TotalRequestedRefund * this.data.transaction_refunds[0].currency_rate);
+                // }
+                return TotalRequestedRefund;
             },
             totalRefunds() {
                 var TotalRequestedRefund = 0;
@@ -326,11 +388,22 @@
                     TotalRequestedRefund += refunds.status === 2 ? refunds.original_amount : 0;
                 });
                 return TotalRequestedRefund;
+            },
+            totalConvertRefunds() {
+                var TotalRequestedRefund = 0;
+                this.data.transaction_refunds.forEach(function(refunds) {
+                    TotalRequestedRefund += refunds.status === 2 ? refunds.amount : 0;
+                });
+                return TotalRequestedRefund;
             }
         },
         methods: {
             clickExpand(){
                 this.expandPaymentDetails = !this.expandPaymentDetails;
+                this.expandRefundTransactions = false;
+            },
+            clickExpandRefundTransactions(){
+                this.expandRefundTransactions = !this.expandRefundTransactions;
             },
         },
         mixins: [componentHandler]
diff --git a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
index e4877e96..309f2b9b 100644
--- a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
@@ -56,6 +56,16 @@
                                                 <span class="flag-icon" :class="'flag-icon-'+item.original_currency.country.short_code.toLowerCase()"></span> {{item.original_currency.short_code}}
                                             </div>
                                         </div>
+                                        <div class="col text-right" v-if="totalRefunds !== 0">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="font-heading fs-10 muted all-caps">Refunded Amount</div>
+                                                    <div class="font-heading fs-14 text-danger bold">
+                                                        {{(Math.round((totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="row">
                                         <div class="col-auto">
@@ -95,7 +105,7 @@
                                         <div class="col text-right">
                                             <div class="font-heading fs-10 muted all-caps">Amount</div>
                                             <div class="font-heading fs-14 text-success bold">
-                                                {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                                {{(Math.round((item.original_amount - totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
                                             </div>
                                         </div>
                                     </div>
@@ -124,11 +134,20 @@
                 active: false,
             }
         },
+        computed: {
+            totalRefunds() {
+                var TotalRequestedRefund = 0;
+                this.data.transaction_refunds.forEach(function(refunds) {
+                    TotalRequestedRefund += refunds.status === 2 ? refunds.original_amount : 0;
+                });
+                return TotalRequestedRefund;
+            }
+        },
         methods: {
             activate(){
                 this.active = !this.active;
                 this.$emit('input', this.item)
-            }
+            },
         },
         mixins: [componentHandler]
     }
diff --git a/resources/assets/vue/components/bookings/forms/SupplierPlaceOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/SupplierPlaceOrderFormComponent.vue
index 4ec71edd..0f27eb95 100644
--- a/resources/assets/vue/components/bookings/forms/SupplierPlaceOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/SupplierPlaceOrderFormComponent.vue
@@ -115,7 +115,12 @@
         computed: {
             total(){
                 return this.payments.reduce(function (total, currentValue) {
-                    return total + currentValue.original_amount;
+                    return total + currentValue.original_amount - currentValue.transaction_refunds.reduce(function (totalRefund, refundTransaction) {
+                        if (refundTransaction.status === 2) {
+                            return totalRefund + refundTransaction.original_amount;
+                        }
+                        return totalRefund;
+                    }, 0);
                 }, 0);
 
             },

From ef43e1616d5f4281c560c45d6159d49d7cd4308c Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Sun, 14 Jan 2024 12:20:28 +0800
Subject: [PATCH 31/40] update

---
 .../CreateBookingRefundLogic.php              |   2 +-
 .../Commands/ExpiredBookingCommand.php        |  61 +------
 .../ExpiredRefundedBookingCommand.php         | 156 ++++++++++++++++++
 3 files changed, 160 insertions(+), 59 deletions(-)
 create mode 100644 app/Console/Commands/ExpiredRefundedBookingCommand.php

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
index b87f4331..7455e689 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
@@ -104,7 +104,7 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
             1, PaymentMethodType::CASH,
             $refundTotal, $request->input('amount'), 1,
             $transaction->original_currency_id, $transaction->currency_rate,
-            $transaction->tax, $transaction->service_charge, null, ApprovalStatus::PENDING_VERIFICATION, [], $transaction->bill_no);
+            0, 0, null, ApprovalStatus::PENDING_VERIFICATION, [], $transaction->bill_no);
 
         $transaction = $this->createsTransaction->execute($transaction, $object);
 
diff --git a/app/Console/Commands/ExpiredBookingCommand.php b/app/Console/Commands/ExpiredBookingCommand.php
index d79b7b9c..ca690c67 100644
--- a/app/Console/Commands/ExpiredBookingCommand.php
+++ b/app/Console/Commands/ExpiredBookingCommand.php
@@ -54,7 +54,9 @@ class ExpiredBookingCommand extends Command
             ->where(function ($query) {
                 $query->whereDoesntHave('transactions')
                     ->orWhereDoesntHave('transactions', function($transaction) {
-                        return $transaction->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                        return $transaction->where('type', TransactionType::PURCHASE_ORDER)->orWhere(function ($q) {
+                            $q->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                        });
                     });
             })->get();
 
@@ -92,62 +94,5 @@ class ExpiredBookingCommand extends Command
                 Log::info("Expired Transaction id: {$transaction->id} from Booking id: {$booking->id}");
             }
         }
-
-        // 3. Cancel fully refunded payment & cancel booking
-        $transactions = Transaction::where('type', TransactionType::CREDIT_NOTE)->get();
-
-        foreach ($transactions as $transaction) {
-            // get the booking marking
-            $marking = substr($transaction->payment_reference, -5); 
-
-            // for a special payment reference on transaction id: 152013
-            if (!is_numeric($marking)) {
-                $payment_reference = explode(" ", trim($transaction->payment_reference));
-                if (count($payment_reference) > 1) {
-                    $marking = $payment_reference[count($payment_reference) - 2];    
-                }
-            }
-
-            if (is_numeric($marking)) {
-                $booking = Booking::where('marking', $marking)->first();
-
-                if ($booking) {
-                    if ($booking->status === ApprovalStatus::APPROVED) {
-                        $bookingPayment = $booking->transactions()->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->first();
-                        if (!$bookingPayment) {
-                            $bookingPayment = $booking->transactions()->payments()->count();
-                            Log::info("Credit note transaction id: {$transaction->id}, there are {$bookingPayment} payment for the booking.");
-                            $bookingPayment = $booking->transactions()->payments()->whereIn('status', [ApprovalStatus::EXPIRED, ApprovalStatus::REJECTED])->first();
-                            $status = ApprovalStatus::APPROVAL_STATUS_ID[$bookingPayment->status];
-                            Log::info("Credit note transaction id: {$transaction->id}, the payment for the booking is in status {$status}");
-                        }
-                        $bookingPaymentAmount = $bookingPayment->amount;
-                        // check if the booking is fully refund
-                        $amountDifference = bcsub($transaction->amount, $bookingPaymentAmount);
-
-                        if (abs($amountDifference) < 0.01) {
-                            // rejecting booking payment transaction
-                            $bookingPayment->status = ApprovalStatus::REJECTED;
-                            $bookingPayment->save();
-
-                            //expired booking
-                            $this->updatesBookingStatus->execute($booking, ApprovalStatus::EXPIRED);
-                            Log::info("Credit note transaction id: {$transaction->id} is fully refunded, the refunded amount was {$transaction->amount} the payment reference is: {$transaction->payment_reference}");
-                            Log::info("Credit note transaction id: {$transaction->id}, Rejected Booking Transaction Payment id: {$bookingPayment->id}, the payment amount was {$bookingPayment->amount}");
-                            Log::info("Credit note transaction id: {$transaction->id}, Expired Booking id: {$booking->id}");
-                        } else {
-                            Log::info("Credit note transaction id: {$transaction->id} is not fully refunded, the refunded amount was {$transaction->amount}, the payment amount was {$bookingPayment->amount}, the payment reference is: {$transaction->payment_reference}");
-                        }
-                    } else {
-                        $status = ApprovalStatus::APPROVAL_STATUS_ID[$booking->status];
-                        Log::info("Credit note transaction id: {$transaction->id}, booking status is {$status}");
-                    }
-                } else {
-                    Log::info("Credit note transaction id: {$transaction->id}, booking marking not found, the payment reference is: {$transaction->payment_reference}");
-                }
-            } else {
-                Log::info("Credit note transaction id: {$transaction->id} does not have booking marking, the payment reference is: {$transaction->payment_reference}");
-            }
-        }
     }
 }
diff --git a/app/Console/Commands/ExpiredRefundedBookingCommand.php b/app/Console/Commands/ExpiredRefundedBookingCommand.php
new file mode 100644
index 00000000..4d49cb36
--- /dev/null
+++ b/app/Console/Commands/ExpiredRefundedBookingCommand.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Booking;
+use Illuminate\Console\Command;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Models\Transaction;
+
+class ExpiredRefundedBookingCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'RefundedBooking:expired';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Expiring refunded booking';
+
+    /** @var UpdatesBookingStatus */
+    private $updatesBookingStatus;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(UpdatesBookingStatus $updatesBookingStatus, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction)
+    {
+        parent::__construct();
+        $this->updatesBookingStatus = $updatesBookingStatus;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        // 3. Cancel fully refunded payment & cancel booking
+        $transactions = Transaction::where('type', TransactionType::CREDIT_NOTE)->where('payment_reference', 'LIKE', "%refund%")->get();
+
+        foreach ($transactions as $transaction) {
+            // get the booking marking
+            $payment_reference = explode(" ", trim($transaction->payment_reference));
+            // $marking = substr($transaction->payment_reference, -5); 
+            $marking = trim(end($payment_reference));
+
+            if (!preg_match('/^[0-9]+$/', $marking)) {
+                $payment_reference = explode(".", trim($transaction->payment_reference));
+                $marking = trim(end($payment_reference));
+            }
+
+            // for a special payment reference on transaction id: 140231
+            if (!preg_match('/^[0-9]+$/', $marking)) {
+                $payment_reference = explode("No", trim($transaction->payment_reference));
+                $marking = end($payment_reference);
+            }
+
+            // for a special payment reference on transaction id: 152013
+            if (!preg_match('/^[0-9]+$/', $marking)) {
+                $payment_reference = explode(" ", trim($transaction->payment_reference));
+                $marking = end($payment_reference);
+                $marking = prev($payment_reference);
+            }
+
+            if (preg_match('/^[0-9]+$/', $marking)) {
+                $booking = Booking::where('marking', $marking)->first();
+
+                if ($booking) {
+                    $bookingPayment = $booking->transactions()->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->first();
+                    if (!$bookingPayment) {
+                        $bookingPaymentCount = $booking->transactions()->payments()->count();
+                        if ($bookingPaymentCount > 1) {
+                            Log::info("Credit note transaction id: {$transaction->id}, there are {$bookingPaymentCount} payment for the booking.");
+                            foreach ($booking->transactions()->payments()->get() as $bp) {
+                                if ($transaction->amount - $bp->amount < 0.01) {
+                                    $bookingPayment = $bp;
+                                    break;
+                                }
+                            }
+                        } 
+                        
+                        if (!$bookingPayment) {
+                            $bookingPayment = $booking->transactions()->payments()->whereIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED, ApprovalStatus::REJECTED])->orderBy('id', 'DESC')->first();
+                        }
+                        $status = ApprovalStatus::APPROVAL_STATUS_ID[$bookingPayment->status];
+                        Log::info("Credit note transaction id: {$transaction->id}, the payment for the booking is in status {$status}");
+                    }
+                    $bookingPaymentAmount = $bookingPayment->amount;
+                    // check if the booking is fully refund
+                    $amountDifference = bcsub($transaction->amount, $bookingPaymentAmount, 7);
+
+                    if (abs($amountDifference) < 0.01) {
+                        // rejecting booking payment transaction
+                        // $bookingPayment->status = ApprovalStatus::REJECTED;
+                        // $bookingPayment->save();
+
+                        //expired booking
+                        // $this->updatesBookingStatus->execute($booking, ApprovalStatus::EXPIRED);
+                        Log::info("Credit note transaction id: {$transaction->id} is fully refunded, the refunded amount was {$transaction->amount} the payment reference is: {$transaction->payment_reference}");
+                        Log::info("Credit note transaction id: {$transaction->id}, Rejected Booking Transaction Payment id: {$bookingPayment->id}, the payment amount was {$bookingPayment->amount}");
+                        Log::info("Credit note transaction id: {$transaction->id}, Expired Booking id: {$booking->id}");
+                    } else {
+                        Log::info("Credit note transaction id: {$transaction->id} is not fully refunded, the refunded amount was {$transaction->amount}, the payment amount was {$bookingPayment->amount}, the payment reference is: {$transaction->payment_reference}");
+                    }
+
+                    $refund = $bookingPayment->transactions()->refunds()->where('amount', $transaction->amount)->where('status', ApprovalStatus::APPROVED)->first();
+
+                    if ($refund) {
+                        Log::info("Credit note transaction id: {$transaction->id}, already created same amount of refund transaction for same booking payment transaction");
+                    }
+
+                    if (!$refund) {
+                        $billNumber = $this->generatesTransactionBillNumber->execute('RFD-');
+
+                        $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id,
+                            1, PaymentMethodType::CASH,
+                            $transaction->amount, $transaction->amount * $bookingPayment->currency_rate, 1,
+                            $bookingPayment->original_currency_id, $bookingPayment->currency_rate,
+                            0, 0, null, ApprovalStatus::APPROVED, [], $bookingPayment->bill_no);
+    
+                        $transaction = $this->createsTransaction->execute($bookingPayment, $object);
+                    }
+                } else {
+                    Log::info("Credit note transaction id: {$transaction->id}, booking marking not found, the payment reference is: {$transaction->payment_reference}");
+                }
+            } else {
+                Log::info("Credit note transaction id: {$transaction->id} does not have booking marking, the payment reference is: {$transaction->payment_reference}");
+            }
+        }
+    }
+}

From c8cabee97b82e78c363e13dc96a1e60f86fb7f14 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Mon, 15 Jan 2024 23:41:12 +0800
Subject: [PATCH 32/40] update

---
 .../Eloquent/Filters/IsNotFullyRefunded.php   | 24 +++++++++++++++++++
 .../ExpiredRefundedBookingCommand.php         | 12 +++++++---
 .../elements/PaymentHistoryComponent.vue      |  4 ++--
 .../SupplierPendingOrdersSectionComponent.vue |  4 ++--
 4 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/IsNotFullyRefunded.php

diff --git a/app/Classes/General/Eloquent/Filters/IsNotFullyRefunded.php b/app/Classes/General/Eloquent/Filters/IsNotFullyRefunded.php
new file mode 100644
index 00000000..fdbb2994
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/IsNotFullyRefunded.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
+
+class IsNotFullyRefunded implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->withSum(['transactions as total_refund_amount' => function($q) {
+            $q->refunds()->where('status', ApprovalStatus::APPROVED);
+        }], 'original_amount')
+        ->having('total_refund_amount', '<', DB::raw('original_amount'));
+    }
+}
diff --git a/app/Console/Commands/ExpiredRefundedBookingCommand.php b/app/Console/Commands/ExpiredRefundedBookingCommand.php
index 4d49cb36..db7e00a7 100644
--- a/app/Console/Commands/ExpiredRefundedBookingCommand.php
+++ b/app/Console/Commands/ExpiredRefundedBookingCommand.php
@@ -122,19 +122,25 @@ class ExpiredRefundedBookingCommand extends Command
                         //expired booking
                         // $this->updatesBookingStatus->execute($booking, ApprovalStatus::EXPIRED);
                         Log::info("Credit note transaction id: {$transaction->id} is fully refunded, the refunded amount was {$transaction->amount} the payment reference is: {$transaction->payment_reference}");
-                        Log::info("Credit note transaction id: {$transaction->id}, Rejected Booking Transaction Payment id: {$bookingPayment->id}, the payment amount was {$bookingPayment->amount}");
-                        Log::info("Credit note transaction id: {$transaction->id}, Expired Booking id: {$booking->id}");
+                        // Log::info("Credit note transaction id: {$transaction->id}, Rejected Booking Transaction Payment id: {$bookingPayment->id}, the payment amount was {$bookingPayment->amount}");
+                        // Log::info("Credit note transaction id: {$transaction->id}, Expired Booking id: {$booking->id}");
                     } else {
                         Log::info("Credit note transaction id: {$transaction->id} is not fully refunded, the refunded amount was {$transaction->amount}, the payment amount was {$bookingPayment->amount}, the payment reference is: {$transaction->payment_reference}");
                     }
 
                     $refund = $bookingPayment->transactions()->refunds()->where('amount', $transaction->amount)->where('status', ApprovalStatus::APPROVED)->first();
 
+                    $bookingInWhiteForm = $bookingPayment->transactions()->bills()->first();
+
                     if ($refund) {
                         Log::info("Credit note transaction id: {$transaction->id}, already created same amount of refund transaction for same booking payment transaction");
                     }
 
-                    if (!$refund) {
+                    if ($bookingInWhiteForm) {
+                        Log::info("Credit note transaction id: {$transaction->id}, booking is in white form");
+                    }
+
+                    if (!$refund && !$bookingInWhiteForm) {
                         $billNumber = $this->generatesTransactionBillNumber->execute('RFD-');
 
                         $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id,
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 2649edcf..43e2e96d 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -299,14 +299,14 @@
                             </modal-component>
                         </div>
                     </div>
-                    <div class="row m-t-10" v-if="totalRefunds !== 0">
+                    <div class="row m-t-10" v-if="data.transaction_refunds.length > 0">
                         <div class="col">
                             <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border" @click="clickExpandRefundTransactions">Show Refund Transactions</button>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row" v-if="totalRefunds != 0 && expandRefundTransactions">
+            <div class="row" v-if="data.transaction_refunds.length > 0 && expandRefundTransactions">
                 <div class="col bg-white padding-15">
                     <div v-for="(refund, index) in data.transaction_refunds">
                         <div class="row align-items-end m-b-10 bold">
diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
index 7df9c125..c7382629 100644
--- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -117,7 +117,7 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
+                                    <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', is_not_fully_refunded: true, type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
                                         <template slot="list" slot-scope="{data}">
                                             <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
                                         </template>
@@ -195,7 +195,7 @@
             },
             updateList(){
 
-                this.$refs.pendingOrdersList.updateFilters({per_page: 10000, status: 2, type: 1, original_currency_id_in: [this.selectedCurrency.id], transaction_service_id: this.selectedService.id});
+                this.$refs.pendingOrdersList.updateFilters({per_page: 10000, status: 2, type: 1, is_not_fully_refunded: true, original_currency_id_in: [this.selectedCurrency.id], transaction_service_id: this.selectedService.id});
 
                 this.selectedSupplier.status = false;
                 this.currencyDropdownLaunch.status = false;

From 7151caa9b8c7364df80a76643c78fe206a00b002 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 11 Feb 2024 16:11:42 +0800
Subject: [PATCH 33/40] Proof of concept - Vue Polling a workaround for AWS API
 Gateway limitation

---
 app/Classes/Jobs/ListBookingsJob.php          |   2 +
 app/Classes/Jobs/ListDocumentsJob.php         |   2 +
 app/Classes/Jobs/ListTransactionsJob.php      |   2 +
 .../Processors/FetchesJobResultProcessor.php  |  10 +-
 .../Processors/UpdateJobResultProcessor.php   |   4 +-
 .../AdminPaymentsBillingSectionComponent.vue  |  26 ++--
 ...PaymentsBillingSectionPollingComponent.vue | 136 ++++++++++++++++++
 .../SupplierPendingOrdersSectionComponent.vue |   8 +-
 .../general/elements/ListPollingComponent.vue |  57 ++++----
 .../views/pages/billings_experiment.blade.php |   9 ++
 routes/job.php                                |   1 +
 routes/web.php                                |  12 +-
 12 files changed, 219 insertions(+), 50 deletions(-)
 create mode 100644 resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue
 create mode 100644 resources/views/pages/billings_experiment.blade.php

diff --git a/app/Classes/Jobs/ListBookingsJob.php b/app/Classes/Jobs/ListBookingsJob.php
index 41f976a6..b021b71d 100644
--- a/app/Classes/Jobs/ListBookingsJob.php
+++ b/app/Classes/Jobs/ListBookingsJob.php
@@ -16,6 +16,8 @@ class ListBookingsJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    public $timeout = 900;
+
     /** @var ListGenericJobObject */
     private $listGenericJobObject;
 
diff --git a/app/Classes/Jobs/ListDocumentsJob.php b/app/Classes/Jobs/ListDocumentsJob.php
index bbadc169..6e93062b 100644
--- a/app/Classes/Jobs/ListDocumentsJob.php
+++ b/app/Classes/Jobs/ListDocumentsJob.php
@@ -16,6 +16,8 @@ class ListDocumentsJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    public $timeout = 900;
+
     /** @var ListGenericJobObject */
     private $listGenericJobObject;
 
diff --git a/app/Classes/Jobs/ListTransactionsJob.php b/app/Classes/Jobs/ListTransactionsJob.php
index 6b8913a2..a2b28656 100644
--- a/app/Classes/Jobs/ListTransactionsJob.php
+++ b/app/Classes/Jobs/ListTransactionsJob.php
@@ -16,6 +16,8 @@ class ListTransactionsJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    public $timeout = 900;
+
     /** @var ListGenericJobObject */
     private $listGenericJobObject;
 
diff --git a/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php b/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
index e19456e7..89783fe8 100644
--- a/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
+++ b/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
@@ -2,6 +2,7 @@
 
 namespace App\Classes\Modules\Jobs\Processors;
 
+use App\Classes\Exceptions\JobResourceNotFoundException;
 use App\Classes\Modules\Jobs\Services\FetchesJobResult;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
@@ -32,12 +33,13 @@ class FetchesJobResultProcessor
     public function execute(Request $request){
 
         $res1 = $this->fetchesJobResult->execute(['job_id' => $request->route('job_id')]);
+        if($request->route('is_last')){
+            $res2 = $this->fetchesJobResult->execute(['request_signature' => $res1->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
+            return $res2;
+        }
 
         if(!$res1->result){
-            Log::info('Job id: '.$request->route('job_id'));
-            $res2 = $this->fetchesJobResult->execute(['request_signature' => $res1->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
-            Log::info('Job id: '.$res2->id." , request_signature: ".$res2->request_signature);
-            return $res2;
+            throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
         }
 
         return $res1;
diff --git a/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php b/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
index fff83bb0..0106417d 100644
--- a/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
+++ b/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
@@ -44,9 +44,9 @@ class UpdateJobResultProcessor
         try{
             $jobResultExisting = $this->fetchesJobResult->execute(['request_signature' => $jobResultCurrent->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
             $resultSignatureExisting = $jobResultExisting->result_signature;
-            if($resultSignatureExisting != $resultSignatureCurrent){
+            //if($resultSignatureExisting != $resultSignatureCurrent){
                 $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
-            }
+            //}
         } catch (JobResourceNotFoundException $exception){
             $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
         }
diff --git a/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
index 03244ff4..966ccbbc 100644
--- a/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
@@ -90,34 +90,34 @@
             <div class="row no-margin">
                 <div class="col bg-white padding-25">
                     <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice" v-if="isActiveTab('invoice') || showTabContent('invoice')">
-                        <list-polling-component key="2" section="invoiceSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
+                        <list-component key="2" section="invoiceSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
                             <template slot="list" slot-scope="{data}">
                                 <billing-document-component :data="data"></billing-document-component>
                             </template>
-                        </list-polling-component>
-                        </div>
-                        <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order" v-if="isActiveTab('purchase-order') || showTabContent('purchase-order')">
-                        <list-polling-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
+                        </list-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order" v-if="isActiveTab('purchase-order') || showTabContent('purchase-order')">
+                        <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
                             <template slot="list" slot-scope="{data}">
                                 <billing-document-component :data="data"></billing-document-component>
                             </template>
-                        </list-polling-component>
-                        </div>
-                        <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order" v-if="isActiveTab('delivery-order') || showTabContent('delivery-order')">
-                        <list-polling-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
+                        </list-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order" v-if="isActiveTab('delivery-order') || showTabContent('delivery-order')">
+                        <list-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
                             <template slot="list" slot-scope="{data}">
                                 <billing-document-component :data="data"></billing-document-component>
                             </template>
-                        </list-polling-component>
+                        </list-component>
                     </div>
                     <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order" v-if="isActiveTab('supplier-delivery-order') || showTabContent('supplier-delivery-order')">
-                        <list-polling-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
+                        <list-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
                             <template slot="list" slot-scope="{data}">
                                 <billing-document-component :data="data"></billing-document-component>
                             </template>
-                        </list-polling-component>
-                    </div>
+                        </list-component>
                     </div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue
new file mode 100644
index 00000000..47d14857
--- /dev/null
+++ b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue
@@ -0,0 +1,136 @@
+<template>
+    <div class="row tabsContainer">
+        <div class="col">
+            <div class="row m-l-0 m-r-0 d-flex">
+                <div class="col">
+                    <div class="row justify-content-end">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="invoice" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path><path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path><path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path><path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Invoice</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchase-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Purchase Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Delivery Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="supplier-delivery-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Supplier Delivery Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row no-margin">
+                <div class="col bg-white padding-25">
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice" v-if="isActiveTab('invoice') || showTabContent('invoice')">
+                        <list-polling-component key="2" section="invoiceSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order" v-if="isActiveTab('purchase-order') || showTabContent('purchase-order')">
+                        <list-polling-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order" v-if="isActiveTab('delivery-order') || showTabContent('delivery-order')">
+                        <list-polling-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order" v-if="isActiveTab('supplier-delivery-order') || showTabContent('supplier-delivery-order')">
+                        <list-polling-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import tabHandler from '../../../general/mixins/tabHandler';
+    export default {
+        data() {
+            return {
+                activeTab: 'invoice',
+                displayedTabs: ['invoice'],
+            };
+        },
+        mixins: [tabHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
index e6b66dcf..d2b69080 100644
--- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -118,16 +118,16 @@
                             <div class="row">
                                 <div class="col">
                                      <!-- CIEF TODO: For easy revert to old code -->
-                                    <!-- <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
+                                    <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
                                         <template slot="list" slot-scope="{data}">
                                             <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
                                         </template>
-                                    </list-component> -->
-                                    <list-polling-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list.job')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
+                                    </list-component>
+                                    <!-- <list-polling-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list.job')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
                                         <template slot="list" slot-scope="{data}">
                                             <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
                                         </template>
-                                    </list-polling-component>
+                                    </list-polling-component> -->
                                 </div>
                             </div>
                         </div>
diff --git a/resources/assets/vue/components/general/elements/ListPollingComponent.vue b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
index 98e2a44b..fcd3b8b8 100644
--- a/resources/assets/vue/components/general/elements/ListPollingComponent.vue
+++ b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
@@ -50,6 +50,7 @@
 </template>
 
 <script>
+    import requestV2 from '../../../general/mixins/aws/requestV2'
     export default {
         props: {
             section:{
@@ -75,6 +76,7 @@
                 filters: this.options,
                 pollingInterval: null,
                 isPolling: false,
+                isFetchingResult: false,
                 isLoading: false,
             }
         },
@@ -124,50 +126,58 @@
                     total: result.meta.total
                 };
 
-                console.log('ListPolling:', JSON.stringify(result.meta));
                 this.stopPolling();
                 this.$store.dispatch('completeList', {'name': this.section, 'data': result.data});
                 this.$refs.pagination.makePagination(result.meta, result.links);
                 this.isLoading = false;
             },
             errorHandler(error){
-                // console.log('ListPolling error:', JSON.stringify(error));
+                this.isFetchingResult = false;
                 this.isPolling = false;
-                // this.isLoading = false;
             },
-            startPolling(jobId, maxAttempts = 3) {
+            startPolling(jobId, maxAttempts = 8) {
                 let attempts = 0;
+                let interval = 10000; // Initial interval
+
+                const resetPollingInterval = (customInterval) => {
+                    this.pollingInterval = setInterval(pollJobResult, customInterval);
+                };
+
                 const pollJobResult = () => {
-                    if (this.isPolling) {
+                    if (this.isPolling || this.isFetchingResult) {
                         return;
                     }
                     this.isPolling = true;
 
                     attempts++;
+                    if(attempts === 1){
+                        this.stopPolling();
+                        resetPollingInterval(5000);
+                    }
 
                     if (attempts > maxAttempts) {
-                        clearInterval(this.pollingInterval);
-                        this.pollingInterval = null;
-                        this.isPolling = false;
+                        this.stopPolling();
                         this.isLoading = false;
                         console.log(`Reached maximum attempts (${maxAttempts}). Polling stopped.`);
                         return;
                     }
 
-                    this.fetchJobResult(jobId);
+                    if(attempts === maxAttempts){
+                        this.fetchJobResult(jobId, true);
+                    }
+                    else{
+                        this.fetchJobResult(jobId);
+                    }
                 };
 
-                // Initial call
-                // pollJobResult();
-
-                // Set up polling interval
-                this.pollingInterval = setInterval(pollJobResult, 10000);
-
+                // pollJobResult();  // Initial call
+                this.pollingInterval = setInterval(pollJobResult, interval);
             },
             stopPolling() {
                 clearInterval(this.pollingInterval);
                 this.pollingInterval = null;
                 this.isPolling = false;
+                this.isFetchingResult = false;
             },
             submitJob(url){
                 try {
@@ -181,24 +191,23 @@
                             }
                         });
                     })
-                    // this.job.progress = response.data.progress;
-                    // this.job.completed = response.data.completed;
-
-                    // if (this.job.completed) {
-                    //     this.stopPolling();
-                    // }
                 } catch (error) {
                     console.error('Error submitJob', error);
                 }
             },
-            fetchJobResult(jobId) {
+            fetchJobResult(jobId, isLastAttempt = false) {
+                this.isFetchingResult = true;
                 try {
                     let anotherEndpoint = route('api.job.fetch', jobId);
-                    this.submit(anotherEndpoint, 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
+                    if(isLastAttempt){
+                        anotherEndpoint = route('api.job.fetch.last.attempt', jobId, isLastAttempt);
+                    }
+                    this.poll(anotherEndpoint, 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
                 } catch (error) {
                     console.error('Error fetchJobResult', error);
                 }
             }
-        }
+        },
+        mixins: [requestV2]
     }
 </script>
diff --git a/resources/views/pages/billings_experiment.blade.php b/resources/views/pages/billings_experiment.blade.php
new file mode 100644
index 00000000..d1caee2d
--- /dev/null
+++ b/resources/views/pages/billings_experiment.blade.php
@@ -0,0 +1,9 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row" v-if="$store.getters.isAdmin">
+        <div class="col p-t-15 p-b-15">
+            <billing-component></billing-component>
+            <admin-payments-billing-section-polling-component></admin-payments-billing-section-polling-component>
+        </div>
+    </div>
+@endsection
diff --git a/routes/job.php b/routes/job.php
index f32d142e..028e9468 100644
--- a/routes/job.php
+++ b/routes/job.php
@@ -4,4 +4,5 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'job', 'as' => 'job.', 'namespace' => 'Jobs'], function () {
     Route::get('/fetch/{job_id}', 'FetchJobResultController@fetch')->name('fetch');
+    Route::get('/fetch/{job_id}/{is_last}', 'FetchJobResultController@fetch')->name('fetch.last.attempt');
 });
diff --git a/routes/web.php b/routes/web.php
index ead4b3d2..4e9afd11 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -92,6 +92,12 @@ Route::get('/billings', function () {
     return view('pages.billings');
 })->name('billings');
 
+/* Vue Polling Experiment - Starts  */
+Route::get('/billings-experiment', function () {
+    return view('pages.billings_experiment');
+})->name('billings.experiment');
+/* Vue Polling Experiment - Ends  */
+
 Route::get('/currency_orders', function () {
     return view('pages.currency_orders');
 })->name('currency_orders');
@@ -813,13 +819,13 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
                     ->withTrashed()
                     ->orderBy('created_at', 'asc')
                     ->first();
-        
+
                 // get the first bill_no
                 $firstBillNo = $firstInvoice->bill_no;
                 if (strpos($firstBillNo, '-deleted') !== false) {
                     $firstBillNo = substr($firstBillNo, 0, strpos($firstBillNo, '-deleted'));
                 }
-        
+
                 // update currentInvoice bill_no to '-deleted-'
                 $currentInvoice = $booking->transactions()->where('type', TransactionType::INVOICE)->first();
                 $currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . Str::random(10);
@@ -842,4 +848,4 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
             }
         }
     );
-})->name('invoice.fix.byCustomerMarking');
\ No newline at end of file
+})->name('invoice.fix.byCustomerMarking');

From ea4795e5c861616064c9ceae521aefedd60769c2 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 11 Feb 2024 09:53:09 +0000
Subject: [PATCH 34/40] Revert "Merge branch
 'dillon/51-vue-polling-experimental-2' into 'master'"

This reverts merge request !152
---
 .../JobResourceNotFoundException.php          |  11 -
 .../Abstracts/AbstractControllerLogic.php     |  15 +-
 .../General/Eloquent/AbstractFetchRecord.php  |  14 +-
 .../General/Eloquent/AbstractGetRecord.php    |  26 +--
 .../General/Eloquent/AbstractListRecord.php   |  14 +-
 .../General/Eloquent/Filters/JobId.php        |  20 --
 .../Eloquent/Filters/OrderByIdDesc.php        |  20 --
 .../Eloquent/Filters/RequestSignature.php     |  19 --
 .../Eloquent/Filters/ResultNotNull.php        |  18 --
 app/Classes/General/Helper.php                |  24 --
 app/Classes/Jobs/ListBookingsJob.php          |  52 -----
 app/Classes/Jobs/ListDocumentsJob.php         |  63 ------
 app/Classes/Jobs/ListTransactionsJob.php      |  52 -----
 .../ControllersLogic/ListBookingJobLogic.php  |  75 ------
 .../Processors/ListBookingsJobProcessor.php   |  46 ----
 .../ControllersLogic/ListDocumentJobLogic.php |  75 ------
 .../Processors/ListDocumentsJobProcessor.php  |  47 ----
 .../ControllersLogic/FetchJobResultLogic.php  |  51 -----
 .../ListGenericJobObject.php                  | 118 ----------
 .../UpdateJobResultObject.php                 |  60 -----
 .../Processors/FetchesJobResultProcessor.php  |  47 ----
 .../Processors/UpdateJobResultProcessor.php   |  64 ------
 .../Jobs/Services/CreatesJobResult.php        |  26 ---
 .../Jobs/Services/FetchesJobResult.php        |  33 ---
 .../Modules/Jobs/Services/ListsJobResult.php  |  33 ---
 .../Jobs/Services/UpdatesJobResult.php        |  28 ---
 .../ListTransactionsJobLogic.php              |  74 ------
 .../ListTransactionsJobProcessor.php          |  45 ----
 .../Bookings/ListBookingsJobController.php    |  22 --
 .../Documents/ListDocumentsJobController.php  |  19 --
 .../Jobs/FetchJobResultController.php         |  19 --
 .../ListTransactionsJobController.php         |  21 --
 app/Http/Resources/BookingResource.php        |   2 +
 app/Http/Resources/CompanyResource.php        |   1 +
 app/Http/Resources/DocumentResource.php       |   3 +
 app/Http/Resources/JobResultResource.php      |  22 --
 app/Http/Resources/ListBookingJobResource.php |  81 -------
 .../Resources/ListDocumentJobResource.php     |  31 ---
 .../Resources/ListTransactionJobResource.php  |  54 -----
 app/Http/Resources/V2/BookingV2Resource.php   |  82 -------
 app/Http/Resources/V2/CompanyV2Resource.php   | 100 --------
 app/Models/JobResult.php                      |  13 --
 ..._08_08_124848_create_job_results_table.php |  35 ---
 ...31_add_new_column_to_job_results_table.php |  36 ---
 ..._add_new_column_2_to_job_results_table.php |  34 ---
 .../AdminPaymentsBillingSectionComponent.vue  | 136 -----------
 ...PaymentsBillingSectionPollingComponent.vue | 136 -----------
 .../SupplierPendingOrdersSectionComponent.vue |  10 +-
 .../general/elements/ListPollingComponent.vue | 213 ------------------
 .../vue/general/mixins/aws/requestV2.js       |  49 ----
 .../assets/vue/general/mixins/tabHandler.js   |  24 --
 .../assets/vue/vuex/modules/crudRequestV2.js  |  51 -----
 resources/assets/vue/vuex/store.js            |   4 +-
 resources/views/pages/billings.blade.php      | 126 ++++++++++-
 .../views/pages/billings_experiment.blade.php |   9 -
 routes/api.php                                |   4 -
 routes/currency.php                           |   2 +-
 routes/document.php                           |   3 +-
 routes/job.php                                |   8 -
 routes/web.php                                |  12 +-
 60 files changed, 152 insertions(+), 2380 deletions(-)
 delete mode 100644 app/Classes/Exceptions/JobResourceNotFoundException.php
 delete mode 100644 app/Classes/General/Eloquent/Filters/JobId.php
 delete mode 100644 app/Classes/General/Eloquent/Filters/OrderByIdDesc.php
 delete mode 100644 app/Classes/General/Eloquent/Filters/RequestSignature.php
 delete mode 100644 app/Classes/General/Eloquent/Filters/ResultNotNull.php
 delete mode 100644 app/Classes/Jobs/ListBookingsJob.php
 delete mode 100644 app/Classes/Jobs/ListDocumentsJob.php
 delete mode 100644 app/Classes/Jobs/ListTransactionsJob.php
 delete mode 100644 app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
 delete mode 100644 app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
 delete mode 100644 app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
 delete mode 100644 app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
 delete mode 100644 app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
 delete mode 100644 app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
 delete mode 100644 app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php
 delete mode 100644 app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
 delete mode 100644 app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
 delete mode 100644 app/Classes/Modules/Jobs/Services/CreatesJobResult.php
 delete mode 100644 app/Classes/Modules/Jobs/Services/FetchesJobResult.php
 delete mode 100644 app/Classes/Modules/Jobs/Services/ListsJobResult.php
 delete mode 100644 app/Classes/Modules/Jobs/Services/UpdatesJobResult.php
 delete mode 100644 app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
 delete mode 100644 app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
 delete mode 100644 app/Http/Controllers/Bookings/ListBookingsJobController.php
 delete mode 100644 app/Http/Controllers/Documents/ListDocumentsJobController.php
 delete mode 100644 app/Http/Controllers/Jobs/FetchJobResultController.php
 delete mode 100644 app/Http/Controllers/Transactions/ListTransactionsJobController.php
 delete mode 100644 app/Http/Resources/JobResultResource.php
 delete mode 100644 app/Http/Resources/ListBookingJobResource.php
 delete mode 100644 app/Http/Resources/ListDocumentJobResource.php
 delete mode 100644 app/Http/Resources/ListTransactionJobResource.php
 delete mode 100644 app/Http/Resources/V2/BookingV2Resource.php
 delete mode 100644 app/Http/Resources/V2/CompanyV2Resource.php
 delete mode 100644 app/Models/JobResult.php
 delete mode 100644 database/migrations/2023_08_08_124848_create_job_results_table.php
 delete mode 100644 database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php
 delete mode 100644 database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php
 delete mode 100644 resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
 delete mode 100644 resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue
 delete mode 100644 resources/assets/vue/components/general/elements/ListPollingComponent.vue
 delete mode 100644 resources/assets/vue/general/mixins/aws/requestV2.js
 delete mode 100644 resources/assets/vue/general/mixins/tabHandler.js
 delete mode 100644 resources/assets/vue/vuex/modules/crudRequestV2.js
 delete mode 100644 resources/views/pages/billings_experiment.blade.php
 delete mode 100644 routes/job.php

diff --git a/app/Classes/Exceptions/JobResourceNotFoundException.php b/app/Classes/Exceptions/JobResourceNotFoundException.php
deleted file mode 100644
index a8ef358e..00000000
--- a/app/Classes/Exceptions/JobResourceNotFoundException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Classes\Exceptions;
-
-use App\Classes\ValueObjects\Constants\HttpStatus;
-
-final class JobResourceNotFoundException extends ServiceApiException {
-    public function __construct(?string $message = null) {
-        parent::__construct($message ?? 'Unable to find the requested resource', HttpStatus::RESOURCE_NOT_FOUND);
-    }
-}
diff --git a/app/Classes/General/Abstracts/AbstractControllerLogic.php b/app/Classes/General/Abstracts/AbstractControllerLogic.php
index 61c70f44..815219c8 100644
--- a/app/Classes/General/Abstracts/AbstractControllerLogic.php
+++ b/app/Classes/General/Abstracts/AbstractControllerLogic.php
@@ -17,7 +17,6 @@ use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use App\Classes\Exceptions\JobResourceNotFoundException;
 
 abstract class AbstractControllerLogic
 {
@@ -68,19 +67,7 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions $exception){
-            if ($exception instanceof JobResourceNotFoundException) {
-                Log::error(sprintf(
-                    "Uncaught exception '%s' with message '%s' in %s:%d",
-                    get_class($exception),
-                    $exception->getMessage(),
-                    $exception->getTrace()[0]['file'],
-                    $exception->getTrace()[0]['line']
-                ));
-            }
-            else{
-                log::error($exception);
-            }
-
+            log::error($exception);
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
                 $exception->getCode() ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 
diff --git a/app/Classes/General/Eloquent/AbstractFetchRecord.php b/app/Classes/General/Eloquent/AbstractFetchRecord.php
index 503fb369..248deee7 100644
--- a/app/Classes/General/Eloquent/AbstractFetchRecord.php
+++ b/app/Classes/General/Eloquent/AbstractFetchRecord.php
@@ -4,11 +4,9 @@ namespace App\Classes\General\Eloquent;
 
 
 use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Exceptions\JobResourceNotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Psy\Exception\ErrorException;
-use Illuminate\Support\Facades\Log;
 
 abstract class AbstractFetchRecord extends AbstractGetRecord
 {
@@ -29,18 +27,12 @@ abstract class AbstractFetchRecord extends AbstractGetRecord
      * @return Model
      * @throws ResourceNotFoundException
      */
-    public function getResults(Builder $query, array $param = []): Model {
+    public function getResults(Builder $query): Model {
         if(!$query->exists()){
-            $table = $query->getModel()->getTable();
-            if($table ==='job_results'){
-                throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
-            }
-            else{
-                throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
-            }
+            throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
         }
 
         return $query->first();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/AbstractGetRecord.php b/app/Classes/General/Eloquent/AbstractGetRecord.php
index 1a7eac3e..f927d818 100644
--- a/app/Classes/General/Eloquent/AbstractGetRecord.php
+++ b/app/Classes/General/Eloquent/AbstractGetRecord.php
@@ -30,25 +30,11 @@ abstract class AbstractGetRecord
         return $this->filters->only(self::DECORATION_FILTERS);
     }
 
-    // /**
-    //  * @param null|string $json
-    //  * @return array
-    //  */
-    // public function deserializeFilters(?string $json): array {
-    //     return $json !== null ? collect(json_decode($json))->toArray() : [];
-    // }
-
     /**
-     * @param null|string $param
+     * @param null|string $json
      * @return array
      */
-    public function deserializeFilters($param): array {
-        if(gettype($param) == "array"){
-            $json = implode(',', $param);
-        }
-        else{
-            $json = $param;
-        }
+    public function deserializeFilters(?string $json): array {
         return $json !== null ? collect(json_decode($json))->toArray() : [];
     }
 
@@ -64,9 +50,9 @@ abstract class AbstractGetRecord
      * @param array $filters
      * @return mixed
      */
-    public function handler(array $filters, array $params = []){
+    public function handler(array $filters){
         $this->filters = collect($filters);
-        return $this->getResults($this->applyFiltersToQuery(), $params);
+        return $this->getResults($this->applyFiltersToQuery());
     }
 
 
@@ -79,6 +65,6 @@ abstract class AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    abstract function getResults(Builder $query, array $params = []);
+    abstract function getResults(Builder $query);
 
-}
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/AbstractListRecord.php b/app/Classes/General/Eloquent/AbstractListRecord.php
index f898f108..7b7d0df9 100644
--- a/app/Classes/General/Eloquent/AbstractListRecord.php
+++ b/app/Classes/General/Eloquent/AbstractListRecord.php
@@ -17,11 +17,11 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @return mixed
      * @throws MalformedRequestException
      */
-    public function execute(array $filters = [], array $param = []){
+    public function execute(array $filters = []){
 
         try{
 
-            return $this->handler($filters, $param);
+            return $this->handler($filters);
 
         } catch (QueryException $exception){
             log::error($exception);
@@ -30,24 +30,18 @@ abstract class AbstractListRecord extends AbstractGetRecord
 
     }
 
-
     /**
      * @param Builder $query
      * @return mixed
      */
-    public function getResults(Builder $query, array $param = []) {
+    public function getResults(Builder $query) {
         $filters = $this->getDecorationFilters();
 
         if($filters->has('order_by')){
             $query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
         }
 
-        if(!empty($param)){
-            return $filters->has('per_page') ? $query->paginate($filters->get('per_page'), ['*'], 'page', $param['page']) : $query->get(); //page data from query parameters e.g ?page=1
-        }
-        else{
-            return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
-        }
+        return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
 
     }
 
diff --git a/app/Classes/General/Eloquent/Filters/JobId.php b/app/Classes/General/Eloquent/Filters/JobId.php
deleted file mode 100644
index 42ac51a4..00000000
--- a/app/Classes/General/Eloquent/Filters/JobId.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class JobId implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('job_id', $value);
-    }
-
-}
diff --git a/app/Classes/General/Eloquent/Filters/OrderByIdDesc.php b/app/Classes/General/Eloquent/Filters/OrderByIdDesc.php
deleted file mode 100644
index 547ec9bd..00000000
--- a/app/Classes/General/Eloquent/Filters/OrderByIdDesc.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class OrderByIdDesc implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->orderBy('id', 'desc');
-    }
-
-}
diff --git a/app/Classes/General/Eloquent/Filters/RequestSignature.php b/app/Classes/General/Eloquent/Filters/RequestSignature.php
deleted file mode 100644
index 67dde0a3..00000000
--- a/app/Classes/General/Eloquent/Filters/RequestSignature.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class RequestSignature implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('request_signature', $value);
-    }
-
-}
diff --git a/app/Classes/General/Eloquent/Filters/ResultNotNull.php b/app/Classes/General/Eloquent/Filters/ResultNotNull.php
deleted file mode 100644
index 3f6a0341..00000000
--- a/app/Classes/General/Eloquent/Filters/ResultNotNull.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class ResultNotNull implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereNotNull('result');
-    }
-}
diff --git a/app/Classes/General/Helper.php b/app/Classes/General/Helper.php
index 45c72f53..ac89540b 100644
--- a/app/Classes/General/Helper.php
+++ b/app/Classes/General/Helper.php
@@ -2,7 +2,6 @@
 
 namespace App\Classes\General;
 
-use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\Log;
 
 use Illuminate\Support\Str;
@@ -43,27 +42,4 @@ class Helper
             }
         }
     }
-
-    /**
-     * @param null|string $param
-     * @return array
-     */
-    static function deserializeFilters($param): array {
-        if(gettype($param) == "array"){
-            $json = implode(',', $param);
-        }
-        else{
-            $json = $param;
-        }
-        return $json !== null ? collect(json_decode($json))->toArray() : [];
-    }
-
-    /**
-     * @param ResourceCollection $collection
-     * @return array
-     */
-    static function collectionResponse(ResourceCollection $collection){
-        return json_decode($collection->response()->getContent(), true);
-    }
-
 }
diff --git a/app/Classes/Jobs/ListBookingsJob.php b/app/Classes/Jobs/ListBookingsJob.php
deleted file mode 100644
index b021b71d..00000000
--- a/app/Classes/Jobs/ListBookingsJob.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\Bookings\Processors\ListBookingsJobProcessor;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Models\JobResult;
-use Illuminate\Support\Facades\Log;
-
-class ListBookingsJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 900;
-
-    /** @var ListGenericJobObject */
-    private $listGenericJobObject;
-
-    private $jobId;
-
-    /**
-     * ListBookingsJob constructor.
-     * @param ListGenericJobObject $listGenericJobObject
-     */
-    public function __construct(ListGenericJobObject $listGenericJobObject)
-    {
-        $this->listGenericJobObject = $listGenericJobObject;
-    }
-
-    public function handle()
-    {
-        $rawPayload = $this->job->payload();
-        if(isset($rawPayload['data']['commandName'])){
-            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
-        }
-
-        if(isset($rawPayload['data']['command'])){
-            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
-        }
-
-        $result = (App()->make(ListBookingsJobProcessor::class))->execute($this->listGenericJobObject);
-    }
-
-    public function getJobId(){
-        return $this->job->getJobId();
-    }
-}
diff --git a/app/Classes/Jobs/ListDocumentsJob.php b/app/Classes/Jobs/ListDocumentsJob.php
deleted file mode 100644
index 6e93062b..00000000
--- a/app/Classes/Jobs/ListDocumentsJob.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\Documents\Processors\ListDocumentsJobProcessor;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Models\JobResult;
-use Illuminate\Support\Facades\Log;
-
-class ListDocumentsJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 900;
-
-    /** @var ListGenericJobObject */
-    private $listGenericJobObject;
-
-    private $jobId;
-
-    /**
-     * ListDocumentsJob constructor.
-     * @param ListGenericJobObject $listGenericJobObject
-     */
-    public function __construct(ListGenericJobObject $listGenericJobObject)
-    {
-        $this->listGenericJobObject = $listGenericJobObject;
-    }
-
-    public function handle()
-    {
-        $rawPayload = $this->job->payload();
-        if(isset($rawPayload['data']['commandName'])){
-            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
-        }
-
-        if(isset($rawPayload['data']['command'])){
-            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
-        }
-
-        $result = (App()->make(ListDocumentsJobProcessor::class))->execute($this->listGenericJobObject);
-
-        //cief todo: Insert into DB: job id, query result, timestamp
-        // Store the result in the job_results table
-
-        //cief todo: why cannot save data in table like this
-        // $model = new JobResult();
-        // $model->job_id = $this->job->getJobId();
-        // $model->result = json_encode($result);
-        // $model->save();
-
-        // Log::error(json_encode($model->id));
-    }
-
-    public function getJobId(){
-        return $this->job->getJobId();
-    }
-}
diff --git a/app/Classes/Jobs/ListTransactionsJob.php b/app/Classes/Jobs/ListTransactionsJob.php
deleted file mode 100644
index a2b28656..00000000
--- a/app/Classes/Jobs/ListTransactionsJob.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\Transactions\Processors\ListTransactionsJobProcessor;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Models\JobResult;
-use Illuminate\Support\Facades\Log;
-
-class ListTransactionsJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 900;
-
-    /** @var ListGenericJobObject */
-    private $listGenericJobObject;
-
-    private $jobId;
-
-    /**
-     * ListTransactionsJob constructor.
-     * @param ListGenericJobObject $listGenericJobObject
-     */
-    public function __construct(ListGenericJobObject $listGenericJobObject)
-    {
-        $this->listGenericJobObject = $listGenericJobObject;
-    }
-
-    public function handle()
-    {
-        $rawPayload = $this->job->payload();
-        if(isset($rawPayload['data']['commandName'])){
-            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
-        }
-
-        if(isset($rawPayload['data']['command'])){
-            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
-        }
-
-        $result = (App()->make(ListTransactionsJobProcessor::class))->execute($this->listGenericJobObject);
-    }
-
-    public function getJobId(){
-        return $this->job->getJobId();
-    }
-}
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
deleted file mode 100644
index ef3570f7..00000000
--- a/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Bookings\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Jobs\ListBookingsJob;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use App\Classes\Modules\Jobs\Services\CreatesJobResult;
-
-
-class ListBookingJobLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'List Booking Job',
-            'message' => 'You have successfully submit a job to list bookings'
-        ];
-    }
-
-    /** @var CreatesJobResult */
-    private $createsJobResult;
-
-    /**
-     * ListPackingListsJobLogic constructor.
-     * @param CreatesJobResult $createsJobResult
-     */
-    public function __construct(CreatesJobResult $createsJobResult)
-    {
-        $this->createsJobResult = $createsJobResult;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $jobId = uniqid();
-
-        $user = Auth::user();
-        $userInfo = (object) [
-            'type' => $user->type,
-        ];
-
-        $userInfoJson = json_encode($userInfo);
-        $requestSignature = md5($userInfoJson . $request->fullUrl());
-
-        $listGenericJobObject = new ListGenericJobObject(
-            $request->fullUrl(),
-            $request->all(),
-            $requestSignature,
-            null,
-            $jobId,
-            $userInfo
-        );
-
-        ListBookingsJob::dispatch($listGenericJobObject);
-
-        $result = [];
-        $result['job_id'] = $jobId;
-
-        $this->createsJobResult->execute($listGenericJobObject);
-
-        return $this->response(['data' => $result]);
-    }
-
-}
diff --git a/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
deleted file mode 100644
index 2a09eb12..00000000
--- a/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Bookings\Processors;
-
-use App\Classes\Modules\Bookings\Services\ListsBookings;
-use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
-use App\Classes\General\Helper;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Http\Resources\ListBookingJobResource;
-
-class ListBookingsJobProcessor
-{
-
-    /** @var ListsBookings */
-    private $listsBookings;
-
-    /** @var UpdateJobResultProcessor */
-    private $updateJobResultProcessor;
-
-    /**
-     * ListBookingsJobProcessor constructor.
-     * @param ListsBookings $listsBookings
-     * @param UpdateJobResultProcessor $updateJobResultProcessor
-     */
-    public function __construct(ListsBookings $listsBookings, UpdateJobResultProcessor $updateJobResultProcessor)
-    {
-        $this->listsBookings = $listsBookings;
-        $this->updateJobResultProcessor = $updateJobResultProcessor;
-    }
-
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject) {
-
-        $query = $this->listsBookings->execute($this->listsBookings->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
-        foreach ($query->items() as &$item) {
-            $item['userInfo'] = $listGenericJobObject->getUserInfo();
-        }
-        $resultCurrent = Helper::collectionResponse(ListBookingJobResource::collection($query));
-        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-    }
-}
diff --git a/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
deleted file mode 100644
index 5e895ad8..00000000
--- a/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Documents\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Jobs\Services\CreatesJobResult;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Classes\Jobs\ListDocumentsJob;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class ListDocumentJobLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'List Document Job',
-            'message' => 'You have successfully submit a job to list documents'
-        ];
-    }
-
-    /** @var CreatesJobResult */
-    private $createsJobResult;
-
-    /**
-     * ListDocumentJobLogic constructor.
-     * @param CreatesJobResult $createsJobResult
-     */
-    public function __construct(CreatesJobResult $createsJobResult)
-    {
-        $this->createsJobResult = $createsJobResult;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $jobId = uniqid();
-
-        $user = Auth::user();
-        $userInfo = (object) [
-            'email' => $user->email,
-            'type' => $user->type,
-        ];
-
-        $userInfoJson = json_encode($userInfo);
-        $requestSignature = md5($userInfoJson . $request->fullUrl());
-
-        $listGenericJobObject = new ListGenericJobObject(
-            $request->fullUrl(),
-            $request->all(),
-            $requestSignature,
-            null,
-            $jobId,
-            $userInfo
-        );
-
-        ListDocumentsJob::dispatch($listGenericJobObject);
-
-        $result = [];
-        $result['job_id'] = $jobId;
-
-        $this->createsJobResult->execute($listGenericJobObject);
-
-        return $this->response(['data' => $result]);
-    }
-}
diff --git a/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
deleted file mode 100644
index 70777f0c..00000000
--- a/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Documents\Processors;
-
-use App\Classes\Modules\Documents\Services\ListsDocuments;
-use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
-use App\Classes\General\Helper;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Http\Resources\ListDocumentJobResource;
-
-class ListDocumentsJobProcessor
-{
-
-    /** @var ListsDocuments */
-    private $listsDocuments;
-
-    /** @var UpdateJobResultProcessor */
-    private $updateJobResultProcessor;
-
-    /**
-     * ListDocumentsJobProcessor constructor.
-     * @param ListsDocuments $listsDocuments
-     * @param UpdateJobResultProcessor $updateJobResultProcessor
-     */
-    public function __construct(ListsDocuments $listsDocuments, UpdateJobResultProcessor $updateJobResultProcessor)
-    {
-        $this->listsDocuments = $listsDocuments;
-        $this->updateJobResultProcessor = $updateJobResultProcessor;
-    }
-
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject) {
-
-        $query = $this->listsDocuments->execute($this->listsDocuments->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
-        foreach ($query->items() as &$item) {
-            $item['userInfo'] = $listGenericJobObject->getUserInfo();
-        }
-        $resultCurrent = Helper::collectionResponse(ListDocumentJobResource::collection($query));
-        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-    }
-}
-
diff --git a/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php b/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
deleted file mode 100644
index c4b72cf0..00000000
--- a/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Jobs\Processors\FetchesJobResultProcessor;
-use App\Http\Resources\JobResultResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchJobResultLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Data',
-            'message' => 'You have successfully retrieved data'
-        ];
-    }
-
-    /** @var FetchesJobResultProcessor */
-    private $fetchesJobResultProcessor;
-
-    /**
-     * FetchJobResultLogic constructor.
-     * @param FetchesJobResultProcessor $fetchesJobResultProcessor
-     */
-    public function __construct(FetchesJobResultProcessor $fetchesJobResultProcessor)
-    {
-        $this->fetchesJobResultProcessor = $fetchesJobResultProcessor;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = $this->fetchesJobResultProcessor->execute($request);
-        return $this->resourceResponse(new JobResultResource($query));
-    }
-
-}
diff --git a/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php b/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
deleted file mode 100644
index 953d77d7..00000000
--- a/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class ListGenericJobObject implements DataTransferObject
-{
-    /** @var string */
-    private $name;
-
-    /** @var array */
-    private $payload;
-
-    /** @var string */
-    private $jobId;
-
-    /** @var string */
-    private $requestSignature;
-
-    /** @var string */
-    private $resultSignature;
-
-    /** @var object */
-    private $userInfo;
-
-    /** @var string */
-    private $jobCommandName;
-
-    /** @var string */
-    private $jobCommand;
-
-    public function __construct(string $name, array $payload, string $requestSignature, ?string $resultSignature, string $jobId, object $userInfo = null)
-    {
-        $this->name = $name;
-        $this->payload = $payload;
-        $this->jobId = $jobId;
-        $this->requestSignature = $requestSignature;
-        $this->resultSignature = $resultSignature;
-        $this->userInfo = $userInfo;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return array
-     */
-    public function getPayload(): array
-    {
-        return $this->payload;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobId(): string
-    {
-        return $this->jobId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRequestSignature(): string
-    {
-        return $this->requestSignature;
-    }
-
-    /**
-     * @return string
-     */
-    public function getResultSignature(): ?string
-    {
-        return $this->resultSignature;
-    }
-
-    /**
-     * @return object
-     */
-    public function getUserInfo(): object
-    {
-        return $this->userInfo;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommandName(): string
-    {
-        return $this->jobCommandName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommand(): string
-    {
-        return $this->jobCommand;
-    }
-
-
-    public function setJobCommandName(string $jobCommandName)
-    {
-        $this->jobCommandName = $jobCommandName;
-    }
-
-    public function setJobCommand(string $jobCommand)
-    {
-        $this->jobCommand = $jobCommand;
-    }
-
-}
diff --git a/app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php b/app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php
deleted file mode 100644
index 636c56b0..00000000
--- a/app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class UpdateJobResultObject implements DataTransferObject
-{
-    /** @var string */
-    private $result;
-
-    /** @var string */
-    private $resultSignature;
-
-    /** @var string */
-    private $jobCommandName;
-
-    /** @var string */
-    private $jobCommand;
-
-    public function __construct(string $result, string $resultSignature, string $jobCommandName, string $jobCommand)
-    {
-        $this->result = $result;
-        $this->resultSignature = $resultSignature;
-        $this->jobCommandName = $jobCommandName;
-        $this->jobCommand = $jobCommand;
-    }
-
-    /**
-     * @return string
-     */
-    public function getResult(): string
-    {
-        return $this->result;
-    }
-
-    /**
-     * @return array
-     */
-    public function getResultSignature(): string
-    {
-        return $this->resultSignature;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommandName(): string
-    {
-        return $this->jobCommandName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommand(): string
-    {
-        return $this->jobCommand;
-    }
-}
diff --git a/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php b/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
deleted file mode 100644
index 89783fe8..00000000
--- a/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Processors;
-
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use App\Classes\Modules\Jobs\Services\FetchesJobResult;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-
-class FetchesJobResultProcessor
-{
-    /** @var FetchesJobResult */
-    private $fetchesJobResult;
-
-
-    /**
-     * FetchesJobResultProcessor constructor.
-     * @param FetchesJobResult $fetchesJobResult
-     */
-    public function __construct(FetchesJobResult $fetchesJobResult)
-    {
-        $this->fetchesJobResult = $fetchesJobResult;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     * @throws \App\Classes\Exceptions\ResourceNotFoundException
-     */
-    public function execute(Request $request){
-
-        $res1 = $this->fetchesJobResult->execute(['job_id' => $request->route('job_id')]);
-        if($request->route('is_last')){
-            $res2 = $this->fetchesJobResult->execute(['request_signature' => $res1->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
-            return $res2;
-        }
-
-        if(!$res1->result){
-            throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
-        }
-
-        return $res1;
-    }
-}
diff --git a/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php b/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
deleted file mode 100644
index 0106417d..00000000
--- a/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Processors;
-
-
-use App\Classes\Modules\Jobs\Services\UpdatesJobResult;
-use App\Classes\Modules\Jobs\Services\FetchesJobResult;
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
-
-class UpdateJobResultProcessor
-{
-
-    /** @var FetchesJobResult */
-    private $fetchesJobResult;
-
-    /** @var UpdatesJobResult */
-    private $updatesJobResult;
-
-    /**
-     * UpdateJobResultProcessor constructor.
-     * @param FetchesJobResult $fetchesJobResult
-     * @param UpdatesJobResult $updatesJobResult
-     */
-    public function __construct(FetchesJobResult $fetchesJobResult, UpdatesJobResult $updatesJobResult)
-    {
-        $this->fetchesJobResult = $fetchesJobResult;
-        $this->updatesJobResult = $updatesJobResult;
-    }
-
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @param array $resultCurrent
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject, $resultCurrent) {
-        $jobResultCurrent = $this->fetchesJobResult->execute(['job_id' => $listGenericJobObject->getJobId()]);
-        $resultCurrentJson = json_encode($resultCurrent);
-        $resultSignatureCurrent = md5($resultCurrentJson);
-
-        try{
-            $jobResultExisting = $this->fetchesJobResult->execute(['request_signature' => $jobResultCurrent->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
-            $resultSignatureExisting = $jobResultExisting->result_signature;
-            //if($resultSignatureExisting != $resultSignatureCurrent){
-                $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
-            //}
-        } catch (JobResourceNotFoundException $exception){
-            $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
-        }
-    }
-
-    private function updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobCommandName, $jobCommand){
-        $updateJobResultObject = new UpdateJobResultObject(
-            $resultCurrentJson,
-            $resultSignatureCurrent,
-            $jobCommandName,
-            $jobCommand
-        );
-        $create = $this->updatesJobResult->execute($jobResultCurrent, $updateJobResultObject);
-    }
-}
diff --git a/app/Classes/Modules/Jobs/Services/CreatesJobResult.php b/app/Classes/Modules/Jobs/Services/CreatesJobResult.php
deleted file mode 100644
index e70e0e6a..00000000
--- a/app/Classes/Modules/Jobs/Services/CreatesJobResult.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\JobResult;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-
-class CreatesJobResult extends AbstractUpdateRecord
-{
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject)
-    {
-        $model = new JobResult();
-        $model->job_id = $listGenericJobObject->getJobId();
-        $model->request_signature = $listGenericJobObject->getRequestSignature();
-        $model->result_signature = $listGenericJobObject->getResultSignature();
-        $model->url = $listGenericJobObject->getName();
-
-        return $this->handler($model);
-    }
-}
diff --git a/app/Classes/Modules/Jobs/Services/FetchesJobResult.php b/app/Classes/Modules/Jobs/Services/FetchesJobResult.php
deleted file mode 100644
index 1cc99cb6..00000000
--- a/app/Classes/Modules/Jobs/Services/FetchesJobResult.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-
-use App\Classes\General\Eloquent\AbstractFetchRecord;
-use Illuminate\Database\Eloquent\Builder;
-use App\Models\JobResult;
-
-class FetchesJobResult extends AbstractFetchRecord
-{
-
-    /** @var JobResult */
-    private $repository;
-
-    /**
-     * FetchesJobResult constructor.
-     * @param JobResult $repository
-     */
-    public function __construct(JobResult $repository)
-    {
-        $this->repository = $repository;
-    }
-
-
-    /**
-     * @return Builder
-     */
-    public function getRepository(): Builder
-    {
-        return $this->repository->newQuery();
-    }
-}
diff --git a/app/Classes/Modules/Jobs/Services/ListsJobResult.php b/app/Classes/Modules/Jobs/Services/ListsJobResult.php
deleted file mode 100644
index 55f3b267..00000000
--- a/app/Classes/Modules/Jobs/Services/ListsJobResult.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-
-use App\Classes\General\Eloquent\AbstractListRecord;
-use Illuminate\Database\Eloquent\Builder;
-use App\Models\JobResult;
-
-class ListsJobResult extends AbstractListRecord
-{
-
-    /** @var JobResult */
-    private $repository;
-
-    /**
-     * ListsJobResult constructor.
-     * @param JobResult $repository
-     */
-    public function __construct(JobResult $repository)
-    {
-        $this->repository = $repository;
-    }
-
-
-    /**
-     * @return Builder
-     */
-    function getRepository(): Builder
-    {
-        return $this->repository->newQuery();
-    }
-}
diff --git a/app/Classes/Modules/Jobs/Services/UpdatesJobResult.php b/app/Classes/Modules/Jobs/Services/UpdatesJobResult.php
deleted file mode 100644
index ab3d9385..00000000
--- a/app/Classes/Modules/Jobs/Services/UpdatesJobResult.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
-use App\Models\JobResult;
-
-class UpdatesJobResult extends AbstractUpdateRecord
-{
-
-    /**
-     * @param JobResult $model
-     * @param UpdateJobResultObject $updateJobResultObject
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(JobResult $model, UpdateJobResultObject $updateJobResultObject) {
-
-        $model->result = $updateJobResultObject->getResult();
-        $model->result_signature = $updateJobResultObject->getResultSignature();
-        $model->job_command_name = $updateJobResultObject->getJobCommandName();
-        $model->job_command = $updateJobResultObject->getJobCommand();
-
-        return $this->handler($model);
-
-    }
-}
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
deleted file mode 100644
index 654a360f..00000000
--- a/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Jobs\ListTransactionsJob;
-use App\Classes\Modules\Jobs\Services\CreatesJobResult;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class ListTransactionsJobLogic extends AbstractControllerLogic
-{
-  /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'List Transaction Job',
-            'message' => 'You have successfully submit a job to list transactions'
-        ];
-    }
-
-    /** @var CreatesJobResult */
-    private $createsJobResult;
-
-    /**
-     * ListTransactionsJobLogic constructor.
-     * @param CreatesJobResult $createsJobResult
-     */
-    public function __construct(CreatesJobResult $createsJobResult)
-    {
-        $this->createsJobResult = $createsJobResult;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $jobId = uniqid();
-
-        $user = Auth::user();
-        $userInfo = (object) [
-            'type' => $user->type,
-        ];
-
-        $userInfoJson = json_encode($userInfo);
-        $requestSignature = md5($userInfoJson . $request->fullUrl());
-
-        $listGenericJobObject = new ListGenericJobObject(
-            $request->fullUrl(),
-            $request->all(),
-            $requestSignature,
-            null,
-            $jobId,
-            $userInfo
-        );
-
-        ListTransactionsJob::dispatch($listGenericJobObject);
-
-        $result = [];
-        $result['job_id'] = $jobId;
-
-        $this->createsJobResult->execute($listGenericJobObject);
-
-        return $this->response(['data' => $result]);
-    }
-
-}
diff --git a/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
deleted file mode 100644
index 475d4715..00000000
--- a/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Processors;
-
-use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
-use App\Classes\General\Helper;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Http\Resources\ListTransactionJobResource;
-
-class ListTransactionsJobProcessor
-{
-
-    /** @var ListsTransactions */
-    private $listsTransactions;
-
-    /** @var UpdateJobResultProcessor */
-    private $updateJobResultProcessor;
-
-    /**
-     * ListTransactionsJobProcessor constructor.
-     * @param ListsTransactions $listsTransactions
-     * @param UpdateJobResultProcessor $updateJobResultProcessor
-     */
-    public function __construct(ListsTransactions $listsTransactions, UpdateJobResultProcessor $updateJobResultProcessor)
-    {
-        $this->listsTransactions = $listsTransactions;
-        $this->updateJobResultProcessor = $updateJobResultProcessor;
-    }
-
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject) {
-
-        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
-
-        $resultCurrent = Helper::collectionResponse(ListTransactionJobResource::collection($query));
-        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-    }
-}
-
diff --git a/app/Http/Controllers/Bookings/ListBookingsJobController.php b/app/Http/Controllers/Bookings/ListBookingsJobController.php
deleted file mode 100644
index 9b32fc77..00000000
--- a/app/Http/Controllers/Bookings/ListBookingsJobController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-
-namespace App\Http\Controllers\Bookings;
-
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use App\Classes\Modules\Bookings\ControllersLogic\ListBookingJobLogic;
-
-
-class ListBookingsJobController
-{
-    /**
-     * @param Request $request
-     * @param ListBookingJobLogic $logic
-     * @return JsonResponse
-     */
-
-    public function list(Request $request, ListBookingJobLogic $logic) : JsonResponse {
-        return $logic->execute($request);
-    }
-}
diff --git a/app/Http/Controllers/Documents/ListDocumentsJobController.php b/app/Http/Controllers/Documents/ListDocumentsJobController.php
deleted file mode 100644
index 8b763085..00000000
--- a/app/Http/Controllers/Documents/ListDocumentsJobController.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Documents;
-
-use App\Classes\Modules\Documents\ControllersLogic\ListDocumentJobLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListDocumentsJobController
-{
-    /**
-     * @param Request $request
-     * @param ListDocumentJobLogic $logic
-     * @return JsonResponse
-     */
-    public function list(Request $request, ListDocumentJobLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-}
diff --git a/app/Http/Controllers/Jobs/FetchJobResultController.php b/app/Http/Controllers/Jobs/FetchJobResultController.php
deleted file mode 100644
index cfef2f5c..00000000
--- a/app/Http/Controllers/Jobs/FetchJobResultController.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Jobs;
-
-use App\Classes\Modules\Jobs\ControllersLogic\FetchJobResultLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchJobResultController
-{
-    /**
-     * @param Request $request
-     * @param FetchJobResultLogic $logic
-     * @return JsonResponse
-     */
-    public function fetch(Request $request, FetchJobResultLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-}
diff --git a/app/Http/Controllers/Transactions/ListTransactionsJobController.php b/app/Http/Controllers/Transactions/ListTransactionsJobController.php
deleted file mode 100644
index fb341d5d..00000000
--- a/app/Http/Controllers/Transactions/ListTransactionsJobController.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-
-namespace App\Http\Controllers\Transactions;
-
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use App\Classes\Modules\Transactions\ControllersLogic\ListTransactionsJobLogic;
-
-
-class ListTransactionsJobController
-{
-    /**
-     * @param Request $request
-     * @param ListTransactionsJobLogic $logic
-     * @return JsonResponse
-     */
-    public function list(Request $request, ListTransactionsJobLogic $logic) : JsonResponse {
-        return $logic->execute($request);
-    }
-}
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index 70fbc95c..f3a7881d 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -11,9 +11,11 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Log;
 
 class BookingResource extends JsonResource
 {
+
     /**
      * Transform the resource into an array.
      *
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index eff2bd1b..85ecee16 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -15,6 +15,7 @@ use App\Models\SegmentConstant;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 class CompanyResource extends JsonResource
 {
diff --git a/app/Http/Resources/DocumentResource.php b/app/Http/Resources/DocumentResource.php
index c0f801bb..59933a67 100644
--- a/app/Http/Resources/DocumentResource.php
+++ b/app/Http/Resources/DocumentResource.php
@@ -3,7 +3,10 @@
 namespace App\Http\Resources;
 
 use App\Models\Booking;
+use App\Models\Company;
+use App\Models\Document;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class DocumentResource extends JsonResource
diff --git a/app/Http/Resources/JobResultResource.php b/app/Http/Resources/JobResultResource.php
deleted file mode 100644
index 51bc1898..00000000
--- a/app/Http/Resources/JobResultResource.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class JobResultResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'job_id' => $this->job_id,
-            'result' => $this->result,
-        ];
-    }
-}
diff --git a/app/Http/Resources/ListBookingJobResource.php b/app/Http/Resources/ListBookingJobResource.php
deleted file mode 100644
index 06f8c38d..00000000
--- a/app/Http/Resources/ListBookingJobResource.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Classes\Modules\Bookings\Services\CalculatesBookingFloatingAmount;
-use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
-use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
-use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use Carbon\Carbon;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class ListBookingJobResource extends JsonResource
-{
-    private $userInfo;
-
-    public function __construct($resource, $userInfo = null)
-    {
-        parent::__construct($resource);
-        $this->userInfo = $userInfo ?? ($resource->userInfo ?? null);
-    }
-
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'company' => new CompanyResource($this->company, $this->userInfo),
-            'bank' => new BankResource($this->bank),
-            'service' => new ServiceTypeResource($this->service),
-            'marking' => $this->marking,
-            'amount' => $this->fix_amount,
-            'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
-            'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
-            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
-            'fixed_currency' => new CurrencyResource($this->fixedCurrency),
-            'convertible_currency' => new CurrencyResource($this->convertibleCurrency),
-            'conversion_currency' => new CurrencyResource($this->conversionCurrency),
-            'documents' => [
-                'purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()),
-                'delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
-                'invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
-                'supplier_delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
-                'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
-                'ecommerce_purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first()),
-            ],
-            'status' => $this->status,
-            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
-            'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
-            $this->mergeWhen($this->relationLoaded('transactions'), [
-                'purchase_order' => new TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()),
-                'payment_attempts' => TransactionResource::collection(
-                    $this->transactions()
-                        ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
-                        ->whereDate('expires_on', '>=', Carbon::now())
-                        ->get()
-                ),
-                'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
-                'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
-                    $query->where(function($query){
-                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
-                    })->orWhere(function($query){
-                        $query->where(function($query){
-                            $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION,  ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
-                        })->orWhere(function($query){
-                            $query->where('type', TransactionType::CREDIT_NOTE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                        });
-                    });
-                })->latest()->get())
-            ])
-        ];
-    }
-}
diff --git a/app/Http/Resources/ListDocumentJobResource.php b/app/Http/Resources/ListDocumentJobResource.php
deleted file mode 100644
index edf549ef..00000000
--- a/app/Http/Resources/ListDocumentJobResource.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Models\Booking;
-use Carbon\Carbon;
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Http\Resources\V2\BookingV2Resource;
-use App\Http\Resources\V2\CompanyV2Resource;
-
-class ListDocumentJobResource 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,
-            'status' => (int) $this->status,
-            'document_type' => $this->document_type,
-            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingV2Resource($this->owner, $this->userInfo) : new CompanyV2Resource($this->owner, $this->userInfo)) : null,
-            'files' => FileResource::collection($this->files),
-            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
-        ];
-    }
-}
diff --git a/app/Http/Resources/ListTransactionJobResource.php b/app/Http/Resources/ListTransactionJobResource.php
deleted file mode 100644
index 6c4c0ece..00000000
--- a/app/Http/Resources/ListTransactionJobResource.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Classes\ValueObjects\Constants\TransactionType;
-use Carbon\Carbon;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class ListTransactionJobResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-
-        $booking = in_array((int)$this->type, [TransactionType::BILL, TransactionType::REFUND])? $this->owner->owner : $this->owner;
-        $days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
-
-        return [
-            'id' => $this->id,
-            'booking' => new BookingResource($booking),
-            'type' => (int) $this->type,
-            'bill_no' => $this->bill_no,
-            'payment_reference' => $this->payment_reference,
-            'payment_method' => (float) $this->payment_method,
-            'recipient_bank_account' => new BankResource($booking->bank),
-            'issuer_name' => $this->issuerCompany->name,
-            'issuer_id' => $this->issuerCompany->id,
-            'amount' => (double) $this->amount,
-            'original_amount' => (double) $this->original_amount,
-            'currency' => new CurrencyResource($this->currency),
-            'original_currency' => new CurrencyResource($this->original_currency),
-            'service_charge' => (double) $this->service_charge,
-            'tax' => (double) $this->tax,
-            'currency_rate' => (double) $this->currency_rate,
-            'status' => (int) $this->status,
-            'details' => TransactionDetailResource::collection($this->transactionDetails),
-            'documents' => new DocumentResource($this->documents()->first()),
-            'transaction_bill' => new TransactionResource($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->bills()->first())),
-            'transaction_refunds' => TransactionResource::collection($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->refunds()->get())),
-            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
-            'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
-            'interval' => [
-                'value' => $days->gt(Carbon::now()) ? '+' : '-',
-                'duration' => $days->diff(Carbon::now())->format('%d'),
-            ],
-            'redemption' => new VoucherRedemptionResource($this->voucherRedemption)
-        ];
-    }
-}
diff --git a/app/Http/Resources/V2/BookingV2Resource.php b/app/Http/Resources/V2/BookingV2Resource.php
deleted file mode 100644
index ee17181e..00000000
--- a/app/Http/Resources/V2/BookingV2Resource.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Http\Resources\V2;
-
-use App\Classes\Modules\Bookings\Services\CalculatesBookingFloatingAmount;
-use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
-use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
-use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use Carbon\Carbon;
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Http\Resources as V1;
-
-class BookingV2Resource extends JsonResource
-{
-    private $userInfo;
-
-    public function __construct($resource, $userInfo = null)
-    {
-        parent::__construct($resource);
-        $this->userInfo = $userInfo ?? ($resource->userInfo ?? null);
-    }
-
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'company' => new CompanyV2Resource($this->company, $this->userInfo),
-            'bank' => new V1\BankResource($this->bank),
-            'service' => new V1\ServiceTypeResource($this->service),
-            'marking' => $this->marking,
-            'amount' => $this->fix_amount,
-            'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
-            'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
-            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
-            'fixed_currency' => new V1\CurrencyResource($this->fixedCurrency),
-            'convertible_currency' => new V1\CurrencyResource($this->convertibleCurrency),
-            'conversion_currency' => new V1\CurrencyResource($this->conversionCurrency),
-            'documents' => [
-                'purchase_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()),
-                'delivery_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
-                'invoice' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
-                'supplier_delivery_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
-                'proforma_invoice' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
-                'ecommerce_purchase_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first()),
-            ],
-            'status' => $this->status,
-            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
-            'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
-            $this->mergeWhen($this->relationLoaded('transactions'), [
-                'purchase_order' => new V1\TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()),
-                'payment_attempts' => V1\TransactionResource::collection(
-                    $this->transactions()
-                        ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
-                        ->whereDate('expires_on', '>=', Carbon::now())
-                        ->get()
-                ),
-                'expired_payment_attempts' => V1\TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
-                'payment_history' => V1\TransactionResource::collection($this->transactions()->where(function($query){
-                    $query->where(function($query){
-                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
-                    })->orWhere(function($query){
-                        $query->where(function($query){
-                            $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION,  ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
-                        })->orWhere(function($query){
-                            $query->where('type', TransactionType::CREDIT_NOTE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                        });
-                    });
-                })->latest()->get())
-            ])
-        ];
-    }
-}
diff --git a/app/Http/Resources/V2/CompanyV2Resource.php b/app/Http/Resources/V2/CompanyV2Resource.php
deleted file mode 100644
index 64fca7c7..00000000
--- a/app/Http/Resources/V2/CompanyV2Resource.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace App\Http\Resources\V2;
-
-use App\Classes\Modules\Companies\Services\FetchesCompanyServices;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BankAccountType;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Currency;
-use App\Models\SegmentConstant;
-use Carbon\Carbon;
-use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Auth;
-use App\Http\Resources as V1;
-
-
-class CompanyV2Resource extends JsonResource
-{
-    private $userInfo;
-
-    public function __construct($resource, $userInfo = null)
-    {
-        parent::__construct($resource);
-        $this->userInfo = $userInfo;
-    }
-
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $lastPayment = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->first();
-        $totalPayments =  $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
-
-        $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
-        $serviceCharge = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $this->id)->first();
-
-        $userResource = null;
-
-        $userInfoEmail = $this->userInfo && isset($this->userInfo->email) ? $this->userInfo->email : null;
-        $userInfoType = $this->userInfo && isset($this->userInfo->type) ? $this->userInfo->type : null;
-
-        if(!$userInfoEmail && Auth::user()){
-            $userInfoEmail = Auth::user()->email;
-        }
-        if(!$userInfoType && Auth::user()){
-            $userInfoType = Auth::user()->type;
-        }
-
-        if(!is_null($userInfoEmail) && !is_null($userInfoType)){
-            $userResource = new V1\UserResource($userInfoType === RoleTypes::USER ? $this->employees()->where('email', '=',  $userInfoEmail)->first() : $this->employees()->orderBy('id', 'DESC')->first());
-        }
-
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'reference' => $this->reference,
-            'debtor' => $this->debtor,
-            'type' => (int) $this->type,
-            'business_type' => (int) $this->business_type,
-            'status' => (int) $this->status,
-            'contact' => new V1\ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
-            'address' => new V1\AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())),
-            'employee' =>  $userResource,
-            'identification' => new V1\DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
-            'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
-            'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
-                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-            })->count(),
-            'total_payments' => (float) $totalPayments,
-            'average_spending_per_day' => (float) $totalPayments / ($this->created_at->diff(Carbon::now())->days === 0 ? 1 : $this->created_at->diff(Carbon::now())->days),
-            'average_spending_per_booking' => (float) $totalPayments > 0 ? $totalPayments / $this->bookings()->whereHas('transactions', function ($query){
-                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                })->count() : $totalPayments,
-            'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
-            'personal_banks' => V1\BankResource::collection($this->banks->where('type', BankAccountType::PERSONAL)),
-            'recipient_banks' => [
-                'accounts' => V1\BankResource::collection($this->banks->where('type', BankAccountType::EXTERNAL)),
-                'default' => new V1\BankResource($this->banks->where('type', BankAccountType::EXTERNAL)->where('default', true)->first())
-            ],
-            'segments' => V1\SegmentResource::collection($this->segments),
-            'seasonalSegment' => $this->whenLoaded('seasonalSegments', V1\SeasonalSegmentResource::collection($this->seasonalSegments)),
-            'services' => (new FetchesCompanyServices())->getServices($this->servicesConfigurations()),
-            'wallet' => $this->whenLoaded('wallets', new V1\WalletResource($this->wallets()->with('transactions')->first()), new V1\WalletResource($this->wallets()->first())),
-            'created_at' => $this->created_at->format('d-m-Y'),
-            $this->mergeWhen($this->business_type === BusinessType::CURRENCY_VENDOR, [
-                'currencies' => $segment ? V1\CurrencyResource::collection(Currency::whereIn('id', $segment->detail->currencies)->get()) : [],
-                'service_charge' => $serviceCharge
-            ])
-
-        ];
-    }
-}
diff --git a/app/Models/JobResult.php b/app/Models/JobResult.php
deleted file mode 100644
index f30b5076..00000000
--- a/app/Models/JobResult.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class JobResult extends AbstractModel
-{
-    protected $table = 'job_results';
-
-    public $fillable = [
-        'job_id',
-        'result'
-   ];
-}
diff --git a/database/migrations/2023_08_08_124848_create_job_results_table.php b/database/migrations/2023_08_08_124848_create_job_results_table.php
deleted file mode 100644
index ef448407..00000000
--- a/database/migrations/2023_08_08_124848_create_job_results_table.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateJobResultsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('job_results', function (Blueprint $table) {
-            $table->id();
-            $table->string('job_id', 50);
-            $table->longText('result')->nullable();
-            $table->timestamps();
-
-            // $table->foreign('job_id')->references('id')->on('jobs')->onDelete('cascade');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('job_results');
-    }
-}
diff --git a/database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php b/database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php
deleted file mode 100644
index 8e6b8342..00000000
--- a/database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddNewColumnToJobResultsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->longText('url')->after('result')->nullable();
-            $table->string('job_command_name')->after('url')->nullable();
-            $table->longText('job_command')->after('job_command_name')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->dropColumn('url');
-            $table->dropColumn('job_command_name');
-            $table->dropColumn('job_command');
-        });
-    }
-}
diff --git a/database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php b/database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php
deleted file mode 100644
index 12c6d57f..00000000
--- a/database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddNewColumn2ToJobResultsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->string('request_signature')->after('job_id')->nullable();
-            $table->string('result_signature')->after('request_signature')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->dropColumn('request_signature');
-            $table->dropColumn('result_signature');
-        });
-    }
-}
diff --git a/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
deleted file mode 100644
index 966ccbbc..00000000
--- a/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-    <div class="row tabsContainer">
-        <div class="col">
-            <div class="row m-l-0 m-r-0 d-flex">
-                <div class="col">
-                    <div class="row justify-content-end">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col b-r b-white">
-                                    <div class="row fs-12 text-center">
-                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="invoice" @click="setActiveTab($event)">
-                                            <div class="row justify-content-center m-b-5">
-                                                <div class="col-auto">
-                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                            width="35" height="35"
-                                                            viewBox="0 0 172 172"
-                                                            style=" fill:#000000;"><defs><linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path><path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path><path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path><path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path></g></g></svg>
-                                                </div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="fs-12 m-t-5 all-caps">Invoice</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col b-r b-white">
-                                    <div class="row fs-12 text-center">
-                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchase-order" @click="setActiveTab($event)">
-                                            <div class="row justify-content-center m-b-5">
-                                                <div class="col-auto">
-                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                            width="35" height="35"
-                                                            viewBox="0 0 172 172"
-                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                </div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="fs-12 m-t-5 all-caps">Purchase Order</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col b-r b-white">
-                                    <div class="row fs-12 text-center">
-                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery-order" @click="setActiveTab($event)">
-                                            <div class="row justify-content-center m-b-5">
-                                                <div class="col-auto">
-                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                            width="35" height="35"
-                                                            viewBox="0 0 172 172"
-                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                </div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="fs-12 m-t-5 all-caps">Delivery Order</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col b-r b-white">
-                                    <div class="row fs-12 text-center">
-                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="supplier-delivery-order" @click="setActiveTab($event)">
-                                            <div class="row justify-content-center m-b-5">
-                                                <div class="col-auto">
-                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                            width="35" height="35"
-                                                            viewBox="0 0 172 172"
-                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                </div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="fs-12 m-t-5 all-caps">Supplier Delivery Order</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row no-margin">
-                <div class="col bg-white padding-25">
-                    <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice" v-if="isActiveTab('invoice') || showTabContent('invoice')">
-                        <list-component key="2" section="invoiceSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
-                            <template slot="list" slot-scope="{data}">
-                                <billing-document-component :data="data"></billing-document-component>
-                            </template>
-                        </list-component>
-                    </div>
-                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order" v-if="isActiveTab('purchase-order') || showTabContent('purchase-order')">
-                        <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
-                            <template slot="list" slot-scope="{data}">
-                                <billing-document-component :data="data"></billing-document-component>
-                            </template>
-                        </list-component>
-                    </div>
-                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order" v-if="isActiveTab('delivery-order') || showTabContent('delivery-order')">
-                        <list-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
-                            <template slot="list" slot-scope="{data}">
-                                <billing-document-component :data="data"></billing-document-component>
-                            </template>
-                        </list-component>
-                    </div>
-                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order" v-if="isActiveTab('supplier-delivery-order') || showTabContent('supplier-delivery-order')">
-                        <list-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
-                            <template slot="list" slot-scope="{data}">
-                                <billing-document-component :data="data"></billing-document-component>
-                            </template>
-                        </list-component>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import tabHandler from '../../../general/mixins/tabHandler';
-    export default {
-        data() {
-            return {
-                activeTab: 'invoice',
-                displayedTabs: ['invoice'],
-            };
-        },
-        mixins: [tabHandler]
-    }
-</script>
diff --git a/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue
deleted file mode 100644
index 47d14857..00000000
--- a/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-    <div class="row tabsContainer">
-        <div class="col">
-            <div class="row m-l-0 m-r-0 d-flex">
-                <div class="col">
-                    <div class="row justify-content-end">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col b-r b-white">
-                                    <div class="row fs-12 text-center">
-                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="invoice" @click="setActiveTab($event)">
-                                            <div class="row justify-content-center m-b-5">
-                                                <div class="col-auto">
-                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                            width="35" height="35"
-                                                            viewBox="0 0 172 172"
-                                                            style=" fill:#000000;"><defs><linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path><path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path><path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path><path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path></g></g></svg>
-                                                </div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="fs-12 m-t-5 all-caps">Invoice</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col b-r b-white">
-                                    <div class="row fs-12 text-center">
-                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchase-order" @click="setActiveTab($event)">
-                                            <div class="row justify-content-center m-b-5">
-                                                <div class="col-auto">
-                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                            width="35" height="35"
-                                                            viewBox="0 0 172 172"
-                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                </div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="fs-12 m-t-5 all-caps">Purchase Order</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col b-r b-white">
-                                    <div class="row fs-12 text-center">
-                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery-order" @click="setActiveTab($event)">
-                                            <div class="row justify-content-center m-b-5">
-                                                <div class="col-auto">
-                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                            width="35" height="35"
-                                                            viewBox="0 0 172 172"
-                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                </div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="fs-12 m-t-5 all-caps">Delivery Order</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col b-r b-white">
-                                    <div class="row fs-12 text-center">
-                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="supplier-delivery-order" @click="setActiveTab($event)">
-                                            <div class="row justify-content-center m-b-5">
-                                                <div class="col-auto">
-                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                            width="35" height="35"
-                                                            viewBox="0 0 172 172"
-                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                </div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="fs-12 m-t-5 all-caps">Supplier Delivery Order</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row no-margin">
-                <div class="col bg-white padding-25">
-                    <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice" v-if="isActiveTab('invoice') || showTabContent('invoice')">
-                        <list-polling-component key="2" section="invoiceSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
-                            <template slot="list" slot-scope="{data}">
-                                <billing-document-component :data="data"></billing-document-component>
-                            </template>
-                        </list-polling-component>
-                    </div>
-                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order" v-if="isActiveTab('purchase-order') || showTabContent('purchase-order')">
-                        <list-polling-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
-                            <template slot="list" slot-scope="{data}">
-                                <billing-document-component :data="data"></billing-document-component>
-                            </template>
-                        </list-polling-component>
-                    </div>
-                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order" v-if="isActiveTab('delivery-order') || showTabContent('delivery-order')">
-                        <list-polling-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
-                            <template slot="list" slot-scope="{data}">
-                                <billing-document-component :data="data"></billing-document-component>
-                            </template>
-                        </list-polling-component>
-                    </div>
-                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order" v-if="isActiveTab('supplier-delivery-order') || showTabContent('supplier-delivery-order')">
-                        <list-polling-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
-                            <template slot="list" slot-scope="{data}">
-                                <billing-document-component :data="data"></billing-document-component>
-                            </template>
-                        </list-polling-component>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import tabHandler from '../../../general/mixins/tabHandler';
-    export default {
-        data() {
-            return {
-                activeTab: 'invoice',
-                displayedTabs: ['invoice'],
-            };
-        },
-        mixins: [tabHandler]
-    }
-</script>
diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
index d2b69080..7df9c125 100644
--- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -117,17 +117,11 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                     <!-- CIEF TODO: For easy revert to old code -->
                                     <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
                                         <template slot="list" slot-scope="{data}">
                                             <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
                                         </template>
                                     </list-component>
-                                    <!-- <list-polling-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list.job')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
-                                        <template slot="list" slot-scope="{data}">
-                                            <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
-                                        </template>
-                                    </list-polling-component> -->
                                 </div>
                             </div>
                         </div>
@@ -171,7 +165,7 @@
             }
         },
         created(){
-            this.submit(route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]}), 'get', 'pendingOrdersSection', false, false); //cief todo: Uncaught (in promise) null
+            this.submit(route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]}), 'get', 'pendingOrdersSection', false, false)
         },
         methods: {
             successHandler(response){
@@ -216,4 +210,4 @@
 
 
     }
-</script>
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/general/elements/ListPollingComponent.vue b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
deleted file mode 100644
index fcd3b8b8..00000000
--- a/resources/assets/vue/components/general/elements/ListPollingComponent.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-    <transition-component group enter-class="animate__animated animate__fadeInUp animate__delay-1 animate__faster p-r-30" leave-class="animate__animated animate__fadeOutDown animate__faster p-r-30" style="min-height: 300px;width:100%">
-        <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
-        <div class="row" key="2" v-show="!$store.getters.isLoading(section)">
-            <div class="col">
-                <div class="row">
-                    <div class="col">
-                        <div class="row align-items-center justify-content-center p-t-50 p-b-50"  v-show="!$store.getters.getListData(section).length && !isLoading && emptyListSection">
-                            <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;">Nothing To Show Here</p>
-                                            </div>
-                                        </div>
-                                        <div class="row m-t-5 align-items-center justify-content-center">
-                                            <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>
-                        <div class="row" v-show="!isLoading">
-                            <div class="col">
-                                <div class="list disable-text-selection" data-check-all="checkAll">
-                                    <div class="row" ref="list" v-for="item in $store.getters.getListData(section)" v-bind:key="item.id" :data="item">
-                                        <div class="col">
-                                            <slot name="list" :data="item"></slot>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row" v-show="!isLoading">
-                            <div class="col">
-                                <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </transition-component>
-</template>
-
-<script>
-    import requestV2 from '../../../general/mixins/aws/requestV2'
-    export default {
-        props: {
-            section:{
-                type: String,
-                required: true
-            },
-            endpoint: {
-                type: String,
-                required: true
-            },
-            options: {
-                default () {
-                    return {}
-                }
-            },
-            emptyListSection: {
-                type: Boolean,
-                default: true,
-            }
-        },
-        data(){
-            return {
-                filters: this.options,
-                pollingInterval: null,
-                isPolling: false,
-                isFetchingResult: false,
-                isLoading: false,
-            }
-        },
-        created(){
-            this.setDecoratorDefault();
-            this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters}); //cief todo: Uncaught (in promise) null
-        },
-        computed: {
-            pendingList () {
-                return this.$store.getters.isInCompleteQueue(this.section);
-            }
-        },
-        watch: {
-            pendingList(inComplete){
-                if(inComplete){
-                    this.fetchList();
-                }
-            }
-        },
-        methods: {
-            fetchList(){
-                let listDecorators = this.$store.getters.getListDetails(this.section);
-                let url = this.endpoint + '?page=' + listDecorators.page + '&filters=' + JSON.stringify(listDecorators.filters);
-                this.isLoading = true;
-                this.submitJob(url);
-            },
-            //cief todo: remove?
-            // updateFilters(filters){
-            //     this.filters = filters;
-            //     this.setDecoratorDefault();
-            //     console.log('updateFilters');
-            //     this.submit(this.endpoint + '?page=1&filters=' + JSON.stringify(this.filters), 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
-            // },
-            successHandler(response){
-                let result = JSON.parse(response.payload.data.result);
-                result.meta = {
-                    current_page: result.meta.current_page,
-                    first_page_url: result.meta.first_page_url,
-                    from: result.meta.from,
-                    last_page: result.meta.last_page,
-                    last_page_url: result.meta.last_page_url,
-                    next_page_url: result.meta.next_page_url,
-                    path: result.meta.path,
-                    per_page: result.meta.per_page,
-                    prev_page_url: result.meta.prev_page_url,
-                    to: result.meta.to,
-                    total: result.meta.total
-                };
-
-                this.stopPolling();
-                this.$store.dispatch('completeList', {'name': this.section, 'data': result.data});
-                this.$refs.pagination.makePagination(result.meta, result.links);
-                this.isLoading = false;
-            },
-            errorHandler(error){
-                this.isFetchingResult = false;
-                this.isPolling = false;
-            },
-            startPolling(jobId, maxAttempts = 8) {
-                let attempts = 0;
-                let interval = 10000; // Initial interval
-
-                const resetPollingInterval = (customInterval) => {
-                    this.pollingInterval = setInterval(pollJobResult, customInterval);
-                };
-
-                const pollJobResult = () => {
-                    if (this.isPolling || this.isFetchingResult) {
-                        return;
-                    }
-                    this.isPolling = true;
-
-                    attempts++;
-                    if(attempts === 1){
-                        this.stopPolling();
-                        resetPollingInterval(5000);
-                    }
-
-                    if (attempts > maxAttempts) {
-                        this.stopPolling();
-                        this.isLoading = false;
-                        console.log(`Reached maximum attempts (${maxAttempts}). Polling stopped.`);
-                        return;
-                    }
-
-                    if(attempts === maxAttempts){
-                        this.fetchJobResult(jobId, true);
-                    }
-                    else{
-                        this.fetchJobResult(jobId);
-                    }
-                };
-
-                // pollJobResult();  // Initial call
-                this.pollingInterval = setInterval(pollJobResult, interval);
-            },
-            stopPolling() {
-                clearInterval(this.pollingInterval);
-                this.pollingInterval = null;
-                this.isPolling = false;
-                this.isFetchingResult = false;
-            },
-            submitJob(url){
-                try {
-                    this.$store.dispatch('crudRequest', {endpoint: url, method: 'get'}).then(response => {
-                        let success = response.ok;
-                        response.json().then(response => {
-                            if(!success){return;}
-                            let jobId = response.payload.data.job_id;
-                            if(jobId){
-                                this.startPolling(jobId);
-                            }
-                        });
-                    })
-                } catch (error) {
-                    console.error('Error submitJob', error);
-                }
-            },
-            fetchJobResult(jobId, isLastAttempt = false) {
-                this.isFetchingResult = true;
-                try {
-                    let anotherEndpoint = route('api.job.fetch', jobId);
-                    if(isLastAttempt){
-                        anotherEndpoint = route('api.job.fetch.last.attempt', jobId, isLastAttempt);
-                    }
-                    this.poll(anotherEndpoint, 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
-                } catch (error) {
-                    console.error('Error fetchJobResult', error);
-                }
-            }
-        },
-        mixins: [requestV2]
-    }
-</script>
diff --git a/resources/assets/vue/general/mixins/aws/requestV2.js b/resources/assets/vue/general/mixins/aws/requestV2.js
deleted file mode 100644
index 12b27542..00000000
--- a/resources/assets/vue/general/mixins/aws/requestV2.js
+++ /dev/null
@@ -1,49 +0,0 @@
-export default {
-    methods: {
-        poll(url, method, section, successNotification = true, errorNotification = true){
-            if(!this.validate()){ return; }
-            if (section) {
-                this.$store.dispatch('toggleLoading', {name: section, status: true})
-            }
-            this.$store.dispatch('crudRequestV2', {
-                endpoint: url,
-                method: method,
-                parameters: this.parameters
-            }).then(response => {
-                let statusCode = response.status,
-                    success = response.ok;
-
-                response.json().then(response => {
-
-                    if(!success){
-                        this.openModal();
-                        errorNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'error'}): null;
-                        this.errorHandler(response, statusCode); return;
-                    }
-
-                    successNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'success'}): null;
-                    this.successHandler(response)
-
-
-                });
-            }).catch((error) => {
-                this.$store.dispatch('createNotification', {title: 'Unexpected Error', message: 'An unexpected error has occurred. Try again!', type: 'error'});
-            }).then(() => {
-                if (section) {
-                    this.$store.dispatch('toggleLoading', {name: section, status: false})
-                }
-            })
-
-        },
-        validate() {
-            if(this.$v){
-                this.$v.$touch();
-                return !this.$v.$invalid;
-            }
-            return true;
-        },
-        successHandler(response){},
-        errorHandler(response){}
-    }
-
-}
diff --git a/resources/assets/vue/general/mixins/tabHandler.js b/resources/assets/vue/general/mixins/tabHandler.js
deleted file mode 100644
index 81790ed0..00000000
--- a/resources/assets/vue/general/mixins/tabHandler.js
+++ /dev/null
@@ -1,24 +0,0 @@
-export default {
-    data() {
-        return {
-            activeTab: null,
-            displayedTabs: [],
-        };
-    },
-    methods: {
-        setActiveTab(event) {
-            const tabName = event.currentTarget.getAttribute('tab-name');
-            // console.log(`Tab "${tabName}" clicked`);
-            this.activeTab = tabName;
-            if (!this.displayedTabs.includes(tabName)) {
-                this.displayedTabs.push(tabName);
-            }
-        },
-        isActiveTab(tabName) {
-            return this.activeTab === tabName;
-        },
-        showTabContent(tabName) {
-            return this.displayedTabs.includes(tabName);
-        },
-    },
-}
diff --git a/resources/assets/vue/vuex/modules/crudRequestV2.js b/resources/assets/vue/vuex/modules/crudRequestV2.js
deleted file mode 100644
index 355b1edb..00000000
--- a/resources/assets/vue/vuex/modules/crudRequestV2.js
+++ /dev/null
@@ -1,51 +0,0 @@
-export default {
-    actions: {
-        crudRequestV2({getters, dispatch},  {endpoint, method, parameters}){
-            return dispatch('ensureReCaptchaIsSet').then(function () {
-                const queryDomain = endpoint.split('?')[0];
-                let encodedParams = endpoint.split('?')[1];
-                let decodedParams = fullyDecodeURI(encodedParams);
-                const queryParams = encodeURIComponent(decodedParams);
-                encodedParams = queryParams.toString();
-                let filteredEncodedParams = encodedParams.replace(/%3D/g,'=');
-                filteredEncodedParams = filteredEncodedParams.replace(/%26/g,'&');
-                let combinedAbsoluteUrl = queryDomain;
-                if(filteredEncodedParams !== undefined && filteredEncodedParams !== 'undefined'){
-                    combinedAbsoluteUrl = queryDomain + '?' + filteredEncodedParams;
-                }
-
-                // return fetch(endpoint, {
-                return fetch(combinedAbsoluteUrl, {
-                    method: method,
-                    responseType: 'json',
-                    body: parameters ? JSON.stringify(parameters):null,
-                    headers: {
-                        'content-type': 'application/json',
-                        'Authorization': 'Bearer '+getters.getAccessToken,
-                        'captcha-token': getters.getReCaptcha
-                    }
-                }).then(response => {
-
-                    if(response.status === 401 && window.location.href !== route('login')){
-                        dispatch('userAuthentication', {access_token: '', redirect_url: '/'});
-                    }
-
-                    return response;
-
-                })
-            });
-        }
-    }
-}
-
-function isEncoded(uri) {
-    uri = uri || '';
-    return uri !== decodeURIComponent(uri);
-}
-
-function fullyDecodeURI(uri){
-    while (isEncoded(uri)){
-        uri = decodeURIComponent(uri);
-    }
-    return uri;
-}
diff --git a/resources/assets/vue/vuex/store.js b/resources/assets/vue/vuex/store.js
index ff10c673..2c3d911b 100644
--- a/resources/assets/vue/vuex/store.js
+++ b/resources/assets/vue/vuex/store.js
@@ -4,7 +4,6 @@ import toggleSection from './modules/toggleSection'
 import toggleLoading from './modules/toggleLoading'
 import createNotification from './modules/createNotification'
 import crudRequest from './modules/crudRequest'
-import crudRequestV2 from './modules/crudRequestV2'
 import authentication from './modules/authentication'
 import loadRequestQueue from './modules/loadRequestQueue'
 
@@ -17,7 +16,6 @@ export default new Vuex.Store({
         loadRequestQueue,
         createNotification,
         crudRequest,
-        crudRequestV2,
         authentication
     }
-})
+})
\ No newline at end of file
diff --git a/resources/views/pages/billings.blade.php b/resources/views/pages/billings.blade.php
index da84f8b9..4bc012d5 100644
--- a/resources/views/pages/billings.blade.php
+++ b/resources/views/pages/billings.blade.php
@@ -3,7 +3,129 @@
     <div class="row" v-if="$store.getters.isAdmin">
         <div class="col p-t-15 p-b-15">
             <billing-component></billing-component>
-            <admin-payments-billing-section-component></admin-payments-billing-section-component>
+
+            <div class="row tabsContainer">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0 d-flex">
+                        <div class="col">
+                            <div class="row justify-content-end">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="invoice">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path><path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path><path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path><path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Invoice</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchase-order">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Purchase Order</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery-order">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Delivery Order</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="supplier-delivery-order">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Supplier Delivery Order</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row no-margin">
+                        <div class="col bg-white padding-25">
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice">
+                                <list-component key="2" section="invoiceSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <billing-document-component :data="data"></billing-document-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order">
+                                <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <billing-document-component :data="data"></billing-document-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order">
+                                <list-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <billing-document-component :data="data"></billing-document-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order">
+                                <list-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <billing-document-component :data="data"></billing-document-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/billings_experiment.blade.php b/resources/views/pages/billings_experiment.blade.php
deleted file mode 100644
index d1caee2d..00000000
--- a/resources/views/pages/billings_experiment.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-@extends('layouts.base_portal')
-@section('inner_content')
-    <div class="row" v-if="$store.getters.isAdmin">
-        <div class="col p-t-15 p-b-15">
-            <billing-component></billing-component>
-            <admin-payments-billing-section-polling-component></admin-payments-billing-section-polling-component>
-        </div>
-    </div>
-@endsection
diff --git a/routes/api.php b/routes/api.php
index 460bd772..8b4bada0 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -67,10 +67,6 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         require __DIR__ . '/milestone.php';
 
-        // require __DIR__ . '/accounting.php'; //cief todo: To check if this is needed
-
-        require __DIR__ . '/job.php';
-
 //        require __DIR__ . '/rate.php';
 //        require __DIR__ . '/receipt.php';
 
diff --git a/routes/currency.php b/routes/currency.php
index ba55c9a2..b621aad6 100644
--- a/routes/currency.php
+++ b/routes/currency.php
@@ -1,4 +1,4 @@
-<?php
+    <?php
 
 use Illuminate\Support\Facades\Route;
 
diff --git a/routes/document.php b/routes/document.php
index 07a7d18a..c186032f 100644
--- a/routes/document.php
+++ b/routes/document.php
@@ -4,10 +4,9 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'document', 'as' => 'document.', 'namespace' => 'Documents'], function () {
     Route::get('/list', 'ListDocumentsController@list')->name('list');
-    Route::get('/list/job', 'ListDocumentsJobController@list')->name('list.job');
     Route::delete('/{id}/delete', 'DeleteDocumentController@delete')->name('delete');
     Route::put('/{id}/approve', 'ApproveDocumentController@approve')->name('status.approve');
     Route::put('/{id}/reject', 'RejectDocumentController@reject')->name('status.reject');
 
     Route::put('/{id}/reference/update', 'UpdateDocumentReferenceController@update')->name('reference.update');
-});
+});
\ No newline at end of file
diff --git a/routes/job.php b/routes/job.php
deleted file mode 100644
index 028e9468..00000000
--- a/routes/job.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Route;
-
-Route::group(['prefix' => 'job', 'as' => 'job.', 'namespace' => 'Jobs'], function () {
-    Route::get('/fetch/{job_id}', 'FetchJobResultController@fetch')->name('fetch');
-    Route::get('/fetch/{job_id}/{is_last}', 'FetchJobResultController@fetch')->name('fetch.last.attempt');
-});
diff --git a/routes/web.php b/routes/web.php
index a6590c17..bf2892bb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -92,12 +92,6 @@ Route::get('/billings', function () {
     return view('pages.billings');
 })->name('billings');
 
-/* Vue Polling Experiment - Starts  */
-Route::get('/billings-experiment', function () {
-    return view('pages.billings_experiment');
-})->name('billings.experiment');
-/* Vue Polling Experiment - Ends  */
-
 Route::get('/currency_orders', function () {
     return view('pages.currency_orders');
 })->name('currency_orders');
@@ -836,13 +830,13 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
                     ->withTrashed()
                     ->orderBy('created_at', 'asc')
                     ->first();
-
+        
                 // get the first bill_no
                 $firstBillNo = $firstInvoice->bill_no;
                 if (strpos($firstBillNo, '-deleted') !== false) {
                     $firstBillNo = substr($firstBillNo, 0, strpos($firstBillNo, '-deleted'));
                 }
-
+        
                 // update currentInvoice bill_no to '-deleted-'
                 $currentInvoice = $booking->transactions()->where('type', TransactionType::INVOICE)->first();
                 $currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . Str::random(10);
@@ -865,4 +859,4 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
             }
         }
     );
-})->name('invoice.fix.byCustomerMarking');
+})->name('invoice.fix.byCustomerMarking');
\ No newline at end of file

From f8230990f4f46348cd37551bd18fa1f75a2232d2 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 11 Feb 2024 10:28:05 +0000
Subject: [PATCH 35/40] Revert "Merge branch 'revert-b9668bb6' into 'master'"

This reverts merge request !157
---
 .../JobResourceNotFoundException.php          |  11 +
 .../Abstracts/AbstractControllerLogic.php     |  15 +-
 .../General/Eloquent/AbstractFetchRecord.php  |  14 +-
 .../General/Eloquent/AbstractGetRecord.php    |  26 ++-
 .../General/Eloquent/AbstractListRecord.php   |  14 +-
 .../General/Eloquent/Filters/JobId.php        |  20 ++
 .../Eloquent/Filters/OrderByIdDesc.php        |  20 ++
 .../Eloquent/Filters/RequestSignature.php     |  19 ++
 .../Eloquent/Filters/ResultNotNull.php        |  18 ++
 app/Classes/General/Helper.php                |  24 ++
 app/Classes/Jobs/ListBookingsJob.php          |  52 +++++
 app/Classes/Jobs/ListDocumentsJob.php         |  63 ++++++
 app/Classes/Jobs/ListTransactionsJob.php      |  52 +++++
 .../ControllersLogic/ListBookingJobLogic.php  |  75 ++++++
 .../Processors/ListBookingsJobProcessor.php   |  46 ++++
 .../ControllersLogic/ListDocumentJobLogic.php |  75 ++++++
 .../Processors/ListDocumentsJobProcessor.php  |  47 ++++
 .../ControllersLogic/FetchJobResultLogic.php  |  51 +++++
 .../ListGenericJobObject.php                  | 118 ++++++++++
 .../UpdateJobResultObject.php                 |  60 +++++
 .../Processors/FetchesJobResultProcessor.php  |  47 ++++
 .../Processors/UpdateJobResultProcessor.php   |  64 ++++++
 .../Jobs/Services/CreatesJobResult.php        |  26 +++
 .../Jobs/Services/FetchesJobResult.php        |  33 +++
 .../Modules/Jobs/Services/ListsJobResult.php  |  33 +++
 .../Jobs/Services/UpdatesJobResult.php        |  28 +++
 .../ListTransactionsJobLogic.php              |  74 ++++++
 .../ListTransactionsJobProcessor.php          |  45 ++++
 .../Bookings/ListBookingsJobController.php    |  22 ++
 .../Documents/ListDocumentsJobController.php  |  19 ++
 .../Jobs/FetchJobResultController.php         |  19 ++
 .../ListTransactionsJobController.php         |  21 ++
 app/Http/Resources/BookingResource.php        |   2 -
 app/Http/Resources/CompanyResource.php        |   1 -
 app/Http/Resources/DocumentResource.php       |   3 -
 app/Http/Resources/JobResultResource.php      |  22 ++
 app/Http/Resources/ListBookingJobResource.php |  81 +++++++
 .../Resources/ListDocumentJobResource.php     |  31 +++
 .../Resources/ListTransactionJobResource.php  |  54 +++++
 app/Http/Resources/V2/BookingV2Resource.php   |  82 +++++++
 app/Http/Resources/V2/CompanyV2Resource.php   | 100 ++++++++
 app/Models/JobResult.php                      |  13 ++
 ..._08_08_124848_create_job_results_table.php |  35 +++
 ...31_add_new_column_to_job_results_table.php |  36 +++
 ..._add_new_column_2_to_job_results_table.php |  34 +++
 .../AdminPaymentsBillingSectionComponent.vue  | 136 +++++++++++
 ...PaymentsBillingSectionPollingComponent.vue | 136 +++++++++++
 .../SupplierPendingOrdersSectionComponent.vue |  10 +-
 .../general/elements/ListPollingComponent.vue | 213 ++++++++++++++++++
 .../vue/general/mixins/aws/requestV2.js       |  49 ++++
 .../assets/vue/general/mixins/tabHandler.js   |  24 ++
 .../assets/vue/vuex/modules/crudRequestV2.js  |  51 +++++
 resources/assets/vue/vuex/store.js            |   4 +-
 resources/views/pages/billings.blade.php      | 126 +----------
 .../views/pages/billings_experiment.blade.php |   9 +
 routes/api.php                                |   4 +
 routes/currency.php                           |   2 +-
 routes/document.php                           |   3 +-
 routes/job.php                                |   8 +
 routes/web.php                                |  12 +-
 60 files changed, 2380 insertions(+), 152 deletions(-)
 create mode 100644 app/Classes/Exceptions/JobResourceNotFoundException.php
 create mode 100644 app/Classes/General/Eloquent/Filters/JobId.php
 create mode 100644 app/Classes/General/Eloquent/Filters/OrderByIdDesc.php
 create mode 100644 app/Classes/General/Eloquent/Filters/RequestSignature.php
 create mode 100644 app/Classes/General/Eloquent/Filters/ResultNotNull.php
 create mode 100644 app/Classes/Jobs/ListBookingsJob.php
 create mode 100644 app/Classes/Jobs/ListDocumentsJob.php
 create mode 100644 app/Classes/Jobs/ListTransactionsJob.php
 create mode 100644 app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
 create mode 100644 app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
 create mode 100644 app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
 create mode 100644 app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
 create mode 100644 app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
 create mode 100644 app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
 create mode 100644 app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php
 create mode 100644 app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
 create mode 100644 app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
 create mode 100644 app/Classes/Modules/Jobs/Services/CreatesJobResult.php
 create mode 100644 app/Classes/Modules/Jobs/Services/FetchesJobResult.php
 create mode 100644 app/Classes/Modules/Jobs/Services/ListsJobResult.php
 create mode 100644 app/Classes/Modules/Jobs/Services/UpdatesJobResult.php
 create mode 100644 app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
 create mode 100644 app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
 create mode 100644 app/Http/Controllers/Bookings/ListBookingsJobController.php
 create mode 100644 app/Http/Controllers/Documents/ListDocumentsJobController.php
 create mode 100644 app/Http/Controllers/Jobs/FetchJobResultController.php
 create mode 100644 app/Http/Controllers/Transactions/ListTransactionsJobController.php
 create mode 100644 app/Http/Resources/JobResultResource.php
 create mode 100644 app/Http/Resources/ListBookingJobResource.php
 create mode 100644 app/Http/Resources/ListDocumentJobResource.php
 create mode 100644 app/Http/Resources/ListTransactionJobResource.php
 create mode 100644 app/Http/Resources/V2/BookingV2Resource.php
 create mode 100644 app/Http/Resources/V2/CompanyV2Resource.php
 create mode 100644 app/Models/JobResult.php
 create mode 100644 database/migrations/2023_08_08_124848_create_job_results_table.php
 create mode 100644 database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php
 create mode 100644 database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php
 create mode 100644 resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
 create mode 100644 resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue
 create mode 100644 resources/assets/vue/components/general/elements/ListPollingComponent.vue
 create mode 100644 resources/assets/vue/general/mixins/aws/requestV2.js
 create mode 100644 resources/assets/vue/general/mixins/tabHandler.js
 create mode 100644 resources/assets/vue/vuex/modules/crudRequestV2.js
 create mode 100644 resources/views/pages/billings_experiment.blade.php
 create mode 100644 routes/job.php

diff --git a/app/Classes/Exceptions/JobResourceNotFoundException.php b/app/Classes/Exceptions/JobResourceNotFoundException.php
new file mode 100644
index 00000000..a8ef358e
--- /dev/null
+++ b/app/Classes/Exceptions/JobResourceNotFoundException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Classes\Exceptions;
+
+use App\Classes\ValueObjects\Constants\HttpStatus;
+
+final class JobResourceNotFoundException extends ServiceApiException {
+    public function __construct(?string $message = null) {
+        parent::__construct($message ?? 'Unable to find the requested resource', HttpStatus::RESOURCE_NOT_FOUND);
+    }
+}
diff --git a/app/Classes/General/Abstracts/AbstractControllerLogic.php b/app/Classes/General/Abstracts/AbstractControllerLogic.php
index 815219c8..61c70f44 100644
--- a/app/Classes/General/Abstracts/AbstractControllerLogic.php
+++ b/app/Classes/General/Abstracts/AbstractControllerLogic.php
@@ -17,6 +17,7 @@ use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use App\Classes\Exceptions\JobResourceNotFoundException;
 
 abstract class AbstractControllerLogic
 {
@@ -67,7 +68,19 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions $exception){
-            log::error($exception);
+            if ($exception instanceof JobResourceNotFoundException) {
+                Log::error(sprintf(
+                    "Uncaught exception '%s' with message '%s' in %s:%d",
+                    get_class($exception),
+                    $exception->getMessage(),
+                    $exception->getTrace()[0]['file'],
+                    $exception->getTrace()[0]['line']
+                ));
+            }
+            else{
+                log::error($exception);
+            }
+
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
                 $exception->getCode() ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 
diff --git a/app/Classes/General/Eloquent/AbstractFetchRecord.php b/app/Classes/General/Eloquent/AbstractFetchRecord.php
index 248deee7..503fb369 100644
--- a/app/Classes/General/Eloquent/AbstractFetchRecord.php
+++ b/app/Classes/General/Eloquent/AbstractFetchRecord.php
@@ -4,9 +4,11 @@ namespace App\Classes\General\Eloquent;
 
 
 use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Exceptions\JobResourceNotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Psy\Exception\ErrorException;
+use Illuminate\Support\Facades\Log;
 
 abstract class AbstractFetchRecord extends AbstractGetRecord
 {
@@ -27,12 +29,18 @@ abstract class AbstractFetchRecord extends AbstractGetRecord
      * @return Model
      * @throws ResourceNotFoundException
      */
-    public function getResults(Builder $query): Model {
+    public function getResults(Builder $query, array $param = []): Model {
         if(!$query->exists()){
-            throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
+            $table = $query->getModel()->getTable();
+            if($table ==='job_results'){
+                throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
+            }
+            else{
+                throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
+            }
         }
 
         return $query->first();
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Classes/General/Eloquent/AbstractGetRecord.php b/app/Classes/General/Eloquent/AbstractGetRecord.php
index f927d818..1a7eac3e 100644
--- a/app/Classes/General/Eloquent/AbstractGetRecord.php
+++ b/app/Classes/General/Eloquent/AbstractGetRecord.php
@@ -30,11 +30,25 @@ abstract class AbstractGetRecord
         return $this->filters->only(self::DECORATION_FILTERS);
     }
 
+    // /**
+    //  * @param null|string $json
+    //  * @return array
+    //  */
+    // public function deserializeFilters(?string $json): array {
+    //     return $json !== null ? collect(json_decode($json))->toArray() : [];
+    // }
+
     /**
-     * @param null|string $json
+     * @param null|string $param
      * @return array
      */
-    public function deserializeFilters(?string $json): array {
+    public function deserializeFilters($param): array {
+        if(gettype($param) == "array"){
+            $json = implode(',', $param);
+        }
+        else{
+            $json = $param;
+        }
         return $json !== null ? collect(json_decode($json))->toArray() : [];
     }
 
@@ -50,9 +64,9 @@ abstract class AbstractGetRecord
      * @param array $filters
      * @return mixed
      */
-    public function handler(array $filters){
+    public function handler(array $filters, array $params = []){
         $this->filters = collect($filters);
-        return $this->getResults($this->applyFiltersToQuery());
+        return $this->getResults($this->applyFiltersToQuery(), $params);
     }
 
 
@@ -65,6 +79,6 @@ abstract class AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    abstract function getResults(Builder $query);
+    abstract function getResults(Builder $query, array $params = []);
 
-}
\ No newline at end of file
+}
diff --git a/app/Classes/General/Eloquent/AbstractListRecord.php b/app/Classes/General/Eloquent/AbstractListRecord.php
index 7b7d0df9..f898f108 100644
--- a/app/Classes/General/Eloquent/AbstractListRecord.php
+++ b/app/Classes/General/Eloquent/AbstractListRecord.php
@@ -17,11 +17,11 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @return mixed
      * @throws MalformedRequestException
      */
-    public function execute(array $filters = []){
+    public function execute(array $filters = [], array $param = []){
 
         try{
 
-            return $this->handler($filters);
+            return $this->handler($filters, $param);
 
         } catch (QueryException $exception){
             log::error($exception);
@@ -30,18 +30,24 @@ abstract class AbstractListRecord extends AbstractGetRecord
 
     }
 
+
     /**
      * @param Builder $query
      * @return mixed
      */
-    public function getResults(Builder $query) {
+    public function getResults(Builder $query, array $param = []) {
         $filters = $this->getDecorationFilters();
 
         if($filters->has('order_by')){
             $query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
         }
 
-        return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
+        if(!empty($param)){
+            return $filters->has('per_page') ? $query->paginate($filters->get('per_page'), ['*'], 'page', $param['page']) : $query->get(); //page data from query parameters e.g ?page=1
+        }
+        else{
+            return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
+        }
 
     }
 
diff --git a/app/Classes/General/Eloquent/Filters/JobId.php b/app/Classes/General/Eloquent/Filters/JobId.php
new file mode 100644
index 00000000..42ac51a4
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/JobId.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class JobId implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('job_id', $value);
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/OrderByIdDesc.php b/app/Classes/General/Eloquent/Filters/OrderByIdDesc.php
new file mode 100644
index 00000000..547ec9bd
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/OrderByIdDesc.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OrderByIdDesc implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->orderBy('id', 'desc');
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/RequestSignature.php b/app/Classes/General/Eloquent/Filters/RequestSignature.php
new file mode 100644
index 00000000..67dde0a3
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/RequestSignature.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class RequestSignature implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('request_signature', $value);
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/ResultNotNull.php b/app/Classes/General/Eloquent/Filters/ResultNotNull.php
new file mode 100644
index 00000000..3f6a0341
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ResultNotNull.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class ResultNotNull implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereNotNull('result');
+    }
+}
diff --git a/app/Classes/General/Helper.php b/app/Classes/General/Helper.php
index ac89540b..45c72f53 100644
--- a/app/Classes/General/Helper.php
+++ b/app/Classes/General/Helper.php
@@ -2,6 +2,7 @@
 
 namespace App\Classes\General;
 
+use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\Log;
 
 use Illuminate\Support\Str;
@@ -42,4 +43,27 @@ class Helper
             }
         }
     }
+
+    /**
+     * @param null|string $param
+     * @return array
+     */
+    static function deserializeFilters($param): array {
+        if(gettype($param) == "array"){
+            $json = implode(',', $param);
+        }
+        else{
+            $json = $param;
+        }
+        return $json !== null ? collect(json_decode($json))->toArray() : [];
+    }
+
+    /**
+     * @param ResourceCollection $collection
+     * @return array
+     */
+    static function collectionResponse(ResourceCollection $collection){
+        return json_decode($collection->response()->getContent(), true);
+    }
+
 }
diff --git a/app/Classes/Jobs/ListBookingsJob.php b/app/Classes/Jobs/ListBookingsJob.php
new file mode 100644
index 00000000..b021b71d
--- /dev/null
+++ b/app/Classes/Jobs/ListBookingsJob.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\Bookings\Processors\ListBookingsJobProcessor;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\JobResult;
+use Illuminate\Support\Facades\Log;
+
+class ListBookingsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 900;
+
+    /** @var ListGenericJobObject */
+    private $listGenericJobObject;
+
+    private $jobId;
+
+    /**
+     * ListBookingsJob constructor.
+     * @param ListGenericJobObject $listGenericJobObject
+     */
+    public function __construct(ListGenericJobObject $listGenericJobObject)
+    {
+        $this->listGenericJobObject = $listGenericJobObject;
+    }
+
+    public function handle()
+    {
+        $rawPayload = $this->job->payload();
+        if(isset($rawPayload['data']['commandName'])){
+            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
+        }
+
+        if(isset($rawPayload['data']['command'])){
+            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
+        }
+
+        $result = (App()->make(ListBookingsJobProcessor::class))->execute($this->listGenericJobObject);
+    }
+
+    public function getJobId(){
+        return $this->job->getJobId();
+    }
+}
diff --git a/app/Classes/Jobs/ListDocumentsJob.php b/app/Classes/Jobs/ListDocumentsJob.php
new file mode 100644
index 00000000..6e93062b
--- /dev/null
+++ b/app/Classes/Jobs/ListDocumentsJob.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\Documents\Processors\ListDocumentsJobProcessor;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\JobResult;
+use Illuminate\Support\Facades\Log;
+
+class ListDocumentsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 900;
+
+    /** @var ListGenericJobObject */
+    private $listGenericJobObject;
+
+    private $jobId;
+
+    /**
+     * ListDocumentsJob constructor.
+     * @param ListGenericJobObject $listGenericJobObject
+     */
+    public function __construct(ListGenericJobObject $listGenericJobObject)
+    {
+        $this->listGenericJobObject = $listGenericJobObject;
+    }
+
+    public function handle()
+    {
+        $rawPayload = $this->job->payload();
+        if(isset($rawPayload['data']['commandName'])){
+            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
+        }
+
+        if(isset($rawPayload['data']['command'])){
+            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
+        }
+
+        $result = (App()->make(ListDocumentsJobProcessor::class))->execute($this->listGenericJobObject);
+
+        //cief todo: Insert into DB: job id, query result, timestamp
+        // Store the result in the job_results table
+
+        //cief todo: why cannot save data in table like this
+        // $model = new JobResult();
+        // $model->job_id = $this->job->getJobId();
+        // $model->result = json_encode($result);
+        // $model->save();
+
+        // Log::error(json_encode($model->id));
+    }
+
+    public function getJobId(){
+        return $this->job->getJobId();
+    }
+}
diff --git a/app/Classes/Jobs/ListTransactionsJob.php b/app/Classes/Jobs/ListTransactionsJob.php
new file mode 100644
index 00000000..a2b28656
--- /dev/null
+++ b/app/Classes/Jobs/ListTransactionsJob.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\Transactions\Processors\ListTransactionsJobProcessor;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\JobResult;
+use Illuminate\Support\Facades\Log;
+
+class ListTransactionsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 900;
+
+    /** @var ListGenericJobObject */
+    private $listGenericJobObject;
+
+    private $jobId;
+
+    /**
+     * ListTransactionsJob constructor.
+     * @param ListGenericJobObject $listGenericJobObject
+     */
+    public function __construct(ListGenericJobObject $listGenericJobObject)
+    {
+        $this->listGenericJobObject = $listGenericJobObject;
+    }
+
+    public function handle()
+    {
+        $rawPayload = $this->job->payload();
+        if(isset($rawPayload['data']['commandName'])){
+            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
+        }
+
+        if(isset($rawPayload['data']['command'])){
+            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
+        }
+
+        $result = (App()->make(ListTransactionsJobProcessor::class))->execute($this->listGenericJobObject);
+    }
+
+    public function getJobId(){
+        return $this->job->getJobId();
+    }
+}
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
new file mode 100644
index 00000000..ef3570f7
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
@@ -0,0 +1,75 @@
+<?php
+
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Jobs\ListBookingsJob;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use App\Classes\Modules\Jobs\Services\CreatesJobResult;
+
+
+class ListBookingJobLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'List Booking Job',
+            'message' => 'You have successfully submit a job to list bookings'
+        ];
+    }
+
+    /** @var CreatesJobResult */
+    private $createsJobResult;
+
+    /**
+     * ListPackingListsJobLogic constructor.
+     * @param CreatesJobResult $createsJobResult
+     */
+    public function __construct(CreatesJobResult $createsJobResult)
+    {
+        $this->createsJobResult = $createsJobResult;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $jobId = uniqid();
+
+        $user = Auth::user();
+        $userInfo = (object) [
+            'type' => $user->type,
+        ];
+
+        $userInfoJson = json_encode($userInfo);
+        $requestSignature = md5($userInfoJson . $request->fullUrl());
+
+        $listGenericJobObject = new ListGenericJobObject(
+            $request->fullUrl(),
+            $request->all(),
+            $requestSignature,
+            null,
+            $jobId,
+            $userInfo
+        );
+
+        ListBookingsJob::dispatch($listGenericJobObject);
+
+        $result = [];
+        $result['job_id'] = $jobId;
+
+        $this->createsJobResult->execute($listGenericJobObject);
+
+        return $this->response(['data' => $result]);
+    }
+
+}
diff --git a/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
new file mode 100644
index 00000000..2a09eb12
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Processors;
+
+use App\Classes\Modules\Bookings\Services\ListsBookings;
+use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
+use App\Classes\General\Helper;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use App\Http\Resources\ListBookingJobResource;
+
+class ListBookingsJobProcessor
+{
+
+    /** @var ListsBookings */
+    private $listsBookings;
+
+    /** @var UpdateJobResultProcessor */
+    private $updateJobResultProcessor;
+
+    /**
+     * ListBookingsJobProcessor constructor.
+     * @param ListsBookings $listsBookings
+     * @param UpdateJobResultProcessor $updateJobResultProcessor
+     */
+    public function __construct(ListsBookings $listsBookings, UpdateJobResultProcessor $updateJobResultProcessor)
+    {
+        $this->listsBookings = $listsBookings;
+        $this->updateJobResultProcessor = $updateJobResultProcessor;
+    }
+
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject) {
+
+        $query = $this->listsBookings->execute($this->listsBookings->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
+        foreach ($query->items() as &$item) {
+            $item['userInfo'] = $listGenericJobObject->getUserInfo();
+        }
+        $resultCurrent = Helper::collectionResponse(ListBookingJobResource::collection($query));
+        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
+    }
+}
diff --git a/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
new file mode 100644
index 00000000..5e895ad8
--- /dev/null
+++ b/app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Classes\Modules\Documents\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Jobs\Services\CreatesJobResult;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use App\Classes\Jobs\ListDocumentsJob;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class ListDocumentJobLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'List Document Job',
+            'message' => 'You have successfully submit a job to list documents'
+        ];
+    }
+
+    /** @var CreatesJobResult */
+    private $createsJobResult;
+
+    /**
+     * ListDocumentJobLogic constructor.
+     * @param CreatesJobResult $createsJobResult
+     */
+    public function __construct(CreatesJobResult $createsJobResult)
+    {
+        $this->createsJobResult = $createsJobResult;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $jobId = uniqid();
+
+        $user = Auth::user();
+        $userInfo = (object) [
+            'email' => $user->email,
+            'type' => $user->type,
+        ];
+
+        $userInfoJson = json_encode($userInfo);
+        $requestSignature = md5($userInfoJson . $request->fullUrl());
+
+        $listGenericJobObject = new ListGenericJobObject(
+            $request->fullUrl(),
+            $request->all(),
+            $requestSignature,
+            null,
+            $jobId,
+            $userInfo
+        );
+
+        ListDocumentsJob::dispatch($listGenericJobObject);
+
+        $result = [];
+        $result['job_id'] = $jobId;
+
+        $this->createsJobResult->execute($listGenericJobObject);
+
+        return $this->response(['data' => $result]);
+    }
+}
diff --git a/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
new file mode 100644
index 00000000..70777f0c
--- /dev/null
+++ b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Processors;
+
+use App\Classes\Modules\Documents\Services\ListsDocuments;
+use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
+use App\Classes\General\Helper;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use App\Http\Resources\ListDocumentJobResource;
+
+class ListDocumentsJobProcessor
+{
+
+    /** @var ListsDocuments */
+    private $listsDocuments;
+
+    /** @var UpdateJobResultProcessor */
+    private $updateJobResultProcessor;
+
+    /**
+     * ListDocumentsJobProcessor constructor.
+     * @param ListsDocuments $listsDocuments
+     * @param UpdateJobResultProcessor $updateJobResultProcessor
+     */
+    public function __construct(ListsDocuments $listsDocuments, UpdateJobResultProcessor $updateJobResultProcessor)
+    {
+        $this->listsDocuments = $listsDocuments;
+        $this->updateJobResultProcessor = $updateJobResultProcessor;
+    }
+
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject) {
+
+        $query = $this->listsDocuments->execute($this->listsDocuments->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
+        foreach ($query->items() as &$item) {
+            $item['userInfo'] = $listGenericJobObject->getUserInfo();
+        }
+        $resultCurrent = Helper::collectionResponse(ListDocumentJobResource::collection($query));
+        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
+    }
+}
+
diff --git a/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php b/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
new file mode 100644
index 00000000..c4b72cf0
--- /dev/null
+++ b/app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Jobs\Processors\FetchesJobResultProcessor;
+use App\Http\Resources\JobResultResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchJobResultLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Data',
+            'message' => 'You have successfully retrieved data'
+        ];
+    }
+
+    /** @var FetchesJobResultProcessor */
+    private $fetchesJobResultProcessor;
+
+    /**
+     * FetchJobResultLogic constructor.
+     * @param FetchesJobResultProcessor $fetchesJobResultProcessor
+     */
+    public function __construct(FetchesJobResultProcessor $fetchesJobResultProcessor)
+    {
+        $this->fetchesJobResultProcessor = $fetchesJobResultProcessor;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->fetchesJobResultProcessor->execute($request);
+        return $this->resourceResponse(new JobResultResource($query));
+    }
+
+}
diff --git a/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php b/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
new file mode 100644
index 00000000..953d77d7
--- /dev/null
+++ b/app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ListGenericJobObject implements DataTransferObject
+{
+    /** @var string */
+    private $name;
+
+    /** @var array */
+    private $payload;
+
+    /** @var string */
+    private $jobId;
+
+    /** @var string */
+    private $requestSignature;
+
+    /** @var string */
+    private $resultSignature;
+
+    /** @var object */
+    private $userInfo;
+
+    /** @var string */
+    private $jobCommandName;
+
+    /** @var string */
+    private $jobCommand;
+
+    public function __construct(string $name, array $payload, string $requestSignature, ?string $resultSignature, string $jobId, object $userInfo = null)
+    {
+        $this->name = $name;
+        $this->payload = $payload;
+        $this->jobId = $jobId;
+        $this->requestSignature = $requestSignature;
+        $this->resultSignature = $resultSignature;
+        $this->userInfo = $userInfo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return array
+     */
+    public function getPayload(): array
+    {
+        return $this->payload;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobId(): string
+    {
+        return $this->jobId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRequestSignature(): string
+    {
+        return $this->requestSignature;
+    }
+
+    /**
+     * @return string
+     */
+    public function getResultSignature(): ?string
+    {
+        return $this->resultSignature;
+    }
+
+    /**
+     * @return object
+     */
+    public function getUserInfo(): object
+    {
+        return $this->userInfo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommandName(): string
+    {
+        return $this->jobCommandName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommand(): string
+    {
+        return $this->jobCommand;
+    }
+
+
+    public function setJobCommandName(string $jobCommandName)
+    {
+        $this->jobCommandName = $jobCommandName;
+    }
+
+    public function setJobCommand(string $jobCommand)
+    {
+        $this->jobCommand = $jobCommand;
+    }
+
+}
diff --git a/app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php b/app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php
new file mode 100644
index 00000000..636c56b0
--- /dev/null
+++ b/app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class UpdateJobResultObject implements DataTransferObject
+{
+    /** @var string */
+    private $result;
+
+    /** @var string */
+    private $resultSignature;
+
+    /** @var string */
+    private $jobCommandName;
+
+    /** @var string */
+    private $jobCommand;
+
+    public function __construct(string $result, string $resultSignature, string $jobCommandName, string $jobCommand)
+    {
+        $this->result = $result;
+        $this->resultSignature = $resultSignature;
+        $this->jobCommandName = $jobCommandName;
+        $this->jobCommand = $jobCommand;
+    }
+
+    /**
+     * @return string
+     */
+    public function getResult(): string
+    {
+        return $this->result;
+    }
+
+    /**
+     * @return array
+     */
+    public function getResultSignature(): string
+    {
+        return $this->resultSignature;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommandName(): string
+    {
+        return $this->jobCommandName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJobCommand(): string
+    {
+        return $this->jobCommand;
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php b/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
new file mode 100644
index 00000000..89783fe8
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Processors;
+
+use App\Classes\Exceptions\JobResourceNotFoundException;
+use App\Classes\Modules\Jobs\Services\FetchesJobResult;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class FetchesJobResultProcessor
+{
+    /** @var FetchesJobResult */
+    private $fetchesJobResult;
+
+
+    /**
+     * FetchesJobResultProcessor constructor.
+     * @param FetchesJobResult $fetchesJobResult
+     */
+    public function __construct(FetchesJobResult $fetchesJobResult)
+    {
+        $this->fetchesJobResult = $fetchesJobResult;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
+     * @throws \App\Classes\Exceptions\ResourceNotFoundException
+     */
+    public function execute(Request $request){
+
+        $res1 = $this->fetchesJobResult->execute(['job_id' => $request->route('job_id')]);
+        if($request->route('is_last')){
+            $res2 = $this->fetchesJobResult->execute(['request_signature' => $res1->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
+            return $res2;
+        }
+
+        if(!$res1->result){
+            throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
+        }
+
+        return $res1;
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php b/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
new file mode 100644
index 00000000..0106417d
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Processors;
+
+
+use App\Classes\Modules\Jobs\Services\UpdatesJobResult;
+use App\Classes\Modules\Jobs\Services\FetchesJobResult;
+use App\Classes\Exceptions\JobResourceNotFoundException;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
+
+class UpdateJobResultProcessor
+{
+
+    /** @var FetchesJobResult */
+    private $fetchesJobResult;
+
+    /** @var UpdatesJobResult */
+    private $updatesJobResult;
+
+    /**
+     * UpdateJobResultProcessor constructor.
+     * @param FetchesJobResult $fetchesJobResult
+     * @param UpdatesJobResult $updatesJobResult
+     */
+    public function __construct(FetchesJobResult $fetchesJobResult, UpdatesJobResult $updatesJobResult)
+    {
+        $this->fetchesJobResult = $fetchesJobResult;
+        $this->updatesJobResult = $updatesJobResult;
+    }
+
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @param array $resultCurrent
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject, $resultCurrent) {
+        $jobResultCurrent = $this->fetchesJobResult->execute(['job_id' => $listGenericJobObject->getJobId()]);
+        $resultCurrentJson = json_encode($resultCurrent);
+        $resultSignatureCurrent = md5($resultCurrentJson);
+
+        try{
+            $jobResultExisting = $this->fetchesJobResult->execute(['request_signature' => $jobResultCurrent->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
+            $resultSignatureExisting = $jobResultExisting->result_signature;
+            //if($resultSignatureExisting != $resultSignatureCurrent){
+                $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
+            //}
+        } catch (JobResourceNotFoundException $exception){
+            $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
+        }
+    }
+
+    private function updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobCommandName, $jobCommand){
+        $updateJobResultObject = new UpdateJobResultObject(
+            $resultCurrentJson,
+            $resultSignatureCurrent,
+            $jobCommandName,
+            $jobCommand
+        );
+        $create = $this->updatesJobResult->execute($jobResultCurrent, $updateJobResultObject);
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Services/CreatesJobResult.php b/app/Classes/Modules/Jobs/Services/CreatesJobResult.php
new file mode 100644
index 00000000..e70e0e6a
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Services/CreatesJobResult.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\JobResult;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+
+class CreatesJobResult extends AbstractUpdateRecord
+{
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject)
+    {
+        $model = new JobResult();
+        $model->job_id = $listGenericJobObject->getJobId();
+        $model->request_signature = $listGenericJobObject->getRequestSignature();
+        $model->result_signature = $listGenericJobObject->getResultSignature();
+        $model->url = $listGenericJobObject->getName();
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Services/FetchesJobResult.php b/app/Classes/Modules/Jobs/Services/FetchesJobResult.php
new file mode 100644
index 00000000..1cc99cb6
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Services/FetchesJobResult.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\JobResult;
+
+class FetchesJobResult extends AbstractFetchRecord
+{
+
+    /** @var JobResult */
+    private $repository;
+
+    /**
+     * FetchesJobResult constructor.
+     * @param JobResult $repository
+     */
+    public function __construct(JobResult $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Services/ListsJobResult.php b/app/Classes/Modules/Jobs/Services/ListsJobResult.php
new file mode 100644
index 00000000..55f3b267
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Services/ListsJobResult.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\JobResult;
+
+class ListsJobResult extends AbstractListRecord
+{
+
+    /** @var JobResult */
+    private $repository;
+
+    /**
+     * ListsJobResult constructor.
+     * @param JobResult $repository
+     */
+    public function __construct(JobResult $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Jobs/Services/UpdatesJobResult.php b/app/Classes/Modules/Jobs/Services/UpdatesJobResult.php
new file mode 100644
index 00000000..ab3d9385
--- /dev/null
+++ b/app/Classes/Modules/Jobs/Services/UpdatesJobResult.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Jobs\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
+use App\Models\JobResult;
+
+class UpdatesJobResult extends AbstractUpdateRecord
+{
+
+    /**
+     * @param JobResult $model
+     * @param UpdateJobResultObject $updateJobResultObject
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(JobResult $model, UpdateJobResultObject $updateJobResultObject) {
+
+        $model->result = $updateJobResultObject->getResult();
+        $model->result_signature = $updateJobResultObject->getResultSignature();
+        $model->job_command_name = $updateJobResultObject->getJobCommandName();
+        $model->job_command = $updateJobResultObject->getJobCommand();
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
new file mode 100644
index 00000000..654a360f
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
@@ -0,0 +1,74 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Jobs\ListTransactionsJob;
+use App\Classes\Modules\Jobs\Services\CreatesJobResult;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class ListTransactionsJobLogic extends AbstractControllerLogic
+{
+  /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'List Transaction Job',
+            'message' => 'You have successfully submit a job to list transactions'
+        ];
+    }
+
+    /** @var CreatesJobResult */
+    private $createsJobResult;
+
+    /**
+     * ListTransactionsJobLogic constructor.
+     * @param CreatesJobResult $createsJobResult
+     */
+    public function __construct(CreatesJobResult $createsJobResult)
+    {
+        $this->createsJobResult = $createsJobResult;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $jobId = uniqid();
+
+        $user = Auth::user();
+        $userInfo = (object) [
+            'type' => $user->type,
+        ];
+
+        $userInfoJson = json_encode($userInfo);
+        $requestSignature = md5($userInfoJson . $request->fullUrl());
+
+        $listGenericJobObject = new ListGenericJobObject(
+            $request->fullUrl(),
+            $request->all(),
+            $requestSignature,
+            null,
+            $jobId,
+            $userInfo
+        );
+
+        ListTransactionsJob::dispatch($listGenericJobObject);
+
+        $result = [];
+        $result['job_id'] = $jobId;
+
+        $this->createsJobResult->execute($listGenericJobObject);
+
+        return $this->response(['data' => $result]);
+    }
+
+}
diff --git a/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
new file mode 100644
index 00000000..475d4715
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
+use App\Classes\General\Helper;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
+use App\Http\Resources\ListTransactionJobResource;
+
+class ListTransactionsJobProcessor
+{
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    /** @var UpdateJobResultProcessor */
+    private $updateJobResultProcessor;
+
+    /**
+     * ListTransactionsJobProcessor constructor.
+     * @param ListsTransactions $listsTransactions
+     * @param UpdateJobResultProcessor $updateJobResultProcessor
+     */
+    public function __construct(ListsTransactions $listsTransactions, UpdateJobResultProcessor $updateJobResultProcessor)
+    {
+        $this->listsTransactions = $listsTransactions;
+        $this->updateJobResultProcessor = $updateJobResultProcessor;
+    }
+
+    /**
+     * @param ListGenericJobObject $listGenericJobObject
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
+     */
+    public function execute(ListGenericJobObject $listGenericJobObject) {
+
+        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
+
+        $resultCurrent = Helper::collectionResponse(ListTransactionJobResource::collection($query));
+        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
+    }
+}
+
diff --git a/app/Http/Controllers/Bookings/ListBookingsJobController.php b/app/Http/Controllers/Bookings/ListBookingsJobController.php
new file mode 100644
index 00000000..9b32fc77
--- /dev/null
+++ b/app/Http/Controllers/Bookings/ListBookingsJobController.php
@@ -0,0 +1,22 @@
+<?php
+
+
+namespace App\Http\Controllers\Bookings;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Bookings\ControllersLogic\ListBookingJobLogic;
+
+
+class ListBookingsJobController
+{
+    /**
+     * @param Request $request
+     * @param ListBookingJobLogic $logic
+     * @return JsonResponse
+     */
+
+    public function list(Request $request, ListBookingJobLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Documents/ListDocumentsJobController.php b/app/Http/Controllers/Documents/ListDocumentsJobController.php
new file mode 100644
index 00000000..8b763085
--- /dev/null
+++ b/app/Http/Controllers/Documents/ListDocumentsJobController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Documents;
+
+use App\Classes\Modules\Documents\ControllersLogic\ListDocumentJobLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListDocumentsJobController
+{
+    /**
+     * @param Request $request
+     * @param ListDocumentJobLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListDocumentJobLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Jobs/FetchJobResultController.php b/app/Http/Controllers/Jobs/FetchJobResultController.php
new file mode 100644
index 00000000..cfef2f5c
--- /dev/null
+++ b/app/Http/Controllers/Jobs/FetchJobResultController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Jobs;
+
+use App\Classes\Modules\Jobs\ControllersLogic\FetchJobResultLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchJobResultController
+{
+    /**
+     * @param Request $request
+     * @param FetchJobResultLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchJobResultLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Transactions/ListTransactionsJobController.php b/app/Http/Controllers/Transactions/ListTransactionsJobController.php
new file mode 100644
index 00000000..fb341d5d
--- /dev/null
+++ b/app/Http/Controllers/Transactions/ListTransactionsJobController.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\ListTransactionsJobLogic;
+
+
+class ListTransactionsJobController
+{
+    /**
+     * @param Request $request
+     * @param ListTransactionsJobLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListTransactionsJobLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index f3a7881d..70fbc95c 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -11,11 +11,9 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Log;
 
 class BookingResource extends JsonResource
 {
-
     /**
      * Transform the resource into an array.
      *
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index 85ecee16..eff2bd1b 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -15,7 +15,6 @@ use App\Models\SegmentConstant;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
 
 class CompanyResource extends JsonResource
 {
diff --git a/app/Http/Resources/DocumentResource.php b/app/Http/Resources/DocumentResource.php
index 59933a67..c0f801bb 100644
--- a/app/Http/Resources/DocumentResource.php
+++ b/app/Http/Resources/DocumentResource.php
@@ -3,10 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Models\Booking;
-use App\Models\Company;
-use App\Models\Document;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class DocumentResource extends JsonResource
diff --git a/app/Http/Resources/JobResultResource.php b/app/Http/Resources/JobResultResource.php
new file mode 100644
index 00000000..51bc1898
--- /dev/null
+++ b/app/Http/Resources/JobResultResource.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class JobResultResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'job_id' => $this->job_id,
+            'result' => $this->result,
+        ];
+    }
+}
diff --git a/app/Http/Resources/ListBookingJobResource.php b/app/Http/Resources/ListBookingJobResource.php
new file mode 100644
index 00000000..06f8c38d
--- /dev/null
+++ b/app/Http/Resources/ListBookingJobResource.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\Modules\Bookings\Services\CalculatesBookingFloatingAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ListBookingJobResource extends JsonResource
+{
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo ?? ($resource->userInfo ?? null);
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'company' => new CompanyResource($this->company, $this->userInfo),
+            'bank' => new BankResource($this->bank),
+            'service' => new ServiceTypeResource($this->service),
+            'marking' => $this->marking,
+            'amount' => $this->fix_amount,
+            'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'fixed_currency' => new CurrencyResource($this->fixedCurrency),
+            'convertible_currency' => new CurrencyResource($this->convertibleCurrency),
+            'conversion_currency' => new CurrencyResource($this->conversionCurrency),
+            'documents' => [
+                'purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()),
+                'delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
+                'invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
+                'supplier_delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
+                'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
+                'ecommerce_purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first()),
+            ],
+            'status' => $this->status,
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
+            'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
+            $this->mergeWhen($this->relationLoaded('transactions'), [
+                'purchase_order' => new TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()),
+                'payment_attempts' => TransactionResource::collection(
+                    $this->transactions()
+                        ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
+                        ->whereDate('expires_on', '>=', Carbon::now())
+                        ->get()
+                ),
+                'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
+                'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
+                    $query->where(function($query){
+                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
+                    })->orWhere(function($query){
+                        $query->where(function($query){
+                            $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION,  ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
+                        })->orWhere(function($query){
+                            $query->where('type', TransactionType::CREDIT_NOTE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                        });
+                    });
+                })->latest()->get())
+            ])
+        ];
+    }
+}
diff --git a/app/Http/Resources/ListDocumentJobResource.php b/app/Http/Resources/ListDocumentJobResource.php
new file mode 100644
index 00000000..edf549ef
--- /dev/null
+++ b/app/Http/Resources/ListDocumentJobResource.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\Booking;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Http\Resources\V2\BookingV2Resource;
+use App\Http\Resources\V2\CompanyV2Resource;
+
+class ListDocumentJobResource 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,
+            'status' => (int) $this->status,
+            'document_type' => $this->document_type,
+            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingV2Resource($this->owner, $this->userInfo) : new CompanyV2Resource($this->owner, $this->userInfo)) : null,
+            'files' => FileResource::collection($this->files),
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
+        ];
+    }
+}
diff --git a/app/Http/Resources/ListTransactionJobResource.php b/app/Http/Resources/ListTransactionJobResource.php
new file mode 100644
index 00000000..6c4c0ece
--- /dev/null
+++ b/app/Http/Resources/ListTransactionJobResource.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ListTransactionJobResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+
+        $booking = in_array((int)$this->type, [TransactionType::BILL, TransactionType::REFUND])? $this->owner->owner : $this->owner;
+        $days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
+
+        return [
+            'id' => $this->id,
+            'booking' => new BookingResource($booking),
+            'type' => (int) $this->type,
+            'bill_no' => $this->bill_no,
+            'payment_reference' => $this->payment_reference,
+            'payment_method' => (float) $this->payment_method,
+            'recipient_bank_account' => new BankResource($booking->bank),
+            'issuer_name' => $this->issuerCompany->name,
+            'issuer_id' => $this->issuerCompany->id,
+            'amount' => (double) $this->amount,
+            'original_amount' => (double) $this->original_amount,
+            'currency' => new CurrencyResource($this->currency),
+            'original_currency' => new CurrencyResource($this->original_currency),
+            'service_charge' => (double) $this->service_charge,
+            'tax' => (double) $this->tax,
+            'currency_rate' => (double) $this->currency_rate,
+            'status' => (int) $this->status,
+            'details' => TransactionDetailResource::collection($this->transactionDetails),
+            'documents' => new DocumentResource($this->documents()->first()),
+            'transaction_bill' => new TransactionResource($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->bills()->first())),
+            'transaction_refunds' => TransactionResource::collection($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->refunds()->get())),
+            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
+            'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
+            'interval' => [
+                'value' => $days->gt(Carbon::now()) ? '+' : '-',
+                'duration' => $days->diff(Carbon::now())->format('%d'),
+            ],
+            'redemption' => new VoucherRedemptionResource($this->voucherRedemption)
+        ];
+    }
+}
diff --git a/app/Http/Resources/V2/BookingV2Resource.php b/app/Http/Resources/V2/BookingV2Resource.php
new file mode 100644
index 00000000..ee17181e
--- /dev/null
+++ b/app/Http/Resources/V2/BookingV2Resource.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Resources\V2;
+
+use App\Classes\Modules\Bookings\Services\CalculatesBookingFloatingAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Http\Resources as V1;
+
+class BookingV2Resource extends JsonResource
+{
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo ?? ($resource->userInfo ?? null);
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'company' => new CompanyV2Resource($this->company, $this->userInfo),
+            'bank' => new V1\BankResource($this->bank),
+            'service' => new V1\ServiceTypeResource($this->service),
+            'marking' => $this->marking,
+            'amount' => $this->fix_amount,
+            'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'fixed_currency' => new V1\CurrencyResource($this->fixedCurrency),
+            'convertible_currency' => new V1\CurrencyResource($this->convertibleCurrency),
+            'conversion_currency' => new V1\CurrencyResource($this->conversionCurrency),
+            'documents' => [
+                'purchase_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()),
+                'delivery_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
+                'invoice' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
+                'supplier_delivery_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
+                'proforma_invoice' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
+                'ecommerce_purchase_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first()),
+            ],
+            'status' => $this->status,
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
+            'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
+            $this->mergeWhen($this->relationLoaded('transactions'), [
+                'purchase_order' => new V1\TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()),
+                'payment_attempts' => V1\TransactionResource::collection(
+                    $this->transactions()
+                        ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
+                        ->whereDate('expires_on', '>=', Carbon::now())
+                        ->get()
+                ),
+                'expired_payment_attempts' => V1\TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
+                'payment_history' => V1\TransactionResource::collection($this->transactions()->where(function($query){
+                    $query->where(function($query){
+                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
+                    })->orWhere(function($query){
+                        $query->where(function($query){
+                            $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION,  ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
+                        })->orWhere(function($query){
+                            $query->where('type', TransactionType::CREDIT_NOTE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                        });
+                    });
+                })->latest()->get())
+            ])
+        ];
+    }
+}
diff --git a/app/Http/Resources/V2/CompanyV2Resource.php b/app/Http/Resources/V2/CompanyV2Resource.php
new file mode 100644
index 00000000..64fca7c7
--- /dev/null
+++ b/app/Http/Resources/V2/CompanyV2Resource.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Http\Resources\V2;
+
+use App\Classes\Modules\Companies\Services\FetchesCompanyServices;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BankAccountType;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Currency;
+use App\Models\SegmentConstant;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Auth;
+use App\Http\Resources as V1;
+
+
+class CompanyV2Resource extends JsonResource
+{
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo;
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $lastPayment = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->first();
+        $totalPayments =  $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+
+        $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
+        $serviceCharge = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $this->id)->first();
+
+        $userResource = null;
+
+        $userInfoEmail = $this->userInfo && isset($this->userInfo->email) ? $this->userInfo->email : null;
+        $userInfoType = $this->userInfo && isset($this->userInfo->type) ? $this->userInfo->type : null;
+
+        if(!$userInfoEmail && Auth::user()){
+            $userInfoEmail = Auth::user()->email;
+        }
+        if(!$userInfoType && Auth::user()){
+            $userInfoType = Auth::user()->type;
+        }
+
+        if(!is_null($userInfoEmail) && !is_null($userInfoType)){
+            $userResource = new V1\UserResource($userInfoType === RoleTypes::USER ? $this->employees()->where('email', '=',  $userInfoEmail)->first() : $this->employees()->orderBy('id', 'DESC')->first());
+        }
+
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'reference' => $this->reference,
+            'debtor' => $this->debtor,
+            'type' => (int) $this->type,
+            'business_type' => (int) $this->business_type,
+            'status' => (int) $this->status,
+            'contact' => new V1\ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
+            'address' => new V1\AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())),
+            'employee' =>  $userResource,
+            'identification' => new V1\DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
+            'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
+            'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
+                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            })->count(),
+            'total_payments' => (float) $totalPayments,
+            'average_spending_per_day' => (float) $totalPayments / ($this->created_at->diff(Carbon::now())->days === 0 ? 1 : $this->created_at->diff(Carbon::now())->days),
+            'average_spending_per_booking' => (float) $totalPayments > 0 ? $totalPayments / $this->bookings()->whereHas('transactions', function ($query){
+                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                })->count() : $totalPayments,
+            'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
+            'personal_banks' => V1\BankResource::collection($this->banks->where('type', BankAccountType::PERSONAL)),
+            'recipient_banks' => [
+                'accounts' => V1\BankResource::collection($this->banks->where('type', BankAccountType::EXTERNAL)),
+                'default' => new V1\BankResource($this->banks->where('type', BankAccountType::EXTERNAL)->where('default', true)->first())
+            ],
+            'segments' => V1\SegmentResource::collection($this->segments),
+            'seasonalSegment' => $this->whenLoaded('seasonalSegments', V1\SeasonalSegmentResource::collection($this->seasonalSegments)),
+            'services' => (new FetchesCompanyServices())->getServices($this->servicesConfigurations()),
+            'wallet' => $this->whenLoaded('wallets', new V1\WalletResource($this->wallets()->with('transactions')->first()), new V1\WalletResource($this->wallets()->first())),
+            'created_at' => $this->created_at->format('d-m-Y'),
+            $this->mergeWhen($this->business_type === BusinessType::CURRENCY_VENDOR, [
+                'currencies' => $segment ? V1\CurrencyResource::collection(Currency::whereIn('id', $segment->detail->currencies)->get()) : [],
+                'service_charge' => $serviceCharge
+            ])
+
+        ];
+    }
+}
diff --git a/app/Models/JobResult.php b/app/Models/JobResult.php
new file mode 100644
index 00000000..f30b5076
--- /dev/null
+++ b/app/Models/JobResult.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+class JobResult extends AbstractModel
+{
+    protected $table = 'job_results';
+
+    public $fillable = [
+        'job_id',
+        'result'
+   ];
+}
diff --git a/database/migrations/2023_08_08_124848_create_job_results_table.php b/database/migrations/2023_08_08_124848_create_job_results_table.php
new file mode 100644
index 00000000..ef448407
--- /dev/null
+++ b/database/migrations/2023_08_08_124848_create_job_results_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateJobResultsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('job_results', function (Blueprint $table) {
+            $table->id();
+            $table->string('job_id', 50);
+            $table->longText('result')->nullable();
+            $table->timestamps();
+
+            // $table->foreign('job_id')->references('id')->on('jobs')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('job_results');
+    }
+}
diff --git a/database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php b/database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php
new file mode 100644
index 00000000..8e6b8342
--- /dev/null
+++ b/database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNewColumnToJobResultsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('job_results', function (Blueprint $table) {
+            $table->longText('url')->after('result')->nullable();
+            $table->string('job_command_name')->after('url')->nullable();
+            $table->longText('job_command')->after('job_command_name')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('job_results', function (Blueprint $table) {
+            $table->dropColumn('url');
+            $table->dropColumn('job_command_name');
+            $table->dropColumn('job_command');
+        });
+    }
+}
diff --git a/database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php b/database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php
new file mode 100644
index 00000000..12c6d57f
--- /dev/null
+++ b/database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNewColumn2ToJobResultsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('job_results', function (Blueprint $table) {
+            $table->string('request_signature')->after('job_id')->nullable();
+            $table->string('result_signature')->after('request_signature')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('job_results', function (Blueprint $table) {
+            $table->dropColumn('request_signature');
+            $table->dropColumn('result_signature');
+        });
+    }
+}
diff --git a/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
new file mode 100644
index 00000000..966ccbbc
--- /dev/null
+++ b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionComponent.vue
@@ -0,0 +1,136 @@
+<template>
+    <div class="row tabsContainer">
+        <div class="col">
+            <div class="row m-l-0 m-r-0 d-flex">
+                <div class="col">
+                    <div class="row justify-content-end">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="invoice" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path><path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path><path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path><path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Invoice</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchase-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Purchase Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Delivery Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="supplier-delivery-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Supplier Delivery Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row no-margin">
+                <div class="col bg-white padding-25">
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice" v-if="isActiveTab('invoice') || showTabContent('invoice')">
+                        <list-component key="2" section="invoiceSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order" v-if="isActiveTab('purchase-order') || showTabContent('purchase-order')">
+                        <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order" v-if="isActiveTab('delivery-order') || showTabContent('delivery-order')">
+                        <list-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order" v-if="isActiveTab('supplier-delivery-order') || showTabContent('supplier-delivery-order')">
+                        <list-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-component>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import tabHandler from '../../../general/mixins/tabHandler';
+    export default {
+        data() {
+            return {
+                activeTab: 'invoice',
+                displayedTabs: ['invoice'],
+            };
+        },
+        mixins: [tabHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue
new file mode 100644
index 00000000..47d14857
--- /dev/null
+++ b/resources/assets/vue/components/bookings/sections/AdminPaymentsBillingSectionPollingComponent.vue
@@ -0,0 +1,136 @@
+<template>
+    <div class="row tabsContainer">
+        <div class="col">
+            <div class="row m-l-0 m-r-0 d-flex">
+                <div class="col">
+                    <div class="row justify-content-end">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="invoice" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path><path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path><path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path><path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Invoice</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchase-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Purchase Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Delivery Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col b-r b-white">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="supplier-delivery-order" @click="setActiveTab($event)">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5 all-caps">Supplier Delivery Order</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row no-margin">
+                <div class="col bg-white padding-25">
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice" v-if="isActiveTab('invoice') || showTabContent('invoice')">
+                        <list-polling-component key="2" section="invoiceSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order" v-if="isActiveTab('purchase-order') || showTabContent('purchase-order')">
+                        <list-polling-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order" v-if="isActiveTab('delivery-order') || showTabContent('delivery-order')">
+                        <list-polling-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                    </div>
+                    <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order" v-if="isActiveTab('supplier-delivery-order') || showTabContent('supplier-delivery-order')">
+                        <list-polling-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list.job')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
+                            <template slot="list" slot-scope="{data}">
+                                <billing-document-component :data="data"></billing-document-component>
+                            </template>
+                        </list-polling-component>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import tabHandler from '../../../general/mixins/tabHandler';
+    export default {
+        data() {
+            return {
+                activeTab: 'invoice',
+                displayedTabs: ['invoice'],
+            };
+        },
+        mixins: [tabHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
index 7df9c125..d2b69080 100644
--- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -117,11 +117,17 @@
                             </div>
                             <div class="row">
                                 <div class="col">
+                                     <!-- CIEF TODO: For easy revert to old code -->
                                     <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
                                         <template slot="list" slot-scope="{data}">
                                             <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
                                         </template>
                                     </list-component>
+                                    <!-- <list-polling-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list.job')" :options="{per_page: 5, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
+                                        <template slot="list" slot-scope="{data}">
+                                            <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
+                                        </template>
+                                    </list-polling-component> -->
                                 </div>
                             </div>
                         </div>
@@ -165,7 +171,7 @@
             }
         },
         created(){
-            this.submit(route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]}), 'get', 'pendingOrdersSection', false, false)
+            this.submit(route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]}), 'get', 'pendingOrdersSection', false, false); //cief todo: Uncaught (in promise) null
         },
         methods: {
             successHandler(response){
@@ -210,4 +216,4 @@
 
 
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/vue/components/general/elements/ListPollingComponent.vue b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
new file mode 100644
index 00000000..fcd3b8b8
--- /dev/null
+++ b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
@@ -0,0 +1,213 @@
+<template>
+    <transition-component group enter-class="animate__animated animate__fadeInUp animate__delay-1 animate__faster p-r-30" leave-class="animate__animated animate__fadeOutDown animate__faster p-r-30" style="min-height: 300px;width:100%">
+        <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+        <div class="row" key="2" v-show="!$store.getters.isLoading(section)">
+            <div class="col">
+                <div class="row">
+                    <div class="col">
+                        <div class="row align-items-center justify-content-center p-t-50 p-b-50"  v-show="!$store.getters.getListData(section).length && !isLoading && emptyListSection">
+                            <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;">Nothing To Show Here</p>
+                                            </div>
+                                        </div>
+                                        <div class="row m-t-5 align-items-center justify-content-center">
+                                            <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>
+                        <div class="row" v-show="!isLoading">
+                            <div class="col">
+                                <div class="list disable-text-selection" data-check-all="checkAll">
+                                    <div class="row" ref="list" v-for="item in $store.getters.getListData(section)" v-bind:key="item.id" :data="item">
+                                        <div class="col">
+                                            <slot name="list" :data="item"></slot>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row" v-show="!isLoading">
+                            <div class="col">
+                                <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </transition-component>
+</template>
+
+<script>
+    import requestV2 from '../../../general/mixins/aws/requestV2'
+    export default {
+        props: {
+            section:{
+                type: String,
+                required: true
+            },
+            endpoint: {
+                type: String,
+                required: true
+            },
+            options: {
+                default () {
+                    return {}
+                }
+            },
+            emptyListSection: {
+                type: Boolean,
+                default: true,
+            }
+        },
+        data(){
+            return {
+                filters: this.options,
+                pollingInterval: null,
+                isPolling: false,
+                isFetchingResult: false,
+                isLoading: false,
+            }
+        },
+        created(){
+            this.setDecoratorDefault();
+            this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters}); //cief todo: Uncaught (in promise) null
+        },
+        computed: {
+            pendingList () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingList(inComplete){
+                if(inComplete){
+                    this.fetchList();
+                }
+            }
+        },
+        methods: {
+            fetchList(){
+                let listDecorators = this.$store.getters.getListDetails(this.section);
+                let url = this.endpoint + '?page=' + listDecorators.page + '&filters=' + JSON.stringify(listDecorators.filters);
+                this.isLoading = true;
+                this.submitJob(url);
+            },
+            //cief todo: remove?
+            // updateFilters(filters){
+            //     this.filters = filters;
+            //     this.setDecoratorDefault();
+            //     console.log('updateFilters');
+            //     this.submit(this.endpoint + '?page=1&filters=' + JSON.stringify(this.filters), 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
+            // },
+            successHandler(response){
+                let result = JSON.parse(response.payload.data.result);
+                result.meta = {
+                    current_page: result.meta.current_page,
+                    first_page_url: result.meta.first_page_url,
+                    from: result.meta.from,
+                    last_page: result.meta.last_page,
+                    last_page_url: result.meta.last_page_url,
+                    next_page_url: result.meta.next_page_url,
+                    path: result.meta.path,
+                    per_page: result.meta.per_page,
+                    prev_page_url: result.meta.prev_page_url,
+                    to: result.meta.to,
+                    total: result.meta.total
+                };
+
+                this.stopPolling();
+                this.$store.dispatch('completeList', {'name': this.section, 'data': result.data});
+                this.$refs.pagination.makePagination(result.meta, result.links);
+                this.isLoading = false;
+            },
+            errorHandler(error){
+                this.isFetchingResult = false;
+                this.isPolling = false;
+            },
+            startPolling(jobId, maxAttempts = 8) {
+                let attempts = 0;
+                let interval = 10000; // Initial interval
+
+                const resetPollingInterval = (customInterval) => {
+                    this.pollingInterval = setInterval(pollJobResult, customInterval);
+                };
+
+                const pollJobResult = () => {
+                    if (this.isPolling || this.isFetchingResult) {
+                        return;
+                    }
+                    this.isPolling = true;
+
+                    attempts++;
+                    if(attempts === 1){
+                        this.stopPolling();
+                        resetPollingInterval(5000);
+                    }
+
+                    if (attempts > maxAttempts) {
+                        this.stopPolling();
+                        this.isLoading = false;
+                        console.log(`Reached maximum attempts (${maxAttempts}). Polling stopped.`);
+                        return;
+                    }
+
+                    if(attempts === maxAttempts){
+                        this.fetchJobResult(jobId, true);
+                    }
+                    else{
+                        this.fetchJobResult(jobId);
+                    }
+                };
+
+                // pollJobResult();  // Initial call
+                this.pollingInterval = setInterval(pollJobResult, interval);
+            },
+            stopPolling() {
+                clearInterval(this.pollingInterval);
+                this.pollingInterval = null;
+                this.isPolling = false;
+                this.isFetchingResult = false;
+            },
+            submitJob(url){
+                try {
+                    this.$store.dispatch('crudRequest', {endpoint: url, method: 'get'}).then(response => {
+                        let success = response.ok;
+                        response.json().then(response => {
+                            if(!success){return;}
+                            let jobId = response.payload.data.job_id;
+                            if(jobId){
+                                this.startPolling(jobId);
+                            }
+                        });
+                    })
+                } catch (error) {
+                    console.error('Error submitJob', error);
+                }
+            },
+            fetchJobResult(jobId, isLastAttempt = false) {
+                this.isFetchingResult = true;
+                try {
+                    let anotherEndpoint = route('api.job.fetch', jobId);
+                    if(isLastAttempt){
+                        anotherEndpoint = route('api.job.fetch.last.attempt', jobId, isLastAttempt);
+                    }
+                    this.poll(anotherEndpoint, 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
+                } catch (error) {
+                    console.error('Error fetchJobResult', error);
+                }
+            }
+        },
+        mixins: [requestV2]
+    }
+</script>
diff --git a/resources/assets/vue/general/mixins/aws/requestV2.js b/resources/assets/vue/general/mixins/aws/requestV2.js
new file mode 100644
index 00000000..12b27542
--- /dev/null
+++ b/resources/assets/vue/general/mixins/aws/requestV2.js
@@ -0,0 +1,49 @@
+export default {
+    methods: {
+        poll(url, method, section, successNotification = true, errorNotification = true){
+            if(!this.validate()){ return; }
+            if (section) {
+                this.$store.dispatch('toggleLoading', {name: section, status: true})
+            }
+            this.$store.dispatch('crudRequestV2', {
+                endpoint: url,
+                method: method,
+                parameters: this.parameters
+            }).then(response => {
+                let statusCode = response.status,
+                    success = response.ok;
+
+                response.json().then(response => {
+
+                    if(!success){
+                        this.openModal();
+                        errorNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'error'}): null;
+                        this.errorHandler(response, statusCode); return;
+                    }
+
+                    successNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'success'}): null;
+                    this.successHandler(response)
+
+
+                });
+            }).catch((error) => {
+                this.$store.dispatch('createNotification', {title: 'Unexpected Error', message: 'An unexpected error has occurred. Try again!', type: 'error'});
+            }).then(() => {
+                if (section) {
+                    this.$store.dispatch('toggleLoading', {name: section, status: false})
+                }
+            })
+
+        },
+        validate() {
+            if(this.$v){
+                this.$v.$touch();
+                return !this.$v.$invalid;
+            }
+            return true;
+        },
+        successHandler(response){},
+        errorHandler(response){}
+    }
+
+}
diff --git a/resources/assets/vue/general/mixins/tabHandler.js b/resources/assets/vue/general/mixins/tabHandler.js
new file mode 100644
index 00000000..81790ed0
--- /dev/null
+++ b/resources/assets/vue/general/mixins/tabHandler.js
@@ -0,0 +1,24 @@
+export default {
+    data() {
+        return {
+            activeTab: null,
+            displayedTabs: [],
+        };
+    },
+    methods: {
+        setActiveTab(event) {
+            const tabName = event.currentTarget.getAttribute('tab-name');
+            // console.log(`Tab "${tabName}" clicked`);
+            this.activeTab = tabName;
+            if (!this.displayedTabs.includes(tabName)) {
+                this.displayedTabs.push(tabName);
+            }
+        },
+        isActiveTab(tabName) {
+            return this.activeTab === tabName;
+        },
+        showTabContent(tabName) {
+            return this.displayedTabs.includes(tabName);
+        },
+    },
+}
diff --git a/resources/assets/vue/vuex/modules/crudRequestV2.js b/resources/assets/vue/vuex/modules/crudRequestV2.js
new file mode 100644
index 00000000..355b1edb
--- /dev/null
+++ b/resources/assets/vue/vuex/modules/crudRequestV2.js
@@ -0,0 +1,51 @@
+export default {
+    actions: {
+        crudRequestV2({getters, dispatch},  {endpoint, method, parameters}){
+            return dispatch('ensureReCaptchaIsSet').then(function () {
+                const queryDomain = endpoint.split('?')[0];
+                let encodedParams = endpoint.split('?')[1];
+                let decodedParams = fullyDecodeURI(encodedParams);
+                const queryParams = encodeURIComponent(decodedParams);
+                encodedParams = queryParams.toString();
+                let filteredEncodedParams = encodedParams.replace(/%3D/g,'=');
+                filteredEncodedParams = filteredEncodedParams.replace(/%26/g,'&');
+                let combinedAbsoluteUrl = queryDomain;
+                if(filteredEncodedParams !== undefined && filteredEncodedParams !== 'undefined'){
+                    combinedAbsoluteUrl = queryDomain + '?' + filteredEncodedParams;
+                }
+
+                // return fetch(endpoint, {
+                return fetch(combinedAbsoluteUrl, {
+                    method: method,
+                    responseType: 'json',
+                    body: parameters ? JSON.stringify(parameters):null,
+                    headers: {
+                        'content-type': 'application/json',
+                        'Authorization': 'Bearer '+getters.getAccessToken,
+                        'captcha-token': getters.getReCaptcha
+                    }
+                }).then(response => {
+
+                    if(response.status === 401 && window.location.href !== route('login')){
+                        dispatch('userAuthentication', {access_token: '', redirect_url: '/'});
+                    }
+
+                    return response;
+
+                })
+            });
+        }
+    }
+}
+
+function isEncoded(uri) {
+    uri = uri || '';
+    return uri !== decodeURIComponent(uri);
+}
+
+function fullyDecodeURI(uri){
+    while (isEncoded(uri)){
+        uri = decodeURIComponent(uri);
+    }
+    return uri;
+}
diff --git a/resources/assets/vue/vuex/store.js b/resources/assets/vue/vuex/store.js
index 2c3d911b..ff10c673 100644
--- a/resources/assets/vue/vuex/store.js
+++ b/resources/assets/vue/vuex/store.js
@@ -4,6 +4,7 @@ import toggleSection from './modules/toggleSection'
 import toggleLoading from './modules/toggleLoading'
 import createNotification from './modules/createNotification'
 import crudRequest from './modules/crudRequest'
+import crudRequestV2 from './modules/crudRequestV2'
 import authentication from './modules/authentication'
 import loadRequestQueue from './modules/loadRequestQueue'
 
@@ -16,6 +17,7 @@ export default new Vuex.Store({
         loadRequestQueue,
         createNotification,
         crudRequest,
+        crudRequestV2,
         authentication
     }
-})
\ No newline at end of file
+})
diff --git a/resources/views/pages/billings.blade.php b/resources/views/pages/billings.blade.php
index 4bc012d5..da84f8b9 100644
--- a/resources/views/pages/billings.blade.php
+++ b/resources/views/pages/billings.blade.php
@@ -3,129 +3,7 @@
     <div class="row" v-if="$store.getters.isAdmin">
         <div class="col p-t-15 p-b-15">
             <billing-component></billing-component>
-
-            <div class="row tabsContainer">
-                <div class="col">
-                    <div class="row m-l-0 m-r-0 d-flex">
-                        <div class="col">
-                            <div class="row justify-content-end">
-                                <div class="col">
-                                    <div class="row">
-                                        <div class="col b-r b-white">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="invoice">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                    width="35" height="35"
-                                                                    viewBox="0 0 172 172"
-                                                                    style=" fill:#000000;"><defs><linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path><path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path><path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path><path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path></g></g></svg>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5 all-caps">Invoice</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col b-r b-white">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchase-order">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                    width="35" height="35"
-                                                                    viewBox="0 0 172 172"
-                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5 all-caps">Purchase Order</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col b-r b-white">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery-order">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                    width="35" height="35"
-                                                                    viewBox="0 0 172 172"
-                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5 all-caps">Delivery Order</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col b-r b-white">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="supplier-delivery-order">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                    width="35" height="35"
-                                                                    viewBox="0 0 172 172"
-                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5 all-caps">Supplier Delivery Order</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row no-margin">
-                        <div class="col bg-white padding-25">
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice">
-                                <list-component key="2" section="invoiceSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
-                                    <template slot="list" slot-scope="{data}">
-                                        <billing-document-component :data="data"></billing-document-component>
-                                    </template>
-                                </list-component>
-                            </div>
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order">
-                                <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
-                                    <template slot="list" slot-scope="{data}">
-                                        <billing-document-component :data="data"></billing-document-component>
-                                    </template>
-                                </list-component>
-                            </div>
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order">
-                                <list-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
-                                    <template slot="list" slot-scope="{data}">
-                                        <billing-document-component :data="data"></billing-document-component>
-                                    </template>
-                                </list-component>
-                            </div>
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order">
-                                <list-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
-                                    <template slot="list" slot-scope="{data}">
-                                        <billing-document-component :data="data"></billing-document-component>
-                                    </template>
-                                </list-component>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <admin-payments-billing-section-component></admin-payments-billing-section-component>
         </div>
     </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/pages/billings_experiment.blade.php b/resources/views/pages/billings_experiment.blade.php
new file mode 100644
index 00000000..d1caee2d
--- /dev/null
+++ b/resources/views/pages/billings_experiment.blade.php
@@ -0,0 +1,9 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row" v-if="$store.getters.isAdmin">
+        <div class="col p-t-15 p-b-15">
+            <billing-component></billing-component>
+            <admin-payments-billing-section-polling-component></admin-payments-billing-section-polling-component>
+        </div>
+    </div>
+@endsection
diff --git a/routes/api.php b/routes/api.php
index 8b4bada0..460bd772 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -67,6 +67,10 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         require __DIR__ . '/milestone.php';
 
+        // require __DIR__ . '/accounting.php'; //cief todo: To check if this is needed
+
+        require __DIR__ . '/job.php';
+
 //        require __DIR__ . '/rate.php';
 //        require __DIR__ . '/receipt.php';
 
diff --git a/routes/currency.php b/routes/currency.php
index b621aad6..ba55c9a2 100644
--- a/routes/currency.php
+++ b/routes/currency.php
@@ -1,4 +1,4 @@
-    <?php
+<?php
 
 use Illuminate\Support\Facades\Route;
 
diff --git a/routes/document.php b/routes/document.php
index c186032f..07a7d18a 100644
--- a/routes/document.php
+++ b/routes/document.php
@@ -4,9 +4,10 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'document', 'as' => 'document.', 'namespace' => 'Documents'], function () {
     Route::get('/list', 'ListDocumentsController@list')->name('list');
+    Route::get('/list/job', 'ListDocumentsJobController@list')->name('list.job');
     Route::delete('/{id}/delete', 'DeleteDocumentController@delete')->name('delete');
     Route::put('/{id}/approve', 'ApproveDocumentController@approve')->name('status.approve');
     Route::put('/{id}/reject', 'RejectDocumentController@reject')->name('status.reject');
 
     Route::put('/{id}/reference/update', 'UpdateDocumentReferenceController@update')->name('reference.update');
-});
\ No newline at end of file
+});
diff --git a/routes/job.php b/routes/job.php
new file mode 100644
index 00000000..028e9468
--- /dev/null
+++ b/routes/job.php
@@ -0,0 +1,8 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'job', 'as' => 'job.', 'namespace' => 'Jobs'], function () {
+    Route::get('/fetch/{job_id}', 'FetchJobResultController@fetch')->name('fetch');
+    Route::get('/fetch/{job_id}/{is_last}', 'FetchJobResultController@fetch')->name('fetch.last.attempt');
+});
diff --git a/routes/web.php b/routes/web.php
index bf2892bb..a6590c17 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -92,6 +92,12 @@ Route::get('/billings', function () {
     return view('pages.billings');
 })->name('billings');
 
+/* Vue Polling Experiment - Starts  */
+Route::get('/billings-experiment', function () {
+    return view('pages.billings_experiment');
+})->name('billings.experiment');
+/* Vue Polling Experiment - Ends  */
+
 Route::get('/currency_orders', function () {
     return view('pages.currency_orders');
 })->name('currency_orders');
@@ -830,13 +836,13 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
                     ->withTrashed()
                     ->orderBy('created_at', 'asc')
                     ->first();
-        
+
                 // get the first bill_no
                 $firstBillNo = $firstInvoice->bill_no;
                 if (strpos($firstBillNo, '-deleted') !== false) {
                     $firstBillNo = substr($firstBillNo, 0, strpos($firstBillNo, '-deleted'));
                 }
-        
+
                 // update currentInvoice bill_no to '-deleted-'
                 $currentInvoice = $booking->transactions()->where('type', TransactionType::INVOICE)->first();
                 $currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . Str::random(10);
@@ -859,4 +865,4 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
             }
         }
     );
-})->name('invoice.fix.byCustomerMarking');
\ No newline at end of file
+})->name('invoice.fix.byCustomerMarking');

From f08343439052ff23e122217e123cd3d314b5a7f6 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 16 Feb 2024 14:59:11 +0800
Subject: [PATCH 36/40] update refund ui and logic

---
 .../CreateBookingPaymentLogic.php             |  10 +-
 .../CreateBookingRefundLogic.php              |   8 +-
 .../ControllersLogic/FetchBookingLogic.php    |   2 +-
 .../FetchBookingPaymentQuotationLogic.php     |   9 +-
 .../CalculatesBookingRefundAmount.php         |  27 ++-
 .../UpdateRefundTransactionStatusLogic.php    |  21 ++-
 app/Http/Resources/BookingResource.php        |   4 +-
 app/Http/Resources/TransactionResource.php    |   1 +
 .../elements/PaymentHistoryComponent.vue      | 105 ++++++++----
 .../elements/RefundConfirmationComponent.vue  | 157 ++++++++----------
 .../elements/RefundVerificationComponent.vue  |   2 +-
 .../forms/PurchaseOrderFormComponent.vue      |   6 +-
 routes/transaction.php                        |   2 +-
 13 files changed, 208 insertions(+), 146 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index c429d91d..ab654675 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -19,6 +19,7 @@ use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
 use App\Http\Resources\TransactionResource;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
 
 use App\Classes\Modules\Transactions\Processors\CreateCashBackTransactionProcessor;
 use App\Classes\Modules\Vouchers\Processors\Voucherify\BookingToVoucherifyProcessor;
@@ -77,6 +78,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
     /** @var BookingToVoucherifyProcessor */
     private $bookingToVoucherifyProcessor;
 
+    /** @var CalculatesBookingRefundAmount */
+    private $calculatesBookingRefundAmount;
+
     /**
      * CreateBookingPaymentLogic constructor.
      * @param FetchesBookingQuotation $fetchBookingQuotation
@@ -90,8 +94,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
      * @param CreateCashBackTransactionProcessor $createCashBackTransactionProcessor
      * @param RecalculatesWalletBalance $recalculatesWalletBalance
      * @param BookingToVoucherifyProcessor $bookingToVoucherifyProcessor
+     * @param CalculatesBookingRefundAmount $calculatesBookingRefundAmount
      */
-    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill, UpdatesWalletBalance $updatesWalletBalance, UpdatesTransactionStatus $updatesTransactionStatus, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, RecalculatesWalletBalance $recalculatesWalletBalance, BookingToVoucherifyProcessor $bookingToVoucherifyProcessor)
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill, UpdatesWalletBalance $updatesWalletBalance, UpdatesTransactionStatus $updatesTransactionStatus, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, RecalculatesWalletBalance $recalculatesWalletBalance, BookingToVoucherifyProcessor $bookingToVoucherifyProcessor, CalculatesBookingRefundAmount $calculatesBookingRefundAmount)
     {
         $this->fetchBookingQuotation = $fetchBookingQuotation;
         $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
@@ -104,6 +109,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
         $this->createCashBackTransactionProcessor = $createCashBackTransactionProcessor;
         $this->recalculatesWalletBalance = $recalculatesWalletBalance;
         $this->bookingToVoucherifyProcessor = $bookingToVoucherifyProcessor;
+        $this->calculatesBookingRefundAmount = $calculatesBookingRefundAmount;
     }
 
     /**
@@ -119,7 +125,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
 
         $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $request->input('amount'))), $booking->convertible_currency_id, $booking->service_id,  $booking->fix_currency_id === 1 ? 0:1, PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')]);
 
-        $outstanding = $this->calculatesBookingOutstanding->execute($booking);
+        $outstanding = $this->calculatesBookingOutstanding->execute($booking) + $this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id);
 
         if($conversionObject->getAmount() > round($outstanding, 2)) throw new MalformedRequestException('Your payment must not be greater than '. $outstanding .'.');
 
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
index 7455e689..0648629e 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
@@ -15,7 +15,6 @@ use App\Classes\Modules\Transactions\Services\CreatesTransaction;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Bookings\Services\FetchesBookingQuotation;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionRefundCalculationObject;
@@ -49,9 +48,6 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
     /** @var CreatesTransaction */
     private $createsTransaction;
 
-    /** @var CalculatesBookingRefundAmount */
-    private $calculatesBookingRefundAmount;
-
     /**
      * CreateBookingPaymentLogic constructor.
      * @param FetchesBookingQuotation $fetchBookingQuotation
@@ -59,16 +55,14 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatesTransaction $createsTransaction
-     * @param CalculatesBookingRefundAmount $calculatesBookingRefundAmount
      */
-    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingRefundAmount $calculatesBookingRefundAmount)
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction)
     {
         $this->fetchBookingQuotation = $fetchBookingQuotation;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsTransaction = $createsTransaction;
-        $this->calculatesBookingRefundAmount = $calculatesBookingRefundAmount;
     }
 
     /**
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingLogic.php
index d9857548..d1f2286e 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingLogic.php
@@ -18,7 +18,7 @@ class FetchBookingLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Retrieved Address',
+            'title' => 'Retrieved Booking',
             'message' => 'You have successfully retrieved a Address'
         ];
     }
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php
index 8effdb2f..e9a42101 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/FetchBookingPaymentQuotationLogic.php
@@ -14,6 +14,7 @@ use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Models\Booking;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
 
 class FetchBookingPaymentQuotationLogic extends AbstractControllerLogic
 {
@@ -40,6 +41,9 @@ class FetchBookingPaymentQuotationLogic extends AbstractControllerLogic
     /** @var CalculatesBookingOutstanding */
     private $calculatesBookingOutstanding;
 
+    /** @var CalculatesBookingRefundAmount */
+    private $calculatesBookingRefundAmount;
+
     /**
      * FetchBookingPaymentQuotationLogic constructor.
      * @param FetchesBookingQuotation $fetchBookingQuotation
@@ -47,12 +51,13 @@ class FetchBookingPaymentQuotationLogic extends AbstractControllerLogic
      * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit
      * @param CalculatesBookingOutstanding $calculatesBookingOutstanding
      */
-    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, GeneratesBookingQuotation $generatesBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, CalculatesBookingOutstanding $calculatesBookingOutstanding)
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, GeneratesBookingQuotation $generatesBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, CalculatesBookingOutstanding $calculatesBookingOutstanding, CalculatesBookingRefundAmount $calculatesBookingRefundAmount)
     {
         $this->fetchBookingQuotation = $fetchBookingQuotation;
         $this->generatesBookingQuotation = $generatesBookingQuotation;
         $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
         $this->calculatesBookingOutstanding = $calculatesBookingOutstanding;
+        $this->calculatesBookingRefundAmount = $calculatesBookingRefundAmount;
     }
 
     /**
@@ -66,7 +71,7 @@ class FetchBookingPaymentQuotationLogic extends AbstractControllerLogic
 
         $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $request->input('amount'))), $booking->convertible_currency_id, $booking->service_id,  $booking->fix_currency_id === 1 ? 0:1, PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')]);
 
-        $outstanding = $this->calculatesBookingOutstanding->execute($booking);
+        $outstanding = $this->calculatesBookingOutstanding->execute($booking) + $this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id);
         if($conversionObject->getAmount() > round($outstanding, 2)) throw new MalformedRequestException('Your payment must not be greater than '.$booking->fixedCurrency->short_code.' '. number_format((float)$outstanding, 2, '.', ','));
 
         //Voucherify
diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php
index 14a4a9ef..f6dab1f4 100644
--- a/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php
+++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php
@@ -2,19 +2,30 @@
 
 namespace App\Classes\Modules\Bookings\Services;
 
-
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Booking;
-use Carbon\Carbon;
 
 class CalculatesBookingRefundAmount
 {
+    public function execute(Booking $booking, int $type, ?string $payment_reference = null): float
+    {
+        $refundAmounts = $booking->transactions()->payments()->get()->map(function ($payment) use ($type) {
+            return $this->calculateRefundAmount($payment, $type);
+        });
 
-    public function execute(Booking $booking, int $type, ?string $payment_reference = NULL){
-        return $type === 1 ?
-        $booking->transactions()->refunds($payment_reference)
-            ->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total') : $booking->transactions()->refunds($payment_reference)->sum('original_amount');
+        $totalRefundAmount = $refundAmounts->sum();
+
+        return $totalRefundAmount;
     }
 
-}
\ No newline at end of file
+    private function calculateRefundAmount($payment, int $type): float
+    {
+        $refundTransactions = $payment->transactions()->refunds()->whereIn('status', [ApprovalStatus::APPROVED]);
+
+        if ($type === 1) {
+            return $refundTransactions->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
+        }
+
+        return $refundTransactions->sum('original_amount');
+    }
+}
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
index bf704359..04fa5e6a 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
@@ -13,6 +13,8 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 use App\Classes\Modules\Wallets\Processors\CreditWalletProcessor;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
 
 
 class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic
@@ -43,6 +45,12 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic
     /** @var CreditWalletProcessor */
     private $creditWalletProcessor;
 
+    /** @var CalculatesBookingPayableAmount */
+    private $calculatesBookingPayableAmount;
+
+    /** @var CalculatesBookingRefundAmount */
+    private $calculatesBookingRefundAmount;
+
     /**
      * CreatePaymentVerificationDocumentLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -50,14 +58,18 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param DeletesDocument $deletesDocument
      * @param CreditWalletProcessor $creditWalletProcessor
+     * @param CalculatesBookingPayableAmount $calculatesBookingPayableAmount
+     * @param CalculatesBookingRefundAmount $calculatesBookingRefundAmount
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, DeletesDocument $deletesDocument, CreditWalletProcessor $creditWalletProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, DeletesDocument $deletesDocument, CreditWalletProcessor $creditWalletProcessor, CalculatesBookingPayableAmount $calculatesBookingPayableAmount, CalculatesBookingRefundAmount $calculatesBookingRefundAmount)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->deletesDocument = $deletesDocument;
         $this->creditWalletProcessor = $creditWalletProcessor;
+        $this->calculatesBookingPayableAmount = $calculatesBookingPayableAmount;
+        $this->calculatesBookingRefundAmount = $calculatesBookingRefundAmount;
     }
 
     /**
@@ -69,7 +81,7 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic
     {
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
 
-        $transaction = $this->updatesTransactionStatus->execute($transaction, $request->input('status'));
+        $transaction = $this->updatesTransactionStatus->execute($transaction, $request->route('status'));
 
         $booking = $transaction->owner->owner;
 
@@ -81,7 +93,10 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic
             $this->creditWalletProcessor->execute($booking->company, $transaction->type, $transaction->amount, $reference);
         }
 
-
+        $paidAmount = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) - $this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id);
+        if (!$paidAmount > 0) {
+            $this->updatesTransactionStatus->execute($paymentTransaction, ApprovalStatus::REFUNDED);
+        }
 
         return $this->response([]);
     }
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index f3a7881d..ea3278c4 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -34,7 +34,7 @@ class BookingResource extends JsonResource
             'amount' => $this->fix_amount,
             'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
             'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
-            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) + floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
             'fixed_currency' => new CurrencyResource($this->fixedCurrency),
             'convertible_currency' => new CurrencyResource($this->convertibleCurrency),
             'conversion_currency' => new CurrencyResource($this->conversionCurrency),
@@ -60,7 +60,7 @@ class BookingResource extends JsonResource
                 'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
                 'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
                     $query->where(function($query){
-                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
+                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED, ApprovalStatus::REFUNDED]);
                     })->orWhere(function($query){
                         $query->where(function($query){
                             $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION,  ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 27fd17ab..9e743042 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -45,6 +45,7 @@ class TransactionResource extends JsonResource
             'transaction_refunds' => TransactionResource::collection($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->refunds()->get())),
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
             'interval' => [
                 'value' => $days->gt(Carbon::now()) ? '+' : '-',
                 'duration' => $days->diff(Carbon::now())->format('%d'),
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 43e2e96d..00d51f06 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -4,12 +4,12 @@
             <div class="row" v-if="!item.transaction_bill">
                 <div class="col">
                     <div class="row">
-                        <div class="col p-t-10 p-b-10 p-r-0 pointer" @click="clickExpand()" :class="[{'bg-master-lighter': item.status === 1 && item.type !== 6}, {'bg-white': item.status !== 1 && item.status !== 4}, {'bg-warning-lighter': item.type === 6}]">
+                        <div class="col p-t-10 p-b-10 p-r-0 pointer" @click="clickExpand()" :class="[{'bg-master-lighter': item.status === 1 && item.type !== 6}, {'bg-white': item.status !== 1 && item.status !== 4}, {'bg-warning-lighter': item.status === 7}, {'bg-warning-lighter': item.type === 6}]">
                             <div class="row m-b-5">
                                 <div class="col-auto">
                                     <div class="font-heading fs-8 muted all-caps">Status</div>
-                                    <div class="font-heading fs-10 bold" v-if="item.type === 1" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
-                                        {{ item.status === 1 ? 'Pending Verification' : item.status === 4 ? 'Rejected' : 'Processing Payment'}}
+                                    <div class="font-heading fs-10 bold" v-if="item.type === 1" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4 && item.status !== 7}, {'text-danger': item.status == 7}]">
+                                        {{ item.status === 7 ? 'Refunded' : (item.status === 1 ? 'Processing Payment' : 'Transferred')}}
                                     </div>
                                     <div class="font-heading fs-10 bold" v-if="item.type === 6" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
                                         {{ item.status === 1 ? 'Pending Verification' : item.status === 4 ? 'Rejected' : 'Processing Payment'}}
@@ -39,7 +39,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-auto" v-if="item.status !== 3" :class="[{'bg-master-light': item.status === 1  && item.type !== 6}, {'bg-master-lighter': item.status === 2}, {'bg-warning-light': item.type === 6}]">
+                        <div class="col-auto" v-if="item.status !== 3" :class="[{'bg-master-light': item.status === 1  && item.type !== 6}, {'bg-master-lighter': item.status === 2}, {'bg-warning-lighter': item.status === 7}, {'bg-warning-light': item.type === 6}]">
                             <div class="row align-items-center h-100" v-if="item.status !== 1 || item.payment_method !== 5">
                                 <div class="col">
                                     <i class="fa" :class="[{'fa-cloud-download': item.status === 1 || item.status === 2}, {'fa-ban': item.status === 4}, {'muted': item.status === 1 || item.status === 2}, {'text-danger':  item.status === 4}]"></i>
@@ -147,13 +147,13 @@
                             <div class="font-heading all-caps fs-10">Refunded Amount</div>
                         </div>
                         <div class="col-auto text-right">
-                            <div class="font-heading fs-12">{{item.original_currency.short_code}} {{(Math.round((totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                            <div class="font-heading fs-10">{{item.original_currency.short_code}} {{(Math.round((totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                         </div>
                     </div>
                     <div class="row align-items-end m-b-10 bold text-danger" v-if="totalRefunds != 0">
                         <div class="col"></div>
                         <div class="col-auto text-right">
-                            <div class="font-heading fs-12">{{item.currency.short_code}} {{(Math.round((totalConvertRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                            <div class="font-heading fs-10">{{item.currency.short_code}} {{(Math.round((totalConvertRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                         </div>
                     </div>
                     <div class="row align-items-end bold m-b-10 text-primary">
@@ -292,7 +292,7 @@
                         </div>
                     </div>
                     <div class="row m-t-10" v-show="[2, 3].includes(item.status) && (totalRequestedRefund + totalRefunds) < data.booking.amount">
-                        <div class="col" v-if="!item.transaction_bill">
+                        <div class="col" v-if="!item.transaction_bill && $store.getters.isAdmin">
                             <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal" data-type="transferSummary">Request Refund</button>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
                                 <refund-confirmation-component :data="data" :section="section" :totalRefunds="totalRequestedRefund + totalRefunds"></refund-confirmation-component>
@@ -301,42 +301,83 @@
                     </div>
                     <div class="row m-t-10" v-if="data.transaction_refunds.length > 0">
                         <div class="col">
-                            <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border" @click="clickExpandRefundTransactions">Show Refund Transactions</button>
+                            <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border pointer" @click="clickExpandRefundTransactions">
+                                <div class="row justify-content-between">
+                                    <div class="col-auto">
+                                        <i class="fa" :class="[{'fa-angle-up': expandRefundTransactions}, {'fa-angle-down': !expandRefundTransactions}]"></i>
+                                    </div>
+                                    <div class="col">
+                                        Show Refund Transactions
+                                    </div>
+                                    <div class="col-auto">
+                                        <i class="fa" :class="[{'fa-angle-up': expandRefundTransactions}, {'fa-angle-down': !expandRefundTransactions}]"></i>
+                                    </div>
+                                </div>
+                            </button>
                         </div>
                     </div>
                 </div>
             </div>
             <div class="row" v-if="data.transaction_refunds.length > 0 && expandRefundTransactions">
                 <div class="col bg-white padding-15">
-                    <div v-for="(refund, index) in data.transaction_refunds">
-                        <div class="row align-items-end m-b-10 bold">
-                            <div class="col">
-                                <div class="font-heading all-caps fs-10">{{ index + 1 }}. Refund updated on</div>
+                    <div class="b-b b-grey m-b-5" v-for="(refund, index) in data.transaction_refunds">
+                        <div class="row m-b-10">
+                            <div class="col-auto">
+                                <div class="font-heading fs-10 muted all-caps">Created At</div>
+                                <div class="font-heading fs-10">
+                                    {{ refund.created_at }}
+                                </div>
+                            </div>
+                            <div class="col-auto">
+                                <div class="font-heading fs-10 muted all-caps">Status</div>
+                                <div class="font-heading fs-10">
+                                    <div class="font-heading fs-10 bold" :class="[{'text-warning': refund.status === 1}, {'text-success': refund.status === 2}, {'text-danger': refund.status === 4}]">{{ refund.status === 1 ? 'Pending Verification' : refund.status === 2 ? 'Approved' : 'Rejected'}}</div>
+                                </div>
+                            </div>
+                            <div class="col text-right">
+                                <div class="font-heading fs-10 muted all-caps">Amount</div>
+                                <div class="font-heading fs-10">
+                                    <div class="font-heading fs-10">{{refund.currency.short_code}} {{(Math.round((refund.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                </div>
                             </div>
                             <div class="col-auto text-right">
-                                <div class="font-heading fs-10">{{ refund.updated_at }}</div>
+                                <div class="font-heading fs-10 muted all-caps">Amount</div>
+                                <div class="font-heading fs-14 text-success bold">
+                                    <div class="font-heading fs-10">{{refund.original_currency.short_code}} {{(Math.round((refund.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                </div>
                             </div>
                         </div>
-                        <div class="row align-items-end m-b-10 bold">
+                        <div class="row m-b-15 text-right parentContainer" v-if="$store.getters.isAdmin && refund.status === 1">
                             <div class="col">
-                                <div class="font-heading all-caps fs-10">&nbsp;&nbsp;&nbsp; Refund status</div>
-                            </div>
-                            <div class="col-auto text-right">
-                                <div class="font-heading fs-10" :class="[{'text-warning': refund.status === 1}, {'text-success': refund.status === 2}, {'text-danger': refund.status === 4}]">{{ refund.status === 1 ? 'Pending Verification' : refund.status === 2 ? 'Approved' : 'Rejected'}}</div>
-                            </div>
-                        </div>
-                        <div class="row align-items-end m-b-10 bold text-danger">
-                            <div class="col">
-                                <div class="font-heading all-caps fs-10">&nbsp;&nbsp;&nbsp; Requested Refund Amount</div>
-                            </div>
-                            <div class="col-auto text-right">
-                                <div class="font-heading fs-10">{{refund.original_currency.short_code}} {{(Math.round((refund.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
-                            </div>
-                        </div>
-                        <div class="row align-items-end m-b-10 bold text-danger">
-                            <div class="col"></div>
-                            <div class="col-auto text-right">
-                                <div class="font-heading fs-10">{{refund.currency.short_code}} {{(Math.round((refund.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="rejectRefund">
+                                    <i class="fa fa-times fa-fw"></i>
+                                </button>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" type="rejectRefund">
+                                    <general-confirmation-form-component
+                                        contentText="Are you sure you want to reject this refund?"
+                                        modalType="delete"
+                                        class="text-center"
+                                        :apiRoute="route('api.transaction.refund.status.update', refund.id, 4)"
+                                        apiMethod="put"
+                                        :section="section"
+                                    >
+                                    </general-confirmation-form-component>
+                                </modal-component>
+
+                                <button class="btn btn-xs btn-outline-primary b-rad-none m-r-5 requestModal" data-type="approveRefund">
+                                    <i class="fa fa-check fa-fw"></i>
+                                </button>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" type="approveRefund">
+                                    <general-confirmation-form-component
+                                        contentText="Are you sure you want to approve this refund?"
+                                        modalType="confirm"
+                                        class="text-center"
+                                        :apiRoute="route('api.transaction.refund.status.update', refund.id, 2)"
+                                        apiMethod="put"
+                                        :section="section"
+                                    >
+                                    </general-confirmation-form-component>
+                                </modal-component>
                             </div>
                         </div>
                     </div>
diff --git a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
index de2cd48f..ec5f1ac6 100644
--- a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
@@ -3,64 +3,42 @@
         <div class="col bg-white padding-25">
             <div class="row p-b-10">
                 <div class="col">
-                    <div class="row m-b-5">
-                        <div class="col">
-                            <div class="font-heading all-caps bold fs-10">Request Refund</div>
+                    <div class="font-heading all-caps bold fs-10">Request Refund</div>
+                </div>
+            </div>
+            <div class="row m-b-10">
+                <div class="col-7">
+                    <div class="font-heading all-caps fs-10 m-b-5">Refund Type:</div>
+                    <div class="row p-l-15">
+                        <div v-for="(method, index) in refundMethods" :key="index"
+                            class="col p-t-20 p-b-20 bg-master-lightest text-center b-grey pointer"
+                            :class="{ 'bg-complete text-white': method.name === refundMethod.name }"
+                            @click="updateRefundType(method)">
+                            {{ method.name }}
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row">
+            <div class="row m-r-0 m-b-10" v-if="refundMethod.name === 'Partially Refund'">
                 <div class="col">
-                    <div class="row">
+                    <validation-wrapper-component :validator="$v.refundAmount">
+                        <label>Amount</label>
+                        <input class="form-control" name="amount" v-model="refundAmount"
+                            :disabled="refundMethod.name === 'Fully Refund'" v-money="moneyV2">
+                    </validation-wrapper-component>
+                </div>
+                <div class="col-auto b-r b-t b-b b-grey">
+                    <div class="row h-100 align-items-center">
                         <div class="col">
-                            <div class="row m-b-10">
-                                <div class="col">
-                                    <div class="row parentContainer">
-                                        <div class="col">
-                                            <div class="row" >
-                                                <div class="col-7 p-r-0">
-                                                    <div class="row m-b-10">
-                                                        <div class="col">
-                                                            <div class="font-heading all-caps fs-10 m-b-5">Refund Type: </div>
-                                                            <div class="row p-l-15">
-                                                                <div class="col p-t-20 p-b-20 bg-master-lightest text-center b-grey pointer" :class="[{'bg-complete': refundMethod.name === 'Fully Refund'}, {'text-white': refundMethod.name === 'Fully Refund'}]" @click="updateRefundType({name: 'Fully Refund'})">
-                                                                    Full Refund
-                                                                </div>
-                                                                <div class="col p-t-20 p-b-20 bg-master-lightest text-center b-grey pointer" :class="[{'bg-complete': refundMethod.name === 'Partially Refund'}, {'text-white': refundMethod.name === 'Partially Refund'}]" @click="updateRefundType({name: 'Partially Refund'})">
-                                                                    Partial Refund
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row m-r-0 m-b-10" v-if="refundMethod.name === 'Partially Refund'">
-                                                        <div class="col p-r-0">
-                                                            <validation-wrapper-component :validator="$v.refundAmount">
-                                                                <label>Amount</label>
-                                                                <input class="form-control" name="amount" v-model="refundAmount" :disabled="refundMethod.name == 'Fully Refund'" v-money="moneyV2">
-                                                            </validation-wrapper-component>
-                                                        </div>
-                                                        <div class="col-auto b-r b-t b-b b-grey">
-                                                            <div class="row h-100 align-items-center">
-                                                                <div class="col">
-                                                                    <div class="font-heading fs-10 muted">{{data.booking.fixed_currency.short_code}}</div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+                            <div class="font-heading fs-10 muted">{{ data.booking.fixed_currency.short_code }}</div>
                         </div>
                     </div>
                 </div>
             </div>
             <div class="row">
                 <div class="col-auto">
-                    <button class="btn btn-lg btn-default bg-master-lightest b-rad-none all-caps fs-12" data-dismiss="modal">Cancel</button>
+                    <button class="btn btn-lg btn-default bg-master-lightest b-rad-none all-caps fs-12"
+                        data-dismiss="modal">Cancel</button>
                 </div>
                 <div class="col text-right">
                     <button class="btn btn-lg btn-success b-rad-none all-caps fs-12" @click="submitForm()">Confirm & Proceed</button>
@@ -71,47 +49,54 @@
 </template>
 
 <script>
-    import FormHandler from '../../../general/mixins/formHandler';
-    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
-    import { required, maxValue } from "vuelidate/lib/validators";
-    export default {
-        props: {
-            totalRefunds:{
-                type: Number,
-                default: 0,
+import FormHandler from '../../../general/mixins/formHandler';
+import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+import { maxValue } from "vuelidate/lib/validators";
+
+export default {
+    props: {
+        totalRefunds: {
+            type: Number,
+            default: 0,
+        }
+    },
+    data() {
+        return {
+            refundMethod: { name: 'Fully Refund', status: false },
+            refundMethods: [
+                { name: 'Fully Refund', label: 'Full Refund' },
+                // { name: 'Partially Refund', label: 'Partial Refund' }
+            ]
+        }
+    },
+    validations() {
+        return {
+            refundAmount: {
+                maxValue: maxValue(this.refundMaxValue)
             }
+        }
+    },
+    computed: {
+        refundAmount() {
+            return (Math.round((this.data.booking.amount - this.totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2);
         },
-        data(){
-            return {
-                refundAmount: (Math.round((this.data.booking.amount - this.totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2),
-                refundMethod: {
-                    name: 'Partially Refund',
-                    status: false
-                },
-                refundMaxValue: (Math.round((this.data.booking.amount - this.totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2),
+        refundMaxValue() {
+            return this.refundAmount;
+        },
+    },
+    methods: {
+        submitForm() {
+            this.parameters.amount = this.refundAmount;
+            this.submit(this.route('api.booking.refund.create', this.data.booking.id, this.data.id), 'post', this.section, true, true)
+        },
+        updateRefundType(refund) {
+            this.refundMethod = { ...refund, status: !this.refundMethod.status };
+            if (this.refundMethod.name === 'Fully Refund') {
+                this.refundAmount = this.refundMaxValue;
             }
+            console.log(this.refundAmount);
         },
-        validations() {
-            return {
-                refundAmount: {
-                    // required,
-                    maxValue: maxValue(this.refundMaxValue)
-                }
-            }
-        },
-        methods: {
-            submitForm(){
-                this.parameters.amount = this.refundAmount;
-                this.submit(this.route('api.booking.refund.create', this.data.booking.id, this.data.id), 'post', this.section, true, true)
-            },
-            updateRefundType(refund){
-                this.refundMethod = {
-                    name: refund.name,
-                    status: !this.refundMethod.status
-                }
-                this.refundMethod.name === 'Fully Refund' ? this.refundAmount = this.refundMaxValue : '';
-            },
-        },
-        mixins: [FormHandler, ModalFormHandler]
-    }
-</script>
\ No newline at end of file
+    },
+    mixins: [FormHandler, ModalFormHandler]
+}
+</script>
diff --git a/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue b/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue
index 42d5682e..24ec68a6 100644
--- a/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue
@@ -115,7 +115,7 @@
             approveRefund(status){
                 this.isLoading = true;
                 this.parameters.status = status;
-                this.submit(this.route('api.transaction.refund.status.update', this.data.id), 'put', 'listRefundTransactionSection', true, true);
+                this.submit(this.route('api.transaction.refund.status.update', this.data.id, status), 'put', 'listRefundTransactionSection', true, true);
             },
         },
         mixins: [componentHandler, staticFormHandler]
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index 9a1bf774..9b8045f9 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -240,7 +240,11 @@
         },
         watch: {
             'data': function () {
-                this.products = this.data.purchase_order.details
+                if (this.data && this.data.purchase_order && this.data.purchase_order.details) {
+                    this.products = this.data.purchase_order.details;
+                } else {
+                    this.products = [];
+                }
             }
         },
         methods: {
diff --git a/routes/transaction.php b/routes/transaction.php
index e714d6b7..f2f4a630 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -11,7 +11,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
     route::post('{id}/bill/verification', 'CreatePaymentProofDocumentController@verify')->name('bill.verification');
     route::post('{id}/bill/pay', 'CreatePaymentProofDocumentController@pay')->name('bill.pay');
     Route::put('/{id}/bill/{status}', 'UpdatePaymentTransactionStatusController@update')->where('status', 'pending|complete')->name('bill.status');
-    Route::put('/{id}/refund/status/update', 'UpdateRefundTransactionStatusController@update')->name('refund.status.update');
+    Route::put('/{id}/refund/status/update/{status}', 'UpdateRefundTransactionStatusController@update')->name('refund.status.update');
 
     route::delete('{id}/bill/delete', 'DeletePaymentProofDocumentController@delete')->name('bill.delete');
 

From 609b71f549e5062640d464b673bce6842f2603b6 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 19 Feb 2024 00:57:42 +0800
Subject: [PATCH 37/40] code upfate for refund booking

---
 .../Services/CalculatesBookingRefundAmount.php   |  2 +-
 .../UpdateRefundTransactionStatusLogic.php       | 14 +++++++-------
 app/Http/Resources/TransactionResource.php       |  2 ++
 .../elements/PaymentHistoryComponent.vue         |  2 +-
 .../elements/RefundConfirmationComponent.vue     | 16 +++++++++++++---
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php
index f6dab1f4..239545af 100644
--- a/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php
+++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php
@@ -18,7 +18,7 @@ class CalculatesBookingRefundAmount
         return $totalRefundAmount;
     }
 
-    private function calculateRefundAmount($payment, int $type): float
+    public function calculateRefundAmount($payment, int $type): float
     {
         $refundTransactions = $payment->transactions()->refunds()->whereIn('status', [ApprovalStatus::APPROVED]);
 
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
index 04fa5e6a..d0e5802a 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
@@ -79,18 +79,18 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
+        $refundTransaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
 
-        $transaction = $this->updatesTransactionStatus->execute($transaction, $request->route('status'));
+        $refundTransaction = $this->updatesTransactionStatus->execute($refundTransaction, $request->route('status'));
 
-        $booking = $transaction->owner->owner;
+        $paymentTransaction = $refundTransaction->owner;
 
-        $paymentTransaction = $transaction->owner;
+        $booking = $paymentTransaction->owner;
 
-        $reference = $transaction->amount == $paymentTransaction->amount ? 'Fully Refund for Ref. ' . $booking->marking : 'Partially Refund for Ref. ' . $booking->marking;
+        $reference = $refundTransaction->amount == $paymentTransaction->amount ? 'Fully Refund for Ref. ' . $booking->marking : 'Partially Refund for Ref. ' . $booking->marking;
 
-        if ($transaction->status == ApprovalStatus::APPROVED) {
-            $this->creditWalletProcessor->execute($booking->company, $transaction->type, $transaction->amount, $reference);
+        if ($refundTransaction->status == ApprovalStatus::APPROVED) {
+            $this->creditWalletProcessor->execute($booking->company, $refundTransaction->type, $refundTransaction->amount, $reference);
         }
 
         $paidAmount = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) - $this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id);
diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 9e743042..09967f4c 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Booking;
 use Carbon\Carbon;
@@ -43,6 +44,7 @@ class TransactionResource extends JsonResource
             'documents' => new DocumentResource($this->documents()->first()),
             'transaction_bill' => new TransactionResource($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->bills()->first())),
             'transaction_refunds' => TransactionResource::collection($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->refunds()->get())),
+            'refunded_amount' => $this->booking ? floatval((App()->make(CalculatesBookingRefundAmount::class))->calculateRefundAmount($this->resource, $this->booking->fix_currency_id)) : null,
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 00d51f06..877ec248 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -291,7 +291,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row m-t-10" v-show="[2, 3].includes(item.status) && (totalRequestedRefund + totalRefunds) < data.booking.amount">
+                    <div class="row m-t-10" v-show="[2, 3].includes(item.status) && (totalRequestedRefund + totalRefunds) < data.original_amount">
                         <div class="col" v-if="!item.transaction_bill && $store.getters.isAdmin">
                             <button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal" data-type="transferSummary">Request Refund</button>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="transferSummary" size="large">
diff --git a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
index ec5f1ac6..75253aaa 100644
--- a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
@@ -35,13 +35,20 @@
                     </div>
                 </div>
             </div>
+            <div class="row m-t-10 m-b-10">
+                <div class="col">
+                    <div class="font-heading all-caps fs-10 m-b-5">Paid Amount: {{ paidAmount }}</div>
+                    <div class="font-heading all-caps fs-10 m-b-5">Refund Amount: {{ refundAmount }}</div>
+                </div>
+            </div>
             <div class="row">
                 <div class="col-auto">
                     <button class="btn btn-lg btn-default bg-master-lightest b-rad-none all-caps fs-12"
                         data-dismiss="modal">Cancel</button>
                 </div>
                 <div class="col text-right">
-                    <button class="btn btn-lg btn-success b-rad-none all-caps fs-12" @click="submitForm()">Confirm & Proceed</button>
+                    <button class="btn btn-lg btn-success b-rad-none all-caps fs-12" @click="submitForm()">Confirm &
+                        Proceed</button>
                 </div>
             </div>
         </div>
@@ -78,11 +85,15 @@ export default {
     },
     computed: {
         refundAmount() {
-            return (Math.round((this.data.booking.amount - this.totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2);
+            // return (Math.round((this.data.booking.amount - this.totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2);
+            return (Math.round((this.data.original_amount - this.data.refunded_amount + Number.EPSILON) * 100) / 100).toFixed(2);
         },
         refundMaxValue() {
             return this.refundAmount;
         },
+        paidAmount() {
+            return this.data.original_amount;
+        },
     },
     methods: {
         submitForm() {
@@ -94,7 +105,6 @@ export default {
             if (this.refundMethod.name === 'Fully Refund') {
                 this.refundAmount = this.refundMaxValue;
             }
-            console.log(this.refundAmount);
         },
     },
     mixins: [FormHandler, ModalFormHandler]

From 9e3c34eb7383e9c2bb6855487e336bfe9de34bc6 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 20 Feb 2024 22:41:28 +0800
Subject: [PATCH 38/40] change payment status when it has been fully refunded

---
 .../ControllersLogic/UpdateRefundTransactionStatusLogic.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
index d0e5802a..09e4b102 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
@@ -93,7 +93,7 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic
             $this->creditWalletProcessor->execute($booking->company, $refundTransaction->type, $refundTransaction->amount, $reference);
         }
 
-        $paidAmount = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) - $this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id);
+        $paidAmount = $paymentTransaction->original_amount - $this->calculatesBookingRefundAmount->calculateRefundAmount($paymentTransaction, $booking->fix_currency_id);
         if (!$paidAmount > 0) {
             $this->updatesTransactionStatus->execute($paymentTransaction, ApprovalStatus::REFUNDED);
         }

From 9aa75630ff3dbff177816678db84d5609b5a4099 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 21 Feb 2024 00:20:45 +0800
Subject: [PATCH 39/40] update code for refund booking

---
 app/Http/Resources/BookingResource.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index 04204a37..6803eec9 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -32,7 +32,8 @@ class BookingResource extends JsonResource
             'amount' => $this->fix_amount,
             'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
             'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
-            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) + floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            // 'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) + floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)),
             'fixed_currency' => new CurrencyResource($this->fixedCurrency),
             'convertible_currency' => new CurrencyResource($this->convertibleCurrency),
             'conversion_currency' => new CurrencyResource($this->conversionCurrency),

From df17a8497ddc98fcc7ca39ffd1b2bdbd45b0e811 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 21 Feb 2024 00:33:08 +0800
Subject: [PATCH 40/40] comment partial refund function

---
 .../ControllersLogic/CreateSupplierTransactionLogic.php       | 1 +
 .../sections/SupplierPendingOrdersSectionComponent.vue        | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
index fb324267..4c407cf5 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
@@ -82,6 +82,7 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
 
         $payments = $request->input('payments');
 
+        // todo-refund: activate this for partial refund
         foreach($payments as $payment){
             $payment = $this->fetchesTransaction->execute(['id' => $payment['id']]);
 
diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
index aee9ab40..fa345d58 100644
--- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -200,7 +200,9 @@
             },
             updateList(){
 
-                this.$refs.pendingOrdersList.updateFilters({per_page: 10000, status: 2, type: 1, is_not_fully_refunded: true, original_currency_id_in: [this.selectedCurrency.id], transaction_service_id: this.selectedService.id});
+                // todo-refund: activate this for partial refund
+                // this.$refs.pendingOrdersList.updateFilters({per_page: 10000, status: 2, type: 1, original_currency_id_in: [this.selectedCurrency.id], transaction_service_id: this.selectedService.id, is_not_fully_refunded: true});
+                this.$refs.pendingOrdersList.updateFilters({per_page: 10000, status: 2, type: 1, original_currency_id_in: [this.selectedCurrency.id], transaction_service_id: this.selectedService.id});
 
                 this.selectedSupplier.status = false;
                 this.currencyDropdownLaunch.status = false;