From 0427b70917d7623d5de1969b99e9c198c38ccca7 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Tue, 20 Aug 2024 15:53:01 +0700 Subject: /^\d{10,12}$/.test(val), { message: 'Format nomor telepon tidak valid, contoh: 081234567890', }), + npwp: z + .string() + .min(1, { message: 'NPWP harus diisi' }) + .refine((val) => /^\d{10,12}$/.test(val), { + message: 'Format nomor telepon tidak valid, contoh: 081234567890', + }), }); -- cgit v1.2.3 From 2ffc49bb65a16f07cf5a3b7e4926c34ea07b9460 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Wed, 21 Aug 2024 17:10:13 +0700 Subject: update new register --- src-migrate/validations/auth.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index 166fd926..8c0cce28 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -2,7 +2,9 @@ import { z } from 'zod'; export const registerSchema = z.object({ name: z.string().min(1, { message: 'Nama harus diisi' }), - document: z.string().min(1, { message: 'Nama harus diisi' }), + nama_wajib_pajak: z.string().min(1, { message: 'Nama harus diisi' }), + sppkp_document: z.string().min(1, { message: 'document harus diisi' }), + npwp_document: z.string().min(1, { message: 'document harus diisi' }), nameWajibPajak: z.string().min(1, { message: 'Nama wajib pajak harus diisi' }), industry: z.string().min(1, { message: 'industri harus diisi' }), badanUsaha: z.string().min(1, { message: 'badan usaha harus dipilih' }), @@ -11,18 +13,23 @@ export const registerSchema = z.object({ .string() .min(1, { message: 'Email harus diisi' }) .email({ message: 'Email harus menggunakan format example@mail.com' }), + email_partner: z + .string() + .min(1, { message: 'Email harus diisi' }) + .email({ message: 'Email harus menggunakan format example@mail.com' }), password: z.string().min(6, { message: 'Password minimal 6 karakter' }), - company: z.string().optional(), + business_name: z.string().optional(), phone: z .string() .min(1, { message: 'Nomor telepon harus diisi' }) .refine((val) => /^\d{10,12}$/.test(val), { message: 'Format nomor telepon tidak valid, contoh: 081234567890', }), - npwp: z + npwp: z .string() .min(1, { message: 'NPWP harus diisi' }) - .refine((val) => /^\d{10,12}$/.test(val), { - message: 'Format nomor telepon tidak valid, contoh: 081234567890', + .refine((val) => /^\d{15}$/.test(val), { + message: 'Format NPWP tidak valid, NPWP harus terdiri dari minimal 15 digit angka.', }), + }); -- cgit v1.2.3 From 6623dba2f6cd4a4ca7b25f7086991afef092cd26 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Thu, 22 Aug 2024 15:48:00 +0700 Subject: update new register view --- src-migrate/validations/auth.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index 8c0cce28..5a6051a6 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -2,13 +2,11 @@ import { z } from 'zod'; export const registerSchema = z.object({ name: z.string().min(1, { message: 'Nama harus diisi' }), - nama_wajib_pajak: z.string().min(1, { message: 'Nama harus diisi' }), + 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' }), - nameWajibPajak: z.string().min(1, { message: 'Nama wajib pajak harus diisi' }), - industry: z.string().min(1, { message: 'industri harus diisi' }), + industry: z.string().min(1, { message: 'Jenis usaha harus dipiliih' }), badanUsaha: z.string().min(1, { message: 'badan usaha harus dipilih' }), - jenisUsaha: z.string().min(1, { message: 'jenis usaha harus dipilih' }), email: z .string() .min(1, { message: 'Email harus diisi' }) @@ -18,7 +16,8 @@ export const registerSchema = z.object({ .min(1, { message: 'Email harus diisi' }) .email({ message: 'Email harus menggunakan format example@mail.com' }), password: z.string().min(6, { message: 'Password minimal 6 karakter' }), - business_name: z.string().optional(), + business_name: z.string().min(1, { message: 'Nama perusahaan harus diisi' }), + companyType: z.string().min(1, { message: 'Badan usaha wajib diisi' }), phone: z .string() .min(1, { message: 'Nomor telepon harus diisi' }) -- cgit v1.2.3 From fb346e50e06ed68508662ca3d004db2c2cc117eb Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Thu, 22 Aug 2024 16:48:03 +0700 Subject: update new register --- src-migrate/validations/auth.ts | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index 5a6051a6..2128dbcc 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -2,28 +2,27 @@ import { z } from 'zod'; export const registerSchema = z.object({ name: z.string().min(1, { message: 'Nama harus diisi' }), - 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.string().min(1, { message: 'Jenis usaha harus dipiliih' }), - badanUsaha: z.string().min(1, { message: 'badan usaha harus dipilih' }), email: z .string() .min(1, { message: 'Email harus diisi' }) .email({ message: 'Email harus menggunakan format example@mail.com' }), - email_partner: z - .string() - .min(1, { message: 'Email harus diisi' }) - .email({ message: 'Email harus menggunakan format example@mail.com' }), password: z.string().min(6, { message: 'Password minimal 6 karakter' }), - business_name: z.string().min(1, { message: 'Nama perusahaan harus diisi' }), - companyType: z.string().min(1, { message: 'Badan usaha wajib diisi' }), phone: z .string() .min(1, { message: 'Nomor telepon harus diisi' }) .refine((val) => /^\d{10,12}$/.test(val), { message: 'Format nomor telepon tidak valid, contoh: 081234567890', }), + 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.string().min(1, { message: 'Jenis usaha harus dipiliih' }), + 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' }), + companyType: z.string().min(1, { message: 'Badan usaha wajib diisi' }), npwp: z .string() .min(1, { message: 'NPWP harus diisi' }) -- cgit v1.2.3 From b42134f5929f256a1ffa1c32daba59a350e9af37 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Thu, 22 Aug 2024 17:20:44 +0700 Subject: update new register --- src-migrate/validations/auth.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index 2128dbcc..9bd3af07 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -24,10 +24,7 @@ export const registerSchema = z.object({ business_name: z.string().min(1, { message: 'Nama perusahaan harus diisi' }), companyType: z.string().min(1, { message: 'Badan usaha wajib diisi' }), npwp: z - .string() - .min(1, { message: 'NPWP harus diisi' }) - .refine((val) => /^\d{15}$/.test(val), { - message: 'Format NPWP tidak valid, NPWP harus terdiri dari minimal 15 digit angka.', - }), - + .string() + .min(15, { message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15 digit angka.' }) + , }); -- cgit v1.2.3 From 453f377e42866cc68a03b2fef0a672590dfd68dd Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Fri, 23 Aug 2024 13:29:30 +0700 Subject: update new register --- src-migrate/validations/auth.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index 9bd3af07..23b033a7 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -16,13 +16,20 @@ 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.string().min(1, { message: 'Jenis usaha harus dipiliih' }), + industry: z.object({ + value: z.string().min(1, { message: 'Jenis usaha harus dipilih' }), + label: z.string().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' }), - companyType: z.string().min(1, { message: 'Badan usaha wajib 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() .min(15, { message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15 digit angka.' }) -- cgit v1.2.3 From bf33cdda7fb249cdd2473e0d1039704fd2171589 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Fri, 23 Aug 2024 13:42:20 +0700 Subject: update new register --- src-migrate/validations/auth.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src-migrate/validations') 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() -- cgit v1.2.3 From 0bca1bfb2bc7e52a31dde39602dd599d7c640e73 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Sat, 24 Aug 2024 08:46:44 +0700 Subject: update new register --- src-migrate/validations/auth.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index fd645ef3..dc5b0411 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -16,13 +16,13 @@ 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_id: z.number().min(1, { message: 'Jenis usaha harus dipilih' }), + industry_id: z.string().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.number().min(1, { message: 'Badan usaha wajib dipilih' }), + company_type_id: z.string().min(1, { message: 'Badan usaha wajib dipilih' }), npwp: z .string() .min(15, { message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15 digit angka.' }) -- cgit v1.2.3 From f0cde08a3fda95b1738a765358022241aea404bf Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 26 Aug 2024 10:28:15 +0700 Subject: update logic new register validation --- src-migrate/validations/auth.ts | 130 +++++++++++++++++++++++++++++++--------- 1 file changed, 102 insertions(+), 28 deletions(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index dc5b0411..69ea52e1 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -1,30 +1,104 @@ import { z } from 'zod'; -export const registerSchema = z.object({ - name: z.string().min(1, { message: 'Nama harus diisi' }), - email: z - .string() - .min(1, { message: 'Email harus diisi' }) - .email({ message: 'Email harus menggunakan format example@mail.com' }), - password: z.string().min(6, { message: 'Password minimal 6 karakter' }), - phone: z - .string() - .min(1, { message: 'Nomor telepon harus diisi' }) - .refine((val) => /^\d{10,12}$/.test(val), { - message: 'Format nomor telepon tidak valid, contoh: 081234567890', - }), - 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_id: z.string().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.string().min(1, { message: 'Badan usaha wajib dipilih' }), - npwp: z - .string() - .min(15, { message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15 digit angka.' }) - , -}); +export const registerSchema = z + .object({ + name: z.string().min(1, { message: 'Nama harus diisi' }), + email: z + .string() + .min(1, { message: 'Email harus diisi' }) + .email({ message: 'Email harus menggunakan format example@mail.com' }), + password: z.string().min(6, { message: 'Password minimal 6 karakter' }), + phone: z + .string() + .min(1, { message: 'Nomor telepon harus diisi' }) + .refine((val) => /^\d{10,12}$/.test(val), { + message: 'Format nomor telepon tidak valid, contoh: 081234567890', + }), + type_acc: z.string().optional(), + nama_wajib_pajak: z.string().optional(), + is_pkp: z.string(), + is_terdaftar: z.string(), + sppkp_document: z.string().optional(), + npwp_document: z.string().optional(), + industry_id: z.string().optional(), + email_partner: z.string().optional(), + business_name: z.string().optional(), + company_type_id: z.string().optional(), + npwp: z.string().optional(), + }) + .superRefine((data, ctx) => { + console.log("data.is_terdaftar", data.is_terdaftar); + console.log("data.is_pkp", data.is_pkp); + console.log("data.type_acc", data.type_acc); + + // Correct the typo in 'bussiness' to 'business' + if (data.type_acc === 'business') { + if (data.is_terdaftar === 'false') { + if (data.is_pkp === 'false') { + // Validation for is_pkp === 'false' + if (!data.business_name) { + ctx.addIssue({ + code: 'custom', + path: ['business_name'], + message: 'Nama perusahaan harus diisi', + }); + } + if (!data.company_type_id) { + ctx.addIssue({ + code: 'custom', + path: ['company_type_id'], + message: 'Badan usaha wajib dipilih', + }); + } + if (!data.industry_id) { + ctx.addIssue({ + code: 'custom', + path: ['industry_id'], + message: 'Jenis usaha harus dipilih', + }); + } + } else { + // Validation for is_pkp === 'true' or other values + const requiredFields: { field: keyof typeof data; message: string }[] = [ + { field: 'business_name', message: 'Nama perusahaan harus diisi' }, + { field: 'company_type_id', message: 'Badan usaha wajib dipilih' }, + { field: 'industry_id', message: 'Jenis usaha harus dipilih' }, + { field: 'sppkp_document', message: 'Document harus diisi' }, + { field: 'npwp_document', message: 'Document harus diisi' }, + { field: 'npwp', message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15 digit angka.' }, + { field: 'nama_wajib_pajak', message: 'Nama wajib pajak harus diisi' }, + ]; + + requiredFields.forEach(({ field, message }) => { + if (!data[field]) { + ctx.addIssue({ + code: 'custom', + path: [field], + message, + }); + } + }); + + // Email validation for `email_partner` + if (!data.email_partner || !z.string().email().safeParse(data.email_partner).success) { + ctx.addIssue({ + code: 'custom', + path: ['email_partner'], + message: 'Email partner harus diisi dengan format example@mail.com', + }); + } + } + }else{ + + } + + // Remove this unconditional issue addition to prevent blocking form submission + // ctx.addIssue({ + // code: 'custom', + // path: ['business_name'], + // message: 'Nama perusahaan harus diisi', + // }); + }else{ + + } + }); -- cgit v1.2.3 From ad3038d8902245ba0ec4122dc9795cda3906ba0e Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 26 Aug 2024 10:52:10 +0700 Subject: update new register handling validation --- src-migrate/validations/auth.ts | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index 69ea52e1..5cc3dc67 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -89,7 +89,46 @@ export const registerSchema = z } } }else{ - + if (data.is_pkp === 'false') { + // Validation for is_pkp === 'false' + if (!data.business_name) { + ctx.addIssue({ + code: 'custom', + path: ['business_name'], + message: 'Nama perusahaan harus diisi', + }); + } + } else { + // Validation for is_pkp === 'true' or other values + const requiredFields: { field: keyof typeof data; message: string }[] = [ + { field: 'business_name', message: 'Nama perusahaan harus diisi' }, + { field: 'company_type_id', message: 'Badan usaha wajib dipilih' }, + { field: 'industry_id', message: 'Jenis usaha harus dipilih' }, + { field: 'sppkp_document', message: 'Document harus diisi' }, + { field: 'npwp_document', message: 'Document harus diisi' }, + { field: 'npwp', message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15 digit angka.' }, + { field: 'nama_wajib_pajak', message: 'Nama wajib pajak harus diisi' }, + ]; + + requiredFields.forEach(({ field, message }) => { + if (!data[field]) { + ctx.addIssue({ + code: 'custom', + path: [field], + message, + }); + } + }); + + // Email validation for `email_partner` + if (!data.email_partner || !z.string().email().safeParse(data.email_partner).success) { + ctx.addIssue({ + code: 'custom', + path: ['email_partner'], + message: 'Email partner harus diisi dengan format example@mail.com', + }); + } + } } // Remove this unconditional issue addition to prevent blocking form submission -- cgit v1.2.3 From 54b6b618effc8416027ed884be1d6d37257c26c4 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 26 Aug 2024 11:59:57 +0700 Subject: update fungsion component --- src-migrate/validations/auth.ts | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index 5cc3dc67..443c0d80 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -27,15 +27,9 @@ export const registerSchema = z npwp: z.string().optional(), }) .superRefine((data, ctx) => { - console.log("data.is_terdaftar", data.is_terdaftar); - console.log("data.is_pkp", data.is_pkp); - console.log("data.type_acc", data.type_acc); - - // Correct the typo in 'bussiness' to 'business' if (data.type_acc === 'business') { if (data.is_terdaftar === 'false') { if (data.is_pkp === 'false') { - // Validation for is_pkp === 'false' if (!data.business_name) { ctx.addIssue({ code: 'custom', @@ -58,7 +52,6 @@ export const registerSchema = z }); } } else { - // Validation for is_pkp === 'true' or other values const requiredFields: { field: keyof typeof data; message: string }[] = [ { field: 'business_name', message: 'Nama perusahaan harus diisi' }, { field: 'company_type_id', message: 'Badan usaha wajib dipilih' }, @@ -79,7 +72,6 @@ export const registerSchema = z } }); - // Email validation for `email_partner` if (!data.email_partner || !z.string().email().safeParse(data.email_partner).success) { ctx.addIssue({ code: 'custom', @@ -90,7 +82,6 @@ export const registerSchema = z } }else{ if (data.is_pkp === 'false') { - // Validation for is_pkp === 'false' if (!data.business_name) { ctx.addIssue({ code: 'custom', @@ -99,33 +90,11 @@ export const registerSchema = z }); } } else { - // Validation for is_pkp === 'true' or other values - const requiredFields: { field: keyof typeof data; message: string }[] = [ - { field: 'business_name', message: 'Nama perusahaan harus diisi' }, - { field: 'company_type_id', message: 'Badan usaha wajib dipilih' }, - { field: 'industry_id', message: 'Jenis usaha harus dipilih' }, - { field: 'sppkp_document', message: 'Document harus diisi' }, - { field: 'npwp_document', message: 'Document harus diisi' }, - { field: 'npwp', message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15 digit angka.' }, - { field: 'nama_wajib_pajak', message: 'Nama wajib pajak harus diisi' }, - ]; - - requiredFields.forEach(({ field, message }) => { - if (!data[field]) { - ctx.addIssue({ - code: 'custom', - path: [field], - message, - }); - } - }); - - // Email validation for `email_partner` - if (!data.email_partner || !z.string().email().safeParse(data.email_partner).success) { + if (!data.business_name) { ctx.addIssue({ code: 'custom', - path: ['email_partner'], - message: 'Email partner harus diisi dengan format example@mail.com', + path: ['business_name'], + message: 'Nama perusahaan harus diisi', }); } } -- cgit v1.2.3 From 0b5f187f45e0bbf111e11a94415f20d5e34f7c5c Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Tue, 27 Aug 2024 14:51:14 +0700 Subject: update new field register --- src-migrate/validations/auth.ts | 76 +++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 25 deletions(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index 443c0d80..81d464f2 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -16,6 +16,8 @@ export const registerSchema = z }), type_acc: z.string().optional(), nama_wajib_pajak: z.string().optional(), + alamat_bisnis: z.string().optional(), + alamat_wajib_pajak: z.string().optional(), is_pkp: z.string(), is_terdaftar: z.string(), sppkp_document: z.string().optional(), @@ -24,36 +26,19 @@ export const registerSchema = z email_partner: z.string().optional(), business_name: z.string().optional(), company_type_id: z.string().optional(), - npwp: z.string().optional(), + isChekBox: z.string().optional(), + npwp: z.string().optional().refine((val) => !val || /^\d{15,16}$/.test(val), { + message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15-16 digit angka.', + }), }) .superRefine((data, ctx) => { if (data.type_acc === 'business') { if (data.is_terdaftar === 'false') { - if (data.is_pkp === 'false') { - if (!data.business_name) { - ctx.addIssue({ - code: 'custom', - path: ['business_name'], - message: 'Nama perusahaan harus diisi', - }); - } - if (!data.company_type_id) { - ctx.addIssue({ - code: 'custom', - path: ['company_type_id'], - message: 'Badan usaha wajib dipilih', - }); - } - if (!data.industry_id) { - ctx.addIssue({ - code: 'custom', - path: ['industry_id'], - message: 'Jenis usaha harus dipilih', - }); - } - } else { + if (data.is_pkp === 'true') { const requiredFields: { field: keyof typeof data; message: string }[] = [ { field: 'business_name', message: 'Nama perusahaan harus diisi' }, + { field: 'alamat_bisnis', message: 'Alamat perusahaan harus diisi' }, + // { field: 'alamat_wajib_pajak', message: 'Alamat wajib pajak harus diisi' }, { field: 'company_type_id', message: 'Badan usaha wajib dipilih' }, { field: 'industry_id', message: 'Jenis usaha harus dipilih' }, { field: 'sppkp_document', message: 'Document harus diisi' }, @@ -79,9 +64,50 @@ export const registerSchema = z message: 'Email partner harus diisi dengan format example@mail.com', }); } + if(data.isChekBox === 'false'){ + if (!data.alamat_wajib_pajak) { + ctx.addIssue({ + code: 'custom', + path: ['alamat_wajib_pajak'], + message: 'Alamat wajib pajak harus diisi', + }); + } + } + + } else { + if (!data.business_name) { + ctx.addIssue({ + code: 'custom', + path: ['business_name'], + message: 'Nama perusahaan harus diisi', + }); + } + if (!data.alamat_bisnis) { + ctx.addIssue({ + code: 'custom', + path: ['alamat_bisnis'], + message: 'Alamat perusahaan harus diisi', + }); + } + + if (!data.company_type_id) { + ctx.addIssue({ + code: 'custom', + path: ['company_type_id'], + message: 'Badan usaha wajib dipilih', + }); + } + if (!data.industry_id) { + ctx.addIssue({ + code: 'custom', + path: ['industry_id'], + message: 'Jenis usaha harus dipilih', + }); + } + } }else{ - if (data.is_pkp === 'false') { + if (data.is_pkp === 'true') { if (!data.business_name) { ctx.addIssue({ code: 'custom', -- cgit v1.2.3 From 3da0d5f55a0dc8b9c04cb271ea7d541c63c9e3a8 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Wed, 28 Aug 2024 11:57:18 +0700 Subject: update new register --- src-migrate/validations/auth.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index 81d464f2..e52853b6 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -43,7 +43,7 @@ export const registerSchema = z { field: 'industry_id', message: 'Jenis usaha harus dipilih' }, { field: 'sppkp_document', message: 'Document harus diisi' }, { field: 'npwp_document', message: 'Document harus diisi' }, - { field: 'npwp', message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15 digit angka.' }, + { field: 'npwp', message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15-16 digit angka.' }, { field: 'nama_wajib_pajak', message: 'Nama wajib pajak harus diisi' }, ]; @@ -104,6 +104,14 @@ export const registerSchema = z message: 'Jenis usaha harus dipilih', }); } + + if (data.npwp && !/^\d{15,16}$/.test(data.npwp)) { + ctx.addIssue({ + code: 'custom', + path: ['npwp'], + message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15-16 digit angka.', + }); + } } }else{ -- cgit v1.2.3 From a5821ad81683c8160d707fe980a282df644c3c0b Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Thu, 29 Aug 2024 16:32:01 +0700 Subject: add sppkp field --- src-migrate/validations/auth.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'src-migrate/validations') diff --git a/src-migrate/validations/auth.ts b/src-migrate/validations/auth.ts index e52853b6..3abdfb57 100644 --- a/src-migrate/validations/auth.ts +++ b/src-migrate/validations/auth.ts @@ -30,6 +30,7 @@ export const registerSchema = z npwp: z.string().optional().refine((val) => !val || /^\d{15,16}$/.test(val), { message: 'Format NPWP tidak valid, NPWP harus terdiri dari 15-16 digit angka.', }), + sppkp: z.string().optional(), }) .superRefine((data, ctx) => { if (data.type_acc === 'business') { -- cgit v1.2.3