Merge branch 'product-template-fix' of MERMS/MermsFirstOffice into master

This commit is contained in:
2025-09-23 14:12:02 +00:00
committed by Gogs
3 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ export default function CustomTemplates() {
},
staleTime: 0 //0 mins
})
const customTemData = data?.data?.products // CUSTOM TEMPLATE LIST
const customTemData = data?.data?.templates // CUSTOM TEMPLATE LIST
const pagination = data?.data?.pagination
// console.log('DATA', data?.data)
+4 -4
View File
@@ -6,7 +6,7 @@ import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
import Icons from '../Icons'
import { getProductsTemplate } from '../../services/siteServices'
import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString'
// import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString'
export default function ProductTemplates() {
@@ -43,7 +43,7 @@ export default function ProductTemplates() {
},
staleTime: 0 //0 mins
})
const productsTemData = data?.data?.products // PRODUCTS TEMPLATE LIST
const productsTemData = data?.data?.templates // PRODUCTS TEMPLATE LIST
const pagination = data?.data?.pagination
// console.log('DATA', data?.data)
@@ -98,7 +98,7 @@ export default function ProductTemplates() {
<td className="px-2 py-2">
<div className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
<div className="text-left">
<div className="text-base font-semibold">{getDateTimeFromDateString(item?.added)}</div>
<div className="text-base font-semibold">{item?.product_id}</div>
</div>
</div>
</td>
@@ -109,7 +109,7 @@ export default function ProductTemplates() {
</td>
<td className="px-2">
<div className="text-left">
<div className="text-base font-semibold">{item?.product_id}</div>
<div className="text-base font-semibold">{item?.provision_name}</div>
</div>
</td>
<td className="px-2">
+2 -2
View File
@@ -101,13 +101,13 @@ export const getUsers = (reqData) => {
// FUNCTION TO GET PRODUCTS TEMPLATE DATA
export const getProductsTemplate = (reqData) => {
const postData = { ...reqData }
return getAuxEnd(`/products-template`, postData)
return getAuxEnd(`/products-templates`, postData)
}
// FUNCTION TO GET CUSTOM TEMPLATE DATA
export const getCustomTemplate = (reqData) => {
const postData = { ...reqData }
return getAuxEnd(`/custom-template`, postData)
return getAuxEnd(`/custom-templates`, postData)
}
// FUNCTION TO VIEW SELECTED ACCOUNT DATA