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

src/components/Expenses/ManageExpense.jsx

@@ -566,7 +566,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               ? "Please Wait..."
               : expenseToEdit
               ? "Update"
-              : "Submit"}
+              : "Save as Draft"}
           </button>
         </div>
       </form>

src/components/PaymentRequest/ManagePaymentRequest.jsx

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

src/components/RecurringExpense/ManageRecurringExpense.jsx

@@ -570,7 +570,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
               ? "Please wait...."
               : requestToEdit
                 ? "Update"
-                : "Submit"}
+                : "Save as Draft"}
           </button>
         </div>
       </form>

src/components/RecurringExpense/ViewRecurringExpense.jsx

@@ -31,9 +31,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
           <div className="col-12 d-flex justify-content-between text-start fw-semibold my-2 mb-4">
             <span>{data?.recurringPaymentUID}</span>
             <span
-              className={`badge bg-label-${
-                statusColorMap[data?.status?.id] || "secondary"
-              }`}
+              className={`badge bg-label-${statusColorMap[data?.status?.id] || "secondary"
+                }`}
             >
               {data?.status?.name || "N/A"}
             </span>
@@ -68,8 +67,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
               <div className="text-muted">
                 {data?.amount != null
                   ? `${data?.currency?.symbol ?? "¥"} ${Number(
-                      data.amount
-                    ).toFixed(2)} ${data?.currency?.currencyCode ?? "CN"}`
+                    data.amount
+                  ).toFixed(2)} ${data?.currency?.currencyCode ?? "CN"}`
                   : "N/A"}
               </div>
             </div>
@@ -83,7 +82,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
               >
                 Project :
               </label>
-              <div className="text-muted">{data?.project?.name || "N/A"}</div>
+              <div className="text-muted" style={{ textAlign: "left" }}>{data?.project?.name || "N/A"}</div>
             </div>
           </div>
 
@@ -117,7 +116,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
               >
                 Title :
               </label>
-              <div className="text-muted">{data?.title || "N/A"}</div>
+              <div className="text-muted" style={{ textAlign: "left" }}>{data?.title || "N/A"}</div>
             </div>
           </div>
 
@@ -131,7 +130,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
               >
                 Payee :
               </label>
-              <div className="text-muted">{data?.payee || "N/A"}</div>
+              <div className="text-muted" style={{ textAlign: "left" }}>{data?.payee || "N/A"}</div>
             </div>
           </div>
 
@@ -147,11 +146,11 @@ const ViewRecurringExpense = ({ RecurringId }) => {
               <div className="text-muted" style={{ textAlign: "left" }}>
                 {data?.notifyTo?.length > 0
                   ? data.notifyTo?.map((user, index) => (
-                      <span key={user.id}>
-                        {user.email}
-                        {index < data?.notifyTo?.length - 1 && ", "}
-                      </span>
-                    ))
+                    <span key={user.id}>
+                      {user.email}
+                      {index < data?.notifyTo?.length - 1 && ", "}
+                    </span>
+                  ))
                   : "N/A"}
               </div>
             </div>
@@ -220,7 +219,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
               >
                 Updated At :
               </label>
-              <div className="text-muted">
+              <div className="text-muted" style={{ textAlign: "left" }}>
                 {data?.updatedAt
                   ? formatUTCToLocalTime(data.updatedAt, true)
                   : "N/A"}
@@ -234,10 +233,12 @@ const ViewRecurringExpense = ({ RecurringId }) => {
                 className="form-label me-2 mb-0 fw-semibold text-start"
                 style={{ minWidth: "130px" }}
               >
-                Number of Iteration :
+                End Date :
               </label>
-              <div className="text-muted">
-                {data?.numberOfIteration || "N/A"}
+              <div className="text-muted" style={{ textAlign: "left" }}>
+                {data?.endDate
+                  ? formatUTCToLocalTime(data.endDate, true)
+                  : "N/A"}
               </div>
             </div>
           </div>
@@ -259,9 +260,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
                 lastName={data?.createdBy?.lastName}
               />
               <span className="text-muted">
-                {`${data?.createdBy?.firstName ?? ""} ${
-                  data?.createdBy?.lastName ?? ""
-                }`.trim() || "N/A"}
+                {`${data?.createdBy?.firstName ?? ""} ${data?.createdBy?.lastName ?? ""
+                  }`.trim() || "N/A"}
               </span>
             </div>
           </div>
@@ -283,9 +283,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
                     lastName={data.updatedBy.lastName}
                   />
                   <span className="text-muted">
-                    {`${data.updatedBy.firstName ?? ""} ${
-                      data.updatedBy.lastName ?? ""
-                    }`.trim() || "N/A"}
+                    {`${data.updatedBy.firstName ?? ""} ${data.updatedBy.lastName ?? ""
+                      }`.trim() || "N/A"}
                   </span>
                 </>
               </div>