diff --git a/app/Classes/General/Eloquent/Filters/WithOwner.php b/app/Classes/General/Eloquent/Filters/WithOwner.php
new file mode 100644
index 00000000..7d31691e
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WithOwner.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithOwner implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('owner');
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
index 9e656e0b..5b331fca 100644
--- a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
+++ b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Billplzs\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
-use phpDocumentor\Reflection\Types\Boolean;
 
 class CreatesBillplzBill
 {
@@ -20,7 +19,7 @@ class CreatesBillplzBill
      * @return null|object
      * @throws MalformedRequestException
      */
-    public function execute(string $name, string $email, string $description, float $amount, string $billNumber, ?string $bankCode = null, ?Boolean $wallet = null) {
+    public function execute(string $name, string $email, string $description, float $amount, string $billNumber, ?string $bankCode = null, ?bool $wallet = null) {
         try{
 //            config('billplz.maybank')
             $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php
index 3c3459e2..514c32cd 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/DownloadBookingDocumentLogic.php
@@ -3,64 +3,39 @@
 namespace App\Classes\Modules\Bookings\ControllersLogic;
 
 
+use Illuminate\Support\Facades\File;
 use ZipArchive;
 use Carbon\Carbon;
 use App\Models\User;
 use App\Models\Booking;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
 
-class DownloadBookingDocumentLogic extends AbstractControllerLogic
+class DownloadBookingDocumentLogic
 {
 
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Download Booking Document',
-            'message' => 'You have successfully retrieved a Booking Document'
-        ];
-    }
-
-    /**
-     * DownloadBookingDocumentLogic constructor.
-     */
-    public function __construct()
-    {
-    }
-
 
     /**
      * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @return void
+     * @throws MalformedRequestException
      */
-    public function logic(Request $request): JsonResponse
+    public function execute(Request $request)
     {
 
         Auth::login(User::findOrFail(1));
-        $zip_file = 'do_' . Carbon::yesterday()->format('Y_m_d') . '.zip';
-        $attachment = storage_path() . '/' . $zip_file;
+        $zip_file = $request->input('type').'.zip';
+        $attachment = storage_path().'/app/documents/collections/' . $zip_file;
 
         $zip = new ZipArchive();
         if ($zip->open($attachment, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
 
-            $bookings = Booking::where('status', ApprovalStatus::COMPLETED)->whereDate('updated_at', '>=', $request->input('startDate'))->whereDate('updated_at', '<=', $request->input('endDate'))
-                ->whereHas('transactions', function ($query) {
-                    return $query->where('type', TransactionType::PAYMENT)->whereHas('transactions', function ($query) {
-                        return $query->where('issuer', 2);
-                    });
-                })->get();
+            $bookings = Booking::where('status', ApprovalStatus::COMPLETED)
+                ->whereDate('created_at', '>=', Carbon::parse($request->input('startDate')))
+                ->whereDate('created_at', '<=', Carbon::parse($request->input('endDate')))->get();
 
             if (!count($bookings)) throw new MalformedRequestException('No available file to download');
 
@@ -70,7 +45,6 @@ class DownloadBookingDocumentLogic extends AbstractControllerLogic
             }
 
             $zip->close();
-
             while (ob_get_level()) {
                 ob_end_clean();
             }
@@ -86,9 +60,14 @@ class DownloadBookingDocumentLogic extends AbstractControllerLogic
 
             readfile($attachment);
             File::delete($attachment);
-            
+
             exit;
 
+//            header('Content-Type: application/zip');
+//            header('Content-Length: ' . filesize($attachment));
+//            readfile($attachment);
+//            unlink($attachment);
+
         }
     }
 }
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/CreditWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/CreditWalletLogic.php
index 1e7b3ceb..60dd95cb 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/CreditWalletLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/CreditWalletLogic.php
@@ -102,13 +102,13 @@ class CreditWalletLogic extends AbstractControllerLogic
         $wallet = $company->wallets()->first();
 
         $billNumber = $this->generatesTransactionBillNumber->execute($type === 2 ? 'DEBIT-NOTE-' : 'CREDIT-NOTE-');
-        
-        $transaction_object = new TransactionObject($billNumber, $type === 2 ? TransactionType::DEBIT_NOTE : TransactionType::CREDIT_NOTE, 1,  $wallet->company->id,  1, PaymentMethodType::CASH,  $amount,  $amount,  1,  1,  1,  0,  0,  null,  ApprovalStatus::APPROVED,  [], $reference);
+
+        $transaction_object = new TransactionObject($billNumber, $type === 2 ? TransactionType::DEBIT_NOTE : TransactionType::CREDIT_NOTE, 1,  $wallet->owner->id,  1, PaymentMethodType::CASH,  $amount,  $amount,  1,  1,  1,  0,  0,  null,  ApprovalStatus::APPROVED,  [], $reference);
         $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
 
         $updateWalletAmount = $type === 2 ? ($wallet->amount - $transaction->amount) : ($wallet->amount + $transaction->amount);
 
-        $walletObject = new WalletObject($wallet->company->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
+        $walletObject = new WalletObject($wallet->owner->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
 
         $wallet = $this->updatesWallet->execute($wallet, $walletObject);
 
diff --git a/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php b/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php
index 461e48fc..95427363 100644
--- a/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php
+++ b/app/Http/Controllers/Bookings/DownloadBookingDocumentController.php
@@ -11,9 +11,10 @@ class DownloadBookingDocumentController
     /**
      * @param Request $request
      * @param DownloadBookingDocumentLogic $logic
-     * @return JsonResponse
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function download(Request $request, DownloadBookingDocumentLogic $logic): JsonResponse {
+    public function download(Request $request, DownloadBookingDocumentLogic $logic) {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Transactions/ListWalletTransactionsController.php b/app/Http/Controllers/Transactions/ListWalletTransactionsController.php
index d084b252..e83d7b58 100644
--- a/app/Http/Controllers/Transactions/ListWalletTransactionsController.php
+++ b/app/Http/Controllers/Transactions/ListWalletTransactionsController.php
@@ -3,19 +3,19 @@
 
 namespace App\Http\Controllers\Transactions;
 
+use App\Classes\Modules\Transactions\ControllersLogic\ListWalletTransactionsLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use App\Classes\Modules\Transactions\ControllersLogic\ListTransactionsLogic;
 
 
 class ListWalletTransactionsController
 {
     /**
      * @param Request $request
-     * @param ListTransactionsLogic $logic
+     * @param ListWalletTransactionsLogic $logic
      * @return JsonResponse
      */
-    public function list(Request $request, ListTransactionsLogic $logic) : JsonResponse {
+    public function list(Request $request, ListWalletTransactionsLogic $logic) : JsonResponse {
         return $logic->execute($request);
     }
 }
diff --git a/app/Http/Resources/DocumentResource.php b/app/Http/Resources/DocumentResource.php
index 2595ed55..59933a67 100644
--- a/app/Http/Resources/DocumentResource.php
+++ b/app/Http/Resources/DocumentResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Models\Booking;
 use App\Models\Company;
 use App\Models\Document;
 use Carbon\Carbon;
@@ -23,7 +24,7 @@ class DocumentResource extends JsonResource
             'reference' => $this->reference,
             'status' => (int) $this->status,
             'document_type' => $this->document_type,
-            'owner' =>  new CompanyResource($this->whenLoaded('owner')),
+            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingResource($this->owner) : new CompanyResource($this->owner)) : null,
             'files' => FileResource::collection($this->files),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
         ];
diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 69e0a264..efcdb99c 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -17,6 +17,7 @@ class TransactionResource extends JsonResource
     public function toArray($request)
     {
         $booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking;
+        $days = Carbon::parse($this->created_at)->addDays($booking->service_id === 1 ? 1 : 2);
 
         return [
             'id' => $this->id,
@@ -41,8 +42,8 @@ class TransactionResource extends JsonResource
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
             'interval' => [
-                'value' => (Carbon::parse($this->created_at)->addDays(3)->gt(Carbon::now()) ) ? '+' : '-' ,
-                'duration' => Carbon::parse($this->created_at)->addDays(3)->diff(Carbon::now())->format('%d'),
+                'value' => $days->gt(Carbon::now()) ? '+' : '-',
+                'duration' => $days->diff(Carbon::now())->format('%d'),
             ]
         ];
     }
diff --git a/resources/assets/images/10107.jpg b/resources/assets/images/10107.jpg
new file mode 100644
index 00000000..cffb1f8f
Binary files /dev/null and b/resources/assets/images/10107.jpg differ
diff --git a/resources/assets/images/first_topup_badge.png b/resources/assets/images/first_topup_badge.png
new file mode 100644
index 00000000..dce1b545
Binary files /dev/null and b/resources/assets/images/first_topup_badge.png differ
diff --git a/resources/assets/images/hot.png b/resources/assets/images/hot.png
new file mode 100644
index 00000000..46520b44
Binary files /dev/null and b/resources/assets/images/hot.png differ
diff --git a/resources/assets/images/new-icon.png b/resources/assets/images/new-icon.png
new file mode 100644
index 00000000..4131f31e
Binary files /dev/null and b/resources/assets/images/new-icon.png differ
diff --git a/resources/assets/images/wallet_announcement.png b/resources/assets/images/wallet_announcement.png
new file mode 100644
index 00000000..bb03ce79
Binary files /dev/null and b/resources/assets/images/wallet_announcement.png differ
diff --git a/resources/assets/images/wallet_announcement_2.png b/resources/assets/images/wallet_announcement_2.png
new file mode 100644
index 00000000..79c6a32f
Binary files /dev/null and b/resources/assets/images/wallet_announcement_2.png differ
diff --git a/resources/assets/sass/_responsive.scss b/resources/assets/sass/_responsive.scss
index 622c734a..fa7bb2f7 100644
--- a/resources/assets/sass/_responsive.scss
+++ b/resources/assets/sass/_responsive.scss
@@ -1184,4 +1184,8 @@
   border: 1px solid #d9d9d9;
   border-top: none;
   pointer-events: none;
+}
+
+.top-0 {
+  top: 0;
 }
\ No newline at end of file
diff --git a/resources/assets/sass/modules/_typography.scss b/resources/assets/sass/modules/_typography.scss
index 6e9934dc..605b8e7c 100644
--- a/resources/assets/sass/modules/_typography.scss
+++ b/resources/assets/sass/modules/_typography.scss
@@ -439,6 +439,10 @@ hr{
     background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0.8) 75%);
     background: linear-gradient(to bottom, rgba(0,0,0,0) 0%, rgba(0,0,0,0.8) 75%);
 }
