Merge branch 'develop' into feature/CSR-1088

src/constants/application-config.js

@@ -9,7 +9,7 @@ const applicationConfig = {
     APPLICATION_ABBREVIATION: "fmg",
     PAGE_QUERYSTRING: "fmgPage",
     SITE_ENTRY_TRIGGER_VALUE: "FixMyGlass",
-    CASH_ACCOUNT_NUMBER: 167132,
+    CASH_PARENT_ACCOUNT_NUMBER: 167132,
 };
 
 export { applicationConfig };

src/constants/tint-mapper.js

@@ -32,6 +32,7 @@ const tintMap = {
         { name: "gray tint", src: "Glass-NoShade-GrayTint.svg" },
         { 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" },
 
         // No shade or tint
         { name: "clear", src: "Glass-NoShade-NoTint.svg" },

src/layouts/quote/quote.spec.js

@@ -66,7 +66,7 @@ store.getters = {
         payment: {
             insuranceCoverage: {},
             isInsurance: false,
-            parentAccountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+            parentAccountNumber: applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
         },
     },
 };
@@ -76,7 +76,7 @@ afterEach(() => {
     store.getters = {
         order: {
             payment: {
-                parentAccountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+                parentAccountNumber: applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
             },
         },
         payment: {

src/layouts/quote/quote.vue

@@ -185,14 +185,14 @@ export default {
             if (!this.isInsuranceSelected) {
                 this.dispatchStoreAction(
                     this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
-                    applicationConfig.CASH_ACCOUNT_NUMBER,
+                    applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
                     false
                 );
             }
 
             if (
                 this.$store.getters.order.payment.parentAccountNumber !=
-                applicationConfig.CASH_ACCOUNT_NUMBER
+                applicationConfig.CASH_PARENT_ACCOUNT_NUMBER
             ) {
                 this.supportingItems = this.filterOutFees(this.supportingItems);
             }

src/store/index.js

@@ -934,7 +934,7 @@ export const actions = {
             payload: {
                 carId: carId,
                 serviceType: isRepair ? "Repair" : "Replace",
-                parentAccountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+                parentAccountNumber: applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
                 parts: glassPartsArray,
                 numberOfRepairChips: isRepair ? numberOfChips : 0,
             },
@@ -1448,7 +1448,7 @@ export const actions = {
         const vehicle = context.getters.order.vehicle;
 
         let queryString =
-            `ParentAccountNumber=${applicationConfig.CASH_ACCOUNT_NUMBER}` +
+            `ParentAccountNumber=${applicationConfig.CASH_PARENT_ACCOUNT_NUMBER}` +
             `&CTU=${ctuToUse}` +
             `&CarId=${vehicle.carId}` +
             `&Make=${vehicle.make}` +

src/styles/common-error-styles.scss

@@ -136,6 +136,18 @@ html {
             }
         }
     }
+    //Quote page radio button group
+    .package-main {
+        .package-wrapper {
+            .has-error {
+                input[type="radio"] {
+                    + .package-label {
+                        border: 1px solid $red;
+                    }
+                }
+            }
+        }
+    }
     //Restore to default style if alert box is present
     .alertError {
         .has-error {