Merge branch 'payment-and-invoice' into 'master'

payment invoice

See merge request CIEFWorldwideSdnBhd/exchange-2.0!44

resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue

@@ -63,7 +63,7 @@
                                         {{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
                                     </div>
                                 </div>
-                                <div class="col-auto text-right">
+                                <div v-if="!no_action" class="col-auto text-right">
                                     <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="rejectPayment">
                                         <i class="fa fa-times fa-fw"></i>
                                     </button>
@@ -132,6 +132,9 @@
     import componentHandler from '../../../general/mixins/componentHandler';
     import staticFormHandler from '../../../general/mixins/staticFormHandler'
     export default {
+        props: {
+            no_action: Boolean
+        },
         methods: {
             approvePayment(status){
                 this.isLoading = true;

resources/views/pages/payment_complete.blade.php

@@ -0,0 +1,25 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row bg-white p-l-25 p-r-25 p-t-15 p-b-15">
+        <div class="col-12">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-15 p-b-10 b-b b-grey">
+                        <div class="col">
+                            <small class="all-caps muted fs-10">Complete Payments</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                           <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 2}">
+                                <template slot="list" slot-scope="{data}">
+                                    <payment-verification-component section="paymentVerificationSection" :data="data" :no_action="true"></payment-verification-component>
+                                </template>
+                            </list-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/partials/header.blade.php

@@ -26,6 +26,11 @@
                                     <div class="col-auto p-r-20">
                                         <a href="{{route('dashboard')}}"><div class="text-white all-caps fs-12">Dashboard</div></a>
                                     </div>
+                                    <div class="col-auto p-r-20"  v-if="$store.getters.isAdmin">
+                                        <a href="{{route('payment.complete')}}">
+                                            <div class="text-white all-caps fs-12">Completed Payment</div>
+                                        </a>
+                                    </div>
                                     <div class="col-auto p-r-20"  v-if="$store.getters.isAdmin">
                                         <a href="{{route('booking.complete')}}">
                                             <div class="text-white all-caps fs-12">Completed Transfers</div>

routes/web.php

@@ -42,6 +42,10 @@ Route::get('/customer/{id}', function ($id) {
     return view('pages.customers', ['id' => $id]);
 })->name('customer.profile');
 
+Route::get('/payment/complete', function () {
+    return view('pages.payment_complete');
+})->name('payment.complete');
+
 Route::get('/booking/complete', function () {
     return view('pages.booking_complete');
 })->name('booking.complete');