+.gradient-white {
+    background: -webkit-linear-gradient(top, rgba(255,255,255, 0.5) 0%, rgba(255,255,255, 0.9) 75%);
+    background: linear-gradient(to bottom, rgba(255,255,255, 0.5) 0%, rgba(255,255,255, 0.9) 75%);
+}
 
 /* Other Colors
 ------------------------------------
diff --git a/resources/assets/vue/components/bookings/elements/BillingComponent.vue b/resources/assets/vue/components/bookings/elements/BillingComponent.vue
new file mode 100644
index 00000000..bfa8b2d9
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/BillingComponent.vue
@@ -0,0 +1,109 @@
+<template>
+    <div class="row m-b-20">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0 bg-master-light padding-10">
+                        <div class="col-12 col-md mb-2 mb-md-0 pointer">
+                            <div class="row h-100">
+                                <div class="col">
+                                    <div class="bg-white bg-hover-complete h-100 btn btn-xs btn-outline-none btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="selectedDocumentStatus = !selectedDocumentStatus">
+                                        <div class="row h-100">
+                                            <div class="col fs-9 d-flex align-items-center flex-column" style="padding-top: 7px; padding-bottom: 4px;">
+                                                <label class="all-caps w-100 m-b-0" style="font-size: 10.5px; letter-spacing: 0.06em; text-transform: uppercase; font-weight: 500;">Document Type</label>
+                                                <span class="w-100 fs-14">{{parameters.type}}</span>
+                                            </div>
+                                            <div class="col-auto b-l b-grey">
+                                                <div class="row h-100 align-items-center">
+                                                    <div class="col">
+                                                        <i class="fa" :class="[{'fa-angle-down': !selectedDocumentStatus}, {'fa-angle-up': selectedDocumentStatus}]"></i>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="relative w-100">
+                                        <div class="absolute w-100 b-l b-b b-r b-grey" :class="[{'hide': !selectedDocumentStatus}]" style="top: 100%; right: 0; z-index: 1;">
+                                            <div class="row text-left no-margin bg-white">
+                                                <div class="col no-padding">
+                                                    <div class="row no-margin" v-for="document in documents" :key="document">
+                                                        <div class="col b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10 b-a" @click="updateDocumentType(document)">
+                                                            <div class="row align-items-center justify-content-center">
+                                                                <div class="col">
+                                                                    <div class="font-heading fs-10">{{document}}</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-12 col-md mb-2 mb-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.startDate">
+                                <label class="all-caps">Start Date</label>
+                                <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md mb-2 mb-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.endDate">
+                                <label class="all-caps">End Date</label>
+                                <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md-auto d-flex justify-content-center align-items-center">
+                            <button type="button" class="btn btn-lg btn-primary fs-11 w-100" @click="submitSearch()">Download</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import componentHandler from "../../../general/mixins/componentHandler";
+import { required, minValue} from "vuelidate/lib/validators";
+import {VMoney} from 'v-money'
+
+export default {
+    data(){
+        return {
+            parameters: {
+                startDate: '',
+                endDate: '',
+                type: 'INVOICE',
+            },
+            documents: ['INVOICE', 'PURCHASE_ORDER', 'DELIVERY_ORDER', 'SUPPLIER_DELIVERY_ORDER'],
+            selectedDocumentStatus: false
+        }
+    },
+    validations: {
+        parameters: {
+            startDate: {
+                required
+            },
+            endDate: {
+                required
+            },
+            type: {
+                required
+            },
+        }
+    },
+    methods: {
+        submitSearch(){
+            if(!this.validate()){ return; }
+            window.open(route('documents.download')+'?type='+this.parameters.type+'&startDate='+this.parameters.startDate+'&endDate='+this.parameters.endDate, '_blank');
+        },
+        updateDocumentType(documentType) {
+            this.parameters.type = documentType;
+            this.selectedDocumentStatus = !this.selectedDocumentStatus
+        }
+    },
+    mixins: [componentHandler]
+};
+</script>
diff --git a/resources/assets/vue/components/bookings/elements/BillingDocumentComponent.vue b/resources/assets/vue/components/bookings/elements/BillingDocumentComponent.vue
new file mode 100644
index 00000000..64f96d0e
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/BillingDocumentComponent.vue
@@ -0,0 +1,64 @@
+<template>
+        <div class="row">
+            <div class="col">
+                <div class="row align-items-center m-b-15 parentContainer position-relative">
+                    <div class="col-auto">
+                        <div class="row">
+                            <div class="col-auto p-r-10 all-caps">
+                                <div class="font-heading all-caps bold">{{item.owner.marking}}</div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <div class="font-heading all-caps muted fs-11">{{item.owner.created_at}}</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-2">
+                        <div class="font-heading fs-10 muted all-caps">Marking</div>
+                        <div class="font-heading">
+                            <a :href="route('customer.profile', item.owner.company.reference)">{{this.item.owner.company.reference}}</a>
+                        </div>
+                    </div>
+                    <div class="col-auto">
+                        <div class="font-heading fs-10 muted all-caps">Document Type</div>
+                        <div class="font-heading">
+                            <span v-if="item.document_type === 'INVOICE'">Invoice</span>
+                            <span v-if="item.document_type === 'PURCHASE_ORDER'">Purchase Order</span>
+                            <span v-if="item.document_type === 'DELIVER_ORDER'">Delivery Order</span>
+                            <span v-if="item.document_type === 'SUPPLIER_DELIVER_ORDER'">Supplier Delivery Order</span>
+                        </div>
+                    </div>
+                    <div class="col-auto d-none d-lg-block">
+                        <div class="font-heading fs-10 muted all-caps">Currency</div>
+                        <div class="font-heading bold">
+                            <span class="flag-icon" :class="'flag-icon-'+item.owner.convertible_currency.country.short_code.toLowerCase()"></span> {{item.owner.convertible_currency.short_code}}
+                        </div>
+                    </div>
+                    <div class="col">
+                        <div class="font-heading fs-10 muted all-caps">Payable Amount</div>
+                        <div class="font-heading text-success bold">{{item.owner.amount}} {{item.owner.fixed_currency.short_code}}</div>
+                    </div>
+                    <div class="col">
+                        <document-file-viewer-component :file="item.files[0]">
+                            <template slot="button">
+                                <button class="btn btn-success">Download</button>
+                            </template>
+                        </document-file-viewer-component>
+                    </div>
+                </div>
+            </div>
+        </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/elements/BookingComponent.vue b/resources/assets/vue/components/bookings/elements/BookingComponent.vue
index c0563a15..9ff3fe9c 100644
--- a/resources/assets/vue/components/bookings/elements/BookingComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BookingComponent.vue
@@ -42,7 +42,7 @@
                         <div class="font-heading fs-10 muted all-caps">Payable Amount</div>
                         <div class="font-heading text-success bold">{{this.item.amount}} {{this.item.fixed_currency.short_code}}</div>
                     </div>
-                    <div class="col-auto" v-if="$store.getters.isCustomer">
+                    <div class="col-auto hide" v-if="$store.getters.isCustomer">
                         <div class="font-heading fs-10 muted all-caps">status</div>
                         <div class="font-heading all-caps text-master btn-rounded p-l-10 p-r-10 lh-15 mt-1" :class="[{'bg-warning': item.status !== 3}, {'bg-success': item.status === 3} ]">
                             {{item.status === 3 ? 'Complete' : 'In Progress'}}
diff --git a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
index 97480ac0..59484c81 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
@@ -28,6 +28,12 @@
                                                 {{item.booking.company.reference}}
                                             </div>
                                         </div>
+                                        <div class="col-auto" v-if="$store.getters.isAdmin">
+                                            <div class="font-heading fs-10 muted all-caps">Supplier</div>
+                                            <div class="font-heading fs-10">
+                                                {{item.issuer_name}}
+                                            </div>
+                                        </div>
                                         <div class="col"  v-if="item.status === 3">
                                             <div v-for="file in item.documents.files" v-bind:key="file.id"  class="col-auto no-padding m-l-5">
                                                 <document-file-viewer-component :file="file">
diff --git a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
index 9e2e1415..80eb3932 100644
--- a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
@@ -19,7 +19,7 @@
                                                 {{item.payment_method === 5 || item.payment_method === 4 ? item.updated_at : item.documents.created_at}}
                                             </div>
                                         </div>
-                                        <div class="col text-right hide">
+                                        <div class="col text-right">
                                             <div class="font-heading fs-10 muted all-caps">timer</div>
                                             <div class="font-heading fs-12 bold" :class="[{'text-success': item.interval.value === '+'}, {'text-danger': item.interval.value === '-'}]">
                                                 {{item.interval.value}}
diff --git a/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue b/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
index 408fbd58..6b285afd 100644
--- a/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
@@ -26,7 +26,7 @@
                                 <div class="col">
                                     <div class="row p-t-5 p-b-20">
                                         <div class="col">
-                                            <div class="row m-b-20" v-if="data.services.length > 1">
+                                            <div class="row" v-if="data.services.length > 1">
                                                 <div class="col">
                                                     <div class="row m-l-0 m-r-0 m-b-5">
                                                         <div class="col-auto p-l-0">
@@ -41,8 +41,13 @@
                                                         </div>
                                                     </div>
                                                     <div class="row no-margin h-100" v-if="data.services.length <= 3">
-                                                        <div class="col no-padding m-b-10" :class="[{'p-l-5': index != 0}, {'p-r-5': index+1 != data.services.length}]" v-for="(service, index) in data.services" v-bind:key="service.id" >
-                                                            <div class="btn btn-md b-rad-none p-t-5 p-b-5 w-100 h-100 d-flex align-items-center justify-content-center" :class="[{'btn-success': serviceType.id === service.id}, {'bg-master-lighter': serviceType.id != service.id}]" @click="updateServiceType(service)">{{service.name}}</div>
+                                                        <div class="col no-padding m-b-10" :class="[{'p-l-5': index !== 0}, {'p-r-5': index+1 !== data.services.length}]" v-for="(service, index) in data.services" v-bind:key="service.id" >
+                                                            <div class="btn btn-xs b-rad-none padding-25 btn-block" :class="[{'btn-success': serviceType.id === service.id}, {'bg-master-lighter': serviceType.id !== service.id}]" @click="updateServiceType(service)">
+                                                                {{service.name}}
+                                                                <span class="absolute" style="right: -15px;top: -15px;width: 40px;" v-if="index !==0">
+                                                                    <img src="/images/new-icon.png" class="w-100">
+                                                                </span>
+                                                            </div>
                                                         </div>
                                                     </div>
                                                     <div class="row" v-if="data.services.length > 3">
@@ -86,6 +91,12 @@
                                                     </div>
                                                 </div>
                                             </div>
+                                            <div class="row m-b-20">
+                                                <div class="col">
+                                                    <p class="no-margin" v-if="serviceType.id === 1">Recipient will receive the transfer on the <span class="text-success bold">next working day</span>. Check out on another three-day transfer option to get a better rate!</p>
+                                                    <p class="no-margin" v-if="serviceType.id === 3">Enjoy a <span class="bold text-underline">better rate</span> with this option! The recipient will receive the transfer after <span class="text-success bold">three working days</span>.</p>
+                                                </div>
+                                            </div>
                                             <div class="row">
                                                 <div class="col">
                                                     <div class="row m-l-0 m-r-0 m-b-5">
@@ -102,8 +113,8 @@
                                                     </div>
                                                     <div class="row m-b-10">
                                                         <div class="col">
-                                                            <div class="btn btn-xs b-rad-none p-l-25 p-r-25 p-t-5 p-b-5" :class="[{'btn-success': paymentType === 1}, {'btn-default': paymentType !== 1}, {'bg-master-lighter': paymentType !== 1}]" @click="paymentType = 1">Full Payment</div>
-                                                            <div class="btn btn-xs  b-rad-none p-l-25 p-r-25 m-r-5 p-t-5 p-b-5" :class="[{'btn-success': paymentType === 0}, {'btn-default': paymentType !== 0}, {'bg-master-lighter': paymentType !== 0}]" @click="paymentType = 0">Deposit</div>
+                                                            <div class="btn btn-xs b-rad-none p-l-25 p-r-25 p-t-5 p-b-5" :class="[{'btn-complete': paymentType === 1}, {'btn-default': paymentType !== 1}, {'bg-master-lighter': paymentType !== 1}]" @click="paymentType = 1">Full Payment</div>
+                                                            <div class="btn btn-xs  b-rad-none p-l-25 p-r-25 m-r-5 p-t-5 p-b-5" :class="[{'btn-complete': paymentType === 0}, {'btn-default': paymentType !== 0}, {'bg-master-lighter': paymentType !== 0}]" @click="paymentType = 0">Deposit</div>
                                                         </div>
                                                     </div>
                                                     <div class="row" v-if="paymentType === 0">
diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 4c859f8e..d43eb47b 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -235,7 +235,9 @@
                                                                      style=" fill:#000000;"><defs><linearGradient x1="47.41556" y1="114.21875" x2="47.41556" y2="136.68625" gradientUnits="userSpaceOnUse" id="color-1_DGsE9caX0XGr_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="21.78488" x2="86" y2="154.10125" gradientUnits="userSpaceOnUse" id="color-2_DGsE9caX0XGr_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="111.53125" y1="27.50388" x2="111.53125" y2="49.92569" gradientUnits="userSpaceOnUse" id="color-3_DGsE9caX0XGr_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="63.15625" y1="54.32244" x2="63.15625" y2="64.45969" gradientUnits="userSpaceOnUse" id="color-4_DGsE9caX0XGr_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="Layer_2"><path d="M55.9,134.375h-15.5875c-1.6125,0 -2.6875,-1.075 -2.6875,-2.6875v-15.5875c0,-1.075 1.34375,-1.88125 2.41875,-1.075l16.93125,16.93125c0.80625,1.075 0,2.41875 -1.075,2.41875z" fill="url(#color-1_DGsE9caX0XGr_gr1)"></path><path d="M150.5,96.75v-37.625c0,-5.9125 -4.8375,-10.75 -10.75,-10.75h-7.525c1.34375,-2.95625 2.15,-6.18125 2.15,-9.40625c0,-12.63125 -10.2125,-22.84375 -22.84375,-22.84375c-12.63125,0 -22.84375,10.2125 -22.84375,22.84375c0,3.225 0.80625,6.45 2.15,9.40625h-12.9c-4.03125,-3.225 -9.1375,-5.375 -14.78125,-5.375c-5.64375,0 -10.75,2.15 -14.78125,5.375h-21.5c-2.95625,0 -5.64375,1.34375 -7.79375,3.225c-1.88125,2.15 -2.95625,4.8375 -2.95625,7.525v0v83.3125c0,7.525 5.9125,13.4375 13.4375,13.4375h107.5c7.525,0 13.4375,-5.9125 13.4375,-13.4375v-18.8125c2.95625,0 5.375,-2.41875 5.375,-5.375v-16.125c0,-2.95625 -2.41875,-5.375 -5.375,-5.375zM111.53125,21.5c9.675,0 17.46875,7.79375 17.46875,17.46875c0,9.675 -7.79375,17.46875 -17.46875,17.46875c-9.675,0 -17.46875,-7.79375 -17.46875,-17.46875c0,-9.675 7.79375,-17.46875 17.46875,-17.46875zM111.53125,61.8125c6.9875,0 13.16875,-3.225 17.46875,-8.0625h10.75c2.95625,0 5.375,2.41875 5.375,5.375v8.0625c-2.15,-1.6125 -5.10625,-2.6875 -8.0625,-2.6875h-51.0625c-0.26875,-4.03125 -1.34375,-7.525 -3.49375,-10.75h11.55625c4.3,4.8375 10.48125,8.0625 17.46875,8.0625zM80.625,64.5h-34.9375c0.80625,-9.1375 8.33125,-16.125 17.46875,-16.125c9.1375,0 16.6625,6.9875 17.46875,16.125zM23.1125,55.3625c0.80625,-1.075 2.15,-1.6125 3.7625,-1.6125h16.93125c-1.88125,3.225 -3.225,6.71875 -3.49375,10.75h-13.16875c-2.95625,0 -5.375,-2.15 -5.64375,-5.10625c0,-1.34375 0.5375,-2.95625 1.6125,-4.03125zM145.125,142.4375c0,4.56875 -3.49375,8.0625 -8.0625,8.0625h-107.5c-4.56875,0 -8.0625,-3.49375 -8.0625,-8.0625v-74.175c1.6125,1.075 3.7625,1.6125 5.9125,1.6125h13.16875h42.73125h53.75c4.56875,0 8.0625,3.49375 8.0625,8.0625v18.8125h-5.375v-13.4375c0,-4.56875 -3.49375,-8.0625 -8.0625,-8.0625h-96.75c-4.56875,0 -8.0625,3.49375 -8.0625,8.0625v53.75c0,4.56875 3.49375,8.0625 8.0625,8.0625h96.75c4.56875,0 8.0625,-3.49375 8.0625,-8.0625v-13.4375h5.375zM120.9375,96.75c-7.525,0 -13.4375,5.9125 -13.4375,13.4375c0,7.525 5.9125,13.4375 13.4375,13.4375h13.4375v13.4375c0,1.6125 -1.075,2.6875 -2.6875,2.6875h-96.75c-1.6125,0 -2.6875,-1.075 -2.6875,-2.6875v-53.75c0,-1.6125 1.075,-2.6875 2.6875,-2.6875h96.75c1.6125,0 2.6875,1.075 2.6875,2.6875v13.4375zM129,110.1875c0,4.56875 -3.49375,8.0625 -8.0625,8.0625c-4.56875,0 -8.0625,-3.49375 -8.0625,-8.0625c0,-4.56875 3.49375,-8.0625 8.0625,-8.0625c4.56875,0 8.0625,3.49375 8.0625,8.0625zM131.6875,118.25c1.6125,-2.15 2.6875,-5.10625 2.6875,-8.0625c0,-2.95625 -1.075,-5.9125 -2.6875,-8.0625h18.8125v16.125z" fill="url(#color-2_DGsE9caX0XGr_gr2)"></path><circle cx="41.5" cy="14.5" transform="scale(2.6875,2.6875)" r="4.5" fill="url(#color-3_DGsE9caX0XGr_gr3)"></circle><path d="M74.98125,64.5c-0.80625,-5.9125 -5.64375,-10.75 -11.825,-10.75c-6.18125,0 -11.2875,4.8375 -11.825,10.75z" fill="url(#color-4_DGsE9caX0XGr_gr4)"></path></g></g></svg>
                                                             </div>
                                                             <p class="no-margin bold all-caps">Wallet Credit</p>
+                                                            <p class="no-margin bold text-primary fs-10">(Better Rate)</p>
                                                         </div>
+                                                        <span class="absolute" style="right: 5px;top: 5px;width: 25px;"><img src="/images/hot.png" class="w-100"></span>
                                                     </div>
                                                 </div>
                                             </div>
diff --git a/resources/assets/vue/components/wallets/elements/WalletComponent.vue b/resources/assets/vue/components/wallets/elements/WalletComponent.vue
index bfc0153e..486f821d 100644
--- a/resources/assets/vue/components/wallets/elements/WalletComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletComponent.vue
@@ -1,18 +1,69 @@
 <template>
     <div class="row">
         <div class="col">
-            <div class="row padding-15">
-                <div class="col bg-white padding-15">
-                    <div class="bold d-flex align-items-center m-b-10">
-                        <span class="rounded badge-success m-r-10 padding-5 p-l-15 p-r-15">New</span> March 1, 2020
+            <div class="row m-b-20 parentContainer" v-if="data.id === 9">
+                <div class="col-auto">
+                    <img src="/images/first_topup_badge.png" class="pointer requestModal" data-type="badgeModal" style="width: 50px;">
+                </div>
+                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="badgeModal" size="extra-large">
+                    <div class="row">
+                        <div class="col text-center">
+                            <div class="row m-b-50">
+                                <div class="col bg-white padding-15">
+                                    <h5 class="text-center text-success bold">Congratulation! You've earned and achievement</h5>
+                                </div>
+                            </div>
+                            <div class="row justify-content-center">
+                                <div class="col-8">
+                                    <img src="/images/first_topup_badge.png" class="animate__animated animate__infinite animate__tada w-100">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </modal-component>
+            </div>
+            <div class="row m-l-0 m-r-0 m-b-15">
+                <div class="col bg-white padding-15">
+                    <div class="row">
+                        <div class="col">
+                            <div class="bold d-flex align-items-center m-b-10">
+                                <span class="rounded badge-success m-r-10 padding-5 p-l-15 p-r-15">New</span> March 1, 2020
+                            </div>
+                            <h5 class="bold fs-18">Try out our wallet to get a better rate now.</h5>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <img class="m-b-10 w-100" src="/images/10107.jpg" />
+                        </div>
+                    </div>
+                    <div class="row" :class="[{'h-25': !expanded}, {'overflow-hidden': !expanded}]">
+                        <div class="col position-relative">
+                            <div class="row">
+                                <div class="col">
+                                    <p>Transferring your payments by using the wallet just got a lot easier.</p>
+                                    <div class="row">
+                                        <div class="col" v-if="expanded">
+                                            <p class="no-margin">This release you can:</p>
+                                            <p class="no-margin">1. Top up once, pay for multiple transfers</p>
+                                            <p class="no-margin">2. Get your refund back to your wallet</p>
+                                            <p class="no-margin">3. Get a better exchange rate.</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row position-absolute top-0 w-100 gradient-white p-t-15 p-b-15" v-if="!expanded">
+                                <div class="col">
+                                    <div class="m-b-0 m-t-5 d-flex justify-content-center cursor" @click="expanded = !expanded">Show more <i class="fa fa-angle-down fs-20 bold m-l-10"></i></div>
+                                </div>
+                            </div>
+                            <div class="row" v-if="expanded">
+                                <div class="col">
+                                    <div class="m-b-0 m-t-5 d-flex justify-content-center cursor" @click="expanded = !expanded">Show less <i class="fa fa-angle-up fs-20 bold m-l-10"></i></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
-                    <h5 class="bold fs-18">Try out our wallet to get a better rate now.</h5>
-                    <img class="m-b-10" src="http://localhost/others/cief/exchange-2.0/public/images/temp_reload_annnouncement.jpg" />
-                    <p>Transfering your payments by using the wallet just got a lot easier.</p>
-                    <p>This release can:</p>
-                    <p>1. Top up once, upload ONE bankslip and you get to pay multiple transactions</p>
-                    <p>2. Get your refund back to your wallet and easier for you to make the next payment (if applicable)</p>
-                    <p>3. Get a better exchange rate.</p>
                 </div>
             </div>
             <div class="row" v-if="!reload">
@@ -70,6 +121,7 @@
         data(){
             return {
                 reload: false,
+                expanded: false
             }
         },
         mixins: [componentHandler],
diff --git a/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue b/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
index 406c478f..d3709d1e 100644
--- a/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
@@ -24,7 +24,7 @@
             </div>
             <div class="row">
                 <div class="col">
-                    <div class="font-heading all-caps fs-11">{{data.created_at}}</div>
+                    <div class="font-heading all-caps fs-11">{{data.updated_at}}</div>
                 </div>
             </div>
         </div>
diff --git a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
index d4d637a2..23f56c46 100644
--- a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
+++ b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
@@ -55,7 +55,7 @@
                     <div class="btn btn-block btn-sm b-rad-none p-t-10 p-b-10 lh-15" @click="parameters.amount = '50000.00'" :class="[{'btn-complete': parseInt(parameters.amount.replace(/\,/g,'')) === 50000}, {'btn-default': parseInt(parameters.amount.replace(/\,/g,'')) !== 50000}]">MYR<br>50,000</div>
                 </div>
             </div>
-            <div class="row m-t-15 justify-content-center parentContainer" v-if="parseInt(parameters.amount.replace(/\,/g,'')) > 0" >
+            <div class="row m-t-15 justify-content-center parentContainer" v-if="parseFloat(parameters.amount.replace(/\,/g,'')) > 0" >
                 <div class="col-10">
                     <div class="btn btn-sm btn-complete btn-block b-rad-none requestModal" data-type="paymentSummary">Reload Credit</div>
                 </div>
@@ -108,7 +108,7 @@
                     amount: '0.00',
                     transaction_type: 0,
                     reference: ''
-                }
+                },
             }
         },
         created(){
@@ -119,7 +119,7 @@
                 parameters: {
                     amount: {
                         required,
-                        minValue: 10.000,
+                        minValue: minValue(this.minValue),
                     },
                     reference: {
                         required: requiredIf(function () { return this.parameters.transaction_type !== 0 })
@@ -127,6 +127,12 @@
                 }
             }
         },
+        computed: {
+            minValue()
+            {
+                return this.transaction_type === 0 ? 10.0000 : 0;
+            }
+        },
         methods: {
             successHandler(response){
                 if (this.parameters.transaction_type === 0) {
diff --git a/resources/views/pages/billings.blade.php b/resources/views/pages/billings.blade.php
new file mode 100644
index 00000000..4bc012d5
--- /dev/null
+++ b/resources/views/pages/billings.blade.php
@@ -0,0 +1,131 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row" v-if="$store.getters.isAdmin">
+        <div class="col p-t-15 p-b-15">
+            <billing-component></billing-component>
+
+            <div class="row tabsContainer">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0 d-flex">
+                        <div class="col">
+                            <div class="row justify-content-end">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="invoice">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path><path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path><path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path><path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Invoice</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="purchase-order">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Purchase Order</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery-order">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Delivery Order</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="supplier-delivery-order">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Supplier Delivery Order</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row no-margin">
+                        <div class="col bg-white padding-25">
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="invoice">
+                                <list-component key="2" section="invoiceSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['INVOICE']}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <billing-document-component :data="data"></billing-document-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="purchase-order">
+                                <list-component key="2" section="purchaseOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['PURCHASE_ORDER']}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <billing-document-component :data="data"></billing-document-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="delivery-order">
+                                <list-component key="2" section="deliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['DELIVER_ORDER']}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <billing-document-component :data="data"></billing-document-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="supplier-delivery-order">
+                                <list-component key="2" section="SupplierDeliveryOrderSection" :endpoint="route('api.document.list')" :options="{'per_page': 30, 'with_owner': true, 'document_type_in': ['SUPPLIER_DELIVER_ORDER']}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <billing-document-component :data="data"></billing-document-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/wallet/wallets.blade.php b/resources/views/pages/wallet/wallets.blade.php
index 8a9219f0..661825ee 100644
--- a/resources/views/pages/wallet/wallets.blade.php
+++ b/resources/views/pages/wallet/wallets.blade.php
@@ -82,28 +82,28 @@
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
                             <div class="row tabsContainer tabContent  m-l-0 m-r-0" tab-name="top-up">
-                                <list-component  key="2" section="topUp" :endpoint="route('api.transaction.wallet.list')" :options="{type: 5, owner_type: 'App\\Models\\Wallet', per_page: 30}">
+                                <list-component  key="2" section="topUp" :endpoint="route('api.transaction.wallet.list')" :options="{type: 5, status: 2, owner_type: 'App\\Models\\Wallet', per_page: 30}">
                                     <template slot="list" slot-scope="{data}">
                                         <wallet-transaction-component :data="data"></wallet-transaction-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent hide m-l-0 m-r-0 hide" tab-name="payments">
-                                <list-component  key="2" section="payments" :endpoint="route('api.transaction.wallet.list')" :options="{type: 1, owner_type: 'App\\Models\\Wallet', per_page: 30}">
+                                <list-component  key="2" section="payments" :endpoint="route('api.transaction.wallet.list')" :options="{type: 1, status: 2, owner_type: 'App\\Models\\Wallet', per_page: 30}">
                                     <template slot="list" slot-scope="{data}">
                                         <wallet-transaction-component :data="data"></wallet-transaction-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent hide m-l-0 m-r-0 hide" tab-name="credit-note">
-                                <list-component  key="2" section="creditNote" :endpoint="route('api.transaction.wallet.list')" :options="{type: 9, owner_type: 'App\\Models\\Wallet', per_page: 30}">
+                                <list-component  key="2" section="creditNote" :endpoint="route('api.transaction.wallet.list')" :options="{type: 9, status: 2, owner_type: 'App\\Models\\Wallet', per_page: 30}">
                                     <template slot="list" slot-scope="{data}">
                                         <wallet-transaction-component :data="data"></wallet-transaction-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent hide m-l-0 m-r-0 hide" tab-name="debit-note">
-                                <list-component  key="2" section="debitNote" :endpoint="route('api.transaction.wallet.list')" :options="{type: 11, owner_type: 'App\\Models\\Wallet', per_page: 30}">
+                                <list-component  key="2" section="debitNote" :endpoint="route('api.transaction.wallet.list')" :options="{type: 11, status: 2, owner_type: 'App\\Models\\Wallet', per_page: 30}">
                                     <template slot="list" slot-scope="{data}">
                                         <wallet-transaction-component :data="data"></wallet-transaction-component>
                                     </template>
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index edd7c858..0f9754ae 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -25,7 +25,12 @@
                                     </div>
                                     <div class="col-auto p-r-20"  v-if="$store.getters.isAdmin">
                                         <a href="{{route('payments')}}">
-                                            <div class="text-white all-caps fs-12">Payments & Billing</div>
+                                            <div class="text-white all-caps fs-12">Payments</div>
+                                        </a>
+                                    </div>
+                                    <div class="col-auto p-r-20"  v-if="$store.getters.isAdmin">
+                                        <a href="{{route('billings')}}">
+                                            <div class="text-white all-caps fs-12">Billings</div>
                                         </a>
                                     </div>
                                     <div class="col-auto p-r-20"  v-if="$store.getters.isAdmin">
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index 40d5ff80..4a8ce344 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -61,7 +61,18 @@
                                      style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M32.25,19.35v133.3h47.59814c-0.1763,-0.87075 -0.29814,-1.75695 -0.29814,-2.6707v-1.6293h-43v-124.7h68.8v30.1h30.1v23.90195c1.39535,-0.15265 2.82295,-0.25195 4.3,-0.25195v-26.69023l-31.35977,-31.35977zM109.65,26.69023l22.75977,22.75977h-22.75977zM47.3,27.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,36.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,45.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,53.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,62.35c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86.17637,62.35v4.12783c-8.0754,0.7482 -12.97978,5.32437 -12.97978,12.23232c0,5.8351 3.65238,9.8429 10.32168,11.54785l2.65811,0.68867v13.63906c-4.45695,-0.50955 -7.32693,-2.99253 -7.62578,-6.55078h-6.34082c0.02365,5.66095 3.61012,9.82731 9.57422,11.48066c1.849,-2.9928 4.77992,-5.51263 8.49082,-7.34443v-10.44766c5.08475,1.01695 7.44522,3.07924 7.44522,6.52139c0,0.5074 -0.05237,0.98248 -0.14697,1.43613c2.021,-0.4214 4.16791,-0.65746 6.39961,-0.73486c0.04515,-0.46225 0.12598,-0.90404 0.12598,-1.38994c0,-6.192 -3.53195,-9.98705 -11.03975,-11.8124l-2.78408,-0.62988v-12.8916c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.25264c-0.1806,-6.67145 -5.26693,-11.39735 -13.01338,-12.08535v-4.12783zM47.3,70.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86.17637,72.19297v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM47.3,79.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM139.75,83.85c-5.07645,0 -9.69507,1.1317 -13.21494,3.11162c-3.51987,1.97993 -6.13506,5.00886 -6.13506,8.71338c0,0.04448 0.01185,0.08589 0.0126,0.13018h-0.0126v11.17412v2.6959c-0.57832,-0.43562 -1.18402,-0.84736 -1.83506,-1.21357c-3.51987,-1.97993 -8.13849,-3.11162 -13.21494,-3.11162c-5.07645,0 -9.69507,1.1317 -13.21494,3.11162c-3.51987,1.97993 -6.13506,5.00886 -6.13506,8.71338c0,0.04448 0.01185,0.08589 0.0126,0.13018h-0.0126v10.52324v0.65088v10.75v10.75c0,3.61346 2.669,6.48532 6.18125,8.34805c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c1.57399,-0.83477 2.96028,-1.883 4.03125,-3.09902c1.07097,1.21602 2.45726,2.26425 4.03125,3.09902c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c3.51225,-1.86273 6.18125,-4.73459 6.18125,-8.34805v-11.40088v-10.09912v-0.42412v-10.86338v-10.86338v-10.52324h-0.0126c0.00075,-0.04429 0.0126,-0.08569 0.0126,-0.13018c0,-3.70452 -2.61519,-6.73345 -6.13506,-8.71338c-3.51987,-1.97993 -8.13849,-3.11162 -13.21494,-3.11162zM47.3,88.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM139.75,88.15c4.42285,0 8.40163,1.03559 11.10693,2.55732c2.70531,1.52174 3.94307,3.32884 3.94307,4.96768c0,1.63884 -1.23776,3.44594 -3.94307,4.96768c-2.70531,1.52173 -6.68408,2.55732 -11.10693,2.55732c-4.42285,0 -8.40163,-1.03559 -11.10693,-2.55732c-2.70531,-1.52174 -3.94307,-3.32884 -3.94307,-4.96768c0,-1.63884 1.23776,-3.44594 3.94307,-4.96768c2.70531,-1.52173 6.68408,-2.55732 11.10693,-2.55732zM47.3,96.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,103.1748c0.57832,0.43562 1.18402,0.84736 1.83506,1.21357c3.51987,1.97993 8.13849,3.11162 13.21494,3.11162c5.07645,0 9.69507,-1.1317 13.21494,-3.11162c0.65104,-0.36621 1.25674,-0.77795 1.83506,-1.21357v3.15361v0.65088c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM47.3,105.35c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM105.35,109.65c4.42285,0 8.40163,1.03559 11.10693,2.55732c2.70531,1.52174 3.94307,3.32884 3.94307,4.96768c0,0.00549 0.00003,0.01131 0,0.0168c-0.00826,1.63447 -1.24682,3.43424 -3.94307,4.95088c-2.70531,1.52173 -6.68408,2.55732 -11.10693,2.55732c-4.42285,0 -8.40163,-1.03559 -11.10693,-2.55732c-2.70531,-1.52174 -3.94307,-3.32884 -3.94307,-4.96768c0,-1.63884 1.23776,-3.44594 3.94307,-4.96768c2.70531,-1.52173 6.68408,-2.55732 11.10693,-2.55732zM47.3,113.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,114.14736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375zM47.3,122.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,124.6748c0.57832,0.43562 1.18402,0.84736 1.83506,1.21357c3.51987,1.97993 8.13849,3.11162 13.21494,3.11162c5.07645,0 9.69507,-1.1317 13.21494,-3.11162c0.65104,-0.36621 1.25674,-0.77795 1.83506,-1.21357v3.15361v0.22676v0.42412c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM124.7,124.89736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v3.15781v0.42412c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM47.3,131.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,135.64736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.04443v0.5375c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375zM124.7,135.64736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v2.93105v0.65088c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375v-0.11338zM47.3,139.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,146.39736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776zM124.7,146.39736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776z"></path></g></g></svg>
                             </div>
                             <div class="col">
-                                <a href="{{route('payments')}}"><h6 class="no-margin light fs-18 all-caps">Payments & Billing</h6></a>
+                                <a href="{{route('payments')}}"><h6 class="no-margin light fs-18 all-caps">Payments</h6></a>
+                            </div>
+                        </div>
+                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center" v-if="$store.getters.isAdmin">
+                            <div class="col-auto p-r-0">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                     width="25" height="25"
+                                     viewBox="0 0 172 172"
+                                     style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M32.25,19.35v133.3h47.59814c-0.1763,-0.87075 -0.29814,-1.75695 -0.29814,-2.6707v-1.6293h-43v-124.7h68.8v30.1h30.1v23.90195c1.39535,-0.15265 2.82295,-0.25195 4.3,-0.25195v-26.69023l-31.35977,-31.35977zM109.65,26.69023l22.75977,22.75977h-22.75977zM47.3,27.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,36.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,45.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,53.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,62.35c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86.17637,62.35v4.12783c-8.0754,0.7482 -12.97978,5.32437 -12.97978,12.23232c0,5.8351 3.65238,9.8429 10.32168,11.54785l2.65811,0.68867v13.63906c-4.45695,-0.50955 -7.32693,-2.99253 -7.62578,-6.55078h-6.34082c0.02365,5.66095 3.61012,9.82731 9.57422,11.48066c1.849,-2.9928 4.77992,-5.51263 8.49082,-7.34443v-10.44766c5.08475,1.01695 7.44522,3.07924 7.44522,6.52139c0,0.5074 -0.05237,0.98248 -0.14697,1.43613c2.021,-0.4214 4.16791,-0.65746 6.39961,-0.73486c0.04515,-0.46225 0.12598,-0.90404 0.12598,-1.38994c0,-6.192 -3.53195,-9.98705 -11.03975,-11.8124l-2.78408,-0.62988v-12.8916c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.25264c-0.1806,-6.67145 -5.26693,-11.39735 -13.01338,-12.08535v-4.12783zM47.3,70.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86.17637,72.19297v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM47.3,79.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM139.75,83.85c-5.07645,0 -9.69507,1.1317 -13.21494,3.11162c-3.51987,1.97993 -6.13506,5.00886 -6.13506,8.71338c0,0.04448 0.01185,0.08589 0.0126,0.13018h-0.0126v11.17412v2.6959c-0.57832,-0.43562 -1.18402,-0.84736 -1.83506,-1.21357c-3.51987,-1.97993 -8.13849,-3.11162 -13.21494,-3.11162c-5.07645,0 -9.69507,1.1317 -13.21494,3.11162c-3.51987,1.97993 -6.13506,5.00886 -6.13506,8.71338c0,0.04448 0.01185,0.08589 0.0126,0.13018h-0.0126v10.52324v0.65088v10.75v10.75c0,3.61346 2.669,6.48532 6.18125,8.34805c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c1.57399,-0.83477 2.96028,-1.883 4.03125,-3.09902c1.07097,1.21602 2.45726,2.26425 4.03125,3.09902c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c3.51225,-1.86273 6.18125,-4.73459 6.18125,-8.34805v-11.40088v-10.09912v-0.42412v-10.86338v-10.86338v-10.52324h-0.0126c0.00075,-0.04429 0.0126,-0.08569 0.0126,-0.13018c0,-3.70452 -2.61519,-6.73345 -6.13506,-8.71338c-3.51987,-1.97993 -8.13849,-3.11162 -13.21494,-3.11162zM47.3,88.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM139.75,88.15c4.42285,0 8.40163,1.03559 11.10693,2.55732c2.70531,1.52174 3.94307,3.32884 3.94307,4.96768c0,1.63884 -1.23776,3.44594 -3.94307,4.96768c-2.70531,1.52173 -6.68408,2.55732 -11.10693,2.55732c-4.42285,0 -8.40163,-1.03559 -11.10693,-2.55732c-2.70531,-1.52174 -3.94307,-3.32884 -3.94307,-4.96768c0,-1.63884 1.23776,-3.44594 3.94307,-4.96768c2.70531,-1.52173 6.68408,-2.55732 11.10693,-2.55732zM47.3,96.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,103.1748c0.57832,0.43562 1.18402,0.84736 1.83506,1.21357c3.51987,1.97993 8.13849,3.11162 13.21494,3.11162c5.07645,0 9.69507,-1.1317 13.21494,-3.11162c0.65104,-0.36621 1.25674,-0.77795 1.83506,-1.21357v3.15361v0.65088c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM47.3,105.35c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM105.35,109.65c4.42285,0 8.40163,1.03559 11.10693,2.55732c2.70531,1.52174 3.94307,3.32884 3.94307,4.96768c0,0.00549 0.00003,0.01131 0,0.0168c-0.00826,1.63447 -1.24682,3.43424 -3.94307,4.95088c-2.70531,1.52173 -6.68408,2.55732 -11.10693,2.55732c-4.42285,0 -8.40163,-1.03559 -11.10693,-2.55732c-2.70531,-1.52174 -3.94307,-3.32884 -3.94307,-4.96768c0,-1.63884 1.23776,-3.44594 3.94307,-4.96768c2.70531,-1.52173 6.68408,-2.55732 11.10693,-2.55732zM47.3,113.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,114.14736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375zM47.3,122.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,124.6748c0.57832,0.43562 1.18402,0.84736 1.83506,1.21357c3.51987,1.97993 8.13849,3.11162 13.21494,3.11162c5.07645,0 9.69507,-1.1317 13.21494,-3.11162c0.65104,-0.36621 1.25674,-0.77795 1.83506,-1.21357v3.15361v0.22676v0.42412c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM124.7,124.89736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v3.15781v0.42412c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM47.3,131.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,135.64736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.04443v0.5375c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375zM124.7,135.64736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v2.93105v0.65088c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375v-0.11338zM47.3,139.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,146.39736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776zM124.7,146.39736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776z"></path></g></g></svg>
+                            </div>
+                            <div class="col">
+                                <a href="{{route('billings')}}"><h6 class="no-margin light fs-18 all-caps">Billings</h6></a>
                             </div>
                         </div>
                         <div class="row p-t-15 p-b-15 align-items-center justify-content-center" v-if="$store.getters.isAdmin">
diff --git a/routes/booking.php b/routes/booking.php
index 2087d0fa..d83bb4af 100644
--- a/routes/booking.php
+++ b/routes/booking.php
@@ -32,6 +32,4 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
 
     Route::post('{id}/proforma/create', 'CreateProformaInvoiceTransaction@create')->name('proforma.create');
 
-    Route::get('/document/download', 'DownloadBookingDocumentController@download')->name('download');
-
 });
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 2938bb23..7e5e7a2c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,6 +6,7 @@ use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Company;
 use App\Models\Transaction;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -62,6 +63,10 @@ Route::get('/payments', function () {
     return view('pages.payments');
 })->name('payments');
 
+Route::get('/billings', function () {
+    return view('pages.billings');
+})->name('billings');
+
 Route::get('/currency_orders', function () {
     return view('pages.currency_orders');
 })->name('currency_orders');
@@ -92,25 +97,25 @@ Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsP
 })->name('products.random');
 
 Route::get('/fix_bills', function () {
-    ini_set('max_execution_time', '10000');
-    Auth()->login(User::find(1));
-    Transaction::where('type', TransactionType::SUPPLIER_DELIVER)->whereIn('issuer', [2165])->chunk(50, function($dos){
-        foreach ($dos as $do){
-            $do->booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->delete();
-            $supplier = [];
-            $po = $do->booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
-            $supplier_order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $do, 'po_order_transaction' => $po, 'supplier' => $supplier]);
-            $document_object = new DocumentObject(
-                DocumentType::SUPPLIER_DELIVER_ORDER,
-                [chunk_split('data:application/pdf;base64,'.base64_encode($supplier_order_pdf->output()))],
-                '',
-                ApprovalStatus::COMPLETED,
-                'supplier_delivery_orders'
-            );
-            $document = (App()->make(CreatesDocument::class))->execute($do->booking, $document_object);
-            (App()->make(CreatesFiles::class))->execute($document, $document_object);
-        }
-    });
+//    ini_set('max_execution_time', '1000000');
+//    Auth()->login(User::find(1));
+//    Transaction::where('type', TransactionType::INVOICE)->chunk(200, function($invoices){
+//        foreach ($invoices as $invoice){
+//            $invoice->booking->documents()->where('document_type', DocumentType::INVOICE)->delete();
+//            $po = $invoice->booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
+//            $supplier = Company::find($invoice->receiver);
+//            $invoice_pdf = LaravelMpdf::loadView('pages.pdfs.invoice', ['invoice_transaction' => $invoice, 'po_order_transaction' => $po, 'supplier' => $supplier]);
+//            $document_object = new DocumentObject(
+//                DocumentType::INVOICE,
+//                [chunk_split('data:application/pdf;base64,'.base64_encode($invoice_pdf->output()))],
+//                '',
+//                ApprovalStatus::COMPLETED,
+//                'invoices'
+//            );
+//            $document = (App()->make(CreatesDocument::class))->execute($invoice->booking, $document_object);
+//            (App()->make(CreatesFiles::class))->execute($document, $document_object);
+//        }
+//    });
 
 
 })->name('products.random');
@@ -128,6 +133,8 @@ Route::get('/bookings/billplz', function () {
     return view('pages.billplz_redirect');
 })->name('bookings.billplz');
 
+Route::get('/document/download', 'Bookings\DownloadBookingDocumentController@download')->name('documents.download');
+
 Route::get('billplz/bills/{bill_no}', function($bill_no){
    return redirect(env('BILLPLZ_BASE_URL').'/bills/'.$bill_no);
 })->name('billplz.bill');