geer-builder 1.2.747 → 1.2.749

package/GCheckout.vue

@@ -422,6 +422,7 @@ export default {
     ({
         is_branch_pickup:false,
         is_merchant_free_shipping_conflict:false,
+        is_elms_conflict:false,
         is_ecom_disable:false,
         is_select_voucher_open:false,
         is_update_address_dialog_open:false,
@@ -461,6 +462,7 @@ export default {
         online_payment_list : [],
         offGcPayment: false,
         temp_product:'',
+        digital_product_shipping:false,
         active_index: 0,
         custom_fees: 0,
         courier_settings: {},
@@ -1276,9 +1278,11 @@ export default {
                 let shipping_fee = 0;
                 let is_merchant_free_shipping = false;
                 this.is_merchant_free_shipping_conflict = false;
+                this.is_elms_conflict = false;
                 let free_shipping_ctr = 0;
                 let shipping_total = 0;
                 let voucher_total = 0;
+                let last_product_type = null;
                 // this.checkout_info.orders.forEach(async orders => {
                 
                 for(let orders of this.checkout_info.orders){
@@ -1299,6 +1303,36 @@ export default {
                                 {
                                     this.is_merchant_free_shipping_conflict = true;
                                 }
+
+                                if(!last_product_type)
+                                {
+                                    last_product_type = pro.product.type;
+                                }
+                                else if(last_product_type == "ELMS")
+                                {
+                                    this.is_elms_conflict = true;
+                                }
+                            }
+                            else if(pro.product.type === "ELMS")
+                            {
+                                let check_condition = true;
+                                if(free_shipping_ctr >= 1 && is_merchant_free_shipping !== true && check_condition === true)
+                                {
+                                    this.is_merchant_free_shipping_conflict = true;
+                                }
+                                else if(free_shipping_ctr >= 1 && is_merchant_free_shipping === true && check_condition !== true)
+                                {
+                                    this.is_merchant_free_shipping_conflict = true;
+                                }
+
+                                if(!last_product_type)
+                                {
+                                    last_product_type = "ELMS";
+                                }
+                                else if(last_product_type != "ELMS")
+                                {
+                                    this.is_elms_conflict = true;
+                                }
                             }
                             else
                             {
@@ -1310,6 +1344,15 @@ export default {
                                 {
                                     this.is_merchant_free_shipping_conflict = true;
                                 }
+
+                                if(!last_product_type)
+                                {
+                                    last_product_type = pro.product.type;
+                                }
+                                else if(last_product_type == "ELMS")
+                                {
+                                    this.is_elms_conflict = true;
+                                }
                             }
 
                             free_shipping_ctr++;
@@ -1324,6 +1367,10 @@ export default {
                                     is_merchant_free_shipping = true;
                                 }
                             }
+                            else if(pro.product.type === 'ELMS')
+                            {
+                                is_merchant_free_shipping = true;
+                            }
                         });
                     }
                     
@@ -2236,6 +2283,10 @@ export default {
                 {
                     this.$q.dialog({ html: true, title: `Something's not quite right`, message: `Cannot combine products with shipping fee to a product with free shipping fee please clear your cart.` });
                 }
+                else if(this.is_elms_conflict == true)
+                {
+                    this.$q.dialog({ html: true, title: `Something's not quite right`, message: `Cannot combine elms wallet purchase with other products please clear your cart.` });
+                }
                 else if(!this.checkout_info.shipping_address.first_name ||!this.checkout_info.shipping_address.last_name )
                 {
                     this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Please Update Shipping Address First Name/Last Name" }).onOk(async data => 

package/GEarningBreakdownWidget.vue

@@ -101,6 +101,35 @@ export default
                 }
                 return res;
             });
+            
+            if(complan_plan.hasOwnProperty("breakdown_complan"))
+            {
+                complan_plan.breakdown_complan.map((val) =>
+                {
+                    let res = { icon: val.icon, active: val.active, label: val.label, complan: val.key, amount : 0, last_update: null, show:val.show };
+                    this.earning_breakdown.forEach((breakdown) =>
+                    {
+                        let another_keyword = val.key+"_convert";
+                        if(breakdown.id == val.key || breakdown.id == another_keyword)
+                        {
+                            res.amount = res.amount+breakdown.amount;
+                            res.last_update = breakdown.last_update;
+                        }
+                    });
+
+                    for (var key in this.earning_breakdown_slot.temporary_wallet) 
+                    {
+                        if(key == val.key)
+                        {
+                            res.amount = res.amount +this.earning_breakdown_slot.temporary_wallet[key];
+                        }
+                    }
+
+                    this.earning_breakdown_processed.push(res);
+                });
+            }
+
+            // console.log(this.earning_breakdown_processed);
             // console.log(this.earning_breakdown_processed);
             // console.log(this.earning_breakdown_slot.temporary_wallet);
 

package/GProductList.vue

@@ -287,7 +287,7 @@ export default {
         },
         async newGetProduct(limit,loadmore=false)
         {
-            let querry = new DB_PRODUCTS().collection().where("type", "in", ["Product", "Membership Kit", "Exclusive"]).where("ecommerce", "==", true).where("country_code", "==", this.country_code ? this.country_code : 'PH');
+            let querry = new DB_PRODUCTS().collection().where("type", "in", ["Product", "Membership Kit", "Exclusive", "ELMS"]).where("ecommerce", "==", true).where("country_code", "==", this.country_code ? this.country_code : 'PH');
             if(this.is_membership_only)
             {
                 querry = querry.where("type", "==", "Membership Kit")

package/components/GProfile.vue

@@ -10,6 +10,9 @@
                             <q-img :src="prop_user_info.hasOwnProperty('profile_picture') ? prop_user_info.profile_picture : default_profile_picture"></q-img>
                         </q-avatar>
                     </div>
+                    <div v-if="profile_details && show_elms_login == true && ( show_elms_login_test == false || ( show_elms_login_test == true && prop_user_info.enable_elms_test ) )">
+                            <q-btn class="full-width q-mt-sm" @click="getElmsLogin()" color="primary" outline>Login to elms</q-btn>
+                    </div>
                     <div class="profile-details" v-if="profile_details">
                         <div class="total-earning-label">Total Earnings</div>
                         <div class="total-earning">{{$_formatNumber(slot_info.total_earned, { decimal: 2 })}}</div>
@@ -98,6 +101,8 @@ export default
         membership:'',
         rank: '',
         slot_info:'',
+        show_elms_login:false,
+        show_elms_login_test:false
     }),
     async mounted()
     { 
@@ -110,6 +115,16 @@ export default
         }
 
         let profile = await this.$_getData('public_settings');
+        if(profile.enable_successflix_product == true)
+        {
+            this.show_elms_login = true;
+        }
+
+        if(profile.enable_successflix_product_test == true)
+        {
+            this.show_elms_login_test = true;
+        }
+
         this.default_profile_picture = profile.default_profile_picture;
     },
     methods: { 
@@ -121,6 +136,20 @@ export default
         sendMessage()
         {
             EventBus.$emit('emitToChat', this.prop_user_info.uid);
+        },
+        async getElmsLogin()
+        {
+            this.$q.loading.show();
+            let public_settings = await this.$_getData('public_settings');
+            if(public_settings.success_flix_elms_login_visit)
+            {
+                let return_response = await this.$_fbCall('memberGetElmsLogin');
+                if(return_response && return_response.data && return_response.data.generated_id)
+                {
+                    window.open(public_settings.success_flix_elms_login_visit+"?loginTokenId="+return_response.data.generated_id, '_blank');
+                }
+            }
+            this.$q.loading.hide();
         }
     },
     computed: { }

package/package.json

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