geer-builder 1.2.633 → 1.2.635

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.
@@ -4,7 +4,7 @@
4
4
  <template v-if="this.earning_breakdown.hasOwnProperty('temporary_wallet')">
5
5
  <q-bar class="bg-primary text-white q-pa-lg">
6
6
  <q-icon class="q-mr-sm" name="fa fa-splotch"></q-icon>
7
- <b>Temporay Wallet Conversion</b>
7
+ <b>Temporary Wallet Conversion</b>
8
8
  <q-space />
9
9
 
10
10
  <q-btn dense flat icon="close" v-close-popup>
@@ -20,6 +20,7 @@
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
24
  earn[0] == 'unilevel' ? 'Unilevel' :
24
25
  earn[0] == 'binary' ? 'Binary' :
25
26
  earn[0] == 'binary_two' ? 'Binary Two' :
package/GSlotWallet.vue CHANGED
@@ -126,8 +126,16 @@
126
126
  </q-btn>
127
127
  </div>
128
128
  </div>
129
-
130
-
129
+ </div>
130
+ <div class="setion-holder rc-holder" v-if="show_rc_history">
131
+ <div class="button-holder">
132
+ <q-btn size="12px" class="full-width q-pa-sm text-primary" flat @click="is_rc_logs_dialog_open=true;">
133
+ <div class="icon-holder">
134
+ <q-icon class="q-mr-sm" name="fas fa-wallet" size="16px"></q-icon>
135
+ </div>
136
+ <div>RC Logs</div>
137
+ </q-btn>
138
+ </div>
131
139
  </div>
132
140
  <div class="actions" v-if="false">
133
141
  <div class="left">
@@ -195,6 +203,9 @@
195
203
  <q-dialog v-model="is_points_logs_dialog_open" :maximized="true">
196
204
  <points-logs-dialog/>
197
205
  </q-dialog>
206
+ <q-dialog v-model="is_rc_logs_dialog_open" :maximized="true">
207
+ <r-c-logs-dialog/>
208
+ </q-dialog>
198
209
  <q-dialog v-model="is_binary_history_dialog_open" :maximized="true">
199
210
  <binary-history :binary_type="binary_type" :flushout_hide="true" :slot_info="current_slot_info"></binary-history>
200
211
  </q-dialog>
@@ -212,6 +223,7 @@ import TempWalletDialog from './dialogs/TempWalletDialog';
212
223
  import GcLogsDialog from './components/GSlotWallet/GcLogsDialog';
213
224
  import UpCoinDialog from './components/GSlotWallet/UpCoinLogsDialog';
214
225
  import PointsLogsDialog from './components/Points/PointsLogs';
226
+ import RCLogsDialog from './components/Points/RCLogs';
215
227
  import WalletLogsDialog from './components/GSlotWallet/WalletLogsDialog';
216
228
  import BinaryHistory from './dialogs/BinaryHistory.vue';
217
229
  // import AddSlotDialog from '../../Dialogs/AddSlotDialog';
@@ -223,7 +235,7 @@ import DB_STAT from './models/DB_STAT';
223
235
 
224
236
  export default
