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

Added phone number to vendor fields IO-414

Browse Source
This commit is contained in:
Patrick Fic
2020-12-01 22:36:31 -08:00
parent f89f385a4b
commit c6ae32b66d
17 changed files with 322 additions and 11 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
@@ -26405,6 +26405,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>phone</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>prompt_discount</name> <name>prompt_discount</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

2
client/.eslintcache
View File

File diff suppressed because one or more lines are too long

2
client/src/components/form-items-formatted/phone-form-item.component.jsx
View File

@@ -1,7 +1,7 @@
import React, { forwardRef } from "react"; import React, { forwardRef } from "react";
import NumberFormat from "react-number-format"; import NumberFormat from "react-number-format";
function FormItemPhone(props, ref) { function FormItemPhone(props, ref) {
return <NumberFormat {...props} ref={ref} type="tel" format="###-###-####" />; return <NumberFormat {...props} className='ant-input' ref={ref} type="tel" format="###-###-####" />;
} }
export default forwardRef(FormItemPhone); export default forwardRef(FormItemPhone);

4
client/src/components/vendors-form/vendors-form.component.jsx
View File

@@ -4,6 +4,7 @@ import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component"; import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
import FormItemEmail from "../form-items-formatted/email-form-item.component"; import FormItemEmail from "../form-items-formatted/email-form-item.component";
import PhoneFormItem from "../form-items-formatted/phone-form-item.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component"; import LayoutFormRow from "../layout-form-row/layout-form-row.component";
export default function VendorsFormComponent({ export default function VendorsFormComponent({
@@ -44,6 +45,9 @@ export default function VendorsFormComponent({
> >
<FormItemEmail email={getFieldValue("email")} /> <FormItemEmail email={getFieldValue("email")} />
</Form.Item> </Form.Item>
<Form.Item label={t("vendors.fields.phone")} name="phone">
<PhoneFormItem />
</Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow grow> <LayoutFormRow grow>
<Form.Item label={t("vendors.fields.street1")} name="street1"> <Form.Item label={t("vendors.fields.street1")} name="street1">

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

@@ -19,6 +19,7 @@ export const QUERY_VENDOR_BY_ID = gql`
cost_center cost_center
city city
street1 street1
phone
} }
} }
`; `;

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

@@ -1630,6 +1630,7 @@
"make": "Make", "make": "Make",
"name": "Vendor Name", "name": "Vendor Name",
"oem": "OEM", "oem": "OEM",
"phone": "Phone",
"prompt_discount": "Prompt Discount %", "prompt_discount": "Prompt Discount %",
"state": "State/Province", "state": "State/Province",
"street1": "Street", "street1": "Street",

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

@@ -1630,6 +1630,7 @@
"make": "", "make": "",
"name": "Nombre del vendedor", "name": "Nombre del vendedor",
"oem": "", "oem": "",
"phone": "",
"prompt_discount": "Descuento pronto", "prompt_discount": "Descuento pronto",
"state": "Provincia del estado", "state": "Provincia del estado",
"street1": "calle", "street1": "calle",

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

@@ -1630,6 +1630,7 @@
"make": "", "make": "",
"name": "Nom du vendeur", "name": "Nom du vendeur",
"oem": "", "oem": "",
"phone": "",
"prompt_discount": "Remise rapide%", "prompt_discount": "Remise rapide%",
"state": "Etat / Province", "state": "Etat / Province",
"street1": "rue", "street1": "rue",

5
hasura/migrations/1606890436428_alter_table_public_vendors_add_column_phone/down.yaml Normal file
View File

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

5
hasura/migrations/1606890436428_alter_table_public_vendors_add_column_phone/up.yaml Normal file
View File

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

44
hasura/migrations/1606890446033_update_permission_user_public_table_vendors/down.yaml Normal file
View File

@@ -0,0 +1,44 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_insert_permission
- args:
permission:
check:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- bodyshopid
- city
- cost_center
- country
- created_at
- discount
- display_name
- due_date
- email
- favorite
- id
- name
- prompt_discount
- state
- street1
- street2
- taxid
- terms
- updated_at
- zip
set: {}
role: user
table:
name: vendors
schema: public
type: create_insert_permission

45
hasura/migrations/1606890446033_update_permission_user_public_table_vendors/up.yaml Normal file
View File

@@ -0,0 +1,45 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_insert_permission
- args:
permission:
check:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- due_date
- favorite
- discount
- prompt_discount
- city
- cost_center
- country
- display_name
- email
- name
- phone
- state
- street1
- street2
- taxid
- terms
- zip
- created_at
- updated_at
- bodyshopid
- id
set: {}
role: user
table:
name: vendors
schema: public
type: create_insert_permission

45
hasura/migrations/1606890454484_update_permission_user_public_table_vendors/down.yaml Normal file
View File

@@ -0,0 +1,45 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- bodyshopid
- city
- cost_center
- country
- created_at
- discount
- display_name
- due_date
- email
- favorite
- id
- name
- prompt_discount
- state
- street1
- street2
- taxid
- terms
- updated_at
- zip
computed_fields: []
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: vendors
schema: public
type: create_select_permission

46
hasura/migrations/1606890454484_update_permission_user_public_table_vendors/up.yaml Normal file
View File

@@ -0,0 +1,46 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- bodyshopid
- city
- cost_center
- country
- created_at
- discount
- display_name
- due_date
- email
- favorite
- id
- name
- phone
- prompt_discount
- state
- street1
- street2
- taxid
- terms
- updated_at
- zip
computed_fields: []
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: vendors
schema: public
type: create_select_permission

44
hasura/migrations/1606890462598_update_permission_user_public_table_vendors/down.yaml Normal file
View File

@@ -0,0 +1,44 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_update_permission
- args:
permission:
columns:
- bodyshopid
- city
- cost_center
- country
- created_at
- discount
- display_name
- due_date
- email
- favorite
- id
- name
- prompt_discount
- state
- street1
- street2
- taxid
- terms
- updated_at
- zip
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: vendors
schema: public
type: create_update_permission

45
hasura/migrations/1606890462598_update_permission_user_public_table_vendors/up.yaml Normal file
View File

@@ -0,0 +1,45 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_update_permission
- args:
permission:
columns:
- bodyshopid
- city
- cost_center
- country
- created_at
- discount
- display_name
- due_date
- email
- favorite
- id
- name
- phone
- prompt_discount
- state
- street1
- street2
- taxid
- terms
- updated_at
- zip
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: vendors
schema: public
type: create_update_permission

19
hasura/migrations/metadata.yaml
View File

@@ -4066,26 +4066,27 @@ tables:
- active: - active:
_eq: true _eq: true
columns: columns:
- bodyshopid - due_date
- favorite
- discount
- prompt_discount
- city - city
- cost_center - cost_center
- country - country
- created_at
- discount
- display_name - display_name
- due_date
- email - email
- favorite
- id
- name - name
- prompt_discount - phone
- state - state
- street1 - street1
- street2 - street2
- taxid - taxid
- terms - terms
- updated_at
- zip - zip
- created_at
- updated_at
- bodyshopid
- id
select_permissions: select_permissions:
- role: user - role: user
permission: permission:
@@ -4102,6 +4103,7 @@ tables:
- favorite - favorite
- id - id
- name - name
- phone
- prompt_discount - prompt_discount
- state - state
- street1 - street1
@@ -4135,6 +4137,7 @@ tables:
- favorite - favorite
- id - id
- name - name
- phone
- prompt_discount - prompt_discount
- state - state
- street1 - street1