geer-builder 1.2.767 → 1.2.768

package/GSlotBreakdownWidget.vue

@@ -61,7 +61,7 @@
                     <div class="label">
                         <q-btn size="12px" class="full-width q-pa-sm text-primary" flat>
                             <q-icon class="q-mr-sm" name="fas fa-money-check" size="16px"></q-icon>
-                            <div>Binary Breakdown</div>
+                            <div>{{is_teslab ? 'Sales Force Breakdown' : 'Binary Breakdown'}}</div>
                         </q-btn>
                     </div>
                 </div>

package/GSlotWallet.vue

@@ -72,7 +72,7 @@
 
 
             </div>
-            <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')">
+            <div class="wallet-grid" :style="is_company_ultrapro? 'display:block': temp_wallet ? 'grid-template-columns: auto' : 'grid-template-columns:1fr 1fr' && current_slot_info.points.hasOwnProperty('gc')">
                 <div class="section-holder">
                     <div class="label" v-if="is_company_success">Central Wallet</div>
                     <div class="label" v-if="is_company_ultrapro">Available Wallet Funds</div>
@@ -140,10 +140,11 @@
                 </div>
                 
                 <div class="section-holder"  v-if="show_binary_history == true" >
+    
                     <div class="button-holder" style="cursor:pointer;" @click="is_binary_history_dialog_open=true" >
                         <q-btn size="12px" class="full-width q-pa-sm text-primary" flat>
                             <q-icon class="q-mr-sm" name="fas fa-money-check" size="16px"></q-icon>
-                            <div>Binary Breakdown</div>
+                            <div>{{is_teslab ? 'Sales Force Breakdown' : 'Binary Breakdown'}}</div>
                         </q-btn>
                     </div>
                 </div>
@@ -236,7 +237,7 @@
         </q-dialog>
         
         <q-dialog v-model="is_wallet_binary_cd_logs"> 
-            <wallet-logs-dialog  :hide_search="true" :special_binary="true" />
+            <wallet-logs-dialog :is_teslab_wallet="is_teslab" :hide_search="true" :special_binary="true" />
         </q-dialog>
 
         <q-dialog v-model="is_up_coin_dialog_open" :maximized="true"> 
@@ -244,14 +245,14 @@
         </q-dialog>
         
         <q-dialog v-model="is_points_logs_dialog_open" :maximized="true"> 
-            <points-logs-dialog/>
+            <points-logs-dialog :is_teslab_points="is_teslab" />
         </q-dialog>
 
         <q-dialog v-model="is_rc_logs_dialog_open" :maximized="true"> 
             <r-c-logs-dialog/>
         </q-dialog>
         <q-dialog v-model="is_binary_history_dialog_open" :maximized="true"> 
-            <binary-history :binary_type="binary_type" :flushout_hide="true" :slot_info="current_slot_info"></binary-history>
+            <binary-history :is_teslab_binary="is_teslab" :binary_type="binary_type" :flushout_hide="true" :slot_info="current_slot_info"></binary-history>
         </q-dialog>
     </g-card>
     <div v-else>
