Merge branch 'promotion-api-query-update' of MERMS/MermsPanelReactJS into master

src/component/layout/layoutcom/UserHeader.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import getImage from "../../../utils/getImage";
-import { useNavigate } from "react-router-dom";
+import { Link, useNavigate } from "react-router-dom";
 import { useSelector } from "react-redux";
 import siteLinks from "../../../links/siteLinks";
 
@@ -83,15 +83,15 @@ export default function UserHeader(){
                                         </div>
                                     </div>
                                     <div className="p-4">
-                                        <a className="dropdown-item d-flex nav-link" href="#">
+                                        <Link className="dropdown-item d-flex nav-link" to={siteLinks.user}>
-                                            <i className="fa fa-user pr-2 text-success"></i> Users</a>
+                                            <i className="fa fa-user pr-2 text-success"></i> Users</Link>
-                                        <a className="dropdown-item d-flex nav-link" href="#">
+                                        <Link className="dropdown-item d-flex nav-link" to={siteLinks.contacts}>
                                             <i className="fa fa-envelope pr-2 text-primary"></i> Contacts
                                             <span className="badge badge-primary ml-auto">6</span>
-                                        </a>
+                                        </Link>
-                                        <a className="dropdown-item d-flex nav-link" href={siteLinks.settings}>
+                                        <Link className="dropdown-item d-flex nav-link" to={siteLinks.settings}>
                                             <i className=" ti ti-settings pr-2 text-info"></i> Settings
-                                        </a>
+                                        </Link>
                                         <a className="dropdown-item d-flex nav-link" href="#">
                                             <i className="fa fa-compass pr-2 text-warning"></i> Need help?</a>
 

src/component/product/ProductProvision.jsx

@@ -12,11 +12,17 @@ export default function ProductProvision(props){
     const productTitle  = props?.productData?.title;
     const productDescription  = props?.productData?.description;
     const productID = props?.productData?.product_id
+    const productUID = props?.productData?.product_uid
     const productSubUID = props?.productData?.product_subscription_uid
 
+    const reqData = {
+        product_id : productID,
+        product_subscription_uid: productSubUID
+    }
+
     const {data:provision, isFetching, isError, error} = useQuery({
         queryKey: queryKeys.myproduct_provision,
-        queryFn: () => productProvision(productID)
+        queryFn: () => productProvision(reqData)
     })
 
     const provisionData = provision?.data?.provision

src/services/services.js

@@ -112,9 +112,9 @@ export const recentActions = () => {
 }
 
 // FUNCTION TO GET MY PRODUCT PROVISION DATA
-export const productProvision = (productID) => {
+export const productProvision = (reqData) => {
-    const reqData = { product_id : productID}
+    const postData = { ...reqData }
-    return getAuxEnd(`/panel/myproduct/provision`,reqData)
+    return getAuxEnd(`/panel/myproduct/provision`, postData)
 }
 
 // FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION