geer-builder 1.2.892 → 1.2.894
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/GBinaryWidget.vue +76 -3
- package/GSlotWallet.vue +100 -2
- package/components/genealogy/Genealogy.vue +5 -1
- package/components/genealogy/GenealogyBinary.vue +2 -2
- package/dialogs/AddPaymentDialog.vue +13 -13
- package/dialogs/BinaryHistory.vue +160 -3
- package/dialogs/PairingHistory.vue +2 -0
- package/models/DB_CMS_V1.js +9 -0
- package/models/DB_EXTREME_BINARY_POINTS_HISTORY.js +9 -0
- package/package.json +1 -1
package/GBinaryWidget.vue
CHANGED
|
@@ -17,11 +17,11 @@
|
|
|
17
17
|
</div>
|
|
18
18
|
<div class="section-holder">
|
|
19
19
|
<div class="label">{{is_digify ? 'Left Sales' : 'Left Points'}}</div>
|
|
20
|
-
<div class="value">{{$_formatNumber(binary_type_settings == 'one' ? slot_info.points.binary_points_left : binary_type_settings == 'three' ? slot_info.points.binary_three_points_left : (slot_info.points.binary_two_points_left / (public_settings.hasOwnProperty('binary_divide') ? public_settings.binary_divide : 1) ), { decimal: 2 })}}</div>
|
|
20
|
+
<div class="value">{{$_formatNumber(binary_type_settings == 'one' ? slot_info.points.binary_points_left : binary_type_settings == 'three' ? slot_info.points.binary_three_points_left : binary_type_settings == 'extreme' ? slot_info.points.extreme_binary_points_left : (slot_info.points.binary_two_points_left / (public_settings.hasOwnProperty('binary_divide') ? public_settings.binary_divide : 1) ), { decimal: 2 })}}</div>
|
|
21
21
|
</div>
|
|
22
22
|
<div class="section-holder">
|
|
23
23
|
<div class="label">{{is_digify ? 'Right Sales' : 'Right Points'}}</div>
|
|
24
|
-
<div class="value">{{$_formatNumber(binary_type_settings == 'one' ? slot_info.points.binary_points_right : binary_type_settings == 'three' ? slot_info.points.binary_three_points_right : (slot_info.points.binary_two_points_right / (public_settings.hasOwnProperty('binary_divide') ? public_settings.binary_divide : 1) ), { decimal: 2 })}}</div>
|
|
24
|
+
<div class="value">{{$_formatNumber(binary_type_settings == 'one' ? slot_info.points.binary_points_right : binary_type_settings == 'three' ? slot_info.points.binary_three_points_right : binary_type_settings == 'extreme' ? slot_info.points.extreme_binary_points_right : (slot_info.points.binary_two_points_right / (public_settings.hasOwnProperty('binary_divide') ? public_settings.binary_divide : 1) ), { decimal: 2 })}}</div>
|
|
25
25
|
</div>
|
|
26
26
|
</div>
|
|
27
27
|
<div class="actions" v-bind:style="getClass()">
|
|
@@ -46,6 +46,13 @@
|
|
|
46
46
|
<div v-else>Pairing History</div>
|
|
47
47
|
</q-btn>
|
|
48
48
|
</div>
|
|
49
|
+
<div class="left" v-if="this.history == true && binary_type_settings == 'extreme'">
|
|
50
|
+
<q-btn @click="openPairingHistory('extreme')" size="12px" class="full-width q-pa-sm text-primary" flat>
|
|
51
|
+
<q-icon class="q-mr-sm" name="fa fa-history" size="16px"></q-icon>
|
|
52
|
+
<div v-if="is_company_success">Initiate Sales Match History</div>
|
|
53
|
+
<div v-else>Pairing History</div>
|
|
54
|
+
</q-btn>
|
|
55
|
+
</div>
|
|
49
56
|
<div class="right" v-if="this.genealogy == true">
|
|
50
57
|
<q-btn @click="is_open_place_slots_dialog = true" size="12px" class="full-width q-pa-sm text-primary" flat>
|
|
51
58
|
<q-icon class="q-mr-sm" name="fas fa-users" size="16px"></q-icon>
|
|
@@ -80,6 +87,13 @@
|
|
|
80
87
|
<div v-else>View Binary History</div>
|
|
81
88
|
</q-btn>
|
|
82
89
|
</div>
|
|
90
|
+
<div class="right" v-if="this.binary_history == true && binary_type_settings == 'extreme' ">
|
|
91
|
+
<q-btn @click="open_binary_history('extreme')" size="12px" class="full-width q-pa-sm text-primary" flat>
|
|
92
|
+
<q-icon class="q-mr-sm" name="fas fa-users" size="16px"></q-icon>
|
|
93
|
+
<div v-if="is_company_success">View Sales Match History</div>
|
|
94
|
+
<div v-else>View Binary History</div>
|
|
95
|
+
</q-btn>
|
|
96
|
+
</div>
|
|
83
97
|
<div class="right" v-if="this.binary_log == true">
|
|
84
98
|
<q-btn @click="is_open_point_history_dialog = true" size="12px" class="full-width q-pa-sm text-primary" flat>
|
|
85
99
|
<q-icon class="q-mr-sm" name="fas fa-users" size="16px"></q-icon>
|
|
@@ -194,6 +208,10 @@ export default
|
|
|
194
208
|
{
|
|
195
209
|
this.binary_settings = info.computation.binary;
|
|
196
210
|
}
|
|
211
|
+
if(this.binary_type_settings == 'extreme')
|
|
212
|
+
{
|
|
213
|
+
this.binary_settings = info.computation.extreme_binary;
|
|
214
|
+
}
|
|
197
215
|
},
|
|
198
216
|
async getMembershipSettings()
|
|
199
217
|
{
|
|
@@ -234,6 +252,10 @@ export default
|
|
|
234
252
|
{
|
|
235
253
|
this.binary_type_settings = "three";
|
|
236
254
|
}
|
|
255
|
+
else if(settings.active_complan[20] && settings.active_complan[20].hasOwnProperty("active") && settings.active_complan[20].active)
|
|
256
|
+
{
|
|
257
|
+
this.binary_type_settings = "extreme";
|
|
258
|
+
}
|
|
237
259
|
|
|
238
260
|
if(this.binary_type_settings == "one")
|
|
239
261
|
{
|
|
@@ -386,7 +408,58 @@ export default
|
|
|
386
408
|
{
|
|
387
409
|
this.pairs_today = this.slot_info.pairs_two_today;
|
|
388
410
|
// response.income_today = slot_info.income_today;
|
|
389
|
-
}
|
|
411
|
+
}
|
|
412
|
+
}
|
|
413
|
+
else if(this.binary_type_settings == "extreme")
|
|
414
|
+
{
|
|
415
|
+
let response = {};
|
|
416
|
+
let reset = 0;
|
|
417
|
+
let setting_reset_schedule = 0;
|
|
418
|
+
|
|
419
|
+
let binary_settings = settings.active_complan[20];
|
|
420
|
+
let today = moment().tz("Asia/Singapore");
|
|
421
|
+
setting_reset_schedule = binary_settings.hasOwnProperty('cycle_reset_time') ? binary_settings.cycle_reset_time : 0;
|
|
422
|
+
|
|
423
|
+
let for_update_date = moment().set({'hour' : setting_reset_schedule, 'minute' : 0, 'second' : 0, 'millisecond': 0});
|
|
424
|
+
|
|
425
|
+
let pairing_cycle = 1;
|
|
426
|
+
let current_cycle = 1;
|
|
427
|
+
let slot_extreme_current_cycle = this.slot_info.slot_extreme_current_cycle ? this.slot_info.slot_extreme_current_cycle : 1;
|
|
428
|
+
|
|
429
|
+
if(binary_settings.hasOwnProperty('pairing_cycle'))
|
|
430
|
+
{
|
|
431
|
+
if(binary_settings.pairing_cycle == 2)
|
|
432
|
+
{
|
|
433
|
+
pairing_cycle = 2;
|
|
434
|
+
|
|
435
|
+
if(today.diff( for_update_date ,"hours") >= 12)
|
|
436
|
+
{
|
|
437
|
+
current_cycle = 2;
|
|
438
|
+
}
|
|
439
|
+
}
|
|
440
|
+
}
|
|
441
|
+
|
|
442
|
+
if (typeof (this.slot_info.date_extreme_pair_daily) === 'undefined')
|
|
443
|
+
{
|
|
444
|
+
reset = 1;
|
|
445
|
+
}
|
|
446
|
+
else if(pairing_cycle == 2 && slot_extreme_current_cycle == 1 && today.diff( moment(this.slot_info.date_extreme_pair_daily.toDate()).tz("Asia/Singapore") ,"hours") >= 12)
|
|
447
|
+
{
|
|
448
|
+
reset = 1;
|
|
449
|
+
}
|
|
450
|
+
else if(today.diff( moment(this.slot_info.date_extreme_pair_daily.toDate()).tz("Asia/Singapore") ,"hours") >= 24)
|
|
451
|
+
{
|
|
452
|
+
reset = 1;
|
|
453
|
+
}
|
|
454
|
+
|
|
455
|
+
if(reset == 1)
|
|
456
|
+
{
|
|
457
|
+
this.pairs_today = 0;
|
|
458
|
+
}
|
|
459
|
+
else
|
|
460
|
+
{
|
|
461
|
+
this.pairs_today = this.slot_info.extreme_pairs_today;
|
|
462
|
+
}
|
|
390
463
|
}
|
|
391
464
|
else
|
|
392
465
|
{
|
package/GSlotWallet.vue
CHANGED
|
@@ -157,7 +157,7 @@
|
|
|
157
157
|
</div>
|
|
158
158
|
|
|
159
159
|
<div class="section-holder" v-if="show_binary_history == true" >
|
|
160
|
-
|
|
160
|
+
|
|
161
161
|
<div class="button-holder" style="cursor:pointer;" @click="is_binary_history_dialog_open=true" >
|
|
162
162
|
<q-btn size="12px" class="full-width q-pa-sm text-primary" flat>
|
|
163
163
|
<q-icon class="q-mr-sm" name="fas fa-money-check" size="16px"></q-icon>
|
|
@@ -166,6 +166,21 @@
|
|
|
166
166
|
</div>
|
|
167
167
|
</div>
|
|
168
168
|
|
|
169
|
+
<!-- Extreme Binary Placement Preference -->
|
|
170
|
+
<div class="section-holder" v-if="is_extreme_binary_enabled">
|
|
171
|
+
<div class="label">Extreme Binary Placement</div>
|
|
172
|
+
<div class="value">{{ current_slot_info.extreme_binary_placement || 'Not Set' }}</div>
|
|
173
|
+
<div class="button-holder" style="cursor:pointer;" @click="openExtremePlacementDialog">
|
|
174
|
+
<q-btn size="12px" class="full-width q-pa-sm text-primary" flat :disable="(current_slot_info.personal_count || 0) < 2">
|
|
175
|
+
<q-icon class="q-mr-sm" name="fas fa-sitemap" size="16px"></q-icon>
|
|
176
|
+
<div>Set Placement Preference</div>
|
|
177
|
+
</q-btn>
|
|
178
|
+
</div>
|
|
179
|
+
<div v-if="(current_slot_info.personal_count || 0) < 2" class="text-caption text-grey q-mt-xs">
|
|
180
|
+
Requires at least 2 sponsored downlines
|
|
181
|
+
</div>
|
|
182
|
+
</div>
|
|
183
|
+
|
|
169
184
|
|
|
170
185
|
<div class="section-holder" v-if="current_slot_info.points.hasOwnProperty('up_coin')" >
|
|
171
186
|
<div class="label">UP Coin</div>
|
|
@@ -272,9 +287,37 @@
|
|
|
272
287
|
<q-dialog v-model="is_rc_logs_dialog_open" :maximized="true">
|
|
273
288
|
<r-c-logs-dialog/>
|
|
274
289
|
</q-dialog>
|
|
275
|
-
<q-dialog v-model="is_binary_history_dialog_open" :maximized="true">
|
|
290
|
+
<q-dialog v-model="is_binary_history_dialog_open" :maximized="true">
|
|
276
291
|
<binary-history :is_teslab_binary="is_teslab" :binary_type="binary_type" :flushout_hide="true" :slot_info="current_slot_info"></binary-history>
|
|
277
292
|
</q-dialog>
|
|
293
|
+
|
|
294
|
+
<!-- Extreme Binary Placement Preference Dialog -->
|
|
295
|
+
<q-dialog v-model="is_extreme_placement_dialog_open">
|
|
296
|
+
<q-card style="min-width: 300px;">
|
|
297
|
+
<q-card-section class="row items-center">
|
|
298
|
+
<div class="text-h6">Extreme Binary Placement</div>
|
|
299
|
+
<q-space />
|
|
300
|
+
<q-btn icon="close" flat round dense v-close-popup />
|
|
301
|
+
</q-card-section>
|
|
302
|
+
|
|
303
|
+
<q-card-section>
|
|
304
|
+
<div class="text-subtitle1 q-mb-md">Select your preferred downline placement:</div>
|
|
305
|
+
<q-option-group
|
|
306
|
+
v-model="extreme_placement_preference"
|
|
307
|
+
:options="[
|
|
308
|
+
{ label: 'LEFT', value: 'LEFT' },
|
|
309
|
+
{ label: 'RIGHT', value: 'RIGHT' }
|
|
310
|
+
]"
|
|
311
|
+
color="primary"
|
|
312
|
+
/>
|
|
313
|
+
</q-card-section>
|
|
314
|
+
|
|
315
|
+
<q-card-actions align="right">
|
|
316
|
+
<q-btn flat label="Cancel" v-close-popup />
|
|
317
|
+
<q-btn color="primary" label="Save" @click="saveExtremePlacementPreference" :loading="saving_placement" />
|
|
318
|
+
</q-card-actions>
|
|
319
|
+
</q-card>
|
|
320
|
+
</q-dialog>
|
|
278
321
|
</g-card>
|
|
279
322
|
<div v-else>
|
|
280
323
|
<span>You need to login to view this component.</span>
|
|
@@ -351,6 +394,10 @@ export default
|
|
|
351
394
|
damayan_pool:[],
|
|
352
395
|
show_damayan_pool:false,
|
|
353
396
|
show_global_pool:false,
|
|
397
|
+
is_extreme_binary_enabled: false,
|
|
398
|
+
is_extreme_placement_dialog_open: false,
|
|
399
|
+
extreme_placement_preference: 'LEFT',
|
|
400
|
+
saving_placement: false,
|
|
354
401
|
}),
|
|
355
402
|
watch:
|
|
356
403
|
{
|
|
@@ -380,9 +427,60 @@ export default
|
|
|
380
427
|
{
|
|
381
428
|
await this.computeWallet();
|
|
382
429
|
}
|
|
430
|
+
|
|
431
|
+
// Check if extreme binary is enabled
|
|
432
|
+
await this.checkExtremeBinaryEnabled();
|
|
383
433
|
},
|
|
384
434
|
methods:
|
|
385
435
|
{
|
|
436
|
+
async checkExtremeBinaryEnabled()
|
|
437
|
+
{
|
|
438
|
+
if (this.settings.active_complan && this.settings.active_complan[20] && this.settings.active_complan[20].active)
|
|
439
|
+
{
|
|
440
|
+
this.is_extreme_binary_enabled = true;
|
|
441
|
+
// Set current preference if exists
|
|
442
|
+
if (this.current_slot_info && this.current_slot_info.extreme_binary_placement)
|
|
443
|
+
{
|
|
444
|
+
this.extreme_placement_preference = this.current_slot_info.extreme_binary_placement;
|
|
445
|
+
}
|
|
446
|
+
}
|
|
447
|
+
},
|
|
448
|
+
openExtremePlacementDialog()
|
|
449
|
+
{
|
|
450
|
+
if ((this.current_slot_info.personal_count || 0) < 2)
|
|
451
|
+
{
|
|
452
|
+
this.$q.notify({
|
|
453
|
+
type: 'warning',
|
|
454
|
+
message: 'You need at least 2 sponsored downlines to set placement preference.'
|
|
455
|
+
});
|
|
456
|
+
return;
|
|
457
|
+
}
|
|
458
|
+
this.is_extreme_placement_dialog_open = true;
|
|
459
|
+
},
|
|
460
|
+
async saveExtremePlacementPreference()
|
|
461
|
+
{
|
|
462
|
+
this.saving_placement = true;
|
|
463
|
+
try
|
|
464
|
+
{
|
|
465
|
+
await this.$_fbCall('setExtremeBinaryPlacement', {
|
|
466
|
+
slot_code: this.current_slot_info.slot_code,
|
|
467
|
+
placement: this.extreme_placement_preference
|
|
468
|
+
});
|
|
469
|
+
this.$q.notify({
|
|
470
|
+
type: 'positive',
|
|
471
|
+
message: `Placement preference set to ${this.extreme_placement_preference}`
|
|
472
|
+
});
|
|
473
|
+
this.is_extreme_placement_dialog_open = false;
|
|
474
|
+
}
|
|
475
|
+
catch (error)
|
|
476
|
+
{
|
|
477
|
+
this.$q.notify({
|
|
478
|
+
type: 'negative',
|
|
479
|
+
message: error.message || 'Failed to save placement preference'
|
|
480
|
+
});
|
|
481
|
+
}
|
|
482
|
+
this.saving_placement = false;
|
|
483
|
+
},
|
|
386
484
|
async getVortexReward()
|
|
387
485
|
{
|
|
388
486
|
if(this.show_personal_cycle)
|
|
@@ -90,10 +90,14 @@
|
|
|
90
90
|
{
|
|
91
91
|
this.binary_type = "binary_one";
|
|
92
92
|
}
|
|
93
|
-
else if(public_settings.hasOwnProperty('active_complan') && public_settings.active_complan[19].active && public_settings.active_complan[19].key == 'binary_three')
|
|
93
|
+
else if(public_settings.hasOwnProperty('active_complan') && public_settings.active_complan[19] && public_settings.active_complan[19].active && public_settings.active_complan[19].key == 'binary_three')
|
|
94
94
|
{
|
|
95
95
|
this.binary_type = "binary_three";
|
|
96
96
|
}
|
|
97
|
+
else if(public_settings.hasOwnProperty('active_complan') && public_settings.active_complan[20] && public_settings.active_complan[20].active)
|
|
98
|
+
{
|
|
99
|
+
this.binary_type = "binary_extreme";
|
|
100
|
+
}
|
|
97
101
|
else
|
|
98
102
|
{
|
|
99
103
|
this.binary_type = "binary_two";
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
{{0 > slot_info.wallet? "-" : ""}}{{ formatNumber(slot_info.wallet) }}
|
|
20
20
|
</div>
|
|
21
21
|
<div class="wallet">
|
|
22
|
-
{{type == 'binary_one' ? formatNumber(slot_info.points.binary_points_left) : (type == 'binary_three' ? formatNumber(slot_info.points.binary_three_points_left) :
|
|
22
|
+
{{type == 'binary_one' ? formatNumber(slot_info.points.binary_points_left) : (type == 'binary_three' ? formatNumber(slot_info.points.binary_three_points_left) : (type == 'binary_extreme' ? formatNumber(slot_info.points.extreme_binary_points_left) : formatNumber(slot_info.points.binary_two_points_left))) }} - {{ type == 'binary_one' ? formatNumber(slot_info.points.binary_points_right) : (type == 'binary_three' ? formatNumber(slot_info.points.binary_three_points_right) : (type == 'binary_extreme' ? formatNumber(slot_info.points.extreme_binary_points_right) : formatNumber(slot_info.points.binary_two_points_right))) }}
|
|
23
23
|
</div>
|
|
24
24
|
</div>
|
|
25
25
|
<div class="action"><q-btn size="10px" @click="loadDownline()" class="full-width" dense flat><q-icon :name="this.load_downline == false ? 'fa fa-caret-down' : 'fa fa-window-minimize'"></q-icon></q-btn></div>
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
{{0 > slot_info.wallet? "-" : ""}}{{ formatNumber(slot_info.wallet) }}
|
|
36
36
|
</div>
|
|
37
37
|
<div class="wallet">
|
|
38
|
-
{{type == 'binary_one' ? formatNumber(slot_info.points.binary_points_left) : (type == 'binary_three' ? formatNumber(slot_info.points.binary_three_points_left) :
|
|
38
|
+
{{type == 'binary_one' ? formatNumber(slot_info.points.binary_points_left) : (type == 'binary_three' ? formatNumber(slot_info.points.binary_three_points_left) : (type == 'binary_extreme' ? formatNumber(slot_info.points.extreme_binary_points_left) : formatNumber(slot_info.points.binary_two_points_left))) }} - {{ type == 'binary_one' ? formatNumber(slot_info.points.binary_points_right) : (type == 'binary_three' ? formatNumber(slot_info.points.binary_three_points_right) : (type == 'binary_extreme' ? formatNumber(slot_info.points.extreme_binary_points_right) : formatNumber(slot_info.points.binary_two_points_right))) }}
|
|
39
39
|
</div>
|
|
40
40
|
</div>
|
|
41
41
|
<div class="action"><q-btn size="10px" @click="loadDownline()" class="full-width" dense flat><q-icon :name="this.load_downline == false ? 'fa fa-caret-down' : 'fa fa-window-minimize'"></q-icon></q-btn></div>
|
|
@@ -30,12 +30,12 @@
|
|
|
30
30
|
{{selected_slot_info.hasOwnProperty('points') ? selected_slot_info.points.up_coin : 0}}
|
|
31
31
|
</div>
|
|
32
32
|
</div>
|
|
33
|
-
<div class="
|
|
33
|
+
<div class="gift-reward-points-holder" v-if="show_gift_reward_points">
|
|
34
34
|
<div v-if="selected_slot" class="field col-6 text-center text-bold">
|
|
35
|
-
Current
|
|
35
|
+
Current Gift Reward Points:
|
|
36
36
|
</div>
|
|
37
37
|
<div v-if="selected_slot" class="field col-6 text-center">
|
|
38
|
-
{{selected_slot_info.hasOwnProperty('points') && selected_slot_info.points.hasOwnProperty('
|
|
38
|
+
{{selected_slot_info.hasOwnProperty('points') && selected_slot_info.points.hasOwnProperty('gift_reward_points') ? selected_slot_info.points.gift_reward_points : 0}}
|
|
39
39
|
</div>
|
|
40
40
|
</div>
|
|
41
41
|
</div>
|
|
@@ -77,7 +77,7 @@ export default
|
|
|
77
77
|
selected_slot_info : {wallet:0,points:{gc:0}},
|
|
78
78
|
public_setting:null,
|
|
79
79
|
hide_up_coin:true,
|
|
80
|
-
|
|
80
|
+
show_gift_reward_points:false
|
|
81
81
|
}),
|
|
82
82
|
props: ['selected_slot', 'gc', 'auto_activate'],
|
|
83
83
|
async mounted()
|
|
@@ -89,7 +89,7 @@ export default
|
|
|
89
89
|
}
|
|
90
90
|
if(this.public_settings.hasOwnProperty('enable_auto_activate_on_purchase') && this.public_settings.enable_auto_activate_on_purchase == true)
|
|
91
91
|
{
|
|
92
|
-
this.
|
|
92
|
+
this.show_gift_reward_points = true;
|
|
93
93
|
}
|
|
94
94
|
console.log(this.public_settings.up_coin);
|
|
95
95
|
console.log(this.hide_up_coin);
|
|
@@ -99,7 +99,7 @@ export default
|
|
|
99
99
|
{
|
|
100
100
|
async receivePayment()
|
|
101
101
|
{
|
|
102
|
-
if(this.gc == true || this.field.payment_type.method_key == 'wallet' || this.field.payment_type.method_key == 'gc' || this.field.payment_type.method_key == '
|
|
102
|
+
if(this.gc == true || this.field.payment_type.method_key == 'wallet' || this.field.payment_type.method_key == 'gc' || this.field.payment_type.method_key == 'gift_reward_points')
|
|
103
103
|
{
|
|
104
104
|
if(this.field.payment_amount < 0)
|
|
105
105
|
{
|
|
@@ -113,9 +113,9 @@ export default
|
|
|
113
113
|
{
|
|
114
114
|
this.$q.dialog({ title: "Something's not quite right", message: 'Your wallet is not enough to continue this transaction' });
|
|
115
115
|
}
|
|
116
|
-
else if(this.field.payment_type.method_key == '
|
|
116
|
+
else if(this.field.payment_type.method_key == 'gift_reward_points' && (!this.selected_slot_info.points.hasOwnProperty('gift_reward_points') || this.field.payment_amount > this.selected_slot_info.points.gift_reward_points))
|
|
117
117
|
{
|
|
118
|
-
this.$q.dialog({ title: "Something's not quite right", message: 'Your
|
|
118
|
+
this.$q.dialog({ title: "Something's not quite right", message: 'Your Gift Reward Points is not enough to continue this transaction' });
|
|
119
119
|
}
|
|
120
120
|
else
|
|
121
121
|
{
|
|
@@ -150,13 +150,13 @@ export default
|
|
|
150
150
|
|
|
151
151
|
})
|
|
152
152
|
|
|
153
|
-
// Add
|
|
154
|
-
if(this.
|
|
153
|
+
// Add Gift Reward Points payment option if enabled
|
|
154
|
+
if(this.show_gift_reward_points && this.selected_slot)
|
|
155
155
|
{
|
|
156
156
|
value_holder.push({
|
|
157
|
-
method_key: "
|
|
158
|
-
method_name: "
|
|
159
|
-
payment_method_id: "
|
|
157
|
+
method_key: "gift_reward_points",
|
|
158
|
+
method_name: "Gift Reward Points",
|
|
159
|
+
payment_method_id: "gift_reward_points"
|
|
160
160
|
})
|
|
161
161
|
}
|
|
162
162
|
|
|
@@ -89,6 +89,15 @@
|
|
|
89
89
|
</template>
|
|
90
90
|
</q-table>
|
|
91
91
|
</div>
|
|
92
|
+
<div class="q-mt-sm text-right" v-else-if="binary_type == 'extreme'">
|
|
93
|
+
<q-table :pagination.sync="pagination" :filter="search" :loading="table_loading" separator="cell" bordered flat :data="!table_loading ? table_data_extreme : []" :columns="table_column_extreme" row-key="email">
|
|
94
|
+
<template v-slot:body-cell-message="cellProperties">
|
|
95
|
+
<q-td :props="cellProperties">
|
|
96
|
+
<span v-html="cellProperties.value"></span>
|
|
97
|
+
</q-td>
|
|
98
|
+
</template>
|
|
99
|
+
</q-table>
|
|
100
|
+
</div>
|
|
92
101
|
<div class="q-mt-sm text-right" v-else>
|
|
93
102
|
<q-table :pagination.sync="pagination" :filter="search" :loading="table_loading" separator="cell" bordered flat :data="!table_loading ? table_data1 : []" :columns="table_column1" row-key="email">
|
|
94
103
|
<template v-slot:body-cell-message="cellProperties">
|
|
@@ -109,6 +118,7 @@
|
|
|
109
118
|
import DB_BINARY_TWO_POINTS_HISTORY from '../models/DB_BINARY_TWO_POINTS_HISTORY';
|
|
110
119
|
import DB_REACTIVATE_SLOTS from '../models/DB_REACTIVATE_SLOTS';
|
|
111
120
|
import DB_BINARY_POINTS_HISTORY from '../models/DB_BINARY_POINTS_HISTORY';
|
|
121
|
+
import DB_EXTREME_BINARY_POINTS_HISTORY from '../models/DB_EXTREME_BINARY_POINTS_HISTORY';
|
|
112
122
|
import { formatNumber } from '../utilities/NumberUtils';
|
|
113
123
|
import {formatDate} from '../utilities/DateUtils';
|
|
114
124
|
import GlobalMixins from '../mixins/global_mixins.js';
|
|
@@ -125,6 +135,7 @@
|
|
|
125
135
|
table_data: [],
|
|
126
136
|
table_data1: [],
|
|
127
137
|
table_data2: [],
|
|
138
|
+
table_data_extreme: [],
|
|
128
139
|
test: "asda",
|
|
129
140
|
search: '',
|
|
130
141
|
settings: '',
|
|
@@ -477,7 +488,137 @@
|
|
|
477
488
|
sortable: true,
|
|
478
489
|
align : "right",
|
|
479
490
|
},
|
|
480
|
-
{
|
|
491
|
+
{
|
|
492
|
+
name : 'cause_slot',
|
|
493
|
+
label : 'Owner',
|
|
494
|
+
field : row => row.cause_info ? row.cause_info.slot_owner.full_name : '----',
|
|
495
|
+
align : 'left',
|
|
496
|
+
required: true,
|
|
497
|
+
format : val => `${val}`,
|
|
498
|
+
sortable: true,
|
|
499
|
+
align : "right",
|
|
500
|
+
}
|
|
501
|
+
],
|
|
502
|
+
table_column_extreme:
|
|
503
|
+
[
|
|
504
|
+
{
|
|
505
|
+
name : 'date_created',
|
|
506
|
+
label : 'Log Date',
|
|
507
|
+
field : row => formatDate(row.date_created, 'MM/DD/YY (hh:mm A)'),
|
|
508
|
+
align : 'left',
|
|
509
|
+
required: true,
|
|
510
|
+
format: val => `${val}`,
|
|
511
|
+
sortable: true,
|
|
512
|
+
|
|
513
|
+
},
|
|
514
|
+
{
|
|
515
|
+
name : 'left_points_before',
|
|
516
|
+
label : 'Before (Left)',
|
|
517
|
+
field : row => row.left_points_before,
|
|
518
|
+
align : 'left',
|
|
519
|
+
required: true,
|
|
520
|
+
format: val => `${val}`,
|
|
521
|
+
sortable: true,
|
|
522
|
+
},
|
|
523
|
+
{
|
|
524
|
+
name : 'right_points_before',
|
|
525
|
+
label : 'Before (Right)',
|
|
526
|
+
field : row => row.right_points_before,
|
|
527
|
+
align : 'right',
|
|
528
|
+
required: true,
|
|
529
|
+
format: val => `${val}`,
|
|
530
|
+
sortable: true,
|
|
531
|
+
},
|
|
532
|
+
{
|
|
533
|
+
name : 'left_points_add',
|
|
534
|
+
label : 'Add (Left)',
|
|
535
|
+
field : row => row.left_points_add,
|
|
536
|
+
align : 'right',
|
|
537
|
+
required: true,
|
|
538
|
+
format: val => `${val}`,
|
|
539
|
+
sortable: true,
|
|
540
|
+
},
|
|
541
|
+
{
|
|
542
|
+
name : 'Right Add',
|
|
543
|
+
label : 'Add (Right)',
|
|
544
|
+
field : row => row.right_points_add,
|
|
545
|
+
align : 'right',
|
|
546
|
+
required: true,
|
|
547
|
+
format: val => `${val}`,
|
|
548
|
+
sortable: true,
|
|
549
|
+
},
|
|
550
|
+
{
|
|
551
|
+
name : 'left_points_after',
|
|
552
|
+
label : 'After (Left)',
|
|
553
|
+
field : row => row.left_points_after,
|
|
554
|
+
align : 'right',
|
|
555
|
+
required: true,
|
|
556
|
+
format: val => `${val}`,
|
|
557
|
+
sortable: true,
|
|
558
|
+
},
|
|
559
|
+
{
|
|
560
|
+
name : 'right_points_after',
|
|
561
|
+
label : 'After (Right)',
|
|
562
|
+
field : row => row.right_points_after,
|
|
563
|
+
align : 'right',
|
|
564
|
+
required: true,
|
|
565
|
+
format: val => `${val}`,
|
|
566
|
+
sortable: true,
|
|
567
|
+
},
|
|
568
|
+
{
|
|
569
|
+
name : 'binary_income',
|
|
570
|
+
label : 'Amount',
|
|
571
|
+
field : row => row.binary_income,
|
|
572
|
+
align : 'left',
|
|
573
|
+
required: true,
|
|
574
|
+
format : val => formatNumber(val, { decimal: 2 }),
|
|
575
|
+
sortable: true,
|
|
576
|
+
align : "left",
|
|
577
|
+
|
|
578
|
+
},
|
|
579
|
+
{
|
|
580
|
+
name : 'gc_income',
|
|
581
|
+
label : 'GC',
|
|
582
|
+
field : row => row.gc_income,
|
|
583
|
+
align : 'left',
|
|
584
|
+
required: true,
|
|
585
|
+
format : val => formatNumber(val, { decimal: 2 }),
|
|
586
|
+
sortable: true,
|
|
587
|
+
align : "right",
|
|
588
|
+
|
|
589
|
+
},
|
|
590
|
+
{
|
|
591
|
+
name : 'is_flushout',
|
|
592
|
+
label : 'Flushout',
|
|
593
|
+
field : row => row.is_flushout ? "Yes" : "No",
|
|
594
|
+
align : 'left',
|
|
595
|
+
required: true,
|
|
596
|
+
format : val => `${val}`,
|
|
597
|
+
sortable: true,
|
|
598
|
+
align : "right",
|
|
599
|
+
},
|
|
600
|
+
{
|
|
601
|
+
name : 'flushout_income',
|
|
602
|
+
label : 'Flushout Income',
|
|
603
|
+
field : row => row.flushout_income,
|
|
604
|
+
align : 'left',
|
|
605
|
+
required: true,
|
|
606
|
+
format : val => formatNumber(val, { decimal: 2 }),
|
|
607
|
+
sortable: true,
|
|
608
|
+
align : "right",
|
|
609
|
+
|
|
610
|
+
},
|
|
611
|
+
{
|
|
612
|
+
name : 'cause_slot_no',
|
|
613
|
+
label : 'Slot',
|
|
614
|
+
field : row => row.cause_info ? row.cause_info.slot_code : '----',
|
|
615
|
+
align : 'left',
|
|
616
|
+
required: true,
|
|
617
|
+
format : val => `${val}`,
|
|
618
|
+
sortable: true,
|
|
619
|
+
align : "right",
|
|
620
|
+
},
|
|
621
|
+
{
|
|
481
622
|
name : 'cause_slot',
|
|
482
623
|
label : 'Owner',
|
|
483
624
|
field : row => row.cause_info ? row.cause_info.slot_owner.full_name : '----',
|
|
@@ -521,7 +662,7 @@
|
|
|
521
662
|
this.table_column1[10].headerClasses = "hidden";
|
|
522
663
|
this.table_column1[9].classes = "hidden";
|
|
523
664
|
this.table_column1[9].headerClasses = "hidden";
|
|
524
|
-
this.getTableData1();
|
|
665
|
+
this.getTableData1();
|
|
525
666
|
}
|
|
526
667
|
else if(this.binary_type == "two")
|
|
527
668
|
{
|
|
@@ -531,6 +672,14 @@
|
|
|
531
672
|
this.table_column[10].headerClasses = this.flushout_hide ? "hidden" : "";
|
|
532
673
|
this.getTableData();
|
|
533
674
|
}
|
|
675
|
+
else if(this.binary_type == "extreme")
|
|
676
|
+
{
|
|
677
|
+
this.table_column_extreme[10].classes = this.flushout_hide ? "hidden" : "";
|
|
678
|
+
this.table_column_extreme[10].headerClasses = this.flushout_hide ? "hidden" : "";
|
|
679
|
+
this.table_column_extreme[9].classes = this.flushout_hide ? "hidden" : "";
|
|
680
|
+
this.table_column_extreme[9].headerClasses = this.flushout_hide ? "hidden" : "";
|
|
681
|
+
this.getTableDataExtreme();
|
|
682
|
+
}
|
|
534
683
|
else
|
|
535
684
|
{
|
|
536
685
|
this.table_column1[10].classes = this.flushout_hide ? "hidden" : "";
|
|
@@ -538,7 +687,7 @@
|
|
|
538
687
|
this.table_column1[9].classes = this.flushout_hide ? "hidden" : "";
|
|
539
688
|
this.table_column1[9].headerClasses = this.flushout_hide ? "hidden" : "";
|
|
540
689
|
|
|
541
|
-
this.getTableData1();
|
|
690
|
+
this.getTableData1();
|
|
542
691
|
}
|
|
543
692
|
},
|
|
544
693
|
async getTableData()
|
|
@@ -583,6 +732,14 @@
|
|
|
583
732
|
|
|
584
733
|
this.table_loading = false;
|
|
585
734
|
},
|
|
735
|
+
async getTableDataExtreme()
|
|
736
|
+
{
|
|
737
|
+
await this.$bind("table_data_extreme", new DB_EXTREME_BINARY_POINTS_HISTORY().collection().where("slot_code", "==", this.slot_info.slot_code).orderBy('date_created', 'desc'));
|
|
738
|
+
this.table_data_extreme.forEach(element => {
|
|
739
|
+
element.binary_income = this.show_currency ? this.public_settings.main_currency+element.binary_income : element.binary_income;
|
|
740
|
+
});
|
|
741
|
+
this.table_loading = false;
|
|
742
|
+
},
|
|
586
743
|
},
|
|
587
744
|
created()
|
|
588
745
|
{
|
|
@@ -75,6 +75,8 @@ export default
|
|
|
75
75
|
await this.$bind('pairing_history', new DB_SLOT_LOG().collection().where('recipient_id','==',this.user_info.active_slot).where('type','==','binary').orderBy('created_date','desc'));
|
|
76
76
|
}else if(this.binary_type == 'three'){
|
|
77
77
|
await this.$bind('pairing_history', new DB_SLOT_LOG().collection().where('recipient_id','==',this.user_info.active_slot).where('type','==','binary_three').orderBy('created_date','desc'));
|
|
78
|
+
}else if(this.binary_type == 'extreme'){
|
|
79
|
+
await this.$bind('pairing_history', new DB_SLOT_LOG().collection().where('recipient_id','==',this.user_info.active_slot).where('type','==','extreme_binary').orderBy('created_date','desc'));
|
|
78
80
|
}else{
|
|
79
81
|
await this.$bind('pairing_history', new DB_SLOT_LOG().collection().where('recipient_id','==',this.user_info.active_slot).where('type','==','binary_two').orderBy('created_date','desc'));
|
|
80
82
|
}
|