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

IO-1468 QB and CDK Updates for MCE Markup

Browse Source
This commit is contained in:
Patrick Fic
2021-10-14 11:21:06 -07:00
parent 660f463aea
commit 1d210a9e52
9 changed files with 91 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.7.1">
<babeledit_project be_version="2.7.1" version="1.2">
<!--
BabelEdit project file
@@ -16878,6 +16878,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>prt_dsmk_m</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>prt_dsmk_p</name>
<definition_loaded>false</definition_loaded>

2
client/src/components/jobs-available-table/jobs-available-table.container.jsx
View File

@@ -501,7 +501,7 @@ async function CheckTaxRates(estData, bodyshop) {
//Set markup lines and tax lines as taxable.
//900510 is a mark up. 900510 is a discount.
if (bodyshop.region_config === "CA_SK" && jl.db_ref === "900510") {
if (jl.db_ref === "900510") {
estData.joblines.data[index].tax_part = true;
}
});

15
client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
View File

@@ -31,6 +31,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
<th>{t("joblines.fields.line_desc")}</th>
<th>{t("joblines.fields.part_type")}</th>
<th>{t("joblines.fields.act_price")}</th>
<th>{t("joblines.fields.prt_dsmk_m")}</th>
<th>{t("joblines.fields.op_code_desc")}</th>
<th>{t("joblines.fields.mod_lbr_ty")}</th>
<th>{t("joblines.fields.mod_lb_hrs")}</th>
@@ -70,6 +71,16 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
<ReadOnlyFormItem type="currency" />
</Form.Item>
</td>
<td>
<Form.Item
span={2}
// label={t("joblines.fields.prt_dsmk_m")}
key={`${index}prt_dsmk_m`}
name={[field.name, "prt_dsmk_m"]}
>
<ReadOnlyFormItem type="currency" />
</Form.Item>
</td>
<td>
<Form.Item
span={2}
@@ -108,7 +119,9 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
labelCol={{ span: 0 }}
rules={[
{
required: !!job.joblines[index].act_price,
required:
!!job.joblines[index].act_price ||
!!job.joblines[index].prt_dsmk_m,
//message: t("general.validation.required"),
},
]}

2
client/src/graphql/jobs.queries.js
View File

@@ -1769,7 +1769,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
actual_in
kmin
kmout
joblines(where: { removed: { _eq: false } }) {
joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) {
id
removed
tax_part

3
client/src/translations/en_us/common.json
View File

@@ -1053,7 +1053,8 @@
},
"profitcenter_labor": "Profit Center: Labor",
"profitcenter_part": "Profit Center: Part",
"prt_dsmk_p": "Line Markup %",
"prt_dsmk_m": "Line Discount/Markup $",
"prt_dsmk_p": "Line Discount/Markup %",
"status": "Status",
"tax_part": "Tax Part",
"total": "Total",

1
client/src/translations/es/common.json
View File

@@ -1053,6 +1053,7 @@
},
"profitcenter_labor": "",
"profitcenter_part": "",
"prt_dsmk_m": "",
"prt_dsmk_p": "",
"status": "Estado",
"tax_part": "",

1
client/src/translations/fr/common.json
View File

@@ -1053,6 +1053,7 @@
},
"profitcenter_labor": "",
"profitcenter_part": "",
"prt_dsmk_m": "",
"prt_dsmk_p": "",
"status": "Statut",
"tax_part": "",

47
logs/oAuthClient-log.log Normal file
View File

