From 4306a95ecbdc7368e0a86a8de15a9b7e6e922d09 Mon Sep 17 00:00:00 2001
From: syedfardeenjeelani <syedfardeenjeelani13@gmail.com>
Date: Sun, 20 Oct 2024 22:40:08 +0530
Subject: [PATCH] Fix issue #8672: Updated PatientRegister, en.json, and
 validators.ts

---
 src/Components/HCX/validators.ts           | 17 +++++++++++------
 src/Components/Patient/PatientRegister.tsx |  2 ++
 src/Locale/en.json                         |  3 +++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Components/HCX/validators.ts b/src/Components/HCX/validators.ts
index cc83b39b6af..5d5c979a405 100644
--- a/src/Components/HCX/validators.ts
+++ b/src/Components/HCX/validators.ts
@@ -1,3 +1,4 @@
+import { t } from "i18next";
 import { FieldValidator } from "../Form/FieldValidators";
 import { HCXPolicyModel } from "./models";
 
@@ -5,12 +6,16 @@ const HCXPolicyValidator: FieldValidator<HCXPolicyModel> = (
   value,
   enable_hcx,
 ) => {
-  if (
-    !value.policy_id.trim() ||
-    !value.subscriber_id.trim() ||
-    (enable_hcx && (!value.insurer_id?.trim() || !value.insurer_name?.trim()))
-  )
-    return "All fields are mandatory";
+  if (!value.subscriber_id.trim()) {
+    return t("member_id_required");
+  } else if (!value.policy_id.trim()) {
+    return t("policy_id_required");
+  }
+  if (enable_hcx) {
+    if (!value.insurer_id?.trim() || !value.insurer_name?.trim()) {
+      return t("insurer_name_required");
+    }
+  }
 };
 
 export default HCXPolicyValidator;
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index 8cfd1a74ce3..693c2c0cf44 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -412,6 +412,8 @@ export const PatientRegister = (props: PatientRegisterProps) => {
       .find((error) => !!error);
     setInsuranceDetailsError(insuranceDetailsError);
 
+    errors["insurance_details"] = insuranceDetailsError;
+
     Object.keys(form).forEach((field) => {
       let phoneNumber, emergency_phone_number;
       switch (field) {
diff --git a/src/Locale/en.json b/src/Locale/en.json
index e516ec61733..a35b5fee8c5 100644
--- a/src/Locale/en.json
+++ b/src/Locale/en.json
@@ -715,6 +715,7 @@
   "indicator": "Indicator",
   "inidcator_event": "Indicator Event",
   "instruction_on_titration": "Instruction on titration",
+  "insurer_name_required": "Insurer Name is required",
   "international_mobile": "International Mobile",
   "invalid_asset_id_msg": "Oops! The asset ID you entered does not appear to be valid.",
   "invalid_email": "Please Enter a Valid Email Address",
@@ -808,6 +809,7 @@
   "medicine_administration_history": "Medicine Administration History",
   "medicines_administered": "Medicine(s) administered",
   "medicines_administered_error": "Error administering medicine(s)",
+  "member_id_required": "Member Id is required",
   "middleware_hostname": "Middleware Hostname",
   "middleware_hostname_example": "e.g. example.ohc.network",
   "middleware_hostname_sourced_from": "Middleware hostname sourced from {{ source }}",
@@ -967,6 +969,7 @@
   "policy__policy_id__example": "POL001",
   "policy__subscriber_id": "Member ID",
   "policy__subscriber_id__example": "SUB001",
+  "policy_id_required": "Policy Id or Policy Name is required",
   "position": "Position",
   "post_your_comment": "Post Your Comment",
   "powered_by": "Powered By",