cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0

Browse Source
This commit is contained in:
edmondlang
2024-07-08 18:57:18 +08:00
parent a77481084c 66c2bb0cca
commit 93ad34b2b8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+10 -7
View File
@@ -1,7 +1,7 @@
<template>
<div class="row zig-zag-top">
<div class="col bg-white padding-25">
<div class="row" v-if="(data.serviceType.id === 4 && step != 1) || data.serviceType.id != 4">
<div class="row" v-if="(isOneSizEightEightOrder && step != 1) || !isOneSizEightEightOrder">
<div class="col">
<div class="row p-b-20 b-b b-dashed m-b-20 b-grey">
<div class="col">
@@ -75,7 +75,7 @@
<!--</div>-->
<div class="row parentContainer">
<div class="col">
<div class="row text-center m-b-15 hide" v-if="data.serviceType.id === 4">
<div class="row text-center m-b-15 hide" v-if="isOneSizEightEightOrder">
<div class="col-auto p-r-0">
<div class="b-a b-grey bg-white padding-15 pointer b-primary text-primary">
<div class="m-b-5">
@@ -105,7 +105,7 @@
<div class="row" id="select-list" name="select-list">
<div class="col">
<div class="form-group no-margin form-group-default">
<label>{{ data.serviceType.id === 4 ? '1688 Login Id/Email/Phone' : 'Account No.' }}</label>
<label>{{ isOneSizEightEightOrder ? '1688 Login Id/Email/Phone' : 'Account No.' }}</label>
<input type="text" class="form-control" v-model="account_no" @keyup="parameters.bankAccount = {}" @focus="dropdownStatus = true">
</div>
</div>
@@ -150,8 +150,8 @@
</div>
<div class="row" v-show="createBank">
<div class="col">
<bank-account-form-component v-if="data.serviceType.id !== 4" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" :currency="data.serviceType.selectedCurrency.short_code" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></bank-account-form-component>
<phone-account-form-component v-if="data.serviceType.id === 4" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></phone-account-form-component>
<bank-account-form-component v-if="!isOneSizEightEightOrder" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" :currency="data.serviceType.selectedCurrency.short_code" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></bank-account-form-component>
<phone-account-form-component v-if="isOneSizEightEightOrder" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></phone-account-form-component>
</div>
</div>
</div>
@@ -319,13 +319,16 @@
dropdownStatus: false,
account_no: '',
step:1,
promoCode:""
promoCode:"",
oneSixEightEightIds: [4, 10],
}
},
computed: {
formDisabled(){
return !!Object.keys(this.parameters.bankAccount).length;
},
isOneSizEightEightOrder() {
return this.oneSixEightEightIds.includes(this.data.serviceType.id);
}
},
created(){