npm - ptechcore_ui - Versions diffs - 1.0.81 → 1.0.82 - Mend

ptechcore_ui 1.0.81 → 1.0.82

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.cjs CHANGED Viewed

@@ -1554,8 +1554,8 @@ var UserServices = {
   deleteUser: (id, token) => FetchApi.delete(`${USERS_API_URL}${id}/`, token),
   // Obtenir les utilisateurs d'une entité
   getEntityUsers: (entityId, token) => FetchApi.get(`${API_URL}/core/entities/${entityId}/users/`, token),
-  // Obtenir les entités auxquelles un utilisateur a accès
-  getuserEntitiesAccess: (id, token) => FetchApi.get(`${API_URL}/core/users/${id}/entities/`, token),
+  // Obtenir les entités auxquelles l'utilisateur connecté a accès
+  getuserEntitiesAccess: (token) => FetchApi.get(`${API_URL}/core/users/entities/`, token),
   // Ajouter un utilisateur à une entité
   addUserToEntity: (entityId, userId, token) => FetchApi.post(`${API_URL}/core/entities/${entityId}/users/`, { user_id: userId }, token),
   // === Nouvelles méthodes pour le profil utilisateur ===
@@ -2270,19 +2270,19 @@ var MODULE_URLS = {
     wiseHR: "https://rewise.praedium-tech.com/admin/human-capital/dashboard/"
   },
   development: {
-    wiseConnect: "http://localhost:5173/admin/crm/trade-strategy/lead-insight/",
+    wiseConnect: "http://localhost:5177/admin/crm/trade-strategy/lead-insight/",
     wiseReach: "http://localhost:5173/admin/marketing/dashboard/",
-    wiseOps: "http://localhost:5173/",
+    wiseOps: "http://localhost:5174/dashboard/",
     wiseGuard: "http://localhost:5173/admin/security/dashboard/",
     wiseThrive: "http://localhost:5173/dashboard/",
-    wiseView: "http://localhost:5175/",
+    wiseView: "http://localhost:5173/",
     wiseProcess: "http://localhost:5173/workspace/sop-connect/",
     wiseBill: "http://localhost:5173/admin/invoicing/insight/summary/",
-    wiseBooks: "http://localhost:5173/admin/accounting/client/invoice-queue/",
+    wiseBooks: "http://localhost:5176/admin/accounting/client/invoice-queue/",
     wiseAsset: "#",
     wiseCash: "http://localhost:5173/admin/finance/dashboard/",
     wiseCollect: "http://localhost:5173/admin/recovery/collection/dashboard/",
-    wiseProcure: "http://localhost:5173/admin/procurement/dashboard/one/",
+    wiseProcure: "http://localhost:5175/",
     wiseHR: "http://localhost:5173/admin/human-capital/dashboard/"
   }
 };
