geer-builder 1.2.951 → 1.2.952
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/GManualPaymentPage.vue +35 -0
- package/package.json +1 -1
package/GManualPaymentPage.vue
CHANGED
|
@@ -42,6 +42,12 @@
|
|
|
42
42
|
<div>Payment: <b>{{this.order_info.payment_method.manual_pay_choice.bank_label}}</b></div>
|
|
43
43
|
<div>Account Name: <b>{{this.order_info.payment_method.manual_pay_choice.account_name}}</b></div>
|
|
44
44
|
<div>Account Number: <b>{{this.order_info.payment_method.manual_pay_choice.account_number}}</b></div>
|
|
45
|
+
<template v-if="resolved_additional_accounts.length > 0">
|
|
46
|
+
<div v-for="(extra, idx) in resolved_additional_accounts" :key="idx" style="margin-top:5px;">
|
|
47
|
+
<div>Account Name: <b>{{extra.account_name}}</b></div>
|
|
48
|
+
<div>Account Number: <b>{{extra.account_number}}</b></div>
|
|
49
|
+
</div>
|
|
50
|
+
</template>
|
|
45
51
|
<div>Order Total: <b>{{ public_settings.main_currency }} {{$_formatNumber(this.order_info.orders.order_total, { decimal: 2})}} {{ public_settings.hasOwnProperty('adspro_cashin_conversion_rate') ? `(PHP ${this.order_info.orders.order_total * public_settings.adspro_cashin_conversion_rate})` : '' }}</b></div>
|
|
46
52
|
</div>
|
|
47
53
|
</div>
|
|
@@ -110,6 +116,35 @@ export default {
|
|
|
110
116
|
|
|
111
117
|
// this.getaAccountList();
|
|
112
118
|
},
|
|
119
|
+
computed:
|
|
120
|
+
{
|
|
121
|
+
resolved_additional_accounts()
|
|
122
|
+
{
|
|
123
|
+
var choice = this.order_info && this.order_info.payment_method
|
|
124
|
+
? this.order_info.payment_method.manual_pay_choice
|
|
125
|
+
: null;
|
|
126
|
+
if (!choice) return [];
|
|
127
|
+
|
|
128
|
+
// Source 1: additional_account saved on the order
|
|
129
|
+
if (choice.additional_account && choice.additional_account.length > 0)
|
|
130
|
+
{
|
|
131
|
+
return choice.additional_account;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
// Source 2: fallback to public_settings.manual_payment_additional_account filtered by bank_id
|
|
135
|
+
if (this.public_settings
|
|
136
|
+
&& this.public_settings.manual_payment_additional_account
|
|
137
|
+
&& this.public_settings.manual_payment_additional_account.length > 0)
|
|
138
|
+
{
|
|
139
|
+
var bank_id = choice.bank_id;
|
|
140
|
+
return this.public_settings.manual_payment_additional_account.filter(function(acc) {
|
|
141
|
+
return acc.bank_id === bank_id;
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
return [];
|
|
146
|
+
}
|
|
147
|
+
},
|
|
113
148
|
methods:
|
|
114
149
|
{
|
|
115
150
|
getPictures(val)
|