QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 05:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Customers

Browse Source
This commit is contained in:
elforjani3
2020-11-10 19:48:37 +02:00
parent 44fb6d621b
commit 6da8f22885
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/src/containers/Customers/CustomerAddressTabs.js
View File

@@ -222,22 +222,22 @@ const CustomerBillingAddress = ({
label={<T id={'address_line_1'} />}
className={'form-group--journal-number'}
intent={
errors.billing_address_1 &&
touched.billing_address_1 &&
errors.shipping_address_1 &&
touched.shipping_address_1 &&
Intent.DANGER
}
inline={true}
helperText={
<ErrorMessage name="billing_address_1" {...{ errors, touched }} />
<ErrorMessage name="shipping_address_1" {...{ errors, touched }} />
}
>
<TextArea
intent={
errors.billing_address_1 &&
touched.billing_address_1 &&
errors.shipping_address_1 &&
touched.shipping_address_1 &&
Intent.DANGER
}
{...getFieldProps('billing_address_1')}
{...getFieldProps('shipping_address_1')}
/>
</FormGroup>
{/*------------ Shipping Address 2 -----------*/}
@@ -245,22 +245,22 @@ const CustomerBillingAddress = ({
label={<T id={'address_line_2'} />}
className={'form-group--journal-number'}
intent={
errors.billing_address_2 &&
touched.billing_address_2 &&
errors.shipping_address_2 &&
touched.shipping_address_2 &&
Intent.DANGER
}
inline={true}
helperText={
<ErrorMessage name="billing_address_2" {...{ errors, touched }} />
<ErrorMessage name="shipping_address_2" {...{ errors, touched }} />
}
>
<TextArea
intent={
errors.billing_address_2 &&
touched.billing_address_2 &&
errors.shipping_address_2 &&
touched.shipping_address_2 &&
Intent.DANGER
}
{...getFieldProps('billing_address_2')}
{...getFieldProps('shipping_address_2')}
/>
</FormGroup>
{/*------------ Shipping Address city -----------*/}

6
client/src/containers/Customers/CustomerForm.js
View File

@@ -79,10 +79,10 @@ function CustomerForm({
.required()
.label(formatMessage({ id: 'display_name_' })),
email: Yup.string().email(),
email: Yup.string().email().nullable(),
work_phone: Yup.number(),
personal_phone: Yup.number(),
website: Yup.string().url(),
website: Yup.string().url().nullable(),
active: Yup.boolean(),
note: Yup.string().trim(),
@@ -103,7 +103,7 @@ function CustomerForm({
shipping_address_postcode: Yup.number().nullable(),
shipping_address_phone: Yup.number(),
opening_balance: Yup.number(),
opening_balance: Yup.number().nullable(),
currency_code: Yup.string(),
opening_balance_at: Yup.date(),
});

7
client/src/containers/Customers/CustomerTable.js
View File

@@ -122,7 +122,12 @@ const CustomerTable = ({
{
id: 'phone_number',
Header: formatMessage({ id: 'phone_number' }),
accessor: 'work_phone',
accessor: (row) => (
<div>
<div className={'work_phone'}>{row.work_phone}</div>
<div className={'personal_phone'}>{row.personal_phone}</div>
</div>
),
className: 'phone_number',
width: 100,
},