geer-builder 1.2.574 → 1.2.577

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 CHANGED
@@ -2,17 +2,25 @@
2
2
  <g-card v-if="this.user_info">
3
3
  <template v-if="slot_info">
4
4
  <div class="q-pt-sm">
5
- <div class="label" v-if="is_company_ultrapro">Downline Unplaced Slot</div>
6
- <div class="label" v-else>Unplaced Slot</div>
7
- <div class="value">{{ unplaced_slot_count }}</div>
8
- <div class="label" v-if="is_company_success">Sales Matches Today</div>
9
- <div class="label" v-if="is_company_ultrapro">Cycle Pair Count</div>
10
- <div class="label" v-else>Pairs Today</div>
11
- <div class="value text-primary">{{pairs_loading == false ? pairs_today : 0}} / {{binary_settings.pairs_per_day}}</div>
12
- <div class="label">Left Points</div>
13
- <div class="value">{{$_formatNumber(binary_type_settings == 'one' ? slot_info.points.binary_points_left : slot_info.points.binary_two_points_left / (public_settings.hasOwnProperty('binary_divide')? public_settings.binary_divide : 1), { decimal: 2 })}}</div>
14
- <div class="label">Right Points</div>
15
- <div class="value">{{$_formatNumber(binary_type_settings == 'one' ? slot_info.points.binary_points_right : slot_info.points.binary_two_points_right / (public_settings.hasOwnProperty('binary_divide')? public_settings.binary_divide : 1), { decimal: 2 })}}</div>
5
+ <div class="section-holder">
6
+ <div class="label" v-if="is_company_ultrapro">Downline Unplaced Slot</div>
7
+ <div class="label" v-else>Unplaced Slot</div>
8
+ <div class="value">{{ unplaced_slot_count }}</div>
9
+ </div>
10
+ <div class="section-holder">
11
+ <div class="label" v-if="is_company_success">Sales Matches Today</div>
12
+ <div class="label" v-if="is_company_ultrapro">Cycle Pair Count</div>
13
+ <div class="label" v-else>Pairs Today</div>
14
+ <div class="value text-primary">{{pairs_loading == false ? pairs_today : 0}} / {{binary_settings.pairs_per_day}}</div>
15
+ </div>
16
+ <div class="section-holder">
17
+ <div class="label">Left Points</div>
18
+ <div class="value">{{$_formatNumber(binary_type_settings == 'one' ? slot_info.points.binary_points_left : slot_info.points.binary_two_points_left / (public_settings.hasOwnProperty('binary_divide')? public_settings.binary_divide : 1), { decimal: 2 })}}</div>
19
+ </div>
20
+ <div class="section-holder">
21
+ <div class="label">Right Points</div>
22
+ <div class="value">{{$_formatNumber(binary_type_settings == 'one' ? slot_info.points.binary_points_right : slot_info.points.binary_two_points_right / (public_settings.hasOwnProperty('binary_divide')? public_settings.binary_divide : 1), { decimal: 2 })}}</div>
23
+ </div>
16
24
  </div>
17
25
  <div class="actions" v-bind:style="getClass()">
18
26
  <div class="left" v-if="this.history == true && binary_type_settings == 'one'">
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;
@@ -1,17 +1,18 @@
1
1
  <template>
2
2
  <g-card v-if="this.user_info">
3
3
  <template v-if="current_slot_info">
4
- <div class="q-pt-md">
5
- <div class="label">Your Active Slot Code</div>
6
- <div class="value text-primary">{{ current_slot_info.slot_code }}</div>
7
- </div>
4
+ <div class="label-holder">
5
+ <div class="q-pt-md">
6
+ <div class="label">Your Active Slot Code</div>
7
+ <div class="value text-primary">{{ current_slot_info.slot_code }}</div>
8
+ </div>
8
9
 
9
- <div class="q-pt-sm">
10
- <div class="label" v-if="is_company_success">Your Direct Enrollees</div>
11
- <div class="label" v-else>Your Direct Downlines</div>
12
- <div class="value text-primary">{{ this.slot_list.length}}</div>
10
+ <div class="q-pt-sm">
11
+ <div class="label" v-if="is_company_success">Your Direct Enrollees</div>
12
+ <div class="label" v-else>Your Direct Downlines</div>
13
+ <div class="value text-primary">{{ this.slot_list.length}}</div>
14
+ </div>
13
15
  </div>
