feature/IO-3182-Phone-Number-Consent - Checkpoint

client/src/components/job-at-change/schedule-event.component.jsx

@@ -395,33 +395,32 @@ export function ScheduleEventComponent({
         ) : (
           <ScheduleManualEvent event={event} />
         )}
-        {event.job &&
-          (HasFeatureAccess({ featureName: "checklist", bodyshop }) ? (
-            <Link
-              to={{
-                pathname: `/manage/jobs/${event.job && event.job.id}/intake`,
-                search: `?appointmentId=${event.id}`
-              }}
-            >
-              <Button disabled={event.arrived}>{t("appointments.actions.intake")}</Button>
-            </Link>
-          ) : (
-            <Popover //open={open}
-              content={popMenu}
-              open={popOverVisible}
-              onOpenChange={setPopOverVisible}
-              onClick={(e) => {
-                if (event.job?.id) {
-                  e.stopPropagation();
-                  getJobDetails();
-                }
-              }}
-              getPopupContainer={(trigger) => trigger.parentNode}
-              trigger="click"
-            >
-              <Button disabled={event.arrived}>{t("jobs.actions.intake_quick")}</Button>
-            </Popover>
-          ))}
+        {event.isintake && HasFeatureAccess({ featureName: "checklist", bodyshop }) ? (
+          <Link
+            to={{
+              pathname: `/manage/jobs/${event.job && event.job.id}/intake`,
+              search: `?appointmentId=${event.id}`
+            }}
+          >
+            <Button disabled={event.arrived}>{t("appointments.actions.intake")}</Button>
+          </Link>
+        ) : (
+          <Popover //open={open}
+            content={popMenu}
+            open={popOverVisible}
+            onOpenChange={setPopOverVisible}
+            onClick={(e) => {
+              if (event.job?.id) {
+                e.stopPropagation();
+                getJobDetails();
+              }
+            }}
+            getPopupContainer={(trigger) => trigger.parentNode}
+            trigger="click"
+          >
+            <Button disabled={event.arrived}>{t("jobs.actions.intake_quick")}</Button>
+          </Popover>
+        )}
       </Space>
     </div>
   );

client/src/components/owner-detail-form/owner-detail-form.container.jsx

@@ -32,15 +32,17 @@ function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {
   // Fetch opt-out status on mount
   useEffect(() => {
     const fetchOptOutStatus = async () => {
-      if (bodyshop?.id && (owner?.ownr_ph1 || owner?.ownr_ph2)) {
+      if (bodyshop?.id && bodyshop?.messagingservicesid && (owner?.ownr_ph1 || owner?.ownr_ph2)) {
         const phoneNumbers = [owner.ownr_ph1, owner.ownr_ph2].filter(Boolean);
         const optOutSet = await phoneNumberOptOutService(apolloClient, bodyshop.id, phoneNumbers);
         setOptedOutPhones(optOutSet);
+      } else {
+        setOptedOutPhones(new Set());
       }
     };
 
     fetchOptOutStatus();
-  }, [apolloClient, bodyshop?.id, owner?.ownr_ph1, owner?.ownr_ph2]);
+  }, [apolloClient, bodyshop?.id, bodyshop?.messagingservicesid, owner?.ownr_ph1, owner?.ownr_ph2]);
 
   // Reset form fields when owner changes
   useEffect(() => {
@@ -136,10 +138,14 @@ function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {
           loading={loading}
           form={form}
           isPhone1OptedOut={
-            owner?.ownr_ph1 && optedOutPhones.has(phone(owner.ownr_ph1, "CA").phoneNumber?.replace(/^\+1/, ""))
+            bodyshop?.messagingservicesid &&
+            owner?.ownr_ph1 &&
+            optedOutPhones.has(phone(owner.ownr_ph1, "CA").phoneNumber?.replace(/^\+1/, ""))
           }
           isPhone2OptedOut={
-            owner?.ownr_ph2 && optedOutPhones.has(phone(owner.ownr_ph2, "CA").phoneNumber?.replace(/^\+1/, ""))
+            bodyshop?.messagingservicesid &&
+            owner?.ownr_ph2 &&
+            optedOutPhones.has(phone(owner.ownr_ph2, "CA").phoneNumber?.replace(/^\+1/, ""))
           }
         />
       </Form>

server/sms/receive.js

@@ -18,8 +18,8 @@ const optOutKeywords = ["STOP", "STOPALL", "UNSUBSCRIBE", "CANCEL", "END", "QUIT
 
 // System Message text, will also need to be localized if we support multiple languages
 const systemMessageOptions = {
-  optIn: "Customer has Opted-in",
-  optOut: "Customer has Opted-out"
+  optIn: "Customer has opted-in",
+  optOut: "Customer has opted-out"
 };
 
 /**