admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2022-05-06 (pull request #458)

Browse Source 
Add backwards compatibility for log generation.
This commit is contained in:
Patrick Fic
2022-05-03 18:08:45 +00:00
parent 896d82202b d533423fb6
commit 4ad9ccec47
9 changed files with 118 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
View File

@@ -48,6 +48,7 @@ export function JobsCloseExportButton({
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/receivables`, {
jobIds: [jobId],
elgen: true,
});
} else {
//Default is QBD

1
client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
View File

@@ -40,6 +40,7 @@ export function JobsExportAllButton({
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/receivables`, {
jobIds: jobIds,
elgen: true,
});
} else {
let QbXmlResponse;

1
client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
View File

@@ -43,6 +43,7 @@ export function PayableExportAll({
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/payables`, {
bills: billids,
elgen: true,
});
} else {
let QbXmlResponse;

1
client/src/components/payable-export-button/payable-export-button.component.jsx
View File

@@ -44,6 +44,7 @@ export function PayableExportButton({
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/payables`, {
bills: [billId],
elgen: true,
});
} else {
//Default is QBD

1
client/src/components/payment-export-button/payment-export-button.component.jsx
View File

@@ -41,6 +41,7 @@ export function PaymentExportButton({
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/payments`, {
payments: [paymentId],
elgen: true,
});
} else {
//Default is QBD

1
client/src/components/payments-export-all-button/payments-export-all-button.component.jsx
View File

@@ -39,6 +39,7 @@ export function PaymentsExportAllButton({
if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/payments`, {
payments: paymentIds,
elgen: true,
});
} else {
let QbXmlResponse;

6
server/accounting/qbo/qbo-payables.js
View File

@@ -45,7 +45,7 @@ exports.default = async (req, res) => {
await refreshOauthToken(oauthClient, req);
const BearerToken = req.headers.authorization;
const { bills: billsToQuery } = req.body;
const { bills: billsToQuery, elgen } = req.body;
//Query Job Info
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
headers: {
@@ -92,6 +92,7 @@ exports.default = async (req, res) => {
);
// //No error. Mark the job exported & insert export log.
if (elgen) {
const result = await client
.setHeaders({ Authorization: BearerToken })
.request(queries.QBO_MARK_BILL_EXPORTED, {
@@ -109,6 +110,7 @@ exports.default = async (req, res) => {
},
],
});
}
ret.push({ billid: bill.id, success: true });
} catch (error) {
@@ -121,6 +123,7 @@ exports.default = async (req, res) => {
});
//Add the export log error.
if (elgen) {
const result = await client
.setHeaders({ Authorization: BearerToken })
.request(queries.INSERT_EXPORT_LOG, {
@@ -139,6 +142,7 @@ exports.default = async (req, res) => {
});
}
}
}
res.status(200).json(ret);
} catch (error) {

6
server/accounting/qbo/qbo-payments.js
View File

@@ -52,7 +52,7 @@ exports.default = async (req, res) => {
await refreshOauthToken(oauthClient, req);
const BearerToken = req.headers.authorization;
const { payments: paymentsToQuery } = req.body;
const { payments: paymentsToQuery, elgen } = req.body;
//Query Job Info
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
headers: {
@@ -157,6 +157,7 @@ exports.default = async (req, res) => {
}
// //No error. Mark the payment exported & insert export log.
if (elgen) {
const result = await client
.setHeaders({ Authorization: BearerToken })
.request(queries.QBO_MARK_PAYMENT_EXPORTED, {
@@ -173,6 +174,7 @@ exports.default = async (req, res) => {
},
],
});
}
ret.push({ paymentid: payment.id, success: true });
} catch (error) {
@@ -182,6 +184,7 @@ exports.default = async (req, res) => {
(error && error.message),
});
//Add the export log error.
if (elgen) {
const result = await client
.setHeaders({ Authorization: BearerToken })
.request(queries.INSERT_EXPORT_LOG, {
@@ -198,6 +201,7 @@ exports.default = async (req, res) => {
},
],
});
}
ret.push({
paymentid: payment.id,

9
server/accounting/qbo/qbo-receivables.js
View File

@@ -46,7 +46,7 @@ exports.default = async (req, res) => {
await refreshOauthToken(oauthClient, req);
const BearerToken = req.headers.authorization;
const { jobIds } = req.body;
const { jobIds, elgen } = req.body;
//Query Job Info
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
headers: {
@@ -141,12 +141,14 @@ exports.default = async (req, res) => {
);
// //No error. Mark the job exported & insert export log.
if (elgen) {
const result = await client
.setHeaders({ Authorization: BearerToken })
.request(queries.QBO_MARK_JOB_EXPORTED, {
jobId: job.id,
job: {
status: bodyshop.md_ro_statuses.default_exported || "Exported*",
status:
bodyshop.md_ro_statuses.default_exported || "Exported*",
date_exported: moment().tz(bodyshop.timezone),
},
logs: [
@@ -159,6 +161,7 @@ exports.default = async (req, res) => {
],
});
}
}
ret.push({ jobid: job.id, success: true });
} catch (error) {
ret.push({
@@ -169,6 +172,7 @@ exports.default = async (req, res) => {
(error && error.message),
});
//Add the export log error.
if (elgen) {
const result = await client
.setHeaders({ Authorization: BearerToken })
.request(queries.INSERT_EXPORT_LOG, {
@@ -187,6 +191,7 @@ exports.default = async (req, res) => {
});
}
}
}
res.status(200).json(ret);
} catch (error) {