@@ -0,0 +1,47 @@
2021-10-14T18:14:19.821Z info: Create Token response is : {
"token": {
"realmId": "4620816365180784050",
"token_type": "bearer",
"access_token": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..dRa330Va1FympcUMjnlbkw.W1_-IFux2NF5wqk48iEyYCPEToNm0KA5OQPOOk0kB75xOQrl-ewYSv3ZPmM56c4p8rzlNUr1V3lF3fcpKcZWSgShNX-dYAQ5WfhaBVz27wI0eXE3RUNbsuUwWc4pKtdU3pFlI2Bz94m9zVY8DKlw1Pm4CFGhqf41IqCcgn6VxYE-uRC2L5VLXyddEGwJoTpAWeA0JEtUc0DoTMVPFnOb6zUEgP5MGj5w81eHludNfl9QxGcitwpqrAHk1UDK0GfgvROZDmfrgvZ0r0SQ9aiI1_XWisZjnqzzcr4fMzQq85CoujnYfgAzi4-En3YgP0D6q_OnUSY5NjFzUsU_4ikganeFx5WgRv9jJDDwcDsSnkoJFSdgEoj_oWwTtYr-9RXjKBdothgXySicLEA5J_PdCGXZJ_rxQ_hW6RndVLMSrlADCWPpKGhT_PV96UB-EO_m0kFvnCOqAuvAcSRC46OmJh9sedTqC5pMHPgOwnosQzHdR-9jKxEivfw8A49IucMhl9pJzPDKPVSdw-e9vlt4OMo_fBcYHb14QxoxJNPZQV6KUe4aSqxjjK0-bFOOk33sNGr-IHZgor1FZyYDK5OBgROLQx98Sm6suJ-GVuG_s0O7VwsqXRSYY9UpWcg4xKfLG6WXFSANa2kc41G4zAsB-4eQJS654t3ycl2Qh50VNKMrPusRhFpMJVvLn0zEiWTjZKswk559Q_1-NpSxUbquatbERDKu9keY7nL5mjWEJUDl8o7e7GpzY05KATWvjjz39OCYUjVhT_kMEho9td7TUjltakgmx-Go8VDbBYqyrPaPdasZfS59w1QhZUJPLFPmRA0H1jxc8qu841eHDBi4kw.vsfZZv3p2rLJWnM9SWbJzg",
"refresh_token": "AB11642961656aZhy8GyGhOImeMq6hd5q3j8S9FJGT4MppS92Y",
"expires_in": 3600,
"x_refresh_token_expires_in": 8726400,
"id_token": "eyJraWQiOiJPUElDUFJEMDkxODIwMTQiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiI1ODYwNzMxZC0yZmQ1LTQ3YTMtOTgxNi0wYzE5N2NkZDk1NjIiLCJhdWQiOlsiQUJnY01pUkZvNmdWZWZtOFBCZkZwZkxQdzFoUzZCekluMFduUlZLR1A5R05SWm1neHQiXSwicmVhbG1pZCI6IjQ2MjA4MTYzNjUxODA3ODQwNTAiLCJhdXRoX3RpbWUiOjE2MzQyMzUyNTAsImlzcyI6Imh0dHBzOlwvXC9vYXV0aC5wbGF0Zm9ybS5pbnR1aXQuY29tXC9vcFwvdjEiLCJleHAiOjE2MzQyMzg4NTYsImlhdCI6MTYzNDIzNTI1Nn0.ZMNPsFfYqnyilp0fFrW5RvMht6Eb1MFTY2X_zx3dcuoH2sAK5EYaKgtm9EZq5VeH_mQ4qGQLGgl70v3v_2I0ElmFOZeSGUO1Q5UcXxaK5-A_8Wed5qr_qpQWGWpc2pkWNM1Q2hQfDVfX9J45Ob2qumYlJ49V_p5Sm6WuqyIrfTQ",
"latency": 60000,
"createdAt": 1634235259820,
"state": "patrick@imex.dev"
},
"response": {
"url": "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer",
"headers": {
"date": "Thu, 14 Oct 2021 18:14:16 GMT",
"content-type": "application/json;charset=utf-8",
"content-length": "1684",
"connection": "close",
"intuit_tid": "1-61687378-07987874613592c04a0e3709",
"x-spanid": "ebcfa726-ad39-401b-8fb5-ad018bdce8a1",
"x-amzn-trace-id": "Root=1-61687378-07987874613592c04a0e3709",
"x-content-type-options": "nosniff",
"server": "envoy",
"cache-control": "no-cache, no-store",
"pragma": "no-cache",
"x-frame-options": "SAMEORIGIN",
"x-xss-protection": "1; mode=block",
"x-envoy-upstream-service-time": "76",
"strict-transport-security": "max-age=31536000"
},
"body": "{\"x_refresh_token_expires_in\":8726400,\"refresh_token\":\"AB11642961656aZhy8GyGhOImeMq6hd5q3j8S9FJGT4MppS92Y\",\"access_token\":\"eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..dRa330Va1FympcUMjnlbkw.W1_-IFux2NF5wqk48iEyYCPEToNm0KA5OQPOOk0kB75xOQrl-ewYSv3ZPmM56c4p8rzlNUr1V3lF3fcpKcZWSgShNX-dYAQ5WfhaBVz27wI0eXE3RUNbsuUwWc4pKtdU3pFlI2Bz94m9zVY8DKlw1Pm4CFGhqf41IqCcgn6VxYE-uRC2L5VLXyddEGwJoTpAWeA0JEtUc0DoTMVPFnOb6zUEgP5MGj5w81eHludNfl9QxGcitwpqrAHk1UDK0GfgvROZDmfrgvZ0r0SQ9aiI1_XWisZjnqzzcr4fMzQq85CoujnYfgAzi4-En3YgP0D6q_OnUSY5NjFzUsU_4ikganeFx5WgRv9jJDDwcDsSnkoJFSdgEoj_oWwTtYr-9RXjKBdothgXySicLEA5J_PdCGXZJ_rxQ_hW6RndVLMSrlADCWPpKGhT_PV96UB-EO_m0kFvnCOqAuvAcSRC46OmJh9sedTqC5pMHPgOwnosQzHdR-9jKxEivfw8A49IucMhl9pJzPDKPVSdw-e9vlt4OMo_fBcYHb14QxoxJNPZQV6KUe4aSqxjjK0-bFOOk33sNGr-IHZgor1FZyYDK5OBgROLQx98Sm6suJ-GVuG_s0O7VwsqXRSYY9UpWcg4xKfLG6WXFSANa2kc41G4zAsB-4eQJS654t3ycl2Qh50VNKMrPusRhFpMJVvLn0zEiWTjZKswk559Q_1-NpSxUbquatbERDKu9keY7nL5mjWEJUDl8o7e7GpzY05KATWvjjz39OCYUjVhT_kMEho9td7TUjltakgmx-Go8VDbBYqyrPaPdasZfS59w1QhZUJPLFPmRA0H1jxc8qu841eHDBi4kw.vsfZZv3p2rLJWnM9SWbJzg\",\"id_token\":\"eyJraWQiOiJPUElDUFJEMDkxODIwMTQiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiI1ODYwNzMxZC0yZmQ1LTQ3YTMtOTgxNi0wYzE5N2NkZDk1NjIiLCJhdWQiOlsiQUJnY01pUkZvNmdWZWZtOFBCZkZwZkxQdzFoUzZCekluMFduUlZLR1A5R05SWm1neHQiXSwicmVhbG1pZCI6IjQ2MjA4MTYzNjUxODA3ODQwNTAiLCJhdXRoX3RpbWUiOjE2MzQyMzUyNTAsImlzcyI6Imh0dHBzOlwvXC9vYXV0aC5wbGF0Zm9ybS5pbnR1aXQuY29tXC9vcFwvdjEiLCJleHAiOjE2MzQyMzg4NTYsImlhdCI6MTYzNDIzNTI1Nn0.ZMNPsFfYqnyilp0fFrW5RvMht6Eb1MFTY2X_zx3dcuoH2sAK5EYaKgtm9EZq5VeH_mQ4qGQLGgl70v3v_2I0ElmFOZeSGUO1Q5UcXxaK5-A_8Wed5qr_qpQWGWpc2pkWNM1Q2hQfDVfX9J45Ob2qumYlJ49V_p5Sm6WuqyIrfTQ\",\"token_type\":\"bearer\",\"expires_in\":3600}",
"status": 200,
"statusText": "OK"
},
"body": "{\"x_refresh_token_expires_in\":8726400,\"refresh_token\":\"AB11642961656aZhy8GyGhOImeMq6hd5q3j8S9FJGT4MppS92Y\",\"access_token\":\"eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..dRa330Va1FympcUMjnlbkw.W1_-IFux2NF5wqk48iEyYCPEToNm0KA5OQPOOk0kB75xOQrl-ewYSv3ZPmM56c4p8rzlNUr1V3lF3fcpKcZWSgShNX-dYAQ5WfhaBVz27wI0eXE3RUNbsuUwWc4pKtdU3pFlI2Bz94m9zVY8DKlw1Pm4CFGhqf41IqCcgn6VxYE-uRC2L5VLXyddEGwJoTpAWeA0JEtUc0DoTMVPFnOb6zUEgP5MGj5w81eHludNfl9QxGcitwpqrAHk1UDK0GfgvROZDmfrgvZ0r0SQ9aiI1_XWisZjnqzzcr4fMzQq85CoujnYfgAzi4-En3YgP0D6q_OnUSY5NjFzUsU_4ikganeFx5WgRv9jJDDwcDsSnkoJFSdgEoj_oWwTtYr-9RXjKBdothgXySicLEA5J_PdCGXZJ_rxQ_hW6RndVLMSrlADCWPpKGhT_PV96UB-EO_m0kFvnCOqAuvAcSRC46OmJh9sedTqC5pMHPgOwnosQzHdR-9jKxEivfw8A49IucMhl9pJzPDKPVSdw-e9vlt4OMo_fBcYHb14QxoxJNPZQV6KUe4aSqxjjK0-bFOOk33sNGr-IHZgor1FZyYDK5OBgROLQx98Sm6suJ-GVuG_s0O7VwsqXRSYY9UpWcg4xKfLG6WXFSANa2kc41G4zAsB-4eQJS654t3ycl2Qh50VNKMrPusRhFpMJVvLn0zEiWTjZKswk559Q_1-NpSxUbquatbERDKu9keY7nL5mjWEJUDl8o7e7GpzY05KATWvjjz39OCYUjVhT_kMEho9td7TUjltakgmx-Go8VDbBYqyrPaPdasZfS59w1QhZUJPLFPmRA0H1jxc8qu841eHDBi4kw.vsfZZv3p2rLJWnM9SWbJzg\",\"id_token\":\"eyJraWQiOiJPUElDUFJEMDkxODIwMTQiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiI1ODYwNzMxZC0yZmQ1LTQ3YTMtOTgxNi0wYzE5N2NkZDk1NjIiLCJhdWQiOlsiQUJnY01pUkZvNmdWZWZtOFBCZkZwZkxQdzFoUzZCekluMFduUlZLR1A5R05SWm1neHQiXSwicmVhbG1pZCI6IjQ2MjA4MTYzNjUxODA3ODQwNTAiLCJhdXRoX3RpbWUiOjE2MzQyMzUyNTAsImlzcyI6Imh0dHBzOlwvXC9vYXV0aC5wbGF0Zm9ybS5pbnR1aXQuY29tXC9vcFwvdjEiLCJleHAiOjE2MzQyMzg4NTYsImlhdCI6MTYzNDIzNTI1Nn0.ZMNPsFfYqnyilp0fFrW5RvMht6Eb1MFTY2X_zx3dcuoH2sAK5EYaKgtm9EZq5VeH_mQ4qGQLGgl70v3v_2I0ElmFOZeSGUO1Q5UcXxaK5-A_8Wed5qr_qpQWGWpc2pkWNM1Q2hQfDVfX9J45Ob2qumYlJ49V_p5Sm6WuqyIrfTQ\",\"token_type\":\"bearer\",\"expires_in\":3600}",
"json": {
"x_refresh_token_expires_in": 8726400,
"refresh_token": "AB11642961656aZhy8GyGhOImeMq6hd5q3j8S9FJGT4MppS92Y",
"access_token": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..dRa330Va1FympcUMjnlbkw.W1_-IFux2NF5wqk48iEyYCPEToNm0KA5OQPOOk0kB75xOQrl-ewYSv3ZPmM56c4p8rzlNUr1V3lF3fcpKcZWSgShNX-dYAQ5WfhaBVz27wI0eXE3RUNbsuUwWc4pKtdU3pFlI2Bz94m9zVY8DKlw1Pm4CFGhqf41IqCcgn6VxYE-uRC2L5VLXyddEGwJoTpAWeA0JEtUc0DoTMVPFnOb6zUEgP5MGj5w81eHludNfl9QxGcitwpqrAHk1UDK0GfgvROZDmfrgvZ0r0SQ9aiI1_XWisZjnqzzcr4fMzQq85CoujnYfgAzi4-En3YgP0D6q_OnUSY5NjFzUsU_4ikganeFx5WgRv9jJDDwcDsSnkoJFSdgEoj_oWwTtYr-9RXjKBdothgXySicLEA5J_PdCGXZJ_rxQ_hW6RndVLMSrlADCWPpKGhT_PV96UB-EO_m0kFvnCOqAuvAcSRC46OmJh9sedTqC5pMHPgOwnosQzHdR-9jKxEivfw8A49IucMhl9pJzPDKPVSdw-e9vlt4OMo_fBcYHb14QxoxJNPZQV6KUe4aSqxjjK0-bFOOk33sNGr-IHZgor1FZyYDK5OBgROLQx98Sm6suJ-GVuG_s0O7VwsqXRSYY9UpWcg4xKfLG6WXFSANa2kc41G4zAsB-4eQJS654t3ycl2Qh50VNKMrPusRhFpMJVvLn0zEiWTjZKswk559Q_1-NpSxUbquatbERDKu9keY7nL5mjWEJUDl8o7e7GpzY05KATWvjjz39OCYUjVhT_kMEho9td7TUjltakgmx-Go8VDbBYqyrPaPdasZfS59w1QhZUJPLFPmRA0H1jxc8qu841eHDBi4kw.vsfZZv3p2rLJWnM9SWbJzg",
"id_token": "eyJraWQiOiJPUElDUFJEMDkxODIwMTQiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiI1ODYwNzMxZC0yZmQ1LTQ3YTMtOTgxNi0wYzE5N2NkZDk1NjIiLCJhdWQiOlsiQUJnY01pUkZvNmdWZWZtOFBCZkZwZkxQdzFoUzZCekluMFduUlZLR1A5R05SWm1neHQiXSwicmVhbG1pZCI6IjQ2MjA4MTYzNjUxODA3ODQwNTAiLCJhdXRoX3RpbWUiOjE2MzQyMzUyNTAsImlzcyI6Imh0dHBzOlwvXC9vYXV0aC5wbGF0Zm9ybS5pbnR1aXQuY29tXC9vcFwvdjEiLCJleHAiOjE2MzQyMzg4NTYsImlhdCI6MTYzNDIzNTI1Nn0.ZMNPsFfYqnyilp0fFrW5RvMht6Eb1MFTY2X_zx3dcuoH2sAK5EYaKgtm9EZq5VeH_mQ4qGQLGgl70v3v_2I0ElmFOZeSGUO1Q5UcXxaK5-A_8Wed5qr_qpQWGWpc2pkWNM1Q2hQfDVfX9J45Ob2qumYlJ49V_p5Sm6WuqyIrfTQ",
"token_type": "bearer",
"expires_in": 3600
},
"intuit_tid": "1-61687378-07987874613592c04a0e3709"
}

4
server/accounting/qb-receivables-lines.js
View File

@@ -31,9 +31,9 @@ exports.default = function ({
hasMashLine = true;
}
//Parts Lines Mappings.
if (jobline.profitcenter_part && jobline.act_price) {
if (jobline.profitcenter_part) {
let DineroAmount = Dinero({
amount: Math.round(jobline.act_price * 100),
amount: Math.round((jobline.act_price || 0) * 100),
}).multiply(jobline.part_qty || 1);
if (