From dc1a996eee79c16ed1612c690fa6ec86ef3fc791 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 12 May 2021 05:39:50 +0800
Subject: [PATCH] fixing bugs

---
 .../bookings/elements/BookingComponent.vue    |  8 +--
 .../elements/PaymentVerificationComponent.vue |  2 +-
 .../customerDashboardSectionComponent.vue     | 54 +++++++++++++++----
 .../views/pages/pdfs/deliver_order.blade.php  |  2 +-
 resources/views/pages/pdfs/invoice.blade.php  |  2 +-
 5 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/BookingComponent.vue b/resources/assets/vue/components/bookings/elements/BookingComponent.vue
index 4e27e8a0..71d4cc4d 100644
--- a/resources/assets/vue/components/bookings/elements/BookingComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BookingComponent.vue
@@ -41,12 +41,12 @@
             <div class="font-heading fs-11 text-success bold">{{this.item.amount}} {{this.item.fixed_currency.short_code}}</div>
         </div>
         <div class="col-auto" v-if="!$store.getters.isAdmin">
-            <div class="font-heading fs-10 muted all-caps">Payment</div>
-            <div class="font-heading fs-8 all-caps text-white btn-rounded bg-danger p-l-10 p-r-10 lh-15 mt-1">
-                pending...
+            <div class="font-heading fs-10 muted all-caps">status</div>
+            <div class="font-heading fs-8 all-caps text-white 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'}}
             </div>
         </div>
-        <div class="col-auto" :class="[{'invisible': !item.service.configurations.billable}]" v-if="!$store.getters.isAdmin">
+        <div class="col-auto hide" :class="[{'invisible': !item.service.configurations.billable}]" v-if="!$store.getters.isAdmin">
             <div class="font-heading fs-10 muted all-caps">Billing</div>
             <div class="font-heading fs-8 all-caps text-danger btn-rounded bg-master-lightest p-l-10 p-r-10 lh-15 mt-1">
                 Pending...
diff --git a/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
index fedf3b78..b9a7d6f5 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
@@ -13,7 +13,7 @@
                                         {{item.bill_no}}
                                     </div>
                                 </div>
