Merge branch 'hotfix/2022-05-10' into release/2022-05-13

client/src/components/shop-info/shop-info.general.component.jsx

@@ -352,10 +352,27 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["accountingconfig", "ReceivableCustomField1"]}
+          label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
+        >
+          {ReceivableCustomFieldSelect}
+        </Form.Item>
+        <Form.Item
+          name={["accountingconfig", "ReceivableCustomField2"]}
+          label={t("bodyshop.fields.ReceivableCustomField", { number: 2 })}
+        >
+          {ReceivableCustomFieldSelect}
+        </Form.Item>
+        <Form.Item
+          name={["accountingconfig", "ReceivableCustomField3"]}
+          label={t("bodyshop.fields.ReceivableCustomField", { number: 3 })}
+        >
+          {ReceivableCustomFieldSelect}
+        </Form.Item>
         <Form.Item
           name={["md_classes"]}
           label={t("bodyshop.fields.md_classes")}
-          dependencies={["enforce_class"]}
           rules={[
             ({ getFieldValue }) => {
               return {
@@ -707,7 +724,7 @@ export default function ShopInfoGeneral({ form }) {
                           },
                         ]}
                       >
-                        <Input />
+                        <Input.TextArea rows={3} />
                       </Form.Item>
                       <Space wrap>
                         <DeleteFilled
@@ -1475,3 +1492,11 @@ export default function ShopInfoGeneral({ form }) {
     </div>
   );
 }
+
+const ReceivableCustomFieldSelect = (
+  <Select>
+    <Select.Option value="v_vin">VIN</Select.Option>
+    <Select.Option value="clm_no">Claim No.</Select.Option>
+    <Select.Option value="ded_amt">Deductible Amount</Select.Option>
+  </Select>
+);