From 9b22da67a1a397ca43ff80abb8ef4bbefef9b448 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Wed, 5 Mar 2025 10:35:33 +0700 Subject: CR renca telepon tempo --- .../register/stores/usePengajuanTempoStore.ts | 2 + src-migrate/types/tempo.ts | 2 + src-migrate/validations/tempo.ts | 12 +++ .../pengajuan-tempo/component/PengajuanTempo.jsx | 10 +- src/lib/pengajuan-tempo/component/Pengiriman.jsx | 117 +++++++++++++++++++++ 5 files changed, 138 insertions(+), 5 deletions(-) diff --git a/src-migrate/modules/register/stores/usePengajuanTempoStore.ts b/src-migrate/modules/register/stores/usePengajuanTempoStore.ts index 1e086c06..5f6e4974 100644 --- a/src-migrate/modules/register/stores/usePengajuanTempoStore.ts +++ b/src-migrate/modules/register/stores/usePengajuanTempoStore.ts @@ -186,6 +186,8 @@ export const usePengajuanTempoStorePengiriman = create< districtPengiriman: '', subDistrictPengiriman: '', zipPengiriman: '', + PICBarangMobile: '', + invoicePicMobile: '', invoicePicTittle: '', invoicePic: '', isSameAddrees: '', diff --git a/src-migrate/types/tempo.ts b/src-migrate/types/tempo.ts index d043e2d6..f28cfdef 100644 --- a/src-migrate/types/tempo.ts +++ b/src-migrate/types/tempo.ts @@ -42,6 +42,8 @@ export type tempoPropsPengiriman = { cityPengiriman: string; streetInvoice: string; zip: string; + PICBarangMobile: string; + invoicePicMobile: string; invoicePic: string; isSameAddrees: string; stateInvoice: string; diff --git a/src-migrate/validations/tempo.ts b/src-migrate/validations/tempo.ts index f019275c..4dc810a1 100644 --- a/src-migrate/validations/tempo.ts +++ b/src-migrate/validations/tempo.ts @@ -77,6 +77,18 @@ export const TempoSchemaPengiriman = z.object({ .string() .min(1, { message: 'Kelurahan harus dipilih' }), zipPengiriman: z.string().min(1, { message: 'Kode pos harus diisi' }), + PICBarangMobile: z + .string() + .min(1, { message: 'Nomor telepon harus diisi' }) + .refine((val) => /^\d{10,12}$/.test(val), { + message: 'Format nomor telepon tidak valid, contoh: 081234567890', + }), + invoicePicMobile: z + .string() + .min(1, { message: 'Nomor telepon harus diisi' }) + .refine((val) => /^\d{10,12}$/.test(val), { + message: 'Format nomor telepon tidak valid, contoh: 081234567890', + }), invoicePicTittle: z.string().min(1, { message: 'Tittle harus dipilih' }), invoicePic: z.string().min(1, { message: 'Nama pic invoice harus diisi' }), streetInvoice: z.string().min(1, { message: 'Alamat invoice harus diisi' }), diff --git a/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx b/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx index c577aa41..0db5b371 100644 --- a/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx +++ b/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx @@ -67,6 +67,11 @@ const PengajuanTempo = () => { const [notValid, setNotValid] = useState(false); const [buttonSubmitClick, setButtonSubmitClick] = useState(false); const stepDivs = [ + , { chekValid={notValid} buttonSubmitClick={buttonSubmitClick} />, - , { const districtPengirimanRef = useRef(null); const subDistrictPengirimanRef = useRef(null); const zipRef = useRef(null); + const PICBarangMobileRef = useRef(null); const invoicePicRef = useRef(null); + const invoicePicMobileRef = useRef(null); const streetInvoiceRef = useRef(null); const stateInvoiceRef = useRef(null); const cityInvoiceRef = useRef(null); @@ -366,10 +368,18 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { zipRef.current.scrollIntoView(options); return; } + if (errorsPengiriman.PICBarangMobile && PICBarangMobileRef.current) { + PICBarangMobileRef.current.scrollIntoView(options); + return; + } if (errorsPengiriman.invoicePic && invoicePicRef.current) { invoicePicRef.current.scrollIntoView(options); return; } + if (errorsPengiriman.invoicePicMobile && invoicePicMobileRef.current) { + invoicePicMobileRef.current.scrollIntoView(options); + return; + } if (errorsPengiriman.streetInvoice && streetInvoiceRef.current) { streetInvoiceRef.current.scrollIntoView(options); return; @@ -800,6 +810,38 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { +
+
+ + {!isKonfirmasi && ( + + isi nomor PIC penerimaan barang yang bertanggung jawab di + perusahaan anda + + )} +
+
+ + {chekValid && ( +
+ {errorsPengiriman.PICBarangMobile} +
+ )} +
+
+
+ +
+
+ +
+ +
+ {chekValid && ( +
+ {errorsPengiriman.invoicePicMobile} +
+ )} +
+
+
+ +
+ +
+ {chekValid && ( +
+ {errorsPengiriman.PICBarangMobile} +
+ )} +
+
+
+
+ +
+ +
+ {chekValid && ( +
+ {errorsPengiriman.PICBarangMobile} +
+ )} +
+