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

IO-1439 Trim QB name fields on export.

Browse Source
This commit is contained in:
Patrick Fic
2021-10-18 12:16:12 -07:00
parent ad6394783d
commit f0a13856bc
3 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/accounting/qbxml/qbxml-payments.js
View File

@@ -111,8 +111,7 @@ const generatePayment = (payment, isThreeTier, twoTierPref) => {
ReceivePaymentAddRq: { ReceivePaymentAddRq: {
ReceivePaymentAdd: { ReceivePaymentAdd: {
CustomerRef: { CustomerRef: {
FullName: FullName: (payment.job.bodyshop.accountingconfig.tiers === 3
payment.job.bodyshop.accountingconfig.tiers === 3
? `${generateSourceTier(payment.job)}:${generateOwnerTier( ? `${generateSourceTier(payment.job)}:${generateOwnerTier(
payment.job, payment.job,
isThreeTier, isThreeTier,
@@ -122,7 +121,8 @@ const generatePayment = (payment, isThreeTier, twoTierPref) => {
payment.job, payment.job,
isThreeTier, isThreeTier,
twoTierPref twoTierPref
)}:${generateJobTier(payment.job)}`, )}:${generateJobTier(payment.job)}`
).trim(),
}, },
ARAccountRef: { ARAccountRef: {
FullName: FullName:
@@ -155,8 +155,7 @@ const generatePayment = (payment, isThreeTier, twoTierPref) => {
CreditMemoAddRq: { CreditMemoAddRq: {
CreditMemoAdd: { CreditMemoAdd: {
CustomerRef: { CustomerRef: {
FullName: FullName: (payment.job.bodyshop.accountingconfig.tiers === 3
payment.job.bodyshop.accountingconfig.tiers === 3
? `${generateSourceTier(payment.job)}:${generateOwnerTier( ? `${generateSourceTier(payment.job)}:${generateOwnerTier(
payment.job, payment.job,
isThreeTier, isThreeTier,
@@ -166,7 +165,8 @@ const generatePayment = (payment, isThreeTier, twoTierPref) => {
payment.job, payment.job,
isThreeTier, isThreeTier,
twoTierPref twoTierPref
)}:${generateJobTier(payment.job)}`, )}:${generateJobTier(payment.job)}`
).trim(),
}, },
ARAccountRef: { ARAccountRef: {
FullName: FullName:

8
server/accounting/qbxml/qbxml-receivables.js
View File

@@ -122,7 +122,7 @@ const generateSourceCustomerQbxml = (jobs_by_pk, bodyshop) => {
"@onError": "continueOnError", "@onError": "continueOnError",
CustomerAddRq: { CustomerAddRq: {
CustomerAdd: { CustomerAdd: {
Name: jobs_by_pk.ins_co_nm, Name: jobs_by_pk.ins_co_nm.trim(),
// BillAddress: { // BillAddress: {
// Addr1: jobs_by_pk.ownr_addr1, // Addr1: jobs_by_pk.ownr_addr1,
// Addr2: jobs_by_pk.ownr_addr2, // Addr2: jobs_by_pk.ownr_addr2,
@@ -238,8 +238,7 @@ const generateInvoiceQbxml = (
InvoiceAddRq: { InvoiceAddRq: {
InvoiceAdd: { InvoiceAdd: {
CustomerRef: { CustomerRef: {
FullName: FullName: (bodyshop.accountingconfig.tiers === 3
bodyshop.accountingconfig.tiers === 3
? `${generateSourceTier(jobs_by_pk)}:${generateOwnerTier( ? `${generateSourceTier(jobs_by_pk)}:${generateOwnerTier(
jobs_by_pk jobs_by_pk
)}:${generateJobTier(jobs_by_pk)}` )}:${generateJobTier(jobs_by_pk)}`
@@ -247,7 +246,8 @@ const generateInvoiceQbxml = (
jobs_by_pk, jobs_by_pk,
isThreeTier, isThreeTier,
twoTierPref twoTierPref
)}:${generateJobTier(jobs_by_pk)}`, )}:${generateJobTier(jobs_by_pk)}`
).trim(),
}, },
...(jobs_by_pk.class ...(jobs_by_pk.class

21
server/accounting/qbxml/qbxml-utils.js
View File

@@ -6,24 +6,25 @@ exports.addQbxmlHeader = addQbxmlHeader = (xml) => {
}; };
exports.generateSourceTier = (jobs_by_pk) => { exports.generateSourceTier = (jobs_by_pk) => {
return jobs_by_pk.ins_co_nm; return jobs_by_pk.ins_co_nm && jobs_by_pk.ins_co_nm.trim();
}; };
exports.generateJobTier = (jobs_by_pk) => { exports.generateJobTier = (jobs_by_pk) => {
return jobs_by_pk.ro_number; return jobs_by_pk.ro_number && jobs_by_pk.ro_number.trim();
}; };
exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => { exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
if (isThreeTier) { if (isThreeTier) {
//It's always gonna be the owner now. Same as 2 tier by name //It's always gonna be the owner now. Same as 2 tier by name
return jobs_by_pk.ownr_co_nm return (
jobs_by_pk.ownr_co_nm
? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${ ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
jobs_by_pk.owner.accountingid || "" jobs_by_pk.owner.accountingid || ""
}` }`
: `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`.substring( : `${`${jobs_by_pk.ownr_ln || ""} ${
0, jobs_by_pk.ownr_fn || ""
30 }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`
)} #${jobs_by_pk.owner.accountingid || ""}`; ).trim();
} else { } else {
//What's the 2 tier pref? //What's the 2 tier pref?
if (twotierpref === "source") { if (twotierpref === "source") {
@@ -31,13 +32,15 @@ exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
//It should be the insurance co. //It should be the insurance co.
} else { } else {
//Same as 3 tier //Same as 3 tier
return jobs_by_pk.ownr_co_nm return (
jobs_by_pk.ownr_co_nm
? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${ ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
jobs_by_pk.owner.accountingid || "" jobs_by_pk.owner.accountingid || ""
}` }`
: `${`${jobs_by_pk.ownr_ln || ""} ${ : `${`${jobs_by_pk.ownr_ln || ""} ${
jobs_by_pk.ownr_fn || "" jobs_by_pk.ownr_fn || ""
}`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`; }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`
).trim();
} }
} }
}; };