diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx index 7efc24a86..e637fa93f 100644 --- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx +++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx @@ -101,6 +101,7 @@ export function JobsDetailHeaderActions({ context: { jobId: job.id, job: job, + alt_transport: job.alt_transport, }, }); }} diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx index 1a3c67baa..f781be9fd 100644 --- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx +++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx @@ -63,6 +63,20 @@ export function ScheduleJobModalContainer({ skip: !visible || !!!jobId, }); + useEffect(() => { + if ( + existingAppointments.data && + existingAppointments.data.appointments.length > 0 && + !existingAppointments.data.appointments[0].canceled + ) { + form.setFieldsValue({ + color: existingAppointments.data.appointments[0].color, + + note: existingAppointments.data.appointments[0].note, + }); + } + }, [existingAppointments.data, form]); + const handleFinish = async (values) => { logImEXEvent("schedule_new_appointment"); diff --git a/client/src/graphql/appointments.queries.js b/client/src/graphql/appointments.queries.js index 717e80143..c0495c2b5 100644 --- a/client/src/graphql/appointments.queries.js +++ b/client/src/graphql/appointments.queries.js @@ -196,10 +196,11 @@ export const CANCEL_APPOINTMENT_BY_ID = gql` export const QUERY_APPOINTMENTS_BY_JOBID = gql` query QUERY_APPOINTMENTS_BY_JOBID($jobid: uuid!) { - appointments(where: { jobid: { _eq: $jobid } }) { + appointments(where: { jobid: { _eq: $jobid } }, order_by: { start: desc }) { start id end + color isintake arrived canceled diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx index 2014a1256..9ca45fd18 100644 --- a/client/src/pages/manage/manage.page.component.jsx +++ b/client/src/pages/manage/manage.page.component.jsx @@ -1,5 +1,5 @@ import { Elements } from "@stripe/react-stripe-js"; -import { loadStripe } from "@stripe/stripe-js"; +//import { loadStripe } from "@stripe/stripe-js"; import { BackTop, Layout } from "antd"; import preval from "preval.macro"; import React, { lazy, Suspense, useEffect } from "react"; @@ -20,12 +20,12 @@ import PartnerPingComponent from "../../components/partner-ping/partner-ping.com import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container"; import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component"; import TestComponent from "../../components/_test/test.component"; -import { QUERY_STRIPE_ID } from "../../graphql/bodyshop.queries"; +//import { QUERY_STRIPE_ID } from "../../graphql/bodyshop.queries"; import { selectBodyshop, selectInstanceConflict, } from "../../redux/user/user.selectors"; -import client from "../../utils/GraphQLClient"; +//import client from "../../utils/GraphQLClient"; import "./manage.page.styles.scss"; const ManageRootPage = lazy(() =>