@@ -285,6 +286,7 @@ export default
     props:{
         binary_type: String,
         vortex: Boolean,
+        is_teslab: Boolean,
         is_company_success: Boolean,
         is_company_qdy:Boolean,
         is_company_ultrapro:Boolean,

package/components/GSlotWallet/WalletLogsDialog.vue

@@ -70,7 +70,7 @@
                     <!-- TABLE -->
                     <div class="col-12 text-right q-mb-md">
                         <div class="q-mt-sm text-right">
-                            <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">
+                            <q-table :pagination.sync="pagination" :filter="search" :loading="table_loading" separator="cell" bordered flat :data="!table_loading ? table_data : []" :columns="is_teslab_wallet ? table_column_teslab : table_column" row-key="email">
                                 <template v-slot:body-cell-message="cellProperties">
                                     <q-td :props="cellProperties">
                                         <span v-html="cellProperties.value"></span>
@@ -95,7 +95,7 @@ export default
 {
     filters: { },
     components: {  },
-    props:['hide_search', 'mbot', 'special_binary'],
+    props:['hide_search', 'mbot', 'special_binary','is_teslab_wallet'],
     data:() =>(
     {
         is_wallet_convert_open:false,
@@ -149,6 +149,48 @@ export default
                 
             },
         ],
+        table_column_teslab:
+        [
+            { 
+                name    : 'created_date',
+                label   : 'Log Date',
+                field   : row => formatDate(row.created_date, 'MM/DD/YY (hh:mm A)'),
+                align   : 'left',
+                required: true,
+                format: val => `${val}`,
+                sortable: true,
+                
+            },
+            { 
+                name    : 'type',
+                label   : 'Type',
+                field   : row => row.type.toUpperCase(),
+                align   : 'left',
+                required: true,
+                format: val => `${val == "COMPANY_TOKEN_INCOME" ? "RESELLERS TOKEN INCOME" : (val == "COMPANY_TOKEN_TWO_INCOME" ?  "INTRODUCERS SALES BONUS" : (val == 'VORTEX' ? 'CASH REWARD' : val) )  }`,
+                sortable: true,
+            },
+            { 
+                name    : 'message',
+                label   : 'Message',
+                field   : row => row.message ? row.message : row.temp_wallet_message,
+                align   : 'left',
+                required: true,
+                format: val => `${val}`,
+                sortable: true,
+            },
+            { 
+                name    : 'amount',
+                label   : 'Amount',
+                field   : row => row.amount,
+                align   : 'left',
+                required: true,
+                format  : val =>  (val < 0 ? "-" : "")+formatNumber(val, { decimal: 2 }),
+                sortable: true,
+                align   : "right",
+                
+            },
+        ],
         temp_wallet_table_column:
         [
             { 

package/components/Points/PointsLogs.vue

@@ -54,7 +54,7 @@
                 <!-- TABLE -->
                 <div class="col-12 text-right q-mb-md">
                     <div class="q-mt-sm text-right">
-                        <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">
+                        <q-table :pagination.sync="pagination" :filter="search" :loading="table_loading" separator="cell" bordered flat :data="!table_loading ? table_data : []" :columns="is_teslab_points ? table_column_teslab : table_column" row-key="email">
                             <template v-slot:body-cell-message="cellProperties">
                                 <q-td :props="cellProperties">
                                     <span v-html="cellProperties.value"></span>
@@ -126,6 +126,48 @@ import {formatDate}from '../../utilities/DateUtils';
 
                 },
             ],
+            table_column_teslab:
+            [
+                {
+                    name    : 'created_date',
+                    label   : 'Log Date',
+                    field   : row => formatDate(row.created_date, 'MM/DD/YY (hh:mm A)'),
+                    align   : 'left',
+                    required: true,
+                    format: val => `${val}`,
+                    sortable: true,
+
+                },
+                {
+                    name    : 'type',
+                    label   : 'Type',
+                    field   : row => row.type.toUpperCase().replace("_", " "),
+                    align   : 'left',
+                    required: true,
+                    format: val => `${val == 'BINARY THREE_POINTS_RIGHT' ? 'SALES FORCE RIGHT' : (val == 'BINARY THREE_POINTS_LEFT' ? 'SALES FORCE LEFT' : (val == 'VORTEX TOKEN' ? 'CASH REWARD TOKEN' : val)) }`,
+                    sortable: true,
+                },
+                {
+                    name    : 'message',
+                    label   : 'Message',
+                    field   : row => row.message,
+                    align   : 'left',
+                    required: true,
+                    format: val => `${val}`,
+                    sortable: true,
+                },
+                {
+                    name    : 'amount',
+                    label   : 'Amount',
+                    field   : row => row.amount,
+                    align   : 'left',
+                    required: true,
+                    format  : val => (val < 0 ? "-" : "")+formatNumber(val, { decimal: 2 }),
+                    sortable: true,
+                    align   : "right",
+
+                },
+            ],
             filter_date: 
             {
                 from: null,
@@ -145,7 +187,7 @@ import {formatDate}from '../../utilities/DateUtils';
         },
         props:
         {
-
+            is_teslab_points: Boolean
         },
         mounted()
         {
@@ -171,7 +213,19 @@ import {formatDate}from '../../utilities/DateUtils';
                     table_data = table_data.where('created_date', '<', date_to);
                 }
                 
+                
                 await this.$bind("table_data", table_data.orderBy('created_date', 'desc'));
+
+                if(this.is_teslab_points === true)
+                {
+                    this.table_data.filter(td => td.type != "gpv_token");
+
+                    this.table_data = this.table_data.filter(function( obj ) 
+                    {
+                        return obj.type !== 'stairstep_group_pv';
+                    });
+                }
+
                 this.table_loading = false;
             },
         },

package/dialogs/BinaryHistory.vue

@@ -3,6 +3,7 @@
         <q-bar class='bg-primary text-white q-pa-lg'>
            <q-icon class='q-mr-sm' name='fa fa-infinity'></q-icon>
            <b v-if="is_company_success">Sales Match History</b>
+           <b v-else-if="is_teslab_binary">Sales Force Breakdown</b>
            <b v-else>Binary History</b>
            <q-space />
            <q-btn dense flat icon='close' v-close-popup><q-tooltip content-class='bg-white text-primary'>Close</q-tooltip></q-btn>
@@ -79,7 +80,7 @@
                             </template>
                         </q-table>
                     </div>
-                    <div class="q-mt-sm text-right" v-if="binary_type == 'three'">
+                    <div class="q-mt-sm text-right" v-else-if="binary_type == 'three'">
                         <q-table :pagination.sync="pagination" :filter="search" :loading="table_loading" separator="cell" bordered flat :data="!table_loading ? table_data2 : []" :columns="table_column2" row-key="email">
                             <template v-slot:body-cell-message="cellProperties">
                                 <q-td :props="cellProperties">
@@ -495,7 +496,8 @@
             binary_type : String,
             flushout_hide : Boolean,
             slot_info : Object,
-            is_company_success:Boolean
+            is_company_success:Boolean,
+            is_teslab_binary:Boolean
         },
         async mounted()
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geer-builder",
-  "version": "1.2.767",
+  "version": "1.2.768",
   "description": "",
   "main": "index.js",
   "scripts": {