geer-builder 1.2.538 → 1.2.539

package/GCheckout.vue

@@ -136,6 +136,7 @@
                             <div v-else v-for="(addre, i) in all_address" :key="i" class="shipping">
                                 <div class="shipping-left">
                                    <q-radio v-model="selectedAddress" :val="i" label="" />
+                                   <div v-if="!addre.default" class="text-center" style="margin-top:15px;padding-right:15px;" @click="archiveAddressPrompt(addre.id)"><q-icon name="fa fa-trash" size="12px"></q-icon></div>
                                 </div>
                                 <div class="shipping-right">
                                     <div class="name"> {{addre.full_name}}</div>
@@ -395,6 +396,7 @@ export default {
         is_add_address_dialog_open: false,
         messageToOwner: [],
         all_address : [],
+        all_address_recheck : [],
         payment_method_list: [],
         payment_account_list:[],
         shipping_address: { full_name:"",region: { region_name: "" },province: { province_name: "" } },
@@ -459,7 +461,15 @@ export default {
             this.product_list = Object.assign([], this.checkout_list);
             await this.$_getSlotInfo();
             await this.getordersbymerchant();
-            await this.$bind('all_address', new DB_USER_SHIPPING_ADDRESS(this.user_info.uid).collection());
+            await this.$bind('all_address', new DB_USER_SHIPPING_ADDRESS(this.user_info.uid).collection().where("archive","==",false));
+
+            let oneTime_checker = localStorage.getItem("oneTime_checker");
+            if(!oneTime_checker)
+            {
+                localStorage.setItem("oneTime_checker",true);
+                await this.$bind('all_address_recheck', new DB_USER_SHIPPING_ADDRESS(this.user_info.uid).collection());
+                this.recheckAddress();
+            }
             this.getAdress();
             this.showActivePayment();
             if(this.public_settings.hasOwnProperty('functions') && this.public_settings.functions.hasOwnProperty('ecommerce') && !this.public_settings.functions.ecommerce)
@@ -1548,6 +1558,53 @@ export default {
                 this.checkout_info.grand_total += this.custom_fees;
             }
         },
+        archiveAddressPrompt(address_id)
+        {
+            this.$q.dialog({
+                title: 'Confirm',
+                message: 'Would you like to delete this address?',
+                cancel: true,
+                persistent: true
+            }).onOk(() => {
+                this.archiveAddress(address_id);
+            });
+        },
+        async archiveAddress(address_id)
+        {           
+            this.$q.loading.show();
+            await this.$_fbCall('memberArchiveAddress',  {uid : this.user_info.uid, address_id: address_id});
+
+            if(this.all_address[this.selectedAddress].id == address_id)
+            {
+                this.all_address.forEach( (address,i) => 
+                {
+                    if(address.default)
+                    {
+                        if(this.selectedAddress < i)
+                        {
+                            this.selectedAddress=i-1;
+                        }
+                        else
+                        {
+                            this.selectedAddress=i;
+                        }
+                    }
+                });
+            }
+
+            this.$q.loading.hide();
+        },
+        recheckAddress()
+        {
+                // this.all_address = await new DB_USER_SHIPPING_ADDRESS(this.user_info.uid).collection().get();
+                for (let address of this.all_address_recheck)
+                {
+                    if(!address.hasOwnProperty("archive"))
+                    {
+                        this.$_fbCall('memberrecheckArchiveAddress',  {uid : this.user_info.uid, address_id: address.id});
+                    }
+                };
+        },
         getAdress()
         {
             // this.all_address = await new DB_USER_SHIPPING_ADDRESS(this.user_info.uid).collection().get();

package/GDirectDownlineWidget.vue

@@ -38,6 +38,10 @@
                     <q-icon name="fa fa-calendar"  size="14px" class="q-mr-sm" ></q-icon>
                     <div>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>
+                    <div>Unilevel Breakdown</div>
+                </q-btn>
                 <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>
@@ -54,6 +58,9 @@
                     <div v-else>Show downline maintaning status</div>
                 </q-btn>
             </div>
+            <q-dialog v-model="is_repeat_sale_dialog_open">
+                <unilevel-breakdown @closePopup="is_repeat_sale_dialog_open = false;" :row="current_slot_info"  :unilevel="distributed"></unilevel-breakdown>
+            </q-dialog>  
             <q-dialog v-model="is_direct_downline_open">
                 <direct-downline-dialog :slot_list="slot_list"  @closePopup="is_direct_downline_open = false"></direct-downline-dialog>
             </q-dialog>
@@ -203,13 +210,14 @@ import UnilevelPurchasesDialog      from './dialogs/UnilevelPurchasesDialog';
 import moment                       from 'moment';
 import {formatNumber}               from './utilities/NumberUtils';
 import {formatDate}                 from './utilities/DateUtils';
+import UnilevelBreakdown            from './dialogs/UnilevelBreakdown.vue';
 
 
 
 
 export default
 {
-    components: { GCard, DirectDownlineDialog,UnilevelPurchasesDialog, DownLineListTable},
+    components: { GCard, DirectDownlineDialog,UnilevelPurchasesDialog, DownLineListTable, UnilevelBreakdown},
     mixins: [GlobalMixins],
     props:{
         is_company_success: Boolean,
@@ -217,6 +225,7 @@ export default
     },
     data: () =>
     ({
+        is_repeat_sale_dialog_open:false,
         is_downline_table_open: false,
         is_unity:false,
         first_month_unity:null,
@@ -244,12 +253,15 @@ export default
         downline_list:[],
         membership_list:[],
         period_pv: 0 ,
-        pv_filter:true
+        pv_filter:true,
+        distributed:{},
+        show_unilevel_breakdown:false
     }),
     async mounted()
     {
         this.$bind('slot_list', this.db_slot.collection().where('sponsor', '==', this.user_info.active_slot));
         this.main_currency = await new DB_SETTINGS().doc('public_settings').get();
+        this.show_unilevel_breakdown = this.main_currency.data().value.company_social ? this.main_currency.data().value.company_social : false;
         this.check_direct_settings = this.main_currency.data().value.active_complan[0];
         this.is_unity = this.check_direct_settings.hasOwnProperty("direct_unity_count") ? true : false;
         this.membership_list = await this.$_getData('membership_list');
@@ -258,6 +270,13 @@ export default
         this.filter.from = moment().format('YYYY/MM/DD');
         this.filter.to = moment().format('YYYY/MM/DD');
         let activated_unilevel = await new DB_UNILEVEL().collection().where('activated', '==', true).get();
+        let distributed_unilevel = await new DB_UNILEVEL().collection().where('status', '==', 'distributed').orderBy('created_date', 'desc').limit(1).get();
+
+        if(distributed_unilevel.docs.length >0)
+        {
+            this.distributed = distributed_unilevel.docs[0].data();
+        }
+
         if(activated_unilevel.docs.length >0)
         {
             let user_tree_details = await new DB_UNTREES().collection().where('downline', '==', this.current_slot_info.slot_code).where('level', '<=', 1).get();
@@ -272,7 +291,6 @@ export default
             });
             if(this.activated_period.length > 0)
             {
-                console.log(this.activated_period.length , 'activated period');
                 if(user_tree_details.docs.length > 0)
                 {
                     this.period_pv = user_tree_details.docs[0].data()[this.activated_period[0].id].pv_earned;
@@ -283,8 +301,6 @@ export default
                 }
             }
         }
-
-
         this.first_month_unity = this.is_unity ? (this.current_slot_info.hasOwnProperty("first_month_unity") ? moment(new Date(this.current_slot_info.first_month_unity.toDate())).format("YYYY/MM/DD hh:mm a") : null) : null;
         this.second_month_unity = this.is_unity ? (this.current_slot_info.hasOwnProperty("second_month_unity") ? moment(new Date(this.current_slot_info.second_month_unity.toDate())).format("YYYY/MM/DD hh:mm a") : null) : null;
     },

package/GLogin.vue

@@ -7,13 +7,29 @@
                     <q-input :disable="is_submitting" v-model="form_data.email" dense placeholder="Enter Email" class="input input-email" outlined stack-label/>
                 </div>
             </div>
-            <div class="g-login__fields q-mt-md">
+
+            <div class="g-login__fields q-mt-md row" v-if="show_pass_button == true">
+                <div class="label col-12">Password</div>
+                <div class="input col-11">
+                    <q-input v-if="showPassword" :disable="is_submitting" v-model="form_data.password" type="text" dense placeholder="Enter Password" class="input input-password" outlined stack-label/>
+                    <q-input v-if="!showPassword" :disable="is_submitting" v-model="form_data.password" type="password" dense placeholder="Enter Password" class="input input-password" outlined stack-label/>
+                </div>
+                <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>
+                        </span>
+                    </div>
+                </div>
+            </div>
+            <div class="g-login__fields q-mt-md" v-else>
                 <div class="label">Password</div>
                 <div class="input">
                     <q-input :disable="is_submitting" v-model="form_data.password" type="password" dense placeholder="Enter Password" class="input input-password" outlined stack-label/>
                 </div>
             </div>
 
+
             <div class="g-login__fields q-mt-md" style="margin-top: 20px">
                 <q-btn class="submit-login" :disable="is_submitting" :loading="is_submitting" type="submit" color="primary full-width button-login"  unelevated>Sign In</q-btn>
                 <q-btn v-if="!hide_registration" class="full-width q-mt-sm" @click="openRegistration()" color="primary" outline>Create Account</q-btn>
@@ -83,7 +99,8 @@ export default
         terms: String,
         val: Boolean,
         hide_registration: Boolean,
-        mbot:Boolean
+        mbot:Boolean,
+        show_pass_button:Boolean
 
     },
     components: { GRegistration,GForgotPassword },
