Added barcode scanning to populate contract form BOD-88

client/src/pages/contract-detail/contract-detail.page.component.jsx

@@ -7,9 +7,9 @@ import ContractFormComponent from "../../components/contract-form/contract-form.
 import ContractJobBlock from "../../components/contract-job-block/contract-job-block.component";
 import { setModalContext } from "../../redux/modals/modals.actions";
 
-const mapDispatchToProps = dispatch => ({
-  setCourtesyCarReturnModalContext: context =>
-    dispatch(setModalContext({ context: context, modal: "courtesyCarReturn" }))
+const mapDispatchToProps = (dispatch) => ({
+  setCourtesyCarReturnModalContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "courtesyCarReturn" })),
 });
 
 export function ContractDetailPage({
@@ -17,27 +17,30 @@ export function ContractDetailPage({
   job,
   courtesyCar,
   setCourtesyCarReturnModalContext,
-  refetch
+  refetch,
 }) {
   const { t } = useTranslation();
   return (
     <div>
       <Row align="middle">
-        <Typography.Title>{`Agreement ${(contract &&
-          contract.agreementnumber) ||
-          ""} - ${t((contract && contract.status) || "")}`}</Typography.Title>
+        <Typography.Title>{`Agreement ${
+          (contract && contract.agreementnumber) || ""
+        } - ${t((contract && contract.status) || "")}`}</Typography.Title>
         <Button type="primary" htmlType="submit">
           {t("general.actions.save")}
         </Button>
         <Button
-          disabled={contract && contract.status !== "contracts.status.out"}
+          disabled={
+            !!!contract ||
+            (contract && contract.status !== "contracts.status.out")
+          }
           onClick={() => {
             setCourtesyCarReturnModalContext({
               actions: { refetch },
               context: {
                 contractId: contract.id,
-                courtesyCarId: courtesyCar.id
-              }
+                courtesyCarId: courtesyCar.id,
+              },
             });
           }}
         >

client/src/pages/contract-detail/contract-detail.page.container.jsx

@@ -65,7 +65,7 @@ export function ContractDetailPageContainer({ setBreadcrumbs, addRecentItem }) {
           `/manage/courtesycars/contracts/${contractId}`
         )
       );
-  }, [t, data, error, loading, setBreadcrumbs, addRecentItem]);
+  }, [t, data, error, loading, setBreadcrumbs, addRecentItem, contractId]);
 
   const handleFinish = (values) => {
     updateContract({
@@ -92,6 +92,7 @@ export function ContractDetailPageContainer({ setBreadcrumbs, addRecentItem }) {
       <Form
         form={form}
         autoComplete="no"
+        layout='vertical'
         onFinish={handleFinish}
         initialValues={
           data