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

CSR-1384: refactoring re: deepClone, naming

Browse source
This commit is contained in:
Adam Caouette 2023-10-11 10:17:14 -04:00
parent 5903115a22
commit 575978ae65
2 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@
<cart <cart
:damage="damageInfo" :damage="damageInfo"
:availableLineItems="availableLineItems || []" :availableLineItems="availableLineItems"
:lineItems="lineItems" :lineItems="lineItems"
servicePackageOptionsCmsName="ServicePackageTitle" servicePackageOptionsCmsName="ServicePackageTitle"
@cart-remove="cartRemove" /> @cart-remove="cartRemove" />
@ -34,10 +34,10 @@
<add-vaps-modal-buttons <add-vaps-modal-buttons
:cartItems="cartItems" :cartItems="cartItems"
:wiperItems="availableWipers || []" :wiperItems="availableWipers"
:rainDefenseItem="availableRainDefense || {}" :rainDefenseItem="availableRainDefense"
vapsTilesCmsName="VapsProductTiles" vapsTilesCmsName="VapsProductTiles"
v-on="{ 'buttonEvent.openModal': openModalAction }" /> v-on="{ 'buttonEvent.openModal': openModal }" />
<div> <div>
<button v-on:click="ccdPayment"> <button v-on:click="ccdPayment">
@ -77,7 +77,7 @@
alt="Afterpay" /> alt="Afterpay" />
</button> </button>
</div> </div>
<button @click="openModalAction('RainDefenseModal')">OPEN MODAL</button> <button @click="openModal('RainDefenseModal')">OPEN MODAL</button>
<contentGroupModal ref="RainDefenseModal" cmsWidgetName="RainDefenseModal" /> <contentGroupModal ref="RainDefenseModal" cmsWidgetName="RainDefenseModal" />
<navbar <navbar
cmsWidgetName="FunnelFooterWidget" cmsWidgetName="FunnelFooterWidget"
@ -160,21 +160,20 @@ export default {
const glassPartsCopy = deepClone(store.getters.order.lineItems.glassParts) ?? []; const glassPartsCopy = deepClone(store.getters.order.lineItems.glassParts) ?? [];
const availableLineItems = [ const availableLineItems = [
resultMapCopy.rainDefense, resultMap.rainDefense,
...resultMapCopy.supportingItems, ...resultMap.supportingItems,
...resultMapCopy.wipers, ...resultMap.wipers,
...glassPartsCopy, ...glassPartsCopy,
]; ];
// TODO - DO WE NEED TO GET PRICINGRESULTS HERE? SEEMS TO BE THE SAME AS availableLineItems const pricedAvailableLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
// const pricingResults = await baseMixin.methods.dispatchStoreActionWithLogging( storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
// storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA, {
// { availableLineItems: availableLineItems,
// availableLineItems: availableLineItems, },
// }, "payment-method",
// "payment-method", false
// false );
// );
const lineItems = store.getters.lineItems; const lineItems = store.getters.lineItems;
const cartItems = [...glassPartsCopy, ...lineItems.supportingItems, ...lineItems.vaps]; const cartItems = [...glassPartsCopy, ...lineItems.supportingItems, ...lineItems.vaps];
@ -186,18 +185,18 @@ export default {
vm.cartItems = cartItems; // TOBEREMOVED BY AJC IN CSR-1384 vm.cartItems = cartItems; // TOBEREMOVED BY AJC IN CSR-1384
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
vm.availableLineItems = availableLineItems; vm.availableLineItems = pricedAvailableLineItems;
vm.lineItems = lineItems; vm.lineItems = lineItems;
}); });
}, },
data() { data() {
return { return {
cartItems: [], // TOBEREMOVED BY AJC IN CSR-1384 cartItems: [], // TOBEREMOVED BY AJC IN CSR-1384
availableWipers: null, // TOBEREMOVED BY AJC IN CSR-1384 availableWipers: [], // TOBEREMOVED BY AJC IN CSR-1384
availableRainDefense: null, // TOBEREMOVED BY AJC IN CSR-1384 availableRainDefense: {}, // TOBEREMOVED BY AJC IN CSR-1384
lineItems: null, lineItems: [],
availableLineItems: null, availableLineItems: [],
displayPaypalAlert: this.getPaypalAlert(), displayPaypalAlert: this.getPaypalAlert(),
}; };
}, },
@ -254,7 +253,7 @@ export default {
packageReqs && serviceLocationReqs && isInsuranceSet && scheduleReqs && customerReqs packageReqs && serviceLocationReqs && isInsuranceSet && scheduleReqs && customerReqs
); );
}, },
openModalAction(modalName) { openModal(modalName) {
this.$refs[modalName].openModal(); this.$refs[modalName].openModal();
}, },
getPaypalAlert() { getPaypalAlert() {

4
src/store/index.js
View file

@ -2064,9 +2064,9 @@ export const actions = {
context.commit(storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA, response.data.serverData); context.commit(storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA, response.data.serverData);
availableLineItems = addPricesToLineItems(availableLineItems, response.data.lineItems); const pricedLineItems = addPricesToLineItems(availableLineItems, response.data.lineItems);
return availableLineItems; return pricedLineItems;
}, },
// Misc order actions // Misc order actions