diff --git a/.env.example b/.env.example
index 47a20e74..6367c9b8 100644
--- a/.env.example
+++ b/.env.example
@@ -50,4 +50,11 @@ 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"
+BILLPLZ_REDIRECT_URL="http://localhost:9003/bookings/billplz"
+BILLPLZ_CALLBACK_URL="localhost:9003/api/v1/billplz/callback"
\ No newline at end of file
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/PaymentReference.php b/app/Classes/General/Eloquent/Filters/PaymentReference.php
new file mode 100644
index 00000000..10c1fa49
--- /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/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
new file mode 100644
index 00000000..8dece746
--- /dev/null
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\ControllersLogic;
+
+use ErrorException;
+
+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;
+
+class CallbackBillplzLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Callback Billplz',
+            'message' => 'You have successfully receive Billplz callback'
+        ];
+    }
+
+    /** @var GetBillplzBill */
+    private $getBillplzBill;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+
+    /**
+     * CreateBookingLogic constructor.
+     * @param CreateGetBillplzBillsBillplzBill $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 JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $billplzXSignatureObject = new BillplzXSignatureObject($request);
+
+        if(!$billplzXSignatureObject->isValidSignature())  throw new MalformedRequestException('Unable to get correct response from billplz server.');
+
+        $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
+
+        if(!$billPlz) throw new MalformedRequestException('Unable to get correct response from billplz server.');
+
+        $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
+
+        if($billPlz->state == 'paid') $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
+        
+        return $this->response(['data' => $billPlz]);
+
+    }
+}
\ 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..db3e3ad6
--- /dev/null
+++ b/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\DataTransferObjects;
+
+use Illuminate\Http\Request;
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class BillplzXSignatureObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $billPlzId;
+
+    /** @var array */
+    private $billPlzConstructArray;
+
+    /** @var string */
+    private $billPlzConstructString;
+
+    /** @var string  */
+    private $billPlzComputedXSignature;
+
+    /** @var Request  */
+    private $request;
+
+    /** @var string  */
+    private $requestXSignature;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+
+        $this->billPlzId = $request->id ? $request->id : $request->{'billplz[id]'};
+
+        $this->requestXSignature = $request->x_signature ? $request->x_signature : $request->{'billplz[x_signature]'};
+
+        $this->_constructBillplzArray()->_natSortBillplzArray()->_constructBillplzString()->_computeBillplzXSignature();
+    }
+
+    private function _constructBillplzArray(){
+        foreach($this->request->all() as $key => $value){
+            if($key != 'x_signature' && $key != 'billplz[x_signature]'){
+                $key = str_replace(']', '', str_replace('[', '', $key));
+                $this->billPlzConstructArray[] = $key.$value;
+            }
+        }
+        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;
+    }
+
+    /**
+     * @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..7cf4bdef
--- /dev/null
+++ b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use Illuminate\Support\Facades\Http;
+
+class CreatesBillplzBill
+{
+    /**
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\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' => $amount,
+                'redirect_url' => config('billplz.redirect_url'),
+                'callback_url' => config('billplz.callback_url'),
+                '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');
+        }
+    }
+}
\ 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..ff7c129f
--- /dev/null
+++ b/app/Classes/Modules/Billplzs/Services/GetBillplzBill.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use Illuminate\Support\Facades\Http;
+
+class GetBillplzBill
+{
+    /**
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\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..db1c0d2b 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,14 +98,18 @@ 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 on behave '.$booking->company->name, $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);
-
+        
         return $this->resourceResponse(new TransactionResource($transaction));
     }
 
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..90de18f4 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
@@ -5,17 +5,17 @@ namespace App\Classes\Modules\Bookings\ControllersLogic;
 
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\FetchesBookingQuotation;
 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;
 
@@ -32,15 +32,15 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
         ];
     }
 
+    /** @var FetchesBookingQuotation */
+    private $fetchBookingQuotation;
+
     /** @var FetchesTransaction */
     private $fetchesTransaction;
 
     /** @var UpdatesTransactionStatus */
     private $updatesTransactionStatus;
 
-    /** @var FetchesCompanyPaymentAttemptLimit */
-    private $fetchesCompanyPaymentAttemptLimit;
-
     /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNumber;
 
