From 07609b9ddefdabfb5b63bfb5e757876fdf134ff0 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Thu, 18 May 2023 15:44:35 -0400 Subject: [PATCH] CSR-1137 | First deploy to dev --- src/layouts/schedule/schedule.vue | 40 ++++++++++++++----------------- src/mixins/base-mixin.js | 1 - 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index e467ac142..dd4bfbdc1 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -138,17 +138,6 @@ export default { initialViewRowsToShow: 5, customSelectableDatesCallback: getAvailableDates, - // Price EARLY BIRD pre-emptively to allow for asynchronous call to pricing - // const pricingPromise = baseMixin.methods.dispatchStoreAction( - // storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA, - // { - // availableLineItems: [ - // {partNumber: "EARLY BIRD"} - // ], - // }, - // false - // ); - /* vvvvv SAVE THESE FOR TESTING PURPOSES FOR NOW vvvvv // todayOverrideDateString: "2023-04-29T03:00:00", // show partial @@ -166,6 +155,17 @@ export default { */ }); + // Price EARLY BIRD pre-emptively to allow for asynchronous call to pricing + const pricingPromise = baseMixin.methods.dispatchStoreAction( + storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA, + { + availableLineItems: [ + {partNumber: "EARLY BIRD"} + ], + }, + false + ); + const earlyBirdPromise = baseMixin.methods.dispatchStoreAction( storeActions.GET_MOBILE_EARLY_BIRD_FEE ); @@ -189,10 +189,10 @@ export default { resultKey: "earlyBird", promise: earlyBirdPromise, }, - // { - // resultKey: "pricingResults", - // promise: pricingPromise, - // }, + { + resultKey: "pricingResults", + promise: pricingPromise, + }, ]; const resultMap = await settleAllPromises(promiseResultMap); @@ -202,14 +202,10 @@ export default { vm.setCmsContent(resultMap.cmsContent); vm.setData(resultMap.alertReasons); vm.$refs.datePicker.initializeComponent(resultMap.datePickerInitialData); - vm.mobileEarlyBirdFee = resultMap.earlyBird; - vm.mobileEarlyBirdFee.laborAmount = 15; - vm.mobileEarlyBirdFee.sellingPrice = 0; - vm.mobileEarlyBirdFee.kitPrice = 0; vm.selectableDatesData = resultMap.datePickerInitialData.initialShopTimeSlotsResponse; - // if (resultMap.earlyBird) { - // vm.mobileEarlyBirdFee = resultMap.pricingResults; - // } + if (resultMap.earlyBird) { + vm.mobileEarlyBirdFee = resultMap.pricingResults[0]; + } }); }, computed: { diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index ba4a9a674..488500639 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -16,7 +16,6 @@ export default { }, methods: { setCmsContent(cmsContent) { - console.log(cmsContent); this.$root.cmsContentByWidget = cmsContent; }, getCmsContent(widgetName, fieldName) {