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

Added error handling if job totals have not been calculated

Browse Source
This commit is contained in:
Patrick Fic
2020-04-28 17:19:37 -07:00
parent c6a29ba417
commit a9bd0a5ccb
10 changed files with 69 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -6053,6 +6053,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>nofinancial</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>nojobselected</name>
<definition_loaded>false</definition_loaded>

1
client/package.json
View File

@@ -15,6 +15,7 @@
"apollo-link-retry": "^2.2.16",
"apollo-link-ws": "^1.0.20",
"axios": "^0.19.2",
"dinero.js": "^1.8.1",
"dotenv": "^8.2.0",
"firebase": "^7.14.1",
"graphql": "^15.0.0",

5
client/src/components/job-totals-table/job-totals-table.component.jsx
View File

@@ -1,10 +1,11 @@
import { Col, Descriptions, Row, Statistic } from "antd";
import { Col, Descriptions, Row, Statistic, Result } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
export default function JobsTotalsTableComponent({ totals }) {
const { t } = useTranslation();
if (!!!totals) return null;
if (!!!totals)
return <Result status='warning' title={t("jobs.errors.nofinancial")} />;
return (
<div>

2
client/src/components/job-totals-table/job-totals.utility.js
View File

@@ -1,3 +1,5 @@
import Dinero from "dinero.js";
export function CalculateJob(job, shoprates) {
let ret = {
parts: CalculatePartsTotals(job.joblines),

72
client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
View File

@@ -9,130 +9,124 @@ export default function JobsDetailFinancials({ job }) {
return (
<Row>
<Col offset={1} span={7}>
<Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
<Form.Item label={t("jobs.fields.ded_amt")} name='ded_amt'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
<Form.Item label={t("jobs.fields.ded_status")} name='ded_status'>
<Input />
</Form.Item>
<Form.Item
label={t("jobs.fields.depreciation_taxes")}
name="depreciation_taxes"
>
name='depreciation_taxes'>
<InputNumber />
</Form.Item>
TODO This is equivalent of GST payable.
<Form.Item
label={t("jobs.fields.federal_tax_payable")}
name="federal_tax_payable"
>
name='federal_tax_payable'>
<InputNumber />
</Form.Item>
TODO equivalent of other customer amount
<Form.Item
label={t("jobs.fields.other_amount_payable")}
name="other_amount_payable"
>
name='other_amount_payable'>
<InputNumber />
</Form.Item>
<Form.Item
label={t("jobs.fields.towing_payable")}
name="towing_payable"
>
name='towing_payable'>
<InputNumber />
</Form.Item>
<Form.Item
label={t("jobs.fields.storage_payable")}
name="storage_payable"
>
name='storage_payable'>
<InputNumber />
</Form.Item>
<Form.Item
label={t("jobs.fields.adjustment_bottom_line")}
name="adjustment_bottom_line"
>
name='adjustment_bottom_line'>
<InputNumber />
</Form.Item>
<Divider />
<Form.Item
label={t("jobs.fields.labor_rate_desc")}
name="labor_rate_desc"
>
name='labor_rate_desc'>
<Input />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab">
<Form.Item label={t("jobs.fields.rate_lab")} name='rate_lab'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lad")} name="rate_lad">
<Form.Item label={t("jobs.fields.rate_lad")} name='rate_lad'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lae")} name="rate_lae">
<Form.Item label={t("jobs.fields.rate_lae")} name='rate_lae'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lar")} name="rate_lar">
<Form.Item label={t("jobs.fields.rate_lar")} name='rate_lar'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_las")} name="rate_las">
<Form.Item label={t("jobs.fields.rate_las")} name='rate_las'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_laf")} name="rate_laf">
<Form.Item label={t("jobs.fields.rate_laf")} name='rate_laf'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lam")} name="rate_lam">
<Form.Item label={t("jobs.fields.rate_lam")} name='rate_lam'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lag")} name="rate_lag">
<Form.Item label={t("jobs.fields.rate_lag")} name='rate_lag'>
<InputNumber />
</Form.Item>
Note //TODO Remove ATP rate?
<Form.Item label={t("jobs.fields.rate_atp")} name="rate_atp">
<Form.Item label={t("jobs.fields.rate_atp")} name='rate_atp'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lau")} name="rate_lau">
<Form.Item label={t("jobs.fields.rate_lau")} name='rate_lau'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la1")} name="rate_la1">
<Form.Item label={t("jobs.fields.rate_la1")} name='rate_la1'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la2")} name="rate_la2">
<Form.Item label={t("jobs.fields.rate_la2")} name='rate_la2'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la3")} name="rate_la3">
<Form.Item label={t("jobs.fields.rate_la3")} name='rate_la3'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la4")} name="rate_la4">
<Form.Item label={t("jobs.fields.rate_la4")} name='rate_la4'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mapa")} name="rate_mapa">
<Form.Item label={t("jobs.fields.rate_mapa")} name='rate_mapa'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mash")} name="rate_mash">
<Form.Item label={t("jobs.fields.rate_mash")} name='rate_mash'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mahw")} name="rate_mahw">
<Form.Item label={t("jobs.fields.rate_mahw")} name='rate_mahw'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_ma2s")} name="rate_ma2s">
<Form.Item label={t("jobs.fields.rate_ma2s")} name='rate_ma2s'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_ma3s")} name="rate_ma3s">
<Form.Item label={t("jobs.fields.rate_ma3s")} name='rate_ma3s'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mabl")} name="rate_mabl">
<Form.Item label={t("jobs.fields.rate_mabl")} name='rate_mabl'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_macs")} name="rate_macs">
<Form.Item label={t("jobs.fields.rate_macs")} name='rate_macs'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_matd")} name="rate_matd">
<Form.Item label={t("jobs.fields.rate_matd")} name='rate_matd'>
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_laa")} name="rate_laa">
<Form.Item label={t("jobs.fields.rate_laa")} name='rate_laa'>
<InputNumber />
</Form.Item>
</Col>
<Col offset={1} span={15}>
<JobTotalsTable totals={job.job_totals} />
{JSON.stringify(job.cieca_ttl, null, "\t")}
</Col>
</Row>
);

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

@@ -282,6 +282,7 @@ export const GET_JOB_BY_PK = gql`
count
}
}
cieca_ttl
}
}
`;

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

@@ -423,6 +423,7 @@
"noaccess": "This job does not exist or you do not have access to it.",
"nodamage": "No damage points on estimate.",
"nodates": "No dates specified for this job.",
"nofinancial": "No financial data has been calculated yet for this job. Please save it again.",
"nojobselected": "No job is selected.",
"noowner": "No owner associated.",
"novehicle": "No vehicle associated.",

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

@@ -423,6 +423,7 @@
"noaccess": "Este trabajo no existe o no tiene acceso a él.",
"nodamage": "",
"nodates": "No hay fechas especificadas para este trabajo.",
"nofinancial": "",
"nojobselected": "No hay trabajo seleccionado.",
"noowner": "Ningún propietario asociado.",
"novehicle": "No hay vehículo asociado.",

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

@@ -423,6 +423,7 @@
"noaccess": "Ce travail n'existe pas ou vous n'y avez pas accès.",
"nodamage": "",
"nodates": "Aucune date spécifiée pour ce travail.",
"nofinancial": "",
"nojobselected": "Aucun travail n'est sélectionné.",
"noowner": "Aucun propriétaire associé.",
"novehicle": "Aucun véhicule associé.",

5
client/yarn.lock
View File

@@ -4885,6 +4885,11 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0"
randombytes "^2.0.0"
dinero.js@^1.8.1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/dinero.js/-/dinero.js-1.8.1.tgz#775a647629b4195af9d02f46e9b7fa1fd81e906d"
integrity sha512-AQ09MDKonkGUrhBZZFx4tPTVcVJuHJ0VEA73LvcBoBB2eQSi1DbapeXj4wnUUpx1hVnPdyev1xPNnNMGy/Au0g==
dir-glob@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"