diff --git a/src/locales/i18n/ar.js b/src/locales/i18n/ar.js index a977a10..099a5d7 100644 --- a/src/locales/i18n/ar.js +++ b/src/locales/i18n/ar.js @@ -579,7 +579,8 @@ export default { "importantNote2": "يرجى تأكيد ما إذا كنت ترغب في متابعة تقديم طلب السحب هذا", "importantNoteBtn": "إلغاء الطلب", "importantNoteBtn2": "أنا أدرك وأرغب في المتابعة", - "dearCustomer": "عزيزي العميل" + "dearCustomer": "عزيزي العميل", + "optionPayment":"طريقة الدفع", }, "partner": { "pageTitle": "الشركاء", diff --git a/src/locales/i18n/en.js b/src/locales/i18n/en.js index 9acb504..4219cdd 100644 --- a/src/locales/i18n/en.js +++ b/src/locales/i18n/en.js @@ -579,7 +579,8 @@ export default { "importantNote2": "Please confirm if you wish to proceed with this withdrawal request. ", "importantNoteBtn": "Cancel Request", "importantNoteBtn2": "I Acknowledge and Proceed", - "dearCustomer": "Dear Client," + "dearCustomer": "Dear Client,", + "optionPayment":"Payment method", }, "partner": { "pageTitle": "Partners", diff --git a/src/locales/i18n/es.js b/src/locales/i18n/es.js index 21ca67c..33a5e31 100644 --- a/src/locales/i18n/es.js +++ b/src/locales/i18n/es.js @@ -579,7 +579,8 @@ export default { "importantNote2": "Confirme si desea continuar con esta solicitud de retiro", "importantNoteBtn": "Cancelar solicitud", "importantNoteBtn2": "Entiendo y deseo continuar", - "dearCustomer": "Estimado cliente" + "dearCustomer": "Estimado cliente", + "optionPayment":"Método de pago", }, "partner": { "pageTitle": "Socios", diff --git a/src/locales/i18n/hi.js b/src/locales/i18n/hi.js index 9ad6145..00233cb 100644 --- a/src/locales/i18n/hi.js +++ b/src/locales/i18n/hi.js @@ -579,7 +579,8 @@ export default { "importantNote2": "कृपया पुष्टि करें कि क्या आप इस निकासी अनुरोध को आगे बढ़ाना चाहते हैं।", "importantNoteBtn": "अनुरोध रद्द करेंं", "importantNoteBtn2": "मैं स्वीकार करता हूँ और जारी रखता हूँ", - "dearCustomer": "प्रप्रिय ग्राहक," + "dearCustomer": "प्रप्रिय ग्राहक,", + "optionPayment":"भुगतान विधि", }, "partner": { "pageTitle": "साथी", diff --git a/src/locales/i18n/id.js b/src/locales/i18n/id.js index 92e1320..95d31d4 100644 --- a/src/locales/i18n/id.js +++ b/src/locales/i18n/id.js @@ -579,7 +579,8 @@ export default { "importantNote2": "Harap konfirmasi jika Anda ingin melanjutkan permintaan penarikan ini.", "importantNoteBtn": "Batalkan Permintaan", "importantNoteBtn2": "Saya Mengerti dan Lanjutkan", - "dearCustomer": "Dear Client," + "dearCustomer": "Dear Client,", + "optionPayment":"Metode pembayaran", }, "partner": { "pageTitle": "Rekanan", diff --git a/src/locales/i18n/ko.js b/src/locales/i18n/ko.js index 4242a68..40e0922 100644 --- a/src/locales/i18n/ko.js +++ b/src/locales/i18n/ko.js @@ -579,7 +579,8 @@ export default { "importantNote2": "출금 요청을 계속 진행하시겠습니까?", "importantNoteBtn": "요청 취소", "importantNoteBtn2": "확인하고 진행합니다", - "dearCustomer": "고객님께," + "dearCustomer": "고객님께,", + "optionPayment":"결제 방법", }, "partner": { "pageTitle": "파트너", diff --git a/src/locales/i18n/th.js b/src/locales/i18n/th.js index fb0b59c..3e4f9d3 100644 --- a/src/locales/i18n/th.js +++ b/src/locales/i18n/th.js @@ -579,7 +579,8 @@ export default { "importantNote2": "โปรดยืนยันหากท่านต้องการดำเนินการคำขอนี้ต่อไป", "importantNoteBtn": "ยกเลิกคำขอ", "importantNoteBtn2": "ยืนยันและดำเนินการต่อ", - "dearCustomer": "เรียน คุณลูกค้าที่เคารพ," + "dearCustomer": "เรียน คุณลูกค้าที่เคารพ,", + "optionPayment":"วิธีการชำระเงิน", }, "partner": { "pageTitle": "พันธมิตร", diff --git a/src/locales/i18n/vi.js b/src/locales/i18n/vi.js index 8081249..8a37a5d 100644 --- a/src/locales/i18n/vi.js +++ b/src/locales/i18n/vi.js @@ -579,7 +579,8 @@ export default { "importantNote2": "Vui lòng xác nhận nếu bạn muốn tiếp tục yêu cầu rút tiền này.", "importantNoteBtn": "Hủy yêu cầu", "importantNoteBtn2": "Tôi xác nhận và tiến hành", - "dearCustomer": "Kính gửi Quý khách hàng" + "dearCustomer": "Kính gửi Quý khách hàng", + "optionPayment":"Phương thức thanh toán", }, "partner": { "pageTitle": "Đối tác", diff --git a/src/locales/i18n/zh-cn.js b/src/locales/i18n/zh-cn.js index 9660141..eb0db6b 100644 --- a/src/locales/i18n/zh-cn.js +++ b/src/locales/i18n/zh-cn.js @@ -579,7 +579,8 @@ export default { "importantNote2":"请确认是否继续提交本次出金申请", "importantNoteBtn":"取消申请", "importantNoteBtn2":"我已知晓并继续", - "dearCustomer":"尊敬的客户," + "dearCustomer":"尊敬的客户,", + "optionPayment":"支付方式", }, "partner": { "pageTitle": "合作伙伴", diff --git a/src/locales/i18n/zh-tw.js b/src/locales/i18n/zh-tw.js index 3cd113b..a4e1ffb 100644 --- a/src/locales/i18n/zh-tw.js +++ b/src/locales/i18n/zh-tw.js @@ -579,7 +579,8 @@ export default { "importantNote2": "請確認是否繼續提交本次出金申請。", "importantNoteBtn": "取消申請", "importantNoteBtn2": "我已知曉並繼續", - "dearCustomer": "尊敬的客戶，" + "dearCustomer": "尊敬的客戶，", + "optionPayment":"支付方式", }, "partner": { "pageTitle": "合作夥伴", diff --git a/src/views/capital/payChannel/goldIn.vue b/src/views/capital/payChannel/goldIn.vue index 5deea05..1898aec 100644 --- a/src/views/capital/payChannel/goldIn.vue +++ b/src/views/capital/payChannel/goldIn.vue @@ -54,8 +54,8 @@ - - + + + + + + + + + + @@ -135,6 +151,10 @@
+ +
+ +
@@ -165,6 +185,7 @@ import Remittance from './remittance' import Remittance2 from './remittance2' import Remittance3 from './remittance3' import RemittanceLdAgency from './remittanceLDAgency' +import One2Pay from "@/views/capital/payChannel/one2Pay.vue"; const emit = defineEmits(['close-channel']) const { proxy } = getCurrentInstance(); @@ -177,6 +198,54 @@ const payAgencyList = ref([]) const currencyList = ref([]) const exchangeRate = ref(null) let exchange_rate_sign = null +const payOkMethod = ref([]) +const payOkMethodVND = ref([ + {"code":"ATM/Visa Master Card","name":"ATM/Visa Master Card"}, + {"name":"OFFLINEPAY","code":"OFFLINEPAY"}, + {"name":"Garena","code":"Garena"}, + {"name":"Gate","code":"Gate"}, + {"name":"Mobifone","code":"Mobifone"}, + {"name":"Vcoin","code":"Vcoin"}, + {"name":"Vietnamobile","code":"Vietnamobile"}, + {"name":"Viettel","code":"Viettel"}, + {"name":"Vinaphone","code":"Vinaphone"}, + {"name":"Zing","code":"Zing"}, + {"name":"BankVA","code":"BankVA"}, + {"name":"ACBVietQR","code":"ACBVietQR"}, + {"name":"AGRIBankQR","code":"AGRIBankQR"}, + {"name":"BIDVQR","code":"BIDVQR"}, + {"name":"MBVietQR","code":"MBVietQR"}, + {"name":"PVcombankQR","code":"PVcombankQR"}, + {"name":"TechcomVietQR","code":"TechcomVietQR"}, + {"name":"TPBankQR","code":"TPBankQR"}, + {"name":"VIBBankQR","code":"VIBBankQR"}, + {"name":"VietcomQR","code":"VietcomQR"}, + {"name":"VietinBankQR","code":"VietinBankQR"}, + {"name":"VPBankQR","code":"VPBankQR"}, + {"name":"Momo","code":"Momo"}, + {"name":"ViettelPay","code":"ViettelPay"}, + {"name":"ZaloPay","code":"ZaloPay"}, +]) + +const payOkMethodIDR = ref([ + {"code":"Alfamart","name":"Alfamart"}, + {"code":"Indomaret","name":"Indomaret"}, + {"code":"CreditCard","name":"CreditCard"}, + {"code":"ConvenienceStore","name":"ConvenienceStore"}, + {"code":"QRIS","name":"QRIS"}, + {"code":"BCAVA","name":"BCAVA"}, + {"code":"BNIVA","name":"BNIVA"}, + {"code":"BRIVA","name":"BRIVA"}, + {"code":"CIMBVA","name":"CIMBVA"}, + {"code":"MandiriVA","name":"MandiriVA"}, + {"code":"PermataVA","name":"PermataVA"}, + {"code":"DANAWALLET","name":"DANAWALLET"}, + {"code":"LINKAJA-APP","name":"LINKAJA-APP"}, + {"code":"LINKAJA-WEB","name":"LINKAJA-WEB"}, + {"code":"OVOWALLET","name":"OVOWALLET"}, + {"code":"SHOPEEPAY-APP","name":"SHOPEEPAY-APP"}, + {"code":"SHOPEEPAY-WEB","name":"SHOPEEPAY-WEB"}, +]) const subsidy = ref(null) const subsidy_amount = computed(() => { @@ -230,7 +299,8 @@ const form = ref({ currency_type: null, usd_amount: null, mt4_server: null, - mt4_login: null + mt4_login: null, + option_payment:null }) const rules = ref({ @@ -242,6 +312,7 @@ const rules = ref({ ], currency_type: [{ required: true, message: "", trigger: "blur" }], pay_agency: [{ required: true, message: "", trigger: "blur" }], + option_payment: [{ required: true, message: "", trigger: "blur" }], }) let ioGoldConf = {} @@ -354,6 +425,17 @@ function currencyTypeChange() { getSubsidy(form.value.pay_agency?form.value.pay_agency.id:null) }) } + + if (payChannel && payChannel.pay_code.indexOf('PayOK')>=0) { + if(form.value.currency_type == 'VND'){ + payOkMethod.value = payOkMethodVND.value + }else if (form.value.currency_type == 'IDR'){ + payOkMethod.value = payOkMethodIDR.value + }else { + payOkMethod.value = [] + } + } + if (isEmpty(form.value.currency_type)) { exchangeRate.value = null } else { @@ -517,7 +599,7 @@ function doGoldIn() { proxy.$refs["formRef"].validate(valid => { if (valid) { payLoading.value = true - const { act_id, pay_channel, mt4_server, mt4_login, usd_amount, currency_type, pay_agency } = form.value + const { act_id, pay_channel, mt4_server, mt4_login, usd_amount, currency_type, pay_agency, option_payment } = form.value goldInSave({ act_id, pay_channel, mt4_server, mt4_login, usd_amount, currency_type, pay_agency: pay_agency ? pay_agency.id : null, @@ -526,7 +608,8 @@ function doGoldIn() { currency_amount: currencyAmount.value, usd_service_charge: 0, language: serverLang(), - exchange_rate_sign: exchange_rate_sign + exchange_rate_sign: exchange_rate_sign, + option_payment: option_payment }).then(resp => { toOpenPay(resp) }).catch(() => { @@ -608,6 +691,17 @@ function toOpenPay(json) { }).catch(() => { payLoading.value = false }) + } else if (pay_channel=='One2Pay') { + if (patams.status==0 || patams.status=='0'){ + patams.currency_amount = currencyAmount.value + remittanceInfo.value = patams + step.value = 7 + }else { + window.showTip({ + title: patams.msg, + status: 'error' + }) + } } else if (pay_channel.indexOf('LDAgency')>=0) { remittanceSign({ qcc_language: serverLang(), @@ -623,7 +717,49 @@ function toOpenPay(json) { }).catch(() => { payLoading.value = false }) + }else if (pay_channel == 'ForcePay' || pay_channel == 'AbaPay'){ + window.open(patams) + }else if (pay_channel == 'PayOK' || pay_channel == 'DidaPay' || pay_channel == 'PaySpec' || pay_channel == 'RediPay' || pay_channel == 'CCPay' || pay_channel == 'TokenPay'){ + if(patams.status==0 || patams.status=='0'){ + let payUrl = patams.payUrl + window.open(payUrl) + }else{ + window.showTip({ + title: patams.msg, + status: 'error' + }) + } + }else if (pay_channel == 'EBitPay'){ + let payUrl = patams.payUrl + delete patams.payUrl + let paramStr = ''; + for (let key in patams){ + paramStr += "&"+key+"="+patams[key]; + } + paramStr = paramStr.substr(1); + window.open( payUrl + "?" + paramStr); + }else if (pay_channel=='help2PayMYR' || pay_channel=='help2PayTHB' || pay_channel=='help2PayPHP' || pay_channel=='help2PayIDR' || pay_channel=='Help2Pay'){ + let payUrl = patams.payUrl; + delete patams.payUrl; + postOpenWindow2(payUrl , patams); } + +} + +function postOpenWindow2(url , postData) { + var tempform = document.createElement("form"); + tempform.action = url; + tempform.target = "_blank"; + tempform.method = "post"; + tempform.style.display = "none"; + for (var x in postData) { + var opt = document.createElement("textarea"); + opt.name = x; + opt.value = postData[x]; + tempform.appendChild(opt); + } + document.body.appendChild(tempform); + tempform.submit(); } function handleLastStep() { diff --git a/src/views/capital/payChannel/index.vue b/src/views/capital/payChannel/index.vue index c33a37a..d2351cf 100644 --- a/src/views/capital/payChannel/index.vue +++ b/src/views/capital/payChannel/index.vue @@ -30,7 +30,8 @@ -