14
-
15
16
  <div class="q-pt-sm" v-if="!pv_filter">
16
17
  <div class="label" v-if="is_company_success">Monthly sales participation</div>
17
18
  <div class="label" v-if="is_company_ultrapro">Monthly PV</div>
@@ -23,7 +24,7 @@
23
24
  <div class="value text-primary" v-if="first_month_unity">{{ this.second_month_unity ? this.second_month_unity : this.first_month_unity }}</div>
24
25
  <div class="value text-primary" v-else-if="is_unity">Not Maintained</div>
25
26
  </div>
26
- <div class="q-pt-sm">
27
+ <div class="q-pt-sm" v-if="show_pv">
27
28
  <div class="label" @click="openFilter()">
28
29
  </div>
29
30
  <div class="pv-holder" v-if="show_pv">
@@ -34,6 +35,7 @@
34
35
  <div class="label">{{selected_date}}</div>
35
36
  </div>
36
37
  </div>
38
+
37
39
  <div class="buttons text-center">
38
40
  <q-btn color="primary" unelevated @click="openFilter()" style="margin:2px auto; width:75%;">
39
41
  <q-icon name="fa fa-calendar" size="14px" class="q-mr-sm" ></q-icon>
@@ -44,6 +46,10 @@
44
46
  <q-icon name="fa fa-calendar" size="14px" class="q-mr-sm" ></q-icon>
45
47
  <div>Unilevel Breakdown</div>
46
48
  </q-btn>
49
+ <q-btn color="primary" unelevated v-if="show_unilevel_breakdown" @click="is_repeat_sale_dialog_open = true" style="margin:2px auto; width:75%;">
50
+ <q-icon name="fa fa-calendar" size="14px" class="q-mr-sm" ></q-icon>
51
+ <div>Unilevel Breakdown</div>
52
+ </q-btn>
47
53
  <q-btn v-close-popup color="primary" @click="direct()" style="margin:2px auto; width:75%;">
48
54
  <q-icon name="fa fa-user" size="14px" class="q-mr-sm"></q-icon>
49
55
  <div v-if="is_company_success">Direct Enrollees List</div>
package/GSlotWallet.vue CHANGED
@@ -2,8 +2,10 @@
2
2
  <g-card v-if="this.user_info" class="g-slot-wallet">
3
3
  <template v-if="current_slot_info">
4
4
  <div class="q-pt-md grid-item">
5
- <div class="label">Your Slot Code</div>
6
- <div class="value text-primary">{{ current_slot_info.slot_code }}</div>
5
+ <div class="section-holder">
6
+ <div class="label">Your Slot Code</div>
7
+ <div class="value text-primary">{{ current_slot_info.slot_code }}</div>
8
+ </div>
7
9
  <!-- <div class="q-pt-sm" v-if="race_earned >= 1">
8
10
  <div class="label">Race to 1 Million</div>
9
11
  <div class="value">{{ main_currency }} {{ $_formatNumber(current_slot_info.total_earned, { decimal: 2 }) }}/ {{ main_currency }} {{ $_formatNumber(race_earned, { decimal: 2 }) }}</div>
@@ -20,56 +22,59 @@
20
22
  <div class="value">{{ main_currency }} {{ $_formatNumber(damayan_pool.count, { decimal: 2 }) }}</div>
21
23
  </div>
22
24
  </div>
23
- <div>
24
- <div class="" v-if="is_company_success">
25
- <div class="label" style="margin-top:10px">TOTAL CENTRAL WALLET EARNED</div>
26
- <div class="value text-primary">{{total_wallet_label}}</div>
27
- <div class="value">{{ main_currency }} {{ $_formatNumber(current_slot_info.total_earned, { decimal: 2 }) }}</div>
28
- </div>
29
- <div v-else>
30
- <div class="label" v-if="is_company_ultrapro">Accumulated Earnings</div>
31
- <div class="label" v-else>Total Earned</div>
32
- <div class="value">{{ main_currency }} {{ $_formatNumber(current_slot_info.total_earned, { decimal: 2 }) }}</div>
33
- </div>
25
+ <div class="section-holder" v-if="is_company_success">
26
+ <div class="label" style="margin-top:10px">TOTAL CENTRAL WALLET EARNED</div>
27
+ <div class="value text-primary">{{total_wallet_label}}</div>
28
+ <div class="value">{{ main_currency }} {{ $_formatNumber(current_slot_info.total_earned, { decimal: 2 }) }}</div>
29
+ </div>
30
+ <div v-else class="section-holder">
31
+ <div class="label" v-if="is_company_ultrapro">Accumulated Earnings</div>
32
+ <div class="label" v-else>Total Earned</div>
33
+ <div class="value">{{ main_currency }} {{ $_formatNumber(current_slot_info.total_earned, { decimal: 2 }) }}</div>
34
34
  </div>
