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) { if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/receivables`, { PartnerResponse = await axios.post(`/qbo/receivables`, {
jobIds: [jobId], jobIds: [jobId],
elgen: true,
}); });
} else { } else {
//Default is QBD //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) { if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/receivables`, { PartnerResponse = await axios.post(`/qbo/receivables`, {
jobIds: jobIds, jobIds: jobIds,
elgen: true,
}); });
} else { } else {
let QbXmlResponse; 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) { if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/payables`, { PartnerResponse = await axios.post(`/qbo/payables`, {
bills: billids, bills: billids,
elgen: true,
}); });
} else { } else {
let QbXmlResponse; 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) { if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/payables`, { PartnerResponse = await axios.post(`/qbo/payables`, {
bills: [billId], bills: [billId],
elgen: true,
}); });
} else { } else {
//Default is QBD //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) { if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/payments`, { PartnerResponse = await axios.post(`/qbo/payments`, {
payments: [paymentId], payments: [paymentId],
elgen: true,
}); });
} else { } else {
//Default is QBD //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) { if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
PartnerResponse = await axios.post(`/qbo/payments`, { PartnerResponse = await axios.post(`/qbo/payments`, {
payments: paymentIds, payments: paymentIds,
elgen: true,
}); });
} else { } else {
let QbXmlResponse; let QbXmlResponse;

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

@@ -45,7 +45,7 @@ exports.default = async (req, res) => {
await refreshOauthToken(oauthClient, req); await refreshOauthToken(oauthClient, req);
const BearerToken = req.headers.authorization; const BearerToken = req.headers.authorization;
const { bills: billsToQuery } = req.body; const { bills: billsToQuery, elgen } = req.body;
//Query Job Info //Query Job Info
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, { const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
headers: { headers: {
@@ -92,23 +92,25 @@ exports.default = async (req, res) => {
); );
// //No error. Mark the job exported & insert export log. // //No error. Mark the job exported & insert export log.
const result = await client if (elgen) {
.setHeaders({ Authorization: BearerToken }) const result = await client
.request(queries.QBO_MARK_BILL_EXPORTED, { .setHeaders({ Authorization: BearerToken })
billId: bill.id, .request(queries.QBO_MARK_BILL_EXPORTED, {
bill: { billId: bill.id,
exported: true, bill: {
exported_at: moment().tz(bodyshop.timezone), exported: true,
}, exported_at: moment().tz(bodyshop.timezone),
logs: [
{
bodyshopid: bodyshop.id,
billid: bill.id,
successful: true,
useremail: req.user.email,
}, },
], logs: [
}); {
bodyshopid: bodyshop.id,
billid: bill.id,
successful: true,
useremail: req.user.email,
},
],
});
}
ret.push({ billid: bill.id, success: true }); ret.push({ billid: bill.id, success: true });
} catch (error) { } catch (error) {
@@ -121,22 +123,24 @@ exports.default = async (req, res) => {
}); });
//Add the export log error. //Add the export log error.
const result = await client if (elgen) {
.setHeaders({ Authorization: BearerToken }) const result = await client
.request(queries.INSERT_EXPORT_LOG, { .setHeaders({ Authorization: BearerToken })
logs: [ .request(queries.INSERT_EXPORT_LOG, {
{ logs: [
bodyshopid: bodyshop.id, {
billid: bill.id, bodyshopid: bodyshop.id,
successful: false, billid: bill.id,
message: JSON.stringify([ successful: false,
(error && error.authResponse && error.authResponse.body) || message: JSON.stringify([
(error && error.message), (error && error.authResponse && error.authResponse.body) ||
]), (error && error.message),
useremail: req.user.email, ]),
}, useremail: req.user.email,
], },
}); ],
});
}
} }
} }

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