@@ -3179,7 +3179,8 @@ var RewiseLayout = ({ children, module_name = "Rewise", module_description = "",
                         "button",
                         {
                           onClick: () => {
-                            window.location.href = "https://core.rewise.praedium-tech.com/parameters/profit-cost-centers/";
+                            const env = localStorage.getItem("env") || "prod";
+                            window.location.href = env === "localhost" ? "http://localhost:5173/parameters/profit-cost-centers/" : "https://core.rewise.praedium-tech.com/parameters/profit-cost-centers/";
                             setShowUserMenu(false);
                           },
                           className: "w-full flex items-center gap-3 px-3 py-2 rounded-lg hover:bg-[var(--color-surface-hover)] transition-colors",
@@ -4740,6 +4741,7 @@ var FDrawer = ({
   const [showOrdering, setShowOrdering] = (0, import_react10.useState)(null);
   const [showFilters, setShowFilters] = (0, import_react10.useState)(null);
   const [dropdownOpen, setDropdownOpen] = (0, import_react10.useState)(null);
+  const [dropdownPos, setDropdownPos] = (0, import_react10.useState)({ top: 0, left: 0, openUp: false });
   const [queryURL, setQueryURL] = (0, import_react10.useState)("");
   const [reponseDetail, setReponseDetail] = (0, import_react10.useState)({
     total_pages: null,
@@ -4798,6 +4800,7 @@ var FDrawer = ({
       if (columnsPanelRef.current && !columnsPanelRef.current.contains(target)) {
         setShowColumnsPanel(false);
       }
+      setDropdownOpen(null);
     };
     document.addEventListener("mousedown", handleClickOutside);
     return () => document.removeEventListener("mousedown", handleClickOutside);
@@ -5497,36 +5500,61 @@ var FDrawer = ({
                   "button",
                   {
                     type: "button",
-                    onClick: () => setDropdownOpen(dropdownOpen === item.id ? null : item.id),
+                    onClick: (e) => {
+                      if (dropdownOpen === item.id) {
+                        setDropdownOpen(null);
+                      } else {
+                        const rect = e.currentTarget.getBoundingClientRect();
+                        const spaceBelow = window.innerHeight - rect.bottom;
+                        const openUp = spaceBelow < 200;
+                        setDropdownPos({
+                          top: openUp ? rect.top : rect.bottom + 4,
+                          left: rect.right - 192,
+                          openUp
+                        });
+                        setDropdownOpen(item.id);
+                      }
+                    },
                     className: "p-1 rounded-full hover:bg-gray-100 transition-colors",
                     children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_lucide_react7.MoreVertical, { className: "w-4 h-4 text-gray-400" })
                   }
                 ),
-                dropdownOpen === item.id && /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { className: "fixed right-3 mt-2 w-48 bg-white rounded-lg shadow-lg border border-gray-200 py-2 z-10", children: [
-                  actions.filter((action) => !action.permission || hasPermission(action.permission)).filter((action) => !action.condition || action.condition(item)).map(
-                    (action, index) => action.navigate ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_router_dom4.Link, { to: action.navigate, className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2", children: action.label }, index) : /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("button", { onClick: () => {
-                      action.onclick && action.onclick(item);
-                      setDropdownOpen(null);
-                    }, className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2", children: action.label }, index)
-                  ),
-                  onDuplicate && /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(import_jsx_runtime16.Fragment, { children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { className: "border-t border-gray-100 my-1" }),
-                    /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
-                      "button",
-                      {
-                        onClick: () => {
-                          handleDuplicate(item);
+                dropdownOpen === item.id && /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
+                  "div",
+                  {
+                    className: "fixed w-48 bg-white rounded-lg shadow-lg border border-gray-200 py-2 z-[9999]",
+                    style: {
+                      top: dropdownPos.openUp ? void 0 : dropdownPos.top,
+                      bottom: dropdownPos.openUp ? window.innerHeight - dropdownPos.top : void 0,
+                      left: Math.max(8, dropdownPos.left)
+                    },
+                    children: [
+                      actions.filter((action) => !action.permission || hasPermission(action.permission)).filter((action) => !action.condition || action.condition(item)).map(
+                        (action, index) => action.navigate ? /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_router_dom4.Link, { to: action.navigate, className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2", children: action.label }, index) : /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("button", { onClick: () => {
+                          action.onclick && action.onclick(item);
                           setDropdownOpen(null);
-                        },
-                        className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2",
-                        children: [
-                          /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_lucide_react7.Copy, { className: "h-4 w-4" }),
-                          /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { children: "Dupliquer" })
-                        ]
-                      }
-                    )
-                  ] })
-                ] })
+                        }, className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2", children: action.label }, index)
+                      ),
+                      onDuplicate && /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(import_jsx_runtime16.Fragment, { children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { className: "border-t border-gray-100 my-1" }),
+                        /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
+                          "button",
+                          {
+                            onClick: () => {
+                              handleDuplicate(item);
+                              setDropdownOpen(null);
+                            },
+                            className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2",
+                            children: [
+                              /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_lucide_react7.Copy, { className: "h-4 w-4" }),
+                              /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { children: "Dupliquer" })
+                            ]
+                          }
+                        )
+                      ] })
+                    ]
+                  }
+                )
               ] }) })
             ]
           },
