From 924aa5d99abbe67801c74bcb8bd8bd4418c49de5 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 13 Jul 2020 10:21:02 -0700 Subject: [PATCH] Added referral source to bodyshop + form. BOD-158 --- .../jobs-detail-claims.component.jsx | 46 ++++++++++----- .../shop-info/shop-info.component.jsx | 24 +++++++- client/src/graphql/bodyshop.queries.js | 2 + client/src/redux/store.js | 2 +- .../down.yaml | 5 ++ .../up.yaml | 6 ++ .../down.yaml | 55 ++++++++++++++++++ .../up.yaml | 56 +++++++++++++++++++ .../down.yaml | 49 ++++++++++++++++ .../up.yaml | 50 +++++++++++++++++ hasura/migrations/metadata.yaml | 2 + 11 files changed, 282 insertions(+), 15 deletions(-) create mode 100644 hasura/migrations/1594659447638_alter_table_public_bodyshops_add_column_md_referral_sources/down.yaml create mode 100644 hasura/migrations/1594659447638_alter_table_public_bodyshops_add_column_md_referral_sources/up.yaml create mode 100644 hasura/migrations/1594659481096_update_permission_user_public_table_bodyshops/down.yaml create mode 100644 hasura/migrations/1594659481096_update_permission_user_public_table_bodyshops/up.yaml create mode 100644 hasura/migrations/1594659492762_update_permission_user_public_table_bodyshops/down.yaml create mode 100644 hasura/migrations/1594659492762_update_permission_user_public_table_bodyshops/up.yaml diff --git a/client/src/components/jobs-detail-claims/jobs-detail-claims.component.jsx b/client/src/components/jobs-detail-claims/jobs-detail-claims.component.jsx index 8a95fc57a..edd972df7 100644 --- a/client/src/components/jobs-detail-claims/jobs-detail-claims.component.jsx +++ b/client/src/components/jobs-detail-claims/jobs-detail-claims.component.jsx @@ -1,46 +1,66 @@ -import { Form, Input, InputNumber, Switch } from "antd"; +import { Form, Input, InputNumber, Switch, Select } from "antd"; import React from "react"; import { useTranslation } from "react-i18next"; import FormRow from "../layout-form-row/layout-form-row.component"; -export default function JobsDetailClaims({ job }) { +import { connect } from "react-redux"; +import { createStructuredSelector } from "reselect"; +import { selectBodyshop } from "../../redux/user/user.selectors"; +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); + +export function JobsDetailClaims({ bodyshop, job }) { const { t } = useTranslation(); return (
- + - + - + - + - + + valuePropName="checked" + name="exempt" + > + valuePropName="checked" + name="special_coverage_policy" + > - - + +
); } +export default connect(mapStateToProps, mapDispatchToProps)(JobsDetailClaims); diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx index 7800096be..45f8f51cc 100644 --- a/client/src/components/shop-info/shop-info.component.jsx +++ b/client/src/components/shop-info/shop-info.component.jsx @@ -1,5 +1,13 @@ import React from "react"; -import { Form, Input, Button, Collapse, InputNumber, Radio } from "antd"; +import { + Form, + Input, + Button, + Collapse, + InputNumber, + Radio, + Select, +} from "antd"; import { useTranslation } from "react-i18next"; import ShopInfoROStatusComponent from "./shop-info.rostatus.component"; import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component"; @@ -179,6 +187,20 @@ export default function ShopInfoComponent({ form }) { ); }} + + +