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

IO-1000 IO-1014 IO-1002 IO-1005 Minor label fixes.

Browse Source
This commit is contained in:
Patrick Fic
2021-05-06 14:40:31 -07:00
parent 786cf4b5db
commit c82a8e6706
8 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
View File

@@ -61,7 +61,7 @@ export function ContractsFindModalContainer({
<Modal
visible={visible}
width="70%"
title={t("labels.labels.findermodal")}
title={t("payments.labels.findermodal")}
onCancel={() => toggleModalVisible()}
onOk={() => toggleModalVisible()}
destroyOnClose

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

@@ -42,7 +42,7 @@ export default function JobTotalsTableOther({ job }) {
const columns = [
{
//title: t("joblines.fields.part_type"),
title: t("general.labels.item"),
dataIndex: "key",
key: "key",
sorter: (a, b) => alphaSort(a.key, b.key),
@@ -82,7 +82,7 @@ export default function JobTotalsTableOther({ job }) {
<strong>{t("jobs.labels.additionaltotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
<strong>
{Dinero(job.job_totals.additional.total).toFormat()}
</strong>
@@ -93,7 +93,7 @@ export default function JobTotalsTableOther({ job }) {
<strong>{t("jobs.labels.subletstotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
<strong>
{Dinero(job.job_totals.parts.sublets.total).toFormat()}
</strong>

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

@@ -74,7 +74,7 @@ export default function JobTotalsTableParts({ job }) {
<strong>{t("jobs.labels.partstotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
<strong>
{Dinero(job.job_totals.parts.parts.total).toFormat()}
</strong>

54
client/src/components/shop-info/shop-info.laborrates.component.jsx
View File

@@ -252,32 +252,34 @@ export default function ShopInfoLaborRates({ form }) {
>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.rate_mabl")}
key={`${index}rate_mabl`}
name={[field.name, "rate_mabl"]}
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}
>
<CurrencyInput />
</Form.Item>
<Form.Item
label={t("jobs.fields.rate_macs")}
key={`${index}rate_macs`}
name={[field.name, "rate_macs"]}
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}
>
<CurrencyInput />
</Form.Item>
{
// <Form.Item
// label={t("jobs.fields.rate_mabl")}
// key={`${index}rate_mabl`}
// name={[field.name, "rate_mabl"]}
// rules={[
// {
// required: true,
// message: t("general.validation.required"),
// },
// ]}
// >
// <CurrencyInput />
// </Form.Item>
// <Form.Item
// label={t("jobs.fields.rate_macs")}
// key={`${index}rate_macs`}
// name={[field.name, "rate_macs"]}
// rules={[
// {
// required: true,
// message: t("general.validation.required"),
// },
// ]}
// >
// <CurrencyInput />
// </Form.Item>
}
<Form.Item
label={t("jobs.fields.rate_matd")}
key={`${index}rate_matd`}