From 5279bc91ef6420121885b7c4dcb44c977fa3970c Mon Sep 17 00:00:00 2001
From: Sibunnayak <sibunnayak8480@gmail.com>
Date: Thu, 10 Oct 2024 18:13:27 +0530
Subject: [PATCH 1/2] pd table fixed

---
 .../principalDistributor.js                   | 66 ++++++++++---------
 .../SalesCoOrdinators/SalesCoOrdinator.js     |  4 +-
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/views/PrincipalDistributors/principalDistributor.js b/src/views/PrincipalDistributors/principalDistributor.js
index 5f4ed85..e72c559 100644
--- a/src/views/PrincipalDistributors/principalDistributor.js
+++ b/src/views/PrincipalDistributors/principalDistributor.js
@@ -208,24 +208,28 @@ const principalDistributor = () => {
                   <div className="table-responsive table-shoot mt-3">
                     <table
                       className="table table-centered table-nowrap"
-                      style={{ border: "1px solid" }}
+                      style={{
+                        border: "1px solid",
+                        tableLayout: "fixed",
+                        width: "100%",
+                      }}
                     >
                       <thead
                         className="thead-info"
                         style={{ background: "rgb(140, 213, 213)" }}
                       >
                         <tr>
-                          <th>Unique Id </th>
-                          <th>SBU</th>
-                          <th>Name</th>
-                          <th>Email</th>
-                          {/* <th>Profile Image</th> */}
-
-                          <th>Date Registered</th>
-                          <th>Last Purchase</th>
-                          <th>Orders</th>
-                          <th>Mapping</th>
-                          <th className="text-center">Action</th>
+                          <th style={{ width: "10%" }}>Unique Id</th>
+                          <th style={{ width: "7%" }}>SBU</th>
+                          <th style={{ width: "15%" }}>Name</th>
+                          <th style={{ width: "17%" }}>Email</th>
+                          <th style={{ width: "12%" }}>Date Registered</th>
+                          <th style={{ width: "12%" }}>Last Purchase</th>
+                          <th style={{ width: "7%" }}>Orders</th>
+                          <th style={{ width: "8%" }}>Mapping</th>
+                          <th className="text-center" style={{ width: "12%" }}>
+                            Action
+                          </th>
                         </tr>
                       </thead>
                       <tbody>
@@ -241,8 +245,8 @@ const principalDistributor = () => {
                               <td>{user.uniqueId}</td>
                               <td>{user.SBU ? user.SBU : "N/A"}</td>
                               <td className="text-start">{user.name}</td>
-                              <td>{user.email}</td>
-                              <td className="text-start">
+                              <td className="text-start">{user.email}</td>
+                              <td className="text-center">
                                 {new Date(user.createdAt).toLocaleString(
                                   "en-IN",
                                   {
@@ -268,20 +272,21 @@ const principalDistributor = () => {
                                     )
                                   : "No purchase"}
                               </td>
-                              <td className="text-center">
+                              <td className="text-start">
                                 <Link
                                   to={`/principaldistributor/orders/${user?._id}`}
                                 >
-                                <button
-                                  style={{
-                                    color: "black",
-                                    marginRight: "1rem",
-                                  }}
-                                  type="button"
-                                  className="btn btn-warning btn-sm waves-effect waves-light btn-table ml-2"
-                                >
-                                  {user.totalOrders}
-                                </button>
+                                  <button
+                                    style={{
+                                      color: "black",
+                                      width: "50px",
+                                      textAlign: "center",
+                                    }}
+                                    type="button"
+                                    className="btn btn-warning btn-sm waves-effect waves-light btn-table"
+                                  >
+                                    {user.totalOrders}
+                                  </button>
                                 </Link>
                               </td>
                               {/* {loading1 && (
@@ -295,7 +300,7 @@ const principalDistributor = () => {
                                 _id={user?._id}
                                 setLoading1={setLoading1}
                               /> */}
-                              <td className="text-start">
+                              <td className="text-center">
                                 <Link
                                   to={`/view/mappedretaildistributor/${user?._id}`}
                                 >
@@ -311,7 +316,7 @@ const principalDistributor = () => {
                                   </button>
                                 </Link>
                               </td>
-                              <td className="text-start">
+                              <td className="text-end">
                                 {/* <Link
                                     to={`/users-address/view/${userAddress._id}`}
                                   >
@@ -381,7 +386,7 @@ const principalDistributor = () => {
                                 >
                                   <button
                                     type="button"
-                                    className=" btn btn-info btn-sm  waves-effect waves-light btn-table ml-2"
+                                    className=" btn btn-info btn-sm  waves-effect waves-light btn-table"
                                   >
                                     View
                                   </button>
@@ -392,14 +397,15 @@ const principalDistributor = () => {
                                   <button
                                     style={{
                                       color: "white",
-                                      marginRight: "1rem",
                                     }}
                                     type="button"
                                     className="
                                       btn btn-info btn-sm
                                     waves-effect waves-light
                                     btn-table
-                                    mx-1
+                                    ml-1
+                                    md-mt-1
+                                    md-ml-0
                                   "
                                   >
                                     Stock
diff --git a/src/views/SalesCoOrdinators/SalesCoOrdinator.js b/src/views/SalesCoOrdinators/SalesCoOrdinator.js
index 0891897..1611ce2 100644
--- a/src/views/SalesCoOrdinators/SalesCoOrdinator.js
+++ b/src/views/SalesCoOrdinators/SalesCoOrdinator.js
@@ -129,7 +129,7 @@ const SalesCoOrdinator = () => {
                   >
                     Add Sales Coordinator
                   </Button>
-                  {/* <Button
+                  <Button
                     variant="contained"
                     color="primary"
                     className="font-bold mb-2 capitalize"
@@ -140,7 +140,7 @@ const SalesCoOrdinator = () => {
                     }
                   >
                     Upload Spreadsheet
-                  </Button> */}
+                  </Button>
                 </div>
               </div>
             </div>

From 54b64f5b64c83824d372e2faefb861519a36cda7 Mon Sep 17 00:00:00 2001
From: Sibunnayak <sibunnayak8480@gmail.com>
Date: Fri, 11 Oct 2024 11:41:09 +0530
Subject: [PATCH 2/2] invantory fixed

---
 src/views/Inventory/Inventory.js       | 7 ++-----
 src/views/Inventory/SingleInventory.js | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/views/Inventory/Inventory.js b/src/views/Inventory/Inventory.js
index 5084ef3..dee4892 100644
--- a/src/views/Inventory/Inventory.js
+++ b/src/views/Inventory/Inventory.js
@@ -33,15 +33,12 @@ const Inventory = () => {
           name: nameRef.current?.value || "",
         },
       });
-
+      // console.log("response", response);
       const transformedData =
         response.data?.inventories?.map((entry) => ({
           id: entry._id,
           uniqueId: entry.uniqueId,
-          tradeName:
-            entry.addedForData?.shippingAddress?.tradeName ||
-            entry.addedForData?.trade_name ||
-            "N/A",
+          tradeName: entry.tradeName || "N/A",
           designation: entry.addedFor === "PrincipalDistributor" ? "PD" : "RD",
           products: entry.products.map((product) => ({
             SKU: product.SKU,
diff --git a/src/views/Inventory/SingleInventory.js b/src/views/Inventory/SingleInventory.js
index f62f98c..a2121a9 100644
--- a/src/views/Inventory/SingleInventory.js
+++ b/src/views/Inventory/SingleInventory.js
@@ -140,7 +140,7 @@ const SingleInventory = () => {
             </Typography>
             <Typography>
               <strong>Trade Name:</strong>{" "}
-              {inventoryDetails.addedForData.shippingAddress?.tradeName||inventoryDetails.addedForData.trade_name}
+              {inventoryDetails.addedForData.shippingAddress?.tradeName||inventoryDetails.addedForData.kyc.trade_name}
             </Typography>
           </Grid>
         </Grid>