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

IO-764 Added cost to parts return.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

23
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project be_version="2.7.1" version="1.2"> <babeledit_project version="1.2" be_version="2.7.1">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -24230,6 +24230,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>cost</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>db_price</name> <name>db_price</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

1
client/src/components/bills-list-table/bills-list-table.component.jsx
View File

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

21
client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
View File

@@ -185,6 +185,10 @@ export function PartsOrderListTableComponent({
setState({ ...state, filteredInfo: filters, sortedInfo: sorter }); setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
}; };
const selectedPartsOrderRecord = parts_orders.find(
(r) => r.id === selectedpartsorder
);
const rowExpander = (record) => { const rowExpander = (record) => {
const columns = [ const columns = [
{ {
@@ -206,6 +210,7 @@ export function PartsOrderListTableComponent({
<CurrencyFormatter>{record.db_price}</CurrencyFormatter> <CurrencyFormatter>{record.db_price}</CurrencyFormatter>
), ),
}, },
{ {
title: t("parts_orders.fields.act_price"), title: t("parts_orders.fields.act_price"),
dataIndex: "act_price", dataIndex: "act_price",
@@ -217,7 +222,21 @@ export function PartsOrderListTableComponent({
<CurrencyFormatter>{record.act_price}</CurrencyFormatter> <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"), title: t("parts_orders.fields.oem_partno"),
dataIndex: "oem_partno", dataIndex: "oem_partno",

10
client/src/components/parts-order-modal/parts-order-modal.component.jsx
View File

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

1
client/src/components/parts-order-modal/parts-order-modal.container.jsx
View File

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

1
client/src/graphql/bills.queries.js
View File

@@ -92,6 +92,7 @@ export const QUERY_BILLS_BY_JOBID = gql`
line_remarks line_remarks
quantity quantity
job_line_id job_line_id
cost
jobline { jobline {
id id
part_type part_type

1
client/src/pages/bills/bills.page.component.jsx
View File

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

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

@@ -1463,6 +1463,7 @@
"act_price": "Price", "act_price": "Price",
"backordered_eta": "B.O. ETA", "backordered_eta": "B.O. ETA",
"backordered_on": "B.O. On", "backordered_on": "B.O. On",
"cost": "Cost",
"db_price": "List Price", "db_price": "List Price",
"deliver_by": "Date", "deliver_by": "Date",
"job_line_id": "Job Line Id", "job_line_id": "Job Line Id",

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

@@ -1463,6 +1463,7 @@
"act_price": "", "act_price": "",
"backordered_eta": "", "backordered_eta": "",
"backordered_on": "", "backordered_on": "",
"cost": "",
"db_price": "", "db_price": "",
"deliver_by": "", "deliver_by": "",
"job_line_id": "", "job_line_id": "",

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

@@ -1463,6 +1463,7 @@
"act_price": "", "act_price": "",
"backordered_eta": "", "backordered_eta": "",
"backordered_on": "", "backordered_on": "",
"cost": "",
"db_price": "", "db_price": "",
"deliver_by": "", "deliver_by": "",
"job_line_id": "", "job_line_id": "",

5
hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."parts_order_lines" DROP COLUMN "cost";
type: run_sql

5
hasura/migrations/1616085067839_alter_table_public_parts_order_lines_add_column_cost/up.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."parts_order_lines" ADD COLUMN "cost" numeric NULL;
type: run_sql

41
hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,41 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_insert_permission
- args:
permission:
check:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_insert_permission

42
hasura/migrations/1616085078098_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,42 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_insert_permission
- args:
permission:
check:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- act_price
- backordered_eta
- backordered_on
- cost
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_insert_permission

42
hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,42 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
computed_fields: []
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: parts_order_lines
schema: public
type: create_select_permission

43
hasura/migrations/1616085088148_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,43 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- act_price
- backordered_eta
- backordered_on
- cost
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
computed_fields: []
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: parts_order_lines
schema: public
type: create_select_permission

41
hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,41 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_update_permission
- args:
permission:
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_update_permission

42
hasura/migrations/1616085543945_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,42 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_update_permission
- args:
permission:
columns:
- act_price
- backordered_eta
- backordered_on
- cost
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- part_type
- quantity
- status
- updated_at
filter:
parts_order:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_update_permission

3
hasura/migrations/metadata.yaml
View File

@@ -3354,6 +3354,7 @@ tables:
- act_price - act_price
- backordered_eta - backordered_eta
- backordered_on - backordered_on
- cost
- created_at - created_at
- db_price - db_price
- id - id
@@ -3373,6 +3374,7 @@ tables:
- act_price - act_price
- backordered_eta - backordered_eta
- backordered_on - backordered_on
- cost
- created_at - created_at
- db_price - db_price
- id - id
@@ -3403,6 +3405,7 @@ tables:
- act_price - act_price
- backordered_eta - backordered_eta
- backordered_on - backordered_on
- cost
- created_at - created_at
- db_price - db_price
- id - id