geer-builder 1.2.865 → 1.2.867
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 +11 -46
- package/package.json +1 -1
package/GCashOut.vue
CHANGED
|
@@ -71,22 +71,12 @@
|
|
|
71
71
|
<div class="summary__content-label" v-else>Cashout Method</div>
|
|
72
72
|
<div class="summary__content-info">{{cashout_choice.method_label}}</div>
|
|
73
73
|
</div>
|
|
74
|
-
|
|
75
|
-
<div class="summary__content-label">{{metamask ? 'Withdrawal Amount': 'Cashout Amount'}}</div>
|
|
76
|
-
<div class="summary__content-info">{{ main_currency }} {{ $_formatNumber(original_cashout_amount, { decimal: 2}) }}</div>
|
|
77
|
-
</div>
|
|
74
|
+
|
|
78
75
|
<div class="summary__content" v-else>
|
|
79
76
|
<div class="summary__content-label">{{metamask ? 'Withdrawal Amount': 'Cashout Amount'}}</div>
|
|
80
77
|
<div class="summary__content-info">{{ main_currency }} {{ $_formatNumber(xfield.cashout_amount, { decimal: 2}) }}</div>
|
|
81
78
|
</div>
|
|
82
|
-
|
|
83
|
-
<div class="summary__content-label">Reactivation</div>
|
|
84
|
-
<div class="summary__content-info">{{ main_currency }} {{ $_formatNumber(xfield.cashout_vortex_reactivate_fee, { decimal: 2}) }}</div>
|
|
85
|
-
</div>
|
|
86
|
-
<div v-if="settings.cashout_vortex_receiver_percentage > 0" class="summary__content">
|
|
87
|
-
<div class="summary__content-label">Company Slot Fee</div>
|
|
88
|
-
<div class="summary__content-info">{{ main_currency }} {{ $_formatNumber(xfield.cashout_vortex_receiver_fee, { decimal: 2}) }}</div>
|
|
89
|
-
</div>
|
|
79
|
+
|
|
90
80
|
<div v-if="cashout_choice.payment_method > 0" class="summary__content">
|
|
91
81
|
<div class="summary__content-label" v-if="merchant_cashout">Admin Fee</div>
|
|
92
82
|
<div class="summary__content-label" v-else>Payment Method Fee</div>
|
|
@@ -275,10 +265,14 @@ export default {
|
|
|
275
265
|
},
|
|
276
266
|
async checkRequiredDirect()
|
|
277
267
|
{
|
|
278
|
-
|
|
268
|
+
let membership_list = await this.$_getData('membership_list');
|
|
269
|
+
let cursor_slot_membership = this._getMembershipByID(this.current_slot_info.membership.membership_id,membership_list);
|
|
270
|
+
|
|
271
|
+
|
|
272
|
+
if(this.current_slot_info && (cursor_slot_membership.hasOwnProperty('cashout_required_direct') && cursor_slot_membership.cashout_required_direct > 0))
|
|
279
273
|
{
|
|
280
274
|
let get_sponsors = await this.db_direct.collection().where("sponsor","==",this.current_slot_info.slot_code).get();
|
|
281
|
-
this.required_direct =
|
|
275
|
+
this.required_direct = cursor_slot_membership.cashout_required_direct;
|
|
282
276
|
this.current_direct = get_sponsors.docs.length;
|
|
283
277
|
}
|
|
284
278
|
},
|
|
@@ -466,33 +460,10 @@ export default {
|
|
|
466
460
|
service_charge: 0,
|
|
467
461
|
amount_less_charge: 0,
|
|
468
462
|
witholding_tax: 0,
|
|
469
|
-
cashout_vortex_reactivate_fee: 0,
|
|
470
|
-
cashout_vortex_receiver_fee: 0,
|
|
471
463
|
total_charge: 0,
|
|
472
464
|
net_amount: 0,
|
|
473
465
|
};
|
|
474
466
|
|
|
475
|
-
if(this.settings.cashout_vortex_reactivate_percentage)
|
|
476
|
-
{
|
|
477
|
-
if(this.original_cashout_amount == 0)
|
|
478
|
-
{
|
|
479
|
-
this.original_cashout_amount = cashout_amount;
|
|
480
|
-
}
|
|
481
|
-
let charges = this.computeCharge(cashout_amount, this.settings.cashout_vortex_reactivate_percentage, true);
|
|
482
|
-
cashout_amount = cashout_amount - charges
|
|
483
|
-
breakdown.cashout_vortex_reactivate_fee = charges;
|
|
484
|
-
}
|
|
485
|
-
|
|
486
|
-
if(this.settings.cashout_vortex_receiver_percentage)
|
|
487
|
-
{
|
|
488
|
-
if(this.original_cashout_amount == 0)
|
|
489
|
-
{
|
|
490
|
-
this.original_cashout_amount = cashout_amount;
|
|
491
|
-
}
|
|
492
|
-
let charges = this.computeCharge(cashout_amount, this.settings.cashout_vortex_receiver_percentage, true);
|
|
493
|
-
cashout_amount = cashout_amount - charges;
|
|
494
|
-
breakdown.cashout_vortex_receiver_fee = charges;
|
|
495
|
-
}
|
|
496
467
|
// for merchant cashout
|
|
497
468
|
// payment method fee = admin fee
|
|
498
469
|
// service charge = transaction fee
|
|
@@ -507,14 +478,12 @@ export default {
|
|
|
507
478
|
breakdown.payment_method_fee = parseFloat(this.computeCharge(cashout_amount, this.cashout_choice.payment_method, this.cashout_choice.payment_method_percentage));
|
|
508
479
|
breakdown.service_charge = parseFloat(this.computeCharge(cashout_amount, this.cashout_choice.service_charge, this.cashout_choice.service_charge_percentage));
|
|
509
480
|
breakdown.witholding_tax = parseFloat(this.computeCharge(cashout_amount, this.cashout_choice.witholding_tax, true));
|
|
510
|
-
breakdown.total_charge = breakdown.witholding_tax + breakdown.payment_method_fee + breakdown.service_charge
|
|
481
|
+
breakdown.total_charge = breakdown.witholding_tax + breakdown.payment_method_fee + breakdown.service_charge;
|
|
511
482
|
breakdown.net_amount = parseFloat(cashout_amount - breakdown.total_charge);
|
|
512
483
|
this.total_charge = breakdown.total_charge;
|
|
513
484
|
|
|
514
485
|
|
|
515
486
|
breakdown.service_charge = breakdown.service_charge > 0 ? breakdown.service_charge : 0;
|
|
516
|
-
breakdown.cashout_vortex_receiver_fee = breakdown.cashout_vortex_receiver_fee > 0 ? breakdown.cashout_vortex_receiver_fee : 0;
|
|
517
|
-
breakdown.cashout_vortex_reactivate_fee = breakdown.cashout_vortex_reactivate_fee > 0 ? breakdown.cashout_vortex_reactivate_fee : 0;
|
|
518
487
|
breakdown.amount_less_charge = breakdown.amount_less_charge > 0 ? breakdown.amount_less_charge : 0;
|
|
519
488
|
breakdown.witholding_tax = breakdown.witholding_tax > 0 ? breakdown.witholding_tax : 0;
|
|
520
489
|
breakdown.payment_method_fee = breakdown.payment_method_fee > 0 ? breakdown.payment_method_fee : 0;
|
|
@@ -528,13 +497,11 @@ export default {
|
|
|
528
497
|
breakdown.service_charge = parseFloat(this.computeCharge(cashout_amount, this.cashout_choice.service_charge, this.cashout_choice.service_charge_percentage));
|
|
529
498
|
// breakdown.amount_less_charge = parseFloat(breakdown.cashout_amount - (breakdown.payment_method_fee + breakdown.service_charge));
|
|
530
499
|
breakdown.witholding_tax = parseFloat(this.computeCharge(cashout_amount,this.cashout_choice.witholding_tax, true));
|
|
531
|
-
breakdown.total_charge = breakdown.witholding_tax + breakdown.payment_method_fee + breakdown.service_charge
|
|
500
|
+
breakdown.total_charge = breakdown.witholding_tax + breakdown.payment_method_fee + breakdown.service_charge;
|
|
532
501
|
breakdown.net_amount = parseFloat(cashout_amount - breakdown.total_charge);
|
|
533
502
|
this.total_charge = breakdown.total_charge;
|
|
534
503
|
|
|
535
504
|
breakdown.service_charge = breakdown.service_charge > 0 ? breakdown.service_charge : 0;
|
|
536
|
-
breakdown.cashout_vortex_receiver_fee = breakdown.cashout_vortex_receiver_fee > 0 ? breakdown.cashout_vortex_receiver_fee : 0;
|
|
537
|
-
breakdown.cashout_vortex_reactivate_fee = breakdown.cashout_vortex_reactivate_fee > 0 ? breakdown.cashout_vortex_reactivate_fee : 0;
|
|
538
505
|
breakdown.amount_less_charge = breakdown.amount_less_charge > 0 ? breakdown.amount_less_charge : 0;
|
|
539
506
|
breakdown.witholding_tax = breakdown.witholding_tax > 0 ? breakdown.witholding_tax : 0;
|
|
540
507
|
breakdown.payment_method_fee = breakdown.payment_method_fee > 0 ? breakdown.payment_method_fee : 0;
|
|
@@ -548,12 +515,10 @@ export default {
|
|
|
548
515
|
breakdown.amount_less_charge = parseFloat(breakdown.cashout_amount - (breakdown.payment_method_fee + breakdown.service_charge));
|
|
549
516
|
breakdown.witholding_tax = parseFloat(this.computeCharge(breakdown.amount_less_charge, this.cashout_choice.witholding_tax, true));
|
|
550
517
|
breakdown.net_amount = parseFloat(breakdown.amount_less_charge - breakdown.witholding_tax);
|
|
551
|
-
breakdown.total_charge = breakdown.witholding_tax + breakdown.payment_method_fee + breakdown.service_charge
|
|
518
|
+
breakdown.total_charge = breakdown.witholding_tax + breakdown.payment_method_fee + breakdown.service_charge;
|
|
552
519
|
this.total_charge = breakdown.total_charge;
|
|
553
520
|
|
|
554
521
|
breakdown.service_charge = breakdown.service_charge > 0 ? breakdown.service_charge : 0;
|
|
555
|
-
breakdown.cashout_vortex_receiver_fee = breakdown.cashout_vortex_receiver_fee > 0 ? breakdown.cashout_vortex_receiver_fee : 0;
|
|
556
|
-
breakdown.cashout_vortex_reactivate_fee = breakdown.cashout_vortex_reactivate_fee > 0 ? breakdown.cashout_vortex_reactivate_fee : 0;
|
|
557
522
|
breakdown.amount_less_charge = breakdown.amount_less_charge > 0 ? breakdown.amount_less_charge : 0;
|
|
558
523
|
breakdown.witholding_tax = breakdown.witholding_tax > 0 ? breakdown.witholding_tax : 0;
|
|
559
524
|
breakdown.payment_method_fee = breakdown.payment_method_fee > 0 ? breakdown.payment_method_fee : 0;
|