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

src/components/Expenses/Filelist.jsx

@@ -103,7 +103,7 @@ export const FileView = ({ file, viewFile }) => {
     <div className=" bg-white ">
       <div className="row align-items-center">
         {/* File icon and info */}
-        <div className="col-12 d-flex align-items-center gap-2">
+        <div className="col-12 d-flex align-items-center gap-2 ms-n1">
           <i className={`bx ${getIconByFileType(file?.fileName)} fs-4`}></i>
 
           <div
@@ -116,7 +116,7 @@ export const FileView = ({ file, viewFile }) => {
               });
             }}
           >
-            <span className="text-muted small text-truncate">
+            <span className="text-muted small text-truncate mb-n4">
               {file.fileName}
             </span>
             <span className="text-body-secondary small">

src/components/purchase/DeliveryChallane.jsx

@@ -85,7 +85,7 @@ const DeliveryChallane = ({ purchaseId }) => {
 
             <input
               type="text"
-              className="form-control form-control-sm"
+              className="form-control"
               {...register("deliveryChallanNumber")}
             />
 
@@ -103,6 +103,7 @@ const DeliveryChallane = ({ purchaseId }) => {
               name="deliveryChallanDate"
               control={control}
               className="w-100"
+              size="xs"
             />
 
             {errors?.deliveryChallanDate && (
@@ -170,7 +171,7 @@ const DeliveryChallane = ({ purchaseId }) => {
             error={errors?.attachment?.message}
           />
 
-          <div className="col-12 text-end">
+          <div className="col-12 text-end my-3">
             <button type="submit" className="btn btn-sm btn-primary px-4">
               {isPending ? "Please Wait..." : "Submit"}
             </button>
@@ -190,7 +191,7 @@ const DeliveryChallane = ({ purchaseId }) => {
       </div>
 
       <div className="col-md-6 text-start">
-        <div className="d-flex justiffy-content-start align-items-center gap-1">
+        <div className="d-flex justiffy-content-start align-items-center gap-1 ms-2">
           <i className="bx bx-history bx-xs"></i>{" "}
           <p className="fw-medium mb-0">History</p>
         </div>

src/components/purchase/PurchaseList.jsx

@@ -29,8 +29,8 @@ const PurchaseList = ({ searchString }) => {
   const visibleColumns = PurchaseColumn.filter((col) => !col.hidden);
 
   return (
-    <div className="card mt-2">
-      <div className="table-responsive px-3">
+    <div className="card mt-2 page-min-h px-sm-4">
+      <div className="table-responsive px-2">
         <table className="datatables-users table border-top text-nowrap">
           <thead>
             <tr>
@@ -130,7 +130,7 @@ const PurchaseList = ({ searchString }) => {
                               })
                             }
                           >
-                            <i className="bx bx-file bx-plus"></i>
+                            <i className="bx bx-file bx-plus me-2"></i>
 
                             <span className="align-left">Add Challan</span>
                           </a>

src/components/purchase/PurchasePartyDetails.jsx

@@ -197,8 +197,8 @@ const PurchasePartyDetails = () => {
         <Label htmlFor="proformaInvoiceAmountt">Proforma Amount</Label>
         <input
           id="proformaInvoiceAmount"
-          type="number"
-          className={`form-control form-control-md`}
+          type="text"
+          className={`form-control `}
           {...register("proformaInvoiceAmount")}
         />
 

src/components/purchase/Purchasetable.jsx

@@ -52,7 +52,7 @@ export const PurchaseColumn = [
   {
     key: "totalAmount",
     label: "Total Amount",
-    className: " text-end w-min",
+    className: "text-end",
     render: (item) => (
       <span>{formatFigure(item?.totalAmount, { type: "currency" })}</span>
     ),

src/pages/purchase/PurchasePage.jsx

@@ -47,7 +47,7 @@ const PurchasePage = () => {
             { label: "Purchase" },
           ]}
         />
-        <div className="card">
+        <div className="card px-sm-4 my-3">
           <div className="row p-2">
             <div className="col-12 col-md-6 text-start">
               {" "}