Compare commits
No commits in common. "18431bf10d5e18f11df2605a818f354fa1f3cc66" and "e85eda5bb0009345bfc9c293318ffb4b17ad28dd" have entirely different histories.
18431bf10d
...
e85eda5bb0
@ -48,7 +48,7 @@ const InvoiceInfo = () => {
|
|||||||
invoiceShipments: true,
|
invoiceShipments: true,
|
||||||
payments: true,
|
payments: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
|
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -39,7 +39,7 @@ const PaymentInfo = () => {
|
|||||||
const [collapseState, updateCollapseState] = useCollapseState('PaymentInfo', {
|
const [collapseState, updateCollapseState] = useCollapseState('PaymentInfo', {
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
|
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -35,7 +35,7 @@ const TaxRecordInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -34,7 +34,7 @@ const FilamentStockInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
events: true,
|
events: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -35,7 +35,7 @@ const OrderItemInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -37,7 +37,7 @@ const PartStockInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
stocks: true,
|
stocks: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -10,10 +10,7 @@ import InfoCollapse from '../../common/InfoCollapse.jsx'
|
|||||||
import ObjectInfo from '../../common/ObjectInfo.jsx'
|
import ObjectInfo from '../../common/ObjectInfo.jsx'
|
||||||
import ObjectProperty from '../../common/ObjectProperty.jsx'
|
import ObjectProperty from '../../common/ObjectProperty.jsx'
|
||||||
import ViewButton from '../../common/ViewButton.jsx'
|
import ViewButton from '../../common/ViewButton.jsx'
|
||||||
import {
|
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
getModelProperty,
|
|
||||||
getModelByName
|
|
||||||
} from '../../../../database/ObjectModels.js'
|
|
||||||
import PostProductStock from './PostProductStock.jsx'
|
import PostProductStock from './PostProductStock.jsx'
|
||||||
import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
|
import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
|
||||||
import NoteIcon from '../../../Icons/NoteIcon.jsx'
|
import NoteIcon from '../../../Icons/NoteIcon.jsx'
|
||||||
@ -47,7 +44,7 @@ const ProductStockInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
partStocks: true,
|
partStocks: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -58,9 +58,7 @@ const PurchaseOrderInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
orderItems: true,
|
auditLogs: true,
|
||||||
shipments: true,
|
|
||||||
auditLogs: false,
|
|
||||||
invoices: true,
|
invoices: true,
|
||||||
stockEvents: true
|
stockEvents: true
|
||||||
}
|
}
|
||||||
|
|||||||
@ -50,7 +50,7 @@ const PurchaseOrderInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -40,7 +40,7 @@ const ShipmentInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -37,7 +37,7 @@ const StockAuditInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
stocks: true,
|
stocks: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -38,7 +38,7 @@ const StockLocationInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -8,10 +8,7 @@ import InfoCollapse from '../../common/InfoCollapse.jsx'
|
|||||||
import ObjectInfo from '../../common/ObjectInfo.jsx'
|
import ObjectInfo from '../../common/ObjectInfo.jsx'
|
||||||
import ObjectProperty from '../../common/ObjectProperty.jsx'
|
import ObjectProperty from '../../common/ObjectProperty.jsx'
|
||||||
import ViewButton from '../../common/ViewButton.jsx'
|
import ViewButton from '../../common/ViewButton.jsx'
|
||||||
import {
|
import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
|
||||||
getModelProperty,
|
|
||||||
getModelByName
|
|
||||||
} from '../../../../database/ObjectModels.js'
|
|
||||||
import PostStockTransfer from './PostStockTransfer.jsx'
|
import PostStockTransfer from './PostStockTransfer.jsx'
|
||||||
import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
|
import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
|
||||||
import NoteIcon from '../../../Icons/NoteIcon.jsx'
|
import NoteIcon from '../../../Icons/NoteIcon.jsx'
|
||||||
@ -42,7 +39,7 @@ const StockTransferInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
lines: true,
|
lines: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -35,7 +35,7 @@ const AppPasswordInfo = () => {
|
|||||||
'AppPasswordInfo',
|
'AppPasswordInfo',
|
||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -37,7 +37,7 @@ const CourierServiceInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -34,7 +34,7 @@ const CourierInfo = () => {
|
|||||||
const [collapseState, updateCollapseState] = useCollapseState('CourierInfo', {
|
const [collapseState, updateCollapseState] = useCollapseState('CourierInfo', {
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
|
|||||||
@ -38,7 +38,7 @@ const DocumentJobInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -39,7 +39,7 @@ const DocumentPrinterInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
stocks: true,
|
stocks: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -38,7 +38,7 @@ const DocumentSizeInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -33,7 +33,7 @@ const DocumentTemplateDesign = () => {
|
|||||||
preview: true,
|
preview: true,
|
||||||
editor: true,
|
editor: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,7 @@ const DocumentTemplateInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
stocks: true,
|
stocks: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -24,15 +24,13 @@ const FilamentSkuInfo = () => {
|
|||||||
const location = useLocation()
|
const location = useLocation()
|
||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
const filamentSkuId = new URLSearchParams(location.search).get(
|
const filamentSkuId = new URLSearchParams(location.search).get('filamentSkuId')
|
||||||
'filamentSkuId'
|
|
||||||
)
|
|
||||||
const [collapseState, updateCollapseState] = useCollapseState(
|
const [collapseState, updateCollapseState] = useCollapseState(
|
||||||
'FilamentSkuInfo',
|
'FilamentSkuInfo',
|
||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -43,7 +43,7 @@ const FilamentInfo = () => {
|
|||||||
filamentSkus: true,
|
filamentSkus: true,
|
||||||
stocks: true,
|
stocks: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -37,7 +37,7 @@ const FileInfo = () => {
|
|||||||
const [collapseState, updateCollapseState] = useCollapseState('FileInfo', {
|
const [collapseState, updateCollapseState] = useCollapseState('FileInfo', {
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
|
|||||||
@ -39,7 +39,7 @@ const HostInfo = () => {
|
|||||||
printers: true,
|
printers: true,
|
||||||
documentPrinters: true,
|
documentPrinters: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
|
|
||||||
const [hostOTPOpen, setHostOTPOpen] = useState(false)
|
const [hostOTPOpen, setHostOTPOpen] = useState(false)
|
||||||
|
|||||||
@ -30,14 +30,11 @@ const MaterialInfo = () => {
|
|||||||
const objectFormRef = useRef(null)
|
const objectFormRef = useRef(null)
|
||||||
const actionHandlerRef = useRef(null)
|
const actionHandlerRef = useRef(null)
|
||||||
const materialId = new URLSearchParams(location.search).get('materialId')
|
const materialId = new URLSearchParams(location.search).get('materialId')
|
||||||
const [collapseState, updateCollapseState] = useCollapseState(
|
const [collapseState, updateCollapseState] = useCollapseState('MaterialInfo', {
|
||||||
'MaterialInfo',
|
|
||||||
{
|
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
})
|
||||||
)
|
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
editLoading: false,
|
editLoading: false,
|
||||||
|
|||||||
@ -28,7 +28,7 @@ const NoteTypeInfo = () => {
|
|||||||
'NoteTypeInfo',
|
'NoteTypeInfo',
|
||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -38,7 +38,7 @@ const NoteInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
content: true,
|
content: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
|
|||||||
@ -28,7 +28,7 @@ const PartSkuInfo = () => {
|
|||||||
const [collapseState, updateCollapseState] = useCollapseState('PartSkuInfo', {
|
const [collapseState, updateCollapseState] = useCollapseState('PartSkuInfo', {
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
|
|||||||
@ -33,7 +33,7 @@ const PartInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
partSkus: true,
|
partSkus: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
|
|||||||
@ -32,7 +32,7 @@ const ProductCategoryInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -34,7 +34,7 @@ const ProductSkuInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
parts: true,
|
parts: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -32,7 +32,7 @@ const ProductInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
productSkus: true,
|
productSkus: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [newProductSkuOpen, setNewProductSkuOpen] = useState(false)
|
const [newProductSkuOpen, setNewProductSkuOpen] = useState(false)
|
||||||
const productSkusTableRef = useRef()
|
const productSkusTableRef = useRef()
|
||||||
|
|||||||
@ -33,7 +33,7 @@ const TaxRateInfo = () => {
|
|||||||
const [collapseState, updateCollapseState] = useCollapseState('TaxRateInfo', {
|
const [collapseState, updateCollapseState] = useCollapseState('TaxRateInfo', {
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
|
|||||||
@ -37,7 +37,7 @@ const UserInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
appPasswords: true,
|
appPasswords: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
|
|||||||
@ -33,7 +33,7 @@ const VendorInfo = () => {
|
|||||||
const [collapseState, updateCollapseState] = useCollapseState('VendorInfo', {
|
const [collapseState, updateCollapseState] = useCollapseState('VendorInfo', {
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
|
|||||||
@ -40,7 +40,7 @@ const GCodeFileInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
parts: true,
|
parts: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,7 @@ const JobInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
subJobs: true,
|
subJobs: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
|
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -35,7 +35,7 @@ const PrinterInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
stocks: true,
|
stocks: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
|
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -30,7 +30,7 @@ const SubJobInfo = () => {
|
|||||||
const [collapseState, updateCollapseState] = useCollapseState('SubJobInfo', {
|
const [collapseState, updateCollapseState] = useCollapseState('SubJobInfo', {
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
|
|||||||
@ -33,7 +33,7 @@ const ClientInfo = () => {
|
|||||||
const [collapseState, updateCollapseState] = useCollapseState('ClientInfo', {
|
const [collapseState, updateCollapseState] = useCollapseState('ClientInfo', {
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
@ -193,3 +193,4 @@ const ClientInfo = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default ClientInfo
|
export default ClientInfo
|
||||||
|
|
||||||
|
|||||||
@ -42,7 +42,7 @@ const ListingVarientInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -43,7 +43,7 @@ const ListingInfo = () => {
|
|||||||
info: true,
|
info: true,
|
||||||
listingVarients: true,
|
listingVarients: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
})
|
})
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
isEditing: false,
|
isEditing: false,
|
||||||
|
|||||||
@ -50,7 +50,7 @@ const MarketplaceInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false
|
auditLogs: true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const [objectFormState, setEditFormState] = useState({
|
const [objectFormState, setEditFormState] = useState({
|
||||||
|
|||||||
@ -55,9 +55,7 @@ const SalesOrderInfo = () => {
|
|||||||
{
|
{
|
||||||
info: true,
|
info: true,
|
||||||
notes: true,
|
notes: true,
|
||||||
auditLogs: false,
|
auditLogs: true,
|
||||||
orderItems: true,
|
|
||||||
shipments: true,
|
|
||||||
invoices: true,
|
invoices: true,
|
||||||
stockEvents: true
|
stockEvents: true
|
||||||
}
|
}
|
||||||
|
|||||||
@ -430,8 +430,8 @@ const ObjectForm = forwardRef(
|
|||||||
setEditLoading(true)
|
setEditLoading(true)
|
||||||
|
|
||||||
const currentFormData = {
|
const currentFormData = {
|
||||||
...objectData,
|
...value,
|
||||||
...value
|
...objectData
|
||||||
}
|
}
|
||||||
onStateChangeRef.current({ editLoading: true })
|
onStateChangeRef.current({ editLoading: true })
|
||||||
await updateObject(id, type, currentFormData)
|
await updateObject(id, type, currentFormData)
|
||||||
|
|||||||
@ -93,7 +93,7 @@ const ObjectTable = forwardRef(
|
|||||||
{
|
{
|
||||||
type,
|
type,
|
||||||
pageSize = 25,
|
pageSize = 25,
|
||||||
scrollHeight = 'calc(var(--unit-100vh) - 258px)',
|
scrollHeight = 'calc(var(--unit-100vh) - 260px)',
|
||||||
onDataChange,
|
onDataChange,
|
||||||
initialPage = 1,
|
initialPage = 1,
|
||||||
cards = false,
|
cards = false,
|
||||||
@ -132,13 +132,13 @@ const ObjectTable = forwardRef(
|
|||||||
adjustedScrollHeight = 'calc(var(--unit-100vh) - 210px)'
|
adjustedScrollHeight = 'calc(var(--unit-100vh) - 210px)'
|
||||||
}
|
}
|
||||||
if (isElectron) {
|
if (isElectron) {
|
||||||
adjustedScrollHeight = 'calc(var(--unit-100vh) - 238px)'
|
adjustedScrollHeight = 'calc(var(--unit-100vh) - 244px)'
|
||||||
}
|
}
|
||||||
if (isMobile && isElectron) {
|
if (isMobile && isElectron) {
|
||||||
adjustedScrollHeight = 'calc(var(--unit-100vh) - 282px)'
|
adjustedScrollHeight = 'calc(var(--unit-100vh) - 282px)'
|
||||||
}
|
}
|
||||||
if (cards && isElectron) {
|
if (cards && isElectron) {
|
||||||
adjustedScrollHeight = 'calc(var(--unit-100vh) - 258px)'
|
adjustedScrollHeight = 'calc(var(--unit-100vh) - 260px)'
|
||||||
}
|
}
|
||||||
const tableRef = useRef(null)
|
const tableRef = useRef(null)
|
||||||
const model = getModelByName(type)
|
const model = getModelByName(type)
|
||||||
@ -999,7 +999,7 @@ const ObjectTable = forwardRef(
|
|||||||
)}
|
)}
|
||||||
</Splitter.Panel>
|
</Splitter.Panel>
|
||||||
{showFilterSidebar && (
|
{showFilterSidebar && (
|
||||||
<Splitter.Panel defaultSize={'25%'}>
|
<Splitter.Panel>
|
||||||
<FilterSidebar
|
<FilterSidebar
|
||||||
type={type}
|
type={type}
|
||||||
filter={sidebarFilter}
|
filter={sidebarFilter}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user