geer-builder 1.2.895 → 1.2.896

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.
@@ -20,7 +20,8 @@
20
20
  earn[0] == 'wallet_adjust_add' ? 'Wallet Add' :
21
21
  earn[0] == 'direct' ? 'Direct Referral' :
22
22
  earn[0] == 'indirect' ? 'Indirect Referral' :
23
- earn[0] == 'hustle_bonus' ? 'Hustle Bonus' :
23
+ earn[0] == 'hustle_bonus' ? 'Hustle Bonus' :
24
+ earn[0] == 'hustle_bonus_two' ? 'Hustle Bonus Two' :
24
25
  earn[0] == 'unilevel' ? 'Unilevel' :
25
26
  earn[0] == 'binary' ? 'Binary' :
26
27
  earn[0] == 'binary_two' ? (binary_two_label || 'Binary Two') :
package/GSlotWallet.vue CHANGED
@@ -399,6 +399,7 @@ export default
399
399
  extreme_placement_preference: 'LEFT',
400
400
  extreme_direct_requirements: 2,
401
401
  saving_placement: false,
402
+ membership_list: [],
402
403
  }),
403
404
  watch:
404
405
  {
@@ -434,13 +435,44 @@ export default
434
435
  },
435
436
  methods:
436
437
  {
438
+ _getMembershipByID(membership_id, mem_list)
439
+ {
440
+ let membership = null;
441
+ mem_list.forEach(val =>
442
+ {
443
+ if (val.membership_id === membership_id)
444
+ {
445
+ membership = val;
446
+ }
447
+ });
448
+ return membership;
449
+ },
437
450
  async checkExtremeBinaryEnabled()
438
451
  {
439
452
  if (this.settings.active_complan && this.settings.active_complan[20] && this.settings.active_complan[20].active)
440
453
  {
441
454
  this.is_extreme_binary_enabled = true;
442
- // Set direct requirements (default 2)
443
- this.extreme_direct_requirements = this.settings.active_complan[20].direct_requirements || 2;
455
+
456
+ // Fetch membership list
457
+ this.membership_list = await this.$_getData('membership_list');
458
+
459
+ // Get slot's membership using helper
460
+ let slot_membership = this._getMembershipByID(this.current_slot_info.membership.membership_id, this.membership_list);
461
+
462
+ // Set direct requirements: membership-specific > global config > default 2
463
+ if (slot_membership && slot_membership.hasOwnProperty('extreme_binary_direct_requirements'))
464
+ {
465
+ this.extreme_direct_requirements = slot_membership.extreme_binary_direct_requirements;
466
+ }
467
+ else if (this.settings.active_complan[20].direct_requirements)
468
+ {
469
+ this.extreme_direct_requirements = this.settings.active_complan[20].direct_requirements;
470
+ }
471
+ else
472
+ {
473
+ this.extreme_direct_requirements = 2;
474
+ }
475
+
444
476
  // Set current preference if exists
445
477
  if (this.current_slot_info && this.current_slot_info.extreme_binary_placement)
446
478
  {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.895",
3
+ "version": "1.2.896",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {