geer-builder 1.2.541 → 1.2.544

package/GBinaryWidget.vue

@@ -2,9 +2,11 @@
     <g-card v-if="this.user_info">
         <template v-if="slot_info">
             <div class="q-pt-sm">
-                <div class="label">Unplaced Slot</div>
+                <div class="label" v-if="is_company_ultrapro">Downline Unplaced Slot</div>
+                <div class="label" v-else>Unplaced Slot</div>
                 <div class="value">{{ unplaced_slot_count }}</div>
                 <div class="label" v-if="is_company_success">Sales Matches Today</div>
+                <div class="label" v-if="is_company_ultrapro">Cycle Pair Count</div>
                 <div class="label" v-else>Pairs Today</div>
                 <div class="value text-primary">{{pairs_loading == false ? pairs_today : 0}} / {{binary_settings.pairs_per_day}}</div>
                 <div class="label">Left Points</div>
@@ -117,7 +119,7 @@ export default
         public_settings:{},
         unplaced_slot_count:0,
     }),
-    props:['genealogy', 'history', 'binary_history' , 'manual_place','binary_history_two', 'binary_log','is_company_success'],
+    props:['genealogy', 'history', 'binary_history' , 'manual_place','binary_history_two', 'binary_log','is_company_success', 'is_company_ultrapro'],
     components: { GCard, Genealogy, PairingHistory, BinaryHistory, PointHistory,ManualPlaceDialog },
     async mounted()
     {

package/GCashOut.vue

@@ -4,19 +4,26 @@
             <div class="cashout__content" v-if="!is_initializing">
                 <div class="cashout__content-left">
                     <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_title" v-if="is_company_ultrapro">Please select mode of payout</div>
+                        <div class="cashout__content-label cashout_title" v-else>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"/>
                         </div>
                     </g-card>
                     <g-card :nomargin="true" class="cashout__box cashout__amount">
                         <div class="cash__amount-balance">
-                            <div class="cashout__content-label cashout_title">{{metamask ? 'Available Balance' : 'Your Wallet Balance?'}}</div>
+                            <div class="cashout__content-label cashout_title" v-if="is_company_ultrapro">Current Available Balance</div>
+                            <div class="cashout__content-label cashout_title" v-else>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"> {{metamask ? 'How much would you like to withdraw?' : 'How much would you like to cashout?'}} </div>
+                            <div class="cashout__content-label q-mt-md" v-if="is_company_ultrapro">
+                                Enter amount of cashout
+                            </div>
+                            <div class="cashout__content-label q-mt-md" v-else>
+                              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> -->
@@ -24,7 +31,8 @@
                         </div>
                     </g-card>
                     <g-card :nomargin="true" class="cashout__box cashout__info">
-                        <div class="cashout__content-label cashout_title">Recipient Information</div>
+                        <div class="cashout__content-label cashout_title" v-if="is_company_ultrapro">Receiver Details</div>
+                        <div class="cashout__content-label cashout_title" v-else>Recipient Information</div>
                         <div class="cashout__info-bottom cashout_body">
                             <div v-for="(field, i) in cashout_choice.fields" :key="i" class="setspan" :style="field.size == 2 ? 'width: 100%;' : 'width: 50%;'">
                                 <div class="cashout__info-label ">{{field.label}}</div>
@@ -35,10 +43,12 @@
                 </div>
                 <div class="cashout__content-right">
                     <g-card :nomargin="true" class="cashout__box cashout__summary">
-                        <div class="cashout__content-label cashout_title">{{metamask ? 'Withdrawal Summary': 'Cash out Summary'}}</div>
+                        <div class="cashout__content-label cashout_title" v-if="is_company_ultrapro">Payout Details</div>
+                        <div class="cashout__content-label cashout_title" v-else>Cash out Summary</div>
                         <div class="cashout_body">
                             <div class="summary__content" v-if="!metamask">
-                                <div class="summary__content-label">Cashout Method</div>
+                                <div class="summary__content-label" v-if="is_company_ultrapro">Mode of payout</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">
@@ -62,12 +72,14 @@
                                 <div class="summary__content-info">{{ main_currency }}  {{ $_formatNumber(xfield.witholding_tax, { decimal: 2}) }}</div>
                             </div>
                             <div class="summary__content" v-if="!metamask">
-                                <div class="summary__content-label">Total Charge</div>
+                                <div class="summary__content-label" v-if="is_company_ultrapro">Total Trans Fee</div>
+                                <div class="summary__content-label" v-else>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>
                             </div>
                             <div class="summary__content">
-                                <div class="summary__content-label">You will receive</div>
+                                <div class="summary__content-label" v-if="is_company_ultrapro">Net Amount</div>
+                                <div class="summary__content-label" v-else>You will receive</div>
                                 <div v-if="convert_cashout == true" class="summary__content-info">{{ convert_currency }}  {{ $_formatNumber((convert_rate * xfield.net_amount), { decimal: 2}) }}</div>
                                 <div v-else class="summary__content-info">{{ main_currency }}  {{ $_formatNumber(xfield.net_amount, { decimal: 2}) }}</div>
                             </div>
@@ -139,7 +151,7 @@ export default {
     }),
     mixins:[GlobalMixins],
     components: { GCard , CashoutStatusDialog, TinRegistrationDialog},
