fixed updated recurring

src/components/Expenses/Filelist.jsx

@@ -55,7 +55,6 @@ const Filelist = ({ files, removeFile, expenseToEdit }) => {
 
 export default Filelist;
 export const FilelistView = ({ files, viewFile }) => {
- console.log( files)
   return (
     <div className="d-flex flex-wrap gap-2 mt-2">
       {files?.map((file, idx) => (

src/components/PaymentRequest/PaymentRequestList.jsx

@@ -224,7 +224,7 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
           isOpen={IsDeleteModalOpen}
           type="delete"
           header="Delete Expense"
-          message="Are you sure you want delete?"
+          message="Under the woring?"
           onSubmit={handleDelete}
           onClose={() => setIsDeleteModalOpen(false)}
           // loading={isPending}

src/components/PaymentRequest/ViewPaymentRequest.jsx

@@ -521,7 +521,7 @@ const ViewPaymentRequest = ({ requestId }) => {
                     )}
                 </div>
               </>
-            ) : !data?.isExpenseCreated ? (
+            ) : (!data?.isExpenseCreated && ! data?.isAdvancePayment) ? (
               <div className="text-end flex-wrap gap-2 my-2 mt-3">
                 <button
                   className="btn btn-sm btn-primary"

src/components/RecurringExpense/ManageRecurringExpense.jsx

@@ -1,29 +1,15 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState } from 'react'
-import Label from "../common/Label";
+import Label from '../common/Label';
-import { Controller, useForm } from "react-hook-form";
+import { Controller, useForm } from 'react-hook-form';
-import {
+import { useExpenseCategory, useRecurringStatus } from '../../hooks/masterHook/useMaster';
-  useExpenseCategory,
+import DatePicker from '../common/DatePicker';
-  useRecurringStatus,
+import { zodResolver } from '@hookform/resolvers/zod';
-} from "../../hooks/masterHook/useMaster";
+import { defaultRecurringExpense, PaymentRecurringExpense } from './RecurringExpenseSchema';
-import DatePicker from "../common/DatePicker";
+import { FREQUENCY_FOR_RECURRING, INR_CURRENCY_CODE } from '../../utils/constants';
-import { zodResolver } from "@hookform/resolvers/zod";
+import { useCurrencies, useProjectName } from '../../hooks/useProjects';
-import {
+import { useCreateRecurringExpense, usePayee, useRecurringExpenseDetail, useUpdateRecurringExpense } from '../../hooks/useExpense';
-  defaultRecurringExpense,
+import InputSuggestions from '../common/InputSuggestion';
-  PaymentRecurringExpense,
+import MultiEmployeeSearchInput from '../common/MultiEmployeeSearchInput';
-} from "./RecurringExpenseSchema";
-import {
-  FREQUENCY_FOR_RECURRING,
-  INR_CURRENCY_CODE,
-} from "../../utils/constants";
-import { useCurrencies, useProjectName } from "../../hooks/useProjects";
-import {
-  useCreateRecurringExpense,
-  usePayee,
-  useRecurringExpenseDetail,
-  useUpdateRecurringExpense,
-} from "../../hooks/useExpense";
-import InputSuggestions from "../common/InputSuggestion";
-import MultiEmployeeSearchInput from "../common/MultiEmployeeSearchInput";
 
 function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
     const {
@@ -32,46 +18,15 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
     isError,
     error: requestError,
   } = useRecurringExpenseDetail(requestToEdit);
-
     //APIs
-  const {
+    const { projectNames, loading: projectLoading, error, isError: isProjectError, } = useProjectName();
-    projectNames,
+    const { data: currencyData, isLoading: currencyLoading, isError: currencyError } = useCurrencies();
-    loading: projectLoading,
+    const { data: statusData, isLoading: statusLoading, isError: statusError } = useRecurringStatus();
-    error,
+    const { data: Payees, isLoading: isPayeeLoaing, isError: isPayeeError, error: payeeError } = usePayee()
-    isError: isProjectError,
+    const { ExpenseCategories, loading: ExpenseLoading, error: ExpenseError } = useExpenseCategory();
-  } = useProjectName();
-  const {
-    data: currencyData,
-    isLoading: currencyLoading,
-    isError: currencyError,
-  } = useCurrencies();
-  const {
-    data: statusData,
-    isLoading: statusLoading,
-    isError: statusError,
-  } = useRecurringStatus();
-  const {
-    data: Payees,
-    isLoading: isPayeeLoaing,
-    isError: isPayeeError,
-    error: payeeError,
-  } = usePayee();
-  const {
-    ExpenseCategories,
-    loading: ExpenseLoading,
-    error: ExpenseError,
-  } = useExpenseCategory();
 
     const schema = PaymentRecurringExpense();
-  const {
+    const { register, control, watch, handleSubmit, setValue, reset, formState: { errors }, } = useForm({
-    register,
-    control,
-    watch,
-    handleSubmit,
-    setValue,
-    reset,
-    formState: { errors },
-  } = useForm({
         resolver: zodResolver(schema),
         defaultValues: defaultRecurringExpense,
     });
@@ -80,13 +35,14 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
         closeModal();
     };
 
-  const { mutate: CreateRecurringExpense, isPending: createPending } =
+    const { mutate: CreateRecurringExpense, isPending: createPending } = useCreateRecurringExpense(
-    useCreateRecurringExpense(() => {
+        () => {
             handleClose();
-    });
+        }
-  // const { mutate: PaymentRequestUpdate, isPending } = useUpdatePaymentRequest(() =>
+    );
-  //     handleClose()
+    const { mutate: RecurringExpenseUpdate, isPending } = useUpdateRecurringExpense(() =>
-  // );
+        handleClose()
+    );
 
     useEffect(() => {
         if (requestToEdit && data) {
@@ -105,35 +61,40 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                 statusId: data.statusId || "",
                 frequency: data.frequency || "",
                 isVariable: data.isVariable || false,
+
             });
         }
     }, [data, reset]);
 
-  // console.log("Veer",data)
+
+    useEffect(() => {
+        if (!requestToEdit && currencyData && currencyData.length > 0) {
+            const inrCurrency = currencyData.find(
+                (c) => c.id === INR_CURRENCY_CODE
+            );
+            if (inrCurrency) {
+                setValue("currencyId", INR_CURRENCY_CODE, { shouldValidate: true });
+            }
+        }
+    }, [currencyData, requestToEdit, setValue]);
 
     const onSubmit = (fromdata) => {
         let payload = {
             ...fromdata,
-      // strikeDate: localToUtc(fromdata.strikeDate),
+            strikeDate: fromdata.strikeDate ? new Date(fromdata.strikeDate).toISOString() : null,
-      strikeDate: fromdata.strikeDate
-        ? new Date(fromdata.strikeDate).toISOString()
-        : null,
         };
         if (requestToEdit) {
             const editPayload = { ...payload, id: data.id };
-      PaymentRequestUpdate({ id: data.id, payload: editPayload });
+            RecurringExpenseUpdate({ id: data.id, payload: editPayload });
         } else {
             CreateRecurringExpense(payload);
         }
-    console.log("Kartik", payload);
     };
 
     return (
         <div className="container p-3">
             <h5 className="m-0">
-        {requestToEdit
+                {requestToEdit ? "Update Expense Recurring " : "Create Expense Recurring"}
-          ? "Update Expense Recurring "
-          : "Create Expense Recurring"}
             </h5>
             <form id="expenseForm" onSubmit={handleSubmit(onSubmit)}>
                 {/* Project and Category */}
@@ -206,10 +167,31 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                             placeholder="Enter title"
                         />
                         {errors.title && (
-              <small className="danger-text">{errors.title.message}</small>
+                            <small className="danger-text">
+                                {errors.title.message}
+                            </small>
                         )}
                     </div>
 
+                    {/* <div className="col-md-6">
+                        <Label htmlFor="isVariable" className="form-label" required>
+                            Is Variable
+                        </Label>
+                        <select
+                            id="isVariable"
+                            className="form-select form-select-sm"
+                            {...register("isVariable", {
+                                setValueAs: (v) => v === "true" ? true : v === "false" ? false : false,
+                            })}
+                        >
+                            <option value="false">False</option>
+                            <option value="true">True</option>
+                        </select>
+                        {errors.isVariable && (
+                            <small className="danger-text">{errors.isVariable.message}</small>
+                        )}
+                    </div>                  */}
+
                     <div className="col-md-6 mt-2">
                         <Label htmlFor="isVariable" className="form-label" required>
                             Payment Type
@@ -229,10 +211,7 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                                             checked={field.value === true}
                                             onChange={() => field.onChange(true)}
                                         />
-                    <Label
+                                        <Label htmlFor="isVariableTrue" className="form-check-label">
-                      htmlFor="isVariableTrue"
-                      className="form-check-label"
-                    >
                                             Is Variable
                                         </Label>
                                     </div>
@@ -245,10 +224,7 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                                             checked={field.value === false}
                                             onChange={() => field.onChange(false)}
                                         />
-                    <Label
+                                        <Label htmlFor="isVariableFalse" className="form-check-label">
-                      htmlFor="isVariableFalse"
-                      className="form-check-label"
-                    >
                                             Fixed
                                         </Label>
                                     </div>
@@ -271,10 +247,12 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                             name="strikeDate"
                             control={control}
                             minDate={new Date()}
-              className="w-100"
+                            className='w-100'
                         />
                         {errors.strikeDate && (
-              <small className="danger-text">{errors.strikeDate.message}</small>
+                            <small className="danger-text">
+                                {errors.strikeDate.message}
+                            </small>
                         )}
                     </div>
 
@@ -364,7 +342,6 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                             <small className="danger-text">{errors.frequency.message}</small>
                         )}
                     </div>
-
                     <div className="col-md-6">
                         <Label htmlFor="statusId" className="form-label" required>
                             Status
@@ -375,14 +352,10 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                             {...register("statusId")}
                         >
                             <option value="">Select Status</option>
-
                             {statusLoading && <option>Loading...</option>}
-
+                            {!statusLoading && !statusError && statusData?.map((status) => (
-              {!currencyLoading &&
-                !currencyError &&
-                statusData?.map((status) => (
                                 <option key={status.id} value={status.id}>
-                    {`${status.name} `}
+                                    {status.name}
                                 </option>
                             ))}
                         </select>
@@ -408,9 +381,7 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                             placeholder="Enter payment buffer days"
                         />
                         {errors.paymentBufferDays && (
-              <small className="danger-text">
+                            <small className="danger-text">{errors.paymentBufferDays.message}</small>
-                {errors.paymentBufferDays.message}
-              </small>
                         )}
                     </div>
                     <div className="col-md-6">
@@ -427,13 +398,32 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                             placeholder="Enter number of iterations"
                         />
                         {errors.numberOfIteration && (
-              <small className="danger-text">
+                            <small className="danger-text">{errors.numberOfIteration.message}</small>
-                {errors.numberOfIteration.message}
-              </small>
                         )}
                     </div>
                 </div>
 
+                {/* Notify  */}
+                {/* <div className="row my-2 text-start">
+                    <div className="col-md-6">
+                        <Label htmlFor="notifyTo" className="form-label" required>
+                            Notify Employees
+                        </Label>
+                        <input
+                            type="text"
+                            id="notifyTo"
+                            className="form-control form-control-sm"
+                            {...register("notifyTo")}
+
+                        />
+                        {errors.notifyTo && (
+                            <small className="danger-text">
+                                {errors.notifyTo.message}
+                            </small>
+                        )}
+                    </div>
+                </div> */}
+
                 <div className="row my-2 text-start">
                     <div className="col-md-6">
                         <Label htmlFor="notifyTo" className="form-label" required>
@@ -478,13 +468,17 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                     >
                         Cancel
                     </button>
-          <button type="submit" className="btn btn-primary btn-sm mt-3">
+                    <button
-            Submit
+                        type="submit"
+                        className="btn btn-primary btn-sm mt-3"
+                    >
+                        {createPending || isPending ? "Please wait...." : requestToEdit ? "Update":"Submit"}
                     </button>
                 </div>
             </form>
         </div>
-  );
+    )
 }
 
-export default ManageRecurringExpense;
+export default ManageRecurringExpense
+

src/components/RecurringExpense/RecurringExpenseList.jsx

@@ -148,7 +148,7 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
           isOpen={IsDeleteModalOpen}
           type="delete"
           header="Delete Recurring Expense"
-          message="Are you sure you want to delete?"
+          message="Under the working"
           onSubmit={handleDelete}
           onClose={() => setIsDeleteModalOpen(false)}
           paramData={deletingId}
@@ -188,7 +188,7 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
                       </td>
                     ))}
                     <td className="sticky-action-column bg-white">