225
237
  {
226
- components: { BinaryHistory, GCard, TempWalletDialog, GcLogsDialog,WalletLogsDialog, PointsLogsDialog, UpCoinDialog },
238
+ components: { BinaryHistory, GCard, TempWalletDialog, GcLogsDialog,WalletLogsDialog, PointsLogsDialog, UpCoinDialog, RCLogsDialog},
227
239
  mixins: [GlobalMixins],
228
240
  props:{
229
241
  binary_type: String,
@@ -233,10 +245,12 @@ export default
233
245
  is_company_ultrapro:Boolean,
234
246
  show_points_history:Boolean,
235
247
  show_binary_history:Boolean,
236
- hide_reactivation:Boolean
248
+ hide_reactivation:Boolean,
249
+ show_rc_history:Boolean,
237
250
  },
238
251
  data: () =>
239
252
  ({
253
+ is_rc_logs_dialog_open: false,
240
254
  is_binary_history_dialog_open: false,
241
255
  is_open_add_slot_dialog: false,
242
256
  is_reactivation_fee_avail: false,
@@ -394,6 +408,11 @@ export default
394
408
  </script>
395
409
  <style lang="scss">
396
410
  .g-slot-wallet{
411
+ .rc-holder
412
+ {
413
+ width: 100%;
414
+ }
415
+
397
416
  .wallet-grid{
398
417
  display: grid;
399
418
  grid-template-columns: 1fr;
@@ -2,7 +2,7 @@
2
2
  <q-card class="wallet-logs-dialog">
3
3
  <q-bar class="bg-primary text-white q-pa-lg">
4
4
  <q-icon class="q-mr-sm" name="fa fa-splotch"></q-icon>
5
- <b>Wallet Logs</b>
5
+ <b>Points Logs</b>
6
6
  <q-space />
7
7
  <q-btn dense flat icon="close" v-close-popup>
8
8
  <q-tooltip content-class="bg-white text-primary">Close</q-tooltip>
@@ -0,0 +1,189 @@
1
+ <template>
2
+ <q-card class="wallet-logs-dialog">
3
+ <q-bar class="bg-primary text-white q-pa-lg">
4
+ <q-icon class="q-mr-sm" name="fa fa-splotch"></q-icon>
5
+ <b>Reseller Commission Logs</b>
6
+ <q-space />
7
+ <q-btn dense flat icon="close" v-close-popup>
8
+ <q-tooltip content-class="bg-white text-primary">Close</q-tooltip>
9
+ </q-btn>
10
+ </q-bar>
11
+ <div class="table-holder">
12
+ <div class="row">
13
+ <!-- FILTER FROM -->
14
+ <div class="col-3 q-mb-sm">
15
+ <div class="q-mt-sm text-left">
16
+ <div class="q-mt-sm q-mr-md">
17
+ <q-input v-model="filter_date.from" mask="date" outlined label="Filter From" stack-label>
18
+ <template v-slot:append>
19
+ <q-icon name="event" class="cursor-pointer">
20
+ <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
21
+ <q-date v-model="filter_date.from" @input="() => $refs.qDateProxy.hide()" />
22
+ </q-popup-proxy>
23
+ </q-icon>
24
+ </template>
25
+ </q-input>
26
+ </div>
27
+ </div>
28
+ </div>
29
+
30
+ <!-- FILTER TO -->
31
+ <div class="col-3">
32
+ <div class="q-mt-sm text-left">
33
+ <div class="q-mt-sm">
34
+ <q-input v-model="filter_date.to" mask="date" outlined label="Filter To" stack-label>
35
+ <template v-slot:append>
36
+ <q-icon name="event" class="cursor-pointer">
37
+ <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
38
+ <q-date v-model="filter_date.to" @input="() => $refs.qDateProxy.hide()" />
39
+ </q-popup-proxy>
40
+ </q-icon>
41
+ </template>
42
+ </q-input>
43
+ </div>
44
+ </div>
45
+ </div>
46
+ <div class="col-3"></div>
47
+ <div class="col-3 q-mt-sm text-right" >
48
+ <q-input v-model="search" outlined label="Search" stack-label>
49
+ <template v-slot:append>
50
+ <q-icon size="14px" name="fa fa-search" class="cursor-pointer" />
51
+ </template>
52
+ </q-input>
53
+ </div>
54
+ <!-- TABLE -->
55
+ <div class="col-12 text-right q-mb-md">
56
+ <div class="q-mt-sm text-right">
57
+ <q-table :pagination.sync="pagination" :filter="search" :loading="table_loading" separator="cell" bordered flat :data="!table_loading ? table_data : []" :columns="table_column" row-key="email">
58
+ <template v-slot:body-cell-message="cellProperties">
59
+ <q-td :props="cellProperties">
60
+ <span v-html="cellProperties.value"></span>
61
+ </q-td>
62
+ </template>
63
+ </q-table>
64
+ </div>
65
+ </div>
66
+ </div>
67
+ </div>
68
+ </q-card>
69
+
70
+ </template>
71
+
72
+ <script>
73
+ import DB_RESELLER_LOG from '../../models/DB_RESELLER_LOGS';
74
+ import { formatNumber } from '../../utilities/NumberUtils';
75
+ import {formatDate}from '../../utilities/DateUtils';
76
+
77
+ export default
78
+ {
79
+ components:{
80
+ },
81
+ data: () =>
82
+ ({
83
+ pagination: { rowsPerPage: 8 },
84
+ table_loading: true,
85
+ table_data: [],
86
+ search: '',
87
+ table_column:
88
+ [
89
+ {
90
+ name : 'Name',
91
+ label : 'Name',
92
+ field : row => row.name,
93
+ align : 'left',
94
+ required: true,
95
+ format: val => `${val}`,
96
+ sortable: true,
97
+ },
98
+ {
99
+ name : 'created_date',
100
+ label : 'Log Date',
101
+ field : row => formatDate(row.created_date, 'MM/DD/YY (hh:mm A)'),
102
+ align : 'left',
103
+ required: true,
104
+ format: val => `${val}`,
105
+ sortable: true,
106
+
107
+ },
108
+ {
109
+ name : 'Status',
110
+ label : 'Status',
111
+ field : row => row.status,
112
+ align : 'left',
113
+ required: true,
114
+ format: val => `${val}`,
115
+ sortable: true,
116
+ },
117
+ {
118
+ name : 'Order ID',
119
+ label : 'Order ID',
120
+ field : row => row.order_id,
121
+ align : 'left',
122
+ required: true,
123
+ format: val => `${val}`,
124
+ sortable: true,
125
+ },
126
+ {
127
+ name : 'amount',
128
+ label : 'Amount',
129
+ field : row => row.amount,
130
+ align : 'left',
131
+ required: true,
132
+ format : val => formatNumber(val, { decimal: 2 }),
133
+ sortable: true,
134
+ align : "right",
135
+
136
+ },
137
+ ],
138
+ filter_date:
139
+ {
140
+ from: null,
141
+ to: null
142
+ }
143
+ }),
144
+ watch:
145
+ {
146
+ filter_date:
147
+ {
148
+ deep: true,
149
+ handler()
150
+ {
151
+ this.getTableData();
152
+ }
153
+ }
154
+ },
155
+ props:
156
+ {
157
+
158
+ },
159
+ mounted()
160
+ {
161
+ this.getTableData();
162
+ },
163
+ methods:
164
+ {
165
+ async getTableData()
166
+ {
167
+ let table_data = new DB_RESELLER_LOG().collection().where("slot_code", "==", this.user_info.active_slot);
168
+ console.log(table_data);
169
+
170
+ if (this.filter_date.from)
171
+ {
172
+ let date_from = new Date(this.filter_date.from);
173
+ date_from.setSeconds(-1);
174
+ table_data = table_data.where('created_date', '>', date_from);
175
+ }
176
+
177
+ if (this.filter_date.to)
178
+ {
179
+ let date_to = new Date(this.filter_date.to);
180
+ date_to.setDate(date_to.getDate() + 1);
181
+ table_data = table_data.where('created_date', '<', date_to);
182
+ }
183
+
184
+ await this.$bind("table_data", table_data.orderBy('created_date', 'desc'));
185
+ this.table_loading = false;
186
+ },
187
+ },
188
+ }
189
+ </script>
@@ -0,0 +1,9 @@
1
+ import MODEL from './MODEL';
2
+
3
+ export default class DB_RESELLER_LOGS extends MODEL
4
+ {
5
+ constructor()
6
+ {
7
+ super('reseller_commission_logs');
8
+ }
9
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.633",
3
+ "version": "1.2.635",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {