diff options
| -rw-r--r-- | src-migrate/validations/tempo.ts | 8 | ||||
| -rw-r--r-- | src/lib/pengajuan-tempo/component/Pengiriman.jsx | 39 |
2 files changed, 26 insertions, 21 deletions
diff --git a/src-migrate/validations/tempo.ts b/src-migrate/validations/tempo.ts index cf5914b5..46ac1ef1 100644 --- a/src-migrate/validations/tempo.ts +++ b/src-migrate/validations/tempo.ts @@ -122,8 +122,12 @@ export const TempoSchemaPengiriman = z.object({ zipInvoice: z.string().min(1, { message: 'Kode pos harus diisi' }), isSameAddrees: z.string(), isSameAddreesStreet: z.string(), - tukarInvoiceInput: z.string().optional(), - tukarInvoiceInputPembayaran: z.string().optional(), + tukarInvoiceInput: z + .string() + .min(1, { message: 'Jadwal Penukaran Invoice Harus Diisi' }), + tukarInvoiceInputPembayaran: z + .string() + .min(1, { message: 'Jadwal Pembayaran Harus Diisi' }), dokumenPengiriman: z.string().optional(), dokumenPengirimanInput: z.string().optional(), dokumenKirimInput: z.string().optional(), diff --git a/src/lib/pengajuan-tempo/component/Pengiriman.jsx b/src/lib/pengajuan-tempo/component/Pengiriman.jsx index fcfa7e1e..bbf22345 100644 --- a/src/lib/pengajuan-tempo/component/Pengiriman.jsx +++ b/src/lib/pengajuan-tempo/component/Pengiriman.jsx @@ -1052,9 +1052,7 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { <HookFormSelect {...props} options={zips} - disabled={ - sameAddressStreet - } + disabled={sameAddressStreet} placeholder='Zip' /> ) : ( @@ -1065,9 +1063,7 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { ref={zipRef} placeholder='Kode Pos' type='number' - disabled={ - sameAddressStreet - } + disabled={sameAddressStreet} value={formPengiriman.zipPengiriman} className='form-input' onChange={handleInputChange} @@ -1322,9 +1318,7 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { <HookFormSelect {...props} options={zipsInvoice} - disabled={ - sameAddress - } + disabled={sameAddress} placeholder='Zip' /> ) : ( @@ -1334,9 +1328,7 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { ref={zipInvoiceRef} placeholder='Kode Pos' type='number' - disabled={ - sameAddress - } + disabled={sameAddress} value={formPengiriman.zipInvoice} className='form-input' onChange={handleInputChange} @@ -1361,11 +1353,11 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { <div className='w-2/5'> <label className='form-label text-wrap'> Jadwal Penukaran Invoice{' '} - <span className=' opacity-60'>(Opsional)</span> + <span className=' opacity-60'>(Wajib Diisi)</span> </label> {!isKonfirmasi && ( <span className='text-xs opacity-60'> - isi jika perusahaan anda memiliki jadwal penukaran invoice + isi jadwal penukaran invoice </span> )} </div> @@ -1380,7 +1372,13 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { rows={4} cols={40} onChange={handleInputChange} + required /> + {chekValid && ( + <div className='text-caption-2 text-danger-500 mt-1'> + {errorsPengiriman.tukarInvoiceInput} + </div> + )} </div> </div> @@ -1388,11 +1386,11 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { <div className='w-2/5'> <label className='form-label text-nowrap'> Jadwal Pembayaran{' '} - <span className=' opacity-60'>(Opsional)</span> + <span className=' opacity-60'>(Wajib Diisi)</span> </label> {!isKonfirmasi && ( <span className='text-xs opacity-60'> - isi jika perusahaan anda memiliki jadwal pembayaran + isi jadwal pembayaran </span> )} </div> @@ -1406,7 +1404,13 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { rows={4} cols={40} onChange={handleInputChange} + required /> + {chekValid && ( + <div className='text-caption-2 text-danger-500 mt-1'> + {errorsPengiriman.tukarInvoiceInputPembayaran} + </div> + )} </div> </div> @@ -1601,7 +1605,6 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { )} </div> </div> - </div> </form> </div> @@ -2330,8 +2333,6 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => { </div> <div className='w-2/5'></div> </div> - - </div> </form> </div> |