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

Added Backordered parts eta to parts order list BOD-215

Browse Source
This commit is contained in:
Patrick Fic
2020-08-03 08:26:01 -07:00
parent 81000dd971
commit b9f555683f
19 changed files with 382 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
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
@@ -17053,6 +17053,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>backordered_eta</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>
<name>backordered_on</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>
<name>db_price</name>
<definition_loaded>false</definition_loaded>

56
client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
View File

@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { Button, notification } from "antd";
import { Button, notification, DatePicker, Popover } from "antd";
import { useMutation } from "@apollo/react-hooks";
import { MUTATION_BACKORDER_PART_LINE } from "../../graphql/parts-orders.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -18,6 +18,8 @@ export function PartsOrderLineBackorderButton({
jobLineId,
bodyshop,
}) {
const [visibility, setVisibility] = useState(false);
const [eta, setEta] = useState(null);
const [loading, setLoading] = useState(false);
const [backorderLine] = useMutation(MUTATION_BACKORDER_PART_LINE);
const { t } = useTranslation();
@@ -25,17 +27,26 @@ export function PartsOrderLineBackorderButton({
const isAlreadyBackordered =
bodyshop.md_order_statuses.default_bo === partsOrderStatus;
const handleOnClick = async () => {
const handleSave = async () => {
setLoading(true);
logImEXEvent("job_parts_backorder");
const partsOrder = {
status: isAlreadyBackordered
? bodyshop.md_order_statuses.default_received || "Received*"
: bodyshop.md_order_statuses.default_bo || "Backordered*",
};
if (!isAlreadyBackordered) {
partsOrder.backordered_on = new Date();
partsOrder.backordered_eta = eta;
}
const result = await backorderLine({
variables: {
jobLineId,
partsLineId,
status: isAlreadyBackordered
? bodyshop.md_order_statuses.default_received || "Received*"
: bodyshop.md_order_statuses.default_bo || "Backordered*",
partsOrder: partsOrder,
status: partsOrder.status,
},
});
@@ -46,16 +57,39 @@ export function PartsOrderLineBackorderButton({
}),
});
}
setEta(null);
setVisibility(false);
setLoading(false);
};
const handlePopover = (e) => {
if (isAlreadyBackordered) {
handleSave();
//Receive the part.
} else {
//Show the date selector to back order the part.
setVisibility(true);
}
};
const popContent = (
<div>
<DatePicker onChange={(e) => setEta(e)} />
<Button type="primary" disabled={eta === null} onClick={handleSave}>
{t("parts_orders.actions.backordered")}
</Button>
<Button onClick={() => setVisibility(false)}>Close</Button>
</div>
);
return (
<Button loading={loading} onClick={handleOnClick}>
{isAlreadyBackordered
? t("parts_orders.actions.receive")
: t("parts_orders.actions.backordered")}
</Button>
<Popover destroyTooltipOnHide content={popContent} visible={visibility}>
<Button loading={loading} onClick={handlePopover}>
{isAlreadyBackordered
? t("parts_orders.actions.receive")
: t("parts_orders.actions.backordered")}
</Button>
</Popover>
);
}

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