-                                <div class="col">
+                                <div class="col-auto">
                                     <div class="font-heading fs-10 muted all-caps">Amount</div>
                                     <div class="font-heading fs-12 text-success bold">
                                         MYR {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
diff --git a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
index 9cbc71ef..27cc564f 100644
--- a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
@@ -27,9 +27,9 @@
                     <div class="row tabsContainer" v-show="(company.status === 2 || company.status === 1) && company.bookings.length">
                         <div class="col">
                             <div class="row m-l-0 m-r-0 d-none d-md-flex">
-                                <div class="col-3">
+                                <div class="col">
                                     <div class="row">
-                                        <div class="col">
+                                        <div class="col m-r-5">
                                             <div class="row fs-12 text-center">
                                                 <div class="col p-t-20 p-b-20 bg-master-lighter active tabButton" tab-name="transfers">
                                                     <div class="row justify-content-center m-b-5">
@@ -48,11 +48,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                </div>
-                                <div class="col">
-                                    <div class="row justify-content-end">
-                                        <div class="col-3 m-r-5">
+                                        <div class="col m-r-5">
                                             <div class="row fs-12 text-center">
                                                 <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="payments">
                                                     <div class="row justify-content-center m-b-5">
@@ -71,7 +67,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="col-4">
+                                        <div class="col">
                                             <div class="row fs-12 text-center">
                                                 <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="PO">
                                                     <div class="row justify-content-center m-b-5">
@@ -84,7 +80,30 @@
                                                     </div>
                                                     <div class="row">
                                                         <div class="col">
-                                                            <div class="fs-12 m-t-5">Pending Purchase Orders</div>
+                                                            <div class="fs-12 m-t-5">Purchase Orders</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-4">
+                                    <div class="row justify-content-end">
+                                        <div class="col-8">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="complete">
+                                                    <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="86" y1="15.84013" x2="86" y2="42.59956" gradientUnits="userSpaceOnUse" id="color-1_1GEnKV6fhh62_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-2_1GEnKV6fhh62_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-3_1GEnKV6fhh62_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-4_1GEnKV6fhh62_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-5_1GEnKV6fhh62_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="75.30644" y1="14.46681" x2="75.30644" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-6_1GEnKV6fhh62_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-7_1GEnKV6fhh62_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-8_1GEnKV6fhh62_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="116.90625" y1="14.46681" x2="116.90625" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-9_1GEnKV6fhh62_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="65.84106" y1="14.46681" x2="65.84106" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-10_1GEnKV6fhh62_gr10"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="14.46681" x2="86" y2="157.82344" gradientUnits="userSpaceOnUse" id="color-11_1GEnKV6fhh62_gr11"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g id="original-icon"><path d="M95.40625,45.6875h-18.8125v-17.46875c0,-5.19494 4.21131,-9.40625 9.40625,-9.40625v0c5.19494,0 9.40625,4.21131 9.40625,9.40625z" fill="url(#color-1_1GEnKV6fhh62_gr1)"></path><rect x="19.043" y="33" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-2_1GEnKV6fhh62_gr2)"></rect><rect x="19.043" y="37" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-3_1GEnKV6fhh62_gr3)"></rect><rect x="19.043" y="42" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-4_1GEnKV6fhh62_gr4)"></rect><rect x="19.043" y="46" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-5_1GEnKV6fhh62_gr5)"></rect><rect x="19.043" y="24" transform="scale(2.6875,2.6875)" width="17.957" height="2" fill="url(#color-6_1GEnKV6fhh62_gr6)"></rect><rect x="42" y="33" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-7_1GEnKV6fhh62_gr7)"></rect><rect x="42" y="42" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-8_1GEnKV6fhh62_gr8)"></rect><rect x="42" y="24" transform="scale(2.6875,2.6875)" width="3" height="2" fill="url(#color-9_1GEnKV6fhh62_gr9)"></rect><rect x="19.043" y="28" transform="scale(2.6875,2.6875)" width="10.912" height="2" fill="url(#color-10_1GEnKV6fhh62_gr10)"></rect><path d="M131.6875,32.7445v-0.4945c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-18.8125h-7.4605c-1.67163,-4.68163 -6.10331,-8.0625 -11.352,-8.0625c-5.24869,0 -9.68037,3.38087 -11.352,8.0625h-26.273c-4.44512,0 -8.0625,3.61737 -8.0625,8.0625v0.4945c-3.12288,1.11531 -5.375,4.06887 -5.375,7.568v107.5c0,4.44512 3.61738,8.0625 8.0625,8.0625h86c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-107.5c0,-3.49912 -2.25213,-6.45269 -5.375,-7.568zM123.625,29.5625c1.4835,0 2.6875,1.204 2.6875,2.6875h-21.5h-6.71875v-2.6875h6.71875zM79.28125,28.21875c0,-3.70606 3.01269,-6.71875 6.71875,-6.71875c3.70606,0 6.71875,3.01269 6.71875,6.71875v14.78125h-13.4375zM48.375,29.5625h25.53125v2.6875h-28.21875c0,-1.4835 1.204,-2.6875 2.6875,-2.6875zM131.6875,147.8125c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-10.75v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h10.75zM131.6875,131.6875h-10.75c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v10.75h-69.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-107.5c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h30.90625v10.75h24.1875v-10.75h6.71875h24.1875c1.4835,0 2.6875,1.204 2.6875,2.6875z" fill="url(#color-11_1GEnKV6fhh62_gr11)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5">Complete Orders</div>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -146,6 +165,23 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="row tabsContainer tabContent hide" tab-name="complete">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <list-component key="2" section="completeTransferSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, status: 3}">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <booking-component :data="data"></booking-component>
+                                                                </template>
+                                                            </list-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index 48f6260f..7cf26d47 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -9,7 +9,7 @@
     <table>
         <tr>
             <td class="header-logo">
-                <img src="{{ public_path('images/ri_1.png') }}" alt="logo" id="logo" class="logo">
+                <img src="{{ asset('images/ri_1.png') }}" alt="logo" id="logo" class="logo">
             </td>
             <td class="header-cief-address">
                 <span class="company-name">
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 0c5170db..0c721442 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -8,7 +8,7 @@
     <table>
         <tr>
             <td class="header-logo">
-                <img src="{{ public_path('images/ri_1.png') }}" alt="logo" id="logo" class="logo">
+                <img src="{{ asset('images/ri_1.png') }}" alt="logo" id="logo" class="logo">
             </td>
             <td class="header-cief-address">
                 <span class="company-name">