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

IO-834 IO-835 Totals table formatting.

Browse Source
This commit is contained in:
Patrick Fic
2021-04-06 14:29:44 -07:00
parent 4779964449
commit 5b17bfaaa0
10 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -28239,6 +28239,27 @@
<folder_node>
<name>templates</name>
<children>
<concept_node>
<name>credits_not_received_date</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>estimator_detail</name>
<definition_loaded>false</definition_loaded>

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

@@ -47,17 +47,21 @@ export function JobsTotalsTableComponent({ jobRO, job }) {
</Col>
<Col {...colSpan}>
<Row gutter={[16, 16]}>
<Col sm={24} md={12}>
<Card title={t("jobs.labels.partstotal")}>
<JobTotalsTableParts job={job} />
</Card>
<Col {...colSpan}>
<Row gutter={[16, 16]}>
<Col span={24}>
<Card title={t("jobs.labels.partstotal")}>
<JobTotalsTableParts job={job} />
</Card>
</Col>
<Col span={24}>
<Card title={t("jobs.labels.othertotal")}>
<JobTotalsTableOther job={job} />
</Card>
</Col>
</Row>
</Col>
<Col sm={24} md={12}>
<Card title={t("jobs.labels.othertotal")}>
<JobTotalsTableOther job={job} />
</Card>
</Col>
<Col span={24}>
<Col {...colSpan}>
<Card title={t("jobs.labels.jobtotals")}>
<JobTotalsTableTotals job={job} />
</Card>

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

@@ -103,11 +103,11 @@ export default function JobTotalsTableLabor({ job }) {
<>
<Table.Summary.Row>
<Table.Summary.Cell>
{t("jobs.labels.labor_rates_subtotal")}
<strong>{t("jobs.labels.labor_rates_subtotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell />
<Table.Summary.Cell />
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
<strong>
{Dinero(job.job_totals.rates.rates_subtotal).toFormat()}
</strong>
@@ -121,7 +121,7 @@ export default function JobTotalsTableLabor({ job }) {
<Table.Summary.Cell>
{job.job_totals.rates.mapa.hours.toFixed(2)}
</Table.Summary.Cell>
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
{Dinero(job.job_totals.rates.mapa.total).toFormat()}
</Table.Summary.Cell>
</Table.Summary.Row>
@@ -133,19 +133,19 @@ export default function JobTotalsTableLabor({ job }) {
<Table.Summary.Cell>
{job.job_totals.rates.mash.hours.toFixed(2)}
</Table.Summary.Cell>
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
{Dinero(job.job_totals.rates.mash.total).toFormat()}
</Table.Summary.Cell>
</Table.Summary.Row>
<Table.Summary.Row>
<Table.Summary.Cell>
{t("jobs.labels.labor_rates_subtotal")}
<strong>{t("jobs.labels.rates_subtotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell />
<Table.Summary.Cell />
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
<strong>
{Dinero(job.job_totals.rates.rates_subtotal).toFormat()}
{Dinero(job.job_totals.rates.subtotal).toFormat()}
</strong>
</Table.Summary.Cell>
</Table.Summary.Row>

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

@@ -79,7 +79,7 @@ export default function JobTotalsTableOther({ job }) {
<>
<Table.Summary.Row>
<Table.Summary.Cell>
{t("jobs.labels.additionaltotal")}
<strong>{t("jobs.labels.additionaltotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell>
@@ -90,7 +90,7 @@ export default function JobTotalsTableOther({ job }) {
</Table.Summary.Row>
<Table.Summary.Row>
<Table.Summary.Cell>
{t("jobs.labels.subletstotal")}
<strong>{t("jobs.labels.subletstotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell>

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

@@ -70,7 +70,9 @@ export default function JobTotalsTableParts({ job }) {
}}
summary={() => (
<Table.Summary.Row>
<Table.Summary.Cell>{t("jobs.labels.partstotal")}</Table.Summary.Cell>
<Table.Summary.Cell>
<strong>{t("jobs.labels.partstotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell>
<strong>

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

@@ -1705,6 +1705,7 @@
"vendor": "Vendor"
},
"templates": {
"credits_not_received_date": "Credits not Received by Date",
"estimator_detail": "Jobs by Estimator (Detail)",
"estimator_summary": "Jobs by Estimator (Summary)",
"hours_sold_detail_closed": "Hours Sold Detail - Closed",

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

@@ -1705,6 +1705,7 @@
"vendor": ""
},
"templates": {
"credits_not_received_date": "",
"estimator_detail": "",
"estimator_summary": "",
"hours_sold_detail_closed": "",

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

@@ -1705,6 +1705,7 @@
"vendor": ""
},
"templates": {
"credits_not_received_date": "",
"estimator_detail": "",
"estimator_summary": "",
"hours_sold_detail_closed": "",

8
client/src/utils/TemplateConstants.js
View File

@@ -519,6 +519,14 @@ export const TemplateList = (type, context) => {
//idtype: "vendor",
disabled: false,
},
credits_not_received_date: {
title: i18n.t("reportcenter.templates.credits_not_received_date"),
description: "",
subject: i18n.t("reportcenter.templates.credits_not_received_date"),
key: "credits_not_received_date",
//idtype: "vendor",
disabled: false,
},
}
: {}),
...(!type || type === "courtesycarcontract"

3
server/job/job-costing.js
View File

@@ -3,9 +3,6 @@ const queries = require("../graphql-client/queries");
//const client = require("../graphql-client/graphql-client").client;
const _ = require("lodash");
const GraphQLClient = require("graphql-request").GraphQLClient;
const {
ExportCustomJobInstance,
} = require("twilio/lib/rest/bulkexports/v1/export/exportCustomJob");
// Dinero.defaultCurrency = "USD";
// Dinero.globalLocale = "en-CA";