diff --git a/.env.example b/.env.example
index 47a20e74..f3d4fd56 100644
--- a/.env.example
+++ b/.env.example
@@ -50,4 +50,9 @@ FILESYSTEM_DRIVER="documents"
 JWT_SECRET=
 JWT_TTL=1440
 
-IS_PRODUCTION=false
\ No newline at end of file
+IS_PRODUCTION=false
+
+BILLPLZ_BASE_URL="https://www.billplz-sandbox.com"
+BILLPLZ_API_KEY="0fa4c710-761b-4a7a-a501-c2c2d02643d5"
+BILLPLZ_X_SIGNATURE_KEY="S-pbNVthVRsvnPfZlgLwqqOg"
+BILLPLZ_COLLECTION_ID="hev2wdjy"
diff --git a/app/Classes/General/Eloquent/AbstractUpdateRecord.php b/app/Classes/General/Eloquent/AbstractUpdateRecord.php
index 44129c92..17690ce4 100644
--- a/app/Classes/General/Eloquent/AbstractUpdateRecord.php
+++ b/app/Classes/General/Eloquent/AbstractUpdateRecord.php
@@ -17,7 +17,6 @@ abstract class AbstractUpdateRecord
      */
     public function handler(Model $model){
         try{
-
             if($model->save()){ return $model; }
 
         } catch (QueryException $exception){
diff --git a/app/Classes/General/Eloquent/Filters/BillNo.php b/app/Classes/General/Eloquent/Filters/BillNo.php
new file mode 100644
index 00000000..167dcd51
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/BillNo.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class BillNo implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('bill_no', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/IsPublished.php b/app/Classes/General/Eloquent/Filters/IsPublished.php
index 9b5b23c1..3e9c8ca4 100644
--- a/app/Classes/General/Eloquent/Filters/IsPublished.php
+++ b/app/Classes/General/Eloquent/Filters/IsPublished.php
@@ -5,7 +5,7 @@ namespace App\Classes\General\Eloquent\Filters;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 
-class isPublished implements Filter
+class IsPublished implements Filter
 {
 
     /**
diff --git a/app/Classes/General/Eloquent/Filters/PaymentReference.php b/app/Classes/General/Eloquent/Filters/PaymentReference.php
new file mode 100644
index 00000000..5f5d53f5
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/PaymentReference.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class PaymentReference implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('payment_reference', '=', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Interfaces/Transactionable.php b/app/Classes/General/Interfaces/Transactionable.php
new file mode 100644
index 00000000..174cb48d
--- /dev/null
+++ b/app/Classes/General/Interfaces/Transactionable.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Transactionable
+{
+
+    public function transactions(): morphMany;
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounts/DataTransferObjects/FullNameObject.php b/app/Classes/Modules/Accounts/DataTransferObjects/FullNameObject.php
index c17a8b72..59396c54 100644
--- a/app/Classes/Modules/Accounts/DataTransferObjects/FullNameObject.php
+++ b/app/Classes/Modules/Accounts/DataTransferObjects/FullNameObject.php
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Accounts\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
 
-class FullnameObject implements DataTransferObject
+class FullNameObject implements DataTransferObject
 {
     /** @var string */
     private $name;
@@ -12,11 +12,6 @@ class FullnameObject implements DataTransferObject
     /**
      * UserObject constructor.
      * @param string $name
-     * @param string $email
-     * @param string $password
-     * @param string $passwordConfirmation
-     * @param int|null $type
-     * @param int|null $status
      */
     public function __construct(string $name)
     {
diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
new file mode 100644
index 00000000..7501bfd1
--- /dev/null
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\ControllersLogic;
+
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Http\Resources\TransactionResource;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
+use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+
+class CallbackBillplzLogic
+{
+
+
+    /** @var GetBillplzBill */
+    private $getBillplzBill;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+
+    /**
+     * CreateBookingLogic constructor.
+     * @param GetBillplzBill $getBillplzBill
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->getBillplzBill = $getBillplzBill;
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws MalformedRequestException
+     * @throws ResourceNotFoundException
+     */
+    public function execute(Request $request)
+    {
+
+        $billplzXSignatureObject = new BillplzXSignatureObject($request);
+
+        if(!$billplzXSignatureObject->isValidSignature()){
+            throw new MalformedRequestException('Billplz Payment validation failed.');
+        }
+
+        $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
+
+        if(!$billPlz) throw new ResourceNotFoundException('Billplz bill not found.');
+
+        $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
+
+        if($billPlz->state === 'paid') {
+            $status = ApprovalStatus::APPROVED;
+        }
+
+        if($billPlz->state === 'due') {
+            $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
+        }
+
+        $this->updatesTransactionStatus->execute($transaction, $status);
+
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $transaction->booking->marking, 'payment_reference' => $transaction->payment_reference, 'status' => $status, 'amount' => $transaction->amount]);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php
new file mode 100644
index 00000000..7aabd468
--- /dev/null
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+
+use ErrorException;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBillplzBillLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Billplz Bill',
+            'message' => 'You have successfully created a new Bill'
+        ];
+    }
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /**
+     * CreateBookingLogic constructor.
+     * @param CreatesBillplzBill $createsBillplzBill
+     */
+    public function __construct(CreatesBillplzBill $createsBillplzBill)
+    {
+        $this->createsBillplzBill = $createsBillplzBill;
+    }
+
+
+    /**
+     * @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
+    {
+        $billPlz = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, $request->input('description'), 200, $request->input('bankName'));
+
+        if(!$billPlz) throw new MalformedRequestException('Unable to get correct response from billplz server.');
+        
+        return $this->response(['data' => $billPlz]);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php b/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php
new file mode 100644
index 00000000..c1295886
--- /dev/null
+++ b/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\DataTransferObjects;
+
+use Illuminate\Http\Request;
+use App\Classes\General\Interfaces\DataTransferObject;
+use function PHPSTORM_META\map;
+
+class BillplzXSignatureObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $billPlzId;
+
+    /** @var string */
+    private $status;
+
+    /** @var array */
+    private $billPlzConstructArray;
+
+    /** @var string */
+    private $billPlzConstructString;
+
+    /** @var string  */
+    private $billPlzComputedXSignature;
+
+    /** @var string */
+    private $type;
+
+    /** @var Request  */
+    private $request;
+
+    /** @var string  */
+    private $requestXSignature;
+
+    public function __construct(Request $request)
+    {
+
+        $this->type = $request->exists('billplz') ? 'redirect' : 'callback';
+
+        $this->request = $this->type === 'redirect' ? $request->input('billplz') : $request;
+
+        $this->billPlzId = $this->request['id'];
+
+        $this->status = $this->request['transaction_status'];
+
+        $this->requestXSignature = $this->request['x_signature'];
+
+        $this->_constructBillplzArray()->_natSortBillplzArray()->_constructBillplzString()->_computeBillplzXSignature();
+    }
+
+    private function _constructBillplzArray(){
+
+        $this->billPlzConstructArray = collect($this->request)->forget('x_signature')->map(function($item, $key){
+            return $this->type === 'redirect' ? 'billplz'.$key.$item : $key.$item;
+        })->toArray();
+
+        return $this;
+    }
+
+    private function _natCaseSortBillplzArray(){
+        natcasesort($this->billPlzConstructArray);
+        return $this;
+    }
+
+    private function _natSortBillplzArray(){
+        natsort($this->billPlzConstructArray);
+        return $this;
+    }
+
+    private function _constructBillplzString(){
+        $this->billPlzConstructString = implode('|', $this->billPlzConstructArray);
+        return $this;
+    }
+
+    private function _computeBillplzXSignature(){
+        $this->billPlzComputedXSignature = hash_hmac('sha256', $this->billPlzConstructString, config('billplz.x_signature_key'));
+        return $this;
+    }
+
+    public function getBillPlzId(): string
+    {
+        return $this->billPlzId;
+    }
+
+    public function getStatus(): string
+    {
+        return $this->status;
+    }
+
+    /**
+     * @return array
+     */
+    public function getBillPlzConstructArray(): array
+    {
+        return $this->billPlzConstructArray;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBillPlzConstructString(): string
+    {
+        return $this->billPlzConstructString;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBillPlzComputedXSignature(): string
+    {
+        return $this->billPlzComputedXSignature;
+    }
+
+    public function isValidSignature(): bool
+    {
+        return $this->billPlzComputedXSignature === $this->requestXSignature ? true : false;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
new file mode 100644
index 00000000..c97ff13a
--- /dev/null
+++ b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+
+class CreatesBillplzBill
+{
+
+    /**
+     * @param string $name
+     * @param string $email
+     * @param string $description
+     * @param float $amount
+     * @param string $billNumber
+     * @param null|string $bankCode
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $name, string $email, string $description, float $amount, string $billNumber, ?string $bankCode = null) {
+        try{
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
+                'collection_id' => config('billplz.collection_id'),
+                'name' => $name,
+                'email' => $email,
+                'description' => $description,
+                'amount' => $this->finalizeAmount($amount),
+                'redirect_url' => route('online_payment.redirect'),
+                'callback_url' => route('api.online_payment.callback'),
+                'reference_1_label' => 'Bank Code',
+                'reference_1' => $bankCode ? $bankCode : config('billplz.maybank'),
+                'reference_2_label' => 'Bill Number',
+                'reference_2' => $billNumber
+            ]);
+
+            if($response->successful()){
+                $data = $response->json();
+
+                $data['url'] = $data['url'].'?auto_submit=true';
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server' . $exception->getMessage());
+        }
+    }
+
+    protected function finalizeAmount($amount){
+        $number = round($amount, 2) * 100;
+        return (string) $number;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Billplzs/Services/GetBillplzBill.php b/app/Classes/Modules/Billplzs/Services/GetBillplzBill.php
new file mode 100644
index 00000000..2a86b403
--- /dev/null
+++ b/app/Classes/Modules/Billplzs/Services/GetBillplzBill.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Http;
+
+class GetBillplzBill
+{
+
+    /**
+     * @param string $billPlzId
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $billPlzId) {
+        try{
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$billPlzId);
+
+            if($response->successful()){
+                $data = $response->json();
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server');
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index df2a7960..a16be8d2 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -11,7 +11,9 @@ use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit;
 use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransaction;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
@@ -46,9 +48,15 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
     /** @var CreatesTransaction */
     private $createsTransaction;
 
+    /** @var UpdatesTransaction */
+    private $updatesTransaction;
+
     /** @var CalculatesBookingOutstanding */
     private $calculatesBookingOutstanding;
 
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
     /**
      * CreateBookingPaymentLogic constructor.
      * @param FetchesBookingQuotation $fetchBookingQuotation
@@ -56,14 +64,17 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatesTransaction $createsTransaction
      * @param CalculatesBookingOutstanding $calculatesBookingOutstanding
+     * @param CreatesBillplzBill $createsBillplzBill
      */
-    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding)
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, UpdatesTransaction $updatesTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill)
     {
         $this->fetchBookingQuotation = $fetchBookingQuotation;
         $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsTransaction = $createsTransaction;
+        $this->updatesTransaction = $updatesTransaction;
         $this->calculatesBookingOutstanding = $calculatesBookingOutstanding;
+        $this->createsBillplzBill = $createsBillplzBill;
     }
 
     /**
@@ -73,7 +84,6 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-
         $booking = Booking::find($request->route('id'));
 
         $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')]);
@@ -88,11 +98,15 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
 
         $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
 
+        if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){
+            $billPlzBill = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, 'This payment is made for transfer ref. '.$booking->marking, $configurations->getTotal(), $billNumber, $request->input('bank_code'));
+        }
+
         $object = new TransactionObject($billNumber, TransactionType::PAYMENT, 1, $booking->company->id,
             $configurations->getConfigurations()->getBankId(), $configurations->getConversionObject()->getPaymentMethod(),
             $configurations->getTotal(), $configurations->getForeignTotal(), 1,
             $configurations->getConversionObject()->getCurrencyId(), $configurations->getConfigurations()->getRate(),
-            $configurations->getTax(), $configurations->getServiceCharge(), Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_SUBMISSION);
+            $configurations->getTax(), $configurations->getServiceCharge(), Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_SUBMISSION, [], isset($billPlzBill) ? $billPlzBill->id : NULL);
 
         $transaction = $this->createsTransaction->execute($booking, $object);
 
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php
index 9c66abc5..e78a9690 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php
@@ -7,15 +7,14 @@ use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionRefundCalculationObject;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Http\Resources\TransactionResource;
 use App\Models\Booking;
-use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -38,9 +37,6 @@ class CreateBookingRefundCreditNoteLogic extends AbstractControllerLogic
     /** @var UpdatesTransactionStatus */
     private $updatesTransactionStatus;
 
-    /** @var FetchesCompanyPaymentAttemptLimit */
-    private $fetchesCompanyPaymentAttemptLimit;
-
     /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNumber;
 
@@ -51,15 +47,13 @@ class CreateBookingRefundCreditNoteLogic extends AbstractControllerLogic
      * CreateBookingPaymentLogic constructor.
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatesTransaction $createsTransaction
      */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction)
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction)
     {
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsTransaction = $createsTransaction;
     }
@@ -76,19 +70,24 @@ class CreateBookingRefundCreditNoteLogic extends AbstractControllerLogic
 
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]);
         
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::REFUNDED);
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
 
-        $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company);
+        $paymentReferenceTransaction = $this->fetchesTransaction->execute(['bill_no' => $transaction->payment_reference]);
 
-        $billNumber = $this->generatesTransactionBillNumber->execute('CDTN-');
-        
-        $object = new TransactionObject($billNumber, TransactionType::CREDIT_NOTE, 1, $booking->company->id,
-            $booking->bank_id, $transaction->payment_method,
-            $transaction->amount, $transaction->original_amount, 1,
-            $transaction->original_currency_id, $transaction->currency_rate,
-            $transaction->tax, $transaction->service_charge, Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_VERIFICATION);
+        if((int) $paymentReferenceTransaction->type === TransactionType::BILL){
+            $transactionRefundCalculationObject = new TransactionRefundCalculationObject($booking, $transaction, $transaction->original_amount, $paymentReferenceTransaction->currency_rate);
+            $transactionRefundCalculationObject->setRefundConversionAmount();
 
-        $transaction = $this->createsTransaction->execute($booking, $object);
+            $billNumber = $this->generatesTransactionBillNumber->execute('CRDNT-');
+            
+            $object = new TransactionObject($billNumber, TransactionType::CREDIT_NOTE, 1, $booking->company->id,
+                $booking->bank_id, $paymentReferenceTransaction->payment_method,
+                $transactionRefundCalculationObject->getRefundConversionAmount(), $transaction->original_amount, 1,
+                $paymentReferenceTransaction->original_currency_id, $paymentReferenceTransaction->currency_rate,
+                $paymentReferenceTransaction->tax, $paymentReferenceTransaction->service_charge, null, ApprovalStatus::PENDING_VERIFICATION, [], $paymentReferenceTransaction->bill_no);
+
+            $transaction = $this->createsTransaction->execute($booking, $object);
+        }
 
         return $this->resourceResponse(new TransactionResource($transaction));
     }
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
index 843ecb88..411b9163 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
@@ -3,21 +3,22 @@
 namespace App\Classes\Modules\Bookings\ControllersLogic;
 
 
+use App\Models\Booking;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Http\Resources\TransactionResource;
 use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit;
-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\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Http\Resources\TransactionResource;
-use App\Models\Booking;
-use Carbon\Carbon;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+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;
 
 class CreateBookingRefundLogic extends AbstractControllerLogic
 {
@@ -32,36 +33,41 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
         ];
     }
 
+    /** @var FetchesBookingQuotation */
+    private $fetchBookingQuotation;
+
     /** @var FetchesTransaction */
     private $fetchesTransaction;
 
     /** @var UpdatesTransactionStatus */
     private $updatesTransactionStatus;
 
-    /** @var FetchesCompanyPaymentAttemptLimit */
-    private $fetchesCompanyPaymentAttemptLimit;
-
     /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNumber;
 
     /** @var CreatesTransaction */
     private $createsTransaction;
 
+    /** @var CalculatesBookingRefundAmount */
+    private $calculatesBookingRefundAmount;
+
     /**
      * CreateBookingPaymentLogic constructor.
+     * @param FetchesBookingQuotation $fetchBookingQuotation
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatesTransaction $createsTransaction
+     * @param CalculatesBookingRefundAmount $calculatesBookingRefundAmount
      */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction)
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingRefundAmount $calculatesBookingRefundAmount)
     {
+        $this->fetchBookingQuotation = $fetchBookingQuotation;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsTransaction = $createsTransaction;
+        $this->calculatesBookingRefundAmount = $calculatesBookingRefundAmount;
     }
 
     /**
@@ -75,18 +81,26 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
         $booking = Booking::find($request->route('id'));
 
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]);
-        
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::REFUNDED);
-
-        $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company);
 
         $billNumber = $this->generatesTransactionBillNumber->execute('RFD-');
-        
+
+        if((int) $transaction->type === TransactionType::BILL){
+            $customerBooking = $booking->transactions()->payments()->complete()->where('original_amount', '=', $transaction->original_amount)->where('id', '<', $transaction->id)->orderByDesc('id')->first();
+        }
+
+        $refund = $this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id, $transaction->bill_no);
+        dd($refund);
+
+        if($refund + $request->input('amount') > $transaction->original_amount) throw new MalformedRequestException('Your refund must not be greater than '. $transaction->original_amount .'.');
+
+        $transactionRefundCalculationObject = new TransactionRefundCalculationObject($booking, (int) $transaction->type === TransactionType::BILL ? $customerBooking : $transaction, $request->input('amount'));
+        $transactionRefundCalculationObject->init();
+
         $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id,
-            $booking->bank_id, $transaction->payment_method,
-            $transaction->amount, $transaction->original_amount, 1,
-            $transaction->original_currency_id, $transaction->currency_rate,
-            $transaction->tax, $transaction->service_charge, Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_VERIFICATION);
+            $request->input('bank_id'),$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);
 
         $transaction = $this->createsTransaction->execute($booking, $object);
 
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateProformaInvoiceTransactionLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateProformaInvoiceTransactionLogic.php
new file mode 100644
index 00000000..b37019a5
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateProformaInvoiceTransactionLogic.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\FetchesBooking;
+use App\Classes\Modules\Bookings\Standards\Rules\CanFetchBooking;
+use App\Classes\Modules\Transactions\Processors\CreateProformaInvoiceTransactionProcessor;
+use App\Http\Resources\BookingResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateProformaInvoiceTransactionLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Proforma Invoice Transaction',
+            'message' => 'You have successfully create proforma invoice transaction'
+        ];
+    }
+
+    /** @var CanFetchBooking */
+    private $canFetchBooking;
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /** @var CreateProformaInvoiceTransactionProcessor */
+    private $CreateProformaInvoiceTransactionProcessor;
+
+    /**
+     * FetchBookingLogic constructor.
+     * @param CanFetchBooking $canFetchBooking
+     * @param FetchesBooking $fetchesBooking
+     * @param CreateProformaInvoiceTransactionProcessor $CreateProformaInvoiceTransactionProcessor
+     */
+    public function __construct(
+        CanFetchBooking $canFetchBooking, 
+        FetchesBooking $fetchesBooking,
+        CreateProformaInvoiceTransactionProcessor $CreateProformaInvoiceTransactionProcessor
+    )
+    {
+        $this->canFetchBooking = $canFetchBooking;
+        $this->fetchesBooking = $fetchesBooking;
+        $this->CreateProformaInvoiceTransactionProcessor = $CreateProformaInvoiceTransactionProcessor;
+    }
+
+
+    /**
+     * @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
+    {
+        $this->canFetchBooking->passes();
+
+        $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
+
+        $this->CreateProformaInvoiceTransactionProcessor->execute($booking);
+
+        return $this->resourceResponse(new BookingResource($booking));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
new file mode 100644
index 00000000..d1cdbada
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\FetchesBooking;
+use App\Classes\Modules\Bookings\Standards\Rules\CanFetchBooking;
+use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
+use App\Classes\Modules\Transactions\Services\DeletesTransaction;
+use App\Classes\Modules\Documents\Services\DeletesDocument;
+use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
+
+use App\Http\Resources\BookingResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+
+class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Regenerate Booking Invoice',
+            'message' => 'You have successfully regenerate booking invoice'
+        ];
+    }
+
+    /** @var CanFetchBooking */
+    private $canFetchBooking;
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /** @var DeletesTransaction */
+    private $deletesTransaction;
+
+    /** @var UpdatesBookingStatus */
+    private $updatesBookingStatus;
+
+    /** @var DeletesDocument */
+    private $deletesDocument;
+
+    /** @var CreateInvoiceTransactionProcessor */
+    private $createInvoiceTransactionProcessor;
+
+    /**
+     * FetchBookingLogic constructor.
+     * @param CanFetchBooking $canFetchBooking
+     * @param FetchesBooking $fetchesBooking
+     * @param DeletesTransaction $deletesTransaction
+     * @param UpdatesBookingStatus $updatesBookingStatus
+     * @param DeletesDocument $deletesDocument
+     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     */
+    public function __construct(
+        CanFetchBooking $canFetchBooking, 
+        FetchesBooking $fetchesBooking,
+        DeletesTransaction $deletesTransaction,
+        UpdatesBookingStatus $updatesBookingStatus,
+        DeletesDocument $deletesDocument,
+        CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+    )
+    {
+        $this->canFetchBooking = $canFetchBooking;
+        $this->fetchesBooking = $fetchesBooking;
+        $this->deletesTransaction = $deletesTransaction;
+        $this->updatesBookingStatus = $updatesBookingStatus;
+        $this->deletesDocument = $deletesDocument;
+        $this->createInvoiceTransactionProcessor = $createInvoiceTransactionProcessor;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canFetchBooking->passes();
+
+        $booking = $this->fetchesBooking->execute([
+            'id' => $request->route('id'), 
+            'status' => ApprovalStatus::COMPLETED,
+            'with_transactions' => true]
+        );
+
+        $this->updatesBookingStatus->execute($booking, ApprovalStatus::APPROVED);
+
+        $transaction = $booking->transactions()->whereIn('type', [TransactionType::INVOICE, TransactionType::SUPPLIER_DELIVER])->get();
+        foreach ($transaction as $key => $row) {
+            $this->deletesTransaction->execute($row);
+        }
+
+        $document = $booking->documents()->get();
+        foreach ($document as $key => $row) {
+            $this->deletesDocument->execute($row);
+        }
+
+        $this->createInvoiceTransactionProcessor->execute($booking);
+
+        return $this->resourceResponse(new BookingResource($booking));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountLogic.php
new file mode 100644
index 00000000..fabdd058
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountLogic.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+use App\Classes\Modules\Bookings\Services\UpdatesBookingFixedAmount;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Http\Resources\BookingResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Bookings\Services\FetchesBooking;
+
+use App\Classes\Modules\Bookings\Standards\Rules\CanUpdateBooking;
+use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use App\Classes\Exceptions\MalformedRequestException;
+
+class UpdateBookingAmountLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Booking',
+            'message' => 'You have successfully updated the Booking'
+        ];
+    }
+
+    /** @var CanUpdateBooking */
+    private $canUpdateBooking;
+
+    /** @var UpdatesBookingFixedAmount */
+    private $updatesBookingFixedAmount;
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /** @var CalculatesBookingOutstanding */
+    private $calculatesBookingOutstanding;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /**
+     * UpdateBookingAmountLogic constructor.
+     * @param CanUpdateBooking $canUpdateBooking
+     * @param UpdatesBookingFixedAmount $updatesBookingFixedAmount
+     * @param FetchesBooking $fetchesBooking
+     * @param CalculatesBookingOutstanding $calculatesBookingOutstanding
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(CanUpdateBooking $canUpdateBooking, UpdatesBookingFixedAmount $updatesBookingFixedAmount, FetchesBooking $fetchesBooking, CalculatesBookingOutstanding $calculatesBookingOutstanding, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->canUpdateBooking = $canUpdateBooking;
+        $this->updatesBookingFixedAmount = $updatesBookingFixedAmount;
+        $this->fetchesBooking = $fetchesBooking;
+        $this->calculatesBookingOutstanding = $calculatesBookingOutstanding;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
+
+        $input_amount = number_format( floatval(str_replace(',', '', $request->input('fix_amount', $booking->fix_amount))), 5, '.', '');
+
+        $minimum_amount = $booking->fix_amount - $this->calculatesBookingOutstanding->execute($booking);
+        
+        if ((float)$input_amount < $minimum_amount) {
+            throw new MalformedRequestException('Booking Amount cannot be less than '. $minimum_amount .'.');
+        }
+
+        $poTransaction = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
+        $booking->transactions()->where('type', TransactionType::PROFORMA)->delete();
+
+        if($poTransaction) {
+            $this->updatesTransactionStatus->execute($poTransaction, ApprovalStatus::PENDING_SUBMISSION);
+        }
+
+        $booking = $this->updatesBookingFixedAmount->execute($booking, $input_amount);
+
+        return $this->resourceResponse(new BookingResource($booking));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php
index 2dec77fa..14a4a9ef 100644
--- a/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php
+++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php
@@ -11,8 +11,10 @@ use Carbon\Carbon;
 class CalculatesBookingRefundAmount
 {
 
-    public function execute(Booking $booking){
-        return $booking->transactions()->refunds()->complete()->sum('original_amount');
+    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');
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php
index 5224e044..57a5525c 100644
--- a/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php
+++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingTransferredAmount.php
@@ -12,7 +12,7 @@ class CalculatesBookingTransferredAmount
 {
 
     public function execute(Booking $booking){
-        return $booking->transactions()->bills()->transferred()->sum('original_amount');
+        return $booking->transactions()->bills()->complete()->sum('original_amount');
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/UpdatesBooking.php b/app/Classes/Modules/Bookings/Services/UpdatesBooking.php
index 37ca5b7c..2c0ec871 100644
--- a/app/Classes/Modules/Bookings/Services/UpdatesBooking.php
+++ b/app/Classes/Modules/Bookings/Services/UpdatesBooking.php
@@ -17,8 +17,8 @@ class UpdatesBooking extends AbstractUpdateRecord
      */
     public function execute(Booking $model, BookingObject $object) 
     {
-        $model->transferable_bank_id = $object->getTransferableBankId();
-        $model->reference = $object->getReference();
+        $model->bank_id = $object->getTransferableBankId();
+        $model->marking = $object->getMarking();
         $model->fix_amount = $object->getFixAmount();
         $model->fix_currency_id = $object->getFixCurrencyId();
         $model->convertible_currency_id = $object->getConvertibleCurrencyId();
diff --git a/app/Classes/Modules/Bookings/Services/UpdatesBookingFixedAmount.php b/app/Classes/Modules/Bookings/Services/UpdatesBookingFixedAmount.php
new file mode 100644
index 00000000..24be06f4
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/UpdatesBookingFixedAmount.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
+use App\Models\Booking;
+
+class UpdatesBookingFixedAmount extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Booking $model
+     * @param float $fixedAmount
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Booking $model, float $fixedAmount) 
+    {
+        $model->fix_amount = $fixedAmount;
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Documents/Services/DeletesDocument.php b/app/Classes/Modules/Documents/Services/DeletesDocument.php
new file mode 100644
index 00000000..e0f02819
--- /dev/null
+++ b/app/Classes/Modules/Documents/Services/DeletesDocument.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Document;
+
+class DeletesDocument extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Document $model
+     * @return mixed
+     */
+    public function execute(Document $model) {
+        return $this->handler($model);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
index 4fd48239..a49d1f85 100644
--- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
@@ -36,7 +36,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping
             1 => 'PAYMENT',
             2 => 'INVOICE',
             3 => 'BILL',
-            4 => 'PERFORMA',
+            4 => 'PROFORMA',
             5 => 'TOP_UP',
             6 => 'REFUND',
             7 => 'PURCHASE_ORDER',
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php
index 111cd0db..81eb0c8a 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php
@@ -83,7 +83,7 @@ class CreatePaymentProofDocumentLogic extends AbstractControllerLogic
 
         $this->createsFile->execute($document, $object);
 
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::COMPLETED);
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
 
         $this->createInvoiceTransactionProcessor->execute($transaction->booking);
 
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
index 01e18b40..f496ab4f 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
@@ -101,7 +101,7 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
 
             /** @var Transaction $payment */
             $payment = $this->fetchesTransaction->execute(['id' => $payment['id']]);
-
+            
             if($payment->status !== ApprovalStatus::APPROVED) continue;
 
             $this->updatesTransactionStatus->execute($payment, ApprovalStatus::COMPLETED);
@@ -109,7 +109,7 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
             $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,
-                $rate, 0, 0, null, ApprovalStatus::APPROVED);
+                $rate, 0, 0, null, ApprovalStatus::PENDING_VERIFICATION);
 
             $transactions[] = $this->createsTransaction->execute($payment->booking, $object);
         }
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/DeleteTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/DeleteTransactionLogic.php
new file mode 100644
index 00000000..7995e447
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/DeleteTransactionLogic.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\DeletesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Company;
+use App\Models\Document;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
+
+
+class DeleteTransactionLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Deleted Transaction',
+            'message' => 'You have successfully deleted a transaction'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var DeletesTransaction */
+    private $deletesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /**
+     * CreatePaymentVerificationDocumentLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param DeletesTransaction $deletesTransaction
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, DeletesTransaction $deletesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->deletesTransaction = $deletesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
+
+       $this->deletesTransaction->execute($transaction);
+
+        $payment_transaction = $transaction->booking->transactions()->payments()->complete()->where('original_amount', '=', $transaction->original_amount)->where('id', '<', $transaction->id)->orderByDesc('id')->first();
+
+        $this->updatesTransactionStatus->execute($payment_transaction, ApprovalStatus::APPROVED);
+
+        return $this->response([]);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php
index 8fcf4ece..6b097b9e 100644
--- a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php
+++ b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php
@@ -57,6 +57,9 @@ class TransactionObject implements DataTransferObject
     /** @var array|null */
     private $details;
 
