From 7146600376e643d29ccd23bda323b3a50904a73c Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 21 Feb 2022 20:53:55 +0800
Subject: [PATCH] update service configuration form component

---
 .../settings/forms/ServiceFormComponent.vue      | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue b/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue
index 002488cc..eac2a388 100644
--- a/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue
@@ -22,7 +22,7 @@
                                 <input type="text" class="form-control" v-model="parameters.name">
                             </validation-wrapper-component>
                         </div>
-                        <div class="col-auto pointer bg-master-lightest m-r-10" @click="parameters.configurations.billable = !parameters.configurations.billable">
+                        <div class="col-auto pointer bg-master-lightest m-r-10 d-none" @click="parameters.configurations.billable = !parameters.configurations.billable">
                             <div class="row h-100 align-items-center">
                                 <div class="col-auto p-r-0">
                                     <div class="icon-thumbnail fs-12 icon-25 btn-rounded" :class="[{'bg-success': parameters.configurations.billable}, {'bg-white': !parameters.configurations.billable}]">
@@ -59,11 +59,17 @@
                     <div class="row m-b-20">
                         <div class="col">
                             <div class="row m-b-10">
-                                <div class="col p-r-5">
+                                <!-- <div class="col p-r-5">
                                     <validation-wrapper-component :validator="$v.parameters.configurations.service_charge.value">
                                         <label>Service Charge</label>
                                         <input type="text" class="form-control" v-model.lazy="parameters.configurations.service_charge.value"  v-money="percentage">
                                     </validation-wrapper-component>
+                                </div> -->
+                                <div class="col p-r-5">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.service_charge.value">
+                                        <label>Price Per CBM</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.service_charge.value"  v-money="percentage">
+                                    </validation-wrapper-component>
                                 </div>
                                 <div class="col p-l-5 p-r-20">
                                     <div class="row">
@@ -82,14 +88,14 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col p-l-5" v-show="parameters.configurations.billable">
+                                <div class="col p-l-5 d-none" v-show="parameters.configurations.billable">
                                     <validation-wrapper-component :validator="$v.parameters.configurations.tax.value">
                                         <label>Tax</label>
                                         <input type="text" class="form-control" v-model.lazy="parameters.configurations.tax.value"  v-money="percentage">
                                     </validation-wrapper-component>
                                 </div>
                             </div>
-                            <div class="row m-b-5">
+                            <div class="row m-b-5 d-none">
                                 <div class="col-5 p-r-0" v-show="parameters.configurations.billable">
                                     <validation-wrapper-component :validator="$v.parameters.configurations.po_limit.value">
                                         <label>Abandoned PO Limit **</label>
@@ -103,7 +109,7 @@
                                     </validation-wrapper-component>
                                 </div>
                             </div>
-                            <div class="row m-b-10" v-show="parameters.configurations.billable">
+                            <div class="row m-b-10 d-none" v-show="parameters.configurations.billable">
                                 <div class="col">
                                     <div class="fs-8 muted">** Abandoned PO's limit is only applicable to transfers that have been paid in full.</div>
                                 </div>