geer-builder 1.2.531 → 1.2.534

package/GCashOut.vue

@@ -11,12 +11,12 @@
                     </g-card>
                     <g-card :nomargin="true" class="cashout__box cashout__amount">
                         <div class="cash__amount-balance">
-                            <div class="cashout__content-label cashout_title">Your Wallet Balance</div>
+                            <div class="cashout__content-label cashout_title">{{metamask ? 'Available Balance' : 'Your Wallet Balance?'}}</div>
                             <div class="cash__balance-value text-primary">{{ main_currency }} {{ $_formatNumber(this.walletBal, { decimal: 2 }) }}</div>
                         </div>
 
                         <div class="cash__amount-container">
-                            <div class="cashout__content-label q-mt-md">How much would you like to cashout?</div>
+                            <div class="cashout__content-label q-mt-md"> {{metamask ? 'How much would you like to withdraw?' : 'How much would you like to cashout?'}} </div>
                             <div class="cash__amount-textbox cashout_body">
                                 <q-input stack-label type="text" v-model.number="cashout_amount" dense style="width:88%" borderless class="input"/>
                                 <!-- <label >{{main_currency}}</label> -->
@@ -35,15 +35,14 @@
                 </div>
                 <div class="cashout__content-right">
                     <g-card :nomargin="true" class="cashout__box cashout__summary">
-                        <div class="cashout__content-label cashout_title">Cash out Summary</div>
+                        <div class="cashout__content-label cashout_title">{{metamask ? 'Withdrawal Summary': 'Cash out Summary'}}</div>
                         <div class="cashout_body">
-                            <div class="summary__content">
-                                <div class="summary__content-label" v-if="metamask">Currency</div>
-                                <div class="summary__content-label" v-else>Cashout Method</div>
+                            <div class="summary__content" v-if="!metamask">
+                                <div class="summary__content-label">Cashout Method</div>
                                 <div class="summary__content-info">{{cashout_choice.method_label}}</div>
                             </div>
                             <div class="summary__content">
-                                <div class="summary__content-label">Cashout Amount</div>
+                                <div class="summary__content-label">{{metamask ? 'Withdrawal Amount': 'Cashout Amount'}}</div>
                                 <div class="summary__content-info">{{ main_currency }} {{ $_formatNumber(xfield.cashout_amount, { decimal: 2}) }}</div>
                             </div>
 
@@ -79,8 +78,8 @@
                         </div>
                     </g-card>
                     <div class="button-cashout">
-                        <q-btn @click="viewStatus" color="primary" class="full-width q-pa-sm status_button" outline>View Cash Out Status</q-btn>
-                        <q-btn type="submit" :disable="dontsubmit" color="primary" class="full-width q-pa-sm q-mt-sm cashout_button">Proceed on Cash out &raquo;</q-btn>
+                        <q-btn @click="viewStatus" color="primary" class="full-width q-pa-sm status_button" outline v-if="!metamask">View Cash Out Status</q-btn>
+                        <q-btn type="submit" :disable="dontsubmit" color="primary" class="full-width q-pa-sm q-mt-sm cashout_button">{{metamask? 'CONFIRM ':'Proceed on Cash out '}}&raquo;</q-btn>
                     </div>
                 </div>
             </div>   
@@ -143,7 +142,6 @@ export default {
     props:['cashout_choice_hide', 'metamask'],
     async mounted()
     {
-        
         await this.$_getSlotInfo();
         await this.getCashoutMethod();
         await this.getpayoutmethod();

package/GCheckout.vue

@@ -56,7 +56,8 @@
                                         <div>Courier: {{merch.courier_chosen ? merch.courier_chosen : ''}}</div>
                                         <div v-if="(merch.voucher_deductions*-1) > 0">Voucher: {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} -{{$_formatNumber(merch.voucher_deductions, { decimal: 2})}}</div>
                                         <div>Shipping Fee: {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(merch.shipping_fee, { decimal: 2})}}</div>
-                                        <div class="text-bold">Order Total ({{merch.total_quantity}} Item): {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(merch.order_total, { decimal: 2})}}</div> 
+                                        <div class="g-cash-lable" v-if="show_gcash_fee">GCash Fee: PHP  {{$_formatNumber(gcash_fee, { decimal: 2})}}</div>
+                                       <div class="text-bold">Order Total ({{merch.total_quantity}} Item): {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}}  {{show_gcash_fee ? $_formatNumber(merch.order_total + gcash_fee, { decimal: 2}) : $_formatNumber(merch.order_total, { decimal: 2}) }}</div> 
                                     </div>
                                 </div> 
                             </div>
@@ -92,7 +93,17 @@
                         </div>
                         <div class="manual-pay-method" v-if="payment_method.payment_method_id == 'dragon_pay'" >
                             <div  v-for="(onlines, ind) in available_payment_channel" class="dragon-pay-list"  :key="ind">
