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

Merged in feature/2021-07-16 (pull request #137)

Browse Source 
feature/2021-07-16
This commit is contained in:
Patrick Fic
2021-07-15 18:42:45 +00:00
parent 7a6a834998 7ce4264309
commit 6f64cb71f2
6 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/documents-upload/documents-upload.utility.js
View File

@@ -24,7 +24,7 @@ export const handleUpload = (ev, context) => {
const fileName = ev.file.name || ev.filename; const fileName = ev.file.name || ev.filename;
let key = `${bodyshop.id}/${jobId}/${fileName.replace( let key = `${bodyshop.id}/${jobId}/${fileName.replace(
/\.[^/.]+$/, /[^a-zA-Z ]/g,
"" ""
)}-${new Date().getTime()}`; )}-${new Date().getTime()}`;
let extension = fileName.split(".").pop(); let extension = fileName.split(".").pop();

21
client/src/components/job-search-select/job-search-select.component.jsx
View File

@@ -1,6 +1,6 @@
import { LoadingOutlined } from "@ant-design/icons"; import { LoadingOutlined } from "@ant-design/icons";
import { useLazyQuery } from "@apollo/client"; import { useLazyQuery } from "@apollo/client";
import { Empty, Select } from "antd"; import { Empty, Select, Space, Tag } from "antd";
import _ from "lodash"; import _ from "lodash";
import React, { forwardRef, useEffect } from "react"; import React, { forwardRef, useEffect } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
@@ -80,13 +80,18 @@ const JobSearchSelect = (
{theOptions {theOptions
? theOptions.map((o) => ( ? theOptions.map((o) => (
<Option key={o.id} value={o.id} status={o.status}> <Option key={o.id} value={o.id} status={o.status}>
{`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${ <Space>
o.ro_number || t("general.labels.na") <span>
} | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${ {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${
o.ownr_co_nm ? ` ${o.ownr_co_num}` : "" o.ro_number || t("general.labels.na")
}| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${ } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
o.v_model_desc || "" o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
}`} }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
o.v_model_desc || ""
}`}
</span>
<Tag>{o.status}</Tag>
</Space>
</Option> </Option>
)) ))
: null} : null}

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

@@ -1043,6 +1043,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
v_make_desc v_make_desc
v_model_desc v_model_desc
v_model_yr v_model_yr
status
} }
} }
`; `;

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

@@ -2284,7 +2284,7 @@
"city": "City", "city": "City",
"cost_center": "Cost Center", "cost_center": "Cost Center",
"country": "Country", "country": "Country",
"discount": "Discount %", "discount": "Discount % (as decimal)",
"display_name": "Display Name", "display_name": "Display Name",
"due_date": "Payment Due Date", "due_date": "Payment Due Date",
"email": "Contact Email", "email": "Contact Email",

6
hasura/migrations/1626374103197_alter_table_public_vehicles_drop_constraint_vehicles_v_vin_shopid_key/down.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
cascade: false
read_only: false
sql: alter table "public"."vehicles" add constraint "vehicles_v_vin_shopid_key"
unique ("v_vin", "shopid");
type: run_sql

5
hasura/migrations/1626374103197_alter_table_public_vehicles_drop_constraint_vehicles_v_vin_shopid_key/up.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: alter table "public"."vehicles" drop constraint "vehicles_v_vin_shopid_key";
type: run_sql