Merge branch 'upgrade_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Expense_2W

src/components/Employee/EmpAttendance.jsx

@@ -152,14 +152,22 @@ const EmpAttendance = ({ employee }) => {
                 </form>
               </FormProvider>
             </>
-          </div>         
+          </div>
         </div>
         <div className="table-responsive text-nowrap">
-          {!loading && data.length === 0 && (
+          {!loading && data.length === 0 && (          
-            <span style={{ fontSize: "0.9rem" }}>
+            <div
-              No attendance record found in selected date range
+              className="d-flex justify-content-center align-items-center"
-            </span>
+              style={{ minHeight: "40vh" }}
+            >
+              <p className="text-secondary mb-0">
+                No data for this date range. Please choose another.
+              </p>
+            </div>
+
           )}
+
+
           {isError && <div className="text-center">{error.message}</div>}
           {loading && !data && <div className="text-center">Loading...</div>}
           {data && data.length > 0 && (

src/components/PaymentRequest/ManagePaymentRequest.jsx

@@ -519,7 +519,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
               ? "Please Wait..."
               : requestToEdit
               ? "Update"
-              : "Submit"}
+              : "Save as Draft"}
           </button>
         </div>
       </form>

src/components/PaymentRequest/PaymentRequestSchema.js

@@ -145,7 +145,7 @@ export const defaultPRActionValues = {
   paidById: null,
   tdsPercentage: "0",
   baseAmount: null,
-  taxAmount: null,
+  taxAmount: "0",
 };
 
 export const RequestedExpenseSchema = z.object({

src/components/PaymentRequest/ViewPaymentRequest.jsx

@@ -416,7 +416,6 @@ const ViewPaymentRequest = ({ requestId }) => {
                         name="paidAt"
                         control={control}
                         minDate={data?.createdAt}
-                        maxDate={new Date()}
                       />
                       {errors.paidAt && (
                         <small className="danger-text">
@@ -522,7 +521,7 @@ const ViewPaymentRequest = ({ requestId }) => {
                     )}
                 </div>
               </>
-            ) : (!data?.isExpenseCreated && data?.expenseStatus.id === EXPENSE_PROCESSED) ? (
+            ) : (!data?.isExpenseCreated && !data?.isAdvancePayment) && (data?.expenseStatus.id === EXPENSE_PROCESSED) ? (
               <div className="text-end flex-wrap gap-2 my-2 mt-3">
                 <button
                   className="btn btn-sm btn-primary"