diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue index 5ae3e25cc..adb0a1210 100644 --- a/src/layouts/payment-adyen/payment-adyen.vue +++ b/src/layouts/payment-adyen/payment-adyen.vue @@ -146,13 +146,15 @@ export default { arePagePrerequisitesValid() { const order = store.getters.order; const logQueue = []; - const result = - hasServiceLocationInfo(order, logQueue) && - hasInsuranceInfo(order, logQueue) && - hasSchedulingInfo(order, logQueue) && - hasCustomerInfo(order, logQueue) && - hasPaymentMethodInfo(order, logQueue) && - hasGlassPartsOrRepairInfo(order, logQueue); + const results = [ + hasServiceLocationInfo(order, logQueue), + hasInsuranceInfo(order, logQueue), + hasSchedulingInfo(order, logQueue), + hasCustomerInfo(order, logQueue), + hasPaymentMethodInfo(order, logQueue), + hasGlassPartsOrRepairInfo(order, logQueue), + ]; + const result = results.every(Boolean); flushPagePrereqsLogs("payment-adyen.vue", result, logQueue); return result; }, diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 0ee3ad8ce..48f076f84 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -390,12 +390,15 @@ export default { arePagePrerequisitesValid() { const order = store.getters.order; const logQueue = []; - const result = - hasServiceLocationInfo(order, logQueue) && - hasInsuranceInfo(order, logQueue) && - hasSchedulingInfo(order, logQueue) && - hasCustomerInfo(order, logQueue) && - hasGlassPartsOrRepairInfo(order, logQueue); + const results = [ + hasServiceLocationInfo(order, logQueue), + hasInsuranceInfo(order, logQueue), + hasSchedulingInfo(order, logQueue), + hasCustomerInfo(order, logQueue), + hasGlassPartsOrRepairInfo(order, logQueue), + ]; + //false if any check is false but calls all checks for logging purposes + const result = results.every(Boolean); flushPagePrereqsLogs("payment-method.vue", result, logQueue); return result; }, diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue index 0fd452a9d..a8c3653b1 100644 --- a/src/layouts/payment/payment.vue +++ b/src/layouts/payment/payment.vue @@ -445,13 +445,15 @@ export default { arePagePrerequisitesValid() { const order = store.getters.order; const logQueue = []; - const result = - hasServiceLocationInfo(order, logQueue) && - hasInsuranceInfo(order, logQueue) && - hasSchedulingInfo(order, logQueue) && - hasCustomerInfo(order, logQueue) && - hasPaymentMethodInfo(order, logQueue) && - hasGlassPartsOrRepairInfo(order, logQueue); + const results = [ + hasServiceLocationInfo(order, logQueue), + hasInsuranceInfo(order, logQueue), + hasSchedulingInfo(order, logQueue), + hasCustomerInfo(order, logQueue), + hasPaymentMethodInfo(order, logQueue), + hasGlassPartsOrRepairInfo(order, logQueue), + ]; + const result = results.every(Boolean); flushPagePrereqsLogs("payment.vue", result, logQueue); return result; }, diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index df1a4ab7d..82249e790 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -739,10 +739,11 @@ export default { order.payment?.insuranceCoverage?.isVerified == null || order.payment?.insuranceCoverage?.isVerified === false; - const preReqResult = - hasServiceZipInfo(order, logQueue) && - hasGlassPartsOrRepairInfo(order, logQueue) && - isVerifiedOk; + const results = [ + hasServiceZipInfo(order, logQueue), + hasGlassPartsOrRepairInfo(order, logQueue), + ]; + const preReqResult = results.every(Boolean) && isVerifiedOk; logQueue.push(() => { debugLog(