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

Merge pull request #1726 from Safelite/rlsmerge/2024.02.15-to-end-to-end

Browse source 
Release merge 2024.02.15 to End-To-End-Insurance
This commit is contained in:
scottkiener 2024-02-06 10:08:45 -05:00 committed by GitHub
commit 7ce96c19a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/layouts/service-location/service-location.vue
View file

@ -153,11 +153,11 @@ const MOBILE_FEE_PART_TYPE = "MOBILE FEE";
// DEFINE VALIDATION RULES // DEFINE VALIDATION RULES
defineRule("mobile-location-required", (value) => { defineRule("mobile-location-required", (value) => {
if ( if (
value.addressQuestions.streetAddress == "" || !value.addressQuestions.streetAddress ||
value.addressQuestions.city == "" || !value.addressQuestions.city ||
value.addressQuestions.state == "" || !value.addressQuestions.state ||
value.addressQuestions.zipCode == "" || !value.addressQuestions.zipCode ||
value.isVehicleProtected == null !value.isVehicleProtected
) { ) {
return errorMessages.MOBILE_LOCATION_REQUIRED; return errorMessages.MOBILE_LOCATION_REQUIRED;
} }

24
src/mixins/analytics-mixin.js
View file

@ -155,10 +155,9 @@ export default {
...(lineItems.vaps ?? []), ...(lineItems.vaps ?? []),
...(lineItems.promos ?? []), ...(lineItems.promos ?? []),
]; ];
const subtotal = baseMixin.methods.getTotalPriceOfAllLineItemsAndChildParts( const subtotal = baseMixin.methods
combinedLineItems, .getTotalPriceOfAllLineItemsAndChildParts(combinedLineItems, false)
false .toFixed(2);
);
// // get correct zip code // // get correct zip code
const providerZip = order.serviceLocation.provider.address.zipCode; const providerZip = order.serviceLocation.provider.address.zipCode;
@ -168,26 +167,25 @@ export default {
: providerZip; : providerZip;
// // calculate total // // calculate total
const total = baseMixin.methods.getTotalPriceOfAllLineItemsAndChildParts( const total = baseMixin.methods
combinedLineItems, .getTotalPriceOfAllLineItemsAndChildParts(combinedLineItems, true)
true .toFixed(2);
);
const payload = { const payload = {
serviceZipCode: serviceZip, serviceZipCode: serviceZip,
damageType: order.damage.isRepair ? "repair" : "replace", damageType: order.damage.isRepair ? "repair" : "replace",
accountType: order.payment.isInsurance ? "insurance" : "cash", accountType: order.payment.isInsurance ? "insurance" : "cash",
promoCodes: promoString, promoCodes: promoString,
vehicleYear: order.vehicle.year, vehicleYear: `${order.vehicle.year}`,
vehicleMake: order.vehicle.make, vehicleMake: order.vehicle.make,
vehicleModel: order.vehicle.model, vehicleModel: order.vehicle.model,
vehicleStyle: order.vehicle.style, vehicleStyle: order.vehicle.style,
glassToReplace: glassString, glassToReplace: glassString,
workOrderId: order.workOrderId, workOrderId: parseInt(order.workOrderId),
providerCtu: order.serviceLocation.zipCodeCtu, providerCtu: parseInt(order.serviceLocation.zipCodeCtu),
orderNumber: order.workOrderNumber, orderNumber: order.workOrderNumber,
priceTotal: total, priceTotal: parseFloat(total),
priceSubTotal: subtotal, priceSubTotal: parseFloat(subtotal),
isRecalibrationOnOrder: store.getters.isRecalibrationOnSubmittedOrder, isRecalibrationOnOrder: store.getters.isRecalibrationOnSubmittedOrder,
appointmentType: order.serviceLocation.appointmentType, appointmentType: order.serviceLocation.appointmentType,
}; };