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

Merge pull request #1756 from Safelite/rlsmerge/2024.02.15-to-2024.02.22

Browse source 
Release merge - 2024.02.15 to 2024.02.22
This commit is contained in:
scottkiener 2024-02-16 10:39:39 -05:00 committed by GitHub
commit 5bee8cf7b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/layouts/address-vehicles/address-vehicles.vue
View file

@ -164,7 +164,6 @@ export default {
if ( if (
store.getters.order.vehicle.carId && store.getters.order.vehicle.carId &&
store.getters.order.serviceLocation.zipCode && store.getters.order.serviceLocation.zipCode &&
store.getters.order.customer.emailAddress &&
store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES) store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES)
) { ) {
return true; return true;

1
src/layouts/quote/quote.vue
View file

@ -43,7 +43,6 @@
class="small mt-4" class="small mt-4"
v-model="lineItems" v-model="lineItems"
:availableVaps="availableVaps" :availableVaps="availableVaps"
:availableLineItems="availableLineItems"
pageName="quote" pageName="quote"
:taxPromos="false" :taxPromos="false"
modalWidgetName="PromoModalWidget" /> modalWidgetName="PromoModalWidget" />

3
src/store/index.js
View file

@ -2310,6 +2310,9 @@ export const actions = {
) { ) {
const order = context.getters.order; const order = context.getters.order;
lineItemsToUse = lineItemsToUse ?? order.lineItems; lineItemsToUse = lineItemsToUse ?? order.lineItems;
addGuidToLineItemsIfNotAlreadyThere(lineItemsToUse.vaps);
syncLineItemIds(addableVaps, lineItemsToUse.vaps);
// addableVaps still won't have IDs if they weren't already in lineItemsToUse
addGuidToLineItemsIfNotAlreadyThere(addableVaps); addGuidToLineItemsIfNotAlreadyThere(addableVaps);
const requestObject = { const requestObject = {
promoCode: promoCode, promoCode: promoCode,

10
src/store/store.spec.js
View file

@ -2933,7 +2933,7 @@ describe("Actions", () => {
// Arrange // Arrange
const context = state; const context = state;
const promoCode = "testPromo"; const promoCode = "testPromo";
const lineItemsToUse = { vaps: [1], promos: [2] }; const lineItemsToUse = { vaps: [{ partNumber: 1 }], promos: [2] };
const addableVaps = [{ partNumber: "addableVap" }]; const addableVaps = [{ partNumber: "addableVap" }];
context["getters"] = { context["getters"] = {
@ -3013,7 +3013,7 @@ describe("Actions", () => {
}, },
referralSequenceNumber: "test", referralSequenceNumber: "test",
lineItems: { lineItems: {
vaps: [1], vaps: [{ partNumber: 1 }],
promos: [2], promos: [2],
serverData: "test", serverData: "test",
}, },
@ -3026,7 +3026,7 @@ describe("Actions", () => {
crypto.randomUUID = jest.fn(() => "GUID"); crypto.randomUUID = jest.fn(() => "GUID");
const expectedLineItemsOnOrder = [1, 2]; const expectedLineItemsOnOrder = [{ partNumber: 1, id: "GUID" }, 2];
// Act // Act
actions.validateOrderPromoAndSaveServerData(context, { actions.validateOrderPromoAndSaveServerData(context, {
@ -3073,7 +3073,7 @@ describe("Actions", () => {
}, },
referralSequenceNumber: "test", referralSequenceNumber: "test",
lineItems: { lineItems: {
vaps: [1], vaps: [{ partNumber: 1 }],
promos: [2], promos: [2],
serverData: "test", serverData: "test",
}, },
@ -3131,7 +3131,7 @@ describe("Actions", () => {
}, },
referralSequenceNumber: "test", referralSequenceNumber: "test",
lineItems: { lineItems: {
vaps: [1], vaps: [{ partNumber: 1 }],
promos: [2], promos: [2],
serverData: "test", serverData: "test",
}, },