From e4402a621599ce92bab227370ae2fa27842cd4bb Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 18 Jul 2024 14:04:40 -0400
Subject: [PATCH 1/7] CSR-2140 QA Updates.

---
 src/layouts/quote/quote.vue                                | 7 ++++++-
 .../service-package-radio/service-package-radio.vue        | 7 +++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index a85fd7d29..a7ab3df24 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -454,7 +454,12 @@ export default {
     },
 };
 </script>
-<style scoped>
+<style>
+.funnel-sub-header {
+    p {
+        font-size: 1rem;
+    }
+}
 .text-block {
     display: block;
 }
diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
index eb72aeedc..ffe599bba 100644
--- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
@@ -38,7 +38,7 @@
                                 class="strikethrough-price"
                                 v-if="shouldDisplayStrikeThroughPrice"
                                 v-html="this.additionalButtonData.strikeThroughPrice"></span>
-                            <span v-html="this.buttonAuxillaryCopy"></span>*
+                            <span v-html="this.buttonAuxillaryCopy"></span>
                         </span>
                     </p>
                     <p
@@ -150,9 +150,9 @@ export default {
             display: block;
             @include media-breakpoint-up(md) {
                 display: flex;
-                min-height: 320px;
+                min-height: 336px;
             }
-            @include media-breakpoint-up(xl) {
+            @media only screen and (min-width: 860px) {
                 display: flex;
                 min-height: 276px;
             }
@@ -336,7 +336,6 @@ export default {
                 margin: 1rem 0 0 -15px;
                 padding: 0;
                 li {
-                    margin-bottom: 0.5rem;
                     font-size: 0.875rem;
                     line-height: 1.714;
                     color: $gray-550;

From 9de920de56269165e173d3f9f1ba635a6d8aa894 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 18 Jul 2024 14:07:22 -0400
Subject: [PATCH 2/7] Comment update.

---
 .../service-package-radio/service-package-radio.vue             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
index ffe599bba..7b4f4ef7a 100644
--- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
@@ -152,6 +152,8 @@ export default {
                 display: flex;
                 min-height: 336px;
             }
+            //Unique breakpoint for this page only to accommodate price spacing issues
+            //from use of position: absolute on .service-package-discount (per Design Team request)
             @media only screen and (min-width: 860px) {
                 display: flex;
                 min-height: 276px;

From 8b507d21ad3700a38191d9958b8e277d36227520 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 18 Jul 2024 16:11:13 -0400
Subject: [PATCH 3/7] CSR-2130 latest applepay

CSR-2130 apple merchant id file, pass hybrid for new hop form, show afterpay, check for IOS version for applepay
---
 azure-pipelines.yml                           |  4 +
 ...-merchantid-domain-association-nonprod.txt | 74 +++++++++++++++++++
 ...per-merchantid-domain-association-prod.txt | 74 +++++++++++++++++++
 public/css/hop-styling.css                    |  3 -
 public/scss/hop-styling.scss                  |  4 -
 .../payment-method-question.vue               | 41 +++++-----
 src/layouts/payment-method/payment-method.vue | 15 ++--
 src/layouts/payment/payment.vue               | 19 ++---
 src/mixins/base-mixin.js                      | 16 ++++
 9 files changed, 205 insertions(+), 45 deletions(-)
 create mode 100644 public/applepay/apple-developer-merchantid-domain-association-nonprod.txt
 create mode 100644 public/applepay/apple-developer-merchantid-domain-association-prod.txt

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8f163704d..31f49f765 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -75,6 +75,7 @@ stages:
                               steps:
                                   - checkout: self
                                     clean: true
+                                  - bash: cp applepay/apple-developer-merchantid-domain-association-nonprod.txt apple-developer-merchantid-domain-association.txt
                                   - template: templates/digital/step-build-vue.yml@AzureDevOps
                                     parameters:
                                         buildOutputDir: dist
@@ -134,6 +135,7 @@ stages:
                               steps:
                                   - checkout: self
                                     clean: true
+                                  - bash: cp applepay/apple-developer-merchantid-domain-association-nonprod.txt apple-developer-merchantid-domain-association.txt
                                   - template: templates/digital/step-build-vue.yml@AzureDevOps
                                     parameters:
                                         buildOutputDir: dist
@@ -193,6 +195,7 @@ stages:
                               steps:
                                   - checkout: self
                                     clean: true
+                                  - bash: cp applepay/apple-developer-merchantid-domain-association-nonprod.txt apple-developer-merchantid-domain-association.txt
                                   - template: templates/digital/step-build-vue.yml@AzureDevOps
                                     parameters:
                                         buildOutputDir: dist
@@ -252,6 +255,7 @@ stages:
                               steps:
                                   - checkout: self
                                     clean: true
+                                  - bash: cp applepay/apple-developer-merchantid-domain-association-prod.txt apple-developer-merchantid-domain-association.txt
                                   - template: templates/digital/step-build-vue.yml@AzureDevOps
                                     parameters:
                                         buildOutputDir: dist
diff --git a/public/applepay/apple-developer-merchantid-domain-association-nonprod.txt b/public/applepay/apple-developer-merchantid-domain-association-nonprod.txt
new file mode 100644
index 000000000..f358f5b28
--- /dev/null
+++ b/public/applepay/apple-developer-merchantid-domain-association-nonprod.txt
@@ -0,0 +1,74 @@
+MIIQaQYJKoZIhvcNAQcCoIIQWjCCEFYCAQExCzAJBgUrDgMCGgUAMHgGCSqGSIb3DQEHAaBrBGl7
+InRlYW1JZCI6IlY4SFNZMzlOWjUiLCJkb21haW4iOiJ3d3ctdGVzdDIuc2FmZWxpdGUuY29tIiwi
+ZGF0ZUNyZWF0ZWQiOiIyMDI0LTA3LTE4LDE0OjU1OjA1IiwidmVyc2lvbiI6MX2ggg0_MIIENDCC
+AxygAwIBAgIIY_BW8s8iV_MwDQYJKoZIhvcNAQELBQAwczEtMCsGA1UEAwwkQXBwbGUgaVBob25l
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwHhcNMjQwMTMwMTgzMjA1WhcNMjkw
+MTI4MTgzMjA0WjBZMTUwMwYDVQQDDCxBcHBsZSBpUGhvbmUgT1MgUHJvdmlzaW9uaW5nIFByb2Zp
+bGUgU2lnbmluZzETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC1FX_kJQ1chXPiyq7cbeqNGGn-pv_c_cwpLk2qcBWJD79H31jO
+WFlKCB2xoQ229iBxUncHfWR_QmmLKHvyw0A9s3CBF8nkhi2ZVzd1wNTjtjcc2Dcm7kAsi3Hw7xRj
+TOS_0S-HUEUdpxJxkbQX9sNJQHBt64923LXzwWH5JKwxWb5X_kqWxYoAlse5CjmYUeqATgKGEejt
+eO1HxmV6-LAL1Ycpfmab7T296Dm6fUhkO-eIB1-efCGWkBQAV0BlJq7bo4O8jRv3o4VjOjf0rtDO
+FG8RVCdSsGjLtGs-0gDEORTorEdwUlY2X54rPlOZpuOA0lN4N7tz35kMtxySmq9lAgMBAAGjgeUw
+geIwDAYDVR0TAQH_BAIwADAfBgNVHSMEGDAWgBRv8ZUYYlzgyPHF7WwYyeDTZFKYIDBABggrBgEF
+BQcBAQQ0MDIwMAYIKwYBBQUHMAGGJGh0dHA6Ly9vY3NwLmFwcGxlLmNvbS9vY3NwMDMtYWlwY2Ew
+NzAvBgNVHR8EKDAmMCSgIqAghh5odHRwOi8vY3JsLmFwcGxlLmNvbS9haXBjYS5jcmwwHQYDVR0O
+BBYEFCkAQ-DGkwX04nv_NdJ5BvpUl3YjMA4GA1UdDwEB_wQEAwIHgDAPBgkqhkiG92NkBjoEAgUA
+MA0GCSqGSIb3DQEBCwUAA4IBAQBA51NbANKWAu-nYD7W27ilNY9YRzstmIC5_nOz1o_RTQR_Zbps
+s1G8bzM-53F6OgL8MFI2ummWpXfSL2k_bX6Y_FtCYkoyWdF-rVexy0WeCkjeRgc1G14DGy5ontva
+qGzENwiFoECYoxI4cBANSDVkhZNWBzfZ2lY4cCWo4U9oVyxYDBoWSd4_JTZzWNzlX3koj7kLA7vh
+nPUW53hsEk_BsH5x10qy_tEBNOKPbh4vC3q0wbEyhk6_W5iEaE9nh0_Anrq0MfQJtIo91t4QKkvE
+jcNN1OrFYpmYGevd0X3H99npvad4XiYUX2Pmf0Ro8ChhvcDhFeBAq_9h6HvAOUoMMIIERDCCAyyg
+AwIBAgIIXGPK5Eo3U8kwDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkFw
+cGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQD
+Ew1BcHBsZSBSb290IENBMB4XDTE3MDUxMDIxMjczMFoXDTMwMTIzMTAwMDAwMFowczEtMCsGA1UE
+AwwkQXBwbGUgaVBob25lIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJRWoBDz6DBIbH_L_cXvAege4XMHNjJi7ePXokzZM-
+TzlHunW-88DS8Vmiqx_-CoY82S2aB_IOa7kpkRpfIgqL8XJYBa5MS0TFeaeAPLCI4IwMJ4RdGeWH
+GTbL48V2t7D0QXJR9AVcg0uibaZRuPEm33terWUMxrKYUYy7fRtMwU7ICMfS7WQLtN0bjU9AfRuP
+SJaSW_PQmH7ZvKQZDplhu0FdAcxbd3p9JNDc01P_w9zFlCy2Wk2OGCM5vdnGUj7R8vQliqEqh_3Y
+DEYpUf_tF2yJJWuHv4ppFJ93n8MVt2iziEW9hOYGAkFkD60qKLgVyeCsp4q6cgQ0sniM-LKFAgMB
+AAGjgewwgekwDwYDVR0TAQH_BAUwAwEB_zAfBgNVHSMEGDAWgBQr0GlHlHYJ_vRrjS5ApvdHTX8I
+XjBEBggrBgEFBQcBAQQ4MDYwNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwLmFwcGxlLmNvbS9vY3Nw
+MDMtYXBwbGVyb290Y2EwLgYDVR0fBCcwJTAjoCGgH4YdaHR0cDovL2NybC5hcHBsZS5jb20vcm9v
+dC5jcmwwHQYDVR0OBBYEFG_xlRhiXODI8cXtbBjJ4NNkUpggMA4GA1UdDwEB_wQEAwIBBjAQBgoq
+hkiG92NkBgISBAIFADANBgkqhkiG9w0BAQsFAAOCAQEAOs-smI2-kiAhCa2V87FcIfo2LVcgRHRz
+ZJIIs5as922X-ls0OCfPEkbTPBHwB8mZkLHR6BEJpeOla2xjCD-eJfrVmZxM5uXOjrJNaOyLq6Oi
+T4oRFT7cFCscxkS2b2fFW0-VKS2HXD_cgx53T-3aVKct5xOBwWPEVAsbSwpqKCII1DeSfH9nKF-v
+PT-3rFkdODRkWu4zShlCRCnEyhhr4cFTLS30TcIV9jMyGHjxJm-KTeuUTKPo_w-zA4tl2usu2GVQ
+n9yfit8xqIRU3FJSQdKyEx0xRkeIXz7uw_KMIwSV66yKPoJsBp8u44tDmmJbNA30mc8s7rpyhhkj
+pfyOtTCCBLswggOjoAMCAQICAQIwDQYJKoZIhvcNAQEFBQAwYjELMAkGA1UEBhMCVVMxEzARBgNV
+BAoTCkFwcGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYw
+FAYDVQQDEw1BcHBsZSBSb290IENBMB4XDTA2MDQyNTIxNDAzNloXDTM1MDIwOTIxNDAzNlowYjEL
+MAkGA1UEBhMCVVMxEzARBgNVBAoTCkFwcGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1BcHBsZSBSb290IENBMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA5JGpCR-R2x5HUOsF7V55hC3rNqJXTFXsixmJ3vlLbPUHqyIwAugYPvhQ
+CdN_QaiY-dHKZpwkaxHQo7vkGyrDH5WeegykR4tb1BY3M8vED03OFGnRyRly9V0O1X9fm_IlA7pV
+j01dDfFkNSMVSxVZHbOU9_acns9QusFYUGePCLQg98usLCBvcLY_ATCMt0PPD5098ytJKBrI_s61
+uQ7ZXhzWyz21Oq30Dw4AkguxIRYudNU8DdtiFqujcZJHU1XBry9Bs_j743DN5qNMRX4fTGtQlkGJ
+xHRiCxCDQYczioGxMFjsWgQyjGizjx3eZXP_Z15lvEnYdp8zFGWhd5TJLQIDAQABo4IBejCCAXYw
+DgYDVR0PAQH_BAQDAgEGMA8GA1UdEwEB_wQFMAMBAf8wHQYDVR0OBBYEFCvQaUeUdgn-9GuNLkCm
+90dNfwheMB8GA1UdIwQYMBaAFCvQaUeUdgn-9GuNLkCm90dNfwheMIIBEQYDVR0gBIIBCDCCAQQw
+ggEABgkqhkiG92NkBQEwgfIwKgYIKwYBBQUHAgEWHmh0dHBzOi8vd3d3LmFwcGxlLmNvbS9hcHBs
+ZWNhLzCBwwYIKwYBBQUHAgIwgbYagbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFu
+eSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2Vy
+dGlmaWNhdGlvbiBwcmFjdGljZSBzdGF0ZW1lbnRzLjANBgkqhkiG9w0BAQUFAAOCAQEAXDaZTC14
+t-2Mm9zzd5vydtJ3ME_BH4WDhRuZPUc38qmbQI4s1LGQEti-9HOb7tJkD8t5TzTYoj75eP9ryAfs
+fTmDi1Mg0zjEsb-aTwpr_yv8WacFCXwXQFYRHnTTt4sjO0ej1W8k4uvRt3DfD0XhJ8rxbXjt57UX
+F6jcfiI1yiXV2Q_Wa9SiJCMR96Gsj3OBYMYbWwkvkrL4REjwYDieFfU9JmcgijNq9w2Cz97roy_5
+U2pbZMBjM3f3OgcsVuvaDyEO2rpzGU-12TZ_wYdV2aeZuTJC-9jVcZ5-oVK3G72TQiQSKscPHbZN
+nF5jyEuAF1CqitXa5PzQCQc3sHV1ITGCAoUwggKBAgEBMH8wczEtMCsGA1UEAwwkQXBwbGUgaVBo
+b25lIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMCCGPwVvLPIlfzMAkGBSsOAwIa
+BQCggdwwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMjQwNzE4MTQ1
+NTA1WjAjBgkqhkiG9w0BCQQxFgQUYwvDx1yr56NtJEdxh--NMv9wqDEwKQYJKoZIhvcNAQk0MRww
+GjAJBgUrDgMCGgUAoQ0GCSqGSIb3DQEBAQUAMFIGCSqGSIb3DQEJDzFFMEMwCgYIKoZIhvcNAwcw
+DgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0G
+CSqGSIb3DQEBAQUABIIBAJ6WUgCnMMT4q4LQjeOOpLWsXJRdns3b5aBEKoK3NIetn3I_bWo0wmX3
+Rxuy29Ljv_0bGC0PfcXyBXWtg1LQ4EzUpgpVK_IeZrlX6HcKwxgZwkejwVg009kTYNir-otXP1AM
+YNfXsPA-woLAbo_Hx0MrN1EHgejqO8x5c9s7LpQQGJpVsD9Rq6sZ4VJftMtuTz4XwvU3Qypj7_RF
+Drhh-MekYg6qG7aJMzOuftkDx2BWL7Sld77ViX1Qt8zZpyoI4RW4MIxH50ERwVYlpaoHYdnit3Ct
+RZki8aS0kxFdxVY0pePF0k6h-5GbwceXATkXM4UY0-fAXqk11QevHKT8was
diff --git a/public/applepay/apple-developer-merchantid-domain-association-prod.txt b/public/applepay/apple-developer-merchantid-domain-association-prod.txt
new file mode 100644
index 000000000..f358f5b28
--- /dev/null
+++ b/public/applepay/apple-developer-merchantid-domain-association-prod.txt
@@ -0,0 +1,74 @@
+MIIQaQYJKoZIhvcNAQcCoIIQWjCCEFYCAQExCzAJBgUrDgMCGgUAMHgGCSqGSIb3DQEHAaBrBGl7
+InRlYW1JZCI6IlY4SFNZMzlOWjUiLCJkb21haW4iOiJ3d3ctdGVzdDIuc2FmZWxpdGUuY29tIiwi
+ZGF0ZUNyZWF0ZWQiOiIyMDI0LTA3LTE4LDE0OjU1OjA1IiwidmVyc2lvbiI6MX2ggg0_MIIENDCC
+AxygAwIBAgIIY_BW8s8iV_MwDQYJKoZIhvcNAQELBQAwczEtMCsGA1UEAwwkQXBwbGUgaVBob25l
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwHhcNMjQwMTMwMTgzMjA1WhcNMjkw
+MTI4MTgzMjA0WjBZMTUwMwYDVQQDDCxBcHBsZSBpUGhvbmUgT1MgUHJvdmlzaW9uaW5nIFByb2Zp
+bGUgU2lnbmluZzETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC1FX_kJQ1chXPiyq7cbeqNGGn-pv_c_cwpLk2qcBWJD79H31jO
+WFlKCB2xoQ229iBxUncHfWR_QmmLKHvyw0A9s3CBF8nkhi2ZVzd1wNTjtjcc2Dcm7kAsi3Hw7xRj
+TOS_0S-HUEUdpxJxkbQX9sNJQHBt64923LXzwWH5JKwxWb5X_kqWxYoAlse5CjmYUeqATgKGEejt
+eO1HxmV6-LAL1Ycpfmab7T296Dm6fUhkO-eIB1-efCGWkBQAV0BlJq7bo4O8jRv3o4VjOjf0rtDO
+FG8RVCdSsGjLtGs-0gDEORTorEdwUlY2X54rPlOZpuOA0lN4N7tz35kMtxySmq9lAgMBAAGjgeUw
+geIwDAYDVR0TAQH_BAIwADAfBgNVHSMEGDAWgBRv8ZUYYlzgyPHF7WwYyeDTZFKYIDBABggrBgEF
+BQcBAQQ0MDIwMAYIKwYBBQUHMAGGJGh0dHA6Ly9vY3NwLmFwcGxlLmNvbS9vY3NwMDMtYWlwY2Ew
+NzAvBgNVHR8EKDAmMCSgIqAghh5odHRwOi8vY3JsLmFwcGxlLmNvbS9haXBjYS5jcmwwHQYDVR0O
+BBYEFCkAQ-DGkwX04nv_NdJ5BvpUl3YjMA4GA1UdDwEB_wQEAwIHgDAPBgkqhkiG92NkBjoEAgUA
+MA0GCSqGSIb3DQEBCwUAA4IBAQBA51NbANKWAu-nYD7W27ilNY9YRzstmIC5_nOz1o_RTQR_Zbps
+s1G8bzM-53F6OgL8MFI2ummWpXfSL2k_bX6Y_FtCYkoyWdF-rVexy0WeCkjeRgc1G14DGy5ontva
+qGzENwiFoECYoxI4cBANSDVkhZNWBzfZ2lY4cCWo4U9oVyxYDBoWSd4_JTZzWNzlX3koj7kLA7vh
+nPUW53hsEk_BsH5x10qy_tEBNOKPbh4vC3q0wbEyhk6_W5iEaE9nh0_Anrq0MfQJtIo91t4QKkvE
+jcNN1OrFYpmYGevd0X3H99npvad4XiYUX2Pmf0Ro8ChhvcDhFeBAq_9h6HvAOUoMMIIERDCCAyyg
+AwIBAgIIXGPK5Eo3U8kwDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkFw
+cGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQD
+Ew1BcHBsZSBSb290IENBMB4XDTE3MDUxMDIxMjczMFoXDTMwMTIzMTAwMDAwMFowczEtMCsGA1UE
+AwwkQXBwbGUgaVBob25lIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJRWoBDz6DBIbH_L_cXvAege4XMHNjJi7ePXokzZM-
+TzlHunW-88DS8Vmiqx_-CoY82S2aB_IOa7kpkRpfIgqL8XJYBa5MS0TFeaeAPLCI4IwMJ4RdGeWH
+GTbL48V2t7D0QXJR9AVcg0uibaZRuPEm33terWUMxrKYUYy7fRtMwU7ICMfS7WQLtN0bjU9AfRuP
+SJaSW_PQmH7ZvKQZDplhu0FdAcxbd3p9JNDc01P_w9zFlCy2Wk2OGCM5vdnGUj7R8vQliqEqh_3Y
+DEYpUf_tF2yJJWuHv4ppFJ93n8MVt2iziEW9hOYGAkFkD60qKLgVyeCsp4q6cgQ0sniM-LKFAgMB
+AAGjgewwgekwDwYDVR0TAQH_BAUwAwEB_zAfBgNVHSMEGDAWgBQr0GlHlHYJ_vRrjS5ApvdHTX8I
+XjBEBggrBgEFBQcBAQQ4MDYwNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwLmFwcGxlLmNvbS9vY3Nw
+MDMtYXBwbGVyb290Y2EwLgYDVR0fBCcwJTAjoCGgH4YdaHR0cDovL2NybC5hcHBsZS5jb20vcm9v
+dC5jcmwwHQYDVR0OBBYEFG_xlRhiXODI8cXtbBjJ4NNkUpggMA4GA1UdDwEB_wQEAwIBBjAQBgoq
+hkiG92NkBgISBAIFADANBgkqhkiG9w0BAQsFAAOCAQEAOs-smI2-kiAhCa2V87FcIfo2LVcgRHRz
+ZJIIs5as922X-ls0OCfPEkbTPBHwB8mZkLHR6BEJpeOla2xjCD-eJfrVmZxM5uXOjrJNaOyLq6Oi
+T4oRFT7cFCscxkS2b2fFW0-VKS2HXD_cgx53T-3aVKct5xOBwWPEVAsbSwpqKCII1DeSfH9nKF-v
+PT-3rFkdODRkWu4zShlCRCnEyhhr4cFTLS30TcIV9jMyGHjxJm-KTeuUTKPo_w-zA4tl2usu2GVQ
+n9yfit8xqIRU3FJSQdKyEx0xRkeIXz7uw_KMIwSV66yKPoJsBp8u44tDmmJbNA30mc8s7rpyhhkj
+pfyOtTCCBLswggOjoAMCAQICAQIwDQYJKoZIhvcNAQEFBQAwYjELMAkGA1UEBhMCVVMxEzARBgNV
+BAoTCkFwcGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYw
+FAYDVQQDEw1BcHBsZSBSb290IENBMB4XDTA2MDQyNTIxNDAzNloXDTM1MDIwOTIxNDAzNlowYjEL
+MAkGA1UEBhMCVVMxEzARBgNVBAoTCkFwcGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1BcHBsZSBSb290IENBMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA5JGpCR-R2x5HUOsF7V55hC3rNqJXTFXsixmJ3vlLbPUHqyIwAugYPvhQ
+CdN_QaiY-dHKZpwkaxHQo7vkGyrDH5WeegykR4tb1BY3M8vED03OFGnRyRly9V0O1X9fm_IlA7pV
+j01dDfFkNSMVSxVZHbOU9_acns9QusFYUGePCLQg98usLCBvcLY_ATCMt0PPD5098ytJKBrI_s61
+uQ7ZXhzWyz21Oq30Dw4AkguxIRYudNU8DdtiFqujcZJHU1XBry9Bs_j743DN5qNMRX4fTGtQlkGJ
+xHRiCxCDQYczioGxMFjsWgQyjGizjx3eZXP_Z15lvEnYdp8zFGWhd5TJLQIDAQABo4IBejCCAXYw
+DgYDVR0PAQH_BAQDAgEGMA8GA1UdEwEB_wQFMAMBAf8wHQYDVR0OBBYEFCvQaUeUdgn-9GuNLkCm
+90dNfwheMB8GA1UdIwQYMBaAFCvQaUeUdgn-9GuNLkCm90dNfwheMIIBEQYDVR0gBIIBCDCCAQQw
+ggEABgkqhkiG92NkBQEwgfIwKgYIKwYBBQUHAgEWHmh0dHBzOi8vd3d3LmFwcGxlLmNvbS9hcHBs
+ZWNhLzCBwwYIKwYBBQUHAgIwgbYagbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFu
+eSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2Vy
+dGlmaWNhdGlvbiBwcmFjdGljZSBzdGF0ZW1lbnRzLjANBgkqhkiG9w0BAQUFAAOCAQEAXDaZTC14
+t-2Mm9zzd5vydtJ3ME_BH4WDhRuZPUc38qmbQI4s1LGQEti-9HOb7tJkD8t5TzTYoj75eP9ryAfs
+fTmDi1Mg0zjEsb-aTwpr_yv8WacFCXwXQFYRHnTTt4sjO0ej1W8k4uvRt3DfD0XhJ8rxbXjt57UX
+F6jcfiI1yiXV2Q_Wa9SiJCMR96Gsj3OBYMYbWwkvkrL4REjwYDieFfU9JmcgijNq9w2Cz97roy_5
+U2pbZMBjM3f3OgcsVuvaDyEO2rpzGU-12TZ_wYdV2aeZuTJC-9jVcZ5-oVK3G72TQiQSKscPHbZN
+nF5jyEuAF1CqitXa5PzQCQc3sHV1ITGCAoUwggKBAgEBMH8wczEtMCsGA1UEAwwkQXBwbGUgaVBo
+b25lIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMCCGPwVvLPIlfzMAkGBSsOAwIa
+BQCggdwwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMjQwNzE4MTQ1
+NTA1WjAjBgkqhkiG9w0BCQQxFgQUYwvDx1yr56NtJEdxh--NMv9wqDEwKQYJKoZIhvcNAQk0MRww
+GjAJBgUrDgMCGgUAoQ0GCSqGSIb3DQEBAQUAMFIGCSqGSIb3DQEJDzFFMEMwCgYIKoZIhvcNAwcw
+DgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0G
+CSqGSIb3DQEBAQUABIIBAJ6WUgCnMMT4q4LQjeOOpLWsXJRdns3b5aBEKoK3NIetn3I_bWo0wmX3
+Rxuy29Ljv_0bGC0PfcXyBXWtg1LQ4EzUpgpVK_IeZrlX6HcKwxgZwkejwVg009kTYNir-otXP1AM
+YNfXsPA-woLAbo_Hx0MrN1EHgejqO8x5c9s7LpQQGJpVsD9Rq6sZ4VJftMtuTz4XwvU3Qypj7_RF
+Drhh-MekYg6qG7aJMzOuftkDx2BWL7Sld77ViX1Qt8zZpyoI4RW4MIxH50ERwVYlpaoHYdnit3Ct
+RZki8aS0kxFdxVY0pePF0k6h-5GbwceXATkXM4UY0-fAXqk11QevHKT8was
diff --git a/public/css/hop-styling.css b/public/css/hop-styling.css
index 22b1b842c..5ef43ea39 100644
--- a/public/css/hop-styling.css
+++ b/public/css/hop-styling.css
@@ -210,9 +210,6 @@ body .cc-error-container #alert-message {
 #fmg-checkout-shared .form-group .list-group.radio .list-group-item label {
   padding: 12px 20px;
 }
-#fmg-checkout-shared #afterpayParentDiv {
-  display: none;
-}
 #fmg-checkout-shared #applepay-and-paypal-container {
   display: inline-flex;
   width: 100%;
diff --git a/public/scss/hop-styling.scss b/public/scss/hop-styling.scss
index bf61cecf7..2a87f1a3b 100644
--- a/public/scss/hop-styling.scss
+++ b/public/scss/hop-styling.scss
@@ -237,10 +237,6 @@ body {
 		}
 	}
 
-    #afterpayParentDiv {
-        display: none;
-    }
-
 	#applepay-and-paypal-container {
 		display: inline-flex;
 		width: 100%;
diff --git a/src/layouts/payment-method/payment-method-question/payment-method-question.vue b/src/layouts/payment-method/payment-method-question/payment-method-question.vue
index e8122d0ef..9991e6093 100644
--- a/src/layouts/payment-method/payment-method-question/payment-method-question.vue
+++ b/src/layouts/payment-method/payment-method-question/payment-method-question.vue
@@ -10,8 +10,9 @@
             isRequired
             :validationRules="validationRules"
             :hasRecal="hasRecal"
-            :isApplePay="isApplePay"
+            :showApplePay="showApplePay"
             :isInsurance="isInsurance"
+            :isPiaEnabled="isPiaEnabled"
             v-model="selectedMethod"
             textPosition="text-start" />
     </div>
@@ -20,6 +21,7 @@
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
 import paymentMethodListButton from "./payment-method-list-button/payment-method-list-button";
+import store from "@/store";
 import { paymentMethods, paymentTimes } from "@/constants/payment-method-constants";
 
 export default {
@@ -33,8 +35,9 @@ export default {
         modelValue: String,
         validationRules: String,
         hasRecal: Boolean,
-        isApplePay: Boolean,
+        showApplePay: Boolean,
         isInsurance: Boolean,
+        isPiaEnabled: Boolean,
     },
     methods: {
         getAnswersNullSafe(widgetName) {
@@ -64,28 +67,14 @@ export default {
             if (this.hasRecal) {
                 cmsData = this.getAnswersNullSafe("PaymentMethodHasRecalWidget");
             } else {
-                if (this.isApplePay) {
+                if (this.showApplePay) {
                     cmsData = this.getAnswersNullSafe("PaymentMethodWidget");
                 } else {
                     cmsData = this.getAnswersNullSafe("PaymentMethodHasRecalWidget");
                 }
             }
 
-            if (this.hasRecal || this.isInsurance) {
-                var tempItems = cmsData.map((answer) => {
-                    return {
-                        buttonLabel: answer.Text,
-                        altText: answer.Text,
-                        groupName: "payment-method",
-                        value: answer.Name,
-                        buttonImage: answer.AnswerImageUrl,
-                    };
-                });
-
-                return tempItems.filter((a) => a.value != "Insurance");
-            }
-
-            return cmsData.map((answer) => {
+            var tempItems = cmsData.map((answer) => {
                 return {
                     buttonLabel: answer.Text,
                     altText: answer.Text,
@@ -94,6 +83,22 @@ export default {
                     buttonImage: answer.AnswerImageUrl,
                 };
             });
+
+            if (this.hasRecal || this.isInsurance) {
+                tempItems.splice(
+                    tempItems.findIndex((a) => a.value === "Insurance"),
+                    1
+                );
+            }
+
+            if (this.hasRecal || !this.isPiaEnabled) {
+                tempItems.splice(
+                    tempItems.findIndex((a) => a.value === "PayNow"),
+                    1
+                );
+            }
+
+            return tempItems;
         },
     },
     components: {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 9c663cc1b..79813cd48 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -68,8 +68,9 @@
                         v-if="isPiaEnabled && totalAmountDue > 0"
                         v-model="paymentMethodInternalModel"
                         :hasRecal="hasRecal"
-                        :isApplePay="isApplePay"
+                        :showApplePay="showApplePay"
                         :isInsurance="isInsurance"
+                        :isPiaEnabled="isPiaEnabled"
                         validationRules="payment-method-required" />
 
                     <alert
@@ -567,19 +568,17 @@ export default {
     },
     computed: {
         hasRecal() {
-            const recalLineItem = this.$store.getters.order.lineItems.supportingItems.find(
-                (lineItem) => lineItem.partType == partTypeStrings.RECALIBRATION
+            const recalLineItem = this.$store.getters.order.lineItems?.supportingItems?.find(
+                (lineItem) => lineItem.partType.indexOf(partTypeStrings.RECALIBRATION) !== -1
             );
+
             if (recalLineItem) {
                 return true;
             }
             return false;
         },
-        isApplePay() {
-            if (window.ApplePaySession && window.ApplePaySession.canMakePayments()) {
-                return true;
-            }
-            return false;
+        showApplePay() {
+            return baseMixin.methods.showApplePay();
         },
         damageInfo() {
             return this.$store.getters.damage;
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 14cc738d9..ba3db4e0e 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -407,11 +407,7 @@ export default {
     },
     computed: {
         parentNomainName() {
-            var a = document.createElement("a");
-            a.href = applicationConfig.HERITAGE_FUNNEL;
-
-            const protocol = window.location.protocol;
-            return `${protocol}//${a.hostname}`;
+            return window.location.hostname;
         },
         dynamicCSSUrl() {
             const { protocol, hostname, port } = window.location;
@@ -658,18 +654,17 @@ export default {
             this.$nextTick(() => {
                 this.$refs.hopForm.submit();
 
-                var isApplePayAvailable = false;
-                if (window.ApplePaySession && window.ApplePaySession.canMakePayments()) {
-                    isApplePayAvailable = true;
-                }
-
                 const iframe = this.$refs.paymentFrame;
                 if (iframe) {
                     iframe.onload = () => {
                         if (iframe.contentWindow) {
-                            if (isApplePayAvailable) {
+                            if (baseMixin.methods.showApplePay()) {
                                 iframe.contentWindow.postMessage("hybrid-with-applepay", "*");
-                                console.log(new Date() + ": Sent applepay");
+                                console.log(new Date() + ": Sent applepay: new hop with applepay");
+                            }
+                            else {
+                                iframe.contentWindow.postMessage("hybrid", "*");
+                                console.log(new Date() + ": Sent hybrid: new hop no applepay");
                             }
 
                             if (this.paymentType == "cc") {
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 90a6a7838..611bdc131 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -196,6 +196,22 @@ export default {
         hideFmgLoadingModal() {
             showFmgLoadingModal(false);
         },
+        showApplePay() {
+            if (window.ApplePaySession && window.ApplePaySession.canMakePayments()) {
+                var iOSversion = this.getiOSversion();
+                if (iOSversion && iOSversion[0] >= 17) {
+                    return true;
+                }
+            }
+            return false;
+        },
+        getiOSversion() {
+            if (/iP(hone|od|ad)/.test(navigator.platform)) {
+                // supports iOS 2.0 and later:
+                var v = navigator.appVersion.match(/OS (\d+)_(\d+)_?(\d+)?/);
+                return [parseInt(v[1], 10), parseInt(v[2], 10), parseInt(v[3] || 0, 10)];
+            }
+        },
     },
     computed: {
         storeActions() {

From b3dda363fa1f9b4b4b376978d4ab466264da493d Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 18 Jul 2024 21:22:56 -0400
Subject: [PATCH 4/7] CSR-2130 prettier

---
 src/layouts/payment/payment.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index ba3db4e0e..960c2c3fb 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -661,8 +661,7 @@ export default {
                             if (baseMixin.methods.showApplePay()) {
                                 iframe.contentWindow.postMessage("hybrid-with-applepay", "*");
                                 console.log(new Date() + ": Sent applepay: new hop with applepay");
-                            }
-                            else {
+                            } else {
                                 iframe.contentWindow.postMessage("hybrid", "*");
                                 console.log(new Date() + ": Sent hybrid: new hop no applepay");
                             }

From 40f0f76acc4f6ce4fa133d6cc929dfdbcc1f3c03 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 19 Jul 2024 06:06:46 -0400
Subject: [PATCH 5/7] CSR-2130 trigger build

CSR-2130 trigger build
---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 31f49f765..6b02f37eb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -300,4 +300,4 @@ stages:
                   parameters:
                       dependsOn: prodBuildDeployment
                       userName: SafeliteAzureDevops
-                      userEmail: githubazuredevops@safelite.com
+                      userEmail: githubazuredevops@safelite.com
\ No newline at end of file

From 0f6bcb99698a07e558030835994703709bc6f550 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 19 Jul 2024 06:21:06 -0400
Subject: [PATCH 6/7] CSR-2130 rename isApplePay

CSR-2130 rename isApplePay
---
 .../payment-method-question/payment-method-question.spec.js    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layouts/payment-method/payment-method-question/payment-method-question.spec.js b/src/layouts/payment-method/payment-method-question/payment-method-question.spec.js
index 96a9d02b9..ad959fdf9 100644
--- a/src/layouts/payment-method/payment-method-question/payment-method-question.spec.js
+++ b/src/layouts/payment-method/payment-method-question/payment-method-question.spec.js
@@ -109,8 +109,9 @@ function generateDefaultProps() {
     return {
         modelValue: "modelValue",
         hasRecal: false,
-        isApplePay: true,
+        showApplePay: true,
         isInsurance: false,
+        isPiaEnabled: true,
     };
 }
 

From aaf9ec66ba9dcd38ec1a4d745a7bb840b77cd5e1 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 19 Jul 2024 06:35:37 -0400
Subject: [PATCH 7/7] CSR-2130 trying to work out the bash copy

CSR-2130 trying to work out the bash copy for applepay merchant file
---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6b02f37eb..b6222f3b5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -135,7 +135,7 @@ stages:
                               steps:
                                   - checkout: self
                                     clean: true
-                                  - bash: cp applepay/apple-developer-merchantid-domain-association-nonprod.txt apple-developer-merchantid-domain-association.txt
+                                  - bash: cp public/applepay/apple-developer-merchantid-domain-association-nonprod.txt public/apple-developer-merchantid-domain-association.txt
                                   - template: templates/digital/step-build-vue.yml@AzureDevOps
                                     parameters:
                                         buildOutputDir: dist
@@ -195,7 +195,7 @@ stages:
                               steps:
                                   - checkout: self
                                     clean: true
-                                  - bash: cp applepay/apple-developer-merchantid-domain-association-nonprod.txt apple-developer-merchantid-domain-association.txt
+                                  - bash: cp public/applepay/apple-developer-merchantid-domain-association-nonprod.txt public/apple-developer-merchantid-domain-association.txt
                                   - template: templates/digital/step-build-vue.yml@AzureDevOps
                                     parameters:
                                         buildOutputDir: dist
@@ -255,7 +255,7 @@ stages:
                               steps:
                                   - checkout: self
                                     clean: true
-                                  - bash: cp applepay/apple-developer-merchantid-domain-association-prod.txt apple-developer-merchantid-domain-association.txt
+                                  - bash: cp public/applepay/apple-developer-merchantid-domain-association-prod.txt public/apple-developer-merchantid-domain-association.txt
                                   - template: templates/digital/step-build-vue.yml@AzureDevOps
                                     parameters:
                                         buildOutputDir: dist