geer-builder 1.2.573 → 1.2.576
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
|
@@ -148,12 +148,14 @@ export default {
|
|
|
148
148
|
merchant_field:[],
|
|
149
149
|
member_field:[],
|
|
150
150
|
cashout_details_tin:false,
|
|
151
|
+
settings:{},
|
|
151
152
|
}),
|
|
152
153
|
mixins:[GlobalMixins],
|
|
153
154
|
components: { GCard , CashoutStatusDialog, TinRegistrationDialog},
|
|
154
155
|
props:['cashout_choice_hide', 'metamask', 'is_company_ultrapro'],
|
|
155
156
|
async mounted()
|
|
156
157
|
{
|
|
158
|
+
this.settings = await this.$_getData('public_settings');
|
|
157
159
|
await this.$_getSlotInfo();
|
|
158
160
|
await this.getCashoutMethod();
|
|
159
161
|
await this.getpayoutmethod();
|
|
@@ -376,6 +378,23 @@ export default {
|
|
|
376
378
|
this.total_charge = breakdown.total_charge;
|
|
377
379
|
|
|
378
380
|
|
|
381
|
+
breakdown.service_charge = breakdown.service_charge > 0 ? breakdown.service_charge : 0;
|
|
382
|
+
breakdown.amount_less_charge = breakdown.amount_less_charge > 0 ? breakdown.amount_less_charge : 0;
|
|
383
|
+
breakdown.witholding_tax = breakdown.witholding_tax > 0 ? breakdown.witholding_tax : 0;
|
|
384
|
+
breakdown.payment_method_fee = breakdown.payment_method_fee > 0 ? breakdown.payment_method_fee : 0;
|
|
385
|
+
breakdown.net_amount = breakdown.net_amount > 0 ? breakdown.net_amount : 0;
|
|
386
|
+
}
|
|
387
|
+
else if(this.settings.hasOwnProperty('is_company_ultrapro'))
|
|
388
|
+
{
|
|
389
|
+
breakdown.cashout_amount = parseFloat(cashout_amount);
|
|
390
|
+
breakdown.payment_method_fee = parseFloat(this.computeCharge(cashout_amount, this.cashout_choice.payment_method, this.cashout_choice.payment_method_percentage));
|
|
391
|
+
breakdown.service_charge = parseFloat(this.computeCharge(cashout_amount, this.cashout_choice.service_charge, this.cashout_choice.service_charge_percentage));
|
|
392
|
+
// breakdown.amount_less_charge = parseFloat(breakdown.cashout_amount - (breakdown.payment_method_fee + breakdown.service_charge));
|
|
393
|
+
breakdown.witholding_tax = parseFloat(this.computeCharge(cashout_amount,this.cashout_choice.witholding_tax, true));
|
|
394
|
+
breakdown.total_charge = breakdown.witholding_tax + breakdown.payment_method_fee + breakdown.service_charge;
|
|
395
|
+
breakdown.net_amount = parseFloat(cashout_amount - breakdown.total_charge);
|
|
396
|
+
this.total_charge = breakdown.total_charge;
|
|
397
|
+
|
|
379
398
|
breakdown.service_charge = breakdown.service_charge > 0 ? breakdown.service_charge : 0;
|
|
380
399
|
breakdown.amount_less_charge = breakdown.amount_less_charge > 0 ? breakdown.amount_less_charge : 0;
|
|
381
400
|
breakdown.witholding_tax = breakdown.witholding_tax > 0 ? breakdown.witholding_tax : 0;
|
|
@@ -44,6 +44,10 @@
|
|
|
44
44
|
<q-icon name="fa fa-calendar" size="14px" class="q-mr-sm" ></q-icon>
|
|
45
45
|
<div>Unilevel Breakdown</div>
|
|
46
46
|
</q-btn>
|
|
47
|
+
<q-btn color="primary" unelevated v-if="show_unilevel_breakdown" @click="is_repeat_sale_dialog_open = true" style="margin:2px auto; width:75%;">
|
|
48
|
+
<q-icon name="fa fa-calendar" size="14px" class="q-mr-sm" ></q-icon>
|
|
49
|
+
<div>Unilevel Breakdown</div>
|
|
50
|
+
</q-btn>
|
|
47
51
|
<q-btn v-close-popup color="primary" @click="direct()" style="margin:2px auto; width:75%;">
|
|
48
52
|
<q-icon name="fa fa-user" size="14px" class="q-mr-sm"></q-icon>
|
|
49
53
|
<div v-if="is_company_success">Direct Enrollees List</div>
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
<div class="tree" style="margin-top: 1000px;">
|
|
17
17
|
<ul v-if="upline">
|
|
18
18
|
<slot-view-dialog-genealogy-children :is_company_success="is_company_success" v-show="method == 'unilevel'" :country="country" :open_level="1" :initial="true" :slot_info="upline" :rank="rank" :membership="membership" :profile_picture="default_profile_picture" />
|
|
19
|
-
<member-genealogy-binary :is_company_success="is_company_success" v-if="!hide_binary" :sponsor="slot_info" :country="country" v-show="method == 'binary'" :open_level="2" :initial="true" :rank="rank" :membership="membership" :binary_type="binary_type" :slot_info="upline" :profile_picture="default_profile_picture"/>
|
|
19
|
+
<member-genealogy-binary :hide_wallet="hide_wallet" :is_company_success="is_company_success" v-if="!hide_binary" :sponsor="slot_info" :country="country" v-show="method == 'binary'" :open_level="2" :initial="true" :rank="rank" :membership="membership" :binary_type="binary_type" :slot_info="upline" :profile_picture="default_profile_picture"/>
|
|
20
20
|
</ul>
|
|
21
21
|
</div>
|
|
22
22
|
</div>
|
|
@@ -64,6 +64,7 @@
|
|
|
64
64
|
method: String,
|
|
65
65
|
hide_binary: Boolean,
|
|
66
66
|
is_company_success: Boolean,
|
|
67
|
+
hide_wallet:Boolean
|
|
67
68
|
},
|
|
68
69
|
async mounted()
|
|
69
70
|
{
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
<div class="name" style="color:#F2C037 !important">{{ slot_info.slot_code }}</div>
|
|
32
32
|
<div class="name" style="color: white !important">{{ first_name }}</div>
|
|
33
33
|
<div class="rank">{{ slot_info.membership.membership_name }}</div>
|
|
34
|
-
<div class="wallet">
|
|
34
|
+
<div class="wallet" v-if="!hide_wallet">
|
|
35
35
|
{{0 > slot_info.wallet? "-" : ""}}{{ formatNumber(slot_info.wallet) }}
|
|
36
36
|
</div>
|
|
37
37
|
<div class="wallet">
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
|
|
45
45
|
<ul v-if="load_downline">
|
|
46
46
|
<!-- LEFT -->
|
|
47
|
-
<member-genealogy-binary :is_company_success="is_company_success" :binary_type="binary_type" :country="country" :sponsor="sponsor" v-for="downline in left_downline" :key="downline.id" :open_level="open_level-1" :initial="false" :slot_info="downline" :profile_picture="profile_picture"/>
|
|
47
|
+
<member-genealogy-binary :hide_wallet="hide_wallet" :is_company_success="is_company_success" :binary_type="binary_type" :country="country" :sponsor="sponsor" v-for="downline in left_downline" :key="downline.id" :open_level="open_level-1" :initial="false" :slot_info="downline" :profile_picture="profile_picture"/>
|
|
48
48
|
<li v-if="left_downline.length == 0">
|
|
49
49
|
<span>
|
|
50
50
|
<a v-if="is_company_success" href="javascript:" class="no-downline" style="width:220px; height:150px">
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
</li>
|
|
62
62
|
|
|
63
63
|
<!-- RIGHT -->
|
|
64
|
-
<member-genealogy-binary :is_company_success="is_company_success" :binary_type="binary_type" :country="country" :sponsor="sponsor" v-for="downline in right_downline" :key="downline.id" :open_level="open_level-1" :initial="false" :slot_info="downline" :profile_picture="profile_picture"/>
|
|
64
|
+
<member-genealogy-binary :hide_wallet="hide_wallet" :is_company_success="is_company_success" :binary_type="binary_type" :country="country" :sponsor="sponsor" v-for="downline in right_downline" :key="downline.id" :open_level="open_level-1" :initial="false" :slot_info="downline" :profile_picture="profile_picture"/>
|
|
65
65
|
<li v-if="right_downline.length == 0">
|
|
66
66
|
<span>
|
|
67
67
|
<a v-if="is_company_success" href="javascript:" class="no-downline" style="width:220px; height:150px" >
|
|
@@ -169,6 +169,7 @@ export default
|
|
|
169
169
|
sponsor: Object,
|
|
170
170
|
binary_type: String,
|
|
171
171
|
is_company_success: Boolean,
|
|
172
|
+
hide_wallet:Boolean
|
|
172
173
|
},
|
|
173
174
|
async mounted()
|
|
174
175
|
{
|