From 6933e7fc9221db4533ee53b40608826767f77085 Mon Sep 17 00:00:00 2001
From: Michaela Brydon <Michaela.Brydon@safelite.com>
Date: Mon, 18 Nov 2024 13:35:08 -0500
Subject: [PATCH 1/2] Fixing loading modal position

---
 src/layouts/payment-page/payment-page.vue     | 15 +++++++++++----
 src/layouts/payment-return/payment-return.vue |  4 ----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/layouts/payment-page/payment-page.vue b/src/layouts/payment-page/payment-page.vue
index c709ae39..efdc2638 100644
--- a/src/layouts/payment-page/payment-page.vue
+++ b/src/layouts/payment-page/payment-page.vue
@@ -382,9 +382,10 @@
             name="calling_application"
             value="ISSNextGen" />
 
-        <input type="hidden"
+        <input
+type="hidden"
                name="parentdomainname"
-               :value="parentNomainName" />
+               :value="parentDomainName" />
     </form>
 </template>
 <script>
@@ -409,6 +410,7 @@ import queryStrings from '@/constants/query-strings';
 import alert from '@/ux-components/alert/alert.vue';
 import cartDropdown from '@/iss-components/cart-dropdown/cart-dropdown.vue';
 import { formatAmountInDollars } from '@/helpers/text-helper';
+import showIssLoadingModal from '@/helpers/loading-modal-helper';
 
 export default {
     name: 'payment-page',
@@ -499,7 +501,7 @@ export default {
         };
     },
     computed: {
-        parentNomainName() {
+        parentDomainName() {
             return window.location.hostname;
         },
         payInAdvanceResponseUrl() {
@@ -731,16 +733,20 @@ export default {
             }
 
             if (event.data.includes('creditCardSubmit')) {
+                this.showIssLoadingModal(true);
                 useMainStore().savePaymentMethodChoice(paymentMethods.CREDIT_CARD);
                 this.setUIBlock(true);
             }
             if (event.data.includes('afterpayPaymentReceived')) {
+                this.showIssLoadingModal(true);
                 useMainStore().savePaymentMethodChoice(paymentMethods.AFTERPAY);
             }
             if (event.data.includes('applepayOpened')) {
+                this.showIssLoadingModal(true);
                 useMainStore().savePaymentMethodChoice(paymentMethods.APPLEPAY);
             }
             if (event.data.includes('showLoaderForPaypal')) {
+                this.showIssLoadingModal(true);
                 useMainStore().savePaymentMethodChoice(paymentMethods.PAYPAL);
             }
         },
@@ -775,7 +781,8 @@ export default {
                 this.navigationScenarios.CLICKED_FORWARD,
                 this.$route
             );
-        }
+        },
+        showIssLoadingModal
     }
 };
 </script>
diff --git a/src/layouts/payment-return/payment-return.vue b/src/layouts/payment-return/payment-return.vue
index eed08848..39dc8465 100644
--- a/src/layouts/payment-return/payment-return.vue
+++ b/src/layouts/payment-return/payment-return.vue
@@ -15,7 +15,6 @@ import getQueryStringParameter from '@/helpers/querystring-helper.js';
 import { paymentMethods } from '@/constants/payment-method-constants.js';
 import { getCartTotal } from '@/helpers/cart-helper';
 import { submitWorkOrder } from '@/helpers/order-helper.js';
-import showIssLoadingModal from '@/helpers/loading-modal-helper';
 import submitType from '@/constants/submit-type';
 
 export default {
@@ -44,7 +43,6 @@ export default {
         }
     },
     async mounted() {
-        showIssLoadingModal(true);
         const payInAdvanceError = getQueryStringParameter(queryStrings.ERROR);
         const { paymentMethod } = useMainStore().order.payment;
 
@@ -130,11 +128,9 @@ export default {
             } catch (error) {
                 console.error(`error: response from submit work order:${error.message}`);
                 this.navigateOnPayInAdvanceError();
-                showIssLoadingModal(false);
                 return;
             }
 
-            showIssLoadingModal(false);
             this.$router.navigate(
                 this.navigationScenarios.PAY_IN_ADVANCE_SUCCESS,
                 this.$route

From 04af205b1c2eaf0237abc8d740d3de79bde82c0d Mon Sep 17 00:00:00 2001
From: Michaela Brydon <Michaela.Brydon@safelite.com>
Date: Mon, 18 Nov 2024 14:15:26 -0500
Subject: [PATCH 2/2] need loading modal to appear on return page

---
 src/layouts/payment-return/payment-return.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/layouts/payment-return/payment-return.vue b/src/layouts/payment-return/payment-return.vue
index 39dc8465..08f844a8 100644
--- a/src/layouts/payment-return/payment-return.vue
+++ b/src/layouts/payment-return/payment-return.vue
@@ -16,6 +16,7 @@ import { paymentMethods } from '@/constants/payment-method-constants.js';
 import { getCartTotal } from '@/helpers/cart-helper';
 import { submitWorkOrder } from '@/helpers/order-helper.js';
 import submitType from '@/constants/submit-type';
+import showIssLoadingModal from '@/helpers/loading-modal-helper';
 
 export default {
     name: 'payment-return',
@@ -43,6 +44,7 @@ export default {
         }
     },
     async mounted() {
+        showIssLoadingModal(true);
         const payInAdvanceError = getQueryStringParameter(queryStrings.ERROR);
         const { paymentMethod } = useMainStore().order.payment;