-                                <q-radio dense v-model="dragon_pay_choice" :val="onlines" :label="onlines.shortName" />
+                            <q-item tag="label" v-ripple>
+                                    <q-item-section avatar>
+                                    <!-- <q-radio v-model="color" val="orange" color="orange" /> -->
+                                        <q-radio  v-model="dragon_pay_choice" :val="onlines" :label="onlines.shortName" />
+                                    </q-item-section>
+                                    <q-item-section>
+                                    <!-- <q-item-label>Orange</q-item-label> -->
+                                    <q-item-label caption>{{`${onlines.longName}`}}</q-item-label>
+                                    </q-item-section>
+                                </q-item>
+                                <!-- <q-radio checked-icon="task_alt" unchecked-icon="panorama_fish_eye" dense v-model="dragon_pay_choice" :val="onlines" :label="onlines.shortName" /> -->
                             </div>                
                         </div>
                     </div>
@@ -256,7 +267,8 @@
                         <div class="order-total">
                             <!-- <div>Order Total ({{product_list[i].quantity}} Item): {{main_currency}} {{order_total}}</div>  -->
                             <div class="shipping">Shipping Fee:<span> {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(merch.shipping_fee, { decimal: 2})}}</span></div> 
-                            <div class="total">Order Total ({{merch.total_quantity}} Item): <span> {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(merch.order_total, { decimal: 2})}}</span></div> 
+                            <div class="g-cash-lable" v-if="show_gcash_fee">GCash Fee: PHP  {{$_formatNumber(gcash_fee, { decimal: 2})}}</div>
+                            <div class="total">Order Total ({{merch.total_quantity}} Item): <span> {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{show_gcash_fee ?  $_formatNumber(merch.order_total + gcash_fee, { decimal: 2}) : $_formatNumber(merch.order_total, { decimal: 2}) }}</span></div> 
                         </div>
                     </div>
                 </div>
