geer-builder 1.2.762 → 1.2.764

package/GCheckout.vue

@@ -423,6 +423,7 @@ export default {
         is_branch_pickup:false,
         is_merchant_free_shipping_conflict:false,
         is_elms_conflict:false,
+        is_elms_included:false,
         is_ecom_disable:false,
         is_select_voucher_open:false,
         is_update_address_dialog_open:false,
@@ -1315,6 +1316,7 @@ export default {
                             }
                             else if(pro.product.type === "ELMS")
                             {
+                                this.is_elms_included = true;
                                 let check_condition = true;
                                 if(free_shipping_ctr >= 1 && is_merchant_free_shipping !== true && check_condition === true)
                                 {
@@ -2279,14 +2281,14 @@ export default {
                         this.is_add_address_dialog_open = true;
                     });
                 }
-                else if(this.is_merchant_free_shipping_conflict == true)
-                {
-                    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.is_merchant_free_shipping_conflict == true)
+                {
+                    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.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 => 
@@ -2491,6 +2493,25 @@ export default {
                     }
                 }
 
+                if(this.is_elms_included == true)
+                {
+                    let copy_list = Object.assign([], this.payment_method_list);
+                    for (let [i,asd] of copy_list.entries())
+                    {
+                        if(asd.payment_method_id == "cod")
+                        {
+                            let pos = this.payment_method_list.map(function(e) { return e.payment_method_id; }).indexOf('cod');
+                            this.payment_method_list.splice(pos, 1);
+                        }
+
+                        if(asd.payment_method_id == "cod_manual")
+                        {
+                            let pos = this.payment_method_list.map(function(e) { return e.payment_method_id; }).indexOf('cod_manual');
+                            this.payment_method_list.splice(pos, 1);
+                        }
+                    }
+                }
+
                 let ind = this.payment_method_list.map(function(e) { return e.payment_method_id; }).indexOf('online_payment');
                 if(ind>=0)
                 {
@@ -2523,7 +2544,7 @@ export default {
                     }
                 });
 
-
+                
             }
         },
         changePaymentMethod(event,index)

package/GManualPaymentPage.vue

@@ -42,6 +42,7 @@
                         <div>Payment: <b>{{this.order_info.payment_method.manual_pay_choice.bank_label}}</b></div>
                         <div>Account Name: <b>{{this.order_info.payment_method.manual_pay_choice.account_name}}</b></div>
                         <div>Account Number: <b>{{this.order_info.payment_method.manual_pay_choice.account_number}}</b></div>
+                        <div>Order Total: <b>PHP {{$_formatNumber(this.order_info.orders.order_total, { decimal: 2})}}</b></div>
                     </div>
                 </div>
                 <div class="q-mt-md">
@@ -114,6 +115,7 @@ export default {
         async getOrderDetails()
         {
             await this.$bind('order_info', new DB_MERCHANT_ORDERS().doc(this.order_id));
+            // console.log(this.order_info);
         },
         async getaAccountList()
         {

package/package.json

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