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

alipay service

Browse Source
This commit is contained in:
Jia Sheng
2024-07-13 14:12:54 +08:00
parent d76e3cc620
commit d1f319582a
7 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/banks/elements/BankAccountComponent.vue
+1 -1
View File
@@ -11,7 +11,7 @@
<div class="col-5">
<div class="row">
<div class="col-auto p-r-10">
<div class="font-heading all-caps fs-11">{{item.type === 2 ? item.reference : item.company_business_type === 1 ? 'Company\'s Bank Account' : 'Personal Bank Account'}}</div>
<div class="font-heading all-caps fs-11">{{item.type === 2 ? item.reference : item.type === 4 ? 'Alipay' : item.company_business_type === 1 ? 'Company\'s Bank Account' : 'Personal Bank Account'}}</div>
</div>
<div class="col-auto p-l-0">
<div class="bg-success-light fs-7 all-caps text-white b-rad-sm lh-18 p-l-10 p-r-10" v-if="item.company_business_type !== 1 && item.default">default</div>
resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+21 -3
View File
@@ -105,7 +105,9 @@
<div class="row" id="select-list" name="select-list">
<div class="col">
<div class="form-group no-margin form-group-default">
<label>{{ isOneSizEightEightOrder ? '1688 Login Id/Email/Phone' : 'Account No.' }}</label>
<label v-if="isOneSizEightEightOrder">1688 Login Id/Email/Phone</label>
<label v-else-if="isAlipayOrder">ALIPAY Account No.</label>
<label v-else>Account No.</label>
<input type="text" class="form-control" v-model="account_no" @keyup="parameters.bankAccount = {}" @focus="dropdownStatus = true">
</div>
</div>
@@ -116,7 +118,7 @@
<div class="absolute w-100 b-l b-b b-r b-grey" :class="[{'hide': !dropdownStatus}]" 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="bank in data.recipientBanks.filter(AccountNumber)" v-bind:key="bank.id" >
<div class="row no-margin" v-for="bank in data.recipientBanks.filter(bank => filterBankType.includes(bank.type)).filter(AccountNumber)" v-bind:key="bank.id" >
<div id="select-option" name="select-option" class="col b-b b-grey p-t-10 p-b-10 pointer p-t-10 p-b-10" :class="[{'bg-master-lightest': parameters.bankAccount.id === bank.id}, {'text-master': parameters.bankAccount.id === bank.id}, {'hover-primary': parameters.bankAccount.id !== bank.id}, {'pointer': parameters.bankAccount.id !== bank.id}]" @click="selectBank(bank)">
<div class="row align-items-center justify-content-center">
<div class="col">
@@ -150,8 +152,9 @@
</div>
<div class="row" v-show="createBank">
<div class="col">
<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>
<bank-account-form-component v-if="!isOneSizEightEightOrder && !isAlipayOrder" 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>
<alipay-account-form-component v-if="isAlipayOrder" 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()"></alipay-account-form-component>
</div>
</div>
</div>
@@ -329,6 +332,21 @@
},
isOneSizEightEightOrder() {
return this.oneSixEightEightServiceIds.includes(this.data.serviceType.id);
},
isAlipayOrder() {
return this.data.serviceType.id === 11;
},
filterBankType() {
if (this.isAlipayOrder) {
return [4];
}
if (!this.isAlipayOrder && !this.isOneSizEightEightOrder) {
return [1, 2];
}
return [];
}
},
created(){
resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+4 -3
View File
@@ -61,7 +61,8 @@
<div class="row align-items-center">
<div class="col-auto p-r-0">
<img v-if="item.service.id === 4" src="/images/1688_logo.png" alt="" width="40">
<div v-if="item.service.id !== 4" class="padding-5 bg-master-light">
<img v-else-if="item.service.id === 11" src="/images/alipay_logo.png" alt="" width="40">
<div v-else class="padding-5 bg-master-light">
<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
width="30" height="30"
viewBox="0 0 172 172"
@@ -71,10 +72,10 @@
<div class="col-auto">
<div class="row">
<div class="col-auto p-r-10">
<div class="font-heading fs-12">{{item.bank.holder_name}} <span class="text-complete m-l-5 bold">{{item.bank.type === 3 ? item.bank.account_no : item.bank.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim()}}</span></div>
<div class="font-heading fs-12">{{item.bank.holder_name}} <span class="text-complete m-l-5 bold">{{[3, 4].includes(item.bank.type) ? item.bank.account_no : item.bank.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim()}}</span></div>
</div>
</div>
<div class="row" v-if="item.bank.type !== 3 ">
<div class="row" v-if="![3, 4].includes(item.bank.type)">
<div class="col-auto p-r-10">
<div class="font-heading fs-10 small">{{item.bank.bank_name}} <span class="m-l-5">({{item.bank.bank_branch}})</span> <span class="m-l-5">({{item.bank.swift}})</span></div>
</div>
resources/assets/vue/components/companies/elements/CompanyBankAccountComponent.vue
+1 -1
View File
@@ -11,7 +11,7 @@
<div class="col-4">
<div class="row">
<div class="col-auto p-r-10">
<div class="font-heading all-caps fs-11">{{item.type === 2 ? item.reference : item.company_business_type === 1 ? 'Company\'s Bank Account' : 'Personal Bank Account'}}</div>
<div class="font-heading all-caps fs-11">{{item.type === 2 ? item.reference : item.type === 4 ? 'Alipay' : item.company_business_type === 1 ? 'Company\'s Bank Account' : 'Personal Bank Account'}}</div>
</div>
</div>
<div class="row">