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

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 BabelEdit project file
@@ -12653,6 +12653,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>item</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>label</name> <name>label</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

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

@@ -61,7 +61,7 @@ export function ContractsFindModalContainer({
<Modal <Modal
visible={visible} visible={visible}
width="70%" width="70%"
title={t("labels.labels.findermodal")} title={t("payments.labels.findermodal")}
onCancel={() => toggleModalVisible()} onCancel={() => toggleModalVisible()}
onOk={() => toggleModalVisible()} onOk={() => toggleModalVisible()}
destroyOnClose 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 = [ const columns = [
{ {
//title: t("joblines.fields.part_type"), title: t("general.labels.item"),
dataIndex: "key", dataIndex: "key",
key: "key", key: "key",
sorter: (a, b) => alphaSort(a.key, b.key), sorter: (a, b) => alphaSort(a.key, b.key),
@@ -82,7 +82,7 @@ export default function JobTotalsTableOther({ job }) {
<strong>{t("jobs.labels.additionaltotal")}</strong> <strong>{t("jobs.labels.additionaltotal")}</strong>
</Table.Summary.Cell> </Table.Summary.Cell>
<Table.Summary.Cell> <Table.Summary.Cell align="right">
<strong> <strong>
{Dinero(job.job_totals.additional.total).toFormat()} {Dinero(job.job_totals.additional.total).toFormat()}
</strong> </strong>
@@ -93,7 +93,7 @@ export default function JobTotalsTableOther({ job }) {
<strong>{t("jobs.labels.subletstotal")}</strong> <strong>{t("jobs.labels.subletstotal")}</strong>
</Table.Summary.Cell> </Table.Summary.Cell>
<Table.Summary.Cell> <Table.Summary.Cell align="right">
<strong> <strong>
{Dinero(job.job_totals.parts.sublets.total).toFormat()} {Dinero(job.job_totals.parts.sublets.total).toFormat()}
</strong> </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> <strong>{t("jobs.labels.partstotal")}</strong>
</Table.Summary.Cell> </Table.Summary.Cell>
<Table.Summary.Cell> <Table.Summary.Cell align="right">
<strong> <strong>
{Dinero(job.job_totals.parts.parts.total).toFormat()} {Dinero(job.job_totals.parts.parts.total).toFormat()}
</strong> </strong>

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

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

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

@@ -806,6 +806,7 @@
"in": "In", "in": "In",
"instanceconflictext": "Your $t(titles.app) account can only be used on one device at any given time. Refresh your session to take control.", "instanceconflictext": "Your $t(titles.app) account can only be used on one device at any given time. Refresh your session to take control.",
"instanceconflictitle": "Your account is being used elsewhere.", "instanceconflictitle": "Your account is being used elsewhere.",
"item": "Item",
"label": "Label", "label": "Label",
"loading": "Loading...", "loading": "Loading...",
"loadingapp": "Loading $t(titles.app)", "loadingapp": "Loading $t(titles.app)",

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

@@ -806,6 +806,7 @@
"in": "en", "in": "en",
"instanceconflictext": "", "instanceconflictext": "",
"instanceconflictitle": "", "instanceconflictitle": "",
"item": "",
"label": "", "label": "",
"loading": "Cargando...", "loading": "Cargando...",
"loadingapp": "Cargando $t(titles.app)", "loadingapp": "Cargando $t(titles.app)",

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

@@ -806,6 +806,7 @@
"in": "dans", "in": "dans",
"instanceconflictext": "", "instanceconflictext": "",
"instanceconflictitle": "", "instanceconflictitle": "",
"item": "",
"label": "", "label": "",
"loading": "Chargement...", "loading": "Chargement...",
"loadingapp": "Chargement de $t(titles.app)", "loadingapp": "Chargement de $t(titles.app)",