geer-builder 1.2.772 → 1.2.773

package/GCheckout.vue

@@ -229,7 +229,7 @@
                 <add-new-address-form @done="updateAddress"></add-new-address-form>
             </q-dialog>
             <q-dialog persistent v-model="is_dialog_confirm_open">
-                <process-checkout-confirm-dialog @closePopup="confirmedCheckout" :checkout_details="checkout_info" :sale_id="sale_id.data" :proc_id="dragon_pay_choice"></process-checkout-confirm-dialog>
+                <process-checkout-confirm-dialog @closePopupElms="confirmedCheckoutElms" @closePopup="confirmedCheckout" :is_elms_popup_checkout="is_elms_popup" :checkout_details="checkout_info" :sale_id="sale_id.data" :proc_id="dragon_pay_choice"></process-checkout-confirm-dialog>
             </q-dialog>    
             </div> 
         </div>
@@ -370,7 +370,7 @@
                     <add-new-address-form @done="updateAddress"></add-new-address-form>
                 </q-dialog>
                 <q-dialog persistent v-model="is_dialog_confirm_open" :maximized="true">
-                    <process-checkout-confirm-dialog @closePopup="confirmedCheckout" :checkout_details="checkout_info" :sale_id="sale_id.data" :chosen_proc="true" ></process-checkout-confirm-dialog>
+                    <process-checkout-confirm-dialog @closePopupElms="confirmedCheckoutElms" @closePopup="confirmedCheckout" :is_elms_popup_checkout="is_elms_popup" :checkout_details="checkout_info" :sale_id="sale_id.data" :chosen_proc="true" ></process-checkout-confirm-dialog>
                 </q-dialog>   
             </div>
         </div>
@@ -505,10 +505,17 @@ export default {
             }
         ],
         payment_channel_tab: 'otc',
-        checkout_fix: false
+        checkout_fix: false,
+        is_elms_popup: false
     }),
     async mounted()
     {
+
+        if(this.$route.query.elms_token)
+        {
+            this.is_elms_popup = true;
+        }
+
         if (this.user_info)
         {
             this.public_settings = await this.$_getData('public_settings');
@@ -633,8 +640,22 @@ export default {
                     sessionStorage.removeItem('referral_slot_code');
                     sessionStorage.removeItem('pending_checkout');
                     this.product_list = [];
-                    this.$emit('success');
-                    swal("Placement Order Successful", `Sale No. ${this.sale_id} has been successfully processed.`, "success");
+
+                    if(this.is_elms_popup)
+                    {
+                        swal(
+                        {
+                            text: `Sale No. ${this.sale_id} has been successfully processed.`,
+                            closeOnClickOutside: false,
+                            closeOnEsc: false,
+                            close:window.close()
+                        })
+                    }
+                    else
+                    {
+                        swal("Placement Order Successful", `Sale No. ${this.sale_id} has been successfully processed.`, "success");
+                    }
+
 
                     // this.$q.dialog({ title: "Transaction Succesful!", message: `Sale No. ${pending_checkout.sale_id} has been successfully processed.` });
                 }
@@ -2566,15 +2587,40 @@ export default {
             this.payment_method = this.payment_method_list[index];
             this.checkout_info.payment_method = this.payment_method_list[index];
         },
+        confirmedCheckoutElms(payment_method)
+        {
+            this.product_list = [];
+            if(payment_method!="online_payment")
+            {
+                this.$emit('success');
+            }
+
+            swal(
+            {
+                text: `Sale No. ${this.sale_id.data} has been successfully processed.`,
+                closeOnClickOutside: false,
+                closeOnEsc: false,
+                close:this.onCloseElmsPopup()
+            })
+            .then((value) => 
+            {
+                window.close();
+            });
+
+        },
+        onCloseElmsPopup()
+        {
+            this.is_dialog_confirm_open = false;
+        },
         confirmedCheckout(payment_method)
         {
+
             this.is_dialog_confirm_open = false;
             this.product_list = [];
             if(payment_method!="online_payment")
             {
                 this.$emit('success');
             }
-
         },
         async addQuantity(i, ind)
         {