geer-builder 1.2.522 → 1.2.526

package/GCashOut.vue

@@ -3,7 +3,7 @@
         <q-form @submit.prevent="submit()">
             <div class="cashout__content" v-if="!is_initializing">
                 <div class="cashout__content-left">
-                    <g-card :nomargin="true" class="cashout__box cashout__choice">
+                    <g-card :nomargin="true" class="cashout__box cashout__choice"  v-if="!cashout_choice_hide">
                         <div class="cashout__content-label cashout_title">How should we send the money?</div>
                         <div class="cashout__content-label cashout_body q-mt-md">
                             <q-select v-model="cashout_choice" outlined dense :options="payoutmethodlist" option-label="method_label" option-value="method_key"/>
@@ -38,7 +38,8 @@
                         <div class="cashout__content-label cashout_title">Cash out Summary</div>
                         <div class="cashout_body">
                             <div class="summary__content">
-                                <div class="summary__content-label">Cashout Method</div>
+                                <div class="summary__content-label" v-if="metamask">Currency</div>
+                                <div class="summary__content-label" v-else>Cashout Method</div>
                                 <div class="summary__content-info">{{cashout_choice.method_label}}</div>
                             </div>
                             <div class="summary__content">
@@ -61,7 +62,7 @@
                                 <div class="summary__content-label" v-else>Withholding Tax</div>
                                 <div class="summary__content-info">{{ main_currency }}  {{ $_formatNumber(xfield.witholding_tax, { decimal: 2}) }}</div>
                             </div>
-                            <div class="summary__content">
+                            <div class="summary__content" v-if="!metamask">
                                 <div class="summary__content-label">Total Charge</div>
                                 <div class="summary__content-info" v-if="merchant_cashout">{{ main_currency }} {{ $_formatNumber(total_charge, { decimal: 2}) }}</div>
                                 <div class="summary__content-info" v-else>{{ main_currency }} {{ $_formatNumber(total_charge, { decimal: 2}) }}</div>
@@ -89,7 +90,7 @@
         </q-form>
 
         <q-dialog v-model="is_dialog_open_cashout_status">
-            <cashout-status-dialog @closePopup="is_dialog_open_cashout_status = false;"></cashout-status-dialog>
+            <cashout-status-dialog :metamask='metamask' @closePopup="is_dialog_open_cashout_status = false;"></cashout-status-dialog>
         </q-dialog>     
         <q-dialog v-model="is_tin_registration_dialog_open">
             <tin-registration-dialog @closePopup="is_tin_registration_dialog_open = false;"></tin-registration-dialog>
@@ -138,6 +139,7 @@ export default {
     }),
     mixins:[GlobalMixins],
     components: { GCard , CashoutStatusDialog, TinRegistrationDialog},