@@ -52,7 +52,7 @@ exports.default = async (req, res) => {
await refreshOauthToken(oauthClient, req); await refreshOauthToken(oauthClient, req);
const BearerToken = req.headers.authorization; const BearerToken = req.headers.authorization;
const { payments: paymentsToQuery } = req.body; const { payments: paymentsToQuery, elgen } = req.body;
//Query Job Info //Query Job Info
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, { const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
headers: { headers: {
@@ -157,22 +157,24 @@ exports.default = async (req, res) => {
} }
// //No error. Mark the payment exported & insert export log. // //No error. Mark the payment exported & insert export log.
const result = await client if (elgen) {
.setHeaders({ Authorization: BearerToken }) const result = await client
.request(queries.QBO_MARK_PAYMENT_EXPORTED, { .setHeaders({ Authorization: BearerToken })
paymentId: payment.id, .request(queries.QBO_MARK_PAYMENT_EXPORTED, {
payment: { paymentId: payment.id,
exportedat: moment().tz(bodyshop.timezone), payment: {
}, exportedat: moment().tz(bodyshop.timezone),
logs: [
{
bodyshopid: bodyshop.id,
paymentid: payment.id,
successful: true,
useremail: req.user.email,
}, },
], logs: [
}); {
bodyshopid: bodyshop.id,
paymentid: payment.id,
successful: true,
useremail: req.user.email,
},
],
});
}
ret.push({ paymentid: payment.id, success: true }); ret.push({ paymentid: payment.id, success: true });
} catch (error) { } catch (error) {
@@ -182,22 +184,24 @@ exports.default = async (req, res) => {
(error && error.message), (error && error.message),
}); });
//Add the export log error. //Add the export log error.
const result = await client if (elgen) {
.setHeaders({ Authorization: BearerToken }) const result = await client
.request(queries.INSERT_EXPORT_LOG, { .setHeaders({ Authorization: BearerToken })
logs: [ .request(queries.INSERT_EXPORT_LOG, {
{ logs: [
bodyshopid: bodyshop.id, {
paymentid: payment.id, bodyshopid: bodyshop.id,
successful: false, paymentid: payment.id,
message: JSON.stringify([ successful: false,
(error && error.authResponse && error.authResponse.body) || message: JSON.stringify([
(error && error.message), (error && error.authResponse && error.authResponse.body) ||
]), (error && error.message),
useremail: req.user.email, ]),
}, useremail: req.user.email,
], },
}); ],
});
}
ret.push({ ret.push({
paymentid: payment.id, paymentid: payment.id,

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

@@ -46,7 +46,7 @@ exports.default = async (req, res) => {
await refreshOauthToken(oauthClient, req); await refreshOauthToken(oauthClient, req);
const BearerToken = req.headers.authorization; const BearerToken = req.headers.authorization;
const { jobIds } = req.body; const { jobIds, elgen } = req.body;
//Query Job Info //Query Job Info
const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, { const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
headers: { headers: {
@@ -141,23 +141,26 @@ exports.default = async (req, res) => {
); );
// //No error. Mark the job exported & insert export log. // //No error. Mark the job exported & insert export log.
const result = await client if (elgen) {
.setHeaders({ Authorization: BearerToken }) const result = await client
.request(queries.QBO_MARK_JOB_EXPORTED, { .setHeaders({ Authorization: BearerToken })
jobId: job.id, .request(queries.QBO_MARK_JOB_EXPORTED, {
job: { jobId: job.id,
status: bodyshop.md_ro_statuses.default_exported || "Exported*", job: {
date_exported: moment().tz(bodyshop.timezone), status:
}, bodyshop.md_ro_statuses.default_exported || "Exported*",
logs: [ date_exported: moment().tz(bodyshop.timezone),
{
bodyshopid: bodyshop.id,
jobid: job.id,
successful: true,
useremail: req.user.email,
}, },
], logs: [
}); {
bodyshopid: bodyshop.id,
jobid: job.id,
successful: true,
useremail: req.user.email,
},
],
});
}
} }
ret.push({ jobid: job.id, success: true }); ret.push({ jobid: job.id, success: true });
} catch (error) { } catch (error) {
@@ -169,22 +172,24 @@ exports.default = async (req, res) => {
(error && error.message), (error && error.message),
}); });
//Add the export log error. //Add the export log error.
const result = await client if (elgen) {
.setHeaders({ Authorization: BearerToken }) const result = await client
.request(queries.INSERT_EXPORT_LOG, { .setHeaders({ Authorization: BearerToken })
logs: [ .request(queries.INSERT_EXPORT_LOG, {
{ logs: [
bodyshopid: bodyshop.id, {
jobid: job.id, bodyshopid: bodyshop.id,
successful: false, jobid: job.id,
message: JSON.stringify([ successful: false,
(error && error.authResponse && error.authResponse.body) || message: JSON.stringify([
(error && error.message), (error && error.authResponse && error.authResponse.body) ||
]), (error && error.message),
useremail: req.user.email, ]),
}, useremail: req.user.email,
], },
}); ],
});
}
} }
} }