@@ -128,6 +128,18 @@ export function PartsOrderListTableComponent({
dataIndex: "status",
key: "status",
},
{
title: t("parts_orders.fields.backordered_on"),
dataIndex: "backordered_on",
key: "backordered_on",
render: (text, record) => <DateFormatter>{text}</DateFormatter>,
},
{
title: t("parts_orders.fields.backordered_eta"),
dataIndex: "backordered_eta",
key: "backordered_eta",
render: (text, record) => <DateFormatter>{text}</DateFormatter>,
},
{
title: t("general.labels.actions"),
dataIndex: "actions",
@@ -147,11 +159,11 @@ export function PartsOrderListTableComponent({
return (
<div>
<Table
size='small'
size="small"
scroll={{ x: "50%", y: "40rem" }}
pagination={{ position: "top", defaultPageSize: 25 }}
columns={columns}
rowKey='id'
rowKey="id"
dataSource={record.parts_order_lines}
/>
</div>
@@ -165,14 +177,14 @@ export function PartsOrderListTableComponent({
</Typography.Title>
<Table
loading={loading}
size='small'
size="small"
title={() => (
<div className='imex-table-header'>
<div className="imex-table-header">
<Button onClick={() => refetch()}>
<SyncOutlined />
</Button>
<div className='imex-table-header__search'>
<div className="imex-table-header__search">
<Input.Search
placeholder={t("general.labels.search")}
onChange={(e) => {
@@ -186,7 +198,7 @@ export function PartsOrderListTableComponent({
expandedRowRender={rowExpander}
pagination={{ position: "top", defaultPageSize: 25 }}
columns={columns}
rowKey='id'
rowKey="id"
dataSource={parts_orders}
onChange={handleTableChange}
expandable={{

2
client/src/graphql/invoices.queries.js
View File

@@ -79,6 +79,8 @@ export const QUERY_INVOICES_BY_JOBID = gql`
line_remarks
quantity
job_line_id
backordered_eta
backordered_on
}
order_number
user_email

5
client/src/graphql/parts-orders.queries.js
View File

@@ -15,13 +15,16 @@ export const MUTATION_BACKORDER_PART_LINE = gql`
$jobLineId: uuid!
$partsLineId: uuid!
$status: String!
$partsOrder: parts_order_lines_set_input
) {
update_parts_order_lines(
where: { id: { _eq: $partsLineId } }
_set: { status: $status }
_set: $partsOrder
) {
returning {
status
backordered_on
backordered_eta
id
}
}

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

@@ -1049,6 +1049,8 @@
},
"fields": {
"act_price": "Price",
"backordered_eta": "B.O. ETA",
"backordered_on": "B.O. On",
"db_price": "DB Price",
"deliver_by": "Deliver By",
"job_line_id": "Job Line Id",

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

@@ -1049,6 +1049,8 @@
},
"fields": {
"act_price": "",
"backordered_eta": "",
"backordered_on": "",
"db_price": "",
"deliver_by": "Entregado por",
"job_line_id": "",

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

@@ -1049,6 +1049,8 @@
},
"fields": {
"act_price": "",
"backordered_eta": "",
"backordered_on": "",
"db_price": "",
"deliver_by": "Livrer par",
"job_line_id": "",

5
hasura/migrations/1596466443672_alter_table_public_parts_order_lines_add_column_backordered_on/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 "backordered_on";
type: run_sql

6
hasura/migrations/1596466443672_alter_table_public_parts_order_lines_add_column_backordered_on/up.yaml Normal file
View File

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

5
hasura/migrations/1596466458082_alter_table_public_parts_order_lines_add_column_backordered_eta/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 "backordered_eta";
type: run_sql

6
hasura/migrations/1596466458082_alter_table_public_parts_order_lines_add_column_backordered_eta/up.yaml Normal file
View File

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

38
hasura/migrations/1596466475798_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,38 @@
- 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
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- quantity
- status
- updated_at
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_insert_permission

40
hasura/migrations/1596466475798_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,40 @@
- 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
- quantity
- status
- updated_at
set: {}
role: user
table:
name: parts_order_lines
schema: public
type: create_insert_permission

39
hasura/migrations/1596466485574_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,39 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- act_price
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- 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/1596466485574_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,41 @@
- 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
- 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

38
hasura/migrations/1596466492287_update_permission_user_public_table_parts_order_lines/down.yaml Normal file
View File

@@ -0,0 +1,38 @@
- args:
role: user
table:
name: parts_order_lines
schema: public
type: drop_update_permission
- args:
permission:
columns:
- act_price
- created_at
- db_price
- id
- job_line_id
- line_desc
- line_remarks
- oem_partno
- orderid
- 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

40
hasura/migrations/1596466492287_update_permission_user_public_table_parts_order_lines/up.yaml Normal file
View File

@@ -0,0 +1,40 @@
- 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
- 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

6
hasura/migrations/metadata.yaml
View File

@@ -3123,6 +3123,8 @@ tables:
_eq: true
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
@@ -3139,6 +3141,8 @@ tables:
permission:
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id
@@ -3166,6 +3170,8 @@ tables:
permission:
columns:
- act_price
- backordered_eta
- backordered_on
- created_at
- db_price
- id