@@ -421,6 +433,9 @@ export default {
         dragon_pay_choice:"",
         check:{},
         dragon_pay_amount:[],
+        filtered_payment_channel:[],
+        gcash_fee:0,
+        show_gcash_fee:false
     }),
     async mounted()
     {
@@ -529,6 +544,17 @@ export default {
     },
     watch:
     {
+        async dragon_pay_choice()
+        {
+            console.log(this.dragon_pay_choice.shortName);
+            this.gcash_fee = 0;
+            this.show_gcash_fee = false;
+            if(this.dragon_pay_choice.shortName == 'GCash' || this.dragon_pay_choice.shortName == 'GCash App')
+            {
+                this.show_gcash_fee = true;
+                this.addGcashFee(this.groupedProducts);
+            }
+        },
         async payment_method()
         {
             this.setDefaultCourier();
@@ -556,15 +582,44 @@ export default {
     },
     methods:
     {
+        async addGcashFee(product_list)
+        {
+            this.gcash_fee = 0;
+            if(this.dragon_pay_choice.shortName == 'GCash App')
+            {
+                this.gcash_fee =  20;
+            } 
+            else if(this.dragon_pay_choice.shortName == 'GCash')
+            {
+                for (let i = 0; i < product_list.length; i++) 
+                {
+                    this.gcash_fee =  (product_list[i].order_sub_total / 100 * 2) + 10;
+                }
+            }
+        },
         async getPaymentChannel()
         {
             if(this.public_settings.hasOwnProperty('dragonpay_details') && this.public_settings.dragonpay_details.active)
             {
-                console.log('dragonpay:', this.public_settings.dragonpay_details.active );
+                this.filtered_payment_channel = this.public_settings.dragonpay_details.hasOwnProperty('active_payment') ? this.public_settings.dragonpay_details.active_payment : [];
                 try 
                 {
                     let ret = await this.$_fbCall('memberGetPaymentChannel', {amount:this.dragon_pay_amount});
-                    this.available_payment_channel = ret.data;
+                    let return_payment = ret.data;
+                    console.log(return_payment, 'All Dragonpay channel');
+                    let x = 0;
+                    let filtered_payment = [];
+                    for (const element of return_payment) 
+                    {
+                        if(this.filtered_payment_channel.includes(element.shortName))
+                        {
+                            filtered_payment.push(element);
+                        }
+                        x++;
+                    }
+                    this.available_payment_channel = filtered_payment;
+
+
                 }
                 catch (error) 
                 {
@@ -1536,6 +1591,15 @@ export default {
         },
         async proceedCheckout()
         {
+            if(this.show_gcash_fee && this.gcash_fee > 0)
+            {
+                this.checkout_info.grand_total + this.gcash_fee;
+                this.checkout_info.gcash_fee = this.gcash_fee;
+            }
+            else 
+            {
+                this.checkout_info.gcash_fee = 0;
+            }
             this.checkout_info.payment_method = this.payment_method;
             try
             {

package/GInvestment.vue

@@ -1,5 +1,5 @@
 <template>
-    <div v-if="this.user_info" class="investment-page">
+    <div class="investment-page">
         <div class="plan-grid">
             <!-- <div class="plan-item"  v-for="(item, i) in investment_packages" :key="i" @click="choosePlan(item)" v-bind:class="{active : chosen_plan.key === item.key}">
                 <div class="plan-title">
@@ -32,12 +32,9 @@
         </q-dialog>
 
         <q-dialog :maximized="$q.platform.is.mobile" transition-show="slide-up" transition-hide="slide-down" v-model="view_plan_dialog">
-            <investment-view-dialog :investment_details="plan"></investment-view-dialog>
+            <investment-view-dialog :investment_details="plan" @closeDialog="view_plan_dialog = false"></investment-view-dialog>
         </q-dialog>
     </div>
-    <div v-else>
-        <span>You need to login to view this component.</span>
-    </div>
 </template>
 
 <script>
@@ -48,6 +45,7 @@ export default
 {
     components: {AddInvestment, InvestmentViewDialog},
     mixins: [GlobalMixins],
+    props: ['profit_calculator'],
     filters: { },
     data:() =>(
     {
@@ -85,8 +83,19 @@ export default
         },
         choosePlan(plan)
         {
-            this.plan = plan;
-            this.is_investment_dialog_open = true;
+            if(this.profit_calculator)
+            {
+                this.plan = plan;
+                this.view_plan_dialog = true;
+            }
+            else
+            {
+                if(this.user_info)
+                {
+                    this.plan = plan;
+                    this.is_investment_dialog_open = true;
+                }
+            }
         },
     },
     computed: { }

package/GInvestmentLeads.vue

@@ -0,0 +1,103 @@
+<template>
+    <div class="leads-table">
+        <q-card class="full-width full-height form member-lead-list">
+            <div v-if="lead_list.length > 0" class="list">
+                <q-table :loading="loading_table" :pagination.sync="pagination" flat bordered :data="!loading_table ? lead_list : []" :columns="table_column">
+                </q-table>
+            </div>
+            <div v-else class="list">
+                <div class="icon" style="text-align: center">
+                    <q-icon class="q-mr-sm" name="fas fa-exclamation-circle" style="font-size: 100px; color: #3887d1;"></q-icon>
+                </div>
+                <div class="no-leads" style="height: 50%; width: 100% !important; text-align: center; font-size: 40px; color: gray">
+                        No Affiliate Yet
+                </div>
+            </div>
+        </q-card>
+        <q-dialog v-model="is_slot_create_dialog_open">
+            <g-code-vault @closePopup="is_slot_create_dialog_open = false;" :lead_info="lead_info"></g-code-vault>
+        </q-dialog> 
+        <q-dialog v-model="is_profile_dialog_open">
+            <g-profile @closePopup="is_profile_dialog_open = false" :mode="'dialog'" :create_slot="true" :prop_user_info="lead_info.lead"></g-profile>
+        </q-dialog>
+    </div>
+</template>
+
+<script>
+import DB_USER from './models/DB_USER';
+import GlobalMixins                 from './mixins/global_mixins';
+import {formatDate}                 from './utilities/DateUtils';
+import GCodeVault                from './GCodeVault';
+import GProfile                  from './components/GProfile';
+export default
+{
+    name: "GLeadsComponent",
+    components: { GCodeVault, GProfile},
+    mixins: [GlobalMixins],
+    filters: { },
+    data:() =>(
+    {
+        pagination: { rowsPerPage: 10 },
+        loading_table:false,
+        is_profile_dialog_open: false,
+        db_user: new DB_USER(),
+        lead_list: [],
+        is_dialog_open : false,
+        is_slot_create_dialog_open:false,
+        lead_info:{},
+        table_column:
+        [
+            {
+                name    : 'email',
+                label   : 'Email',
+                field   : row => row.email,
+                align   : 'left',
+                required: true,
+                sortable: true,
+            },
+            {
+                name    : 'full_name',
+                label   : 'Name',
+                field   : row => row.full_name,
+                align   : 'left',
+                required: true,
+                sortable: true,
+            },
+            {
+                name    : 'created_date',
+                label   : 'Date Joined',
+                field   : row => row.created_date,
+                format  : val => formatDate(val, 'MM/DD/YY (hh:mm A)'),
+                align   : 'left',
+                required: true,
+                sortable: true,
+            },
+            {
+                name    : 'contact_number',
+                label   : 'Contact Number',
+                field   : row => row.contact_number,
+                align   : 'center',
+                required: true,
+                sortable: true,
+            }
+        ],
+    }),
+    async mounted() {
+        await this.$_getSlotInfo();
+        await this.$bind('lead_list', this.db_user.collection().where('sponsor', '==', this.current_slot_info.slot_code));
+        console.log(this.lead_list);
+   },
+    methods: {
+        createSlot(lead)
+        {
+            this.lead_info.lead = lead;
+            this.is_profile_dialog_open = true;
+        },
+        open_dialog()
+        {
+            this.is_dialog_open=true;
+        }
+    },
+    computed: { }
+}
+</script>

package/GInvestmentLogin.vue

@@ -9,7 +9,6 @@
 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
 {
@@ -24,10 +23,11 @@ export default
             usdt: null
         },
         hide_button:false,
+        public_settings:{}
     }),
-    mounted() 
+    async mounted() 
     {
-        console.log(sessionStorage.metamask_login);
+        this.public_settings = await this.$_getData('public_settings');
         if(sessionStorage.metamask_login)
         {
             this.hide_button = true;
@@ -43,13 +43,13 @@ export default
                 this.metamask.signer = provider.getSigner();
 
                 this.metamask.payment_processor = new Contract(
-                    settings.payment_processor,
+                    this.public_settings.payment_processor,
                     PaymentProcessor.abi,
                     this.metamask.signer
                 );
 
                 this.metamask.usdt = new Contract(
-                    settings.usdt,
+                    this.public_settings.usdt,
                     USDT.abi,
                     this.metamask.signer
                 );
@@ -66,7 +66,7 @@ export default
                     console.log(error);
                 }
                 // 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()));
+                // this.merchant_balance = await this.usdt.balanceOf(this.public_settings.merchant).then(result => ethers.utils.formatEther(result.toString()));
             }
             else 
             {

package/GInvestmentLogs.vue

@@ -178,7 +178,6 @@ export default
     }),
     async mounted() {
         await this.getTableData();
-        this.mbot = true;
         if(this.mbot)
         {
             await this.mbotLog();
@@ -188,29 +187,29 @@ export default
         {
             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`;
-                    }
-                });
+                // 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()

package/GLogin.vue

@@ -2,7 +2,7 @@
     <div class="g-login">
         <q-form @submit="submitLogin()">
             <div class="g-login__fields">
-                <div class="label">Emails Address / Slot Code</div>
+                <div class="label"> {{mbot ? 'Emails Address':'Emails Address / Slot Code'}}</div>
                 <div class="input">
                     <q-input :disable="is_submitting" v-model="form_data.email" dense placeholder="Enter Email" class="input input-email" outlined stack-label/>
                 </div>
@@ -83,6 +83,7 @@ export default
         terms: String,
         val: Boolean,
         hide_registration: Boolean,
+        mbot:Boolean
 
     },
     components: { GRegistration,GForgotPassword },

package/GRegistration.vue

@@ -62,7 +62,7 @@
 
             <!-- create account -->
             <div class="g-registration__fields q-mt-md">
-                <q-btn :loading="is_submitting" unelevated class="full-width" color="primary" type="submit">Sign Up</q-btn>
+                <q-btn :loading="is_submitting" unelevated class="full-width" color="primary" type="submit"> {{mbot ? 'Register' : 'Sign Up'}}</q-btn>
             </div>
             <div v-if="!mbot" class="term"><q-checkbox v-model="val" /> <span @click="is_term_and_condition_open =true" class="term_span"> By clicking sign-up, I have read and I agree to the Company Policies, Terms and Conditions, Rules and Regulation, Code of Conduct And Ethical Standards and the Privacy Policy</span></div>
 <!-- 
@@ -211,7 +211,7 @@ export default
                         
                         this.$q.dialog(
                         {
-                            title: 'An Error Has Occured',
+                            title: this.mbot ? 'Error': 'An Error Has Occured' ,
                             message: error.message
                         });
                     }

package/components/Checkout/Printable.vue

@@ -83,6 +83,10 @@
                         <div class="col-7 label">{{settings.custom_ecommerce_fee.label}}</div>
                         <div class="col-5 value">{{ $_formatNumber(sale_info[settings.custom_ecommerce_fee.id], { decimal: 2}) }}<template v-if="settings.hasOwnProperty('custom_ecommerce_fee') && settings.custom_ecommerce_fee.percentage">(<b>{{settings.custom_ecommerce_fee.value}}%</b>)</template></div>
                     </div>
+                    <div class="row bordered" v-if="sale_info.gcash_fee > 0">
+                        <div class="col-7 label">GCash Fee</div>
+                        <div class="col-5 value text-right">{{ $_formatNumber(sale_info.gcash_fee, { decimal: 2}) }}</div>
+                    </div>
                     <div class="row">
                         <div class="col-7 label">Grand Total</div>
                         <div class="col-5 value text-primary text-bold">{{payment_method.payment_method_id =='gc_points' ? 'GC' :  settings.main_currency }} {{ $_formatNumber(grand_total, { decimal: 2}) }}</div>
@@ -172,6 +176,10 @@
                         <div class="col-7 label">Sub Total</div>
                         <div class="col-5 value text-right">{{ $_formatNumber(sub_total, { decimal: 2}) }}</div>
                     </div>
+                    <div class="row bordered">
+                        <div class="col-7 label">GCash Fee</div>
+                        <div class="col-5 value text-right">{{ $_formatNumber(sale_info.gcash_fee, { decimal: 2}) }}</div>
+                    </div>
                     <div class="row bordered">
                         <div class="col-7 label">Shipping Total</div>
                         <div class="col-5 value text-right">{{ $_formatNumber(shipping_total, { decimal: 2}) }}</div>

package/components/Checkout/ProcessCheckoutConfirmDialog.vue

@@ -31,7 +31,7 @@
                     <input type="hidden" name="ResponseURL" :value="ipay88_response_url">
                     <input type="hidden" name="BackendURL" :value="ipay88_backend_url">
                 </form>
-                <form v-if="sale.payment_method.payment_method_id == 'dragon_pay'" method="get" id="dragon_pay_form" name="ePayment" :action="public_settings.dragonpay_details.test_payment_request_url">
+                <form v-if="sale.payment_method.payment_method_id == 'dragon_pay'" method="get" id="dragon_pay_form" name="ePayment" :action="public_settings.dragonpay_details.payment_request_url">
                     <input type="hidden" name="merchantid" :value="merchant_id">
                     <input type="hidden" name="txnid" :value="txnid">
                     <input type="hidden" name="amount" :value="amount">

package/components/Investment/InvestmentAddWallet.vue

@@ -51,11 +51,10 @@
 </template>
 
 <script>
-import GlobalMixins     from '../../mixins/global_mixins';
-import PaymentProcessor from '../../contracts/PaymentProcessor.json';
-import USDT             from '../../contracts/USDT.json';
-import settings             from '../../settings/settings';
-import { ethers, Contract } from 'ethers';
+import GlobalMixins                 from '../../mixins/global_mixins';
+import PaymentProcessor             from '../../contracts/PaymentProcessor.json';
+import USDT                         from '../../contracts/USDT.json';
+import { ethers, Contract }         from 'ethers';
 import {QSpinnerFacebook }          from 'quasar'
 
 
@@ -82,8 +81,8 @@ export default
             signer: null,
             payment_processor: null,
             usdt: null
-        }
-        
+        },
+        public_settings:{}
     }),
     components: {  },
     props:
@@ -92,6 +91,7 @@ export default
     },
     async mounted()
     {
+        this.public_settings = await this.$_getData('public_settings');
         await this.$_getSlotInfo();
         // if (window.ethereum)
         // {
@@ -175,27 +175,27 @@ export default
                     this.metamask.signer = provider.getSigner();
 
                     this.metamask.payment_processor = new Contract(
-                        settings.payment_processor,
+                        this.public_settings.payment_processor,
                         PaymentProcessor.abi,
                         this.metamask.signer
                     );
 
                     this.metamask.usdt = new Contract(
-                        settings.usdt,
+                        this.public_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()));
+                    // this.merchant_balance = await this.usdt.balanceOf(this.this.public_settings.merchant).then(result => ethers.utils.formatEther(result.toString()));
                 }
                 const amount = Number(this.wallet_details.amount);
                 
 
-                const tx1 = await this.metamask.usdt.approve(settings.payment_processor, amount);
+                const tx1 = await this.metamask.usdt.approve(this.public_settings.payment_processor, amount);
                 await tx1.wait();
 
-                const tx2 = await this.metamask.payment_processor.pay(settings.usdt, amount, this.wallet_details.transaction_id);
+                const tx2 = await this.metamask.payment_processor.pay(this.public_settings.usdt, amount, this.wallet_details.transaction_id);
                 await tx2.wait();
             }
             catch (e)

package/components/Investment/InvestmentBreakdownDialog.vue

@@ -1,5 +1,13 @@
 <template>
-<q-card :style="`min-width: ${ $q.platform.is.mobile ? '100%' : '400px' };`" class="form add-slot">
+<q-card :style="`min-width: ${ $q.platform.is.mobile ? '100%' : '400px' };`" class="investment-breakdown-dialog">
+    <q-bar class="bg-primary text-white q-pa-lg">
+        <q-icon class="q-mr-sm" name="trending_up"></q-icon>
+        <b>Profit Breakdown</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>
     <q-card-section class='content text-center bg-primary my-card'>
         <q-card class="my-card" v-if="table_loading">
             <!-- <q-table flat :data="investment_preview" :columns="table_column"></q-table> -->

package/components/Investment/InvestmentListDialog.vue

@@ -93,7 +93,7 @@ export default
             },
             {
                 name    : 'investment_duration',
-                label   : 'Investment Durtion (Days)',
+                label   : 'Duration (Days)',
                 field   : row => row.plan.investment_duration,
                 align   : 'center',
                 required: true,

package/components/Investment/InvestmentStatusDialog.vue

@@ -1,8 +1,8 @@
 <template>
     <q-card :style="`min-width: ${ $q.platform.is.mobile ? '100%' : '600px' };`" class="form add-slot">
         <q-bar class='bg-primary text-white q-pa-lg'>
-            <q-icon class='q-mr-sm' name='fa fa-heart'></q-icon>
-            <b>Investment Status</b>
+            <q-icon class='q-mr-sm' name='stacked_line_chart'></q-icon>
+            <b>Trade Status</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>

package/components/Investment/InvestmentView.vue

@@ -1,6 +1,6 @@
 <template>
-    <q-card :style="`min-width: ${ $q.platform.is.mobile ? '100%' : '300px' };`" class="form add-slot">
-        <q-card-section class='content text-center bg-primary my-card'>
+    <q-card :style="`min-width: ${ $q.platform.is.mobile ? '100%' : '300px' };`" class="profit-view">
+        <!-- <q-card-section class='content text-center bg-primary my-card'>
             <q-card class="my-card" v-if="investment_details">
                 <q-card-section>
                     <div class="text-h6 text-bold">{{investment_details.investment_name}}</div>
@@ -20,7 +20,7 @@
                     <q-btn @click="showSample" flat>Sample Computation</q-btn>
                 </q-card-actions>
             </q-card>
-        </q-card-section>
+        </q-card-section> -->
         <q-dialog :maximized="$q.platform.is.mobile" transition-show="slide-up" transition-hide="slide-down" v-model="is_sample_computation_open">
             <investment-breakdown-dialog :investment_details="investment_details" @closeDialog="is_sample_computation_open = false"></investment-breakdown-dialog>
         </q-dialog>
@@ -50,14 +50,15 @@ export default
     async mounted()
     {
         await this.$_getSlotInfo()
+        this.showSample();
     },
     methods:
     {
         showSample()
         {
             this.$q.dialog({
-                    title: 'Sample Computation',
-                    message: 'Please Enter Amount',
+                    title: 'Profit Calculator',
+                    message: 'Enter Amount',
                     prompt: {
                     model: this.amount,
                     type: 'number' // optional
@@ -67,7 +68,7 @@ export default
                     }).onOk(data => {
                         this.computeSample(data);
                     }).onCancel(() => {
-                        // console.log('>>>> Cancel')
+                        this.$emit('closeDialog');
                     }).onDismiss(() => {
                         // console.log('I am triggered on both OK and Cancel')
                 })

package/components/MyPurchases/tabs/ToReceiveTab.vue

@@ -90,7 +90,7 @@
                     </div>
                     <div v-if="list.status =='delivered' || list.status =='shipping'" style="background:white;text-align:right;padding:0px 20px 10px 0px;">
                         <q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
-                        <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='delivered' && list.payment_method.payment_method_id =='dragon_pay'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
+                        <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='delivered' && list.payment_method.payment_method_id =='dragon_pay' ||  list.status =='delivered' && list.payment_method.payment_method_id =='manual_pay'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
                     </div>
                 </div>
             </div>
@@ -160,7 +160,7 @@
                     </div>
                     <div v-if="list.status =='delivered' || list.status =='shipping'" style="background:white;text-align:right;padding:10px">
                         <q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
-                        <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
+                        <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='delivered' && list.payment_method.payment_method_id =='dragon_pay' ||  list.status =='delivered' && list.payment_method.payment_method_id =='manual_pay'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
                     </div>
                 </div>
             </div>  

package/components/genealogy/GenealogyBinary.vue

@@ -109,10 +109,10 @@
                             <div class="slot-title">Direct: </div>
                             <div class="slot-value">{{slot_info.personal_count}}</div>
                         </div>
-                        <div class="items">
+                        <!-- <div class="items">
                             <div class="slot-title">Maintenance: </div>
                             <div class="slot-value">{{slot_info.points.personal_pv - (slot_info.points.spent_ppv ? slot_info.points.spent_ppv : 0) - (slot_info.points.extra_spent_ppv ? slot_info.points.extra_spent_ppv : 0) }}</div>
-                        </div>
+                        </div> -->
                         <div class="items">
                             <div class="slot-title">Sponsor: </div>
                             <div class="slot-value">{{slot_info.sponsor}}</div>

package/components/genealogy/GenealogyChildren.vue

@@ -131,10 +131,10 @@
                             <div class="slot-title">Direct: </div>
                             <div class="slot-value">{{slot_info.personal_count}}</div>
                         </div>
-                        <div class="items">
+                        <!-- <div class="items">
                             <div class="slot-title">Maintenance: </div>
                             <div class="slot-value">{{slot_info.points.personal_pv - (slot_info.points.spent_ppv ? slot_info.points.spent_ppv : 0) - (slot_info.points.extra_spent_ppv ? slot_info.points.extra_spent_ppv : 0) }}</div>
-                        </div>
+                        </div> -->
                         <div class="items">
                             <div class="slot-title">Sponsor: </div>
                             <div class="slot-value">{{slot_info.sponsor}}</div>

package/dialogs/AddInvestment.vue

@@ -2,10 +2,9 @@
     <q-card :style="`min-width: ${ $q.platform.is.mobile ? '100%' : '400px' };`" class="form add-slot">
         <!-- HEADER -->
         <q-bar class="bg-primary text-white q-pa-lg">
-            <q-icon class="q-mr-sm" name="fa fa-splotch"></q-icon>
-            <b>Add Investment</b>
+            <q-icon class="q-mr-sm" name="credit_card"></q-icon>
+            <b>DEPOSIT</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>
@@ -13,11 +12,10 @@
         <div class="desktop-only">
             <q-card-section class="content">
                 <q-stepper flat v-model="step" vertical color="primary" animated>
-                    <q-step :name="1" title="Create your plan" icon="settings" :done="step > 1">
                         <q-form @submit.prevent="confirmPlan()">
                             <div class="row justify-center">
                                 <div class="q-py-md col-12 plan-amount-text text-center">
-                                    <b>Current Wallet </b> : 
+                                    <b>Available Balance</b> : 
                                     <div class="text-primary" v-if="current_slot_info">
                                         {{ $_formatNumber(current_slot_info.wallet ? current_slot_info.wallet : 0, { decimal: 2 }) }} USDT
                                     </div>
@@ -30,9 +28,8 @@
                             </div>
                             <q-btn type="submit" :loading="submit_loading" unelevated class="full-width q-mt-md" color="primary"><q-icon name="fa fa-check q-mr-sm" size="14px"></q-icon> Confirm</q-btn>
                         </q-form>
-                    </q-step>
 
-                    <q-step :name="2" title="Verify All Details" icon="assignment" :done="step > 2">
+                    <!-- <q-step :name="2" title="Verify All Details" icon="assignment" :done="step > 2">
                         <div class="add-slot__verify-details">
                             <q-table flat :data="investment_preview" :columns="table_column"></q-table>
                         </div>
@@ -48,18 +45,21 @@
                             <div class="q-pt-sm q-mr-lg q-ml-lg">Your investment has been successfully created!</div>
                         </div>
                         <q-btn @click="emitClose"  v-close-popup type="button" :loading="submit_loading" unelevated class="full-width q-mt-md" color="primary"><q-icon name="fa fa-check q-mr-sm" size="14px"></q-icon> Transaction Complete</q-btn>
-                    </q-step>
+                    </q-step> -->
                 </q-stepper>
             </q-card-section>
         </div>
+        <q-dialog :maximized="$q.platform.is.mobile" transition-show="slide-up" transition-hide="slide-down" v-model="is_investment_breakdown_open">
+            <investment-breakdown :breakdown_details="investment_info" @closeDialog="confirmDetails"></investment-breakdown>
+        </q-dialog>
     </q-card>
 </template>
 
 <script>
 import GlobalMixins     from '../mixins/global_mixins';
 import GRegistration    from './../GRegistration';
-import { formatDate }           from '../utilities/DateUtils';
-import { log } from 'console';
+import InvestmentBreakdown    from './InvestmentBreakdown.vue';
+import {QSpinnerFacebook }          from 'quasar'
 
 
 export default
@@ -67,6 +67,7 @@ export default
     mixins: [GlobalMixins],
     data: () =>
     ({
+        is_investment_breakdown_open:false,
         investment_packages:'',
         submit_loading : false,
         step : 1,
@@ -108,9 +109,12 @@ export default
                 format: val => `${val.toFixed(2)}`,
                 sortable: true,
             }
-        ]
+        ],
+        investment_info:{
+            investment_preview:[]
+        }
     }),
-    components: { GRegistration },
+    components: { GRegistration, InvestmentBreakdown },
     props:
     { 
         is_show: Boolean,
@@ -136,13 +140,17 @@ export default
             {
                 this.$q.dialog({ title: "Something's not quite right", message: "Please choose a plan." });
             }
-            else if(this.investment_amount < this.chosen_plan.minimum_investment)
+            else if(this.investment_amount < 1)
+            {
+                this.$q.dialog({ title: "Something's not quite right", message: "Please enter a valid amount" });
+            }
+            else if(this.investment_amount < this.plan.investment_minimum)
             {
                 this.$q.dialog({ title: "Something's not quite right", message: "Investment amount is below the minimum required." });
             }
             else
             {
-                this.step++;
+                // this.step++;
                 let days_left = this.plan.investment_duration
                 let ctr = 0;
                 let start_date = new Date();
@@ -163,10 +171,13 @@ export default
                     ctr++;
                 }
                 while(days_left > 0)
-            }
 
+                this.investment_info.investment_preview = this.investment_preview;
+                this.investment_info.plan = this.plan;
+                this.investment_info.amount = this.investment_amount;
+                this.is_investment_breakdown_open = true;
+            }
             this.submit_loading = false;
-            
         },
         addDaysToDate(days)
         {
@@ -174,12 +185,13 @@ export default
             res.setDate(res.getDate() + days);
             return res;
         },
-        async confirmDetails()
+        async confirmDetails(details)
         {
+            this.is_investment_breakdown_open = false
             this.submit_loading = true;
             let fields = {}
-            fields.plan = this.plan;
-            fields.amount = this.investment_amount;
+            fields.plan = details.plan;
+            fields.amount = Number(details.amount);
             fields.slot_id = this.current_slot_info.id;
             
             if(fields.amount < this.plan.invesment_minimum)
@@ -194,6 +206,14 @@ export default
             }
             else
             {
+                this.$q.loading.show({
+                    spinner: QSpinnerFacebook,
+                    spinnerColor: 'white',
+                    spinnerSize: 140,
+                    backgroundColor: 'primary',
+                    message: 'Some important process is in progress. Hang on...',
+                    messageColor: 'black'
+                })
                 try
                 {
                     let res = await this.$_fbCall('memberCreateInvestment', { data: fields});
@@ -204,8 +224,9 @@ export default
                     this.submit_loading = false;
                     this.step --;
                 }
-                this.step++
                 this.submit_loading = false;
+                this.$q.loading.hide();
+                this.$emit('closeDialog');
             }
         }
     }

package/dialogs/CashoutStatusDialog.vue

@@ -1,7 +1,7 @@
 <template>
     <q-card class="direct-downline" style="width: 1300px; height: 700px;max-width: 1700px;">
         <div class="downline-container">
-            <div class="title text-primary">Cashout List</div>
+            <div class="title text-primary"> {{metamask ? 'Withdrawal List': 'Cashout List'}}</div>
             <q-table :loading="table_loading"
                 separator="cell"
                 flat

package/dialogs/InvestmentBreakdown.vue

@@ -0,0 +1,83 @@
+<template>
+    <q-card class="investment-breakdown">
+        <div class="table-holder">
+            <q-table :pagination.sync="pagination" flat :data="investment_breakdown" :columns="table_column"></q-table>
+        </div>
+        <div class="button-holder">
+            <q-btn color="primary" @click="emitFields" icon="check" label="confirm" class="confirm-button q-mr-sm"/>   
+            <q-btn color="primary" icon="arrow_back" label="back" v-close-popup class="cancel-button"/>
+        </div>
+    </q-card>
+</template>
+
+<script>
+export default
+{
+    props: { 
+            breakdown_details: Object,
+    },
+    filters: { },
+    data:() =>(
+    {
+        pagination:
+        {
+            rowsPerPage: 10 // current rows per page being displayed
+        },
+        investment_breakdown:[],
+        table_column : 
+        [
+            {
+                name    : 'interest_date',
+                label   : 'Date of Interest',
+                field   : row => row.interest_date,
+                align   : 'center',
+                required: true,
+                format: val => `${val.toLocaleDateString()}`,
+                sortable: true,
+            },
+            {
+                name    : 'projection',
+                label   : 'Projected Interest',
+                field   : row => row.projection,
+                align   : 'center',
+                required: true,
+                format: val => `${val}`,
+                sortable: true,
+            },
+            {
+                name    : 'projected_income',
+                label   : 'Projected Income',
+                field   : row => row.projected_income,
+                align   : 'center',
+                required: true,
+                format: val => `${val.toFixed(2)}`,
+                sortable: true,
+            }
+        ]
+    }),
+    mounted() 
+    {
+        this.investment_breakdown = this.breakdown_details.investment_preview ? this.breakdown_details.investment_preview : [] ;
+    },
+    methods: 
+    {
+        emitFields()
+        {
+            this.$emit('closeDialog', this.breakdown_details);
+        },
+    },
+    computed: { }
+}
+</script>
+
+<style lang="scss">
+.investment-breakdown
+{
+    padding: 20px;
+    .table-holder{
+    }
+    .button-holder{
+        text-align: end;
+    }
+}
+</style>

package/dialogs/InvestmentLogs.vue

@@ -1,8 +1,8 @@
 <template>
    <q-card class="investment-logs">
        <q-bar class='bg-primary text-white q-pa-lg'>
-           <q-icon class='q-mr-sm' name='fa fa-heart'></q-icon>
-           <b>{{investment_info.plan.investment_name}} Logs</b>
+           <q-icon class='q-mr-sm' name='stacked_line_chart'></q-icon>
+           <b>{{investment_info.plan.investment_name}} 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>
        </q-bar>

package/package.json

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