@@ -19226,7 +19254,7 @@ var CatalogueProductSelector = ({
   };
   const getBestPrice = (product) => {
     const prices = product.supplier_prices || [];
-    const homologatedPrices = prices.filter((sp) => sp.is_homologated);
+    const homologatedPrices = prices.filter((sp) => sp.homologation_status === "approved");
     if (homologatedPrices.length > 0) return homologatedPrices.sort((a, b) => a.unit_price - b.unit_price)[0];
     return prices[0] || null;
   };
@@ -19434,9 +19462,9 @@ var CatalogueProductSelector = ({
                         const price = supplierPrices.find((sp) => sp.vendor === Number(e.target.value));
                         if (price) updateSelectedPrice(productId, price);
                       },
-                      options: supplierPrices.filter((sp) => !onlyHomologated || sp.is_homologated).sort((a, b) => a.unit_price - b.unit_price).map((sp) => ({
+                      options: supplierPrices.filter((sp) => !onlyHomologated || sp.homologation_status === "approved").sort((a, b) => a.unit_price - b.unit_price).map((sp) => ({
                         value: String(sp.vendor),
-                        label: `${getSupplierName(sp)} - ${formatCurrency(sp.unit_price)}/${listItem.unit}${sp.is_homologated ? " (Homologu\xE9)" : ""}${sp.discount_percent ? ` (-${sp.discount_percent}%)` : ""}`
+                        label: `${getSupplierName(sp)} - ${formatCurrency(sp.unit_price)}/${listItem.unit}${sp.homologation_status === "approved" ? " (Homologu\xE9)" : ""}${sp.discount_percent ? ` (-${sp.discount_percent}%)` : ""}`
                       }))
                     }
                   )
@@ -20333,6 +20361,7 @@ var import_jsx_runtime61 = require("react/jsx-runtime");
 var PurchaseRequestsPage = () => {
   const [refreshToggle, setRefreshToggle] = (0, import_react44.useState)(false);
   const [showModal, setShowModal] = (0, import_react44.useState)(false);
+  const [showAllRequests, setShowAllRequests] = (0, import_react44.useState)(false);
   const [showPrintPreview, setShowPrintPreview] = (0, import_react44.useState)(false);
   const [selectedPurchaseRequest, setSelectedPurchaseRequest] = (0, import_react44.useState)(null);
   const { success, error: showError, confirm: confirm2 } = useToast();
@@ -20343,7 +20372,7 @@ var PurchaseRequestsPage = () => {
     setRefreshToggle((prev) => !prev);
   };
   const tabs = [
-    { id: "purchase_requests", label: "Demande d'achat", icon: import_lucide_react36.ClipboardCheck },
+    { id: "purchase_requests", label: "Mes Demandes d'achat", icon: import_lucide_react36.ClipboardCheck },
     { id: "my_gr_se", label: "My GR-SE", icon: import_lucide_react36.ClipboardCheck }
   ];
   const [activeTab, setActiveTab] = (0, import_react44.useState)("purchase_requests");
@@ -20352,12 +20381,18 @@ var PurchaseRequestsPage = () => {
     {
       title: "Proculink",
       description: "G\xE9rez vos demandes d'achat",
-      sideAction: /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(Buttons_default, { onClick: () => {
-        setShowModal(true);
-        setSelectedPurchaseRequest(null);
-      }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(import_lucide_react36.Plus, { className: "h-4 w-4 mr-2" }),
-        " Nouvelle demande"
+      sideAction: /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)("div", { className: "flex gap-2", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(Buttons_default, { variant: "outline", onClick: () => setShowAllRequests(true), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(import_lucide_react36.ClipboardCheck, { className: "h-4 w-4 mr-2" }),
+          " Toutes les DA"
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(Buttons_default, { onClick: () => {
+          setShowModal(true);
+          setSelectedPurchaseRequest(null);
+        }, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(import_lucide_react36.Plus, { className: "h-4 w-4 mr-2" }),
+          " Nouvelle demande"
+        ] })
       ] }),
       tabs: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("nav", { className: "flex space-x-1 mt-4 overflow-x-auto", children: tabs.map((tab) => {
         const Icon = tab.icon;
@@ -20456,6 +20491,7 @@ var PurchaseRequestsPage = () => {
             ],
             actions: [
               {
+                condition: (item) => loggedUser?.id === item.created_by,
                 label: "Modifier",
                 permission: "",
                 onclick: (item) => {
@@ -20477,6 +20513,7 @@ var PurchaseRequestsPage = () => {
               },
               {
                 label: "Supprimer",
+                condition: (item) => loggedUser?.id !== item.created_by,
                 permission: "",
                 onclick: (item) => {
                   if (item.status !== "draft") {
@@ -20586,7 +20623,59 @@ var PurchaseRequestsPage = () => {
               }
             )
           }
-        )
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(Modals_default, { title: "Toutes les demandes d'achat", open: showAllRequests, onClose: () => setShowAllRequests(false), width: "w-[90vw]", children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+          FDrawer,
+          {
+            apiEndpoint: "/procurement/purchase-requests/",
+            columns: [
+              { key: "created_at", label: "Date de cr\xE9ation", type: "date", filterable: true, sortable: true, search_name: "created_at" },
+              { key: "request_number", label: "N\xB0 DA", type: "text", filterable: true, sortable: true, search_name: "request_number" },
+              { key: "requested_by_user", label: "Demandeur", type: "text", filterable: true, sortable: false, search_name: "requester__last_name" },
+              { key: "title", label: "Titre", type: "text", filterable: true, sortable: true, search_name: "title" },
+              { key: "amount", label: "Montant Estim\xE9", type: "number", filterable: true, sortable: true, search_name: "amount", formule: (item) => item.amount ? `${formatCurrency(item.amount)}` : "0 FCFA" },
+              {
+                key: "status",
+                label: "Statut",
+                type: "text",
+                filterable: true,
+                sortable: true,
+                search_name: "status",
+                filter_options: [
+                  { value: "draft", label: "Brouillon" },
+                  { value: "submitted", label: "Soumise" },
+                  { value: "approved", label: "Approuv\xE9e" },
+                  { value: "rejected", label: "Rejet\xE9e" },
+                  { value: "in_sourcing", label: "En sourcing" },
+                  { value: "completed", label: "Termin\xE9e" },
+                  { value: "cancelled", label: "Annul\xE9e" }
+                ],
+                formule: (item) => /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(StatusBadge, { status: item.status })
+              },
+              {
+                key: "sourcing_id",
+                label: "Sourcing",
+                type: "text",
+                filterable: false,
+                sortable: false,
+                search_name: "sourcing_id",
+                formule: (item) => {
+                  if (item.sourcing_id) {
+                    return /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("span", { className: "bg-secondary text-[13px] text-primary px-4 py-1 rounded-[4px]", children: "SSJ" });
+                  }
+                  if (item.rfq) {
+                    return /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("span", { className: "bg-secondary text-[13px] text-primary px-4 py-1 rounded-[4px]", children: "appel d'offre" });
+                  }
+                  return "N/A";
+                }
+              },
+              { key: "vendor", label: "Fournisseur", type: "text", filterable: true, sortable: true, search_name: "vendor", formule: (item) => item.po_details?.vendor_name ?? "", filter_endpoint: "/accounting/vendors/" },
+              { key: "po_amount", label: "Montant Reel", type: "number", filterable: true, sortable: true, search_name: "po_amount", formule: (item) => item.po_amount ? `${formatCurrency(item.po_amount)}` : "-" }
+            ],
+            actions: [],
+            ordering: "-created_at"
+          }
+        ) })
       ]
     }
   );

package/dist/index.d.cts CHANGED Viewed

@@ -470,7 +470,7 @@ declare const UserServices: {
     updateUser: (id: number, data: Partial<User$1>, token: string) => Promise<unknown>;
     deleteUser: (id: number, token: string) => Promise<unknown>;
     getEntityUsers: (entityId: number, token: string) => Promise<unknown>;
-    getuserEntitiesAccess: (id: number, token: string) => Promise<unknown>;
+    getuserEntitiesAccess: (token: string) => Promise<unknown>;
     addUserToEntity: (entityId: number, userId: number, token: string) => Promise<unknown>;
     updateMyProfile: (data: UpdateProfileData) => Promise<unknown>;
     updateProfilePicture: (file: File) => Promise<unknown>;

package/dist/index.d.ts CHANGED Viewed

@@ -470,7 +470,7 @@ declare const UserServices: {
     updateUser: (id: number, data: Partial<User$1>, token: string) => Promise<unknown>;
     deleteUser: (id: number, token: string) => Promise<unknown>;
     getEntityUsers: (entityId: number, token: string) => Promise<unknown>;
-    getuserEntitiesAccess: (id: number, token: string) => Promise<unknown>;
+    getuserEntitiesAccess: (token: string) => Promise<unknown>;
     addUserToEntity: (entityId: number, userId: number, token: string) => Promise<unknown>;
     updateMyProfile: (data: UpdateProfileData) => Promise<unknown>;
     updateProfilePicture: (file: File) => Promise<unknown>;

package/dist/index.js CHANGED Viewed

@@ -1361,8 +1361,8 @@ var UserServices = {
   deleteUser: (id, token) => FetchApi.delete(`${USERS_API_URL}${id}/`, token),
   // Obtenir les utilisateurs d'une entité
   getEntityUsers: (entityId, token) => FetchApi.get(`${API_URL}/core/entities/${entityId}/users/`, token),
-  // Obtenir les entités auxquelles un utilisateur a accès
-  getuserEntitiesAccess: (id, token) => FetchApi.get(`${API_URL}/core/users/${id}/entities/`, token),
+  // Obtenir les entités auxquelles l'utilisateur connecté a accès
+  getuserEntitiesAccess: (token) => FetchApi.get(`${API_URL}/core/users/entities/`, token),
   // Ajouter un utilisateur à une entité
   addUserToEntity: (entityId, userId, token) => FetchApi.post(`${API_URL}/core/entities/${entityId}/users/`, { user_id: userId }, token),
   // === Nouvelles méthodes pour le profil utilisateur ===
@@ -2077,19 +2077,19 @@ var MODULE_URLS = {
     wiseHR: "https://rewise.praedium-tech.com/admin/human-capital/dashboard/"
   },
   development: {
-    wiseConnect: "http://localhost:5173/admin/crm/trade-strategy/lead-insight/",
+    wiseConnect: "http://localhost:5177/admin/crm/trade-strategy/lead-insight/",
     wiseReach: "http://localhost:5173/admin/marketing/dashboard/",
-    wiseOps: "http://localhost:5173/",
+    wiseOps: "http://localhost:5174/dashboard/",
     wiseGuard: "http://localhost:5173/admin/security/dashboard/",
     wiseThrive: "http://localhost:5173/dashboard/",
-    wiseView: "http://localhost:5175/",
+    wiseView: "http://localhost:5173/",
     wiseProcess: "http://localhost:5173/workspace/sop-connect/",
     wiseBill: "http://localhost:5173/admin/invoicing/insight/summary/",
-    wiseBooks: "http://localhost:5173/admin/accounting/client/invoice-queue/",
+    wiseBooks: "http://localhost:5176/admin/accounting/client/invoice-queue/",
     wiseAsset: "#",
     wiseCash: "http://localhost:5173/admin/finance/dashboard/",
     wiseCollect: "http://localhost:5173/admin/recovery/collection/dashboard/",
-    wiseProcure: "http://localhost:5173/admin/procurement/dashboard/one/",
+    wiseProcure: "http://localhost:5175/",
     wiseHR: "http://localhost:5173/admin/human-capital/dashboard/"
   }
 };
@@ -2986,7 +2986,8 @@ var RewiseLayout = ({ children, module_name = "Rewise", module_description = "",
                         "button",
                         {
                           onClick: () => {
-                            window.location.href = "https://core.rewise.praedium-tech.com/parameters/profit-cost-centers/";
+                            const env = localStorage.getItem("env") || "prod";
+                            window.location.href = env === "localhost" ? "http://localhost:5173/parameters/profit-cost-centers/" : "https://core.rewise.praedium-tech.com/parameters/profit-cost-centers/";
                             setShowUserMenu(false);
                           },
                           className: "w-full flex items-center gap-3 px-3 py-2 rounded-lg hover:bg-[var(--color-surface-hover)] transition-colors",
@@ -4547,6 +4548,7 @@ var FDrawer = ({
   const [showOrdering, setShowOrdering] = useState10(null);
   const [showFilters, setShowFilters] = useState10(null);
   const [dropdownOpen, setDropdownOpen] = useState10(null);
+  const [dropdownPos, setDropdownPos] = useState10({ top: 0, left: 0, openUp: false });
   const [queryURL, setQueryURL] = useState10("");
   const [reponseDetail, setReponseDetail] = useState10({
     total_pages: null,
@@ -4605,6 +4607,7 @@ var FDrawer = ({
       if (columnsPanelRef.current && !columnsPanelRef.current.contains(target)) {
         setShowColumnsPanel(false);
       }
+      setDropdownOpen(null);
     };
     document.addEventListener("mousedown", handleClickOutside);
     return () => document.removeEventListener("mousedown", handleClickOutside);
@@ -5304,36 +5307,61 @@ var FDrawer = ({
                   "button",
                   {
                     type: "button",
-                    onClick: () => setDropdownOpen(dropdownOpen === item.id ? null : item.id),
+                    onClick: (e) => {
+                      if (dropdownOpen === item.id) {
+                        setDropdownOpen(null);
+                      } else {
+                        const rect = e.currentTarget.getBoundingClientRect();
+                        const spaceBelow = window.innerHeight - rect.bottom;
+                        const openUp = spaceBelow < 200;
+                        setDropdownPos({
+                          top: openUp ? rect.top : rect.bottom + 4,
+                          left: rect.right - 192,
+                          openUp
+                        });
+                        setDropdownOpen(item.id);
+                      }
+                    },
                     className: "p-1 rounded-full hover:bg-gray-100 transition-colors",
                     children: /* @__PURE__ */ jsx16(MoreVertical, { className: "w-4 h-4 text-gray-400" })
                   }
                 ),
-                dropdownOpen === item.id && /* @__PURE__ */ jsxs11("div", { className: "fixed right-3 mt-2 w-48 bg-white rounded-lg shadow-lg border border-gray-200 py-2 z-10", children: [
-                  actions.filter((action) => !action.permission || hasPermission(action.permission)).filter((action) => !action.condition || action.condition(item)).map(
-                    (action, index) => action.navigate ? /* @__PURE__ */ jsx16(Link3, { to: action.navigate, className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2", children: action.label }, index) : /* @__PURE__ */ jsx16("button", { onClick: () => {
-                      action.onclick && action.onclick(item);
-                      setDropdownOpen(null);
-                    }, className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2", children: action.label }, index)
-                  ),
-                  onDuplicate && /* @__PURE__ */ jsxs11(Fragment5, { children: [
-                    /* @__PURE__ */ jsx16("div", { className: "border-t border-gray-100 my-1" }),
-                    /* @__PURE__ */ jsxs11(
-                      "button",
-                      {
-                        onClick: () => {
-                          handleDuplicate(item);
+                dropdownOpen === item.id && /* @__PURE__ */ jsxs11(
+                  "div",
+                  {
+                    className: "fixed w-48 bg-white rounded-lg shadow-lg border border-gray-200 py-2 z-[9999]",
+                    style: {
+                      top: dropdownPos.openUp ? void 0 : dropdownPos.top,
+                      bottom: dropdownPos.openUp ? window.innerHeight - dropdownPos.top : void 0,
+                      left: Math.max(8, dropdownPos.left)
+                    },
+                    children: [
+                      actions.filter((action) => !action.permission || hasPermission(action.permission)).filter((action) => !action.condition || action.condition(item)).map(
+                        (action, index) => action.navigate ? /* @__PURE__ */ jsx16(Link3, { to: action.navigate, className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2", children: action.label }, index) : /* @__PURE__ */ jsx16("button", { onClick: () => {
+                          action.onclick && action.onclick(item);
                           setDropdownOpen(null);
-                        },
-                        className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2",
-                        children: [
-                          /* @__PURE__ */ jsx16(Copy, { className: "h-4 w-4" }),
-                          /* @__PURE__ */ jsx16("span", { children: "Dupliquer" })
-                        ]
-                      }
-                    )
-                  ] })
-                ] })
+                        }, className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2", children: action.label }, index)
+                      ),
+                      onDuplicate && /* @__PURE__ */ jsxs11(Fragment5, { children: [
+                        /* @__PURE__ */ jsx16("div", { className: "border-t border-gray-100 my-1" }),
+                        /* @__PURE__ */ jsxs11(
+                          "button",
+                          {
+                            onClick: () => {
+                              handleDuplicate(item);
+                              setDropdownOpen(null);
+                            },
+                            className: "w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-50 flex items-center space-x-2",
+                            children: [
+                              /* @__PURE__ */ jsx16(Copy, { className: "h-4 w-4" }),
+                              /* @__PURE__ */ jsx16("span", { children: "Dupliquer" })
+                            ]
+                          }
+                        )
+                      ] })
+                    ]
+                  }
+                )
               ] }) })
             ]
           },
@@ -19155,7 +19183,7 @@ var CatalogueProductSelector = ({
   };
   const getBestPrice = (product) => {
     const prices = product.supplier_prices || [];
-    const homologatedPrices = prices.filter((sp) => sp.is_homologated);
+    const homologatedPrices = prices.filter((sp) => sp.homologation_status === "approved");
     if (homologatedPrices.length > 0) return homologatedPrices.sort((a, b) => a.unit_price - b.unit_price)[0];
     return prices[0] || null;
   };
@@ -19363,9 +19391,9 @@ var CatalogueProductSelector = ({
                         const price = supplierPrices.find((sp) => sp.vendor === Number(e.target.value));
                         if (price) updateSelectedPrice(productId, price);
                       },
-                      options: supplierPrices.filter((sp) => !onlyHomologated || sp.is_homologated).sort((a, b) => a.unit_price - b.unit_price).map((sp) => ({
+                      options: supplierPrices.filter((sp) => !onlyHomologated || sp.homologation_status === "approved").sort((a, b) => a.unit_price - b.unit_price).map((sp) => ({
                         value: String(sp.vendor),
-                        label: `${getSupplierName(sp)} - ${formatCurrency(sp.unit_price)}/${listItem.unit}${sp.is_homologated ? " (Homologu\xE9)" : ""}${sp.discount_percent ? ` (-${sp.discount_percent}%)` : ""}`
+                        label: `${getSupplierName(sp)} - ${formatCurrency(sp.unit_price)}/${listItem.unit}${sp.homologation_status === "approved" ? " (Homologu\xE9)" : ""}${sp.discount_percent ? ` (-${sp.discount_percent}%)` : ""}`
                       }))
                     }
                   )
@@ -20262,6 +20290,7 @@ import { jsx as jsx61, jsxs as jsxs54 } from "react/jsx-runtime";
 var PurchaseRequestsPage = () => {
   const [refreshToggle, setRefreshToggle] = useState38(false);
   const [showModal, setShowModal] = useState38(false);
+  const [showAllRequests, setShowAllRequests] = useState38(false);
   const [showPrintPreview, setShowPrintPreview] = useState38(false);
   const [selectedPurchaseRequest, setSelectedPurchaseRequest] = useState38(null);
   const { success, error: showError, confirm: confirm2 } = useToast();
@@ -20272,7 +20301,7 @@ var PurchaseRequestsPage = () => {
     setRefreshToggle((prev) => !prev);
   };
   const tabs = [
-    { id: "purchase_requests", label: "Demande d'achat", icon: ClipboardCheck },
+    { id: "purchase_requests", label: "Mes Demandes d'achat", icon: ClipboardCheck },
     { id: "my_gr_se", label: "My GR-SE", icon: ClipboardCheck }
   ];
   const [activeTab, setActiveTab] = useState38("purchase_requests");
@@ -20281,12 +20310,18 @@ var PurchaseRequestsPage = () => {
     {
       title: "Proculink",
       description: "G\xE9rez vos demandes d'achat",
-      sideAction: /* @__PURE__ */ jsxs54(Buttons_default, { onClick: () => {
-        setShowModal(true);
-        setSelectedPurchaseRequest(null);
-      }, children: [
-        /* @__PURE__ */ jsx61(Plus9, { className: "h-4 w-4 mr-2" }),
-        " Nouvelle demande"
+      sideAction: /* @__PURE__ */ jsxs54("div", { className: "flex gap-2", children: [
+        /* @__PURE__ */ jsxs54(Buttons_default, { variant: "outline", onClick: () => setShowAllRequests(true), children: [
+          /* @__PURE__ */ jsx61(ClipboardCheck, { className: "h-4 w-4 mr-2" }),
+          " Toutes les DA"
+        ] }),
+        /* @__PURE__ */ jsxs54(Buttons_default, { onClick: () => {
+          setShowModal(true);
+          setSelectedPurchaseRequest(null);
+        }, children: [
+          /* @__PURE__ */ jsx61(Plus9, { className: "h-4 w-4 mr-2" }),
+          " Nouvelle demande"
+        ] })
       ] }),
       tabs: /* @__PURE__ */ jsx61("nav", { className: "flex space-x-1 mt-4 overflow-x-auto", children: tabs.map((tab) => {
         const Icon = tab.icon;
@@ -20385,6 +20420,7 @@ var PurchaseRequestsPage = () => {
             ],
             actions: [
               {
+                condition: (item) => loggedUser?.id === item.created_by,
                 label: "Modifier",
                 permission: "",
                 onclick: (item) => {
@@ -20406,6 +20442,7 @@ var PurchaseRequestsPage = () => {
               },
               {
                 label: "Supprimer",
+                condition: (item) => loggedUser?.id !== item.created_by,
                 permission: "",
                 onclick: (item) => {
                   if (item.status !== "draft") {
@@ -20515,7 +20552,59 @@ var PurchaseRequestsPage = () => {
               }
             )
           }
-        )
+        ),
+        /* @__PURE__ */ jsx61(Modals_default, { title: "Toutes les demandes d'achat", open: showAllRequests, onClose: () => setShowAllRequests(false), width: "w-[90vw]", children: /* @__PURE__ */ jsx61(
+          FDrawer,
+          {
+            apiEndpoint: "/procurement/purchase-requests/",
+            columns: [
+              { key: "created_at", label: "Date de cr\xE9ation", type: "date", filterable: true, sortable: true, search_name: "created_at" },
+              { key: "request_number", label: "N\xB0 DA", type: "text", filterable: true, sortable: true, search_name: "request_number" },
+              { key: "requested_by_user", label: "Demandeur", type: "text", filterable: true, sortable: false, search_name: "requester__last_name" },
+              { key: "title", label: "Titre", type: "text", filterable: true, sortable: true, search_name: "title" },
+              { key: "amount", label: "Montant Estim\xE9", type: "number", filterable: true, sortable: true, search_name: "amount", formule: (item) => item.amount ? `${formatCurrency(item.amount)}` : "0 FCFA" },
+              {
+                key: "status",
+                label: "Statut",
+                type: "text",
+                filterable: true,
+                sortable: true,
+                search_name: "status",
+                filter_options: [
+                  { value: "draft", label: "Brouillon" },
+                  { value: "submitted", label: "Soumise" },
+                  { value: "approved", label: "Approuv\xE9e" },
+                  { value: "rejected", label: "Rejet\xE9e" },
+                  { value: "in_sourcing", label: "En sourcing" },
+                  { value: "completed", label: "Termin\xE9e" },
+                  { value: "cancelled", label: "Annul\xE9e" }
+                ],
+                formule: (item) => /* @__PURE__ */ jsx61(StatusBadge, { status: item.status })
+              },
+              {
+                key: "sourcing_id",
+                label: "Sourcing",
+                type: "text",
+                filterable: false,
+                sortable: false,
+                search_name: "sourcing_id",
+                formule: (item) => {
+                  if (item.sourcing_id) {
+                    return /* @__PURE__ */ jsx61("span", { className: "bg-secondary text-[13px] text-primary px-4 py-1 rounded-[4px]", children: "SSJ" });
+                  }
+                  if (item.rfq) {
+                    return /* @__PURE__ */ jsx61("span", { className: "bg-secondary text-[13px] text-primary px-4 py-1 rounded-[4px]", children: "appel d'offre" });
+                  }
+                  return "N/A";
+                }
+              },
+              { key: "vendor", label: "Fournisseur", type: "text", filterable: true, sortable: true, search_name: "vendor", formule: (item) => item.po_details?.vendor_name ?? "", filter_endpoint: "/accounting/vendors/" },
+              { key: "po_amount", label: "Montant Reel", type: "number", filterable: true, sortable: true, search_name: "po_amount", formule: (item) => item.po_amount ? `${formatCurrency(item.po_amount)}` : "-" }
+            ],
+            actions: [],
+            ordering: "-created_at"
+          }
+        ) })
       ]
     }
   );
@@ -20698,7 +20787,7 @@ import { useState as useState49, useEffect as useEffect36 } from "react";
 var API_BASE_URL3 = `${API_URL}/core/permissions`;
 // src/forms/UserForm.tsx
-import { Building2 as Building29, User as UserIcon3, X as X17 } from "lucide-react";
+import { Building2 as Building29, User as UserIcon3, X as X17, Shield as Shield3 } from "lucide-react";
 import { Fragment as Fragment16, jsx as jsx74, jsxs as jsxs67 } from "react/jsx-runtime";
 // src/pages/organizations/DetailEntity.tsx

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "ptechcore_ui",
-  "version": "1.0.81",
+  "version": "1.0.82",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",