@@ -98,6 +115,7 @@ export default
         db_slot: new DB_SLOT(),
         is_resend_dialog: false,
         public_settings:[],
+        showPassword:false
     }),
     watch:
     {
@@ -166,6 +184,10 @@ export default
         {
             this.is_registration_dialog= true;
         },
+        toggleShowPass()
+        {
+            this.showPassword = this.showPassword == false ? true : false;
+        },
         async submitLogin()
         {
             /* start login */

package/GSlotWallet.vue

@@ -14,6 +14,12 @@
                         <div class="value">{{ main_currency }} {{ $_formatNumber(global_pool.count, { decimal: 2 }) }}</div>
                     </div>
                 </div>
+                <div class="global-holder" v-if="show_damayan_pool">
+                    <div>
+                        <div class="label">Damayan Funds</div>
+                        <div class="value">{{ main_currency }} {{ $_formatNumber(damayan_pool.count, { decimal: 2 }) }}</div>
+                    </div>
+                </div>
                 <div>
                     <div class="" v-if="is_company_success">
                         <div class="label" style="margin-top:10px">TOTAL CENTRAL WALLET EARNED</div>
@@ -185,6 +191,8 @@ export default
         public_settings:{},
         total_wallet_label:'',
         global_pool:[],
+        damayan_pool:[],
+        show_damayan_pool:false,
         show_global_pool:false,
     }),
     watch:
@@ -207,6 +215,7 @@ export default
         await this.getTempWallet();
         await this.memberUpdateSlotLimit();
         await this.getGlobalPool();
+        await this.getDamayan();
 
         if(this.is_company_success == true)
         {
@@ -215,6 +224,14 @@ export default
     },
     methods:
     {
+        async getDamayan()
+        {
+            await this.$bind('damayan_pool', new DB_STAT().doc('damayan'));
+            if(this.damayan_pool != null)
+            {
+                this.show_damayan_pool = true;
+            }
+        },
         async getGlobalPool()
         {
             await this.$bind('global_pool', new DB_STAT().doc('global_pool'));

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.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.test ? public_settings.dragonpay_details.test_payment_request_url : 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">
@@ -122,7 +122,7 @@ export default {
             this.txnid = this.sale.sale_id.toString();
             this.amount = floattotal.toString();
             this.ccy = "PHP";
-            this.description = "test";
+            this.description = this.public_settings.dragonpay_details.test ? "test" : "order: ", this.txnid;
             this.email = this.public_settings.dragonpay_details.test ? "admin@gmail.com" : this.sale.customer_email;
             let digest_string = `${this.merchant_id}:${this.txnid}:${this.amount}:${this.ccy}:${this.description}:${this.email}:${this.password}`;
             this.digest = encryptSha(digest_string);

package/dialogs/UnilevelBreakdown.vue

@@ -2,7 +2,7 @@
     <q-card style="max-width: 700px; min-height: 200px;">
         <q-bar class="bg-primary text-white q-pa-lg">
             <q-icon class="q-mr-sm" name="fa fa-splotch"></q-icon>
-            <b>Breakdown ({{ row.slot_code }})</b>
+            <b>Unilevel Breakdown({{unilevel.unilevel_id}})</b>
           <q-space />
 
           <q-btn dense flat icon="close" v-close-popup>

package/package.json

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