geer-builder 1.2.838 → 1.2.840
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/GCashOut.vue
CHANGED
|
@@ -85,13 +85,13 @@
|
|
|
85
85
|
<div class="summary__content-label" v-if="is_company_ultrapro">Total Trans Fee</div>
|
|
86
86
|
<div class="summary__content-label" v-else>Total Charge</div>
|
|
87
87
|
<div class="summary__content-info" v-if="merchant_cashout">{{ main_currency }} {{ $_formatNumber(total_charge, { decimal: 2}) }}</div>
|
|
88
|
-
<div class="summary__content-info" v-else>{{ main_currency }} {{ $_formatNumber(total_charge, { decimal: 2}) }}</div>
|
|
88
|
+
<div class="summary__content-info" v-else>{{ main_currency }} {{ $_formatNumber(total_charge, { decimal: 2}) }} </div>
|
|
89
89
|
</div>
|
|
90
90
|
<div class="summary__content">
|
|
91
91
|
<div class="summary__content-label" v-if="is_company_ultrapro">Net Amount</div>
|
|
92
92
|
<div class="summary__content-label" v-else>You will receive</div>
|
|
93
93
|
<div v-if="convert_cashout == true" class="summary__content-info">{{ convert_currency }} {{ $_formatNumber((convert_rate * xfield.net_amount), { decimal: 2}) }}</div>
|
|
94
|
-
<div v-else class="summary__content-info">{{ main_currency }} {{ $_formatNumber(xfield.net_amount, { decimal: 2}) }}</div>
|
|
94
|
+
<div v-else class="summary__content-info">{{ main_currency }} {{ $_formatNumber(xfield.net_amount, { decimal: 2}) }} {{ settings.hasOwnProperty('adspro_conversion_rate') ? `(PHP ${$_formatNumber((xfield.net_amount * settings.adspro_conversion_rate), { decimal: 2})})` : ''}}</div>
|
|
95
95
|
</div>
|
|
96
96
|
<div class="summary__content" v-if="convert_cashout == true">
|
|
97
97
|
<div class="summary__content-label">Conversion Rate</div>
|
|
@@ -174,6 +174,7 @@ export default {
|
|
|
174
174
|
async mounted()
|
|
175
175
|
{
|
|
176
176
|
this.settings = await this.$_getData('public_settings');
|
|
177
|
+
console.log(this.settings);
|
|
177
178
|
await this.$_getSlotInfo();
|
|
178
179
|
await this.getCashoutMethod();
|
|
179
180
|
await this.getpayoutmethod();
|
|
@@ -314,6 +315,7 @@ export default {
|
|
|
314
315
|
{
|
|
315
316
|
this.main_currency = await new DB_SETTINGS().doc('public_settings').get();
|
|
316
317
|
this.main_currency = this.main_currency.data().value.main_currency;
|
|
318
|
+
// this.main_currency = "USD";
|
|
317
319
|
},
|
|
318
320
|
async getpayoutmethod()
|
|
319
321
|
{
|
|
@@ -373,7 +375,10 @@ export default {
|
|
|
373
375
|
submitdata.wallet_balance = this.walletBal;
|
|
374
376
|
submitdata.cashout_method = this.cashout_choice;
|
|
375
377
|
submitdata.amount = this.cashout_amount;
|
|
376
|
-
|
|
378
|
+
if(this.settings.hasOwnProperty('adspro_conversion_rate'))
|
|
379
|
+
{
|
|
380
|
+
submitdata.adspro_conversion_rate = this.settings.adspro_conversion_rate;
|
|
381
|
+
}
|
|
377
382
|
this.$q.loading.show({
|
|
378
383
|
spinner: QSpinnerFacebook,
|
|
379
384
|
spinnerColor: 'white',
|
package/GManualPaymentPage.vue
CHANGED
|
@@ -42,7 +42,7 @@
|
|
|
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
|
-
<div>Order Total: <b>
|
|
45
|
+
<div>Order Total: <b>{{ public_settings.main_currency }} {{$_formatNumber(this.order_info.orders.order_total, { decimal: 2})}} {{ public_settings.hasOwnProperty('adspro_conversion_rate') ? `(PHP ${this.order_info.orders.order_total * public_settings.adspro_conversion_rate})` : '' }}</b></div>
|
|
46
46
|
</div>
|
|
47
47
|
</div>
|
|
48
48
|
<div class="q-mt-md">
|
|
@@ -71,7 +71,8 @@ export default {
|
|
|
71
71
|
slot_code: "",
|
|
72
72
|
is_qr_enable: false,
|
|
73
73
|
qr_image_settings: "",
|
|
74
|
-
qr_image: ""
|
|
74
|
+
qr_image: "",
|
|
75
|
+
public_settings: {},
|
|
75
76
|
}),
|
|
76
77
|
async mounted()
|
|
77
78
|
{
|
|
@@ -87,6 +88,7 @@ export default {
|
|
|
87
88
|
this.getOrderDetails();
|
|
88
89
|
|
|
89
90
|
let check_settings = await this.$_getData('public_settings');
|
|
91
|
+
this.public_settings = check_settings
|
|
90
92
|
if(check_settings.hasOwnProperty("enable_gcash_qr"))
|
|
91
93
|
{
|
|
92
94
|
if(check_settings.enable_gcash_qr == true)
|
|
@@ -110,10 +110,10 @@ export default
|
|
|
110
110
|
{
|
|
111
111
|
name : 'net_payout',
|
|
112
112
|
label : 'Net Payout',
|
|
113
|
-
field : row => row.net_amount
|
|
113
|
+
field : row => `${row.hasOwnProperty('adspro_conversion_rate') ? 'USD ' + row.net_amount :row.net_amount} ${row.hasOwnProperty('adspro_conversion_rate') ? '(PHP ' + (row.net_amount * row.adspro_conversion_rate) + ')' : ''}`,
|
|
114
114
|
align : 'left',
|
|
115
115
|
},
|
|
116
|
-
{
|
|
116
|
+
{
|
|
117
117
|
name : 'requested_date',
|
|
118
118
|
label : 'Requested Date',
|
|
119
119
|
field : row => row.request_date,
|
|
@@ -154,7 +154,6 @@ export default
|
|
|
154
154
|
{
|
|
155
155
|
this.table_loading=true;
|
|
156
156
|
this.cashout_list = await new DB_MEMBER_CASHOUT().getPayoutBySlot(this.user_info.active_slot);
|
|
157
|
-
|
|
158
157
|
if(this.merchant_cashout)
|
|
159
158
|
{
|
|
160
159
|
this.table_column[5].label = "VAT";
|