IO-764 Added cost to parts return.

This commit is contained in:
Patrick Fic
2021-03-18 10:19:02 -07:00
parent c01b57f7cc
commit 62738c50a9
19 changed files with 323 additions and 2 deletions

View File

@@ -288,6 +288,7 @@ export function BillsListTableComponent({
line_desc: i.line_desc,
// db_price: i.actual_price,
act_price: i.actual_price,
cost: i.actual_cost,
quantity: i.quantity,
joblineid: i.joblineid,
};

View File

@@ -185,6 +185,10 @@ export function PartsOrderListTableComponent({
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
};
const selectedPartsOrderRecord = parts_orders.find(
(r) => r.id === selectedpartsorder
);
const rowExpander = (record) => {
const columns = [
{
@@ -206,6 +210,7 @@ export function PartsOrderListTableComponent({
<CurrencyFormatter>{record.db_price}</CurrencyFormatter>
),
},
{
title: t("parts_orders.fields.act_price"),
dataIndex: "act_price",
@@ -217,7 +222,21 @@ export function PartsOrderListTableComponent({
<CurrencyFormatter>{record.act_price}</CurrencyFormatter>
),
},
...(selectedPartsOrderRecord && selectedPartsOrderRecord.isReturn
? [
{
title: t("parts_orders.fields.cost"),
dataIndex: "cost",
key: "cost",
sorter: (a, b) => a.cost - b.cost,
sortOrder:
state.sortedInfo.columnKey === "cost" && state.sortedInfo.order,
render: (text, record) => (
<CurrencyFormatter>{record.cost}</CurrencyFormatter>
),
},
]
: []),
{
title: t("parts_orders.fields.oem_partno"),
dataIndex: "oem_partno",

View File

@@ -98,6 +98,16 @@ export default function PartsOrderModalComponent({
>
<CurrencyInput />
</Form.Item>
{isReturn && (
<Form.Item
label={t("parts_orders.fields.cost")}
key={`${index}cost`}
name={[field.name, "cost"]}
>
<CurrencyInput />
</Form.Item>
)}
<Form.Item
label={t("parts_orders.fields.quantity")}
key={`${index}quantity`}

View File

@@ -212,6 +212,7 @@ export function PartsOrderModalContainer({
oem_partno: value.oem_partno,
db_price: value.db_price,
act_price: value.act_price,
cost: value.cost,
quantity: value.part_qty,
job_line_id: isReturn ? value.joblineid : value.id,
});