-                      <div className="d-flex justify-content-center gap-0">
+                      <div className="d-flex flex-row gap-2 gap-0">
                         <i
                           className="bx bx-show text-primary cursor-pointer"
                           // onClick={() =>
@@ -198,7 +198,6 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
                           //     })
                           // }
                         ></i>
-                        {/* Uncomment for edit/delete actions */}
 
                         <div className="dropdown z-2">
                           <button
@@ -213,7 +212,7 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
                               onClick={() =>
                                 setManageRequest({
                                   IsOpen: true,
-                                  RecurringId: recurringExpense.id,
+                                  RecurringId: recurringExpense?.id,
                                 })
                               }
                             >

src/components/common/TimeLine.jsx

@@ -27,7 +27,7 @@ const Timeline = ({ items = [], transparent = true }) => {
           <div className="timeline-event">
             <div className="timeline-header mb-3 d-flex justify-content-between">
               <h6 className="mb-0 text-body">{item.title}</h6>
-              <small className="text-body-secondary"><Tooltip text={formatUTCToLocalTime(item.timeAgo,true)}>{moment(item.timeAgo).fromNow()}</Tooltip></small>
+              <small className="text-body-secondary"><Tooltip text={formatUTCToLocalTime(item.timeAgo,true)}>{moment.utc(item.timeAgo).local().fromNow()}</Tooltip></small>
             </div>
 
             {item.description && <p className="mb-2">{item.description}</p>}

src/hooks/useExpense.js

@@ -492,7 +492,6 @@ export const useRecurringExpenseList = (
   return useQuery({
     queryKey: ["recurringExpenseList",pageSize,pageNumber,filter,isActive,searchString],
     queryFn: async()=>{
-      debugger
       const resp = await ExpenseRepository.GetRecurringExpenseList(pageSize,pageNumber,filter,isActive,searchString);
       return resp.data;
     },
@@ -504,7 +503,6 @@ export const useRecurringExpenseDetail =(RequestId)=>{
   return useQuery({
     queryKey:['recurringExpense',RequestId],
     queryFn:async()=>{
-      RequestId
       const resp = await ExpenseRepository.GetRecurringExpense(RequestId);
       return resp.data;
     },

src/pages/RecurringExpense/RecurringExpensePage.jsx

@@ -19,7 +19,7 @@ export const useRecurringExpenseContext = () => {
 const RecurringExpensePage = () => {
     const [ManageRequest, setManageRequest] = useState({
         IsOpen: null,
-        RequestId: null,
+        RecurringId: null,
     });
     const [ViewRequest, setVieRequest] = useState({ view: false, requestId: null })
 
@@ -41,7 +41,6 @@ const RecurringExpensePage = () => {
                 : [...prev, id]
         );
     };
-
     return (
         <RecurringExpenseContext.Provider value={contextValue}>
             <div className="container-fluid">
@@ -102,7 +101,7 @@ const RecurringExpensePage = () => {
                                     onClick={() =>
                                         setManageRequest({
                                             IsOpen: true,
-                                            expenseId: null,
+                                            RecurringId: null,
                                         })
                                     }
                                 >
@@ -118,7 +117,6 @@ const RecurringExpensePage = () => {
 
                 <RecurringExpenseList filterStatuses={selectedStatuses} search={search} />
 
-                {/* Add/Edit Modal */}
                 {ManageRequest.IsOpen && (
                     <GlobalModel
                         isOpen
@@ -128,11 +126,11 @@ const RecurringExpensePage = () => {
                         }
                     >
                         <ManageRecurringExpense
-                            key={ManageRequest.RequestId ?? "new"}
+                            key={ManageRequest.RecurringId ?? "new"}
-                            requestToEdit={ManageRequest.RequestId}
                             closeModal={() =>
-                                setManageRequest({ IsOpen: null, RequestId: null })
+                                setManageRequest({ IsOpen: null, RecurringId: null })
                             }
+                            requestToEdit={ManageRequest.RecurringId}
                         />
                     </GlobalModel>
                 )}