@@ -49,17 +49,17 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
 
     /**
      * CreateBookingPaymentLogic constructor.
+     * @param FetchesBookingQuotation $fetchBookingQuotation
      * @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(FetchesBookingQuotation $fetchBookingQuotation, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction)
     {
+        $this->fetchBookingQuotation = $fetchBookingQuotation;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsTransaction = $createsTransaction;
     }
@@ -75,18 +75,21 @@ 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();
+        }
+
+        $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);
+            $transactionRefundCalculationObject->getConfigurations()->getConfigurations()->getBankId(), $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/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/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/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..b2e13067 100644
--- a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
+++ b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php
@@ -2,8 +2,8 @@
 
 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;
@@ -15,7 +15,7 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
      * @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/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/TransactionType.php b/app/Classes/ValueObjects/Constants/TransactionType.php
index c3d9eb64..05771c12 100644
--- a/app/Classes/ValueObjects/Constants/TransactionType.php
+++ b/app/Classes/ValueObjects/Constants/TransactionType.php
@@ -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/Http/Controllers/Billplzs/CallbackBillplzController.php b/app/Http/Controllers/Billplzs/CallbackBillplzController.php
new file mode 100644
index 00000000..33525632
--- /dev/null
+++ b/app/Http/Controllers/Billplzs/CallbackBillplzController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Billplzs;
+
+use App\Classes\Modules\Billplzs\ControllersLogic\CallbackBillplzLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CallbackBillplzController
+{
+    /**
+     * @param Request $request
+     * @param BillplzBillLogic $logic
+     * @return JsonResponse
+     */
+    public function callback(Request $request, CallbackBillplzLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Billplzs/CreateBillplzBillController.php b/app/Http/Controllers/Billplzs/CreateBillplzBillController.php
new file mode 100644
index 00000000..cd62cfec
--- /dev/null
+++ b/app/Http/Controllers/Billplzs/CreateBillplzBillController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Billplzs;
+
+use App\Classes\Modules\Billplzs\ControllersLogic\CreateBillplzBillLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBillplzBillController
+{
+    /**
+     * @param Request $request
+     * @param BillplzBillLogic $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/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..30f2a733 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -23,6 +23,7 @@ class BookingResource extends JsonResource
      */
     public function toArray($request)
     {
+        // dd($this->service);
         return [
             'id' => $this->id,
             'company' => new CompanyResource($this->company),
@@ -46,7 +47,12 @@ class BookingResource extends JsonResource
             '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){
diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 1793d191..df1a5685 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Models/Booking.php b/app/Models/Booking.php
index 33c33341..c3492241 100644
--- a/app/Models/Booking.php
+++ b/app/Models/Booking.php
@@ -3,6 +3,7 @@
 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;
@@ -24,7 +25,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property \App\Models\Currency convertible_currency_id
  * @property \App\Models\Currency conversion_currency_id
  */
-class Booking extends AbstractModel implements Documentable
+class Booking extends AbstractModel implements Documentable, Transactionable
 {
     use SoftDeletes;
 
@@ -89,11 +90,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 2624117b..f24fee8d 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -12,18 +12,40 @@ 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
 {
     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');
     }
 
     /**
@@ -135,6 +157,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..3323db18 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.*",
         "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..ac5b3a75
--- /dev/null
+++ b/config/billplz.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'base_url' => env('BILLPLZ_BASE_URL', 'https://www.billplz-sandbox.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/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 6e9ea19f..3abccf8b 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -2,7 +2,7 @@
     <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="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>
@@ -42,7 +42,7 @@
                     </document-file-viewer-component>
                 </div>
             </div>
-            <div class="row" v-show="expanded">
+            <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">
@@ -116,6 +116,106 @@
                             </div>
                         </div>
                     </div>
+                    <div class="row m-t-10">
+                        <div class="col">
+                            <button class="btn btn-xs all-caps b-rad-none btn-success btn-block" @click="requestRefund()">Request Refund</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-show="expandRefund">
+                <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="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="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>
@@ -127,7 +227,13 @@
     export default {
         data(){
             return {
-                expanded: false
+                expandPaymentDetails: false,
+                expandRefund: false,
+                refundMethod: {
+                    name: 'Fully Refund',
+                    status: false
+                },
+                amount: (Math.round(1000 * 100) / 100).toFixed(2),
             }
         },
         computed: {
@@ -135,6 +241,26 @@
               return this.item.type === 1 ? this.item : this.item.customer_booking;
           }
         },
+        methods: {
+            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/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/dashboards/admin.blade.php b/resources/views/pages/dashboards/admin.blade.php
index 7471027f..13e9e7ac 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]}">
                                                             <template slot="list" slot-scope="{data}">
                                                                 <payment-proof-component :data="data"></payment-proof-component>
                                                             </template>
diff --git a/routes/api.php b/routes/api.php
index 146d519a..0dc5b6a5 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,6 +23,12 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
         Route::get('countries/list', 'Services\CountriesListController@index')->name('list.countries');
     });
 
+    Route::group(['prefix' => 'billplz', 'as' => 'billplz.', 'namespace' => 'Billplzs'], function () {
+        Route::group(['prefix' => 'bill', 'as' => 'bill.'], function () {
+            Route::post('/callback', 'CallbackBillplzController@callback')->name('callback');
+        });
+    });
+
 
 
     Route::group(['middleware' => 'valid.token'], function () {
@@ -47,7 +53,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..cee3c778
--- /dev/null
+++ b/routes/billplz.php
@@ -0,0 +1,9 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'billplz', 'as' => 'billplz.', 'namespace' => 'Billplzs'], 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/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 37db6461..c0e8a208 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -100,6 +100,10 @@ Route::get('/test', function(){
 
 
 });
+Route::get('/bookings/billplz', function () {
+    return view('pages.billplz_redirect');
+})->name('bookings.billplz');
+
 
 Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
 Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions');