From ef2e015347369a9acb7c7fd62d306dbe9a6ec29a Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 19 Aug 2020 11:12:44 -0700
Subject: [PATCH] Added ins co, classes, categories to shop info + job
 conversion BOD-255 BOD-258 BOD-259

---
 bodyshop_translations.babel                   | 86 +++++++++++++++-
 .../jobs-convert-button.component.jsx         | 99 +++++++++++++++++++
 .../jobs-create-jobs-info.component.jsx       | 24 ++++-
 .../jobs-detail-general.component.jsx         | 12 ++-
 .../jobs-detail-header.component.jsx          | 28 +-----
 .../shop-info/shop-info.component.jsx         | 68 +++++++++++--
 client/src/graphql/bodyshop.queries.js        |  8 ++
 client/src/graphql/jobs.queries.js            | 13 ++-
 .../jobs-detail.page.component.jsx            |  2 -
 .../jobs-detail.page.container.jsx            |  5 +-
 client/src/translations/en_us/common.json     |  4 +
 client/src/translations/es/common.json        |  4 +
 client/src/translations/fr/common.json        |  4 +
 .../down.yaml                                 |  5 +
 .../up.yaml                                   |  6 ++
 .../down.yaml                                 |  5 +
 .../up.yaml                                   |  6 ++
 .../down.yaml                                 |  5 +
 .../up.yaml                                   |  6 ++
 .../down.yaml                                 | 62 ++++++++++++
 .../up.yaml                                   | 65 ++++++++++++
 .../down.yaml                                 | 56 +++++++++++
 .../up.yaml                                   | 59 +++++++++++
 .../down.yaml                                 |  5 +
 .../up.yaml                                   |  6 ++
 .../down.yaml                                 | 65 ++++++++++++
 .../up.yaml                                   | 66 +++++++++++++
 .../down.yaml                                 | 59 +++++++++++
 .../up.yaml                                   | 60 +++++++++++
 hasura/migrations/metadata.yaml               |  8 ++
 30 files changed, 853 insertions(+), 48 deletions(-)
 create mode 100644 client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
 create mode 100644 hasura/migrations/1597854452477_alter_table_public_bodyshops_add_column_md_classes/down.yaml
 create mode 100644 hasura/migrations/1597854452477_alter_table_public_bodyshops_add_column_md_classes/up.yaml
 create mode 100644 hasura/migrations/1597854464958_alter_table_public_bodyshops_add_column_md_categories/down.yaml
 create mode 100644 hasura/migrations/1597854464958_alter_table_public_bodyshops_add_column_md_categories/up.yaml
 create mode 100644 hasura/migrations/1597854487005_alter_table_public_bodyshops_add_column_md_ins_cos/down.yaml
 create mode 100644 hasura/migrations/1597854487005_alter_table_public_bodyshops_add_column_md_ins_cos/up.yaml
 create mode 100644 hasura/migrations/1597854499320_update_permission_user_public_table_bodyshops/down.yaml
 create mode 100644 hasura/migrations/1597854499320_update_permission_user_public_table_bodyshops/up.yaml
 create mode 100644 hasura/migrations/1597854509708_update_permission_user_public_table_bodyshops/down.yaml
 create mode 100644 hasura/migrations/1597854509708_update_permission_user_public_table_bodyshops/up.yaml
 create mode 100644 hasura/migrations/1597856801481_alter_table_public_bodyshops_add_column_enforce_class/down.yaml
 create mode 100644 hasura/migrations/1597856801481_alter_table_public_bodyshops_add_column_enforce_class/up.yaml
 create mode 100644 hasura/migrations/1597856850558_update_permission_user_public_table_bodyshops/down.yaml
 create mode 100644 hasura/migrations/1597856850558_update_permission_user_public_table_bodyshops/up.yaml
 create mode 100644 hasura/migrations/1597856859918_update_permission_user_public_table_bodyshops/down.yaml
 create mode 100644 hasura/migrations/1597856859918_update_permission_user_public_table_bodyshops/up.yaml

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 4ed4779f1..d627443d4 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -1232,6 +1232,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>enforce_class</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>federal_tax_id</name>
                                         <definition_loaded>false</definition_loaded>
@@ -1379,6 +1400,69 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>md_categories</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>md_classes</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>md_ins_cos</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>md_referral_sources</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
new file mode 100644
index 000000000..3d3e63c3f
--- /dev/null
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -0,0 +1,99 @@
+import { Button, notification, Popover, Form, Select } from "antd";
+import React, { useState } from "react";
+import { useMutation } from "react-apollo";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { CONVERT_JOB_TO_RO } from "../../graphql/jobs.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export function JobsConvertButton({ bodyshop, job, refetch }) {
+  const [visible, setVisible] = useState(false);
+  const [mutationConvertJob] = useMutation(CONVERT_JOB_TO_RO);
+  const { t } = useTranslation();
+
+  const handleConvert = (values) => {
+    mutationConvertJob({
+      variables: { jobId: job.id, ...values },
+    }).then((r) => {
+      refetch();
+
+      notification["success"]({
+        message: t("jobs.successes.converted"),
+      });
+    });
+  };
+
+  const popMenu = (
+    <div>
+      <Form layout="vertical" onFinish={handleConvert}>
+        <Form.Item
+          name={["ins_co_nm"]}
+          label={t("jobs.fields.ins_co_nm")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Select>
+            {bodyshop.md_ins_cos.map((s) => (
+              <Select.Option key={s} value={s}>
+                {s}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          name={["class"]}
+          label={t("jobs.fields.class")}
+          rules={[
+            {
+              required: bodyshop.enforce_class,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Select>
+            {bodyshop.md_classes.map((s) => (
+              <Select.Option key={s} value={s}>
+                {s}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Button type="danger" htmlType="submit">
+          {t("jobs.actions.convert")}
+        </Button>
+        <Button onClick={() => setVisible(false)}>
+          {t("general.actions.close")}
+        </Button>
+      </Form>
+    </div>
+  );
+
+  return (
+    <Popover visible={visible} content={popMenu}>
+      <Button
+        key="convert"
+        className="imex-flex-row__margin"
+        type="danger"
+        style={{ display: job.converted ? "none" : "" }}
+        disabled={job.converted}
+        onClick={() => setVisible(true)}
+      >
+        {t("jobs.actions.convert")}
+      </Button>
+    </Popover>
+  );
+}
+export default connect(mapStateToProps, mapDispatchToProps)(JobsConvertButton);
diff --git a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
index abbff8dd8..84e917bf9 100644
--- a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
+++ b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
@@ -1,12 +1,23 @@
-import { Collapse, Form, Input, InputNumber, Switch } from "antd";
+import { Collapse, Form, Input, InputNumber, Select, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import FormItemPhone from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
-export default function JobsCreateJobsInfo({ form, selected }) {
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
   const { t } = useTranslation();
   const { getFieldValue } = form;
   return (
@@ -168,7 +179,13 @@ export default function JobsCreateJobsInfo({ form, selected }) {
               label={t("jobs.fields.referralsource")}
               name="referral_source"
             >
-              <Input />
+              <Select>
+                {bodyshop.md_referral_sources.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
+                  </Select.Option>
+                ))}
+              </Select>
             </Form.Item>
           </LayoutFormRow>
           TODO How to handle different taxes and marking them as exempt?
@@ -311,3 +328,4 @@ export default function JobsCreateJobsInfo({ form, selected }) {
     </div>
   );
 }
+export default connect(mapStateToProps, mapDispatchToProps)(JobsCreateJobsInfo);
diff --git a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
index c36d6d9c3..fbfd7d2bf 100644
--- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
+++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
@@ -116,10 +116,10 @@ export function JobsDetailGeneral({ bodyshop, job, form }) {
           <FormDatePicker />
         </Form.Item>
         <Form.Item label={t("jobs.fields.kmin")} name="kmin">
-          <InputNumber precision={1} />
+          <InputNumber precision={1} min={0} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.kmout")} name="kmout">
-          <InputNumber precision={1} />
+          <InputNumber precision={1} min={0} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.ponumber")} name="po_number">
           <Input />
@@ -173,7 +173,13 @@ export function JobsDetailGeneral({ bodyshop, job, form }) {
         </Form.Item>
 
         <Form.Item label={t("jobs.fields.category")} name="category">
-          <Select />
+          <Select>
+            {bodyshop.md_categories.map((s) => (
+              <Select.Option key={s} value={s}>
+                {s}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
 
         <Form.Item
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index ad97bbea0..31c3ab0c2 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -1,5 +1,5 @@
 import { DownCircleFilled, PrinterFilled } from "@ant-design/icons";
-import { Button, Dropdown, Menu, notification, PageHeader, Tag } from "antd";
+import { Button, Dropdown, Menu, PageHeader, Tag } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -7,11 +7,12 @@ import { createStructuredSelector } from "reselect";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
+import JobsConvertButton from "../jobs-convert-button/jobs-convert-button.component";
 import JobsDetailHeaderActions from "../jobs-detail-header-actions/jobs-detail-header-actions.component";
 import OwnerTagPopoverComponent from "../owner-tag-popover/owner-tag-popover.component";
 import VehicleTagPopoverComponent from "../vehicle-tag-popover/vehicle-tag-popover.component";
 import "./jobs-detail-header.styles.scss";
-import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -24,7 +25,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function JobsDetailHeader({
   job,
-  mutationConvertJob,
+
   refetch,
   setPrintCenterContext,
   bodyshop,
@@ -74,26 +75,7 @@ export function JobsDetailHeader({
         <PrinterFilled />
         {t("jobs.actions.printCenter")}
       </Button>
-      <Button
-        key="convert"
-        className="imex-flex-row__margin"
-        type="danger"
-        style={{ display: job.converted ? "none" : "" }}
-        disabled={job.converted}
-        onClick={() => {
-          mutationConvertJob({
-            variables: { jobId: job.id },
-          }).then((r) => {
-            refetch();
-
-            notification["success"]({
-              message: t("jobs.successes.converted"),
-            });
-          });
-        }}
-      >
-        {t("jobs.actions.convert")}
-      </Button>
+      <JobsConvertButton job={job} refetch={refetch} />
       <JobsDetailHeaderActions key="actions" job={job} refetch={refetch} />
       <Button
         type="primary"
diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx
index db9af532c..fabf25ae8 100644
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -1,24 +1,25 @@
-import React from "react";
+import { DeleteFilled } from "@ant-design/icons";
 import {
-  Form,
-  Input,
   Button,
   Collapse,
+  Form,
+  Input,
   InputNumber,
   Radio,
   Select,
+  Switch,
 } from "antd";
-import { DeleteFilled } from "@ant-design/icons";
+import React from "react";
 import { useTranslation } from "react-i18next";
-import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
-import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component";
-import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycenters.component";
-import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
+import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ShopInfoIntakeChecklistComponent from "./shop-info.intake.component";
-import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
-import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component";
 import ShopInfoRbacComponent from "./shop-info.rbac.component";
+import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycenters.component";
+import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
+import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
+import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
 
 export default function ShopInfoComponent({ form, saveLoading }) {
   const { t } = useTranslation();
@@ -414,6 +415,53 @@ export default function ShopInfoComponent({ form, saveLoading }) {
               );
             }}
           </Form.List>
+
+          <Form.Item
+            name={["md_classes"]}
+            label={t("bodyshop.fields.md_classes")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+                type: "array",
+              },
+            ]}
+          >
+            <Select mode="tags" />
+          </Form.Item>
+          <Form.Item
+            name={["md_categories"]}
+            label={t("bodyshop.fields.md_categories")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+                type: "array",
+              },
+            ]}
+          >
+            <Select mode="tags" />
+          </Form.Item>
+          <Form.Item
+            name={["md_ins_cos"]}
+            label={t("bodyshop.fields.md_ins_cos")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+                type: "array",
+              },
+            ]}
+          >
+            <Select mode="tags" />
+          </Form.Item>
+          <Form.Item
+            name={["enforce_class"]}
+            label={t("bodyshop.fields.enforce_class")}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </Collapse.Panel>
         <Collapse.Panel
           key="speedprint"
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index 3f01d2094..3c4e51f5b 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -54,6 +54,10 @@ export const QUERY_BODYSHOP = gql`
       md_notes_presets
       md_rbac
       prodtargethrs
+      md_classes
+      md_ins_cos
+      md_categories
+      enforce_class
       employees {
         id
         first_name
@@ -114,6 +118,10 @@ export const UPDATE_SHOP = gql`
         md_notes_presets
         md_rbac
         prodtargethrs
+        md_classes
+        md_ins_cos
+        md_categories
+        enforce_class
         employees {
           id
           first_name
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index ae9a9c1cb..78f0e6209 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -616,12 +616,21 @@ export const UPDATE_JOBS = gql`
 `;
 
 export const CONVERT_JOB_TO_RO = gql`
-  mutation CONVERT_JOB_TO_RO($jobId: uuid!) {
-    update_jobs(where: { id: { _eq: $jobId } }, _set: { converted: true }) {
+  mutation CONVERT_JOB_TO_RO(
+    $jobId: uuid!
+    $class: String
+    $ins_co_nm: String!
+  ) {
+    update_jobs(
+      where: { id: { _eq: $jobId } }
+      _set: { converted: true, ins_co_nm: $ins_co_nm, class: $class }
+    ) {
       returning {
         id
         ro_number
         converted
+        class
+        ins_co_nm
       }
     }
   }
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index 7fd3225ea..1f43e8c70 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -81,7 +81,6 @@ const mapStateToProps = createStructuredSelector({
 export function JobsDetailPage({
   job,
   mutationUpdateJob,
-  mutationConvertJob,
   handleSubmit,
   refetch,
   updateJobStatus,
@@ -144,7 +143,6 @@ export function JobsDetailPage({
 
         <JobsDetailHeader
           job={job}
-          mutationConvertJob={mutationConvertJob}
           refetch={refetch}
           handleSubmit={handleSubmit}
           updateJobStatus={updateJobStatus}
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.container.jsx b/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
index 3cd8c7b6a..274a136ce 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
@@ -5,8 +5,8 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import AlertComponent from "../../components/alert/alert.component";
 import SpinComponent from "../../components/loading-spinner/loading-spinner.component";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import {
-  CONVERT_JOB_TO_RO,
   GET_JOB_BY_PK,
   UPDATE_JOB,
   UPDATE_JOB_STATUS,
@@ -17,7 +17,6 @@ import {
 } from "../../redux/application/application.actions";
 import { CreateRecentItem } from "../../utils/create-recent-item";
 import JobsDetailPage from "./jobs-detail.page.component";
-import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -33,7 +32,6 @@ function JobsDetailPageContainer({ match, setBreadcrumbs, addRecentItem }) {
     fetchPolicy: "network-only",
   });
   const [mutationUpdateJob] = useMutation(UPDATE_JOB);
-  const [mutationConvertJob] = useMutation(CONVERT_JOB_TO_RO);
   const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
 
   const updateJobStatus = (status) => {
@@ -94,7 +92,6 @@ function JobsDetailPageContainer({ match, setBreadcrumbs, addRecentItem }) {
     <RbacWrapper action="jobs:detail">
       <JobsDetailPage
         job={data.jobs_by_pk}
-        mutationConvertJob={mutationConvertJob}
         mutationUpdateJob={mutationUpdateJob}
         refetch={refetch}
         updateJobStatus={updateJobStatus}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 4ae4f7627..bbdf75adb 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -93,6 +93,7 @@
 				"dailybodytarget": "Scoreboard - Daily Body Target",
 				"dailypainttarget": "Scoreboard - Daily Paint Target",
 				"email": "General Shop Email",
+				"enforce_class": "Enforce Class on Conversion?",
 				"federal_tax_id": "Federal Tax ID (GST/HST)",
 				"insurance_vendor_id": "Insurance Vendor ID",
 				"invoice_federal_tax_rate": "Invoices - Federal Tax Rate %",
@@ -100,6 +101,9 @@
 				"invoice_state_tax_rate": "Invoices - State Tax Rate %",
 				"lastnumberworkingdays": "Scoreboard - Last Number of Working Days",
 				"logo_img_path": "Shop Logo",
+				"md_categories": "Categories",
+				"md_classes": "Classes",
+				"md_ins_cos": "Insurance Companies",
 				"md_referral_sources": "Referral Sources",
 				"messaginglabel": "Messaging Preset Label",
 				"messagingtext": "Messaging Preset Text",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 4a582eeee..4246ca0cc 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -93,6 +93,7 @@
 				"dailybodytarget": "",
 				"dailypainttarget": "",
 				"email": "",
+				"enforce_class": "",
 				"federal_tax_id": "",
 				"insurance_vendor_id": "",
 				"invoice_federal_tax_rate": "",
@@ -100,6 +101,9 @@
 				"invoice_state_tax_rate": "",
 				"lastnumberworkingdays": "",
 				"logo_img_path": "",
+				"md_categories": "",
+				"md_classes": "",
+				"md_ins_cos": "",
 				"md_referral_sources": "",
 				"messaginglabel": "",
 				"messagingtext": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index b6d9ae15a..16d64ab9a 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -93,6 +93,7 @@
 				"dailybodytarget": "",
 				"dailypainttarget": "",
 				"email": "",
+				"enforce_class": "",
 				"federal_tax_id": "",
 				"insurance_vendor_id": "",
 				"invoice_federal_tax_rate": "",
@@ -100,6 +101,9 @@
 				"invoice_state_tax_rate": "",
 				"lastnumberworkingdays": "",
 				"logo_img_path": "",
+				"md_categories": "",
+				"md_classes": "",
+				"md_ins_cos": "",
 				"md_referral_sources": "",
 				"messaginglabel": "",
 				"messagingtext": "",
diff --git a/hasura/migrations/1597854452477_alter_table_public_bodyshops_add_column_md_classes/down.yaml b/hasura/migrations/1597854452477_alter_table_public_bodyshops_add_column_md_classes/down.yaml
new file mode 100644
index 000000000..ab2c7f9e4
--- /dev/null
+++ b/hasura/migrations/1597854452477_alter_table_public_bodyshops_add_column_md_classes/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "md_classes";
+  type: run_sql
diff --git a/hasura/migrations/1597854452477_alter_table_public_bodyshops_add_column_md_classes/up.yaml b/hasura/migrations/1597854452477_alter_table_public_bodyshops_add_column_md_classes/up.yaml
new file mode 100644
index 000000000..9fce3f75f
--- /dev/null
+++ b/hasura/migrations/1597854452477_alter_table_public_bodyshops_add_column_md_classes/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "md_classes" jsonb NULL DEFAULT
+      jsonb_build_array();
+  type: run_sql
diff --git a/hasura/migrations/1597854464958_alter_table_public_bodyshops_add_column_md_categories/down.yaml b/hasura/migrations/1597854464958_alter_table_public_bodyshops_add_column_md_categories/down.yaml
new file mode 100644
index 000000000..377bdd5c5
--- /dev/null
+++ b/hasura/migrations/1597854464958_alter_table_public_bodyshops_add_column_md_categories/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "md_categories";
+  type: run_sql
diff --git a/hasura/migrations/1597854464958_alter_table_public_bodyshops_add_column_md_categories/up.yaml b/hasura/migrations/1597854464958_alter_table_public_bodyshops_add_column_md_categories/up.yaml
new file mode 100644
index 000000000..f00a0bca7
--- /dev/null
+++ b/hasura/migrations/1597854464958_alter_table_public_bodyshops_add_column_md_categories/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "md_categories" jsonb NULL DEFAULT
+      jsonb_build_array();
+  type: run_sql
diff --git a/hasura/migrations/1597854487005_alter_table_public_bodyshops_add_column_md_ins_cos/down.yaml b/hasura/migrations/1597854487005_alter_table_public_bodyshops_add_column_md_ins_cos/down.yaml
new file mode 100644
index 000000000..529d79f74
--- /dev/null
+++ b/hasura/migrations/1597854487005_alter_table_public_bodyshops_add_column_md_ins_cos/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "md_ins_cos";
+  type: run_sql
diff --git a/hasura/migrations/1597854487005_alter_table_public_bodyshops_add_column_md_ins_cos/up.yaml b/hasura/migrations/1597854487005_alter_table_public_bodyshops_add_column_md_ins_cos/up.yaml
new file mode 100644
index 000000000..0b048abd1
--- /dev/null
+++ b/hasura/migrations/1597854487005_alter_table_public_bodyshops_add_column_md_ins_cos/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "md_ins_cos" jsonb NULL DEFAULT
+      jsonb_build_array();
+  type: run_sql
diff --git a/hasura/migrations/1597854499320_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1597854499320_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 000000000..715668e1d
--- /dev/null
+++ b/hasura/migrations/1597854499320_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,62 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_length
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - invoice_tax_rates
+      - logo_img_path
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - messagingservicesid
+      - prodtargethrs
+      - production_config
+      - region_config
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - stripe_acct_id
+      - template_header
+      - textid
+      - updated_at
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1597854499320_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1597854499320_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 000000000..f4a8dafa8
--- /dev/null
+++ b/hasura/migrations/1597854499320_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,65 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_length
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - invoice_tax_rates
+      - logo_img_path
+      - md_categories
+      - md_classes
+      - md_ins_cos
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - messagingservicesid
+      - prodtargethrs
+      - production_config
+      - region_config
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - stripe_acct_id
+      - template_header
+      - textid
+      - updated_at
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1597854509708_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1597854509708_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 000000000..42dbb2e30
--- /dev/null
+++ b/hasura/migrations/1597854509708_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,56 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_length
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - invoice_tax_rates
+      - logo_img_path
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - prodtargethrs
+      - production_config
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - updated_at
+      - zip_post
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+      set: {}
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1597854509708_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1597854509708_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 000000000..cd9607890
--- /dev/null
+++ b/hasura/migrations/1597854509708_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,59 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_length
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - invoice_tax_rates
+      - logo_img_path
+      - md_categories
+      - md_classes
+      - md_ins_cos
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - prodtargethrs
+      - production_config
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - updated_at
+      - zip_post
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+      set: {}
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1597856801481_alter_table_public_bodyshops_add_column_enforce_class/down.yaml b/hasura/migrations/1597856801481_alter_table_public_bodyshops_add_column_enforce_class/down.yaml
new file mode 100644
index 000000000..7c71d8b6b
--- /dev/null
+++ b/hasura/migrations/1597856801481_alter_table_public_bodyshops_add_column_enforce_class/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "enforce_class";
+  type: run_sql
diff --git a/hasura/migrations/1597856801481_alter_table_public_bodyshops_add_column_enforce_class/up.yaml b/hasura/migrations/1597856801481_alter_table_public_bodyshops_add_column_enforce_class/up.yaml
new file mode 100644
index 000000000..8d0391a7d
--- /dev/null
+++ b/hasura/migrations/1597856801481_alter_table_public_bodyshops_add_column_enforce_class/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "enforce_class" bool NOT NULL
+      DEFAULT false;
+  type: run_sql
diff --git a/hasura/migrations/1597856850558_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1597856850558_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 000000000..f4a8dafa8
--- /dev/null
+++ b/hasura/migrations/1597856850558_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,65 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_length
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - invoice_tax_rates
+      - logo_img_path
+      - md_categories
+      - md_classes
+      - md_ins_cos
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - messagingservicesid
+      - prodtargethrs
+      - production_config
+      - region_config
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - stripe_acct_id
+      - template_header
+      - textid
+      - updated_at
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1597856850558_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1597856850558_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 000000000..ed6ba8e94
--- /dev/null
+++ b/hasura/migrations/1597856850558_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,66 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_length
+      - city
+      - country
+      - created_at
+      - email
+      - enforce_class
+      - federal_tax_id
+      - id
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - invoice_tax_rates
+      - logo_img_path
+      - md_categories
+      - md_classes
+      - md_ins_cos
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - messagingservicesid
+      - prodtargethrs
+      - production_config
+      - region_config
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - stripe_acct_id
+      - template_header
+      - textid
+      - updated_at
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1597856859918_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1597856859918_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 000000000..cd9607890
--- /dev/null
+++ b/hasura/migrations/1597856859918_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,59 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_length
+      - city
+      - country
+      - created_at
+      - email
+      - federal_tax_id
+      - id
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - invoice_tax_rates
+      - logo_img_path
+      - md_categories
+      - md_classes
+      - md_ins_cos
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - prodtargethrs
+      - production_config
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - updated_at
+      - zip_post
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+      set: {}
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1597856859918_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1597856859918_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 000000000..4614d8cf1
--- /dev/null
+++ b/hasura/migrations/1597856859918_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,60 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_length
+      - city
+      - country
+      - created_at
+      - email
+      - enforce_class
+      - federal_tax_id
+      - id
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - invoice_tax_rates
+      - logo_img_path
+      - md_categories
+      - md_classes
+      - md_ins_cos
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - prodtargethrs
+      - production_config
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - updated_at
+      - zip_post
+      filter:
+        associations:
+          bodyshop:
+            associations:
+              user:
+                authid:
+                  _eq: X-Hasura-User-Id
+      set: {}
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index 723e93aa8..55f4b720d 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -467,6 +467,7 @@ tables:
       - country
       - created_at
       - email
+      - enforce_class
       - federal_tax_id
       - id
       - inhousevendorid
@@ -474,6 +475,9 @@ tables:
       - intakechecklist
       - invoice_tax_rates
       - logo_img_path
+      - md_categories
+      - md_classes
+      - md_ins_cos
       - md_messaging_presets
       - md_notes_presets
       - md_order_statuses
@@ -517,6 +521,7 @@ tables:
       - country
       - created_at
       - email
+      - enforce_class
       - federal_tax_id
       - id
       - inhousevendorid
@@ -524,6 +529,9 @@ tables:
       - intakechecklist
       - invoice_tax_rates
       - logo_img_path
+      - md_categories
+      - md_classes
+      - md_ins_cos
       - md_messaging_presets
       - md_notes_presets
       - md_order_statuses