Compare commits

...

7 Commits

Author SHA1 Message Date
Allan Carr
54ce0e1802 IO-3500 Profit Center Item
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2026-01-13 16:40:24 -08:00
Dave Richer
be2df79555 Merged in hotfix/2026-01-13 (pull request #2813)
Hotfix/2026 01 13 into master-AIO
2026-01-13 20:52:00 +00:00
Allan Carr
9c733702e4 Merged in feature/IO-3498-QBO-Auth-Token (pull request #2810)
IO-3498 QBO Auth Token

Approved-by: Dave Richer
2026-01-13 20:45:42 +00:00
Allan Carr
997aebddb0 IO-3498 QBO Auth Token
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2026-01-13 12:42:18 -08:00
Dave
17e3f39706 Merge remote-tracking branch 'origin/feature/IO-3431-Job-Image-Gallery' into hotfix/2026-01-13 2026-01-13 14:22:23 -05:00
Allan Carr
d90acf4b89 IO-3431 Prettier Run
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2026-01-12 13:27:23 -08:00
Allan Carr
68dd7f33ab IO-3431 Add Tags to Images and Documents
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2026-01-12 13:25:26 -08:00
4 changed files with 52 additions and 24 deletions

View File

@@ -67,6 +67,7 @@ export function JobsDocumentsLocalGallery({
src: val.thumbnail,
height: val.thumbnailHeight,
width: val.thumbnailWidth,
tags: [{ value: val.filename, title: val.filename }],
...(val.optimized && { src: val.optimized, fullsize: val.src })
});
if (val.optimized) optimized = true;

View File

@@ -1,4 +1,5 @@
import { Checkbox } from "antd";
import { Tag } from "antd";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
/**
@@ -187,6 +188,30 @@ export function LocalMediaGrid({
transition: "opacity .25s ease"
}}
/>
{img.tags && img.tags.length > 0 && (
<div
style={{
position: "absolute",
bottom: 0,
left: 0,
right: 0,
padding: "2px 6px",
borderRadius: "0 0 4px 4px",
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
display: "flex",
flexWrap: "wrap",
gap: "4px"
}}
>
{img.tags.map((tag, tagIdx) => (
<Tag key={tagIdx} variant="outlined" color="gold" style={{ opacity: 0.8 }}>
{tag.value || tag.title}
</Tag>
))}
</div>
)}
</>
);
})()}

View File

@@ -695,25 +695,25 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
>
<Input onBlur={handleBlur} />
</Form.Item>
{!hasDMSKey && (
<Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountitem")}
key={`${index}accountitem`}
name={[field.name, "accountitem"]}
rules={[{ required: true }]}
>
<Input onBlur={handleBlur} />
</Form.Item>
)}
{hasDMSKey && !bodyshop.rr_dealerid && (
<>
<Form.Item
label={t("bodyshop.fields.responsibilitycenter_accountitem")}
key={`${index}accountitem`}
name={[field.name, "accountitem"]}
rules={[{ required: true }]}
>
<Input onBlur={handleBlur} />
</Form.Item>
<Form.Item
label={t("bodyshop.fields.dms.dms_acctnumber")}
key={`${index}dms_acctnumber`}
name={[field.name, "dms_acctnumber"]}
rules={[{ required: true }]}
>
<Input onBlur={handleBlur} />
</Form.Item>
</>
<Form.Item
label={t("bodyshop.fields.dms.dms_acctnumber")}
key={`${index}dms_acctnumber`}
name={[field.name, "dms_acctnumber"]}
rules={[{ required: true }]}
>
<Input onBlur={handleBlur} />
</Form.Item>
)}
{bodyshop.cdk_dealerid && (
<Form.Item

View File

@@ -45,7 +45,7 @@ exports.default = async (req, res) => {
exports.refresh = async (oauthClient, req) => {
try {
// logger.log("qbo-token-refresh", "DEBUG", req.user.email, null, null);
logger.log("qbo-token-refresh", "DEBUG", req.user.email, null, null);
const authResponse = await oauthClient.refresh();
await client.request(queries.SET_QBO_AUTH, {
email: req.user.email,
@@ -59,10 +59,12 @@ exports.refresh = async (oauthClient, req) => {
};
exports.setNewRefreshToken = async (email, apiResponse) => {
//logger.log("qbo-token-updated", "DEBUG", email, null, null);
// Deprecated - tokens are now auto-updated in the oauthClient and the token isn't pushed back from QBO API calls anymore
await client.request(queries.SET_QBO_AUTH, {
email,
qbo_auth: { ...apiResponse.token, createdAt: Date.now() }
});
// logger.log("qbo-token-updated", "DEBUG", email, null, {apiResponse: apiResponse});
// await client.request(queries.SET_QBO_AUTH, {
// email,
// qbo_auth: { ...apiResponse.token, createdAt: Date.now() }
// });
};