+    props:['cashout_choice_hide', 'metamask'],
     async mounted()
     {
         
@@ -238,7 +240,6 @@ export default {
             if(this.merchant_cashout)
             {
                 this.payoutmethodlist = await this.$_getData('merchant_payout_methods');
-                console.log(this.merchant_cashout, 'Merhant Cashout');
             }
             else
             {
@@ -259,6 +260,7 @@ export default {
         },
         async submit()
         {
+
             if(this.tin_required && !this.user_info.hasOwnProperty('tin_number'))
             {
                 if(this.user_info.tin_number == 'N/A')
@@ -270,6 +272,10 @@ export default {
                     this.is_tin_registration_dialog_open = true;
                 }
             }
+            else if(this.cashout_amount > this.walletBal)
+            {
+                this.$q.dialog({ html: true, title: `Something's not quite right`, message: 'Your wallet is not enough to continue this transaction'});
+            }
             else
             {
                 this.cashout_choice.fields.forEach((field, i) =>
@@ -277,6 +283,7 @@ export default {
                     this.cashout_choice.fields[i]["value"] = this.inputed[i];
                 });
 
+
                 let submitdata = {};
                 if(this.merchant_cashout)
                 {
@@ -294,6 +301,7 @@ export default {
                     await this.$_fbCall('memberCashOut', submitdata);
                     // this.$router.push({ name: 'member_cashout_success' });
                     this.$q.dialog({ html: true, title: `Success`, message: 'Cashout request successfully sent.' });
+                    this.$emit('closeDialog');
                 }
                 catch (error)
                 {

package/GInvestment.vue

@@ -14,16 +14,17 @@
                 <div class="plan-value">Support 24/7</div>
             </div> -->
 
-            <q-card class="my-card bg-primary text-white" style="width:250px" v-for="(item, i) in investment_packages" :key="i" v-bind:class="{active : chosen_plan.key === item.key}">
-                <q-card-section>
+            <q-card class="my-card bg-primary text-white text-left" style="width:200px" v-for="(item, i) in investment_packages" :key="i" v-bind:class="{active : chosen_plan.key === item.key}">
+                <q-card-section @click="choosePlan(item)" style="cursor:pointer">
                     <div class="text-h6">{{item.investment_name}}</div>
-                    <div class="text-h4">${{item.investment_minimum}}</div>
+                    <div class="text-h6">{{item.investment_rate}}% DAILY</div>
+                    <div class="text-h6">{{item.investment_duration}} LOCKED IN PERIOD</div>
                 </q-card-section>
                 <q-separator dark />
-                <q-card-actions vertical align="center" class="bg-white text-primary">
+                <!-- <q-card-actions vertical align="center" class="bg-white text-primary">
                     <q-btn flat  @click="choosePlan(item)" icon="favorite_border"> Buy</q-btn>
                     <q-btn flat @click="viewPlan(item)" icon="visibility"> View</q-btn>
-                </q-card-actions>
+                </q-card-actions> -->
             </q-card>
         </div>
         <q-dialog  persistent :maximized="$q.platform.is.mobile" transition-show="slide-up" transition-hide="slide-down" v-model="is_investment_dialog_open">
@@ -43,7 +44,7 @@
 <script>
 import GlobalMixins             from './mixins/global_mixins.js';
 import AddInvestment            from './dialogs/AddInvestment';
-import InvestmentViewDialog            from './components/Investment/InvestmentViewDialog';
+import InvestmentViewDialog            from './components/Investment/InvestmentView.vue';
 export default
 {
     components: {AddInvestment, InvestmentViewDialog},

package/GInvestmentLogin.vue

@@ -0,0 +1,85 @@
+<template>
+    <div class="g-investment-login" @click="loginMetaMask">
+        <img :src="require('./assets/statics/metamask-icon.png')" class="image" alt="">
+        <div class="label">Connect to MetaMask</div>
+    </div>
+</template>
+
+<script>
+import GlobalMixins                     from './mixins/global_mixins';
+import PaymentProcessor                 from './contracts/PaymentProcessor.json';
+import USDT                             from './contracts/USDT.json';
+import settings                         from './settings';
+import { ethers, Contract }             from 'ethers';
+export default
+{
+    mixins: [GlobalMixins],
+    filters: { },
+    data:() =>(
+    {
+        metamask:
+        {
+            signer: null,
+            payment_processor: null,
+            usdt: null
+        }
+    }),
+    mounted() 
+    {
+    },
+    methods: { 
+        async loginMetaMask()
+        {
+            if (window.ethereum)
+            {
+                await window.ethereum.request({ method: 'eth_requestAccounts' });
+                const provider = new ethers.providers.Web3Provider(window.ethereum);
+                this.metamask.signer = provider.getSigner();
+
+                this.metamask.payment_processor = new Contract(
+                    settings.payment_processor,
+                    PaymentProcessor.abi,
+                    this.metamask.signer
+                );
+
+                this.metamask.usdt = new Contract(
+                    settings.usdt,
+                    USDT.abi,
+                    this.metamask.signer
+                );
+
+                console.log(await this.metamask.usdt.balanceOf(await this.metamask.signer.getAddress()).then(result => ethers.utils.formatEther(result.toString())));
+                // this.merchant_balance = await this.usdt.balanceOf(this.settings.merchant).then(result => ethers.utils.formatEther(result.toString()));
+            }
+            else 
+            {
+                this.$q.dialog(
+                {
+                    title: 'An Error Has Occured',
+                    message: 'Metamask not installed'
+                });
+            }
+        }
+    },
+    computed: { }
+}
+</script>
+<style lang="scss">
+.g-investment-login{
+    background: $primary;
+    width: 200px;
+    height: 100px;
+    border-radius: 5px;
+    margin: auto;
+    display: grid;
+    grid-template-columns: 30% 1fr;
+    place-items: center;
+    color: #fafafa;
+    font-size: 1rem;
+    padding: 20px;
+    cursor: pointer;
+    .image{
+        width: 100%;
+    }
+}
+</style>

package/GInvestmentLogs.vue

@@ -0,0 +1,301 @@
+<template>
+    <q-card class="wallet-logs-dialog">
+        <q-bar class="bg-primary text-white q-pa-lg">
+            <q-icon class="q-mr-sm" name="fa fa-splotch"></q-icon>
+            <b>Wallet Logs</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>
+        </q-bar>
+            <div class="table-holder">
+                <div class="temp-nav-holder" v-if="!hide_search">
+                    <!-- FILTER FROM -->
+                    <!-- <div class="filter-from">
+                        <div class="q-mt-sm text-left">
+                            <div class="q-mt-sm q-mr-md">
+                                <q-input mask="date" outlined label="Filter From" stack-label>
+                                    <template v-slot:append>
+                                        <q-icon name="event" class="cursor-pointer">
+                                        <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
+                                            <q-date @input="() => $refs.qDateProxy.hide()" />
+                                        </q-popup-proxy>
+                                        </q-icon>
+                                    </template>
+                                </q-input>
+                            </div>
+                        </div>
+                    </div> -->
+
+                    <!-- FILTER TO -->
+                    <!-- <div class="filter-to">
+                        <div class="q-mt-sm text-left">
+                            <div class="q-mt-sm q-mr-md">
+                                <q-input mask="date" outlined label="Filter To" stack-label>
+                                    <template v-slot:append>
+                                        <q-icon name="event" class="cursor-pointer">
+                                        <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
+                                            <q-date @input="() => $refs.qDateProxy.hide()" />
+                                        </q-popup-proxy>
+                                        </q-icon>
+                                    </template>
+                                </q-input>
+                            </div>
+                        </div>
+                    </div> -->
+
+
+                    <!-- ACTIONS -->
+                    <div class="search-button">
+                        <div class="q-mt-sm text-left" >
+                            <div class="q-mt-sm q-mr-md">
+                                <q-input v-model="search" outlined label="Search" stack-label>
+                                    <template v-slot:append>
+                                        <q-icon size="14px" name="fa fa-search" class="cursor-pointer" />
+                                    </template>
+                                </q-input>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="row">
+                    <!-- 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">
+                                <template v-slot:body-cell-message="cellProperties">
+                                    <q-td :props="cellProperties">
+                                        <span v-html="cellProperties.value"></span>
+                                    </q-td>
+                                </template>
+                            </q-table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+    </q-card>
+</template>
+
+<script>
+    import DB_SLOT_LOG            from './models/DB_SLOT_LOG';
+    import { formatNumber }         from './utilities/NumberUtils';
+    import {formatDate}             from './utilities/DateUtils';
+
+export default
+{
+    filters: { },
+    components: {  },
+    props:['hide_search', 'mbot', 'investment_unilevel','investment_direct'],
+    data:() =>(
+    {
+        is_wallet_convert_open:false,
+        is_temporary_wallet_dialog_open: false,
+        pagination: { rowsPerPage: 8 },
+        table_loading: true,
+        temp_table_data:[],
+        table_data: [],
+        temp_search:'',
+        search: '',
+        settings: '',
+        table_column:
+        [
+            { 
+                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    : '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 => formatNumber(val, { decimal: 2 }),
+                sortable: true,
+                align   : "right",
+                
+            },
+        ],
+        temp_wallet_table_column:
+        [
+            { 
+                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}`,
+                sortable: true,
+            },
+            { 
+                name    : 'message',
+                label   : 'Message',
+                field   : row => row.convert_message,
+                align   : 'left',
+                required: true,
+                format: val => `${val}`,
+                sortable: true,
+            },
+            { 
+                name    : 'amount',
+                label   : 'Amount',
+                field   : row => row.amount,
+                align   : 'left',
+                required: true,
+                format  : val => formatNumber(val, { decimal: 2 }),
+                sortable: true,
+                align   : "right",
+                
+            },
+        ],
+    }),
+    async mounted() {
+        await this.getTableData();
+        this.mbot = true;
+        if(this.mbot)
+        {
+            await this.mbotLog();
+        }
+     },
+    methods:
+        {
+            async mbotLog()
+            {
+                this.table_data.forEach(element => 
+                {
+                    if(element.type == 'direct_invest')
+                    {
+                        element.message = `Your account <b>${element.current_owner_info.email}</b> earned direct referral amounting to <b>${element.amount} USDT</b> from invest a package ${element.cause_info.owner_info.email}`;
+                    }
+                    else if(element.type == 'unilevel_invest')
+                    {
+                        element.message = `Your account <b>${element.current_owner_info.email}</b> earned unilevel amounting to <b>${element.amount} USDT</b> from ${element.cause_info.owner_info.email}`;
+                    }
+                    else if(element.type == 'receive_interest')
+                    {
+                        // element.message = `Your account <b>${element.current_owner_info.email}</b> earned direct referral amounting to <b>USD 100.00</b> from invest a package IVABASNKNVL-PH`;
+                    }
+                    else if(element.type == 'capital_investment')
+                    {
+                        // element.message = `Your account <b>${element.current_owner_info.email}</b> earned direct referral amounting to <b>USD 100.00</b> from invest a package IVABASNKNVL-PH`;
+                    }
+                    else if(element.type == 'create_investment')
+                    {
+                        // element.message = `Your account <b>${element.current_owner_info.email}</b> earned direct referral amounting to <b>USD 100.00</b> from invest a package IVABASNKNVL-PH`;
+                    }
+                });
+                console.log(this.table_data);
+            },
+            async getTableData()
+            {
+                if(this.investment_unilevel)
+                {
+                    await this.$bind("table_data", new DB_SLOT_LOG().collection().where("recipient_id", "==", this.user_info.active_slot).where("type", "==", "unilevel_invest").orderBy('created_date', 'desc'));
+                }
+                else if(this.investment_direct)
+                {
+                    console.log('direct logs');
+                    await this.$bind("table_data", new DB_SLOT_LOG().collection().where("recipient_id", "==", this.user_info.active_slot).where("type", "==", "direct_invest").orderBy('created_date', 'desc'));
+                }
+                else
+                {
+                    console.log('all wallet logs');
+                    await this.$bind("table_data", new DB_SLOT_LOG().collection().where("recipient_id", "==", this.user_info.active_slot).orderBy('created_date', 'desc'));
+                }
+                this.table_loading = false;
+            },
+        },
+    computed: { 
+
+    }
+}
+</script>
+<style lang="scss">
+.wallet-logs-dialog{
+    background:#fafafa;
+    width: 100% !important;
+    max-width:100% !important;
+    height: 100vh;
+    .table-holder{
+        padding: 20px;
+        .temp-nav-holder{
+            margin: 10px auto;
+            display: flex;
+            @media only screen and (max-device-width: 780px)
+            {
+                display: block;
+            }
+            .search-button{
+
+            }
+            .convert-button{
+                .buttons{
+                    @media only screen and (max-device-width: 780px)
+                    {
+                        text-align: left !important;
+                    }
+                }
+
+            }
+            .filter-from{
+
+            }
+            .filter-to{
+
+            }
+
+
+        }
+
+    }
+    .view-temp-wallet{
+        .view{
+            cursor: pointer;
+            color: $primary;
+        }
+    }
+}
+    .temp-dialog{
+        background: #fafafa;
+        max-width: 100% !important;
+        min-width: 100% !important;
+        min-height: 100% !important;
+        .title{
+            color: $primary;
+            font-weight: 500;
+            font-size: 20px;
+            text-align: center;
+        }
+        .search{
+            width: 30%;
+            padding: 10px 20px;
+        }
+    }
+</style>

package/GInvestmentTable.vue

@@ -0,0 +1,20 @@
+<template>
+    <q-card class="g-investment-table">
+        <investment-list-dialog></investment-list-dialog>
+    </q-card>
+</template>
+
+<script>
+import InvestmentListDialog         from './components/Investment/InvestmentListDialog';
+export default
+{
+    components: {InvestmentListDialog},
+    filters: { },
+    data:() =>(
+    {
+    }),
+    mounted() { },
+    methods: { },
+    computed: { }
+}
+</script>