+    /** @var string */
+    private $paymentReference;
+
     /**
      * TransactionObject constructor.
      * @param string $billNo
@@ -75,8 +78,9 @@ class TransactionObject implements DataTransferObject
      * @param Carbon|null $expiresOn
      * @param int|null $status
      * @param array|null $details
+     * @param string $paymentReference
      */
-    public function __construct(string $billNo, string $transactionType, int $issuer, int $receiver, int $recipientBankAccountId, int $paymentMethod, float $amount, float $originalAmount, int $currencyId, int $originalCurrencyId, float $currencyRate, float $tax, float $serviceCharge, ?Carbon $expiresOn, ?int $status = ApprovalStatus::PENDING_SUBMISSION, ?array $details = [])
+    public function __construct(string $billNo, string $transactionType, int $issuer, int $receiver, int $recipientBankAccountId, int $paymentMethod, float $amount, float $originalAmount, int $currencyId, int $originalCurrencyId, float $currencyRate, float $tax, float $serviceCharge, ?Carbon $expiresOn, ?int $status = ApprovalStatus::PENDING_SUBMISSION, ?array $details = [], ?string $paymentReference = null)
     {
         $this->billNo = $billNo;
         $this->transactionType = $transactionType;
@@ -94,6 +98,7 @@ class TransactionObject implements DataTransferObject
         $this->expiresOn = $expiresOn;
         $this->status = $status;
         $this->details = $details;
+        $this->paymentReference = $paymentReference;
     }
 
     /**
@@ -226,6 +231,14 @@ class TransactionObject implements DataTransferObject
         }, $this->details);
     }
 
+    /**
+     * @return string|null
+     */
+    public function getPaymentReference(): ?string
+    {
+        return $this->paymentReference;
+    }
+
 
 
 
diff --git a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionRefundCalculationObject.php b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionRefundCalculationObject.php
new file mode 100644
index 00000000..6da9a37d
--- /dev/null
+++ b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionRefundCalculationObject.php
@@ -0,0 +1,176 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+use App\Models\Transaction;
+use App\Models\Booking;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
+
+class TransactionRefundCalculationObject implements DataTransferObject
+{
+    private $booking;
+
+    private $transaction;
+
+    private $amount;
+
+    private $currency_rate;
+
+    private $unrequested_amount;
+
+    private $conversionObject;
+
+    private $configurations;
+
+    private $refund_amount;
+
+    private $refund_service_charge;
+
+    private $refund_tax;
+
+    private $refund_total_amount;
+
+    private $refund_conversion_amount;
+
+    /**
+     * TransactionRefundCalculationObject constructor.
+     * @param float $price
+     */
+    public function __construct(Booking $booking, Transaction $transaction, ?float $amount = 0.00, ?float $currency_rate = 0.00)
+    {
+        $this->booking = $booking;
+        $this->transaction = $transaction;
+        $this->amount = $amount;
+        $this->currency_rate = $currency_rate;
+    }
+
+    /**
+     * @return Booking
+     */
+    public function getBooking(): Booking
+    {
+        return $this->booking;
+    }
+
+    /**
+     * @return Transaction
+     */
+    public function getTransaction(): Transaction
+    {
+        return $this->transaction;
+    }
+
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+    public function getCurrencyRate(): float
+    {
+        return $this->currency_rate;
+    }
+
+    /**
+     * @return float
+     */
+    public function setUnrequestedAmount()
+    {
+        $this->unrequested_amount = $this->transaction->original_amount == $this->amount ? $this->transaction->original_amount : $this->transaction->original_amount - $this->amount;
+        return $this;
+    }
+
+    public function getUnrequestedAmount()
+    {
+        return $this->unrequested_amount;
+    }
+
+    public function setConversionObject()
+    {
+        $this->conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $this->getUnrequestedAmount())), $this->booking->convertible_currency_id, $this->booking->service_id,  $this->booking->fix_currency_id === 1 ? 0 : 1);
+        return $this;
+    }
+
+    public function getConversionObject()
+    {
+        return $this->conversionObject;
+    }
+
+    public function setConfigurations()
+    {
+        $this->configurations = app('App\Classes\Modules\Bookings\Services\FetchesBookingQuotation')->execute($this->booking->company, $this->getConversionObject());
+        return $this;
+    }
+
+    public function getConfigurations()
+    {
+        return $this->configurations;
+    }
+
+    public function setRefundAmount()
+    {
+        $this->refund_amount = $this->transaction->amount == $this->getConfigurations()->getLocalTotal() ? $this->transaction->amount : $this->transaction->amount - $this->getConfigurations()->getLocalTotal();
+        return $this;
+    }
+
+    public function getRefundAmount()
+    {
+        return $this->refund_amount;
+    }
+
+    public function setRefundServiceCharge()
+    {
+        $this->refund_service_charge = $this->transaction->service_charge == $this->getConfigurations()->getServiceCharge() ? $this->transaction->service_charge : $this->transaction->service_charge - $this->getConfigurations()->getServiceCharge();
+        return $this;
+    }
+
+    public function getRefundServiceCharge()
+    {
+        return $this->refund_service_charge;
+    }
+
+    public function setRefundTax()
+    {
+        $this->refund_tax = $this->transaction->tax == $this->getConfigurations()->getTax() ? $this->transaction->tax : $this->transaction->tax - $this->getConfigurations()->getTax();
+        return $this;
+    }
+
+    public function getRefundTax()
+    {
+        return $this->refund_tax;
+    }
+
+    public function setRefundTotalAmount()
+    {
+        $this->refund_total_amount = $this->getRefundAmount() + $this->getRefundServiceCharge() + $this->getRefundTax();
+        return $this;
+    }
+
+    public function getRefundTotalAmount()
+    {
+        return $this->refund_total_amount;
+    }
+
+    public function setRefundConversionAmount()
+    {
+        $this->refund_conversion_amount = $this->getCurrencyRate() ? $this->transaction->original_amount * (1 / $this->getCurrencyRate()) : $this->transaction->original_amount;
+        return $this;
+    }
+
+    public function getRefundConversionAmount()
+    {
+        return $this->refund_conversion_amount;
+    }
+
+    public function init(){
+        $this->setUnrequestedAmount();
+        $this->setConversionObject();
+        $this->setConfigurations();
+        $this->setRefundAmount();
+        $this->setRefundServiceCharge();
+        $this->setRefundTax();
+        $this->setRefundTotalAmount();
+        $this->setRefundConversionAmount();
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
index ff76d197..e583eaf9 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
@@ -115,7 +115,6 @@ class CreateInvoiceTransactionProcessor
         if ((float) $booking_amount > (float) $payable_amount) {
             return;
         }
-
         // confirm that all payments has been transferred
         if($this->calculatesBookingTransferredAmount->execute($booking) !== $this->calculatesBookingPaidAmount->execute($booking)){
             return;
diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
new file mode 100644
index 00000000..3e7e8137
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -0,0 +1,188 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
+use App\Classes\Modules\Bookings\Services\FetchesBookingQuotation;
+use App\Classes\Modules\Bookings\Services\GeneratesBookingQuotation;
+use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Booking;
+use App\Models\Document;
+use Carbon\Carbon;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+
+class CreateProformaInvoiceTransactionProcessor
+{
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+
+    /** @var CalculatesBookingPayableAmount */
+    private $calculatesBookingPayableAmount;
+
+    /** @var CalculatesBookingCurrencyAverageRate */
+    private $calculatesBookingCurrencyAverageRate;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+
+    /** @var CalculatesBookingOutstanding */
+    private $calculatesBookingOutstanding;
+
+    /** @var GeneratesBookingQuotation */
+    private $generatesBookingQuotation;
+
+    /** @var FetchesBookingQuotation */
+    private $fetchesBookingQuotation;
+
+    /** @var FetchesCompanyPaymentAttemptLimit */
+    private $fetchesCompanyPaymentAttemptLimit;
+
+
+    /**
+     * CreateProformaInvoiceTransactionProcessor constructor.
+     * @param CreatesTransaction $createsTransaction
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CalculatesBookingPayableAmount $calculatesBookingPayableAmount
+     * @param CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate
+     * @param FetchesCompany $fetchesCompany
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFile
+     * @param CalculatesBookingOutstanding $calculatesBookingOutstanding
+     * @param GeneratesBookingQuotation $generatesBookingQuotation
+     * @param FetchesBookingQuotation $fetchesBookingQuotation
+     * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit
+     */
+    public function __construct(CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculatesBookingPayableAmount $calculatesBookingPayableAmount, CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate, FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, CalculatesBookingOutstanding $calculatesBookingOutstanding, GeneratesBookingQuotation $generatesBookingQuotation, FetchesBookingQuotation $fetchesBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit)
+    {
+        $this->createsTransaction = $createsTransaction;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->calculatesBookingPayableAmount = $calculatesBookingPayableAmount;
+        $this->calculatesBookingCurrencyAverageRate = $calculatesBookingCurrencyAverageRate;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
+        $this->calculatesBookingOutstanding = $calculatesBookingOutstanding;
+        $this->generatesBookingQuotation = $generatesBookingQuotation;
+        $this->fetchesBookingQuotation = $fetchesBookingQuotation;
+        $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
+    }
+
+
+    /**
+     * @param Booking $booking
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Booking $booking) 
+    {
+
+        $po_order_transaction = $booking->transactions()
+            ->where('type', TransactionType::PURCHASE_ORDER)
+            ->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])
+            ->first();
+
+        $outstanding = $this->calculatesBookingOutstanding->execute($booking);
+
+        $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $outstanding)), $booking->convertible_currency_id, $booking->service_id,  $booking->fix_currency_id === 1 ? 0:1, PaymentMethodType::CASH);
+
+        $configurations = $this->fetchesBookingQuotation->execute($booking->company, $conversionObject);
+
+        $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company);
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
+
+
+        $object = new TransactionObject($billNumber, TransactionType::PAYMENT, 1, $booking->company->id,
+            $configurations->getConfigurations()->getBankId(), $configurations->getConversionObject()->getPaymentMethod(),
+            $configurations->getTotal(), $configurations->getForeignTotal(), 1,
+            $configurations->getConversionObject()->getCurrencyId(), $configurations->getConfigurations()->getRate(),
+            $configurations->getTax(), $configurations->getServiceCharge(), Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_SUBMISSION, [], isset($billPlzBill) ? $billPlzBill->id : NULL);
+
+        $this->createsTransaction->execute($booking, $object);
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('PROFORMA-');
+
+        $payable_amount = $booking->transactions()->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::SUSPENDED])->payments()->sum('amount');
+        $booking_amount = $booking->fix_amount;
+
+        $transaction = $booking->transactions()
+            ->where('type', TransactionType::PAYMENT)
+            ->first();
+
+        $booking_currency_average_rate = $booking_amount / $booking->transactions()->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::SUSPENDED])->payments()->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
+
+        $total_service_charge = $booking->transactions()
+            ->where('type', TransactionType::PAYMENT)
+            ->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::SUSPENDED])
+            ->sum('service_charge');
+
+        $total_tax = $booking->transactions()
+            ->where('type', TransactionType::PAYMENT)
+            ->whereIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::SUSPENDED])
+            ->sum('tax');
+
+        $transaction_object = new TransactionObject(
+            $billNumber,
+            TransactionType::PROFORMA,
+            $transaction->issuer,
+            $transaction->receiver,
+            $transaction->recipient_bank_account_id,
+            $transaction->payment_method,
+            $payable_amount,
+            $booking_amount,
+            $transaction->currency_id,
+            $transaction->original_currency_id,
+            $booking_currency_average_rate,
+            $total_tax,
+            $total_service_charge,
+            null,
+            ApprovalStatus::APPROVED
+        );
+
+        $perofrma_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object);
+
+        $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]);
+
+        $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.proforma_invoice', ['invoice_transaction' => $perofrma_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+        $document_object = new DocumentObject(
+            DocumentType::PROFORMA_INVOICE,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($purchase_order_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'proforma_invoices'
+        );
+
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $this->createsFile->execute($document, $document_object);
+
+
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php
new file mode 100644
index 00000000..7297c670
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Transactions\Services\CreatesWalletTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Models\Wallet;
+
+class CreateWalletTransactionProcessor
+{
+    /** @var CreatesWalletTransaction */
+    private $createsWalletTransaction;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    public function __construct(CreatesWalletTransaction $createsWalletTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber)
+    {
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsWalletTransaction = $createsWalletTransaction;
+    }
+
+
+    /**
+     * @param Booking $booking
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Wallet $wallet, WalletObject $walletOject, int $transactionType)
+    {
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('WAL-');
+
+        $transaction_object = new TransactionObject(
+            $billNumber,
+            $transactionType,
+            $wallet->company->id,
+            1,
+            1,
+            PaymentMethodType::BA,
+            $walletOject->getAmount(),
+            $walletOject->getAmount(),
+            $wallet->currency_id,
+            $wallet->currency_id,
+            0,
+            0,
+            0,
+            null,
+            ApprovalStatus::PENDING_SUBMISSION
+        );
+        $walletTransaction = $this->createsWalletTransaction->execute($wallet, $transaction_object);
+
+        return $walletTransaction;
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php
new file mode 100644
index 00000000..7c7277f8
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Models\Wallet;
+
+class UpdateWalletTransactionProcessor
+{
+    /** @var CreatesWalletTransaction */
+    private $createsWalletTransaction;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var ListWallet  */
+    private $fetchesWallet;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWallet $updatesWallet, FetchesTransaction $fetchesTransaction)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updatesWallet = $updatesWallet;
+    }
+
+
+    /**
+     * @param Booking $booking
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(int $transactionId, int $transactionStatus)
+    {
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $transactionId]);
+        $wallet = $transaction->wallet;
+
+        switch($transaction->type){
+            case TransactionType::TOP_UP:
+                $updateWalletAmount = $transaction->amount + $wallet->amount;
+                break;
+            case TransactionType::WITHDRAW:
+                $updateWalletAmount = $wallet->amount - $transaction->amount;
+                break;
+            default:
+                break;
+        }
+
+        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $updateWalletAmount);
+
+        $this->updatesTransactionStatus->execute($transaction, $transactionStatus);
+
+        $this->updatesWallet->execute($wallet, $walletOject);
+
+        return $wallet;
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
index ddebf0d5..06530564 100644
--- a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
+++ b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
@@ -2,20 +2,20 @@
 
 namespace App\Classes\Modules\Transactions\Services;
 
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\General\Interfaces\Transactionable;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Models\Booking;
 use App\Models\Transaction;
 
 class CreatesTransaction extends AbstractUpdateRelationshipRecord
 {
     /**
+     * @param Transactionable $transactionable
      * @param TransactionObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Booking $booking, TransactionObject $object) {
+    public function execute(Transactionable $transactionable, TransactionObject $object) {
         $model = new Transaction();
         $model->bill_no = $object->getBillNo();
         $model->type = $object->getTransactionType();
@@ -32,9 +32,9 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
         $model->service_charge = $object->getServiceCharge();
         $model->expires_on = $object->getExpiresOn();
         $model->status = $object->getStatus();
+        $model->payment_reference = $object->getPaymentReference();
 
-
-        return $this->handler($booking->transactions(), $model);
+        return $this->handler($transactionable->transactions(), $model);
 
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Services/CreatesWalletTransaction.php b/app/Classes/Modules/Transactions/Services/CreatesWalletTransaction.php
new file mode 100644
index 00000000..6c5003c8
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/CreatesWalletTransaction.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Models\Wallet;
+use App\Models\Transaction;
+
+class CreatesWalletTransaction extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param TransactionObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Wallet $wallet, TransactionObject $object) {
+        $model = new Transaction();
+        $model->bill_no = $object->getBillNo();
+        $model->type = $object->getTransactionType();
+        $model->issuer = $object->getIssuer();
+        $model->receiver = $object->getReceiver();
+        $model->recipient_bank_account_id = $object->getRecipientBankAccountId();
+        $model->payment_method = $object->getPaymentMethod();
+        $model->amount = $object->getAmount();
+        $model->original_amount = $object->getOriginalAmount();
+        $model->currency_id = $object->getCurrencyId();
+        $model->original_currency_id = $object->getOriginalCurrencyId();
+        $model->currency_rate = $object->getCurrencyRate();
+        $model->tax = $object->getTax();
+        $model->service_charge = $object->getServiceCharge();
+        $model->expires_on = $object->getExpiresOn();
+        $model->status = $object->getStatus();
+
+        return $this->handler($wallet->transactions(), $model);
+
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Services/DeletesTransaction.php b/app/Classes/Modules/Transactions/Services/DeletesTransaction.php
new file mode 100644
index 00000000..66416d60
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/DeletesTransaction.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Transaction;
+
+class DeletesTransaction extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Transaction $model
+     * @return mixed
+     */
+    public function execute(Transaction $model) {
+        return $this->handler($model);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
index efcff6b3..9a613b43 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
@@ -9,6 +9,7 @@ use App\Classes\Modules\Wallets\Services\CreatesWallet;
 use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
 use App\Classes\Modules\Wallets\Standards\Rules\CanCreateCompanyWallet;
 use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
 
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -38,14 +39,18 @@ class CreateWalletLogic extends AbstractControllerLogic
    /** @var CanCreateCompanyWallet */
    private $canCreateCompanyWallet;
 
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
     /**
      * CreateWalletLogic constructor.
      * @param CreatesWallet $createsWallet
      * @param GeneratesWalletCode $generatesWalletCode
      * @param CanCreateCompanyWallet $canCreateCompanyWallet
      */
-    public function __construct(CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet)
+    public function __construct(CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet, FetchesCompany $fetchesCompany)
     {
+        $this->fetchesCompany = $fetchesCompany;
         $this->createsWallet = $createsWallet;
         $this->generatesWalletCode = $generatesWalletCode;
         $this->canCreateCompanyWallet = $canCreateCompanyWallet;
@@ -58,24 +63,14 @@ class CreateWalletLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $object = new WalletObject($request->input('company_id'), $request->input('currency_id'), $this->generatesWalletCode->execute());
 
-            DB::beginTransaction();
+        $this->canCreateCompanyWallet->passes($object);
 
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
 
-            $object = new WalletObject($request->input('currency_id'), $request->input('company_id'), $this->generatesWalletCode->execute());
-
-            $this->canCreateCompanyWallet->passes($object);
-
-            $wallet = $this->createsWallet->execute($object);
-
-            DB::commit();
-
-            return $this->resourceResponse(new WalletResource($wallet));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $wallet = $this->createsWallet->execute($object, $company);
 
+        return $this->resourceResponse(new WalletResource($wallet));
     }
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php
new file mode 100644
index 00000000..cf6b86bb
--- /dev/null
+++ b/app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
+use App\Http\Resources\WalletResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class ListWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'List Company Wallet',
+            'message' => 'You have successfully list company wallet'
+        ];
+    }
+
+    /** @var ListWallet  */
+   private $listsWallet;
+
+   /** @var CanCreateCompanyWallet */
+   private $canListWallet;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(CanListWallet $canListWallet, ListsWallet $listsWallet)
+    {
+        $this->canListWallet = $canListWallet;
+        $this->listsWallet = $listsWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        //$this->canListWallet->passes();
+
+        $query = $this->listsWallet->execute($this->listsWallet->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(WalletResource::collection($query));
+    }
+}
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
new file mode 100644
index 00000000..8497ec32
--- /dev/null
+++ b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanTopUpWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Transactions\Processors\CreateWalletTransactionProcessor;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class TopUpWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'TopUp into Company Wallet',
+            'message' => 'You have successfully topup company wallet'
+        ];
+    }
+
+    /** @var FetchesWallet  */
+   private $fetchesWallet;
+
+   /** @var CanTopUpWallet */
+   private $canTopUpWallet;
+
+    /** @var CreateWalletTransactionProcessor */
+    private $createWalletTransactionProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(CanTopUpWallet $canTopUpWallet, FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor)
+    {
+        $this->canTopUpWallet = $canTopUpWallet;
+        $this->fetchesWallet = $fetchesWallet;
+        $this->createWalletTransactionProcessor = $createWalletTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]);
+
+        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $request->input('amount'));
+
+        $this->canTopUpWallet->passes($walletOject);
+
+        $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::TOP_UP);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+    }
+}
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php
new file mode 100644
index 00000000..b051d3e3
--- /dev/null
+++ b/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Transactions\Processors\UpdateWalletTransactionProcessor;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class UpdateStatusWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Status Transaction Company Wallet',
+            'message' => 'You have successfully status transaction company wallet'
+        ];
+    }
+
+    /** @var ListWallet  */
+   private $fetchesWallet;
+
+   /** @var CanCreateCompanyWallet */
+   private $canListWallet;
+
+    /** @var UpdateWalletTransactionProcessor */
+    private $updateWalletTransactionProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(FetchesWallet $fetchesWallet, UpdateWalletTransactionProcessor $updateWalletTransactionProcessor)
+    {
+        $this->fetchesWallet = $fetchesWallet;
+        $this->updateWalletTransactionProcessor = $updateWalletTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $status = ($request->route('status')=='approve') ? 2 : 4;
+
+        $wallet = $this->updateWalletTransactionProcessor->execute($request->route('transaction_id'), $status);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+
+    }
+}
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php
new file mode 100644
index 00000000..b1491ab7
--- /dev/null
+++ b/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanWithdrawWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Transactions\Processors\CreateWalletTransactionProcessor;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class WithdrawWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Withdraw from Company Wallet',
+            'message' => 'You have successfully withdraw company wallet'
+        ];
+    }
+
+    /** @var FetchesWallet  */
+   private $fetchesWallet;
+
+   /** @var CanWithdrawWallet */
+   private $canWithdrawWallet;
+
+    /** @var CreateWalletTransactionProcessor */
+    private $createWalletTransactionProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(CanWithdrawWallet $canWithdrawWallet, FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor)
+    {
+        $this->canWithdrawWallet = $canWithdrawWallet;
+        $this->fetchesWallet = $fetchesWallet;
+        $this->createWalletTransactionProcessor = $createWalletTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]);
+
+        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $request->input('amount'));
+
+        $this->canWithdrawWallet->passes($walletOject);
+
+        $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::WITHDRAW);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+    }
+}
diff --git a/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php b/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php
index 6f4fcd83..4bfae2f4 100644
--- a/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php
+++ b/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php
@@ -16,17 +16,20 @@ class WalletObject implements DataTransferObject
 	/** @var int */
 	private $code;
 
