Merge branch 'develop' into feature/CSR-1392

src/layouts/payment-method/payment-method.vue

@@ -105,6 +105,7 @@ import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { Form } from "vee-validate";
+import { AppointmentTypeStrings } from "@/constants/schedule-constants";
 
 export default {
     name: "paymentMethod",
@@ -193,7 +194,56 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return true;
+            // Line Items
+            const packageReqs = !!store.getters.order.lineItems.supportingItems;
+
+            // Service Location
+            const serviceLocation = store.getters.order.serviceLocation;
+            const mobileReqs = !!(
+                serviceLocation.address &&
+                serviceLocation.city &&
+                serviceLocation.state &&
+                serviceLocation.zipCode
+            );
+
+            const providerLocation = serviceLocation.provider.address;
+            const dropOffInshopReqs = !!(
+                providerLocation.streetAddress &&
+                providerLocation.city &&
+                providerLocation.state &&
+                providerLocation.zipCode
+            );
+
+            const isMobile = serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE;
+
+            const serviceLocationReqs =
+                (isMobile && mobileReqs) || (!isMobile && dropOffInshopReqs);
+
+            // Insurance
+            const isInsuranceSet = store.getters.order.payment.isInsurance !== null;
+
+            // Schedule
+            const schedule = store.getters.order.schedule;
+            const scheduleReqs = !!(
+                schedule.date &&
+                schedule.startTime &&
+                (!isMobile || schedule.endTime) &&
+                schedule.jobMaxMinutes &&
+                schedule.jobMinMinutes
+            );
+
+            // Customer
+            const customer = store.getters.order.customer;
+            const customerReqs = !!(
+                customer.firstName &&
+                customer.lastName &&
+                customer.phoneNumber &&
+                customer.emailAddress
+            );
+
+            return (
+                packageReqs && serviceLocationReqs && isInsuranceSet && scheduleReqs && customerReqs
+            );
         },
         getPaypalAlert() {
             return store.getters.order.payment.piaErrorCode ? true : false;

src/layouts/review/review.vue

@@ -177,8 +177,7 @@ export default {
             // damageReqs handles checking for damage, even though it is also required for this section.
             const packageReqs = !!(
                 (damage.isRepair || lineItems.glassParts) &&
-                lineItems.supportingItems &&
-                lineItems.vaps
+                lineItems.supportingItems
             );
 
             // Service Location
@@ -208,7 +207,7 @@ export default {
             const scheduleReqs = !!(
                 schedule.date &&
                 schedule.startTime &&
-                schedule.endTime &&
+                (!isMobile || schedule.endTime) &&
                 schedule.jobMaxMinutes &&
                 schedule.jobMinMinutes
             );