35
- <div class="q-pt-sm" v-if="is_company_qdy == false">
35
+ <div class="q-pt-sm section-holder" v-if="is_company_qdy == false">
36
36
  <div class="label" v-if="is_company_ultrapro">Slot Count Limit</div>
37
37
  <div class="label" v-else>Slot Limit</div>
38
38
  <div class="value">{{user_info.hasOwnProperty('slot_owned') ? user_info.slot_owned : 0}}/{{ slot_limit }}</div>
39
39
  </div>
40
- <div v-if="current_slot_info.points.reactivation_fee || is_reactivation_fee_avail == true" class="q-pt-sm q-pb-md">
40
+ <div v-if="current_slot_info.points.reactivation_fee || is_reactivation_fee_avail == true" class="q-pt-sm q-pb-md section-holder">
41
41
  <div class="label" v-if="is_company_success">Higher Income Status</div>
42
42
  <div class="label" v-else>Reactivation Fee</div>
43
43
  <div class="value">{{$_formatNumber(current_slot_info.points.hasOwnProperty("reactivation_fee") ? current_slot_info.points.reactivation_fee : 0 , { decimal: 2 }) }}</div>
44
44
  </div>
45
45
  </div>
46
46
  <div class="wallet-grid" :style="is_company_ultrapro? 'display:block': temp_wallet ? 'grid-template-columns: 1fr 1fr 1fr' : 'grid-template-columns:1fr 1fr' && current_slot_info.points.hasOwnProperty('gc')">
47
- <div class="q-pt-sm grid-item" style="cursor:pointer;" @click="is_wallet_logs_dialog_open=true;">
47
+ <div class="section-holder">
48
48
  <div class="label" v-if="is_company_success">Central Wallet</div>
49
49
  <div class="label" v-if="is_company_ultrapro">Available Wallet Funds</div>
50
50
  <div v-else>Your Wallet</div>
51
51
  <div class="value" v-if="current_slot_info.wallet >= 0">{{ main_currency }} {{ $_formatNumber(current_slot_info.wallet, { decimal: 2 }) }}</div>
52
52
  <div class="value" v-else>Balance:<span style="color:red">{{ main_currency }} {{ $_formatNumber(current_slot_info.wallet, { decimal: 2 }) }}</span></div>
53
- <div class="label">
53
+ <div class="button-holder" style="cursor:pointer;" @click="is_wallet_logs_dialog_open=true;">
54
54
  <q-btn size="12px" class="full-width q-pa-sm text-primary" flat>
55
- <q-icon class="q-mr-sm" name="fas fa-wallet" size="16px"></q-icon>
55
+ <div class="icon-holder" v-if="!is_company_ultrapro">
56
+ <q-icon class="q-mr-sm" name="fas fa-wallet" size="16px"></q-icon>
57
+ </div>
56
58
  <div v-if="is_company_ultrapro">Wallet History</div>
57
59
  <div v-else>Wallet Logs</div>
58
60
  </q-btn>
59
61
  </div>
60
62
  </div>
61
- <q-btn size="12px" class="full-width q-pa-sm text-primary" flat v-if="show_points_history == true" @click="is_points_logs_dialog_open=true;">
62
- <q-icon class="q-mr-sm" name="fas fa-wallet" size="16px"></q-icon>
63
- <div v-if="is_company_ultrapro">Points History</div>
64
- <div>Points Logs</div>
65
- </q-btn>
66
63
 
67
- <div class="q-pt-sm grid-item" style="cursor:pointer;" v-if="temp_wallet" @click="is_temp_wallet_dialog_open = true" >
68
- <div v-if="is_company_ultrapro">Secondary Wallet</div>
64
+ <div class="setion-holder">
65
+ <q-btn size="12px" class="full-width q-pa-sm text-primary" flat v-if="show_points_history == true" @click="is_points_logs_dialog_open=true;">
66
+ <q-icon class="q-mr-sm" name="fas fa-wallet" size="16px"></q-icon>
67
+ <div v-if="is_company_ultrapro">Points History</div>
68
+ <div>Points Logs</div>
69
+ </q-btn>
70
+ </div>
71
+
72
+ <div class="section-holder" v-if="temp_wallet">
73
+ <div v-if="is_company_ultrapro">Secondary Wallet</div>
69
74
  <div v-else>Temporary Wallet</div>
