Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: responsiveness of create new invoice form #1185

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: responsiveness of create new invoice form #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 51 additions & 27 deletions frontend/src/modules/ErpPanelModule/ItemRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import { Form, Input, InputNumber, Row, Col } from 'antd';
import { DeleteOutlined } from '@ant-design/icons';
import { useMoney, useDate } from '@/settings';
import calculate from '@/utils/calculate';
import useLanguage from '@/locale/useLanguage';

export default function ItemRow({ field, remove, current = null }) {
const translate = useLanguage();
const [totalState, setTotal] = useState(undefined);
const [price, setPrice] = useState(0);
const [quantity, setQuantity] = useState(0);
Expand Down Expand Up @@ -53,35 +55,50 @@ export default function ItemRow({ field, remove, current = null }) {

return (
<Row gutter={[12, 12]} style={{ position: 'relative' }}>
<Col className="gutter-row" span={5}>
<Col className="gutter-row" xs={24} sm={12} md={5}>
<Form.Item
name={[field.name, 'itemName']}
label={translate('Item Name')} // Add label here
rules={[
{
required: true,
message: 'Missing itemName name',
},
{
pattern: /^(?!\s*$)[\s\S]+$/, // Regular expression to allow spaces, alphanumeric, and special characters, but not just spaces
pattern: /^(?!\s*$)[\s\S]+$/,
message: 'Item Name must contain alphanumeric or special characters',
},
]}
>
<Input placeholder="Item Name" />
</Form.Item>
</Col>
<Col className="gutter-row" span={7}>
<Form.Item name={[field.name, 'description']}>
<Input placeholder="description Name" />

<Col className="gutter-row" xs={24} sm={12} md={7}>
<Form.Item
name={[field.name, 'description']}
label={translate('Description')} // Add label here
>
<Input placeholder="Description" />
</Form.Item>
</Col>
<Col className="gutter-row" span={3}>
<Form.Item name={[field.name, 'quantity']} rules={[{ required: true }]}>

<Col className="gutter-row" xs={12} sm={6} md={3}>
<Form.Item
name={[field.name, 'quantity']}
label={translate('Quantity')} // Add label here
rules={[{ required: true }]}
>
<InputNumber style={{ width: '100%' }} min={0} onChange={updateQt} />
</Form.Item>
</Col>
<Col className="gutter-row" span={4}>
<Form.Item name={[field.name, 'price']} rules={[{ required: true }]}>

<Col className="gutter-row" xs={12} sm={6} md={4}>
<Form.Item
name={[field.name, 'price']}
label={translate('Price')} // Add label here
rules={[{ required: true }]}
>
<InputNumber
className="moneyInput"
onChange={updatePrice}
Expand All @@ -92,28 +109,35 @@ export default function ItemRow({ field, remove, current = null }) {
/>
</Form.Item>
</Col>
<Col className="gutter-row" span={5}>
<Form.Item name={[field.name, 'total']}>
<Form.Item>
<InputNumber
readOnly
className="moneyInput"
value={totalState}
min={0}
controls={false}
addonAfter={money.currency_position === 'after' ? money.currency_symbol : undefined}
addonBefore={money.currency_position === 'before' ? money.currency_symbol : undefined}
formatter={(value) =>
money.amountFormatter({ amount: value, currency_code: money.currency_code })
}
/>
</Form.Item>

<Col className="gutter-row" xs={24} sm={12} md={5}>
<Form.Item
name={[field.name, 'total']}
label={translate('Total')} // Add label here
>
<InputNumber
readOnly
className="moneyInput"
value={totalState}
min={0}
controls={false}
addonAfter={money.currency_position === 'after' ? money.currency_symbol : undefined}
addonBefore={money.currency_position === 'before' ? money.currency_symbol : undefined}
formatter={(value) =>
money.amountFormatter({ amount: value, currency_code: money.currency_code })
}
/>
</Form.Item>
</Col>

<div style={{ position: 'absolute', right: '-20px', top: ' 5px' }}>
<DeleteOutlined onClick={() => remove(field.name)} />
<div style={{ position: 'absolute', right: '-10px', top: '3px' }}>
<DeleteOutlined onClick={() => remove(field.name)}
style={{
fontSize: '18px',
cursor: 'pointer',
}}/>
</div>
</Row>

);
}
98 changes: 35 additions & 63 deletions frontend/src/modules/InvoiceModule/Forms/InvoiceForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@ function LoadInvoiceForm({ subTotal = 0, current = null }) {
addField.current.click();
}, []);

const sm = 576;
const md = 768;
const lg = 992;

return (
<>
<Row gutter={[12, 0]}>
<Col className="gutter-row" span={8}>
<Col className="gutter-row" xs={24} sm={12} md={8}>
<Form.Item
name="client"
label={translate('Client')}
rules={[
{
required: true,
},
]}
rules={[{ required: true }]}
>
<AutoCompleteAsync
entity={'client'}
Expand All @@ -86,110 +86,86 @@ function LoadInvoiceForm({ subTotal = 0, current = null }) {
/>
</Form.Item>
</Col>
<Col className="gutter-row" span={3}>
<Col className="gutter-row" xs={24} sm={12} md={3}>
<Form.Item
label={translate('number')}
name="number"
initialValue={lastNumber}
rules={[
{
required: true,
},
]}
rules={[{ required: true }]}
>
<InputNumber min={1} style={{ width: '100%' }} />
</Form.Item>
</Col>
<Col className="gutter-row" span={3}>
<Col className="gutter-row" xs={24} sm={12} md={3}>
<Form.Item
label={translate('year')}
name="year"
initialValue={currentYear}
rules={[
{
required: true,
},
]}
rules={[{ required: true }]}
>
<InputNumber style={{ width: '100%' }} />
</Form.Item>
</Col>

<Col className="gutter-row" span={5}>
<Col className="gutter-row" xs={24} sm={12} md={5}>
<Form.Item
label={translate('status')}
name="status"
rules={[
{
required: false,
},
]}
initialValue={'draft'}
rules={[{ required: false }]}
>
<Select
options={[
{ value: 'draft', label: translate('Draft') },
{ value: 'pending', label: translate('Pending') },
{ value: 'sent', label: translate('Sent') },
]}
></Select>
/>
</Form.Item>
</Col>

<Col className="gutter-row" span={8}>
<Col className="gutter-row" xs={24} sm={12} md={8}>
<Form.Item
name="date"
label={translate('Date')}
rules={[
{
required: true,
type: 'object',
},
]}
rules={[{ required: true, type: 'object' }]}
initialValue={dayjs()}
>
<DatePicker style={{ width: '100%' }} format={dateFormat} />
</Form.Item>
</Col>
<Col className="gutter-row" span={6}>
<Col className="gutter-row" xs={24} sm={12} md={6}>
<Form.Item
name="expiredDate"
label={translate('Expire Date')}
rules={[
{
required: true,
type: 'object',
},
]}
rules={[{ required: true, type: 'object' }]}
initialValue={dayjs().add(30, 'days')}
>
<DatePicker style={{ width: '100%' }} format={dateFormat} />
</Form.Item>
</Col>
<Col className="gutter-row" span={10}>
<Col className="gutter-row" xs={24}>
<Form.Item label={translate('Note')} name="notes">
<Input />
</Form.Item>
</Col>
</Row>
<Divider dashed />
<Row gutter={[12, 12]} style={{ position: 'relative' }}>
<Col className="gutter-row" span={5}>
{/* <Row gutter={[12, 12]} style={{ position: 'relative' }}>
<Col className="gutter-row" xs={24} sm={5}>
<p>{translate('Item')}</p>
</Col>
<Col className="gutter-row" span={7}>
<Col className="gutter-row" xs={24} sm={7}>
<p>{translate('Description')}</p>
</Col>
<Col className="gutter-row" span={3}>
<p>{translate('Quantity')}</p>{' '}
<Col className="gutter-row" xs={24} sm={3}>
<p>{translate('Quantity')}</p>
</Col>
<Col className="gutter-row" span={4}>
<Col className="gutter-row" xs={24} sm={4}>
<p>{translate('Price')}</p>
</Col>
<Col className="gutter-row" span={5}>
<Col className="gutter-row" xs={24} sm={5}>
<p>{translate('Total')}</p>
</Col>
</Row>
</Row> */}
<Form.List name="items">
{(fields, { add, remove }) => (
<>
Expand All @@ -211,16 +187,16 @@ function LoadInvoiceForm({ subTotal = 0, current = null }) {
)}
</Form.List>
<Divider dashed />
<div style={{ position: 'relative', width: ' 100%', float: 'right' }}>
<div style={{ position: 'relative', width: '100%', float: 'right' }}>
<Row gutter={[12, -5]}>
<Col className="gutter-row" span={5}>
<Col className="gutter-row" xs={24} sm={5}>
<Form.Item>
<Button type="primary" htmlType="submit" icon={<PlusOutlined />} block>
{translate('Save')}
</Button>
</Form.Item>
</Col>
<Col className="gutter-row" span={4} offset={10}>
<Col className="gutter-row" xs={24} sm={4} offset={sm ? 10 : 0}>
<p
style={{
paddingLeft: '12px',
Expand All @@ -232,19 +208,15 @@ function LoadInvoiceForm({ subTotal = 0, current = null }) {
{translate('Sub Total')} :
</p>
</Col>
<Col className="gutter-row" span={5}>
<Col className="gutter-row" xs={24} sm={5}>
<MoneyInputFormItem readOnly value={subTotal} />
</Col>
</Row>
<Row gutter={[12, -5]}>
<Col className="gutter-row" span={4} offset={15}>
<Col className="gutter-row" xs={24} sm={4} offset={sm ? 15 : 0}>
<Form.Item
name="taxRate"
rules={[
{
required: true,
},
]}
rules={[{ required: true }]}
>
<SelectAsync
value={taxRate}
Expand All @@ -259,12 +231,12 @@ function LoadInvoiceForm({ subTotal = 0, current = null }) {
/>
</Form.Item>
</Col>
<Col className="gutter-row" span={5}>
<Col className="gutter-row" xs={24} sm={5}>
<MoneyInputFormItem readOnly value={taxTotal} />
</Col>
</Row>
<Row gutter={[12, -5]}>
<Col className="gutter-row" span={4} offset={15}>
<Col className="gutter-row" xs={24} sm={4} offset={sm ? 15 : 0}>
<p
style={{
paddingLeft: '12px',
Expand All @@ -276,7 +248,7 @@ function LoadInvoiceForm({ subTotal = 0, current = null }) {
{translate('Total')} :
</p>
</Col>
<Col className="gutter-row" span={5}>
<Col className="gutter-row" xs={24} sm={5}>
<MoneyInputFormItem readOnly value={total} />
</Col>
</Row>
Expand Down
Loading