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

IO-1744 Added missing totals to job costing modal.

Browse Source
This commit is contained in:
Patrick Fic
2022-02-17 17:14:37 -08:00
parent 65b505035a
commit 2192cb1e7c
5 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project be_version="2.7.1" version="1.2"> <babeledit_project version="1.2" be_version="2.7.1">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -25204,6 +25204,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>cost_sublet</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> <concept_node>
<name>costs</name> <name>costs</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -27119,6 +27140,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>sale_sublet</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> <concept_node>
<name>sales</name> <name>sales</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

8
client/src/components/job-costing-statistics/job-costing-statistics.component.jsx
View File

@@ -16,6 +16,10 @@ export default function JobCostingStatistics({ summaryData }) {
value={Dinero(summaryData.totalPartsSales).toFormat()} value={Dinero(summaryData.totalPartsSales).toFormat()}
title={t("jobs.labels.sale_parts")} title={t("jobs.labels.sale_parts")}
/> />
<Statistic
value={Dinero(summaryData.totalSubletSales).toFormat()}
title={t("jobs.labels.sale_sublet")}
/>
<Statistic <Statistic
value={Dinero(summaryData.totalAdditionalSales).toFormat()} value={Dinero(summaryData.totalAdditionalSales).toFormat()}
title={t("jobs.labels.sale_additional")} title={t("jobs.labels.sale_additional")}
@@ -32,6 +36,10 @@ export default function JobCostingStatistics({ summaryData }) {
value={Dinero(summaryData.totalPartsCost).toFormat()} value={Dinero(summaryData.totalPartsCost).toFormat()}
title={t("jobs.labels.cost_parts")} title={t("jobs.labels.cost_parts")}
/> />
<Statistic
value={Dinero(summaryData.totalSubletCost).toFormat()}
title={t("jobs.labels.cost_sublet")}
/>
<Statistic <Statistic
value={Dinero(summaryData.totalAdditionalCost).toFormat()} value={Dinero(summaryData.totalAdditionalCost).toFormat()}
title={t("jobs.labels.cost_Additional")} title={t("jobs.labels.cost_Additional")}

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

@@ -1490,6 +1490,7 @@
"cost_Additional": "Cost - Additional", "cost_Additional": "Cost - Additional",
"cost_labor": "Cost - Labor", "cost_labor": "Cost - Labor",
"cost_parts": "Cost - Parts", "cost_parts": "Cost - Parts",
"cost_sublet": "Cost - Sublet",
"costs": "Costs", "costs": "Costs",
"create": { "create": {
"jobinfo": "Job Info", "jobinfo": "Job Info",
@@ -1589,7 +1590,8 @@
"rosaletotal": "RO Parts Total", "rosaletotal": "RO Parts Total",
"sale_additional": "Sales - Additional", "sale_additional": "Sales - Additional",
"sale_labor": "Sales - Labor", "sale_labor": "Sales - Labor",
"sale_parts": "Sales - Parts & Sublet", "sale_parts": "Sales - Parts",
"sale_sublet": "Sales - Sublet",
"sales": "Sales", "sales": "Sales",
"savebeforeconversion": "You have unsaved changes on the job. Please save them before converting it. ", "savebeforeconversion": "You have unsaved changes on the job. Please save them before converting it. ",
"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date, please schedule or reschedule the job. ", "scheduledinchange": "The scheduled in is based off the latest appointment. To change this date, please schedule or reschedule the job. ",

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

@@ -1490,6 +1490,7 @@
"cost_Additional": "", "cost_Additional": "",
"cost_labor": "", "cost_labor": "",
"cost_parts": "", "cost_parts": "",
"cost_sublet": "",
"costs": "", "costs": "",
"create": { "create": {
"jobinfo": "", "jobinfo": "",
@@ -1590,6 +1591,7 @@
"sale_additional": "", "sale_additional": "",
"sale_labor": "", "sale_labor": "",
"sale_parts": "", "sale_parts": "",
"sale_sublet": "",
"sales": "", "sales": "",
"savebeforeconversion": "", "savebeforeconversion": "",
"scheduledinchange": "", "scheduledinchange": "",

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

@@ -1490,6 +1490,7 @@
"cost_Additional": "", "cost_Additional": "",
"cost_labor": "", "cost_labor": "",
"cost_parts": "", "cost_parts": "",
"cost_sublet": "",
"costs": "", "costs": "",
"create": { "create": {
"jobinfo": "", "jobinfo": "",
@@ -1590,6 +1591,7 @@
"sale_additional": "", "sale_additional": "",
"sale_labor": "", "sale_labor": "",
"sale_parts": "", "sale_parts": "",
"sale_sublet": "",
"sales": "", "sales": "",
"savebeforeconversion": "", "savebeforeconversion": "",
"scheduledinchange": "", "scheduledinchange": "",