jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/2024.12.03' into CSR-2417-close-cart-on-submit

Browse source
This commit is contained in:
CarlNation 2024-11-26 15:18:17 -05:00 committed by GitHub
commit 8c3c799d1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/fmg-components/cart/cart.vue
View file

@ -749,8 +749,12 @@ export default {
recycleFeeCartItemName() { recycleFeeCartItemName() {
return this.getCmsContent("RecycleFeeTextWidget", "Text"); return this.getCmsContent("RecycleFeeTextWidget", "Text");
}, },
requiresRecycleFeeCartItem() { showRecycleFeeCartItem() {
return !this.isRepair; if (!this.isInsurance || this.isItac || this.isNoComp) { // CASH, ITAC, NOCOMP ORDERS
return !this.isRepair;
} else {
return false;
}
}, },
recycleFeeCartItem() { recycleFeeCartItem() {
let cartItem = null; let cartItem = null;
@ -759,7 +763,7 @@ export default {
(supportingItem) => supportingItem.partType == partTypeStrings.REPLACE_FEE (supportingItem) => supportingItem.partType == partTypeStrings.REPLACE_FEE
); );
if (!recycleFeeLineItem && this.requiresRecycleFeeCartItem) { if (!recycleFeeLineItem && this.showRecycleFeeCartItem) {
recycleFeeLineItem = { recycleFeeLineItem = {
partNumber: partTypeStrings.RECYCLE_FEE, partNumber: partTypeStrings.RECYCLE_FEE,
partType: partTypeStrings.REPLACE_FEE, partType: partTypeStrings.REPLACE_FEE,

6
src/layouts/confirmation/confirmation.vue
View file

@ -112,6 +112,8 @@ import { containsRecalParts } from "@/helpers/recal-helper.js";
export default { export default {
name: "confirmation", name: "confirmation",
async beforeRouteEnter(to, from, next) { async beforeRouteEnter(to, from, next) {
const hasRecalPriceRemoveExperiment = await store.getters.shouldHideRecalibration;
await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER); // This nulls the Store order await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER); // This nulls the Store order
// Call APIs // Call APIs
@ -156,10 +158,6 @@ export default {
const isNoComp = submittedOrder?.policy?.isNoComp; const isNoComp = submittedOrder?.policy?.isNoComp;
const isItac = submittedOrder?.policy?.isItac; const isItac = submittedOrder?.policy?.isItac;
const isRecalibrationOnOrder = containsRecalParts(lineItemsFromSubmittedOrder); const isRecalibrationOnOrder = containsRecalParts(lineItemsFromSubmittedOrder);
const hasRecalPriceRemoveExperiment =
experimentMixin.methods
.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)
?.toLowerCase() === "true";
const shouldHideRecalibration = () => { const shouldHideRecalibration = () => {
if (isNoComp || isItac) { if (isNoComp || isItac) {

5
src/layouts/payment-method/payment-method.vue
View file

@ -47,7 +47,7 @@
v-bind:isDismissible="false" /> v-bind:isDismissible="false" />
</div> </div>
<div v-if="!isInsurance" class="questions-about-service my-5"> <div v-if="isRecalibrationOnOrder && shouldHideRecalibration" class="questions-about-service my-5">
<textBlock <textBlock
cmsWidgetName="QuestionsAboutYourServiceWidget" cmsWidgetName="QuestionsAboutYourServiceWidget"
justifyText="left" justifyText="left"
@ -55,8 +55,7 @@
<textBlock cmsWidgetName="CallOrTextWidget" justifyText="left" /> <textBlock cmsWidgetName="CallOrTextWidget" justifyText="left" />
<hr class="my-5" /> <hr class="my-5" />
<div <div
class="d-flex flex-row checkbox-group" class="d-flex flex-row checkbox-group">
v-if="isRecalibrationOnOrder && shouldHideRecalibration">
<checkboxQuestion <checkboxQuestion
cmsWidgetName="RecalConfirmWidget" cmsWidgetName="RecalConfirmWidget"
class="mb-5" class="mb-5"

24
src/layouts/vehicle-damage/vehicle-damage.vue
View file

@ -436,7 +436,6 @@ export default {
policy.policyNumber !== ""; policy.policyNumber !== "";
const skipVin = await skipVinLookup(); const skipVin = await skipVinLookup();
if (vehicleChangedDuringPolicyLookupInHeritage) { if (vehicleChangedDuringPolicyLookupInHeritage) {
if (skipVin) { if (skipVin) {
this.$router.navigateWithSaving( this.$router.navigateWithSaving(
@ -455,13 +454,22 @@ export default {
{ [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false } { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
); );
} else { } else {
this.$router.navigateWithSaving( if (store.getters.vehicle.vin) {
this.navigationScenarios this.$router.navigateWithSaving(
.CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE, this.navigationScenarios
this.$route, .CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
{}, this.$route,
{ [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false } {},
); { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
);
} else {
this.$router.navigateWithSaving(
this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
this.$route,
{},
{ [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
);
}
} }
} }
} }