added GST number filed

src/components/Expenses/ExpenseSchema.js

@@ -25,6 +25,7 @@ export const ExpenseSchema = (expenseTypes) => {
       description: z.string().min(1, { message: "Description is required" }),
       location: z.string().min(1, { message: "Location is required" }),
       supplerName: z.string().min(1, { message: "Supplier name is required" }),
+      gstNumber :z.string().optional(),
       amount: z.coerce
         .number({
           invalid_type_error: "Amount is required and must be a number",
@@ -91,6 +92,7 @@ export const defaultExpense = {
   supplerName: "",
   amount: "",
   noOfPersons: "",
+  gstNumber:"",
   billAttachments: [],
 };
 

src/components/Expenses/ManageExpense.jsx

@@ -156,6 +156,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
         supplerName: data.supplerName || "",
         amount: data.amount || "",
         noOfPersons: data.noOfPersons || "",
+        gstNumber:data.gstNumber || "",
         billAttachments: data.documents
           ? data.documents.map((doc) => ({
               fileName: doc.fileName,
@@ -237,7 +238,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
           </div>
 
           <div className="col-md-6">
-            <label htmlFor="expensesTypeId" className="form-label ">
+            <label htmlFor="expensesTypeId" className="form-label">
               Expense Type
             </label>
             <select
@@ -268,7 +269,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
 
         <div className="row my-2">
           <div className="col-md-6">
-            <label htmlFor="paymentModeId" className="form-label ">
+            <label htmlFor="paymentModeId" className="form-label">
               Payment Mode
             </label>
             <select
@@ -409,10 +410,27 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               </small>
             )}
           </div>
+              <div className="col-md-6">
+            <label htmlFor="statusId" className="form-label ">
+             GST Number
+            </label>
+            <input
+              type="text"
+              id="gstNumber"
+              className="form-control form-control-sm"
+              min="1"
+              {...register("gstNumber")}
+            />
+            {errors.gstNumber && (
+              <small className="danger-text">
+                {errors.gstNumber.message}
+              </small>
+            )}
+          </div>
 
           {ExpenseType?.noOfPersonsRequired && (
-            <div className="col-md-6">
+            <div className="col-md-6 mt-2">
-              <label>No. of Persons</label>
+              <label className="form-label ">No. of Persons</label>
               <input
                 type="number"
                 id="noOfPersons"
@@ -431,7 +449,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
 
         <div className="row my-2">
           <div className="col-md-12">
-            <label htmlFor="description">Description</label>
+            <label htmlFor="description" className="form-label ">Description</label>
             <textarea
               id="description"
               className="form-control form-control-sm"

src/components/Expenses/ViewExpense.jsx

@@ -183,13 +183,14 @@ const ViewExpense = ({ ExpenseId }) => {
               className="form-label me-2 mb-0 fw-semibold text-start"
               style={{ minWidth: "130px" }}
             >
-              Paid By :
+              GST Number :
             </label>
             <div className="text-muted">
-              {data?.paidBy?.firstName} {data?.paidBy?.lastName}
+              {data?.gstNumber}
             </div>
           </div>
         </div>
+       
 
         {/* Row 4 */}
         <div className="col-md-6 mb-3">
@@ -272,6 +273,19 @@ const ViewExpense = ({ ExpenseId }) => {
             </div>
           </div>
         )}
+         <div className="col-md-6 mb-3">
+          <div className="d-flex">
+            <label
+              className="form-label me-2 mb-0 fw-semibold text-start"
+              style={{ minWidth: "130px" }}
+            >
+              Paid By :
+            </label>
+            <div className="text-muted">
+              {data?.paidBy?.firstName} {data?.paidBy?.lastName}
+            </div>
+          </div>
+        </div>
       </div>
 
       <div className="col-12 text-start">
@@ -349,7 +363,7 @@ const ViewExpense = ({ ExpenseId }) => {
           )}
         </div>
       )}
-     <hr className="divider my-1 py-3 divider-primary"  />
+     <hr className="divider my-1  divider-primary"  />
 
       {Array.isArray(data?.nextStatus) && data.nextStatus.length > 0 && (
         <>