mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-20 05:22:02 +00:00
Merge branch 'feat/add-bank-name-in-supplier-customer' into 'development'
[FEAT/FE] Bank Name in Supplier & Customer See merge request mbugroup/lti-web-client!478
This commit is contained in:
@@ -189,6 +189,11 @@ const CustomersTable = () => {
|
|||||||
accessorKey: 'email',
|
accessorKey: 'email',
|
||||||
header: 'Email',
|
header: 'Email',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
accessorKey: 'bank_name',
|
||||||
|
header: 'Nama Bank',
|
||||||
|
cell: (props) => props.row.original.bank_name || '-',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
header: 'Aksi',
|
header: 'Aksi',
|
||||||
cell: (props: CellContext<Customer, unknown>) => {
|
cell: (props: CellContext<Customer, unknown>) => {
|
||||||
|
|||||||
@@ -27,6 +27,9 @@ export const CustomerFormSchema = Yup.object({
|
|||||||
.email('Format email tidak valid!')
|
.email('Format email tidak valid!')
|
||||||
.required('Email wajib diisi!'),
|
.required('Email wajib diisi!'),
|
||||||
|
|
||||||
|
bank_name: Yup.string()
|
||||||
|
.min(3, 'Nama bank minimal 3 karakter!')
|
||||||
|
.required('Nama bank wajib diisi!'),
|
||||||
account_number: Yup.string()
|
account_number: Yup.string()
|
||||||
.matches(/^[0-9]+$/, 'Nomor rekening hanya boleh berisi angka!')
|
.matches(/^[0-9]+$/, 'Nomor rekening hanya boleh berisi angka!')
|
||||||
.required('Nomor rekening wajib diisi!'),
|
.required('Nomor rekening wajib diisi!'),
|
||||||
|
|||||||
@@ -142,6 +142,7 @@ const CustomerForm = ({
|
|||||||
},
|
},
|
||||||
type: normalizeType(initialValues?.type),
|
type: normalizeType(initialValues?.type),
|
||||||
address: initialValues?.address ?? '',
|
address: initialValues?.address ?? '',
|
||||||
|
bank_name: initialValues?.bank_name ?? '',
|
||||||
account_number: initialValues?.account_number ?? '',
|
account_number: initialValues?.account_number ?? '',
|
||||||
};
|
};
|
||||||
}, [initialValues]);
|
}, [initialValues]);
|
||||||
@@ -164,6 +165,7 @@ const CustomerForm = ({
|
|||||||
pic_id: values.picId,
|
pic_id: values.picId,
|
||||||
type: (values.type as OptionType).value as string,
|
type: (values.type as OptionType).value as string,
|
||||||
address: values.address,
|
address: values.address,
|
||||||
|
bank_name: values.bank_name,
|
||||||
account_number: values.account_number,
|
account_number: values.account_number,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -286,6 +288,22 @@ const CustomerForm = ({
|
|||||||
errorMessage={formik.errors.phone}
|
errorMessage={formik.errors.phone}
|
||||||
readOnly={formType === 'detail'}
|
readOnly={formType === 'detail'}
|
||||||
/>
|
/>
|
||||||
|
<TextInput
|
||||||
|
required
|
||||||
|
label='Nama Bank'
|
||||||
|
name='bank_name'
|
||||||
|
placeholder='Masukkan nama bank customer'
|
||||||
|
value={formik.values.bank_name}
|
||||||
|
onChange={(e) =>
|
||||||
|
formik.setFieldValue('bank_name', e.target.value.toUpperCase())
|
||||||
|
}
|
||||||
|
onBlur={formik.handleBlur}
|
||||||
|
isError={
|
||||||
|
formik.touched.bank_name && Boolean(formik.errors.bank_name)
|
||||||
|
}
|
||||||
|
errorMessage={formik.errors.bank_name}
|
||||||
|
readOnly={formType === 'detail'}
|
||||||
|
/>
|
||||||
<TextInput
|
<TextInput
|
||||||
required
|
required
|
||||||
label='Nomor Rekening'
|
label='Nomor Rekening'
|
||||||
|
|||||||
@@ -326,6 +326,11 @@ const SuppliersTable = () => {
|
|||||||
accessorKey: 'email',
|
accessorKey: 'email',
|
||||||
header: 'Email',
|
header: 'Email',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
accessorKey: 'bank_name',
|
||||||
|
header: 'Nama Bank',
|
||||||
|
cell: (props) => props.row.original.bank_name || '-',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
accessorKey: 'address',
|
accessorKey: 'address',
|
||||||
header: 'Alamat',
|
header: 'Alamat',
|
||||||
|
|||||||
@@ -31,6 +31,9 @@ export const SupplierFormSchema = Yup.object({
|
|||||||
npwp: Yup.string()
|
npwp: Yup.string()
|
||||||
.matches(/^[0-9]+$/, 'Nomor NPWP hanya boleh berisi angka!')
|
.matches(/^[0-9]+$/, 'Nomor NPWP hanya boleh berisi angka!')
|
||||||
.required('Nomor NPWP wajib diisi!'),
|
.required('Nomor NPWP wajib diisi!'),
|
||||||
|
bank_name: Yup.string()
|
||||||
|
.min(3, 'Nama bank minimal 3 karakter!')
|
||||||
|
.required('Nama bank wajib diisi!'),
|
||||||
account_number: Yup.string()
|
account_number: Yup.string()
|
||||||
.matches(/^[0-9]+$/, 'Nomor rekening hanya boleh berisi angka!')
|
.matches(/^[0-9]+$/, 'Nomor rekening hanya boleh berisi angka!')
|
||||||
.required('Nomor rekening wajib diisi!'),
|
.required('Nomor rekening wajib diisi!'),
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ const SupplierForm = ({
|
|||||||
email: initialValues?.email ?? '',
|
email: initialValues?.email ?? '',
|
||||||
address: initialValues?.address ?? '',
|
address: initialValues?.address ?? '',
|
||||||
npwp: initialValues?.npwp ?? '',
|
npwp: initialValues?.npwp ?? '',
|
||||||
|
bank_name: initialValues?.bank_name ?? '',
|
||||||
account_number: initialValues?.account_number ?? '',
|
account_number: initialValues?.account_number ?? '',
|
||||||
due_date: initialValues?.due_date ?? 1,
|
due_date: initialValues?.due_date ?? 1,
|
||||||
};
|
};
|
||||||
@@ -149,6 +150,7 @@ const SupplierForm = ({
|
|||||||
email: values.email,
|
email: values.email,
|
||||||
address: values.address,
|
address: values.address,
|
||||||
npwp: values.npwp,
|
npwp: values.npwp,
|
||||||
|
bank_name: values.bank_name,
|
||||||
account_number: values.account_number,
|
account_number: values.account_number,
|
||||||
due_date: parseInt(values.due_date.toString()),
|
due_date: parseInt(values.due_date.toString()),
|
||||||
};
|
};
|
||||||
@@ -368,6 +370,22 @@ const SupplierForm = ({
|
|||||||
errorMessage={formik.errors.npwp}
|
errorMessage={formik.errors.npwp}
|
||||||
readOnly={formType === 'detail'}
|
readOnly={formType === 'detail'}
|
||||||
/>
|
/>
|
||||||
|
<TextInput
|
||||||
|
required
|
||||||
|
label='Nama Bank'
|
||||||
|
name='bank_name'
|
||||||
|
placeholder='Masukkan nama bank supplier'
|
||||||
|
value={formik.values.bank_name}
|
||||||
|
onChange={(e) =>
|
||||||
|
formik.setFieldValue('bank_name', e.target.value.toUpperCase())
|
||||||
|
}
|
||||||
|
onBlur={formik.handleBlur}
|
||||||
|
isError={
|
||||||
|
formik.touched.bank_name && Boolean(formik.errors.bank_name)
|
||||||
|
}
|
||||||
|
errorMessage={formik.errors.bank_name}
|
||||||
|
readOnly={formType === 'detail'}
|
||||||
|
/>
|
||||||
<TextInput
|
<TextInput
|
||||||
required
|
required
|
||||||
label='Nomor Rekening'
|
label='Nomor Rekening'
|
||||||
|
|||||||
+2
@@ -10,6 +10,7 @@ export type BaseCustomer = {
|
|||||||
phone: string;
|
phone: string;
|
||||||
email: string;
|
email: string;
|
||||||
account_number: string;
|
account_number: string;
|
||||||
|
bank_name: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type Customer = BaseMetadata & BaseCustomer;
|
export type Customer = BaseMetadata & BaseCustomer;
|
||||||
@@ -22,6 +23,7 @@ export type CreateCustomerPayload = {
|
|||||||
phone: string;
|
phone: string;
|
||||||
email: string;
|
email: string;
|
||||||
account_number: string;
|
account_number: string;
|
||||||
|
bank_name: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type UpdateCustomerPayload = CreateCustomerPayload;
|
export type UpdateCustomerPayload = CreateCustomerPayload;
|
||||||
|
|||||||
+2
@@ -16,6 +16,7 @@ export type BaseSupplier = {
|
|||||||
account_number: string;
|
account_number: string;
|
||||||
due_date: number;
|
due_date: number;
|
||||||
balance?: number;
|
balance?: number;
|
||||||
|
bank_name: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type Supplier = BaseMetadata & BaseSupplier;
|
export type Supplier = BaseMetadata & BaseSupplier;
|
||||||
@@ -45,6 +46,7 @@ export type CreateSupplierPayload = {
|
|||||||
account_number: string;
|
account_number: string;
|
||||||
due_date: number;
|
due_date: number;
|
||||||
balance?: number;
|
balance?: number;
|
||||||
|
bank_name: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type UpdateSupplierPayload = CreateSupplierPayload;
|
export type UpdateSupplierPayload = CreateSupplierPayload;
|
||||||
|
|||||||
Reference in New Issue
Block a user