Merge branch 'develop' into rlsmerge/2024.11.21-to-dev-freeze

This commit is contained in:
CarlNation 2024-11-21 08:37:29 -05:00
commit b476b6b3c6
4 changed files with 16 additions and 6 deletions

View file

@ -109,7 +109,7 @@ export async function getImplicitNavigation(toRoute) {
Used to navigate to the heritage funnel with the correct query string and url.
*/
export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog }) {
export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog, navType }) {
const log = getQuerystringParameter(queryStrings.LOG);
if (log === "true") {
console.log("------------- Navigate to heritage start -----------------");
@ -136,6 +136,10 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo
heritageParms["promo"] = promo;
}
if (navType) {
heritageParms["navType"] = navType;
}
if (
(process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglasstest") &&
process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") ||

View file

@ -428,7 +428,8 @@ export default {
);
},
shouldHideRecalibration() {
return store.getters.shouldHideRecalibration;
if (this.isInsuranceSelected) return false;
return (experimentMixin.methods.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)?.toLowerCase() === "true" && this.isRecalibrationOnOrder);
},
showAfterpayBanner() {
return (

View file

@ -315,11 +315,12 @@ export default {
font-weight: 600;
font-size: 0.875rem;
display: flex;
justify-content: space-between;
justify-content: flex-end;
align-items: center;
div.strikethrough-discount-price {
text-decoration: line-through;
margin-right: 0.5rem;
font-weight: 600;
font-weight: 400;
font-size: 0.75rem;
line-height: 20px;
color: $gray-550;
@ -393,7 +394,7 @@ export default {
display: flex;
flex-direction: row;
margin: auto;
margin-left: -2rem;
margin-left: -1.25rem;
padding: 0.5rem 1rem;
border-radius: 0.25rem;
margin-top: 0.5rem;

View file

@ -520,7 +520,11 @@ export default {
(payment?.insuranceCoverage?.isVerified ||
store.getters.order.referralNumber.length === 6)
) {
navigateToHeritageFunnel({ shouldSaveSession: false });
navigateToHeritageFunnel({
shouldSaveSession: false,
pageNameToLog: "service-location",
navType: "back",
});
} else {
this.$router.navigateWithoutSaving(
this.navigationScenarios.CLICKED_BACK,