-    props:['cashout_choice_hide', 'metamask'],
+    props:['cashout_choice_hide', 'metamask', 'is_company_ultrapro'],
     async mounted()
     {
         await this.$_getSlotInfo();

package/GCodeVault.vue

@@ -3,8 +3,8 @@
         <div class="q-mt-md">
             <g-card>
                 <div class="codevault-tabs">
-                    <div class="tab" @click="tab_active = 'unused'"  :class="tab_active == 'unused' ? 'active' : ''">Ready For Use ({{ unused_count }})</div>
-                    <div class="tab" @click="tab_active = 'used'" :class="tab_active == 'used' ? 'active' : ''">Used Codes ({{ used_count }})</div>
+                    <div class="tab" @click="tab_active = 'unused'"  :class="tab_active == 'unused' ? 'active' : ''">{{is_company_ultrapro ? `Available Codes`:`Ready For Use`}} ({{ unused_count }})</div>
+                    <div class="tab" @click="tab_active = 'used'" :class="tab_active == 'used' ? 'active' : ''">{{is_company_ultrapro ? `Code History`:`Used Codes`}}({{ used_count }})</div>
                 </div>
 
                 <div>
@@ -133,13 +133,13 @@ export default
     props:
     {
         lead_info:Object,
+        is_company_ultrapro:Boolean
     },
     async mounted()
     {
         this.loadCodes();
         await this.$_getSlotInfo();
         this.settings = await this.$_getData('public_settings');
-
     },
     methods:
     {
@@ -165,7 +165,7 @@ export default
             if(code.used == true)
             {
                 this.$q.loading.show();
-
+                console.log('asd');
 
                 let slot_info = await this.db_slot.get(code.used_by);
                 let user_info = await this.db_user.get(slot_info.owner);

package/GDirectDownlineWidget.vue

@@ -14,6 +14,7 @@
 
             <div class="q-pt-sm" v-if="!pv_filter">
                 <div class="label" v-if="is_company_success">Monthly sales participation</div>
+                <div class="label" v-if="is_company_ultrapro">Monthly PV</div>
                 <div class="label" v-else>Period PV</div>
                 <div class="value text-primary">{{ period_pv}}</div>
             </div>
@@ -36,7 +37,8 @@
              <div class="buttons text-center">
                 <q-btn color="primary" unelevated @click="openFilter()" style="margin:2px auto; width:75%;">
                     <q-icon name="fa fa-calendar"  size="14px" class="q-mr-sm" ></q-icon>
-                    <div>Period PV</div>
+                    <div  v-if="is_company_ultrapro">Monthly PV</div>
+                    <div v-else>Period PV</div>
                 </q-btn>
                 <q-btn color="primary" unelevated v-if="show_unilevel_breakdown" @click="is_repeat_sale_dialog_open = true" style="margin:2px auto; width:75%;">
                     <q-icon name="fa fa-calendar"  size="14px" class="q-mr-sm" ></q-icon>
@@ -45,16 +47,19 @@
                 <q-btn v-close-popup color="primary"  @click="direct()" style="margin:2px auto; width:75%;">
                     <q-icon name="fa fa-user" size="14px" class="q-mr-sm"></q-icon>
                     <div v-if="is_company_success">Direct Enrollees List</div>
+                    <div v-if="is_company_ultrapro">Direct Downlines</div>
                     <div v-else>Direct Downline list</div>
                 </q-btn>
                  <q-btn color="primary" v-if="!hide_unilevel" unelevated @click="unilevel()" style="margin:2px auto; width:75%;">
                     <q-icon name="fa fa-store"  size="14px" class="q-mr-sm" ></q-icon>
                     <div v-if="is_company_success">Product Purchases</div>
+                    <div v-if="is_company_ultrapro">Product PV History</div>
                     <div v-else>Unilevel Purchases</div>
                 </q-btn>
                 <q-btn color="primary" unelevated @click="showDownlineMaintaint()" style="margin:2px auto 10px auto; width:75%;">
                     <q-icon name="fa fa-calendar"  size="14px" class="q-mr-sm" ></q-icon>
                     <div v-if="is_company_success">Product Purchases</div>
+                    <div v-if="is_company_ultrapro">Downline PV Status</div>
                     <div v-else>Show downline maintaning status</div>
                 </q-btn>
             </div>
@@ -221,6 +226,7 @@ export default
     mixins: [GlobalMixins],
     props:{
         is_company_success: Boolean,
+        is_company_ultrapro: Boolean,
         hide_unilevel: Boolean
     },
     data: () =>

package/GEcomChat.vue

@@ -111,8 +111,8 @@
                                         <div class='code'>
                                             Code: <b>{{getActivation(message.message)}}<br></b>
                                             Pin: <b>{{getPin(message.message)}}<br></b>
-                                            <template v-if="message.code_details">Type: <b>{{ message.code_details.kit_for_upgrade=="Don't use for Upgrade" ? 'Activation Only' : message.code_details.kit_for_upgrade == "Only For Upgrade" ? 'Upgrade Only' : message.code_details.kit_for_upgrade == "All (Upgrade and New Kit)" ? 'All (Upgrade and Activation)' : '' }}<br></b></template>
-                                            <template v-if="message.code_details">Membership: <b>{{ message.code_details.membership.membership_name }}</b></template>
+                                            <template v-if="message.code_details && message.code_details.kit_for_upgrade ">Type: <b>{{ message.code_details.kit_for_upgrade=="Don't use for Upgrade" ? 'Activation Only' : message.code_details.kit_for_upgrade == "Only For Upgrade" ? 'Upgrade Only' : message.code_details.kit_for_upgrade == "All (Upgrade and New Kit)" ? 'All (Upgrade and Activation)' : '' }}<br></b></template>
+                                            <template v-if="message.code_details && message.code_details.membership ">Membership: <b>{{ message.code_details.membership.membership_name }}</b></template>
                                         </div>
                                     </div>
                                     <div v-else>{{message.message}}</div>
@@ -126,8 +126,8 @@
                                         <div class='code'>
                                             Code: <b>{{getActivation(message.message)}}<br></b>
                                             Pin: <b>{{getPin(message.message)}}<br></b>
-                                            <template v-if="message.code_details">Type: <b>{{ message.code_details.kit_for_upgrade=="Don't use for Upgrade" ? 'Activation Only' : message.code_details.kit_for_upgrade == "Only For Upgrade" ? 'Upgrade Only' : message.code_details.kit_for_upgrade == "All (Upgrade and New Kit)" ? 'All (Upgrade and Activation)' : '' }}<br></b></template>
-                                            <template v-if="message.code_details">Membership: <b>{{ message.code_details.membership.membership_name }}</b></template>
+                                            <template v-if="message.code_details && message.code_details.kit_for_upgrade">Type: <b>{{ message.code_details.kit_for_upgrade=="Don't use for Upgrade" ? 'Activation Only' : message.code_details.kit_for_upgrade == "Only For Upgrade" ? 'Upgrade Only' : message.code_details.kit_for_upgrade == "All (Upgrade and New Kit)" ? 'All (Upgrade and Activation)' : '' }}<br></b></template>
+                                            <template v-if="message.code_details && message.code_details.membership">Membership: <b>{{ message.code_details.membership.membership_name }}</b></template>
                                         </div>
                                     </div>
                                     <div v-else>{{message.message}}</div>
@@ -145,8 +145,8 @@
                                             <div class='code'>
                                                 Code: <b>{{getActivation(que.message)}}<br></b>
                                                 Pin: <b>{{getPin(que.message)}}<br></b>
-                                                <template v-if="message.code_details">Type: <b>{{ message.code_details.kit_for_upgrade=="Don't use for Upgrade" ? 'Activation Only' : message.code_details.kit_for_upgrade == "Only For Upgrade" ? 'Upgrade Only' : message.code_details.kit_for_upgrade == "All (Upgrade and New Kit)" ? 'All (Upgrade and Activation)' : '' }}<br></b></template>
-                                                <template v-if="message.code_details">Membership: <b>{{ message.code_details.membership.membership_name }}</b></template>
+                                                <template v-if="message.code_details && message.code_details.kit_for_upgrade">Type: <b>{{ message.code_details.kit_for_upgrade=="Don't use for Upgrade" ? 'Activation Only' : message.code_details.kit_for_upgrade == "Only For Upgrade" ? 'Upgrade Only' : message.code_details.kit_for_upgrade == "All (Upgrade and New Kit)" ? 'All (Upgrade and Activation)' : '' }}<br></b></template>
+                                                <template v-if="message.code_details && message.code_details.membership">Membership: <b>{{ message.code_details.membership.membership_name }}</b></template>
                                             </div>
                                         </div>
                                         <div v-else>{{que.message}}</div>
@@ -213,15 +213,30 @@
                     <q-item @click="is_open_choose_code = true" v-close-popup clickable>
                         <q-item-section>Send Code & Pin</q-item-section>
                     </q-item>
+
+                    <q-item @click="is_choose_product_code = true" v-close-popup clickable>
+                        <q-item-section>Send Product Code</q-item-section>
+                    </q-item>
                 </q-list>
             </q-card> 
         </q-dialog>
+
+        <q-dialog v-model="is_choose_product_code">
+            <use-batch-product-code-dialog :code="product_code_list" :send_code="true" @sendCode="sendCode"></use-batch-product-code-dialog>
+        </q-dialog>
+
+        <q-dialog v-model="is_open_use_product_code">
+            <use-product-code-dialog :code='this.product_code' @closed_popup="is_open_use_product_code=false"></use-product-code-dialog>
+        </q-dialog>
+
         <q-dialog v-model="is_open_choose_code">
             <chat-attach-code @sendCode="sendCode"></chat-attach-code>
         </q-dialog>
+
         <q-dialog v-model="is_confirm_password_open">
             <confirm-password-dialog @closePopup="is_confirm_password_open=false" @success="confirmedPassword"></confirm-password-dialog>
         </q-dialog>
+
         <q-dialog :maximized="$q.platform.is.mobile" transition-show="slide-up" transition-hide="slide-down" v-model="is_open_add_slot_dialog"> 
             <div><q-bar class="bg-primary text-white q-pa-lg">
                 <q-icon class="q-mr-sm" name="fa fa-splotch"></q-icon>
@@ -269,6 +284,7 @@
 <script>
 import DB_SLOT                      from './models/DB_SLOT';
 import DB_CODE                      from './models/DB_CODE';
+import DB_PRODUCT_CODE              from './models/DB_PRODUCT_CODE';
 import DB_ECOM_CHAT                 from './models/DB_ECOM_CHAT';
 import DB_ECOM_CHAT_CONVERSATION    from './models/DB_ECOM_CHAT_CONVERSATION';
 import GlobalMixins                 from './mixins/global_mixins.js';
@@ -280,14 +296,16 @@ import GLoader                      from './components/GlobalLoader';
 import ChatAttachCode               from './components/Chat/ChatAttachCode';
 import ConfirmPasswordDialog        from './components/Chat/ConfirmPasswordDialog';
 import AddChatFloat                 from './components/Chat/AddChatFloat';
-import GSlotCreation        from './GSlotCreation';
+import GSlotCreation                from './GSlotCreation';
 const validator                     = require('validator');
 import GCard                        from './components/GCard';
 import UpgradeSlotDialog            from './dialogs/UpgradeSlotDialog';
+import useBatchProductCodeDialog    from './dialogs/UseBatchProductCodeDialog';
+import UseProductCodeDialog         from './dialogs/UseProductCodeDialog';
 
 export default {
     mixins: [GlobalMixins],
-    components:{ GCard, GLoader, ChatAttachCode, ConfirmPasswordDialog, GSlotCreation, AddChatFloat, UpgradeSlotDialog},
+    components:{ GCard, GLoader, ChatAttachCode, ConfirmPasswordDialog, GSlotCreation, AddChatFloat, UpgradeSlotDialog, useBatchProductCodeDialog, UseProductCodeDialog},
     props:
     {
         user_id: String,
@@ -307,6 +325,9 @@ export default {
     },
     data: () =>
     ({
+        product_code:null,
+        is_open_use_product_code:false,
+        is_choose_product_code:false,
         is_open_upgrade_slot_dialog:false,
         is_select_action_dialog_open:false,
         inputed_email:'',
@@ -339,6 +360,8 @@ export default {
         searchValue: "",
         code: {},
         received_code:[],
+        product_code_list:[],
+        db_product_code: new DB_PRODUCT_CODE(),
     }),
     watch:
     {
@@ -439,7 +462,8 @@ export default {
         this.bindConvos();
         // await this.bindMessages(this.default_message_display);
         this.is_convos_loading_done = true;
-        if(this.user_id){
+        if(this.user_id)
+        {
             let merchant_details = await new DB_USER().get(this.user_id);
             if(merchant_details)
             {
@@ -452,9 +476,17 @@ export default {
             setTimeout(() => this.updateScroll(), .1);
             this.is_loading_message_done = true;
         }
+        if(this.user_info.hasOwnProperty('active_slot'))
+        {
+            await this.loadCode();
+        }
     },
     methods:
     {
+        async loadCode()
+        {
+            await this.$bind('product_code_list', this.db_product_code.collection().where('slot_code', '==', this.user_info.active_slot).where('used', '==', false));
+        },
         async sendCodeToEmail()
         {
             if(!validator.isEmail(this.inputed_email))
@@ -530,7 +562,12 @@ export default {
         {
             if(code_details)
             {
-                if(code_details.kit_for_upgrade == "Don't use for Upgrade")
+                if(code_details.product_code == true)
+                {
+                    this.product_code = code_details;
+                    this.is_open_use_product_code = true;
+                }
+                else if(code_details.kit_for_upgrade == "Don't use for Upgrade")
                 {
                     //activate only
                     this.is_open_add_slot_dialog = true;

package/GLogin.vue

@@ -17,7 +17,7 @@
                 <div class="col-1">
                     <div @click="toggleShowPass" class="text-center" style="height:100%">
                         <span class="icon is-small is-right">
-                            <q-icon :class="{ 'fa-eye-slash': showPassword, 'fa-eye': !showPassword }" name="fas fa-eye" size="20px" style="margin-top:10px;"></q-icon>
+                            <q-icon :class="{ 'fa-eye': showPassword, 'fa-eye-slash': !showPassword }" name="fas fa-eye" size="20px" style="margin-top:10px;"></q-icon>
                         </span>
                     </div>
                 </div>