Merge remote-tracking branch 'origin/develop' into feature/CSR-2076

src/constants/tint-mapper.js

@@ -33,6 +33,7 @@ const tintMap = {
         { name: "green tint", src: "Glass-NoShade-GreenTint.svg" },
         { name: "gray tint privacy", src: "Glass-NoShade-GrayTint.svg" },
         { name: "blue tint", src: "Glass-NoShade-BlueTint.svg" },
+        { name: "green tint privacy", src: "Glass-NoShade-Privacy.svg" },
 
         // No shade or tint
         { name: "clear", src: "Glass-NoShade-NoTint.svg" },

src/layouts/payment-method/payment-method.vue

@@ -559,11 +559,12 @@ export default {
             const piaExperience = this.getSettingValue(experimentSettings.PIA_EXPERIENCE);
             const piaInsurance = this.getSettingValue(experimentSettings.PIA_INSURANCE);
 
-            const isEnabled =
+            var isEnabled = false;
-                (piaExperience === "PIA Optional" ||
+            if (this.isInsurance) {
-                    piaExperience === "PIA Required" ||
+                isEnabled = piaInsurance === "true" && this.currentDeductible !== 0;
-                    piaInsurance === "true") &&
+            } else {
-                this.currentDeductible !== 0;
+                isEnabled = piaExperience === "PIA Optional" || piaExperience === "PIA Required";
+            }
 
             return !isEnabled;
         },

src/layouts/service-location/appointment-type-question/appointment-type-question.vue

@@ -32,6 +32,7 @@ export default {
         cmsWidgetName: String,
         isServiceableMobile: Boolean,
         isServiceableInshop: Boolean,
+        mobileFeeApplies: Boolean,
     },
     computed: {
         questionText() {
@@ -45,7 +46,8 @@ export default {
             const shouldShowInshop = this.isServiceableInshop;
             const shouldShowDropoff =
                 this.isServiceableInshop && !this.$store.getters.damage.isRepair;
-            return this.answersFromCms
+
+            var answers = this.answersFromCms
                 ? this.answersFromCms.filter((answer) => {
                       return (
                           (answer.Name == AppointmentTypeStrings.IN_SHOP && shouldShowInshop) ||
@@ -54,6 +56,15 @@ export default {
                       );
                   })
                 : [];
+
+            if (!this.mobileFeeApplies) {
+                answers.forEach((item) => {
+                    if (item.Name.toLowerCase() === "mobile") {
+                        item.SubText = item.SubText.replace("*", "");
+                    }
+                });
+            }
+            return answers;
         },
         selectedValue: {
             get: function () {

src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue

@@ -25,6 +25,7 @@
                     </span>
                 </div>
                 <textBlock
+                    v-if="mobileFeeApplies"
                     :customText="mobileFeeText"
                     cmsWidgetName="MobileFeeDisclaimerWidget"
                     typeStyle="caption" />
@@ -153,6 +154,7 @@ export default {
         alertInvalidZipWidgetName: String,
         customComponentId: String,
         validationRules: String,
+        mobileFeeApplies: Boolean,
     },
     computed: {
         mobileLocationLinkPromptText() {

src/layouts/service-location/service-location.vue

@@ -67,6 +67,7 @@
                         :isServiceableMobile="isServiceableMobile"
                         :isServiceableInshop="isServiceableInshop"
                         :isDisplayed="isAppointmentTypeDisplayed"
+                        :mobileFeeApplies="mobileFeeApplies"
                         ref="appointmentTypeQuestion"
                         groupName="appointmentTypeQuestion"
                         cmsWidgetName="AppointmentTypeQuestionWidget"
@@ -80,6 +81,7 @@
                         v-if="selectedAppointmentType === 'Mobile'"
                         v-model="mobileLocationQuestions"
                         :mobileFeePart="mobileFeePart"
+                        :mobileFeeApplies="mobileFeeApplies"
                         @updated-mobile-fee-part="setMobileFeePart"
                         @updated-serviceability="setServiceabilityDetails"
                         @updated-contains-military-base="setContainsMilitaryBase"
@@ -300,6 +302,13 @@ export default {
                 return this.isGlassServiceableMobile;
             }
         },
+        mobileFeeApplies() {
+            if (this.mobileFeePart) {
+                return true;
+            } else {
+                return false;
+            }
+        },
         isServiceableInshop() {
             if (this.isRecalibrationServiceableInshop !== null) {
                 return this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;