+    private $amount;
+
     /**
      * WalletObject constructor.
      * @param int $company_id
      * @param int $currency
      * @param int $code
      */
-    public function __construct(int $company_id, int $currency, int $code)
+    public function __construct(int $company_id, int $currency, int $code, float $amount=0)
     {
         $this->company_id = $company_id;
         $this->currency_id = $currency;
         $this->code = $code;
+        $this->amount = $amount;
     }
 
     /**
@@ -53,7 +56,10 @@ class WalletObject implements DataTransferObject
         return $this->code;
     }
 
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
 
 
-
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Wallets/Services/CreatesWallet.php b/app/Classes/Modules/Wallets/Services/CreatesWallet.php
index 720049cb..c114b9de 100644
--- a/app/Classes/Modules/Wallets/Services/CreatesWallet.php
+++ b/app/Classes/Modules/Wallets/Services/CreatesWallet.php
@@ -3,24 +3,26 @@
 namespace App\Classes\Modules\Wallets\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
 use App\Models\Wallet;
+use App\Models\Company;
 
-class CreatesWallet extends AbstractUpdateRecord
+class CreatesWallet extends AbstractUpdateRelationshipRecord
 {
     /**
      * @param WalletObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(WalletObject $object) {
+    public function execute(WalletObject $object, Company $company) {
         $model = new Wallet();
-        $model->company_id = $object->getCompanyId();
+        //$model->company_id = $object->getCompanyId();
         $model->code = $object->getCode();
         $model->currency_id = $object->getCurrency();
 
 
-        return $this->handler($model);
+        return $this->handler($company->wallets(), $model);
 
     }
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Wallets/Services/ListsWallet.php b/app/Classes/Modules/Wallets/Services/ListsWallet.php
new file mode 100644
index 00000000..c11e2063
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Services/ListsWallet.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use Illuminate\Database\Eloquent\Builder;
+use App\Classes\General\Eloquent\AbstractListRecord;
+use App\Models\Wallet;
+
+class ListsWallet extends AbstractListRecord
+{
+    /** @var Booking */
+    private $repository;
+
+    /**
+     * ListsBookings constructor.
+     * @param Booking $repository
+     */
+    public function __construct(Wallet $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Wallets/Services/UpdatesWallet.php b/app/Classes/Modules/Wallets/Services/UpdatesWallet.php
new file mode 100644
index 00000000..8b268fab
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Services/UpdatesWallet.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Models\Wallet;
+use App\Models\Company;
+
+class UpdatesWallet extends AbstractUpdateRecord
+{
+    /**
+     * @param WalletObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Wallet $model, WalletObject  $object) {
+        $model->amount = $object->getAmount();
+        $model->code = $object->getCode();
+        $model->currency_id = $object->getCurrency();
+
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php
new file mode 100644
index 00000000..c87cb316
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\ListWalletValidation;
+
+class CanListWallet extends AbstractRule
+{
+
+    /** @var ListWalletValidation */
+    private $listWalletValidation;
+
+
+    public function __construct(ListWalletValidation $listWalletValidation)
+    {
+        $this->listWalletValidation = $listWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->listWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php
new file mode 100644
index 00000000..9a005498
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\TopUpWalletValidation;
+
+class CanTopUpWallet extends AbstractRule
+{
+
+    /** @var TopUpWalletValidation */
+    private $topUpWalletValidation;
+
+
+    public function __construct(TopUpWalletValidation $topUpWalletValidation)
+    {
+        $this->topUpWalletValidation = $topUpWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->topUpWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php
new file mode 100644
index 00000000..6fb4019d
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\WithdrawWalletValidation;
+
+class CanWithdrawWallet extends AbstractRule
+{
+
+    /** @var WithdrawWalletValidation */
+    private $witdrawWalletValidation;
+
+
+    public function __construct(WithdrawWalletValidation $witdrawWalletValidation)
+    {
+        $this->witdrawWalletValidation = $witdrawWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->witdrawWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php b/app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php
new file mode 100644
index 00000000..1f75aa54
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class ListWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Validators/TopUpWalletValidation.php b/app/Classes/Modules/Wallets/Standards/Validators/TopUpWalletValidation.php
new file mode 100644
index 00000000..d2e1244c
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Validators/TopUpWalletValidation.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class TopUpWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Validators/WithdrawWalletValidation.php b/app/Classes/Modules/Wallets/Standards/Validators/WithdrawWalletValidation.php
new file mode 100644
index 00000000..78660228
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Validators/WithdrawWalletValidation.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class WithdrawWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Classes/ValueObjects/Constants/DocumentType.php b/app/Classes/ValueObjects/Constants/DocumentType.php
index 2b053163..04edf25c 100644
--- a/app/Classes/ValueObjects/Constants/DocumentType.php
+++ b/app/Classes/ValueObjects/Constants/DocumentType.php
@@ -17,6 +17,7 @@ final class DocumentType {
     public const WALLET_TOP_UP_PAYMENT_PROOF = 'WALLET_TOP_UP_PAYMENT_PROOF';
     public const WALLET_REFUND_PAYMENT_PROOF = 'WALLET_REFUND_PAYMENT_PROOF';
 
+    public const PROFORMA_INVOICE = 'PROFORMA_INVOICE';
     public const PURCHASE_ORDER = 'PURCHASE_ORDER';
     public const DELIVER_ORDER = 'DELIVER_ORDER';
     public const INVOICE = 'INVOICE';
diff --git a/app/Classes/ValueObjects/Constants/PaymentMethodType.php b/app/Classes/ValueObjects/Constants/PaymentMethodType.php
index 4efec990..848cf3cd 100644
--- a/app/Classes/ValueObjects/Constants/PaymentMethodType.php
+++ b/app/Classes/ValueObjects/Constants/PaymentMethodType.php
@@ -19,7 +19,7 @@ final class PaymentMethodType {
         'cheque' => self::CHEQUE,
         'ba' => self::BA,
         'wallet' => self::WALLET,
-        'payment gateway' => self::PAYMENT_GATEWAY,
+        'payment_gateway' => self::PAYMENT_GATEWAY,
     ];
 
     public const PAYMENT_METHODS_ID = [
@@ -27,7 +27,7 @@ final class PaymentMethodType {
         self::CHEQUE => 'cheque',
         self::BA => 'ba',
         self::WALLET => 'wallet',
-        self::PAYMENT_GATEWAY => 'payment gateway'
+        self::PAYMENT_GATEWAY => 'payment_gateway'
     ];
 
 }
diff --git a/app/Classes/ValueObjects/Constants/TransactionType.php b/app/Classes/ValueObjects/Constants/TransactionType.php
index c3d9eb64..698abd76 100644
--- a/app/Classes/ValueObjects/Constants/TransactionType.php
+++ b/app/Classes/ValueObjects/Constants/TransactionType.php
@@ -12,7 +12,7 @@ final class TransactionType {
 
     public const BILL = 3;
 
-    public const PERFORMA = 4;
+    public const PROFORMA = 4;
 
     public const TOP_UP = 5;
 
@@ -23,4 +23,6 @@ final class TransactionType {
     public const SUPPLIER_DELIVER = 8;
 
     public const CREDIT_NOTE = 9;
+
+    public const WITHDRAW = 10;
 }
diff --git a/app/Console/Commands/EmailDoToVTCommand.php b/app/Console/Commands/EmailDoToVTCommand.php
index d9d463f0..66e4f7b4 100644
--- a/app/Console/Commands/EmailDoToVTCommand.php
+++ b/app/Console/Commands/EmailDoToVTCommand.php
@@ -5,19 +5,10 @@ namespace App\Console\Commands;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Document;
-use App\Models\State;
-use App\Http\Helpers\General;
 
-use App\Models\Transaction;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
-use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
-use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
-use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
-use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
-use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Mail;
@@ -62,14 +53,16 @@ class EmailDoToVTCommand extends Command
         Auth::login(User::findOrFail(1));
         $zip_file = 'do_'.Carbon::yesterday()->format('Y_m_d').'.zip';
         $attachment = storage_path().'/'.$zip_file;
+
         $zip = new ZipArchive();
         if ($zip->open($attachment, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
+
             $bookings = \App\Models\Booking::where('status', ApprovalStatus::COMPLETED)->whereDate('updated_at', Carbon::yesterday())
                 ->whereHas('transactions', function ($query){
                     return $query->where('type', TransactionType::BILL)->where('issuer', 2);
                 })->get();
 
-            if(!$bookings){ return; }
+            if(!count($bookings)){ return; }
 
             foreach ($bookings as $booking) {
                 $file = $booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()->files()->first();
@@ -82,7 +75,7 @@ class EmailDoToVTCommand extends Command
             Mail::raw( "Attention to VT Admin team:\r\n\r\nKindly refer to the attachment for our DAILY DO COMPILATION ".Carbon::yesterday()->format('d-m-Y').".\r\n\r\n**This is an automatically generated email – please do not reply to it. If you have any queries kindly contact our admin team through Wechat.\r\n\r\n\r\nCIEF WORLDWIDE SDN BHD", function($message) use ($attachment){
                 $message->from('exchange@cief-malaysia.com');
                 $message->to(['vtnation16@gmail.com', 'vtnation@gmail.com', 'atvantic04@gmail.com', 'vtnation2@gmail.com']);
-                $message->cc(['shafiqa_sukeri@cief-malaysia.com', 'frontendcief@gmail.com', 'pm@cief-malaysia.com', 'hasan@cief-malaysia.com', 'shipping_admin@cief-malaysia.com', 'hasanakbar27@gmail.com', 'pmwong2019@gmail.com']);
+                $message->cc(['shafiqa_sukeri@cief-malaysia.com', 'frontendcief@gmail.com', 'pm@cief-malaysia.com', 'hasan@cief-malaysia.com', 'shipping_admin@cief-malaysia.com', 'hasanakbar27@gmail.com', 'pmwong2019@gmail.com', 'uldvstar@gmail.com']);
                 $message->subject('CIEF DO COMPILATION '.Carbon::yesterday()->format('d-m-Y'));
 
                 $message->attach($attachment);
@@ -94,4 +87,5 @@ class EmailDoToVTCommand extends Command
 
         }
     }
+
 }
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 75c6edf1..8edaaa22 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -32,7 +32,7 @@ class Kernel extends ConsoleKernel
     {
 
         // $schedule->command('inspire')->hourly();
-        $schedule->command('mail:EmailDoToVTCommand')->dailyAt('10:00');
+        $schedule->command('mail:EmailDoToVTCommand')->dailyAt('10:00')->withoutOverlapping();
 
     }
 
diff --git a/app/Http/Controllers/Billplz/CallbackBillplzController.php b/app/Http/Controllers/Billplz/CallbackBillplzController.php
new file mode 100644
index 00000000..9ee281e6
--- /dev/null
+++ b/app/Http/Controllers/Billplz/CallbackBillplzController.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Billplz;
+
+use App\Classes\Modules\Billplzs\ControllersLogic\CallbackBillplzLogic;
+use Illuminate\Http\Request;
+
+class CallbackBillplzController
+{
+
+    /**
+     * @param Request $request
+     * @param CallbackBillplzLogic $logic
+     * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\ResourceNotFoundException
+     */
+    public function callback(Request $request, CallbackBillplzLogic $logic) {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Billplz/CreateBillplzBillController.php b/app/Http/Controllers/Billplz/CreateBillplzBillController.php
new file mode 100644
index 00000000..c10bad79
--- /dev/null
+++ b/app/Http/Controllers/Billplz/CreateBillplzBillController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Billplz;
+
+use App\Classes\Modules\Billplzs\ControllersLogic\CreateBillplzBillLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBillplzBillController
+{
+    /**
+     * @param Request $request
+     * @param CreateBillplzBillLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateBillplzBillLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/CreateProformaInvoiceTransaction.php b/app/Http/Controllers/Bookings/CreateProformaInvoiceTransaction.php
new file mode 100644
index 00000000..11b0739c
--- /dev/null
+++ b/app/Http/Controllers/Bookings/CreateProformaInvoiceTransaction.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\CreateProformaInvoiceTransactionLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateProformaInvoiceTransaction
+{
+    /**
+     * @param Request $request
+     * @param CreateProformaInvoiceTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateProformaInvoiceTransactionLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/RegenerateInvoiceBookingController.php b/app/Http/Controllers/Bookings/RegenerateInvoiceBookingController.php
new file mode 100644
index 00000000..d63c1b9c
--- /dev/null
+++ b/app/Http/Controllers/Bookings/RegenerateInvoiceBookingController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\RegenerateInvoiceBookingLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RegenerateInvoiceBookingController
+{
+    /**
+     * @param Request $request
+     * @param RegenerateInvoiceBookingLogic $logic
+     * @return JsonResponse
+     */
+    public function regenerate(Request $request, RegenerateInvoiceBookingLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/UpdateBookingAmountController.php b/app/Http/Controllers/Bookings/UpdateBookingAmountController.php
new file mode 100644
index 00000000..d0f6dd6c
--- /dev/null
+++ b/app/Http/Controllers/Bookings/UpdateBookingAmountController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\UpdateBookingAmountLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateBookingAmountController
+{
+    /**
+     * @param Request $request
+     * @param CreateBookingRefundLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateBookingAmountLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}   
\ No newline at end of file
diff --git a/app/Http/Controllers/Transactions/CreateTransactionController.php b/app/Http/Controllers/Transactions/CreateTransactionController.php
index c311ca19..fa67604a 100644
--- a/app/Http/Controllers/Transactions/CreateTransactionController.php
+++ b/app/Http/Controllers/Transactions/CreateTransactionController.php
@@ -10,6 +10,6 @@ class CreateTransactionController
 {
 
     public function create(Request $request, CreateTransactionLogic $logic): JsonResponse {
-        return $logic->execute($request);
+        return $logic->logic($request);
     }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Transactions/DeletePaymentProofDocumentController.php b/app/Http/Controllers/Transactions/DeletePaymentProofDocumentController.php
new file mode 100644
index 00000000..d90cf1df
--- /dev/null
+++ b/app/Http/Controllers/Transactions/DeletePaymentProofDocumentController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\DeleteTransactionLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeletePaymentProofDocumentController
+{
+    public function delete(Request $request, DeleteTransactionLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Wallets/ListWalletController.php b/app/Http/Controllers/Wallets/ListWalletController.php
new file mode 100644
index 00000000..45b2f1d1
--- /dev/null
+++ b/app/Http/Controllers/Wallets/ListWalletController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\ListWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListWalletController
+{
+    public function list(Request $request, ListWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Wallets/TopUpWalletController.php b/app/Http/Controllers/Wallets/TopUpWalletController.php
new file mode 100644
index 00000000..aaa707bd
--- /dev/null
+++ b/app/Http/Controllers/Wallets/TopUpWalletController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\TopUpWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class TopUpWalletController
+{
+
+    public function topUp(Request $request, TopUpWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Wallets/UpdateStatusWalletController.php b/app/Http/Controllers/Wallets/UpdateStatusWalletController.php
new file mode 100644
index 00000000..21eea924
--- /dev/null
+++ b/app/Http/Controllers/Wallets/UpdateStatusWalletController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\UpdateStatusWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateStatusWalletController
+{
+    public function updateStatus(Request $request, UpdateStatusWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Wallets/WithdrawWalletController.php b/app/Http/Controllers/Wallets/WithdrawWalletController.php
new file mode 100644
index 00000000..7c7b944a
--- /dev/null
+++ b/app/Http/Controllers/Wallets/WithdrawWalletController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\WithdrawWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class WithdrawWalletController
+{
+
+    public function withdraw(Request $request, WithdrawWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index cc5f0dca..80199df9 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -5,6 +5,7 @@ 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;
@@ -31,8 +32,8 @@ class BookingResource extends JsonResource
             '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)),
-            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)),
+            '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),
@@ -41,18 +42,32 @@ class BookingResource extends JsonResource
                 '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()),
             ],
             'status' => $this->status,
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
             $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()),
+                '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())->get()),
                 'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
                     $query->where(function($query){
-                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED]);
+                        $query->where(function($query){
+                            $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED]);
+                        })->orWhere(function($query){
+                            $query->where('type', TransactionType::BILL)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED,  ApprovalStatus::COMPLETED]);
+                        });
                     })->orWhere(function($query){
-                        $query->where('type', TransactionType::BILL)->whereIn('status', [ApprovalStatus::APPROVED,  ApprovalStatus::COMPLETED]);
+                        $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/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 18658d33..633985cf 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -21,8 +21,10 @@ class TransactionResource extends JsonResource
             'booking' => new BookingResource($this->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($this->when((int) $this->type === TransactionType::BILL, $this->booking->bank)),
             'issuer_name' => $this->issuerCompany->name,
-            'recipient_bank_account' => new BankResource($this->when((int) $this->type === TransactionType::BILL,$this->booking->bank)),
             'amount' => (double) $this->amount,
             'original_amount' => (double) $this->original_amount,
             'currency' => new CurrencyResource($this->currency),
diff --git a/app/Models/Booking.php b/app/Models/Booking.php
index 33c33341..ea01b302 100644
--- a/app/Models/Booking.php
+++ b/app/Models/Booking.php
@@ -3,13 +3,11 @@
 namespace App\Models;
 
 use App\Classes\General\Interfaces\Documentable;
+use App\Classes\General\Interfaces\Transactionable;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Scopes\CustomerBookingsScope;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -21,10 +19,10 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string marking
  * @property string reference
  * @property float fix_amount
- * @property \App\Models\Currency convertible_currency_id
- * @property \App\Models\Currency conversion_currency_id
+ * @property int convertible_currency_id
+ * @property int conversion_currency_id
  */
-class Booking extends AbstractModel implements Documentable
+class Booking extends AbstractModel implements Documentable, Transactionable
 {
     use SoftDeletes;
 
@@ -89,11 +87,11 @@ class Booking extends AbstractModel implements Documentable
     }
 
     /**
-     * @return HasMany
+     * @return MorphMany
      */
-    public function transactions(): HasMany
+    public function transactions(): MorphMany
     {
-        return $this->HasMany(Transaction::class, 'booking_id');
+        return $this->MorphMany(Transaction::class, 'owner');
     }
 
     protected static function booted()
diff --git a/app/Models/Company.php b/app/Models/Company.php
index e2c9dda4..7b8e4387 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -99,7 +99,15 @@ class Company extends AbstractModel implements Documentable
      */
     public function transactions(): hasManyDeep
     {
-        return $this->hasManyDeep(Transaction::class, [Booking::class], ['company_id',  'booking_id'], ['id', 'id']);
+        return $this->hasManyDeep(Transaction::class, [Booking::class], ['company_id',  'owner_id'], ['id', 'id']);
+    }
+
+    /**
+     * @return MorphMany
+     */
+    public function wallets(): morphMany
+    {
+        return $this->morphMany(Wallet::class, 'owner');
     }
 
     /**
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 6a9c0282..a3e16c79 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -7,23 +7,48 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 
 class Transaction extends AbstractModel implements Documentable
 {
+    use SoftDeletes;
+
     protected $table = 'transactions';
 
+    public function owner(): morphTo
+    {
+        return $this->morphTo();
+    }
+
     /**
-     * @return BelongsTo
+     * @return MorphMany
      */
     public function booking(): BelongsTo
     {
-        return $this->BelongsTo( Booking::class, 'booking_id', 'id');
+        return $this->BelongsTo(Booking::class, 'owner_id', 'id');
+    }
+
+      /**
+     * @return MorphMany
+     */
+    public function wallets(): morphMany
+    {
+        return $this->morphMany(Wallet::class, 'owner');
+    }
+
+     /**
+     * @return BelongsTo
+     */
+    public function wallet(): BelongsTo
+    {
+        return $this->BelongsTo(Wallet::class, 'owner_id', 'id');
     }
 
     /**
@@ -104,10 +129,15 @@ class Transaction extends AbstractModel implements Documentable
 
     /**
      * @param Builder $query
+     * @param string $payment_reference
      * @return Builder
      */
-    public function scopeRefunds(Builder $query)
+    public function scopeRefunds(Builder $query, ?string $payment_reference = NULL)
     {
+        if($payment_reference){
+            $query->where('payment_reference', $payment_reference);
+        }
+
         return $query->where('type', TransactionType::REFUND);
     }
 
@@ -143,6 +173,6 @@ class Transaction extends AbstractModel implements Documentable
      */
     public function scopeTransferred(Builder $query)
     {
-        return $query->whereIn('status', [ApprovalStatus::COMPLETED]);
+        return $query->whereIn('status', [ApprovalStatus::APPROVED]);
     }
 }
diff --git a/app/Models/Wallet.php b/app/Models/Wallet.php
index f9808e9e..52d8f718 100644
--- a/app/Models/Wallet.php
+++ b/app/Models/Wallet.php
@@ -2,16 +2,34 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Relations\HasOne;
-
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 class Wallet extends AbstractModel
 {
-    protected $table = 'wallets';
+    use SoftDeletes;
 
-    public function company(): HasOne
+    protected $table = 'wallets';
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function owner(): morphTo
     {
-        return $this->hasOne(Company::class, 'company_id', 'id');
+        return $this->morphTo();
+    }
+    public function company(): BelongsTo
+    {
+        return $this->BelongsTo(Company::class, 'owner_id', 'id');
     }
 
+     /**
+     * @return morphMany
+     */
+    public function transactions(): morphMany
+    {
+        return $this->morphMany(Transaction::class, 'owner');
+    }
 }
diff --git a/composer.json b/composer.json
index 377c8932..32f52d83 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,7 @@
         "ext-zip": "*",
         "barryvdh/laravel-dompdf": "^0.9.0",
         "carlos-meneses/laravel-mpdf": "^2.1",
+        "doctrine/dbal": "^2.12.1",
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",
         "guzzlehttp/guzzle": "^6.3",
diff --git a/config/billplz.php b/config/billplz.php
new file mode 100644
index 00000000..fb8ed920
--- /dev/null
+++ b/config/billplz.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'base_url' => env('BILLPLZ_BASE_URL', 'https://www.billplz.com'),
+    'api_key' => env('BILLPLZ_API_KEY', '0fa4c710-761b-4a7a-a501-c2c2d02643d5'),
+    'x_signature_key' => env('BILLPLZ_X_SIGNATURE_KEY', 'S-pbNVthVRsvnPfZlgLwqqOg'),
+    'collection_id' => env('BILLPLZ_COLLECTION_ID', 'hev2wdjy'),
+    'redirect_url' => env('BILLPLZ_REDIRECT_URL', 'localhost'),
+    'callback_url' => env('BILLPLZ_CALLBACK_URL', 'localhost'),
+    'maybank' => 'MB2U0227',
+    'cimb' => 'BCBB0235'
+];
\ No newline at end of file
diff --git a/database/migrations/2021_10_02_082211_drop_wallet_transactions_table.php b/database/migrations/2021_10_02_082211_drop_wallet_transactions_table.php
new file mode 100644
index 00000000..f16eeba3
--- /dev/null
+++ b/database/migrations/2021_10_02_082211_drop_wallet_transactions_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class DropWalletTransactionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::dropIfExists('wallet_transaction');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/migrations/2021_10_02_082442_alter_wallet_company_id.php b/database/migrations/2021_10_02_082442_alter_wallet_company_id.php
new file mode 100644
index 00000000..c1eba98a
--- /dev/null
+++ b/database/migrations/2021_10_02_082442_alter_wallet_company_id.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AlterWalletCompanyId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasColumn('wallets', 'company_id')) {
+            Schema::table('wallets', function (Blueprint $table) {
+                $table->dropForeign('wallets_company_id_foreign');
+                $table->dropColumn('company_id');
+            });
+        }
+
+        if (!Schema::hasColumn('wallets', 'owner_id')) {
+            Schema::table('wallets', function (Blueprint $table) {
+                $table->morphs('owner');
+            });
+
+            //In-case the model name lengthy
+            Schema::table('wallets', function (Blueprint $table) {
+                $table->string('owner_type', 250)->change();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php b/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php
new file mode 100644
index 00000000..a37da4e4
--- /dev/null
+++ b/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php
@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
+class AlterTransactionBookingId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!Schema::hasColumn('transactions', 'owner_id')) {
+            Schema::table('transactions', function (Blueprint $table) {
+                $table->morphs('owner');
+            });
+
+            //In-case the model name lengthy
+            Schema::table('transactions', function (Blueprint $table) {
+                $table->string('owner_type', 250)->change();
+            });
+
+            DB::statement("UPDATE transactions SET owner_type='App\\\\Models\\\\Booking', owner_id = booking_id");
+
+            Schema::table('transactions', function (Blueprint $table) {
+                $table->dropForeign('transactions_booking_id_foreign');
+                $table->dropColumn('booking_id');
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/seeds/FakeBookingTransactions.php b/database/seeds/FakeBookingTransactions.php
index 08ff95f7..7eafda1d 100644
--- a/database/seeds/FakeBookingTransactions.php
+++ b/database/seeds/FakeBookingTransactions.php
@@ -230,7 +230,7 @@ class FakeBookingTransactions extends Seeder
                 Constants\TransactionType::PAYMENT,
                 Constants\TransactionType::INVOICE,
                 Constants\TransactionType::BILL,
-                Constants\TransactionType::PERFORMA,
+                Constants\TransactionType::PROFORMA,
                 Constants\TransactionType::TOP_UP,
                 Constants\TransactionType::REFUND,
                 Constants\TransactionType::PURCHASE_ORDER,
diff --git a/resources/assets/sass/modules/_buttons.scss b/resources/assets/sass/modules/_buttons.scss
index e4c1e5b4..3a9879eb 100644
--- a/resources/assets/sass/modules/_buttons.scss
+++ b/resources/assets/sass/modules/_buttons.scss
@@ -120,6 +120,10 @@
 button:focus{
     outline: none !important;
 }
+
+button:disabled {
+    cursor: not-allowed;
+}   
 /*
 Alternate buttons
 --------------------------------------------------
diff --git a/resources/assets/vue/components/accounts/forms/TopUpAccountComponent.vue b/resources/assets/vue/components/accounts/forms/TopUpAccountComponent.vue
new file mode 100644
index 00000000..af8a43b7
--- /dev/null
+++ b/resources/assets/vue/components/accounts/forms/TopUpAccountComponent.vue
@@ -0,0 +1,196 @@
+<template>
+    <div class="row h-100 parentContainer">
+        <div class="col">
+            <div class="col-auto p-l-0 p-r-10">
+                <div class="btn btn-xs btn-primary p-t-0 p-b-0 text-primary-lighter requestModal" style="background-color: rgba(255, 255, 255, 0.2);" data-type="topUpModal">
+                    <i class="fa fa-plus fs-14 m-t-5"></i>
+                </div>
+            </div>
+            <modal-component styleType="fill-in" type="topUpModal">
+                <div class="row zig-zag-top">
+                    <div class="col bg-white padding-25">
+
+
+                        <div class="row m-b-20">
+                            <div class="col">
+                                <div class="row">
+                                    <div class="col-8">
+                                        <div class="btn btn-xs btn-complete no-border btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="paymentMethod.status = !paymentMethod.status">
+                                            <div class="row">
+                                                <div class="col p-t-10 p-b-10">
+                                                    {{paymentMethod.name}}
+                                                </div>
+                                                <div class="col-auto bg-complete-light">
+                                                    <div class="row h-100 align-items-center">
+                                                        <div class="col">
+                                                            <i class="fa" :class="[{'fa-angle-down': !paymentMethod.status}, {'fa-angle-up': paymentMethod.status}]"></i>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="relative w-100">
+                                            <div class="absolute w-100 b-l b-b b-r b-complete" :class="[{'hide': !paymentMethod.status}]" style="top: 100%; right: 0; z-index: 1;">
+                                                <div class="row text-left no-margin bg-white">
+                                                    <div class="col no-padding">
+                                                        <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Bank Transfer'}, {'text-white': paymentMethod.name === 'Bank Transfer'}, {'hover-complete': paymentMethod.name !== 'Bank Transfer'}]" @click="updatePaymentType({name: 'Bank Transfer', id: 'cash'})">
+                                                            <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                <div class="row align-items-center justify-content-center">
+                                                                    <div class="col">
+                                                                        <div class="font-heading fs-10">Bank Transfer</div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Cash Deposit'}, {'text-white': paymentMethod.name === 'Cash Deposit'}, {'hover-complete': paymentMethod.name !== 'Cash Deposit'}]"  @click="updatePaymentType({name: 'Cash Deposit', id: 'cash'})">
+                                                            <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                <div class="row align-items-center justify-content-center">
+                                                                    <div class="col">
+                                                                        <div class="font-heading fs-10">Cash Deposit</div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Cheque'}, {'text-white': paymentMethod.name === 'Cheque'}, {'hover-complete': paymentMethod.name !== 'Cheque'}]" @click="updatePaymentType({name: 'Cheque', id: 'cheque'})">
+                                                            <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                <div class="row align-items-center justify-content-center">
+                                                                    <div class="col">
+                                                                        <div class="font-heading fs-10">Cheque</div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Banker\'s Acceptance'}, {'text-white': paymentMethod.name === 'Banker\'s Acceptance'}, {'hover-complete': paymentMethod.name !== 'Banker\'s Acceptance'}]" @click="updatePaymentType({name: 'Banker\'s Acceptance', id: 'ba'})">
+                                                            <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                <div class="row align-items-center justify-content-center">
+                                                                    <div class="col">
+                                                                        <div class="font-heading fs-10">Banker's Acceptance</div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Online Transfer'}, {'text-white': paymentMethod.name === 'Online Transfer'}, {'hover-complete': paymentMethod.name !== 'Online Transfer'}]" @click="updatePaymentType({name: 'Online Transfer', id: 'ot'})">
+                                                            <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                <div class="row align-items-center justify-content-center">
+                                                                    <div class="col">
+                                                                        <div class="font-heading fs-10">Online Transfer</div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row m-r-0">
+                                    <div class="col p-r-0">
+                                        <validation-wrapper-component :validator="$v.amount">
+                                            <label>Amount</label>
+                                            <input class="form-control" name="amount" v-model.lazy="amount">
+                                            <!-- <input class="form-control" name="amount" v-model.lazy="amount" v-money="{decimal: '.',thousands: ',', precision: 2}"> -->
+                                        </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">{{this.data.fixed_currency.short_code}}</div> -->
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="row" v-if="paymentMethod.name == 'Online Transfer'">
+                                    <div class="col">
+
+                                        <div class="row m-t-10">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col-8">
+                                                        <div class="btn btn-xs btn-block text-left b-rad-none p-t-10 p-b-10 p-l-15 p-r-15" :class="[{'b-complete': onlinePayment.bankName === 'Maybank'}]" @click="selectOnlinePaymentBank({bankName: 'Maybank', id: 'maybank'})">
+                                                            <img src="https://shopee.com.my/static/images/bank_logo/img_bankmy_maybank.png" alt="">
+                                                            Maybank2u
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row m-t-10">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col-8">
+                                                        <div class="btn btn-xs btn-block text-left b-rad-none p-t-10 p-b-10 p-l-15 p-r-15" :class="[{'b-complete': onlinePayment.bankName === 'Cimb'}]" @click="selectOnlinePaymentBank({bankName: 'Cimb', id: 'cimb'})">
+                                                            <img src="https://shopee.com.my/static/images/bank_logo/img_bankmy_cimb.png" alt="">
+                                                            Cimb
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-4 p-r-0">
+                                <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lighter btn-block" data-dismiss="modal">Cancel</button>
+                            </div>
+                            <div class="col p-l-0">
+                                <button class="btn btn-xs all-caps b-rad-none btn-success btn-block" v-if="!(paymentMethod.name === 'Online Transfer' && onlinePayment.status === false)" @click="submitForm()">Confirm</button>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </modal-component>
+        </div>
+    </div>
+
+</template>
+<script>
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                loading: false,
+                // amount: (Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100).toFixed(2),
+                amount: (Math.round(1000 * 100) / 100).toFixed(2),
+                paymentMethod: {
+                    name: 'Bank Transfer',
+                    id: 'cash',
+                    status: false
+                },
+                onlinePayment: {    
+                    bankName: '',
+                    id: '',
+                    status: false
+                },
+            }
+        },
+        validations () {
+            return {
+                amount: { required }
+            }
+        },
+        methods:{
+            updatePaymentType(payment){
+                this.paymentMethod = {
+                    name: payment.name,
+                    id: payment.id,
+                    status: false,
+                }
+            },
+            selectOnlinePaymentBank(bankName){
+                this.onlinePayment = {
+                    bankName: bankName.bankName,
+                    id: bankName.id,
+                    status: true,
+                }
+            },
+        }
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 6f1c723c..fb157182 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -1,63 +1,98 @@
 <template>
     <div class="row m-l-0 m-b-10 m-r-0 parentContainer" :class="[{'b-a': item.status === 4}, {'b-danger': item.status === 4}]" >
         <div class="col">
-            <div class="row">
-                <div class="col p-t-10 p-b-10 p-r-0 pointer" @click="expanded = !expanded" :class="[{'bg-master-lighter': item.status === 1}, {'bg-white': item.status !== 1 && item.status !== 4}]">
-                    <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" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
-                                {{ item.status === 1 ? 'Pending Verification' : item.status === 2 ? 'Processing Payment' : item.status === 4 ? 'Rejected' : 'Transferred'}}
-                            </div>
-                        </div>
-                        <div class="col-auto p-l-0">
-                            <div class="font-heading fs-8 muted all-caps">Payment Amount</div>
-                            <div class="font-heading fs-10 bold">
-                                {{ item.type === 3 ? item.original_currency.short_code : item.currency.short_code}} {{(Math.round((item.type === 3 ? item.original_amount : item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row m-b-5">
-                        <div class="col" v-if="$store.getters.isAdmin && item.type === 3">
-                            <div class="font-heading fs-8 muted all-caps">Supplier</div>
-                            <div class="font-heading fs-10 bold">
-                                {{item.issuer_name}}
-                            </div>
-                        </div>
-                    </div>
+            <div class="row" v-if="item.type === 1">
+                <div class="col">
                     <div class="row">
-                        <div class="col">
-                            <div class="font-heading fs-8 all-caps" :class="[{'text-danger': item.status === 4}, {'text-primary': item.status !== 4}]">{{ item.status === 1 ? 'Submitted' : item.status === 2 ? 'Received' : item.status === 4 ? 'Rejected' : 'Paid'}} On: {{item.updated_at}}</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-auto" v-if="item.status !== 3" :class="[{'bg-master-light': item.status === 1}, {'bg-master-lighter': item.status === 2}]">
-                    <div class="row align-items-center h-100">
-                        <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>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-auto bg-success" v-if="item.status === 3">
-                    <document-file-viewer-component class="h-100" :file="item.documents.files[0]">
-                        <template slot="button">
-                            <div class="row align-items-center h-100">
-                                <div class="col">
-                                    <i class="fa fa-cloud-download text-white"></i>
+                        <div class="col p-t-10 p-b-10 p-r-0 pointer" @click="clickExpand()" :class="[{'bg-master-lighter': item.status === 1}, {'bg-white': item.status !== 1 && item.status !== 4}]">
+                            <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>
+                                </div>
+                                <div class="col-auto p-l-0">
+                                    <div class="font-heading fs-8 muted all-caps">Payment Amount</div>
+                                    <div class="font-heading fs-10 bold">
+                                        {{item.currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                    </div>
                                 </div>
                             </div>
-                        </template>
-                    </document-file-viewer-component>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="font-heading fs-8 all-caps" :class="[{'text-danger': item.status === 4}, {'text-primary': item.status !== 4}]">{{ item.status === 2 ? 'Received' : item.status === 4 ? 'Rejected' : 'Submitted'}} On: {{item.updated_at}}</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto" v-if="item.status !== 3" :class="[{'bg-master-light': item.status === 1}, {'bg-master-lighter': item.status === 2}]">
+                            <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>
+                                </div>
+                            </div>
+                            <div class="row align-items-center h-100" v-if="item.payment_method === 5 && item.status === 1">
+                                <div class="col">
+                                    <a :href="'https://www.billplz.com/bills/'+item.payment_reference"><i class="fa fa-repeat text-success"></i></a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="row" v-show="expanded">
+            <div class="row" v-if="item.type === 3">
+                <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}, {'bg-white': item.status !== 1 && item.status !== 4}]">
+                            <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" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
+                                        {{ item.status === 1 ? 'Processing Payment' : 'Transferred'}}
+                                    </div>
+                                </div>
+                                <div class="col-auto p-l-0">
+                                    <div class="font-heading fs-8 muted all-caps">Payment Amount</div>
+                                    <div class="font-heading fs-10 bold">
+                                        {{item.original_currency.short_code}} {{(Math.round((item.original_amount + 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 fs-8 all-caps" >{{ item.status === 1 ? 'Paid On: ' + customerBooking.updated_at : 'Transferred On:' + item.updated_at }}</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto" v-if="item.status !== 3 && item.status !== 2" :class="[{'bg-master-light': item.status === 1}, {'bg-master-lighter': item.status === 2}]">
+                            <div class="row align-items-center h-100">
+                                <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>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto bg-success" v-if="item.status === 2 || item.status === 3">
+                            <document-file-viewer-component class="h-100" :file="item.documents.files[0]">
+                                <template slot="button">
+                                    <div class="row align-items-center h-100">
+                                        <div class="col">
+                                            <i class="fa fa-cloud-download text-white"></i>
+                                        </div>
+                                    </div>
+                                </template>
+                            </document-file-viewer-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-if="expandPaymentDetails">
                 <div class="col bg-white padding-15">
                     <div class="row align-items-end m-b-10 text-success bold">
                         <div class="col">
                             <div class="font-heading all-caps fs-10">Recipient Gets</div>
                         </div>
                         <div class="col-auto text-right">
-                            <div class="font-heading fs-10">{{this.customerBooking.original_currency.short_code}} {{(Math.round((item.type === 3 ? customerBooking.original_amount : item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                            <div class="font-heading fs-10">{{this.customerBooking.original_currency.short_code}} {{(item.original_amount).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                         </div>
                     </div>
                     <div class="row align-items-end bold m-b-10 text-primary">
@@ -95,7 +130,7 @@
                     <div class="row">
                         <div class="col">
                             <div class="font-heading all-caps fs-10 m-b-5">Your Payment Proof</div>
-                            <div class="row no-margin">
+                            <div class="row no-margin" v-if="customerBooking.payment_method !== 5">
                                 <div v-if="customerBooking.documents != null">
                                     <div v-for="file in customerBooking.documents.files" v-bind:key="file.id"  class="col-auto no-padding m-r-5">
                                         <document-file-viewer-component :file="file">
@@ -108,10 +143,17 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="row no-margin" v-if="customerBooking.payment_method === 5 && (customerBooking.status === 2 || customerBooking.status === 3)">
+                                <a :href="'https://www.billplz.com/bills/'+customerBooking.payment_reference" target="_blank">
+                                    <div class="icon-thumbnail fs-11 text-white icon-25 bg-primary btn-rounded float-left m-r-5">
+                                        <i class="fa fa-file-image-o fs-10"></i>
+                                    </div>
+                                </a>
+                            </div>
                         </div>
                         <div class="col text-right">
                             <div class="font-heading all-caps fs-10 m-b-5">Our Payment Proof</div>
-                            <div class="row no-margin justify-content-end" v-if="item.status === 3">
+                            <div class="row no-margin justify-content-end" v-if="item.type === 3 && (item.status === 2 || item.status === 3)">
                                 <div v-for="file in item.documents.files" v-bind:key="file.id"  class="col-auto no-padding m-l-5">
                                     <document-file-viewer-component :file="file">
                                         <template slot="button">
@@ -124,6 +166,110 @@
                             </div>
                         </div>
                     </div>
+                    <div class="row m-t-10 hide">
+                        <div class="col">
+                            <button class="btn btn-xs all-caps b-rad-none btn-success btn-block 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"></refund-confirmation-component>
+                            </modal-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- <div class="row" v-show="expandRefund"> -->
+            <div class="row" v-show="false">
+                <div class="col bg-white padding-15">
+                    <div class="row m-b-10">
+                        <div class="col-8">
+                            <div class="font-heading all-caps fs-10 m-b-5">Refund Type: </div>
+                            <div class="btn btn-xs btn-complete no-border btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="refundMethod.status = !refundMethod.status">
+                                <div class="row">
+                                    <div class="col p-t-10 p-b-10">
+                                        {{refundMethod.name}}
+                                    </div>
+                                    <div class="col-auto bg-complete-light">
+                                        <div class="row h-100 align-items-center">
+                                            <div class="col">
+                                                <i class="fa" :class="[{'fa-angle-down': !refundMethod.status}, {'fa-angle-up': refundMethod.status}]"></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="relative w-100">
+                                <div class="absolute w-100 b-l b-b b-r b-complete" :class="[{'hide': !refundMethod.status}]" style="top: 100%; right: 0; z-index: 1;">
+                                    <div class="row text-left no-margin bg-white">
+                                        <div class="col no-padding">
+                                            <div class="row no-margin" :class="[{'bg-complete-light': refundMethod.name === 'Fully Refund'}, {'text-white': refundMethod.name === 'Fully Refund'}, {'hover-complete': refundMethod.name !== 'Fully Refund'}]" @click="updateRefundType({name: 'Fully Refund'})">
+                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                    <div class="row align-items-center justify-content-center">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-10">Fully Refund</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row no-margin" :class="[{'bg-complete-light': refundMethod.name === 'Partially Refund'}, {'text-white': refundMethod.name === 'Partially Refund'}, {'hover-complete': refundMethod.name !== 'Partially Refund'}]" @click="updateRefundType({name: 'Partially Refund'})">
+                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                    <div class="row align-items-center justify-content-center">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-10">Partially Refund</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-r-0 m-b-10" v-if="refundMethod.name == 'Fully Refund'">
+                        <div class="col p-r-0">
+                            <validation-wrapper-component :validator="parameters.amount" v-if="refundMethod.name == 'Fully Refund'">
+                                <label>Amount</label>
+                                <input class="form-control disabled" name="amount" v-model.lazy="amount" disabled>
+                            </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">{{''}}</div>
+                                </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="parameters.amount">
+                                <label>Amount</label>
+                                <input class="form-control" name="amount">
+                            </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">{{''}}</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="form-group no-margin form-group-default">
+                                <label>Account No.</label>
+                                <input type="text" class="form-control">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-4 p-r-0">
+                            <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lighter btn-block" @click="requestRefund()">Cancel</button>
+                        </div>
+                        <div class="col p-l-0">
+                            <button class="btn btn-xs all-caps b-rad-none btn-success btn-block" @click="submitForm()">Refund</button>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -135,7 +281,19 @@
     export default {
         data(){
             return {
-                expanded: false
+                expandPaymentDetails: false,
+                expandRefund: false,
+                refundMethod: {
+                    name: 'Fully Refund',
+                    status: false
+                },
+                amount: (Math.round(1000 * 100) / 100).toFixed(2),
+                parameters: {
+                    amount: (Math.round(1000 * 100) / 100).toFixed(2),
+                    bank_id: 1
+                },
+                expanded: false,
+                section: 'bookingDetailSection',
             }
         },
         computed: {
@@ -143,6 +301,29 @@
               return this.item.type === 1 ? this.item : this.item.customer_booking;
           }
         },
+        methods: {
+            submitForm(){
+                this.submit(this.route('api.booking.refund.create', this.data.booking.id, this.data.id), 'post', this.section, true, true);
+            },
+            requestRefund(){
+                this.expandRefund = !this.expandRefund;
+                this.expandPaymentDetails = !this.expandPaymentDetails;
+            },
+            clickExpand(){
+                if (this.expandPaymentDetails == false && this.expandRefund == false) {
+                    this.expandPaymentDetails = !this.expandPaymentDetails;
+                } else {
+                    this.expandRefund = false;
+                    this.expandPaymentDetails = false;
+                }
+            },
+            updateRefundType(refund){
+                this.refundMethod = {
+                    name: refund.name,
+                    status: !this.refundMethod.status
+                }
+            },
+        },
         mixins: [componentHandler]
     }
 </script>
diff --git a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
new file mode 100644
index 00000000..9a810def
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
@@ -0,0 +1,337 @@
+<template>
+ <div class="row zig-zag-top">
+        <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>
+                    </div>
+                </div>
+            </div>
+            <div class="row p-b-20 b-b b-dashed b-grey m-b-20">
+                <div class="col">
+                    <div class="row">
+                        <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="btn btn-xs btn-complete no-border btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="refundMethod.status = !refundMethod.status">
+                                                                <div class="row">
+                                                                    <div class="col p-t-10 p-b-10">
+                                                                        {{refundMethod.name}}
+                                                                    </div>
+                                                                    <div class="col-auto bg-complete-light">
+                                                                        <div class="row h-100 align-items-center">
+                                                                            <div class="col">
+                                                                                <i class="fa" :class="[{'fa-angle-down': !refundMethod.status}, {'fa-angle-up': refundMethod.status}]"></i>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div> -->
+                                                            <!-- <div class="relative w-100">
+                                                                <div class="absolute w-100 b-l b-b b-r b-complete" :class="[{'hide': !refundMethod.status}]" style="top: 100%; right: 0; z-index: 1;">
+                                                                    <div class="row text-left no-margin bg-white">
+                                                                        <div class="col no-padding">
+                                                                            <div class="row no-margin" :class="[{'bg-complete-light': refundMethod.name === 'Fully Refund'}, {'text-white': refundMethod.name === 'Fully Refund'}, {'hover-complete': refundMethod.name !== 'Fully Refund'}]" @click="updateRefundType({name: 'Fully Refund'})">
+                                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                                    <div class="row align-items-center justify-content-center">
+                                                                                        <div class="col">
+                                                                                            <div class="font-heading fs-10">Fully Refund</div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                            <div class="row no-margin" :class="[{'bg-complete-light': refundMethod.name === 'Partially Refund'}, {'text-white': refundMethod.name === 'Partially Refund'}, {'hover-complete': refundMethod.name !== 'Partially Refund'}]" @click="updateRefundType({name: 'Partially Refund'})">
+                                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                                    <div class="row align-items-center justify-content-center">
+                                                                                        <div class="col">
+                                                                                            <div class="font-heading fs-10">Partially Refund</div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div> -->
+                                                            <div class="row">
+                                                                <div class="col-auto b-a m-l-15 padding-5 p-l-10 p-r-10 rounded b-grey pointer" :class="[{'b-complete': refundMethod.name === 'Fully Refund'}]" @click="updateRefundType({name: 'Fully Refund'})">
+                                                                    Fully Refund
+                                                                </div>
+                                                                <div class="col-auto b-a m-l-10 padding-5 p-l-10 p-r-10 rounded b-grey pointer" :class="[{'b-complete': refundMethod.name === 'Partially Refund'}]" @click="updateRefundType({name: 'Partially Refund'})">
+                                                                    Partially 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.parameters.refundAmount">
+                                                                <label>Amount</label>
+                                                                <input class="form-control disabled" name="amount" v-model="data.booking.amount">
+                                                            </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 class="row" v-show="!createBank">
+                                                <div class="col-7 p-r-0">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="form-group no-margin form-group-default">
+                                                                <label>Account No.</label>
+                                                                <input type="text" class="form-control" v-model="account_no" @keyup="parameters.bankAccount = {}" @focus="dropdownStatus = true">
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="relative w-100">
+                                                                <div class="absolute w-100 b-l b-b b-r b-grey" :class="[{'hide': !dropdownStatus}]" style="top: 100%; right: 0; z-index: 1;">
+                                                                    <div class="row text-left no-margin bg-white">
+                                                                        <div class="col no-padding">
+                                                                            <div class="row no-margin" v-for="bank in data.booking.company.personal_banks.accounts" v-bind:key="bank.id" >
+                                                                                <!-- <div class="col b-b b-grey p-t-10 p-b-10 pointer p-t-10 p-b-10" :class="[{'bg-master-lightest': parameters.bankAccount.id === bank.id}, {'text-master': parameters.bankAccount.id === bank.id}, {'hover-primary': parameters.bankAccount.id !== bank.id}, {'pointer': parameters.bankAccount.id !== bank.id}]" @click="selectBank(bank)"> -->
+                                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer p-t-10 p-b-10" @click="selectBank(bank)">
+                                                                                    <div class="row align-items-center justify-content-center">
+                                                                                        <div class="col">
+                                                                                            <div class="row">
+                                                                                                <div class="col">
+                                                                                                    <div class="font-heading bold lh-15 fs-13">{{bank.reference ? bank.reference + ' - ':''}}{{bank.holder_name}}</div>
+                                                                                                </div>
+                                                                                            </div>
+                                                                                            <div class="row">
+                                                                                                <div class="col">
+                                                                                                    <div class="font-heading all-caps fs-13 muted"><b class="m-r-5 text-primary">{{bank.account_no}}</b> {{bank.bank_name}}</div>
+                                                                                                </div>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto p-l-0" v-show="!createBank && account_no && !Object.keys(parameters.bankAccount).length">
+                                                    <button class="btn btn-sm h-100 btn-primary b-rad-none all-caps" @click="createBank = !createBank; dropdownStatus = false">
+                                                        <i class="fa fa-plus m-r-5"></i>
+                                                        Create New
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="row" v-show="createBank">
+                                                <div class="col">
+                                                    <!-- <bank-account-form-component section="customerProfileSection" :company_id="data.booking.company.id" :data="{account_no: account_no, company_id: data.booking.company.id, country_id: 1, account_type: 1}" :type='1'></bank-account-form-component> -->
+                                                    <bank-account-form-component section="customerProfileSection" :company_id="data.booking.company.id" :data="{account_no: account_no, company_id: data.booking.company.id, country_id: 1, account_type: 1}" :type='2'></bank-account-form-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row m-b-20" v-show="createBank">
+                <div class="col">
+                    <div class="row align-items-end no-margin">
+                        <div class="col">
+                            <div class="row align-items-end bg-master-lightest p-t-10 p-b-10">
+                                <div class="col">
+                                    <div class="font-heading fs-10 all-caps">Amount you are Transferring</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <!-- <div class="font-heading fs-10 bold">{{this.parameters.type === 0 ? 'MYR': parameters.serviceType.selectedCurrency.short_code}}</div> -->
+                                    <div class="font-heading fs-10 bold">short_code</div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <!-- <div class="font-heading fs-10 bold">{{(Math.round((parseFloat(this.parameters.amount.replace(",", ""))+ Number.EPSILON) * 100) / 100).toFixed(2)}}</div> -->
+                                    <div class="font-heading fs-10 bold">amount</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end  p-t-10 p-b-10">
+                                <div class="col">
+                                    <div class="font-heading fs-10 all-caps text-primary">Exchange Rate</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <div class="font-heading fs-10"></div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <!-- <div class="font-heading fs-10 text-primary bold">{{(Math.round((this.parameters.calculation.rate + Number.EPSILON) * 100000) / 100000).toFixed(5)}}</div> -->
+                                    <div class="font-heading fs-10 text-primary bold">rate</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end bg-master-lightest p-t-10 p-b-10">
+                                <div class="col">
+                                    <div class="font-heading fs-10 all-caps">Money Transfer Fee</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <div class="font-heading fs-10">MYR</div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <!-- <div class="font-heading fs-10">{{(Math.round((this.parameters.calculation.service_charge + Number.EPSILON) * 100) / 100).toFixed(2)}}</div> -->
+                                    <div class="font-heading fs-10">amount</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end p-t-10 p-b-10">
+                                <div class="col text-right">
+                                    <div class="font-heading fs-10 all-caps">Sub-Total</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <div class="font-heading fs-10">MYR</div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <!-- <div class="font-heading fs-10">{{(Math.round((this.parameters.calculation.sub_total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div> -->
+                                    <div class="font-heading fs-10">Sub-Total</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end bg-master-lightest p-t-10 p-b-10">
+                                <div class="col text-right">
+                                    <div class="font-heading fs-10 all-caps">Tax</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <!-- <div class="font-heading fs-10">{{Math.round((this.parameters.calculation.tax + Number.EPSILON) * 100) / 100}}%</div> -->
+                                    <div class="font-heading fs-10">some%</div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <!-- <div class="font-heading fs-10">{{(Math.round((this.parameters.calculation.tax_total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div> -->
+                                    <div class="font-heading fs-10">some tax</div>
+                                </div>
+                            </div>
+                            <div class="row align-items-end p-t-10 p-b-10">
+                                <div class="col text-right">
+                                    <div class="font-heading all-caps bold">Amount you are Paying</div>
+                                </div>
+                                <div class="col-1 no-padding text-center">
+                                    <div class="font-heading bold">MYR</div>
+                                </div>
+                                <div class="col-3 text-right">
+                                    <!-- <div class="font-heading text-success bold">{{(Math.round((this.parameters.calculation.total + Number.EPSILON) * 100) / 100).toFixed(2)}}</div> -->
+                                    <div class="font-heading text-success bold">payming amount</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- <confirm-booking-component :section="section" :data="data" v-if="parameters.bankAccount"></confirm-booking-component> -->
+            <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" v-if="Object.keys(data.bankAccount).length" @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>
+    </div>
+</template>
+
+<script>
+    import FormHandler from '../../../general/mixins/formHandler';
+    // import ConfirmBookingComponent from "../forms/confirmBookingComponent";
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        // components: {ConfirmBookingComponent},
+        data(){
+            return {
+                createBank: false,
+                recipientBanks: [],
+                dropdownStatus: false,
+                account_no: '',
+                parameters: {
+                    bankAccount: '',
+                    refundAmount: this.data.booking.amount,
+                    bank_id: '',
+                },
+                expandRefund: false,
+                refundMethod: {
+                    name: 'Fully Refund',
+                    status: false
+                },
+            }
+        },
+        validations: {
+            parameters: {
+                bankAccount: { required },
+                refundAmount: { required },
+            }
+        },
+        computed: {
+          formDisabled(){
+              return !!Object.keys(this.parameters.bankAccount).length;
+          }
+        },
+        created(){
+            this.recipientBanks = this.data.recipientBanks;
+        },
+        methods: {
+            AccountNumber(bank){
+                return bank.account_no.startsWith(this.account_no)
+            },
+            updateBank(bank){
+                this.selectBank(bank);
+                this.recipientBanks.push(bank);
+                this.parameters.bankAccount = bank;
+            },
+            selectBank(bank){
+                console.log(bank);
+                this.account_no = bank.account_no;
+                this.createBank = true;
+                this.parameters.bankAccount = bank;
+                this.dropdownStatus = false;
+            },
+            clearAccount(){
+                this.createBank = false;
+                this.account_no = '';
+                this.parameters.bankAccount = {};
+            },
+            submitForm(){
+                // this.parameters = {
+                //     company_id: this.data.company.id,
+                //     type: this.data.type,
+                //     fix_amount: this.data.amount,
+                //     service_id: this.data.serviceType.id,
+                //     transferable_bank_id: this.data.bankAccount.id,
+                //     convertible_currency_id: this.data.serviceType.selectedCurrency.id,
+                // };
+
+                this.submit(route('api.booking.create'), 'post', this.section, true, true)
+            },
+            updateRefundType(refund){
+                this.refundMethod = {
+                    name: refund.name,
+                    status: !this.refundMethod.status
+                }
+            },
+            successHandler(response){
+                window.location.href = this.route('booking.details', response.payload.data.marking)
+
+            }
+        },
+        mixins: [FormHandler, ModalFormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
index 0b6fe5db..0487b05c 100644
--- a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
@@ -30,7 +30,7 @@
                                         <div class="col-auto">
                                             <div class="font-heading fs-10 muted all-caps">Date</div>
                                             <div class="font-heading fs-10">
-                                                {{item.documents.created_at}}
+                                                {{item.payment_method === 5 ? item.updated_at : item.documents.created_at}}
                                             </div>
                                         </div>
                                         <div class="col-auto">
diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 9909ae8e..acec8d4b 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -70,8 +70,11 @@
                                     <div class="font-heading all-caps fs-10">Transfer Total:</div>
                                 </div>
                                 <div class="col-auto text-right">
-                                    <div class="font-heading fs-12">{{this.data.fixed_currency.short_code}} {{(Math.round((this.data.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                    <div class="font-heading fs-12"><i class="fa fa-edit fs-12 pointer fa-fw requestModal" data-type="editBookingAmount" v-if="$store.getters.isSuperAdmin"></i> {{this.data.fixed_currency.short_code}} {{(Math.round((this.data.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                                 </div>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editBookingAmount">
+                                    <edit-booking-amount-form-component :data="this.data" :section="section"></edit-booking-amount-form-component>
+                                </modal-component>
                             </div>
                             <div class="row align-items-end m-b-10 text-success">
                                 <div class="col">
@@ -106,14 +109,14 @@
                     </div>
                     <div class="row" v-if="expandPayment && !calculation">
                         <div class="col">
-                            <div class="row m-b-20">
+                            <div class="row m-b-10">
                                 <div class="col">
                                     <div class="row m-b-5 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="row">
+                                    <div class="row hide">
                                         <div class="col-8">
                                             <div class="btn btn-xs btn-complete no-border btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="paymentMethod.status = !paymentMethod.status">
                                                 <div class="row">
@@ -169,13 +172,22 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
+                                                            <div class="row no-margin" :class="[{'bg-complete-light': paymentMethod.name === 'Online Transfer'}, {'text-white': paymentMethod.name === 'Online Transfer'}, {'hover-complete': paymentMethod.name !== 'Online Transfer'}]" @click="updatePaymentType({name: 'Online Transfer', id: 'payment_gateway'})">
+                                                                <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10">
+                                                                    <div class="row align-items-center justify-content-center">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-10">Online Transfer</div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="row m-r-0">
+                                    <div class="row m-r-0 m-b-15">
                                         <div class="col p-r-0">
                                             <validation-wrapper-component :validator="$v.amount">
                                                 <label>Amount</label>
@@ -190,6 +202,147 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row p-l-15 p-r-15">
+                                                <div class="col text-center">
+                                                    <div class="row h-100">
+                                                        <div class="col b-a b-grey bg-white padding-10 pointer" :class="{ 'b-primary': paymentMethod.name === 'Online Transfer', 'text-primary': paymentMethod.name === 'Online Transfer', 'b-grey': paymentMethod.name !== 'Online Transfer' }" @click="updatePaymentType({name: 'Online Transfer', id: 'payment_gateway'})">
+                                                            <div class="m-b-5 text-center">
+                                                            <img src="https://vectorlogo4u.com/wp-content/uploads/2020/10/fpx-logo-vector-01.png" alt="logo" height="40">
+                                                            </div>
+                                                            <p class="no-margin bold">FPX Online Banking</p>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="col text-center">
+                                                    <div class="row h-100">
+                                                        <div class="col b-a b-grey bg-white padding-10 pointer" :class="{ 'b-primary': paymentMethod.name === 'Cheque', 'text-primary': paymentMethod.name === 'Cheque', 'b-grey': paymentMethod.name !== 'Cheque' }" @click="updatePaymentType({name: 'Cheque', id: 'cheque'})">
+                                                            <div class="m-b-5 text-center">
+                                                                <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="43" y1="68.19531" x2="43" y2="82.97656" gradientUnits="userSpaceOnUse" id="color-1_46095_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="31.91406" x2="86" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-2_46095_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="31.91406" x2="45.6875" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-3_46095_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="43" y1="31.91406" x2="43" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-4_46095_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="59.125" y1="31.91406" x2="59.125" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-5_46095_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="26.875" y1="31.91406" x2="26.875" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-6_46095_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="37.625" y1="31.91406" x2="37.625" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-7_46095_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="48.375" y1="31.91406" x2="48.375" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-8_46095_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="104.8125" y1="31.91406" x2="104.8125" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-9_46095_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="31.91406" x2="69.875" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-10_46095_gr10"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="118.25" y1="31.91406" x2="118.25" y2="141.80863" gradientUnits="userSpaceOnUse" id="color-11_46095_gr11"><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="M61.8125,80.625h-37.625v-8.1055c0,-1.45931 1.18519,-2.6445 2.6445,-2.6445h32.33331c1.462,0 2.64719,1.18519 2.64719,2.6445z" fill="url(#color-1_46095_gr1)"></path><path d="M155.875,59.125h-18.8125v-18.8125c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-112.875c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v64.5c0,4.44512 3.61738,8.0625 8.0625,8.0625h18.8125v18.8125c0,4.44512 3.61738,8.0625 8.0625,8.0625h112.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-64.5c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM13.4375,104.8125v-64.5c0,-1.48081 1.20669,-2.6875 2.6875,-2.6875h112.875c1.48081,0 2.6875,1.20669 2.6875,2.6875v64.5c0,1.48081 -1.20669,2.6875 -2.6875,2.6875h-112.875c-1.48081,0 -2.6875,-1.20669 -2.6875,-2.6875zM158.5625,131.6875c0,1.48081 -1.20669,2.6875 -2.6875,2.6875h-112.875c-1.48081,0 -2.6875,-1.20669 -2.6875,-2.6875v-18.8125h88.6875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-40.3125h18.8125c1.48081,0 2.6875,1.20669 2.6875,2.6875z" fill="url(#color-2_46095_gr2)"></path><path d="M24.1875,48.375h43v5.375h-43z" fill="url(#color-3_46095_gr3)"></path><path d="M24.1875,59.125h37.625v5.375h-37.625z" fill="url(#color-4_46095_gr4)"></path><path d="M56.4375,86h5.375v10.75h-5.375z" fill="url(#color-5_46095_gr5)"></path><path d="M24.1875,86h5.375v10.75h-5.375z" fill="url(#color-6_46095_gr6)"></path><path d="M34.9375,86h5.375v10.75h-5.375z" fill="url(#color-7_46095_gr7)"></path><path d="M45.6875,86h5.375v10.75h-5.375z" fill="url(#color-8_46095_gr8)"></path><path d="M107.5,48.375h-5.375v5.375h-5.375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v5.375c0,4.44513 3.61738,8.0625 8.0625,8.0625h16.125c1.48081,0 2.6875,1.20669 2.6875,2.6875v5.375c0,1.48081 -1.20669,2.6875 -2.6875,2.6875h-24.1875v5.375h13.4375v5.375h5.375v-5.375h5.375c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-5.375c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-16.125c-1.48081,0 -2.6875,-1.20669 -2.6875,-2.6875v-5.375c0,-1.48081 1.20669,-2.6875 2.6875,-2.6875h24.1875v-5.375h-13.4375z" fill="url(#color-9_46095_gr9)"></path><path d="M51.0625,120.9375h37.625v5.375h-37.625z" fill="url(#color-10_46095_gr10)"></path><path d="M99.4375,120.9375h37.625v5.375h-37.625z" fill="url(#color-11_46095_gr11)"></path></g></g></svg>
+                                                            </div>
+                                                            <p class="no-margin bold">Cheque</p>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row m-b-10 p-l-15 p-r-15">
+                                                <div class="col text-center">
+                                                    <div class="row h-100">
+                                                        <div class="col b-a b-grey bg-white padding-10 pointer" :class="{ 'b-primary': paymentMethod.name === 'Cash Deposit', 'text-primary': paymentMethod.name === 'Cash Deposit', 'b-grey': paymentMethod.name !== 'Cash Deposit' }" @click="updatePaymentType({name: 'Cash Deposit', id: 'cash  '})">
+                                                            <div class="m-b-5 text-center">
+                                                                <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="86" y1="15.45313" x2="86" y2="157.24562" gradientUnits="userSpaceOnUse" id="color-1_46094_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="62.14844" x2="86" y2="87.68238" gradientUnits="userSpaceOnUse" id="color-2_46094_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></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="M142.4375,26.875h-18.8125v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-64.5c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375h-18.8125c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v86c0,4.44512 3.61737,8.0625 8.0625,8.0625h40.3125v10.75h-10.75c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v2.6875h-10.75v5.375h10.75h69.875h10.75v-5.375h-10.75v-2.6875c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-10.75v-10.75h40.3125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-86c0,-4.44513 -3.61737,-8.0625 -8.0625,-8.0625zM123.625,96.75v-53.75h10.75v64.5h-96.75v-64.5h10.75v53.75zM107.5,91.375h-43v-48.64644c5.25675,-1.06962 9.40894,-5.22181 10.47856,-10.47856h22.04019c1.06963,5.25675 5.22181,9.40894 10.47856,10.47856v48.64644zM53.75,21.5h64.5v69.875h-5.375v-53.75h-2.6875c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-2.6875h-32.25v2.6875c0,4.44512 -3.61737,8.0625 -8.0625,8.0625h-2.6875v53.75h-5.375zM112.875,145.125c1.4835,0 2.6875,1.204 2.6875,2.6875v2.6875h-59.125v-2.6875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75h32.25zM96.75,139.75h-21.5v-10.75h21.5zM145.125,120.9375c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-40.3125h-32.25h-40.3125c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-86c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h18.8125v5.375h-10.75c-2.96431,0 -5.375,2.41069 -5.375,5.375v64.5c0,2.96431 2.41069,5.375 5.375,5.375h96.75c2.96431,0 5.375,-2.41069 5.375,-5.375v-64.5c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75v-5.375h18.8125c1.4835,0 2.6875,1.204 2.6875,2.6875z" fill="url(#color-1_46094_gr1)"></path><path d="M86,64.5c-5.93706,0 -10.75,4.81294 -10.75,10.75c0,5.93706 4.81294,10.75 10.75,10.75c5.93706,0 10.75,-4.81294 10.75,-10.75c0,-5.93706 -4.81294,-10.75 -10.75,-10.75z" fill="url(#color-2_46094_gr2)"></path></g></g></svg>
+                                                            </div>
+                                                            <p class="no-margin bold">Manual Bank Transfer</p>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <!--paymentMethod.name === 'Online Transfer'-->
+                                            <div class="row" v-if="false">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="row m-b-15">
+                                                                <div class="col">
+                                                                    <div class="row m-b-10">
+                                                                        <div class="col">
+                                                                            <small class="fs-8 muted all-caps">Personal Account Banks</small>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="row">
+                                                                        <div class="col">
+                                                                            <div class="row">
+                                                                                <div class="col p-r-0">
+                                                                                    <div class="btn btn-xs btn-block text-left b-rad-none p-t-10 p-b-10 p-l-15 p-r-15" :class="[{'b-complete': onlinePayment.id === 'MBBEMYKL'}]" @click="selectOnlinePaymentBank('MBBEMYKL')">
+                                                                                        <div class="row justify-content-center">
+                                                                                            <div class="col-auto p-r-0">
+                                                                                                <img src="https://shopee.com.my/static/images/bank_logo/img_bankmy_maybank.png">
+                                                                                            </div>
+                                                                                            <div class="col p-l-5">
+                                                                                                <p class="no-margin lh-25">Maybank2u</p>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <div class="col">
+                                                                                    <div class="btn btn-xs btn-block text-left b-rad-none p-t-10 p-b-10 p-l-15 p-r-15" :class="[{'b-complete': onlinePayment.id === 'CIBBMYKL'}]" @click="selectOnlinePaymentBank('CIBBMYKL')">
+                                                                                        <div class="row justify-content-center">
+                                                                                            <div class="col-auto p-r-0">
+                                                                                                <img src="https://shopee.com.my/static/images/bank_logo/img_bankmy_cimb.png">
+                                                                                            </div>
+                                                                                            <div class="col p-l-5">
+                                                                                                <p class="no-margin lh-25">CimbClicks</p>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <div class="row m-b-10">
+                                                                        <div class="col">
+                                                                            <small class="fs-8 muted all-caps">Business Account Banks</small>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="row">
+                                                                        <div class="col">
+                                                                            <div class="row">
+                                                                                <div class="col p-r-0">
+                                                                                    <div class="btn btn-xs btn-block text-left b-rad-none p-t-10 p-b-10 p-l-15 p-r-15" :class="[{'b-complete': onlinePayment.id === 'MBB0227'}]" @click="selectOnlinePaymentBank('MBB0227')">
+                                                                                        <div class="row justify-content-center">
+                                                                                            <div class="col-auto p-r-0">
+                                                                                                <img src="https://shopee.com.my/static/images/bank_logo/img_bankmy_maybank.png">
+                                                                                            </div>
+                                                                                            <div class="col p-l-5">
+                                                                                                <p class="no-margin lh-25">Maybank2E</p>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <div class="col">
+                                                                                    <div class="btn btn-xs btn-block text-left b-rad-none p-t-10 p-b-10 p-l-15 p-r-15" :class="[{'b-complete': onlinePayment.id === 'B2B1-BCBB0235'}]" @click="selectOnlinePaymentBank('B2B1-BCBB0235')">
+                                                                                        <div class="row justify-content-center">
+                                                                                            <div class="col-auto p-r-0">
+                                                                                                <img src="https://shopee.com.my/static/images/bank_logo/img_bankmy_cimb.png">
+                                                                                            </div>
+                                                                                            <div class="col p-l-5">
+                                                                                                <p class="no-margin lh-25">BizChannel</p>
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+
+
+                                                    <div class="row m-t-10">
+                                                        <div class="col">
+                                                            <div class="row">
+
+                                                            </div>
+                                                        </div>
+                                                    </div>
+
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <div class="row">
@@ -197,6 +350,7 @@
                                     <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lighter btn-block" @click="expandPayment = false">Cancel</button>
                                 </div>
                                 <div class="col p-l-0">
+                                    <!--:class="[{'hide': paymentMethod.name === 'Online Transfer' && onlinePayment.status === false}, {'hide': paymentMethod.name == ''}]"-->
                                     <button class="btn btn-xs all-caps b-rad-none btn-success btn-block" @click="submitForm()">Create Booking</button>
                                 </div>
                             </div>
@@ -211,7 +365,7 @@
                                             <div class="font-heading all-caps fs-10">Outstanding</div>
                                         </div>
                                         <div class="col-auto text-right">
-                                            <div class="font-heading fs-10">{{this.data.fixed_currency.short_code}} {{(Math.round(((this.data.amount - parseFloat(amount.replace(',', '')))+ Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                            <div class="font-heading fs-10">{{this.data.fixed_currency.short_code}} {{(Math.round(((this.data.outstanding_amount - parseFloat(amount.replace(',', '')))+ 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 text-success bold">
@@ -280,7 +434,7 @@
                                     <button class="btn btn-xs all-caps b-rad-none btn-success btn-block requestModal" data-type="paymentSummary" >Lock Booking</button>
                                 </div>
                                 <modal-component v-if="calculation.total > 0" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="paymentSummary">
-                                    <confirm-quotation-form-component v-on:cancelQuotation="cancelQuotation()" :calculation="calculation" :section="section" :id="item.id" :payment_method="paymentMethod.id" :amount="amount"></confirm-quotation-form-component>
+                                    <confirm-quotation-form-component v-on:cancelQuotation="cancelQuotation()" :calculation="calculation" :section="section" :id="item.id" :payment_method="paymentMethod.id" :bank_code="onlinePayment.id" :amount="amount"></confirm-quotation-form-component>
                                 </modal-component>
                             </div>
                         </div>
@@ -307,8 +461,12 @@
                 error: '',
                 expandPayment: false,
                 paymentMethod: {
-                    name: 'Bank Transfer',
-                    id: 'cash',
+                    name: '',
+                    id: '',
+                    status: false
+                },
+                onlinePayment: {    
+                    id: '',
                     status: false
                 },
                 amount: (Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100).toFixed(2),
@@ -331,6 +489,13 @@
                     status: false,
                 }
 
+            },
+            selectOnlinePaymentBank(bankCode){
+                this.onlinePayment = {
+                    id: bankCode,
+                    status: true,
+                }
+
             },
             submitForm(){
                 this.parameters = {
@@ -360,8 +525,4 @@
         mixins: [componentHandler],
         directives: {money: VMoney}
     }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue b/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
index 86be8e1a..12ca41de 100644
--- a/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
@@ -8,12 +8,17 @@
                             <div class="font-heading all-caps fs-12 bold">Congratulation, you have got great rates.</div>
                         </div>
                     </div>
-                    <div class="row m-b-25">
+                    <div class="row m-b-25" v-if="payment_method !== 'payment_gateway'">
                         <div class="col">
                             <div class="font-heading fs-11">You can proceed by bank in <span class="text-success bold">{{(Math.round((calculation.total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} MYR</span> to the bank account detailed below and upload your payment proof to proceed with your transfer after clicking on the confirm button below.</div>
                         </div>
                     </div>
-                    <div class="row align-items-center m-b-25">
+                    <div class="row m-b-25" v-if="payment_method === 'payment_gateway'">
+                        <div class="col">
+                            <div class="font-heading fs-11">You will be redirected to your bank to complete the payment of <span class="text-success bold">{{(Math.round((calculation.total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} MYR</span> after clicking on the confirm button below. please follow your bank instruction to complete the payment</div>
+                        </div>
+                    </div>
+                    <div class="row align-items-center m-b-25" v-if="payment_method !== 'payment_gateway'">
                         <div class="col-auto p-r-0">
                             <div class="icon-thumbnail icon-50 bg-master-lightest">
                                 <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -42,7 +47,7 @@
                     </div>
                     <div class="row m-b-20">
                         <div class="col">
-                            <div class="font-heading text-danger fs-10 m-b-5">Please upload your payment proof before the booking expires within {{calculation.payment_attempt_limit}}.</div>
+                            <div class="font-heading text-danger fs-10 m-b-5">Please <span v-if="payment_method !== 'payment_gateway'">upload your payment proof </span><span v-if="payment_method === 'payment_gateway'">complete your payment</span> before the booking expires within {{calculation.payment_attempt_limit}}.</div>
                         </div>
                     </div>
                     <div class="row m-b-5">
@@ -77,6 +82,9 @@
             payment_method: {
                 required: true
             },
+            bank_code: {
+                required: false
+            },
             id: {
                 type: Number,
                 required: true
@@ -91,6 +99,7 @@
                 parameters: {
                     payment_method: this.payment_method,
                     amount: this.amount,
+                    bank_code: this.bank_code,
                 }
             }
         },
@@ -98,10 +107,14 @@
             submitForm(){
                 this.submit(route('api.booking.payment.create', this.id), 'post', this.section, false, false);
             },
-            successHandler(){
+            successHandler(response){
                 this.$emit('cancelQuotation');
                 this.updateList();
                 this.closeModal();
+
+                if (response.payload.data.payment_method === 5) {
+                    window.location.href = 'https://www.billplz.com/bills/' + response.payload.data.payment_reference + '?auto_submit=true';
+                }
             }
         }
     }
diff --git a/resources/assets/vue/components/bookings/forms/EditBookingAmountFormComponent.vue b/resources/assets/vue/components/bookings/forms/EditBookingAmountFormComponent.vue
new file mode 100644
index 00000000..20e2d27b
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/EditBookingAmountFormComponent.vue
@@ -0,0 +1,68 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h3 class="all-caps m-b-5 bold no-margin">Edit Booking Amount</h3>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.fix_amount">
+                                <label class="muted">Booking Amount ({{data.fixed_currency.short_code}})</label>
+                                <input type="text" class="form-control" v-model="fix_amount" v-money="money">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 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="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required } from "vuelidate/lib/validators";
+    import FormHandler from '../../../general/mixins/formHandler';
+
+    export default {
+        data(){
+            return {
+                error: '',
+                fix_amount: (Math.round((this.data.amount + Number.EPSILON) * 100) / 100).toFixed(2)
+            }
+        },
+        validations: {
+            fix_amount: { required }
+        },
+        watch: {
+            'data': function() {
+                this.fix_amount = (Math.round((this.data.amount + Number.EPSILON) * 100) / 100).toFixed(2);
+            }
+        },
+        methods: {
+            submitForm(){
+                this.parameters = {fix_amount : parseFloat((this.fix_amount).toString().replace(',', ''))}
+                this.submit(this.route('api.booking.booking_amount.update', this.data.id), 'put', this.section, true, true)
+            },
+            successHandler(){
+                this.closeModal();
+                this.formHandler('');
+            },
+        },
+        mixins: [FormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index 3e800820..cc7772e6 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -29,6 +29,7 @@
                                 </div>
                                 <div class="col-auto text-center">
                                     <button class="btn btn-xs btn-outline-success b-rad-none invisible"><i class="fa fa-check"></i></button>
+                                    <button class="btn btn-xs btn-outline-success b-rad-none invisible"><i class="fa fa-pencil"></i></button>
                                 </div>
                             </div>
                         </div>
@@ -61,38 +62,14 @@
                                         </div>
                                         <div class="col-auto">
                                             <button class="btn btn-xs btn-outline-success b-rad-none" @click="addProduct()"><i class="fa fa-check"></i></button>
+                                            <button class="btn btn-xs btn-outline-success b-rad-none invisible"><i class="fa fa-pencil"></i></button>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                             <div class="row" v-for="(product, index) in products">
                                 <div class="col p-b-10 p-t-10 b-b b-grey">
-                                    <div class="row  align-items-center">
-                                        <div class="col-auto p-r-0" style="min-width: 40px;">
-                                            <div class="font-heading all-caps fs-10">{{index + 1}}</div>
-                                        </div>
-                                        <div class="col p-r-5">
-                                            <div class="font-heading all-caps fs-10">{{product.stockCode}}</div>
-                                        </div>
-                                        <div class="col-4 p-r-5 p-l-5">
-                                            <div class="font-heading all-caps fs-10">{{product.description}}</div>
-                                        </div>
-                                        <div class="col text-center p-r-5 p-l-5">
-                                            <div class="font-heading all-caps fs-10">{{product.quantity}}</div>
-                                        </div>
-                                        <div class="col text-center p-r-5 p-l-5">
-                                            <div class="font-heading all-caps fs-10">{{product.unit_price}}</div>
-                                        </div>
-                                        <div class="col-1 text-center p-r-5 p-l-5">
-                                            <div class="font-heading all-caps fs-10">{{data.fixed_currency.short_code}}</div>
-                                        </div>
-                                        <div class="col-1 text-right p-r-5 p-l-5">
-                                            <div class="font-heading all-caps fs-10">{{(Math.round((product.total + Number.EPSILON) * 100) / 100).toFixed(2) }}</div>
-                                        </div>
-                                        <div class="col-auto">
-                                            <button class="btn btn-xs btn-outline-danger b-rad-none" v-if="!submitted" @click="removeProduct(index)"><i class="fa fa-times"></i></button>
-                                        </div>
-                                    </div>
+                                     <purchase-order-item-form-component :data="product" :index="index" :currency="data.fixed_currency.short_code" :editable="!submitted" :section="section" @change="updateProduct($event, index)" v-on:remove="removeProduct(index)"></purchase-order-item-form-component>
                                 </div>
                             </div>
                         </div>
@@ -130,7 +107,7 @@
                         <div class="col">
                             <div class="row m-b-10">
                                 <div class="col">
-                                        <button class="btn btn-xs all-caps b-rad-none btn-primary btn-block" @click="submitForm()">{{(Math.round((poTotal + Number.EPSILON) * 1000) / 1000).toFixed(3) !== (Math.round((data.amount + Number.EPSILON) * 1000) / 1000).toFixed(3) ? 'Save Purchase Order' : 'Save & Confirm'}}</button>
+                                    <button class="btn btn-xs all-caps b-rad-none btn-primary btn-block" @click="submitForm()">{{(Math.round((poTotal + Number.EPSILON) * 1000) / 1000).toFixed(3) !== (Math.round((data.amount + Number.EPSILON) * 1000) / 1000).toFixed(3) ? 'Save Purchase Order' : 'Save & Confirm'}}</button>
                                 </div>
                             </div>
                             <div class="row" v-if="(Math.round((poTotal + Number.EPSILON) * 1000) / 1000).toFixed(3) !== data.amount">
@@ -143,8 +120,30 @@
                 </div>
             </div>
             <div class="row" v-if="submitted && data.status !== 3">
-                <div class="col-7">
-                    <button class="btn btn-xs btn-success b-rad-none" v-if="$store.getters.isAdmin && data.purchase_order.status === 1" @click="submit(route('api.booking.po.approval', data.id), 'post', section, true, true)">Approve Purchase Order</button>
+                <div class="col-12 col-md-7">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <button class="btn btn-xs btn-success b-rad-none" v-if="$store.getters.isAdmin && data.purchase_order.status === 1" @click="submit(route('api.booking.po.approval', data.id), 'post', section, true, true)">Approve Purchase Order</button>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-12 col-lg-6">
+                            <document-file-viewer-component :file="data.documents.proforma_invoice.files[0]" v-if="data.documents.proforma_invoice">
+                                <template slot="button">
+                                    <div class="text-center b-a b-info b-dashed b-thick padding-20 pointer m-b-10">
+                                        <div class="m-b-10">
+                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                    width="45" height="45"
+                                                    viewBox="0 0 172 172"
+                                                    style=" fill:#000000;"><defs><linearGradient x1="118.25" y1="63.41425" x2="118.25" y2="88.92669" gradientUnits="userSpaceOnUse" id="color-1_Ya7GVcPz6Vqb_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="72.5625" y1="20.87113" x2="72.5625" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-2_Ya7GVcPz6Vqb_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="56.4375" y1="20.87113" x2="56.4375" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-3_Ya7GVcPz6Vqb_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="20.87113" x2="45.6875" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-4_Ya7GVcPz6Vqb_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="20.87113" x2="69.875" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-5_Ya7GVcPz6Vqb_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="80.625" y1="20.87113" x2="80.625" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-6_Ya7GVcPz6Vqb_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="91.375" y1="20.87113" x2="91.375" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-7_Ya7GVcPz6Vqb_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="20.87113" x2="86" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-8_Ya7GVcPz6Vqb_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="52.40625" y1="20.87113" x2="52.40625" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-9_Ya7GVcPz6Vqb_gr9"><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 id="Layer_1"><circle cx="44" cy="30" transform="scale(2.6875,2.6875)" r="4" fill="url(#color-1_Ya7GVcPz6Vqb_gr1)"></circle><rect x="12" y="14" transform="scale(2.6875,2.6875)" width="30" height="2" fill="url(#color-2_Ya7GVcPz6Vqb_gr2)"></rect><path d="M80.625,102.125v-43c0,-2.95625 -2.41875,-5.375 -5.375,-5.375h-37.625c-2.95625,0 -5.375,2.41875 -5.375,5.375v43c0,2.95625 2.41875,5.375 5.375,5.375h37.625c2.95625,0 5.375,-2.41875 5.375,-5.375zM53.75,102.125h-16.125v-10.75h16.125zM53.75,86h-16.125v-10.75h16.125zM53.75,69.875h-16.125v-10.75h16.125zM75.25,102.125h-16.125v-10.75h16.125zM75.25,86h-16.125v-10.75h16.125zM75.25,69.875h-16.125v-10.75h16.125z" fill="url(#color-3_Ya7GVcPz6Vqb_gr3)"></path><rect x="12" y="47" transform="scale(2.6875,2.6875)" width="10" height="2" fill="url(#color-4_Ya7GVcPz6Vqb_gr4)"></rect><rect x="25" y="47" transform="scale(2.6875,2.6875)" width="2" height="2" fill="url(#color-5_Ya7GVcPz6Vqb_gr5)"></rect><rect x="29" y="47" transform="scale(2.6875,2.6875)" width="2" height="2" fill="url(#color-6_Ya7GVcPz6Vqb_gr6)"></rect><rect x="33" y="47" transform="scale(2.6875,2.6875)" width="2" height="2" fill="url(#color-7_Ya7GVcPz6Vqb_gr7)"></rect><path d="M141.3625,73.90625c-1.88125,-6.45 -6.45,-11.825 -12.3625,-14.78125v-34.9375c0,-4.56875 -3.49375,-8.0625 -8.0625,-8.0625h-96.75c-4.56875,0 -8.0625,3.49375 -8.0625,8.0625v110.1875v2.6875v10.75c0,4.56875 3.49375,8.0625 8.0625,8.0625h96.75c4.56875,0 8.0625,-3.49375 8.0625,-8.0625v-10.75v-22.30625c1.6125,0.5375 3.49375,0.80625 5.375,0.80625c11.825,0 21.5,-9.675 21.5,-21.5c0,-9.1375 -5.9125,-17.2 -14.5125,-20.15625zM137.0625,80.625c0,10.48125 -8.33125,18.8125 -18.8125,18.8125c-10.48125,0 -18.8125,-8.33125 -18.8125,-18.8125c0,-10.48125 8.33125,-18.8125 18.8125,-18.8125c10.48125,0 18.8125,8.33125 18.8125,18.8125zM123.625,147.8125c0,1.6125 -1.075,2.6875 -2.6875,2.6875h-96.75c-1.6125,0 -2.6875,-1.075 -2.6875,-2.6875v-3.225c0.80625,0.26875 1.6125,0.5375 2.6875,0.5375h96.75c1.075,0 1.88125,-0.26875 2.6875,-0.5375zM123.625,134.375v2.6875c0,1.6125 -1.075,2.6875 -2.6875,2.6875h-96.75c-1.6125,0 -2.6875,-1.075 -2.6875,-2.6875v-2.6875v-110.1875c0,-1.6125 1.075,-2.6875 2.6875,-2.6875h96.75c1.6125,0 2.6875,1.075 2.6875,2.6875v32.7875c-1.6125,-0.26875 -3.49375,-0.5375 -5.375,-0.5375c-13.4375,0 -24.1875,10.75 -24.1875,24.1875c0,12.3625 9.40625,22.84375 21.76875,24.1875c1.88125,3.49375 4.56875,6.18125 7.79375,8.0625zM134.375,110.1875c-4.8375,0 -9.1375,-2.15 -12.3625,-5.64375c11.55625,-1.88125 20.425,-11.825 20.425,-23.91875c0,-0.26875 0,-0.26875 0,-0.5375c4.8375,2.95625 8.0625,8.0625 8.0625,13.975c0,8.86875 -7.25625,16.125 -16.125,16.125z" fill="url(#color-8_Ya7GVcPz6Vqb_gr8)"></path><rect x="12" y="43" transform="scale(2.6875,2.6875)" width="15" height="2" fill="url(#color-9_Ya7GVcPz6Vqb_gr9)"></rect></g></g></svg>
+                                        </div>
+                                        <p class="no-margin fs-12">Proforma Invoice</p>
+                                    </div>
+                                </template>
+                            </document-file-viewer-component>
+                            <button class="btn btn-xs btn-danger b-rad-none btn-block" v-if="data.documents.proforma_invoice && data.outstanding_amount > 0" @click="submit(route('api.booking.proforma.create', data.id), 'post', section, true, true)">Regenerate Proforma Invoice</button>
+                        </div>
+                    </div>
                 </div>
                 <div class="col" v-if="submitted">
                     <div class="alert alert-success padding-15" role="alert">
@@ -154,7 +153,8 @@
                                 <div class="font-heading fs-10">If you would like to still edit your Purchase Order you can do that by clicking on the edit button below, but your purchase order verification request will be reset.</div>
                             </div>
                         </div>
-                        <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lightest" @click="submitted = false">Edit Purchase Order</button>
+                        <button class="btn btn-xs all-caps b-rad-none btn-default bg-master-lightest w-100" @click="submitted = false">Edit Purchase Order</button>
+                        <button class="btn btn-xs all-caps b-rad-none btn-success w-100 m-t-5" v-if="!data.documents.proforma_invoice && data.outstanding_amount != 0" @click="submit(route('api.booking.proforma.create', data.id), 'post', section, true, true)">Generate Proforma Invoice</button>
                     </div>
                 </div>
             </div>
@@ -165,16 +165,16 @@
     import formHandler from '../../../general/mixins/formHandler';
     export default {
         data(){
-          return {
-              submitted: false,
-              product: {
-                  stockCode: '',
-                  description: '',
-                  quantity: 1,
-                  unit_price: 0,
-              },
-              products: []
-          }
+            return {
+                submitted: false,
+                    product: {
+                        stockCode: '',
+                        description: '',
+                        quantity: 1,
+                        unit_price: 0,
+                    },
+                products: [],
+            }
         },
         created() {
             this.products = this.data.purchase_order ? this.data.purchase_order.details : [];
@@ -221,8 +221,8 @@
                   stockCode: this.product.stockCode,
                   description: this.product.description,
                   quantity: this.product.quantity,
-                  unit_price: this.product.unit_price,
-                  total: this.productTotal
+                  unit_price: parseFloat((this.product.unit_price).toString().replace(',', '')),
+                  total: this.product.quantity * parseFloat((this.product.unit_price).toString().replace(',', ''))
               });
 
               this.product = {
@@ -231,7 +231,15 @@
                   quantity: 1,
                   unit_price: 0,
               };
-
+            },
+            updateProduct(product, index){
+                this.$set(this.products, index, {
+                    stockCode: product.stockCode,
+                    description: product.description,
+                    quantity: product.quantity,
+                    unit_price: parseFloat((product.unit_price).toString().replace(',', '')),
+                    total: product.quantity * parseFloat((product.unit_price).toString().replace(',', ''))
+                });
             },
             removeProduct(index){
                 this.products.splice(index, 1);
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderItemFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderItemFormComponent.vue
new file mode 100644
index 00000000..00fe70e4
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderItemFormComponent.vue
@@ -0,0 +1,97 @@
+<template>
+    <div class="row  align-items-center">
+        <div class="col-auto p-r-0" style="min-width: 40px;">
+            <div class="font-heading all-caps fs-10">{{index + 1}}</div>
+        </div>
+        <div class="col p-r-5">
+            <div v-if="!isEdit" class="font-heading all-caps fs-10">{{product.stockCode}}</div>
+            <input v-if="isEdit" type="text" class="form-control fs-10 b-rad-none" placeholder="Stock Code" v-model="product.stockCode" />
+        </div>
+        <div class="col-4 p-r-5 p-l-5">
+            <div v-if="!isEdit" class="font-heading all-caps fs-10">{{product.description}}</div>
+            <textarea v-if="isEdit" class="form-control fs-10 b-rad-none" placeholder="Description" rows="1" @keyup="onlyEnglish($event)" v-model="product.description"></textarea>
+        </div>
+        <div class="col text-center p-r-5 p-l-5">
+            <div v-if="!isEdit" class="font-heading all-caps fs-10">{{product.quantity}}</div>
+            <input v-if="isEdit" type="text" class="form-control fs-10 b-rad-none text-center" placeholder="Quantity" v-model.lazy="product.quantity" v-mask="'#########'"/>
+        </div>
+        <div class="col text-center p-r-5 p-l-5">
+            <div v-if="!isEdit" class="font-heading all-caps fs-10">{{product.unit_price}}</div>
+            <input v-if="isEdit" type="text" class="form-control fs-10 b-rad-none text-center" placeholder="Unit Price" v-model.lazy="product.unit_price" v-money="productPrice" />
+        </div>
+        <div class="col-1 text-center p-r-5 p-l-5">
+            <div class="font-heading all-caps fs-10">{{currency}}</div>
+        </div>
+        <div class="col-1 text-right p-r-5 p-l-5">
+            <div class="font-heading all-caps fs-10">{{(Math.round((productTotal + Number.EPSILON) * 100) / 100).toFixed(2) }}</div>
+        </div>
+        <div class="col-auto" :class="[{'invisible': !editable}]">
+            <button class="btn btn-xs btn-outline-danger b-rad-none" @click="$emit('remove')"><i class="fa fa-times"></i></button>
+            <button v-if="!isEdit" class="btn btn-xs btn-outline-warning b-rad-none" @click="isEdit = !isEdit"><i class="fa fa-pencil"></i></button>
+            <button v-if="isEdit" class="btn btn-xs btn-outline-success b-rad-none" @click="updateProduct()"><i class="fa fa-check"></i></button>
+        </div>
+    </div>
+</template>
+<script>
+    import formHandler from '../../../general/mixins/formHandler';
+    export default {
+        props: {
+            editable: {
+                type: Boolean,
+                default: false
+            },
+            currency:{
+                type: String,
+                required: true
+            },
+            index:{
+                type: Number,
+                required: true
+            }
+        },
+        data(){
+            return {
+                isEdit: false,
+                product: {
+                    stockCode: '',
+                    description: '',
+                    unit_price: 0,
+                },
+                products: []
+            }
+        },
+        created() {
+            this.product = this.data;
+            this.product.unit_price = (Math.round((this.product.unit_price+ Number.EPSILON) * 1000) / 1000).toFixed(3)
+        },
+        computed: {
+            productTotal(){
+                return this.product.quantity * parseFloat((this.product.unit_price).toString().replace(',', ''));
+            },
+        },
+        methods: {
+            updateProduct(){
+                this.isEdit = !this.isEdit;
+
+                this.$emit('change', {
+                  stockCode: this.product.stockCode,
+                  description: this.product.description,
+                  quantity: this.product.quantity,
+                  unit_price: parseFloat((this.product.unit_price).toString().replace(',', '')),
+                  total: this.productTotal
+              }, this.index);
+            },
+            onlyEnglish(event){
+                let value = event.target.value,
+                    regex = /^[^~`!@#$%^&*()_+=[\]\{}|;':",.\/<>?a-zA-Z0-9-]+$/;
+
+                event.preventDefault();
+
+                if(regex.test(value)){
+                    this.product.description = value.replace(regex, '');
+                }
+            },
+        },
+        mixins: [formHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/RegenerateBookingInvoicesComponent.vue b/resources/assets/vue/components/bookings/forms/RegenerateBookingInvoicesComponent.vue
new file mode 100644
index 00000000..5cda2e90
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/RegenerateBookingInvoicesComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to regenerate the invoices for this transfer?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.booking.regenerate.invoice', data.id), 'post', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index 947480d6..edd9e114 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -4,8 +4,8 @@
             <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
             <div class="row" v-if="booking">
                 <div class="col">
-                    <div class="row m-b-50" v-if="booking.status === 3 && transactionsComplete">
-                        <div class="col-10 no-padding m-auto">
+                    <div class="row m-b-50" v-if="booking.status === 3">
+                        <div class="col-10 no-padding">
                             <div class="row">
                                 <div class="col">
                                     <div class="row">
@@ -203,6 +203,10 @@
                             <purchase-order-form-component :data="booking" :section="section"></purchase-order-form-component>
                         </div>
                     </div>
+                    <div class="btn btn-xs all-caps b-rad-none btn-danger pointer requestModal" data-type="regenerateInvoices" v-if="booking.status === 3 && $store.getters.isSuperAdmin">Regenerate Invoices</div>
+                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="regenerateInvoices">
+                        <regenerate-booking-invoices-component :data="booking" :section="section" class="text-center"></regenerate-booking-invoices-component>
+                    </modal-component>
                 </div>
                 <div class="col-12 col-sm-12 col-md-3 mt-3 mt-sm-0">
                     <booking-payment-quotation-component :data="booking" :section="section"></booking-payment-quotation-component>
@@ -250,7 +254,16 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="col-auto p-l-5 p-r-5 bg-success requestModal pointer" data-type="identificationVerificationModal">
+                                        <div class="col-auto p-l-5 p-r-5 bg-success pointer" v-if="item.payment_method === 5">
+                                            <a :href="'https://www.billplz.com/bills/'+item.payment_reference">
+                                                <div class="row align-items-center h-100">
+                                                    <div class="col">
+                                                        <i class="fa fa-repeat fs-20 text-white p-l-10 p-r-10"></i>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </div>
+                                        <div class="col-auto p-l-5 p-r-5 bg-success requestModal pointer" v-if="item.payment_method !== 5" data-type="paymentProofModal">
                                             <div @click="selectedID(item.id)" class="row align-items-center h-100">
                                                 <div class="col">
                                                     <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -263,7 +276,7 @@
                                         <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteAttempt">
                                             <delete-payment-attempt-form-component :data="item" :section="section" class="text-center"></delete-payment-attempt-form-component>
                                         </modal-component>
-                                        <modal-component type="identificationVerificationModal">
+                                        <modal-component type="paymentProofModal">
                                             <payment-verification-form-component v-if="selected_id == item.id" :section="section" :id="booking.id" :data="item"></payment-verification-form-component>
                                         </modal-component>
                                     </div>
diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
index f97f7916..6225a43e 100644
--- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
@@ -38,7 +38,7 @@
                                 <i class="fa fa-circle text-success m-r-5" :class="[{'text-success': item.status === 2}, {'text-danger-darker': item.status === 5}, {'text-danger': item.status !== 2 || item.status !== 5}]"></i>{{item.status === 2 ? 'Active' : item.status === 5 ? 'Suspended' : 'Inactive'}}
                             </div>
                         </div>
-                        <div class="col m-l-50">
+                        <div class="col-auto m-l-50">
                             <div class="row align-items-center parentContainer">
                                 <div class="col-auto padding-5 b-a b-grey b-rad-lg pointer requestModal" data-type="assignSegment">
                                     <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -64,6 +64,23 @@
                                 </modal-component>
                             </div>
                         </div>
+                        <div class="col m-l-50">
+                            <div class="row">
+                                <div class="col">
+                                    <p class="m-b-0 fs-11 muted bold"><b>Last Payment: </b>{{item.last_payment}}</p>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <p class="m-b-0 fs-11 muted bold"><b>Payment Amount: </b>MYR {{(Math.round((item.total_payments + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</p>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <p class="m-b-0 fs-11 muted bold"><b>Created at: </b>{{item.created_at}}</p>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue b/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
index 3554a8f2..b7792264 100644
--- a/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
+++ b/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
@@ -75,9 +75,11 @@
                                     </div>
                                     <div class="row">
                                         <div class="col-4 p-l-5 p-r-5 m-b-10" v-for="(rate, method) in item.rates">
-                                            <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].rates.$each[method].selling.value" :class="[{'hint-text': rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'}]">
+                                            <!-- <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].rates.$each[method].selling.value" :class="[{'hint-text': rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'}]"> -->
+                                            <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].rates.$each[method].selling.value" :class="[{'hint-text': rate.payment_method === 'wallet'}]">
                                                 <label class="all-caps">{{rate.payment_method}}</label>
-                                                <input type="text" class="form-control" v-model.lazy="rate.selling.value" v-money="exchangeRate" :disabled="!item.active || rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'">
+                                                <!-- <input type="text" class="form-control" v-model.lazy="rate.selling.value" v-money="exchangeRate" :disabled="!item.active || rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'"> -->
+                                                <input type="text" class="form-control" v-model.lazy="rate.selling.value" v-money="exchangeRate" :disabled="!item.active || rate.payment_method === 'wallet'">
                                             </validation-wrapper-component>
                                         </div>
                                     </div>
@@ -202,7 +204,7 @@
                             }
                         },
                         {
-                            payment_method: 'payment gateway',
+                            payment_method: 'payment_gateway',
                             selling: {
                                 type: 'rate',
                                 value: 0
diff --git a/resources/views/pages/billplz_redirect.blade.php b/resources/views/pages/billplz_redirect.blade.php
new file mode 100644
index 00000000..a2e924a4
--- /dev/null
+++ b/resources/views/pages/billplz_redirect.blade.php
@@ -0,0 +1,33 @@
+<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
+<script>
+// var url_string = window.location.href
+// var url = new URL(url_string);
+// var billplz = url.searchParams.get("billplz[id]");
+// console.log(billplz);
+
+function getQueryParams(qs) {
+    qs = qs.split('+').join(' ');
+
+    var params = {},
+        tokens,
+        re = /[?&]?([^=]+)=([^&]*)/g;
+
+    while (tokens = re.exec(qs)) {
+        params[decodeURIComponent(tokens[1])] = decodeURIComponent(tokens[2]);
+    }
+
+    return params;
+}
+
+var query = getQueryParams(document.location.search);
+console.log(query);
+
+axios.post('/api/v1/billplz/bill/callback', query)
+  .then(function (response) {
+    console.log(response);
+  })
+  .catch(function (error) {
+    console.log(error);
+  });
+
+</script>
\ No newline at end of file
diff --git a/resources/views/pages/bookings/profile.blade.php b/resources/views/pages/bookings/profile.blade.php
index a9ad70a7..d1e3925a 100644
--- a/resources/views/pages/bookings/profile.blade.php
+++ b/resources/views/pages/bookings/profile.blade.php
@@ -4,7 +4,7 @@
         <div class="col">
             <booking-details-section-component :marking={{$marking}}></booking-details-section-component>
             @if(!env('IS_PRODUCTION'))
-                <a class="btn btn-xs all-caps b-rad-none btn-warning" href="{{ route('booking.merge', $marking)}}">Merge Transfer Orders</a>
+                {{--<a class="btn btn-xs all-caps b-rad-none btn-warning" href="{{ route('booking.merge', $marking)}}">Merge Transfer Orders</a>--}}
             @endif
         </div>
     </div>
diff --git a/resources/views/pages/customers/index.blade.php b/resources/views/pages/customers/index.blade.php
index 867ff561..e65fef3a 100644
--- a/resources/views/pages/customers/index.blade.php
+++ b/resources/views/pages/customers/index.blade.php
@@ -3,10 +3,10 @@
     <div class="row">
         <div class="col p-t-15 p-b-15">
             <div class="row no-margin">
-                <div class="col">
+                <div class="col-12 col-md">
                     <div class="row tabsContainer">
                         <div class="col">
-                            <div class="row m-l-0 m-r-0 d-none d-md-flex">
+                            <div class="row m-l-0 m-r-0 d-flex">
                                 <div class="col">
                                     <div class="row justify-content-end">
                                         <div class="col-4 b-r b-white">
@@ -75,7 +75,7 @@
                                 </div>
                             </div>
                             <div class="row no-margin" v-if="$store.getters.isAdmin">
-                                <div class="col bg-white padding-25">
+                                <div class="col-12 col-md bg-white padding-25">
                                     <div class="row tabsContainer tabContent  m-l-0 m-r-0" tab-name="customer-list">
                                         <list-component  key="2" section="customerListSection" :endpoint="route('api.company.list')" :options="{'business_type': 2, with_bookings:true}">
                                             <template slot="list" slot-scope="{data}">
@@ -105,7 +105,7 @@
                 <div class="col">
                     <div class="row tabsContainer">
                         <div class="col">
-                            <div class="row m-l-0 m-r-0 d-none d-md-flex">
+                            <div class="row m-l-0 m-r-0 d-flex">
                                 <div class="col">
                                     <div class="row justify-content-end">
                                         <div class="col">
diff --git a/resources/views/pages/dashboards/admin.blade.php b/resources/views/pages/dashboards/admin.blade.php
index 7681658b..8cb063e0 100644
--- a/resources/views/pages/dashboards/admin.blade.php
+++ b/resources/views/pages/dashboards/admin.blade.php
@@ -328,7 +328,7 @@
                                             <div class="col">
                                                 <div class="row">
                                                     <div class="col">
-                                                        <list-component ref="paymentProofList" section="paymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 2, type: 3, issuer_in: [2]}">
+                                                        <list-component ref="paymentProofList" section="paymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 1, type: 3, issuer_in: [2, 1937]}">
                                                             <template slot="list" slot-scope="{data}">
                                                                 <payment-proof-component :data="data"></payment-proof-component>
                                                             </template>
diff --git a/resources/views/pages/payments_redirect.blade.php b/resources/views/pages/payments_redirect.blade.php
new file mode 100644
index 00000000..ad18711f
--- /dev/null
+++ b/resources/views/pages/payments_redirect.blade.php
@@ -0,0 +1,93 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row m-b-20 justify-content-center">
+        <div class="col-8 b-success b-thick bg-white padding-15 text-center">
+            <div class="row">
+                <div class="col">
+                    @if($status === 2)
+                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                             width="64" height="64"
+                             viewBox="0 0 172 172"
+                             style=" fill:#000000;"><defs><linearGradient x1="59.125" y1="98.76563" x2="59.125" y2="105.79881" gradientUnits="userSpaceOnUse" id="color-1_TLEZOKwHlvwt_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="98.76563" x2="86" y2="105.79881" gradientUnits="userSpaceOnUse" id="color-2_TLEZOKwHlvwt_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="112.875" y1="98.76563" x2="112.875" y2="105.79881" gradientUnits="userSpaceOnUse" id="color-3_TLEZOKwHlvwt_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="53.75" y1="144.90194" x2="53.75" y2="151.93244" gradientUnits="userSpaceOnUse" id="color-4_TLEZOKwHlvwt_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="144.90194" x2="86" y2="151.93244" gradientUnits="userSpaceOnUse" id="color-5_TLEZOKwHlvwt_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="118.25" y1="144.90194" x2="118.25" y2="151.93244" gradientUnits="userSpaceOnUse" id="color-6_TLEZOKwHlvwt_gr6"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="11.60731" x2="86" y2="160.22338" gradientUnits="userSpaceOnUse" id="color-7_TLEZOKwHlvwt_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="11.60731" x2="86" y2="160.22338" gradientUnits="userSpaceOnUse" id="color-8_TLEZOKwHlvwt_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="11.60731" x2="86" y2="160.22338" gradientUnits="userSpaceOnUse" id="color-9_TLEZOKwHlvwt_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="87.34375" y1="11.60731" x2="87.34375" y2="160.22338" gradientUnits="userSpaceOnUse" id="color-10_TLEZOKwHlvwt_gr10"><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="M51.0625,99.4375h16.125v5.375h-16.125z" fill="url(#color-1_TLEZOKwHlvwt_gr1)"></path><path d="M72.5625,99.4375h26.875v5.375h-26.875z" fill="url(#color-2_TLEZOKwHlvwt_gr2)"></path><path d="M104.8125,99.4375h16.125v5.375h-16.125z" fill="url(#color-3_TLEZOKwHlvwt_gr3)"></path><path d="M45.6875,145.125h16.125v5.375h-16.125z" fill="url(#color-4_TLEZOKwHlvwt_gr4)"></path><path d="M77.9375,145.125h16.125v5.375h-16.125z" fill="url(#color-5_TLEZOKwHlvwt_gr5)"></path><path d="M110.1875,145.125h16.125v5.375h-16.125z" fill="url(#color-6_TLEZOKwHlvwt_gr6)"></path><path d="M126.3125,88.6875h-80.625c-2.96969,0 -5.375,2.40531 -5.375,5.375v16.125c0,2.96969 2.40531,5.375 5.375,5.375h80.625c2.96969,0 5.375,-2.40531 5.375,-5.375v-16.125c0,-2.96969 -2.40531,-5.375 -5.375,-5.375zM45.6875,110.1875v-16.125h80.625l0.00538,16.125z" fill="url(#color-7_TLEZOKwHlvwt_gr7)"></path><rect x="17" y="45" transform="scale(2.6875,2.6875)" width="30" height="2" fill="url(#color-8_TLEZOKwHlvwt_gr8)"></rect><path d="M142.4375,150.5v-72.5625v-5.375v-13.46706c0,-4.44512 -3.61737,-8.03294 -8.0625,-8.03294h-13.4375v-32.25c0,-1.4835 -1.204,-2.6875 -2.6875,-2.6875c-4.11456,0 -6.13287,2.97775 -7.60562,5.15194c-1.34375,1.98337 -2.00488,2.78963 -3.15244,2.78963c-1.15025,0 -1.81137,-0.80625 -3.15512,-2.78963c-1.47544,-2.17687 -3.49106,-5.15194 -7.60563,-5.15194c-4.11456,0 -6.1275,2.97775 -7.60025,5.15194c-1.34375,1.98337 -2.00219,2.78963 -3.14975,2.78963c-1.14487,0 -1.806,-0.80625 -3.14706,-2.78963c-1.47275,-2.17419 -3.48569,-5.15194 -7.59756,-5.15194c-4.11187,0 -6.1275,2.97775 -7.59756,5.15194c-1.34106,1.98069 -1.9995,2.78963 -3.14437,2.78963c-1.14487,0 -1.806,-0.80625 -3.14706,-2.78963c-1.47006,-2.17419 -3.48569,-5.15194 -7.59756,-5.15194c-1.4835,0 -2.6875,1.204 -2.6875,2.6875v32.25h-13.4375c-4.44512,0 -8.0625,3.58781 -8.0625,8.03294v34.96706v56.4375h-5.375v5.375h123.625v-5.375zM120.9375,67.17406h5.375v5.375h-5.375zM56.89706,24.28963c1.47006,2.17419 3.48569,5.15194 7.59756,5.15194c4.11187,0 6.12481,-2.97775 7.59488,-5.15194c1.34106,-1.98337 1.9995,-2.78963 3.14706,-2.78963c1.14487,0 1.80331,0.80625 3.14437,2.78963c1.47006,2.17419 3.48569,5.15194 7.59756,5.15194c4.11456,0 6.13019,-2.97775 7.60294,-5.15194c1.34106,-1.98337 2.00219,-2.78963 3.14975,-2.78963c1.15025,0 1.81137,0.80625 3.15512,2.78963c1.47275,2.17419 3.48838,5.15194 7.60563,5.15194c4.11725,0 6.13019,-2.97506 7.60294,-5.15194c0.16662,-0.24456 0.3225,-0.47031 0.46762,-0.67994v48.95281h-59.11963l-0.00537,-48.94206c0.14512,0.20694 0.29563,0.42731 0.45956,0.66919zM61.8125,150.5h-16.125v-5.375h16.125zM94.0625,150.5h-16.125v-5.375h16.125zM126.3125,150.5h-16.125v-5.375h16.125zM137.0625,150.5h-5.375v-5.40456c0,-2.96162 -2.41069,-5.34544 -5.375,-5.34544h-16.125c-2.96431,0 -5.375,2.38381 -5.375,5.34544v5.40456h-5.375v-5.40456c0,-2.96162 -2.41069,-5.34544 -5.375,-5.34544h-16.125c-2.96431,0 -5.375,2.38381 -5.375,5.34544v5.40456h-5.375v-5.40456c0,-2.96162 -2.41069,-5.34544 -5.375,-5.34544h-16.125c-2.96431,0 -5.375,2.38381 -5.375,5.34544v5.40456h-5.375v-91.40456c0,-1.48081 1.204,-2.65794 2.6875,-2.65794h13.4375v5.375h-5.375c-2.96431,0 -5.375,2.38381 -5.375,5.34544v5.375c0,2.96431 2.41069,5.40456 5.375,5.40456h80.625c2.96431,0 5.375,-2.44025 5.375,-5.40456v-5.375c0,-2.96162 -2.41069,-5.34544 -5.375,-5.34544h-5.375v-5.375h13.4375c1.4835,0 2.6875,1.17712 2.6875,2.65794zM51.0625,67.17406v5.375h-5.375v-5.375z" fill="url(#color-9_TLEZOKwHlvwt_gr9)"></path><path d="M83.3125,60.6945c1.37869,0 2.75469,-0.54288 3.80281,-1.634l14.22225,-14.79469l-3.80013,-3.95331l-14.22763,14.79469l-6.15975,-6.407l-3.80013,3.95331l6.15975,6.407c1.04812,1.09113 2.42413,1.634 3.80281,1.634z" fill="url(#color-10_TLEZOKwHlvwt_gr10)"></path></g></g></svg>
+                    @elseif($status === 1)
+                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                             width="64" height="64"
+                             viewBox="0 0 172 172"
+                             style=" fill:#000000;"><defs><linearGradient x1="59.125" y1="98.76563" x2="59.125" y2="105.79881" gradientUnits="userSpaceOnUse" id="color-1_TLEZOKwHlvwt_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="98.76563" x2="86" y2="105.79881" gradientUnits="userSpaceOnUse" id="color-2_TLEZOKwHlvwt_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="112.875" y1="98.76563" x2="112.875" y2="105.79881" gradientUnits="userSpaceOnUse" id="color-3_TLEZOKwHlvwt_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="53.75" y1="144.90194" x2="53.75" y2="151.93244" gradientUnits="userSpaceOnUse" id="color-4_TLEZOKwHlvwt_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="144.90194" x2="86" y2="151.93244" gradientUnits="userSpaceOnUse" id="color-5_TLEZOKwHlvwt_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="118.25" y1="144.90194" x2="118.25" y2="151.93244" gradientUnits="userSpaceOnUse" id="color-6_TLEZOKwHlvwt_gr6"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="11.60731" x2="86" y2="160.22338" gradientUnits="userSpaceOnUse" id="color-7_TLEZOKwHlvwt_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="11.60731" x2="86" y2="160.22338" gradientUnits="userSpaceOnUse" id="color-8_TLEZOKwHlvwt_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="11.60731" x2="86" y2="160.22338" gradientUnits="userSpaceOnUse" id="color-9_TLEZOKwHlvwt_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="87.34375" y1="11.60731" x2="87.34375" y2="160.22338" gradientUnits="userSpaceOnUse" id="color-10_TLEZOKwHlvwt_gr10"><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="M51.0625,99.4375h16.125v5.375h-16.125z" fill="url(#color-1_TLEZOKwHlvwt_gr1)"></path><path d="M72.5625,99.4375h26.875v5.375h-26.875z" fill="url(#color-2_TLEZOKwHlvwt_gr2)"></path><path d="M104.8125,99.4375h16.125v5.375h-16.125z" fill="url(#color-3_TLEZOKwHlvwt_gr3)"></path><path d="M45.6875,145.125h16.125v5.375h-16.125z" fill="url(#color-4_TLEZOKwHlvwt_gr4)"></path><path d="M77.9375,145.125h16.125v5.375h-16.125z" fill="url(#color-5_TLEZOKwHlvwt_gr5)"></path><path d="M110.1875,145.125h16.125v5.375h-16.125z" fill="url(#color-6_TLEZOKwHlvwt_gr6)"></path><path d="M126.3125,88.6875h-80.625c-2.96969,0 -5.375,2.40531 -5.375,5.375v16.125c0,2.96969 2.40531,5.375 5.375,5.375h80.625c2.96969,0 5.375,-2.40531 5.375,-5.375v-16.125c0,-2.96969 -2.40531,-5.375 -5.375,-5.375zM45.6875,110.1875v-16.125h80.625l0.00538,16.125z" fill="url(#color-7_TLEZOKwHlvwt_gr7)"></path><rect x="17" y="45" transform="scale(2.6875,2.6875)" width="30" height="2" fill="url(#color-8_TLEZOKwHlvwt_gr8)"></rect><path d="M142.4375,150.5v-72.5625v-5.375v-13.46706c0,-4.44512 -3.61737,-8.03294 -8.0625,-8.03294h-13.4375v-32.25c0,-1.4835 -1.204,-2.6875 -2.6875,-2.6875c-4.11456,0 -6.13287,2.97775 -7.60562,5.15194c-1.34375,1.98337 -2.00488,2.78963 -3.15244,2.78963c-1.15025,0 -1.81137,-0.80625 -3.15512,-2.78963c-1.47544,-2.17687 -3.49106,-5.15194 -7.60563,-5.15194c-4.11456,0 -6.1275,2.97775 -7.60025,5.15194c-1.34375,1.98337 -2.00219,2.78963 -3.14975,2.78963c-1.14487,0 -1.806,-0.80625 -3.14706,-2.78963c-1.47275,-2.17419 -3.48569,-5.15194 -7.59756,-5.15194c-4.11187,0 -6.1275,2.97775 -7.59756,5.15194c-1.34106,1.98069 -1.9995,2.78963 -3.14437,2.78963c-1.14487,0 -1.806,-0.80625 -3.14706,-2.78963c-1.47006,-2.17419 -3.48569,-5.15194 -7.59756,-5.15194c-1.4835,0 -2.6875,1.204 -2.6875,2.6875v32.25h-13.4375c-4.44512,0 -8.0625,3.58781 -8.0625,8.03294v34.96706v56.4375h-5.375v5.375h123.625v-5.375zM120.9375,67.17406h5.375v5.375h-5.375zM56.89706,24.28963c1.47006,2.17419 3.48569,5.15194 7.59756,5.15194c4.11187,0 6.12481,-2.97775 7.59488,-5.15194c1.34106,-1.98337 1.9995,-2.78963 3.14706,-2.78963c1.14487,0 1.80331,0.80625 3.14437,2.78963c1.47006,2.17419 3.48569,5.15194 7.59756,5.15194c4.11456,0 6.13019,-2.97775 7.60294,-5.15194c1.34106,-1.98337 2.00219,-2.78963 3.14975,-2.78963c1.15025,0 1.81137,0.80625 3.15512,2.78963c1.47275,2.17419 3.48838,5.15194 7.60563,5.15194c4.11725,0 6.13019,-2.97506 7.60294,-5.15194c0.16662,-0.24456 0.3225,-0.47031 0.46762,-0.67994v48.95281h-59.11963l-0.00537,-48.94206c0.14512,0.20694 0.29563,0.42731 0.45956,0.66919zM61.8125,150.5h-16.125v-5.375h16.125zM94.0625,150.5h-16.125v-5.375h16.125zM126.3125,150.5h-16.125v-5.375h16.125zM137.0625,150.5h-5.375v-5.40456c0,-2.96162 -2.41069,-5.34544 -5.375,-5.34544h-16.125c-2.96431,0 -5.375,2.38381 -5.375,5.34544v5.40456h-5.375v-5.40456c0,-2.96162 -2.41069,-5.34544 -5.375,-5.34544h-16.125c-2.96431,0 -5.375,2.38381 -5.375,5.34544v5.40456h-5.375v-5.40456c0,-2.96162 -2.41069,-5.34544 -5.375,-5.34544h-16.125c-2.96431,0 -5.375,2.38381 -5.375,5.34544v5.40456h-5.375v-91.40456c0,-1.48081 1.204,-2.65794 2.6875,-2.65794h13.4375v5.375h-5.375c-2.96431,0 -5.375,2.38381 -5.375,5.34544v5.375c0,2.96431 2.41069,5.40456 5.375,5.40456h80.625c2.96431,0 5.375,-2.44025 5.375,-5.40456v-5.375c0,-2.96162 -2.41069,-5.34544 -5.375,-5.34544h-5.375v-5.375h13.4375c1.4835,0 2.6875,1.17712 2.6875,2.65794zM51.0625,67.17406v5.375h-5.375v-5.375z" fill="url(#color-9_TLEZOKwHlvwt_gr9)"></path><path d="M83.3125,60.6945c1.37869,0 2.75469,-0.54288 3.80281,-1.634l14.22225,-14.79469l-3.80013,-3.95331l-14.22763,14.79469l-6.15975,-6.407l-3.80013,3.95331l6.15975,6.407c1.04812,1.09113 2.42413,1.634 3.80281,1.634z" fill="url(#color-10_TLEZOKwHlvwt_gr10)"></path></g></g></svg>
+                    @else
+                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                             width="64" height="64"
+                             viewBox="0 0 172 172"
+                             style=" fill:#000000;"><defs><linearGradient x1="86" y1="13.4375" x2="86" y2="158.92263" gradientUnits="userSpaceOnUse" id="color-1_43980_gr1"><stop offset="0" stop-color="#ff8177"></stop><stop offset="1" stop-color="#b12a5b"></stop></linearGradient><linearGradient x1="86" y1="13.4375" x2="86" y2="158.92263" gradientUnits="userSpaceOnUse" id="color-2_43980_gr2"><stop offset="0" stop-color="#ff8177"></stop><stop offset="1" stop-color="#b12a5b"></stop></linearGradient><linearGradient x1="86" y1="55.98869" x2="86" y2="114.75088" gradientUnits="userSpaceOnUse" id="color-3_43980_gr3"><stop offset="0" stop-color="#ffe9e7"></stop><stop offset="1" stop-color="#dd6e96"></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="M86,155.875c-38.53069,0 -69.875,-31.34431 -69.875,-69.875c0,-38.53069 31.34431,-69.875 69.875,-69.875c38.53069,0 69.875,31.34431 69.875,69.875c0,38.53069 -31.34431,69.875 -69.875,69.875zM86,21.5c-35.56369,0 -64.5,28.93631 -64.5,64.5c0,35.56369 28.93631,64.5 64.5,64.5c35.56369,0 64.5,-28.93631 64.5,-64.5c0,-35.56369 -28.93631,-64.5 -64.5,-64.5z" fill="url(#color-1_43980_gr1)"></path><path d="M86,139.75c-29.63775,0 -53.75,-24.11225 -53.75,-53.75c0,-29.63775 24.11225,-53.75 53.75,-53.75c29.63775,0 53.75,24.11225 53.75,53.75c0,29.63775 -24.11225,53.75 -53.75,53.75zM86,37.625c-26.67344,0 -48.375,21.70156 -48.375,48.375c0,26.67344 21.70156,48.375 48.375,48.375c26.67344,0 48.375,-21.70156 48.375,-48.375c0,-26.67344 -21.70156,-48.375 -48.375,-48.375z" fill="url(#color-2_43980_gr2)"></path><path d="M109.35975,66.44575l-3.80819,-3.80819c-1.10187,-1.10187 -2.89175,-1.10187 -3.99362,0l-15.55794,15.56063l-15.55794,-15.55794c-1.10187,-1.10187 -2.89175,-1.10187 -3.99362,0l-3.80819,3.80819c-1.10187,1.10188 -1.10187,2.89175 0,3.99363l15.55794,15.55794l-15.55794,15.55794c-1.10187,1.10187 -1.10187,2.89175 0,3.99362l3.80819,3.80819c1.10188,1.10187 2.89175,1.10187 3.99363,0l15.55794,-15.55794l15.55794,15.55794c1.10187,1.10187 2.89175,1.10187 3.99362,0l3.80819,-3.80819c1.10187,-1.10187 1.10187,-2.89175 0,-3.99362l-15.55794,-15.55794l15.55794,-15.55794c1.10456,-1.10456 1.10456,-2.89175 0,-3.99631z" fill="url(#color-3_43980_gr3)"></path></g></g></svg>
+                    @endif
+                </div>
+            </div>
+            @if($status === 2)
+                <div class="row">
+                    <div class="col">
+                        <div class="row m-b-10">
+                            <div class="col">
+                                <h5 class="semi-bold text-success">Your Payment is Successful</h5>
+                                <p class="hint-text">Thank you for your payment. Your transfer request is now being processed and you will be notified once its complete.</p>
+                            </div>
+                        </div>
+                        <div class="row m-b-20">
+                            <div class="col">
+                                <a href="{{route('dashboard')}}">
+                                    <div class="btn btn-sm all-caps btn-outline-success b-rad-none">Dashboard</div>
+                                </a>
+                                <a href="{{route('booking.details', $marking)}}">
+                                    <div class="btn btn-sm all-caps btn-success b-rad-none" >Back to Booking</div>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @elseif($status === 1)
+                <div class="row">
+                    <div class="col">
+                        <div class="row m-b-10">
+                            <div class="col">
+                                <h5 class="semi-bold">Your Payment is Pending Verification</h5>
+                                <p class="hint-text">It seems that your payment attempt is still pending verification. We will approve your payment once the your bank verifies the payment.</p>
+                            </div>
+                        </div>
+                        <div class="row m-b-20">
+                            <div class="col">
+                                <a href="{{route('dashboard')}}">
+                                    <div class="btn btn-sm all-caps btn-outline-success b-rad-none">Dashboard</div>
+                                </a>
+                                <a href="{{route('booking.details', $marking)}}">
+                                    <div class="btn btn-sm all-caps btn-success b-rad-none" >Back to Booking</div>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @else
+                <div class="row">
+                    <div class="col">
+                        <div class="row m-b-10">
+                            <div class="col">
+                                <h5 class="semi-bold text-danger">Your Payment Has Failed</h5>
+                                <p class="hint-text">It seems that your payment attempt has failed. you can try to reattempt your payment to complete your transaction.</p>
+                            </div>
+                        </div>
+                        <div class="row m-b-20">
+                            <div class="col">
+                                <a href="{{route('booking.details', $marking)}}">
+                                    <div class="btn btn-sm all-caps btn-outline-success b-rad-none" >Back to Booking</div>
+                                </a>
+                                <a href="https://www.billplz.com/bills/{{$payment_reference}}">
+                                    <div class="btn btn-sm all-caps btn-success b-rad-none">Retry Payment</div>
+                                </a>
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @endif
+
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index a2c77a66..3eb7576e 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -33,7 +33,7 @@
                 <div class="number">EDO: {{ $invoice_transaction->bill_no }}</div>
 
 
-                <div class="ref">REF: {{ $invoice_transaction->payment_reference ?? '-' }}</div>
+                <div class="ref">REF: {{ $invoice_transaction->booking->marking }}</div>
                 <div class="date">Date: {{ $po_order_transaction->created_at }}</div>
                 <div>&nbsp;</div>
                 </div>
@@ -52,7 +52,7 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }}
                     {{ $addresses->street_two }} ,
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 355c2328..581773fe 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -32,7 +32,7 @@
                 <div class="number">EI#: {{ $invoice_transaction->bill_no }}</div>
 
 
-                <div class="ref">Ref# {{ $invoice_transaction->payment_reference ?? '-' }}</div>
+                <div class="ref">Ref# {{ $po_order_transaction->booking->marking }}</div>
                 <div class="date">Date: {{ $po_order_transaction->booking->created_at }}</div>
                 <div>&nbsp;</div>
                 </div>
@@ -51,7 +51,7 @@
                 </div>
                 <div class="address">
                     @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }}
                     {{ $addresses->street_two }} ,
diff --git a/resources/views/pages/pdfs/proforma_invoice.blade.php b/resources/views/pages/pdfs/proforma_invoice.blade.php
new file mode 100644
index 00000000..7d2c77c7
--- /dev/null
+++ b/resources/views/pages/pdfs/proforma_invoice.blade.php
@@ -0,0 +1,174 @@
+@extends('layouts.base_pdf')
+@section('inner_content')
+    <br>
+    <htmlpageheader name="page-header">
+        <br><br>
+        <div class="separator"><strong><i>{{ $invoice_transaction->bill_no }}</i></strong></div>
+    </htmlpageheader>
+    <table>
+        <tr>
+            <td class="header-logo">
+                <img src="{{ asset('images/ri_1.png') }}" alt="logo" id="logo" class="logo">
+            </td>
+            <td class="header-cief-address">
+                <span class="company-name">
+                    <strong>
+                        CIEF WORLDWIDE SDN BHD
+                    </strong>
+                </span>
+                <span class="company-reg">(1134596-M)</span><br>
+                Malaysian Global Innovation &amp; Creativity Center <br>
+                Level 1 CWS, Block 3730, Persiaran APEC, <br>
+                63000 Cyberjaya, Malaysian. <br>
+                Tel: 018-2909252
+            </td>
+            <td class="header-details">
+                <div class="title">
+                    <strong>
+                        Proforma Invoice
+                    </strong>
+                </div>
+
+                <div class="number">EI#: {{ $invoice_transaction->bill_no }}</div>
+
+
+                <div class="ref">Ref# {{ $po_order_transaction->booking->marking }}</div>
+                <div class="date">Date: {{ $po_order_transaction->booking->created_at }}</div>
+                <div>&nbsp;</div>
+                </div>
+            </td>
+        <tr>
+            <td colspan="3" class="bill-to">
+                <span class="sub-title">
+                    Bill To
+                </span>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="3" class="address">
+                <div class="label">
+                    Company: {{ $supplier->name }}
+                </div>
+                <div class="address">
+                    @php
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
+                    @endphp
+                    {{ $addresses->street_one }}
+                    {{ $addresses->street_two }} ,
+                    {{ $addresses->district()->first()->name }},
+                    {{ $addresses->postcode }}
+                    {{ $addresses->state()->first()->name }},
+                    {{ $addresses->country()->first()->name }}
+                </div>
+                <div>
+                    Phone: {{ $supplier->contacts()->first()->phone }}
+                </div>
+            </td>
+        </tr>
+    </table>
+
+    <br>
+    <br>
+    <table class="line-table" style="overflow: wrap" autosize="1">
+        <thead>
+            <tr>
+                <th width="5%">No</th>
+                <th class="stock-code" width="10%">Stock Code</th>
+                <th class="description">Description</th>
+                <th width="10%">Quantity</th>
+                <th width="15%">Unit Price (RM)</th>
+                <th width="10%">Total Amount<br>(RM)</th>
+            </tr>
+        </thead>
+        <tbody>
+            @php
+                $subtotal = 0;
+            @endphp
+
+            @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
+                <tr>
+                    <td width="5%" class="center top">{{ $key + 1 }}</td>
+                    <td class="stock-code top" width="10%">{{ $transaction_detail->product_code }}</td>
+                    <td class="description">{{ $transaction_detail->product_name }}</td>
+                    <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
+                    <td width="15%" class="center top">
+                        @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
+                            {{ number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2) }}
+                        @else
+                            {{ number_format($transaction_detail->price, 2) }}
+                        @endif
+                    </td>
+                    <td width="20%" class="right top">
+                        @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
+                        
+                            {{  number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+                            
+                            @php
+                                $subtotal += number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                            @endphp
+                        @else                            
+                            {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+
+                            @php
+                                $subtotal += number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                            @endphp
+                        @endif
+                    </td>
+                </tr>
+            @endforeach
+        </tbody>
+        <tfoot>
+            <tr class="subtotal">
+                <td colspan="4"></td>
+                <td class="right middle">Subtotal</td>
+                <td class="right middle">
+                    {{ number_format($subtotal, 2) }}
+                </td>
+            </tr>
+            <tr class="billingcharges">
+                <td colspan="4"></td>
+                <td class="right">Service Charges</td>
+                <td class="right">
+                    {{ number_format($invoice_transaction->service_charge, 2) }}
+                </td>
+            </tr>
+            <tr class="billingcharges">
+                <td colspan="4"></td>
+                <td class="right">Adjustment</td>
+                <td class="right">
+                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
+                        {{ number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $invoice_transaction->original_amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @else
+                        {{ number_format((float)number_format($invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @endif
+                </td>
+            </tr>
+            @if($invoice_transaction->tax > 0)
+                <tr class="billingcharges">
+                    <td colspan="4"></td>
+                    <td class="right">Tax</td>
+                    <td class="right">{{ number_format($invoice_transaction->tax, 2) }}</td>
+                </tr>
+            @endif
+            <tr>
+                <td colspan="4"></td>
+                <td class="right middle">Total</td>
+                <td class="total right middle">
+                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
+                        {{ number_format( ((1/$invoice_transaction->currency_rate) * $invoice_transaction->original_amount) + $invoice_transaction->service_charge + $invoice_transaction->tax, 2) }}
+                    @else
+                        {{ number_format($invoice_transaction->amount + $invoice_transaction->service_charge + $invoice_transaction->tax, 2) }}
+                    @endif
+                </td>
+            </tr>
+        </tfoot>
+    </table>
+    <htmlpagefooter name="page-footer">
+        <table width="100%">
+            <tr>
+                <td style="text-align: right; ">This is generated by computer. No signature required.</td>
+                <td style="text-align: right; ">Page {PAGENO} of {nbpg}</td>
+            </tr>
+        </table>
+    </htmlpagefooter>
+@endsection
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php
index eb123975..d190f285 100644
--- a/resources/views/pages/pdfs/purchase_order.blade.php
+++ b/resources/views/pages/pdfs/purchase_order.blade.php
@@ -13,7 +13,7 @@
             </td>
             <td class="document-detail">
                 PO#: {{ $po_order_transaction->bill_no }} <br>
-                Ref#: {{ $po_order_transaction->payment_reference ?? '-' }} <br>
+                Ref#: {{ $po_order_transaction->booking->marking }} <br>
                 Date: {{ $po_order_transaction->booking->created_at }}
             </td>
         </tr>
@@ -42,7 +42,7 @@
                 <br>
                 <span class="address">
                    @php
-                        $addresses = $supplier->addresses()->first();
+                        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
                     {{ $addresses->street_one }} 
                     {{ $addresses->street_two }} 
diff --git a/resources/views/pages/pdfs/supplier_deliver_order.blade.php b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
index 22de6719..f1e0d6c6 100644
--- a/resources/views/pages/pdfs/supplier_deliver_order.blade.php
+++ b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
@@ -19,7 +19,7 @@
             </td>
             <td class="document-detail">
                 PO#: {{ $supplier_deliver_order_transaction->bill_no }} <br>
-                Ref#: {{ $supplier_deliver_order_transaction->payment_reference ?? '-' }} <br>
+                Ref#: {{ $supplier_deliver_order_transaction->booking->marking }} <br>
                 Date: {{ $po_order_transaction->created_at }}
             </td>
         </tr>
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index f4af064b..4fb2bb75 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -1,5 +1,5 @@
 <div class="container-fluid p-r-15 p-l-15 position-fixed" style="z-index: 1050;">
-    <div class="row bg-primary-complete-gradient align-items-center justify-content-center">
+    <div class="row bg-primary-complete-gradient align-items-center justify-content-center" >
         <div class="col">
             <div class="container-fluid container-fixed-lg no-padding">
                 <div class="row align-items-center justify-content-between">
@@ -66,6 +66,14 @@
                             </div>
                             <div class="col-auto m-r-20 d-none d-md-inline">
                                 <div class="row align-items-center p-t-5 p-b-5 b-a b-thick" style="border-color: #ffffff3d">
+                                    <div class="col-auto">
+                                        <div class="fs-12 text-primary-lighter">MYR 0.00</div>
+                                    </div>
+                                    <top-up-account-component></top-up-account-component>
+                                </div>
+                            </div>
+                            <div class="col-auto m-r-20 d-none d-md-inline">
+                                <div class="row align-items-center p-t-5 p-b-5 b-a b-thick d-inline-flex h-100" style="border-color: #ffffff3d">
                                     <div class="col-auto">
                                         <div class="fs-12 text-primary-lighter">Hi, <span v-text="$store.getters.getUserName.split(' ').slice(0,2).join(' ')"></span>!</div>
                                     </div>
@@ -97,4 +105,14 @@
             </div>
         </div>
     </div>
+    @if(env('APP_ENV') === 'development')
+        <div class="row">
+            <div class="col no-padding">
+                <div class="alert alert-danger" role="alert">
+                    <i class="fa fa-times float-right text-danger pointer" data-dismiss="alert"></i>
+                    <strong>Development: </strong>Your are currently browsing the application on a development server, it is safe to make changes here!
+                </div>
+            </div>
+        </div>
+    @endif
 </div>
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 146d519a..cf5838f3 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -14,7 +14,7 @@ use Illuminate\Support\Facades\Route;
 */
 
 Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function () {
-    
+
     require __DIR__ . '/account.php';
 
 //    Route::get('/rate/calculate', 'RateCalculateCurrencyController@convert')->name('calculate');
@@ -23,7 +23,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
         Route::get('countries/list', 'Services\CountriesListController@index')->name('list.countries');
     });
 
-
+    Route::post('online_payment/callback', 'Billplz\CallbackBillplzController@callback')->name('online_payment.callback');
 
     Route::group(['middleware' => 'valid.token'], function () {
 
@@ -47,7 +47,10 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         require __DIR__ . '/announcement.php';
 
-//        require __DIR__ . '/wallet.php';
+        require __DIR__ . '/billplz.php';
+
+        require __DIR__ . '/wallet.php';
+
 //        require __DIR__ . '/rate.php';
 //        require __DIR__ . '/receipt.php';
 
diff --git a/routes/billplz.php b/routes/billplz.php
new file mode 100644
index 00000000..e1717a20
--- /dev/null
+++ b/routes/billplz.php
@@ -0,0 +1,9 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'billplz', 'as' => 'billplz.', 'namespace' => 'Billplz'], function () {
+    Route::group(['prefix' => 'bill', 'as' => 'bill.'], function () {
+        Route::post('/create', 'CreateBillplzBillController@create')->name('create');
+    });
+});
\ No newline at end of file
diff --git a/routes/booking.php b/routes/booking.php
index c2805443..44767438 100644
--- a/routes/booking.php
+++ b/routes/booking.php
@@ -10,6 +10,7 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
     Route::put('/cancel/{id}', 'CancelBookingController@cancel')->name('cancel');
     Route::put('/restore/{id}', 'RestoreBookingController@restore')->name('restore');
     Route::delete('/delete/{id}', 'DeleteBookingController@delete')->name('delete');
+    Route::post('/regenerate/invoice/{id}', 'RegenerateInvoiceBookingController@regenerate')->name('regenerate.invoice');
 
     Route::group(['prefix' => '{id}/payment', 'as' => 'payment.'], function () {
         Route::post('quotation', 'FetchBookingPaymentQuotationController@fetch')->name('quotation');
@@ -25,6 +26,9 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
 
     Route::post('{id}/purchase_order/verification', 'ApprovePurchaseOrderController@approve')->name('po.approval');
 
+    Route::put('{id}/updateAmount', 'UpdateBookingAmountController@update')->name('booking_amount.update');
+
     Route::post('/merge', 'MergeBookingController@merge')->name('merge');
 
+    Route::post('{id}/proforma/create', 'CreateProformaInvoiceTransaction@create')->name('proforma.create');
 });
\ No newline at end of file
diff --git a/routes/transaction.php b/routes/transaction.php
index 9f10c6cc..17502743 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -10,6 +10,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
     route::post('/supplier/{id}/bill/create', 'CreateSupplierTransactionController@create')->name('supplier.create');
     route::post('{id}/bill/verification', 'CreatePaymentProofDocumentController@verify')->name('bill.verification');
     route::post('{id}/bill/pay', 'CreatePaymentProofDocumentController@pay')->name('bill.pay');
+    route::delete('{id}/bill/delete', 'DeletePaymentProofDocumentController@delete')->name('bill.delete');
 
     Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');
 
diff --git a/routes/wallet.php b/routes/wallet.php
index 6b19a47c..7ad2a479 100644
--- a/routes/wallet.php
+++ b/routes/wallet.php
@@ -3,8 +3,10 @@
 use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'wallets', 'namespace' => 'Wallets', 'as' => 'wallet.'], function () {
-
+    Route::get('/', 'ListWalletController@list')->name('list');
     Route::post('/create', 'CreateWalletController@create')->name('create');
-    Route::post('/create-transaction/{id}', 'CreateWalletTransactionController@create')->name('create_transaction');
+    Route::post('/topup', 'TopUpWalletController@topUp')->name('topup');
+    Route::post('/withdraw', 'WithdrawWalletController@withdraw')->name('withdraw');
+    Route::put('/{transaction_id}/update-status/{status}', 'UpdateStatusWalletController@updateStatus')->where('status', 'approve|reject')->name('approval');
 
-});
\ No newline at end of file
+});
diff --git a/routes/web.php b/routes/web.php
index 38d5acab..61cccb47 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,10 +1,6 @@
 <?php
 
-use App\Models\User;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\Storage;
 
 /*
 |--------------------------------------------------------------------------