Merge pull request 'added validation in customer master' (#255) from temp/customer-master-validation-fix into main

Reviewed-on: Pozomind/pozo-retail-app#255

src/Pages/CustomerMaster/CustMasterForm.jsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef, useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import { InputField } from '../../Components/Forms/InputField.jsx';
 import Buttons from '../../Components/Forms/Buttons.jsx';
@@ -37,6 +37,7 @@ import { MdLocationOn, MdHome } from 'react-icons/md';
 import { useSelector } from 'react-redux';
 import { ApplicationPreferences } from '../../Features/BrachLogin/BranchLogin.js';
 import { IoMdAddCircleOutline } from 'react-icons/io';
+import { isIndianMobile } from '../../utils/calculations.js';
 
 const subDirectory = import.meta.env.BASE_URL;
 
@@ -354,9 +355,15 @@ const CustomerForm = ({ formType }) => {
 
   //post data
   const onFinish = async (values) => {
+    try {
       let postData = values;
       console.log(postData, 'postData');
-
+      const validMobile = isIndianMobile(postData?.CustMobile);
+      if (!validMobile) {
+        setMessageType('warning');
+        setMessageData('Please enter a valid Indian mobile number.');
+        return;
+      }
       // Handle address data - use only the addresses from addressesList
       const addedAddresses = addressesList || [];
 
@@ -435,6 +442,10 @@ const CustomerForm = ({ formType }) => {
         setMessageType('error');
         setMessageData(response?.data?.response);
       }
+    } catch (error) {
+      // Validation error will stop submit
+      console.log("Validation Failed:", error);
+    }
   };
 
   useEffect(() => {
@@ -841,12 +852,17 @@ const CustomerForm = ({ formType }) => {
     );
   };
 
+  const onComplete = useCallback(() => {
+    setMessageType(null);
+    setMessageData(null);
+  }, []);
+
   return (
     <div className="CustomerForm-Master">
       <div className="pageOverAll">
         <div className="userPage userPageCustMaster">
           <div className="userPageContent">
-            <Messages messageType={messageType} messageData={messageData} />
+            <Messages messageType={messageType} messageData={messageData} onComplete={onComplete} />
             <div className="formName">
               <FormHeader title={'Customer'} />
             </div>
@@ -865,10 +881,12 @@ const CustomerForm = ({ formType }) => {
                       rules={[
                         {
                           required: true,
-                          pattern: /^\d{10}$/,
+                          message: "Please Enter Mobile Number",
-                          message: 'Please Enter a Valid Mobile Number',
+                        },
+                        {
+                          pattern: /^[6-9]\d{9}$/,
+                          message: "Please enter a valid mobile number",
                         },
-
                         { validator: validatePhoneNumber },
                       ]}
                     >