Revert "Release/2026 02 27 (pull request #3070)"
This commit is contained in:
Patrick Fic
@@ -1,5 +1,4 @@
|
||||
import { Space } from "antd";
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Space, Table } from "antd";
|
||||
import Dinero from "dinero.js";
|
||||
import { useMemo, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -105,9 +104,8 @@ export default function JobTotalsTableLabor({ job }) {
|
||||
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
|
||||
};
|
||||
return (
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
columns={columns}
|
||||
mobileColumnKeys={["total", "profitcenter_labor", "rate", "mod_lb_hrs"]}
|
||||
rowKey="id"
|
||||
pagination={false}
|
||||
onChange={handleTableChange}
|
||||
@@ -117,29 +115,29 @@ export default function JobTotalsTableLabor({ job }) {
|
||||
}}
|
||||
summary={() => (
|
||||
<>
|
||||
<ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Cell>
|
||||
<Table.Summary.Row>
|
||||
<Table.Summary.Cell>
|
||||
<strong>{t("jobs.labels.labor_rates_subtotal")}</strong>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell />
|
||||
<ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
<Table.Summary.Cell />
|
||||
<Table.Summary.Cell>
|
||||
{(job.job_totals.rates.mapa.hours + job.job_totals.rates.mash.hours).toFixed(1)}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
{InstanceRenderManager({
|
||||
imex: null,
|
||||
rome: (
|
||||
<>
|
||||
<ResponsiveTable.Summary.Cell />
|
||||
<ResponsiveTable.Summary.Cell />
|
||||
<Table.Summary.Cell />
|
||||
<Table.Summary.Cell />
|
||||
</>
|
||||
)
|
||||
})}
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
<Table.Summary.Cell align="right">
|
||||
<strong>{Dinero(job.job_totals.rates.rates_subtotal).toFormat()}</strong>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
</Table.Summary.Row>
|
||||
<Table.Summary.Row>
|
||||
<Table.Summary.Cell>
|
||||
<Space>
|
||||
{t("jobs.labels.mapa")}
|
||||
{InstanceRenderManager({
|
||||
@@ -158,34 +156,34 @@ export default function JobTotalsTableLabor({ job }) {
|
||||
})
|
||||
})}
|
||||
</Space>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
</Table.Summary.Cell>
|
||||
<Table.Summary.Cell align="right">
|
||||
<CurrencyFormatter>{job.job_totals.rates.mapa.rate}</CurrencyFormatter>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell>{job.job_totals.rates.mapa.hours.toFixed(1)}</ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
<Table.Summary.Cell>{job.job_totals.rates.mapa.hours.toFixed(1)}</Table.Summary.Cell>
|
||||
{InstanceRenderManager({
|
||||
imex: (
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
<Table.Summary.Cell align="right">
|
||||
{Dinero(job.job_totals.rates.mapa.total).toFormat()}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
),
|
||||
rome: (
|
||||
<>
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
<Table.Summary.Cell align="right">
|
||||
{Dinero(job.job_totals.rates.mapa.base).toFormat()}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
</Table.Summary.Cell>
|
||||
<Table.Summary.Cell align="right">
|
||||
{Dinero(job.job_totals.rates.mapa.adjustment).toFormat()}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
</Table.Summary.Cell>
|
||||
<Table.Summary.Cell align="right">
|
||||
{Dinero(job.job_totals.rates.mapa.total).toFormat()}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
</>
|
||||
)
|
||||
})}
|
||||
</ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Row>
|
||||
<Table.Summary.Row>
|
||||
<Table.Summary.Cell>
|
||||
<Space wrap>
|
||||
{t("jobs.labels.mash")}
|
||||
{InstanceRenderManager({
|
||||
@@ -204,51 +202,51 @@ export default function JobTotalsTableLabor({ job }) {
|
||||
})
|
||||
})}
|
||||
</Space>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
</Table.Summary.Cell>
|
||||
<Table.Summary.Cell align="right">
|
||||
<CurrencyFormatter>{job.job_totals.rates.mash.rate}</CurrencyFormatter>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell>{job.job_totals.rates.mash.hours.toFixed(1)}</ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
<Table.Summary.Cell>{job.job_totals.rates.mash.hours.toFixed(1)}</Table.Summary.Cell>
|
||||
{InstanceRenderManager({
|
||||
imex: (
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
<Table.Summary.Cell align="right">
|
||||
{Dinero(job.job_totals.rates.mash.total).toFormat()}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
),
|
||||
rome: (
|
||||
<>
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
<Table.Summary.Cell align="right">
|
||||
{Dinero(job.job_totals.rates.mash.base).toFormat()}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
</Table.Summary.Cell>
|
||||
<Table.Summary.Cell align="right">
|
||||
{Dinero(job.job_totals.rates.mash.adjustment).toFormat()}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
</Table.Summary.Cell>
|
||||
<Table.Summary.Cell align="right">
|
||||
{Dinero(job.job_totals.rates.mash.total).toFormat()}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
</>
|
||||
)
|
||||
})}
|
||||
</ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Row>
|
||||
<Table.Summary.Row>
|
||||
<Table.Summary.Cell>
|
||||
<strong>{t("jobs.labels.rates_subtotal")}</strong>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell />
|
||||
<ResponsiveTable.Summary.Cell />
|
||||
</Table.Summary.Cell>
|
||||
<Table.Summary.Cell />
|
||||
<Table.Summary.Cell />
|
||||
{InstanceRenderManager({
|
||||
imex: null,
|
||||
rome: (
|
||||
<>
|
||||
<ResponsiveTable.Summary.Cell />
|
||||
<ResponsiveTable.Summary.Cell />
|
||||
<Table.Summary.Cell />
|
||||
<Table.Summary.Cell />
|
||||
</>
|
||||
)
|
||||
})}
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
<Table.Summary.Cell align="right">
|
||||
<strong>{Dinero(job.job_totals.rates.subtotal).toFormat()}</strong>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</ResponsiveTable.Summary.Row>
|
||||
</Table.Summary.Cell>
|
||||
</Table.Summary.Row>
|
||||
</>
|
||||
)}
|
||||
/>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Table } from "antd";
|
||||
import Dinero from "dinero.js";
|
||||
import { useMemo, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -65,9 +65,8 @@ export default function JobTotalsTableOther({ job }) {
|
||||
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
|
||||
};
|
||||
return (
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
columns={columns}
|
||||
mobileColumnKeys={["total", "key"]}
|
||||
rowKey="key"
|
||||
pagination={false}
|
||||
onChange={handleTableChange}
|
||||
@@ -77,24 +76,24 @@ export default function JobTotalsTableOther({ job }) {
|
||||
}}
|
||||
summary={() => (
|
||||
<>
|
||||
<ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Cell>
|
||||
<Table.Summary.Row>
|
||||
<Table.Summary.Cell>
|
||||
<strong>{t("jobs.labels.additionaltotal")}</strong>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
<Table.Summary.Cell align="right">
|
||||
<strong>{Dinero(job.job_totals.additional.total).toFormat()}</strong>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
</Table.Summary.Row>
|
||||
<Table.Summary.Row>
|
||||
<Table.Summary.Cell>
|
||||
<strong>{t("jobs.labels.subletstotal")}</strong>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
<Table.Summary.Cell align="right">
|
||||
<strong>{Dinero(job.job_totals.parts.sublets.total).toFormat()}</strong>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</ResponsiveTable.Summary.Row>
|
||||
</Table.Summary.Cell>
|
||||
</Table.Summary.Row>
|
||||
</>
|
||||
)}
|
||||
/>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Table } from "antd";
|
||||
import Dinero from "dinero.js";
|
||||
import { useMemo, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -64,9 +64,8 @@ export default function JobTotalsTableParts({ job }) {
|
||||
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
|
||||
};
|
||||
return (
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
columns={columns}
|
||||
mobileColumnKeys={["total", "id"]}
|
||||
rowKey="id"
|
||||
pagination={false}
|
||||
onChange={handleTableChange}
|
||||
@@ -76,38 +75,36 @@ export default function JobTotalsTableParts({ job }) {
|
||||
}}
|
||||
summary={() => (
|
||||
<>
|
||||
<ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Cell>{t("jobs.labels.prt_dsmk_total")}</ResponsiveTable.Summary.Cell>
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
<Table.Summary.Row>
|
||||
<Table.Summary.Cell>{t("jobs.labels.prt_dsmk_total")}</Table.Summary.Cell>
|
||||
<Table.Summary.Cell align="right">
|
||||
{Dinero(job.job_totals.parts.parts.prt_dsmk_total).toFormat()}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</ResponsiveTable.Summary.Row>
|
||||
</Table.Summary.Cell>
|
||||
</Table.Summary.Row>
|
||||
|
||||
<ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Cell>
|
||||
<Table.Summary.Row>
|
||||
<Table.Summary.Cell>
|
||||
<strong>{t("jobs.labels.partstotal")}</strong>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</Table.Summary.Cell>
|
||||
|
||||
<ResponsiveTable.Summary.Cell align="right">
|
||||
<Table.Summary.Cell align="right">
|
||||
<strong>{Dinero(job.job_totals.parts.parts.total).toFormat()}</strong>
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</ResponsiveTable.Summary.Row>
|
||||
</Table.Summary.Cell>
|
||||
</Table.Summary.Row>
|
||||
{
|
||||
//TODO:AIO This shoudl only be in the US version. need to verify whether this causes problems for the CA version.
|
||||
insuranceAdjustments.length > 0 && (
|
||||
<ResponsiveTable.Summary.Row>
|
||||
<ResponsiveTable.Summary.Cell colSpan={24}>
|
||||
{t("jobs.labels.profileadjustments")}
|
||||
</ResponsiveTable.Summary.Cell>
|
||||
</ResponsiveTable.Summary.Row>
|
||||
<Table.Summary.Row>
|
||||
<Table.Summary.Cell colSpan={24}>{t("jobs.labels.profileadjustments")}</Table.Summary.Cell>
|
||||
</Table.Summary.Row>
|
||||
)
|
||||
}
|
||||
{insuranceAdjustments.map((adj, idx) => (
|
||||
<ResponsiveTable.Summary.Row key={idx}>
|
||||
<ResponsiveTable.Summary.Cell>{t(`jobs.fields.${adj.id.toLowerCase()}`)}</ResponsiveTable.Summary.Cell>
|
||||
<Table.Summary.Row key={idx}>
|
||||
<Table.Summary.Cell>{t(`jobs.fields.${adj.id.toLowerCase()}`)}</Table.Summary.Cell>
|
||||
|
||||
<ResponsiveTable.Summary.Cell align="right">{adj.amount.toFormat()}</ResponsiveTable.Summary.Cell>
|
||||
</ResponsiveTable.Summary.Row>
|
||||
<Table.Summary.Cell align="right">{adj.amount.toFormat()}</Table.Summary.Cell>
|
||||
</Table.Summary.Row>
|
||||
))}
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import ResponsiveTable from "../responsive-table/responsive-table.component";
|
||||
import { Table } from "antd";
|
||||
import Dinero from "dinero.js";
|
||||
import { useMemo } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -245,9 +245,8 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
|
||||
];
|
||||
|
||||
return (
|
||||
<ResponsiveTable
|
||||
<Table
|
||||
columns={columns}
|
||||
mobileColumnKeys={["total", "key"]}
|
||||
rowKey="key"
|
||||
showHeader={false}
|
||||
pagination={false}
|
||||
|
||||
Reference in New Issue
Block a user