geer-builder 1.2.675 → 1.2.677
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.
|
@@ -33,7 +33,8 @@
|
|
|
33
33
|
<script>
|
|
34
34
|
import GCard from './components/GCard';
|
|
35
35
|
import GLoader from './components/GlobalLoader';
|
|
36
|
-
import EarningsLog
|
|
36
|
+
import EarningsLog from './components/EarningBreakdownWidget/EarningsLog';
|
|
37
|
+
import DB_SLOT from './models/DB_SLOT';
|
|
37
38
|
import DB_SLOT_BREAKDOWN from './models/DB_SLOT_BREAKDOWN';
|
|
38
39
|
import GlobalMixins from './mixins/global_mixins.js';
|
|
39
40
|
import AUTH from './auth.js';
|
|
@@ -47,6 +48,7 @@ export default
|
|
|
47
48
|
({
|
|
48
49
|
is_earning_breakdown_log_open:false,
|
|
49
50
|
earning_breakdown: [],
|
|
51
|
+
earning_breakdown_slot: [],
|
|
50
52
|
earning_breakdown_processed: [],
|
|
51
53
|
selected_complan: {},
|
|
52
54
|
}),
|
|
@@ -65,23 +67,38 @@ export default
|
|
|
65
67
|
|
|
66
68
|
this.earning_breakdown.forEach((breakdown) =>
|
|
67
69
|
{
|
|
68
|
-
|
|
70
|
+
let another_keyword = val.key+"_convert";
|
|
71
|
+
if(breakdown.id == val.key || breakdown.id == another_keyword)
|
|
69
72
|
{
|
|
70
|
-
res.amount = breakdown.amount;
|
|
73
|
+
res.amount = res.amount+breakdown.amount;
|
|
71
74
|
res.last_update = breakdown.last_update;
|
|
72
75
|
}
|
|
73
76
|
});
|
|
74
77
|
|
|
78
|
+
for (var key in this.earning_breakdown_slot.temporary_wallet)
|
|
79
|
+
{
|
|
80
|
+
if(key == val.key)
|
|
81
|
+
{
|
|
82
|
+
res.amount = res.amount +this.earning_breakdown_slot.temporary_wallet[key];
|
|
83
|
+
}
|
|
84
|
+
}
|
|
75
85
|
return res;
|
|
76
86
|
});
|
|
87
|
+
|
|
88
|
+
// console.log(this.earning_breakdown_processed);
|
|
89
|
+
// console.log(this.earning_breakdown_slot.temporary_wallet);
|
|
90
|
+
|
|
91
|
+
|
|
77
92
|
}
|
|
78
93
|
},
|
|
79
94
|
methods:
|
|
80
95
|
{
|
|
81
96
|
async load_breakdown()
|
|
82
97
|
{
|
|
98
|
+
// console.log(this.current_slot_info,123);
|
|
83
99
|
if(this.user_info)
|
|
84
100
|
{
|
|
101
|
+
this.earning_breakdown_slot = await new DB_SLOT().get(this.user_info.active_slot);
|
|
85
102
|
await this.$bind("earning_breakdown", new DB_SLOT_BREAKDOWN(this.user_info.active_slot).collection());
|
|
86
103
|
}
|
|
87
104
|
}
|
package/GSlotWallet.vue
CHANGED
|
@@ -126,7 +126,7 @@
|
|
|
126
126
|
<div class="icon-holder" v-if="!is_company_ultrapro">
|
|
127
127
|
<q-icon class="q-mr-sm" name="fas fa-money-check" size="16px"></q-icon>
|
|
128
128
|
</div>
|
|
129
|
-
<div>GC History</div>
|
|
129
|
+
<div>{{ (settings && settings.gc_label) || 'GC' }} History</div>
|
|
130
130
|
</q-btn>
|
|
131
131
|
</div>
|
|
132
132
|
</div>
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
</div>
|
|
19
19
|
<div class="detail">
|
|
20
20
|
<div class="message">
|
|
21
|
-
<div v-html="notification.message"></div>
|
|
21
|
+
<div v-html="notification.message ? notification.message : notification.temp_wallet_message "></div>
|
|
22
22
|
</div>
|
|
23
23
|
<div class="time">{{ $_formatDate(notification.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
|
|
24
24
|
</div>
|
|
@@ -133,7 +133,7 @@ export default
|
|
|
133
133
|
let res = [];
|
|
134
134
|
this.notification_list.forEach((n) =>
|
|
135
135
|
{
|
|
136
|
-
if(n.hasOwnProperty('message'))
|
|
136
|
+
if(n.hasOwnProperty('message') || n.hasOwnProperty('temp_wallet_message'))
|
|
137
137
|
{
|
|
138
138
|
if(this.new_count == 0)
|
|
139
139
|
{
|