IO-117 PBS WIP

client/src/components/dms-post-form/dms-post-form.component.jsx

@@ -119,33 +119,35 @@ export function DmsPostForm({ bodyshop, socket, job }) {
           </Form.Item>
         </LayoutFormRow>
 
-        <LayoutFormRow style={{ justifyContent: "center" }} grow>
-          <Form.Item
-            name="dms_make"
-            label={t("jobs.fields.dms.dms_make")}
-            rules={[
-              {
-                required: true,
-              },
-            ]}
-          >
-            <Input disabled />
-          </Form.Item>
-          <Form.Item
-            name="dms_model"
-            label={t("jobs.fields.dms.dms_model")}
-            rules={[
-              {
-                required: true,
-              },
-            ]}
-          >
-            <Input disabled />
-          </Form.Item>
+        {bodyshop.cdk_dealerid && (
+          <LayoutFormRow style={{ justifyContent: "center" }} grow>
+            <Form.Item
+              name="dms_make"
+              label={t("jobs.fields.dms.dms_make")}
+              rules={[
+                {
+                  required: true,
+                },
+              ]}
+            >
+              <Input disabled />
+            </Form.Item>
+            <Form.Item
+              name="dms_model"
+              label={t("jobs.fields.dms.dms_model")}
+              rules={[
+                {
+                  required: true,
+                },
+              ]}
+            >
+              <Input disabled />
+            </Form.Item>
 
-          <DmsCdkMakes form={form} socket={socket} job={job} />
-          <DmsCdkMakesRefetch />
-        </LayoutFormRow>
+            <DmsCdkMakes form={form} socket={socket} job={job} />
+            <DmsCdkMakesRefetch />
+          </LayoutFormRow>
+        )}
         <Form.Item
           name="story"
           label={t("jobs.fields.dms.story")}
@@ -157,6 +159,7 @@ export function DmsPostForm({ bodyshop, socket, job }) {
         >
           <Input.TextArea maxLength={240} />
         </Form.Item>
+
         <Divider />
         <Form.List name={["payers"]}>
           {(fields, { add, remove }) => {

client/src/components/header/header.component.jsx

@@ -46,12 +46,16 @@ import {
 } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { signOutStart } from "../../redux/user/user.actions";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
   recentItems: selectRecentItems,
   selectedHeader: selectSelectedHeader,
+  bodyshop: selectBodyshop,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -69,6 +73,7 @@ const mapDispatchToProps = (dispatch) => ({
 function Header({
   handleMenuClick,
   currentUser,
+  bodyshop,
   selectedHeader,
   signOutStart,
   setBillEnterContext,
@@ -77,6 +82,7 @@ function Header({
   setReportCenterContext,
   recentItems,
 }) {
+  console.log("🚀 ~ file: header.component.jsx ~ line 85 ~ bodyshop", bodyshop);
   const { t } = useTranslation();
 
   return (
@@ -237,16 +243,26 @@ function Header({
                 {t("menus.header.accounting-receivables")}
               </Link>
             </Menu.Item>
-            <Menu.Item key="payables">
-              <Link to="/manage/accounting/payables">
-                {t("menus.header.accounting-payables")}
-              </Link>
-            </Menu.Item>
-            <Menu.Item key="payments">
-              <Link to="/manage/accounting/payments">
-                {t("menus.header.accounting-payments")}
-              </Link>
-            </Menu.Item>
+            {!(
+              (bodyshop && bodyshop.cdk_dealerid) ||
+              (bodyshop && bodyshop.pbs_serialnumber)
+            ) && (
+              <Menu.Item key="payables">
+                <Link to="/manage/accounting/payables">
+                  {t("menus.header.accounting-payables")}
+                </Link>
+              </Menu.Item>
+            )}
+            {!(
+              (bodyshop && bodyshop.cdk_dealerid) ||
+              (bodyshop && bodyshop.pbs_serialnumber)
+            ) && (
+              <Menu.Item key="payments">
+                <Link to="/manage/accounting/payments">
+                  {t("menus.header.accounting-payments")}
+                </Link>
+              </Menu.Item>
+            )}
             <Menu.Item key="export-logs">
               <Link to="/manage/accounting/exportlogs">
                 {t("menus.header.export-logs")}

client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx

@@ -61,7 +61,7 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
     );
   };
 
-  const overlay = bodyshop.cdk_dealerid && (
+  const overlay = (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
     <Menu onClick={handleMenuClick}>
       {bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => (
         <Menu.Item key={mapping.name}>{mapping.name}</Menu.Item>
@@ -69,7 +69,7 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
     </Menu>
   );
 
-  return bodyshop.cdk_dealerid ? (
+  return bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
     <Dropdown overlay={overlay}>
       <Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
     </Dropdown>

client/src/components/production-board-filters/production-board-filters.component.jsx

@@ -1,4 +1,4 @@
-import { Input, PageHeader, Space, Spin } from "antd";
+import { Input, Space, Spin } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";

client/src/pages/dms/dms.container.jsx

@@ -120,7 +120,11 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   if (loading) return <LoadingSpinner />;
   if (error) return <AlertComponent message={error.message} type="error" />;
 
-  if (!jobId || !bodyshop.cdk_dealerid || !(data && data.jobs_by_pk))
+  if (
+    !jobId ||
+    !(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) ||
+    !(data && data.jobs_by_pk)
+  )
     return <Result status="404" />;
 
   return (

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -208,7 +208,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
           >
             <DateTimePicker disabled={jobRO} />
           </Form.Item>
-          {bodyshop.cdk_dealerid && (
+          {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
             <Form.Item
               label={t("jobs.fields.kmin")}
               name="kmin"
@@ -221,7 +221,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
               <InputNumber precision={0} disabled={jobRO} />
             </Form.Item>
           )}
-          {bodyshop.cdk_dealerid && (
+          {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
             <Form.Item
               label={t("jobs.fields.kmout")}
               name="kmout"