Merged in feature/2021-06-18 (pull request #111)

Feature/2021 06 18
This commit is contained in:
Patrick Fic
2021-06-16 21:25:18 +00:00
6 changed files with 9916 additions and 54543 deletions

44267
client/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -77,8 +77,8 @@
"analyze": "source-map-explorer 'build/static/js/*.js'", "analyze": "source-map-explorer 'build/static/js/*.js'",
"start": "craco start", "start": "craco start",
"build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build", "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
"build:test": "env-cmd -f .env.test npm run build", "build:test": "env-cmd -f .env.test yarn run build",
"build-deploy:test": "npm run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'", "build-deploy:test": "yarn run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
"buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` react-scripts build", "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` react-scripts build",
"test": "craco test", "test": "craco test",
"eject": "react-scripts eject", "eject": "react-scripts eject",

View File

@@ -163,9 +163,9 @@ function JobsDocumentsComponent({
currentImageWillChange={onCurrentImageChange} currentImageWillChange={onCurrentImageChange}
customControls={[ customControls={[
<Button <Button
key="edit-button"
style={{ style={{
float: "right", float: "right",
zIndex: "5", zIndex: "5",
}} }}
onClick={() => { onClick={() => {
@@ -177,7 +177,7 @@ function JobsDocumentsComponent({
if (newWindow) newWindow.opener = null; if (newWindow) newWindow.opener = null;
}} }}
> >
<EditFilled style={{}} /> <EditFilled />
</Button>, </Button>,
]} ]}
onClickImage={(props) => { onClickImage={(props) => {

View File

@@ -937,7 +937,7 @@ export default function ShopInfoGeneral({ form }) {
<Select.Option value="PAS"> <Select.Option value="PAS">
{t("joblines.fields.part_types.PAS")} {t("joblines.fields.part_types.PAS")}
</Select.Option> </Select.Option>
</Select>{" "} </Select>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("joblines.fields.oem_partno")} label={t("joblines.fields.oem_partno")}

View File

@@ -135,7 +135,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
} }
/> />
<Space wrap direction="vertical"> <Space wrap direction="vertical" style={{ width: "100%" }}>
<FormsFieldChanged form={form} /> <FormsFieldChanged form={form} />
{!job.actual_in && job.scheduled_in && ( {!job.actual_in && job.scheduled_in && (
<Alert <Alert

File diff suppressed because it is too large Load Diff