IO-2589 Allow Company Only for Customer Creation

Merged in release/2024-01-12 (pull request #1161 )
IO-2520 Adjust to imexshopid instead of shopname & prettify
2024-01-17 14:22:47 -08:00 · 2024-01-13 05:12:28 +00:00 · 2024-01-13 00:34:42 +00:00 · 2024-01-13 00:02:58 +00:00
1 changed files with 23 additions and 6 deletions
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
@@ -19,10 +19,13 @@ export default function JobsCreateOwnerInfoNewComponent() {
          label={t("owners.fields.ownr_ln")}
          name={["owner", "data", "ownr_ln"]}
          rules={[
-            {
-              required: state.owner.new,
+            ({ getFieldValue }) => ({
+              required:
+                state.owner.new &&
+                (!getFieldValue(["owner", "data", "ownr_co_nm"]) ||
+                  getFieldValue(["owner", "data", "ownr_co_nm"]) === ""),
              //message: t("general.validation.required"),
-            },
+            }),
          ]}
        >
          <Input disabled={!state.owner.new} />
@@ -31,10 +34,13 @@ export default function JobsCreateOwnerInfoNewComponent() {
          label={t("owners.fields.ownr_fn")}
          name={["owner", "data", "ownr_fn"]}
          rules={[
-            {
-              required: state.owner.new,
+            ({ getFieldValue }) => ({
+              required:
+                state.owner.new &&
+                (!getFieldValue(["owner", "data", "ownr_co_nm"]) ||
+                  getFieldValue(["owner", "data", "ownr_co_nm"]) === ""),
              //message: t("general.validation.required"),
-            },
+            }),
          ]}
        >
          <Input disabled={!state.owner.new} />
@@ -51,6 +57,17 @@ export default function JobsCreateOwnerInfoNewComponent() {
        <Form.Item
          label={t("owners.fields.ownr_co_nm")}
          name={["owner", "data", "ownr_co_nm"]}
+          rules={[
+            ({ getFieldValue }) => ({
+              required:
+                state.owner.new &&
+                (!getFieldValue(["owner", "data", "ownr_ln"]) ||
+                  !getFieldValue(["owner", "data", "ownr_fn"]) ||
+                  getFieldValue(["owner", "data", "ownr_ln"]) === "" ||
+                  getFieldValue(["owner", "data", "ownr_fn"]) === ""),
+              //message: t("general.validation.required"),
+            }),
+          ]}
        >
          <Input disabled={!state.owner.new} />
        </Form.Item>
Author	SHA1	Message	Date
Allan Carr	636be8989e	IO-2589 Allow Company Only for Customer Creation	2024-01-17 14:22:47 -08:00
Allan Carr	260607cb72	Merged in release/2024-01-12 (pull request #1161 ) IO-2520 Adjust to imexshopid instead of shopname & prettify	2024-01-13 05:12:28 +00:00
Allan Carr	69f727c4e5	Merged in release/2024-01-12 (pull request #1156 ) IO-2520 Add in Server Key format	2024-01-13 00:34:42 +00:00
Allan Carr	a697ade93a	Merged in release/2024-01-12 (pull request #1152 ) IO-2602 Beta domain	2024-01-13 00:02:58 +00:00