summaryrefslogtreecommitdiff
path: root/src-migrate
diff options
context:
space:
mode:
authorit-fixcomart <it@fixcomart.co.id>2024-08-23 13:42:20 +0700
committerit-fixcomart <it@fixcomart.co.id>2024-08-23 13:42:20 +0700
commitbf33cdda7fb249cdd2473e0d1039704fd2171589 (patch)
treec31db3bbc75a125fcd99003194afc660cb62dac7 /src-migrate
parent453f377e42866cc68a03b2fef0a672590dfd68dd (diff)
<iman> update new register
Diffstat (limited to 'src-migrate')
-rw-r--r--src-migrate/modules/register/components/FormBisnis.tsx12
-rw-r--r--src-migrate/modules/register/stores/useRegisterStore.ts4
-rw-r--r--src-migrate/validations/auth.ts9
3 files changed, 9 insertions, 16 deletions
diff --git a/src-migrate/modules/register/components/FormBisnis.tsx b/src-migrate/modules/register/components/FormBisnis.tsx
index 42d7aaa3..b58f2fec 100644
--- a/src-migrate/modules/register/components/FormBisnis.tsx
+++ b/src-migrate/modules/register/components/FormBisnis.tsx
@@ -17,7 +17,7 @@ interface FormProps {
isPKP: boolean;
}
-interface Industry {
+interface industry_id {
label: string;
value: string;
category: string;
@@ -42,7 +42,7 @@ const FormBisnis: React.FC<FormProps> = ({ type, required, isPKP }) => {
const [selectedCategory, setSelectedCategory] = useState<string>('');
const [selectedCompanyId, setSelectedCompanyId] = useState<string>('');
- const [industries, setIndustries] = useState<Industry[]>([]);
+ const [industries, setIndustries] = useState<industry_id[]>([]);
const [companyTypes, setCompanyTypes] = useState<company_type_id[]>([]);
const isFormValid = useMemo(() => Object.keys(errors).length === 0, [errors]);
@@ -67,13 +67,13 @@ const FormBisnis: React.FC<FormProps> = ({ type, required, isPKP }) => {
}, [watch('company_type_id'), companyTypes]);
useEffect(() => {
- const selectedIndustryType = industries.find(industry => industry.value === watch('industry'));
+ const selectedIndustryType = industries.find(industry => industry.value === watch('industry_id'));
if (selectedIndustryType) {
updateFormBisnis("industry_id", selectedIndustryType?.value);
setSelectedCategory(selectedIndustryType.label);
validateFormBisnis();
}
- }, [watch('industry'), industries]);
+ }, [watch('industry_id'), industries]);
useEffect(() => {
const loadIndustries = async () => {
@@ -212,14 +212,14 @@ const FormBisnis: React.FC<FormProps> = ({ type, required, isPKP }) => {
Klasifikasi Jenis Usaha
</label>
<Controller
- name='industry'
+ name='industry_id'
control={control}
render={(props) => <HookFormSelect {...props} options={industries} disabled={required} placeholder={'Select industry'}/>}
/>
{selectedCategory &&
<span className='text-gray_r-11 text-xs'>Kategori : {selectedCategory}</span>
}
- {!required && !!errors.industry && <span className="form-msg-danger">{errors.industry}</span>}
+ {!required && !!errors.industry_id && <span className="form-msg-danger">{errors.industry_id}</span>}
</div>
<div>
diff --git a/src-migrate/modules/register/stores/useRegisterStore.ts b/src-migrate/modules/register/stores/useRegisterStore.ts
index de237b0d..2db0b602 100644
--- a/src-migrate/modules/register/stores/useRegisterStore.ts
+++ b/src-migrate/modules/register/stores/useRegisterStore.ts
@@ -37,7 +37,7 @@ export const useRegisterStore = create<State & Action>((set, get) => ({
sppkp_document: '',
npwp_document: '',
nameWajibPajak: '',
- industry: { value: '', label: '' },
+ industry_id: 0,
badanUsaha: '',
jenisUsaha: '',
npwp: '',
@@ -56,7 +56,7 @@ export const useRegisterStore = create<State & Action>((set, get) => ({
sppkp_document: '',
npwp_document: '',
nameWajibPajak: '',
- industry: { value: '', label: '' },
+ industry_id: 0,
badanUsaha: '',
jenisUsaha: '',
npwp: '',
diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts
index 23b033a7..fd645ef3 100644
--- a/src-migrate/validations/auth.ts
+++ b/src-migrate/validations/auth.ts
@@ -16,19 +16,12 @@ export const registerSchema = z.object({
nama_wajib_pajak: z.string().min(1, { message: 'Nama wajib pajak harus diisi' }),
sppkp_document: z.string().min(1, { message: 'document harus diisi' }),
npwp_document: z.string().min(1, { message: 'document harus diisi' }),
- industry: z.object({
- value: z.string().min(1, { message: 'Jenis usaha harus dipilih' }),
- label: z.string().min(1, { message: 'Jenis usaha harus dipilih' }),
- }),
+ industry_id: z.number().min(1, { message: 'Jenis usaha harus dipilih' }),
email_partner: z
.string()
.min(1, { message: 'Email harus diisi' })
.email({ message: 'Email harus menggunakan format example@mail.com' }),
business_name: z.string().min(1, { message: 'Nama perusahaan harus diisi' }),
- // company_type_id: z.object({
- // value: z.string().min(1, { message: 'Badan usaha wajib dipilih' }),
- // label: z.string().min(1, { message: 'Badan usaha wajib dipilih' }),
- // }),
company_type_id: z.number().min(1, { message: 'Badan usaha wajib dipilih' }),
npwp: z
.string()