geer-builder 1.2.736 → 1.2.738
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.
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
<q-icon size="18px" :name="breakdown.icon"></q-icon>
|
|
11
11
|
</div>
|
|
12
12
|
<div class="breakdown-label">{{ breakdown.label }}</div>
|
|
13
|
-
<div class="breakdown-value text-primary">{{ $_formatNumber(breakdown.amount, { decimal: 2 }) }}</div>
|
|
13
|
+
<div class="breakdown-value text-primary">{{ $_formatNumber(breakdown.amount + (binary_three_mentors_earnings ? binary_three_mentors_earnings : 0), { decimal: 2 }) }}</div>
|
|
14
14
|
</div>
|
|
15
15
|
</template>
|
|
16
16
|
</div>
|
|
@@ -51,6 +51,7 @@ export default
|
|
|
51
51
|
earning_breakdown_slot: [],
|
|
52
52
|
earning_breakdown_processed: [],
|
|
53
53
|
selected_complan: {},
|
|
54
|
+
binary_three_mentors_earnings: 0
|
|
54
55
|
}),
|
|
55
56
|
async mounted()
|
|
56
57
|
{
|
|
@@ -59,12 +60,11 @@ export default
|
|
|
59
60
|
watch:
|
|
60
61
|
{
|
|
61
62
|
async earning_breakdown()
|
|
62
|
-
{
|
|
63
|
+
{
|
|
63
64
|
let complan_plan = await this.$_getData('public_settings');
|
|
64
65
|
this.earning_breakdown_processed = complan_plan.active_complan.map((val) =>
|
|
65
66
|
{
|
|
66
67
|
let res = { icon: val.icon, active: val.active, label: val.label, complan: val.key, amount : 0, last_update: null, show:val.show };
|
|
67
|
-
|
|
68
68
|
this.earning_breakdown.forEach((breakdown) =>
|
|
69
69
|
{
|
|
70
70
|
let another_keyword = val.key+"_convert";
|
|
@@ -73,6 +73,15 @@ export default
|
|
|
73
73
|
res.amount = res.amount+breakdown.amount;
|
|
74
74
|
res.last_update = breakdown.last_update;
|
|
75
75
|
}
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
if(val.key == "binary_three")
|
|
79
|
+
{
|
|
80
|
+
if(breakdown.id == "binary_three_mentors")
|
|
81
|
+
{
|
|
82
|
+
res.amount = res.amount+breakdown.amount;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
76
85
|
});
|
|
77
86
|
|
|
78
87
|
for (var key in this.earning_breakdown_slot.temporary_wallet)
|
|
@@ -81,10 +90,17 @@ export default
|
|
|
81
90
|
{
|
|
82
91
|
res.amount = res.amount +this.earning_breakdown_slot.temporary_wallet[key];
|
|
83
92
|
}
|
|
93
|
+
|
|
94
|
+
if(val.key == "binary_three")
|
|
95
|
+
{
|
|
96
|
+
if(key == "binary_three_mentors")
|
|
97
|
+
{
|
|
98
|
+
res.amount = res.amount +this.earning_breakdown_slot.temporary_wallet[key];
|
|
99
|
+
}
|
|
100
|
+
}
|
|
84
101
|
}
|
|
85
102
|
return res;
|
|
86
103
|
});
|
|
87
|
-
|
|
88
104
|
// console.log(this.earning_breakdown_processed);
|
|
89
105
|
// console.log(this.earning_breakdown_slot.temporary_wallet);
|
|
90
106
|
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="g-dashboard-package">
|
|
3
3
|
<template v-if="product_list.length>0">
|
|
4
|
-
<h5 style="margin-bottom:10px;">Buy now and be part of our community!</h5>
|
|
4
|
+
<!-- <h5 style="margin-bottom:10px;">Buy now and be part of our community!</h5> -->
|
|
5
|
+
<h5 style="margin-bottom:10px;">BUY NOW AND BE OUR PARTNER TO MAKE THE WORLD BETTER!</h5>
|
|
5
6
|
<div class="product-line" >
|
|
6
7
|
<div v-for="(field, i) in product_list" :key="i" class="imgcontainer" :style="`background-color:`+background_color+``">
|
|
7
8
|
<div :style="`background-image: url(${field.primary_picture ? field.primary_picture : public_settings.default_product_picture ? public_settings.default_product_picture : 'https://bvusolution.com/images/product-no-image.jpg'});height:200px;width:230px;background-size:80%`" class="image product-list-image" :id="i">
|
package/GProductList.vue
CHANGED
|
@@ -342,12 +342,12 @@ export default {
|
|
|
342
342
|
await this.$bind('new_product_list', querry);
|
|
343
343
|
let filt = this.new_product_list.map(prod => {
|
|
344
344
|
|
|
345
|
-
if(prod.activated_only && this.user_info &&
|
|
345
|
+
if(prod.activated_only && !this.user_info && !this.user_info.hasOwnProperty('active_slot') )
|
|
346
346
|
{
|
|
347
347
|
remove_prod_count++;
|
|
348
348
|
return false;
|
|
349
349
|
}
|
|
350
|
-
if(prod.not_activated_only && this.user_info &&
|
|
350
|
+
if(prod.not_activated_only && this.user_info && this.user_info.hasOwnProperty('active_slot') )
|
|
351
351
|
{
|
|
352
352
|
remove_prod_count++;
|
|
353
353
|
return false;
|
|
@@ -369,12 +369,12 @@ export default {
|
|
|
369
369
|
let loaded_new_product_remove_count = 0;
|
|
370
370
|
let filt1 = this.loaded_new_product.map(prod => {
|
|
371
371
|
|
|
372
|
-
if(prod.activated_only && this.user_info &&
|
|
372
|
+
if(prod.activated_only && !this.user_info && this.user_info.hasOwnProperty('active_slot') )
|
|
373
373
|
{
|
|
374
374
|
loaded_new_product_remove_count++;
|
|
375
375
|
return false;
|
|
376
376
|
}
|
|
377
|
-
if(prod.not_activated_only && this.user_info &&
|
|
377
|
+
if(prod.not_activated_only && this.user_info && this.user_info.hasOwnProperty('active_slot') )
|
|
378
378
|
{
|
|
379
379
|
loaded_new_product_remove_count++;
|
|
380
380
|
return false;
|
|
@@ -386,11 +386,11 @@ export default {
|
|
|
386
386
|
await this.$bind('loaded_new_product', querry);
|
|
387
387
|
let filt = this.loaded_new_product.map(prod => {
|
|
388
388
|
|
|
389
|
-
if(prod.activated_only && this.user_info &&
|
|
389
|
+
if(prod.activated_only && !this.user_info && !this.user_info.hasOwnProperty('active_slot') )
|
|
390
390
|
{
|
|
391
391
|
return false;
|
|
392
392
|
}
|
|
393
|
-
if(prod.not_activated_only && this.user_info &&
|
|
393
|
+
if(prod.not_activated_only && this.user_info && this.user_info.hasOwnProperty('active_slot') )
|
|
394
394
|
{
|
|
395
395
|
return false;
|
|
396
396
|
}
|
|
@@ -406,11 +406,11 @@ export default {
|
|
|
406
406
|
await this.$bind('new_product_list', querry);
|
|
407
407
|
let filt = this.new_product_list.map(prod =>
|
|
408
408
|
{
|
|
409
|
-
if(prod.activated_only && this.user_info &&
|
|
409
|
+
if(prod.activated_only && !this.user_info && !this.user_info.hasOwnProperty('active_slot') )
|
|
410
410
|
{
|
|
411
411
|
return false;
|
|
412
412
|
}
|
|
413
|
-
if(prod.not_activated_only && this.user_info &&
|
|
413
|
+
if(prod.not_activated_only && this.user_info && this.user_info.hasOwnProperty('active_slot') )
|
|
414
414
|
{
|
|
415
415
|
return false;
|
|
416
416
|
}
|
|
@@ -81,7 +81,15 @@ export default
|
|
|
81
81
|
{
|
|
82
82
|
async loadNotificationList()
|
|
83
83
|
{
|
|
84
|
-
let query =
|
|
84
|
+
let query = [];
|
|
85
|
+
if(this.complan_details.complan == "binary_three")
|
|
86
|
+
{
|
|
87
|
+
query = new DB_SLOT_LOG().collection().where("recipient_id", "==", this.current_slot_info.slot_code).where("type",'in',["binary_three","binary_three_mentors"] ).orderBy('created_date', 'desc').limit(10);
|
|
88
|
+
}
|
|
89
|
+
else
|
|
90
|
+
{
|
|
91
|
+
query = new DB_SLOT_LOG().collection().where("recipient_id", "==", this.current_slot_info.slot_code).where("type",'==', this.complan_details.complan).orderBy('created_date', 'desc').limit(10);
|
|
92
|
+
}
|
|
85
93
|
await this.$bind('notification_list', query);
|
|
86
94
|
this.initial_loading = false;
|
|
87
95
|
},
|