70
75
 
71
76
  <div class="value">{{ main_currency }} {{ $_formatNumber(temp_wallet_value, { decimal: 2 }) }}</div>
72
- <div class="label">
77
+ <div class="button-holder" style="cursor:pointer;" @click="is_temp_wallet_dialog_open = true">
73
78
  <q-btn size="12px" class="full-width q-pa-sm text-primary" flat>
74
79
  <q-icon class="q-mr-sm" name="fas fa-coins" size="16px"></q-icon>
75
80
  <div v-if="is_company_ultrapro">Secondary Wallet History</div>
@@ -78,35 +83,44 @@
78
83
  </div>
79
84
  </div>
80
85
 
81
- <div class="q-pt-sm grid-item" style="cursor:pointer;" @click="is_gc_logs_dialog_open=true" v-if="current_slot_info.points.hasOwnProperty('gc')" >
86
+ <div class="section-holder" v-if="current_slot_info.points.hasOwnProperty('gc')">
82
87
  <div class="label" v-if="vortex">Vortex</div>
83
88
  <div class="label" v-else >Current GC</div>
84
89
  <div class="value">GC {{ $_formatNumber(current_slot_info.points.gc ? current_slot_info.points.gc : 0, { decimal: 2 }) }}</div>
85
- <div class="label">
90
+ <div class="button-holder" style="cursor:pointer;" @click="is_gc_logs_dialog_open=true">
86
91
  <q-btn size="12px" class="full-width q-pa-sm text-primary" flat>
87
- <q-icon class="q-mr-sm" name="fas fa-money-check" size="16px"></q-icon>
92
+ <div class="icon-holder" v-if="!is_company_ultrapro">
93
+ <q-icon class="q-mr-sm" name="fas fa-money-check" size="16px"></q-icon>
94
+ </div>
88
95
  <div>GC History</div>
89
96
  </q-btn>
90
97
  </div>
91
98
  </div>
92
- <div class="q-pt-sm grid-item" style="cursor:pointer;" v-if="show_binary_history == true" @click="is_binary_history_dialog_open=true" >
93
- <div class="label">
99
+
100
+ <div class="section-holder" v-if="show_binary_history == true" >
101
+ <div class="button-holder" style="cursor:pointer;" @click="is_binary_history_dialog_open=true" >
94
102
  <q-btn size="12px" class="full-width q-pa-sm text-primary" flat>
95
103
  <q-icon class="q-mr-sm" name="fas fa-money-check" size="16px"></q-icon>
96
104
  <div>Binary Breakdown</div>
97
105
  </q-btn>
98
106
  </div>
99
107
  </div>
100
- <div class="q-pt-sm grid-item" style="cursor:pointer;" @click="is_up_coin_dialog_open=true" v-if="current_slot_info.points.hasOwnProperty('up_coin')" >
108
+
109
+
110
+ <div class="section-holder" v-if="current_slot_info.points.hasOwnProperty('up_coin')" >
101
111
  <div class="label">UP Coin</div>
102
112
  <div class="value">{{ $_formatNumber(current_slot_info.points.up_coin ? current_slot_info.points.up_coin : 0, { decimal: 2 }) }}</div>
103
- <div class="label">
113
+ <div class="button-holder" style="cursor:pointer;" @click="is_up_coin_dialog_open=true" >
104
114
  <q-btn size="12px" class="full-width q-pa-sm text-primary" flat>
105
- <q-icon class="q-mr-sm" name="fas fa-coins" size="16px"></q-icon>
115
+ <div class="icon-holder" v-if="!is_company_ultrapro">
116
+ <q-icon class="q-mr-sm" name="fas fa-coins" size="16px"></q-icon>
117
+ </div>
106
118
  <div>UP Coin History</div>
107
119
  </q-btn>
108
120
  </div>
109
121
  </div>
122
+
123
+
110
124
  </div>
111
125
  <div class="actions" v-if="false">
112
126
  <div class="left">
@@ -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
  {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.574",
3
+ "version": "1.2.577",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {