Merge branch 'new-release' into CR/renca-tempo

3 files changed, 11 insertions, 15 deletions

diff --git a/src-migrate/validations/tempo.ts b/src-migrate/validations/tempo.ts
index dad26c5a..e39f0f8b 100644
--- a/src-migrate/validations/tempo.ts
+++ b/src-migrate/validations/tempo.ts
@@ -8,7 +8,7 @@ export const TempoSchema = z.object({
   state: z.string().min(1, { message: 'Provinsi harus dipilih' }),
   city: z.string().min(1, { message: 'Kota harus dipilih' }),
   district: z.string().min(1, { message: 'Kecamatan harus dipilih' }),
-  subDistrict: z.string().min(1, { message: 'Kelurahan harus dipilih' }),
+  subDistrict: z.string().optional(),
   mobile: z
     .string()
     .min(1, { message: 'Nomor telepon harus diisi' })
@@ -94,9 +94,7 @@ export const TempoSchemaPengiriman = z.object({
   statePengiriman: z.string().min(1, { message: 'Provinsi harus dipilih' }),
   cityPengiriman: z.string().min(1, { message: 'Kota harus dipilih' }),
   districtPengiriman: z.string().min(1, { message: 'Kecamatan harus dipilih' }),
-  subDistrictPengiriman: z
-    .string()
-    .min(1, { message: 'Kelurahan harus dipilih' }),
+  subDistrictPengiriman: z.string().optional(),
   zipPengiriman: z.string().min(1, { message: 'Kode pos harus diisi' }),
   PICBarangMobile: z
     .string()
@@ -120,9 +118,7 @@ export const TempoSchemaPengiriman = z.object({
   districtInvoice: z
     .string()
     .min(1, { message: 'Kecamatan invoice harus dipilih' }),
-  subDistrictInvoice: z
-    .string()
-    .min(1, { message: 'Kelurahan invoice harus dipilih' }),
+  subDistrictInvoice: z.string().optional(),
   zipInvoice: z.string().min(1, { message: 'Kode pos harus diisi' }),
   isSameAddrees: z.string(),
   isSameAddreesStreet: z.string(),
diff --git a/src/lib/pengajuan-tempo/component/Pengiriman.jsx b/src/lib/pengajuan-tempo/component/Pengiriman.jsx
index 52376f61..fcfa7e1e 100644
--- a/src/lib/pengajuan-tempo/component/Pengiriman.jsx
+++ b/src/lib/pengajuan-tempo/component/Pengiriman.jsx
@@ -1053,7 +1053,7 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => {
                                     {...props}
                                     options={zips}
                                     disabled={
-                                      !watchsubDistrict || sameAddressStreet
+                                      sameAddressStreet
                                     }
                                     placeholder='Zip'
                                   />
@@ -1066,7 +1066,7 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => {
                                     placeholder='Kode Pos'
                                     type='number'
                                     disabled={
-                                      !watchsubDistrict || sameAddressStreet
+                                      sameAddressStreet
                                     }
                                     value={formPengiriman.zipPengiriman}
                                     className='form-input'
@@ -1323,7 +1323,7 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => {
                                     {...props}
                                     options={zipsInvoice}
                                     disabled={
-                                      !watchsubDistrictInvoice || sameAddress
+                                      sameAddress
                                     }
                                     placeholder='Zip'
                                   />
@@ -1335,7 +1335,7 @@ const Pengiriman = ({ chekValid, buttonSubmitClick, isKonfirmasi }) => {
                                     placeholder='Kode Pos'
                                     type='number'
                                     disabled={
-                                      !watchsubDistrictInvoice || sameAddress
+                                      sameAddress
                                     }
                                     value={formPengiriman.zipInvoice}
                                     className='form-input'
diff --git a/src/lib/pengajuan-tempo/component/informasiPerusahaan.jsx b/src/lib/pengajuan-tempo/component/informasiPerusahaan.jsx
index 4e99f9f5..4898a3f8 100644
--- a/src/lib/pengajuan-tempo/component/informasiPerusahaan.jsx
+++ b/src/lib/pengajuan-tempo/component/informasiPerusahaan.jsx
@@ -782,7 +782,7 @@ const InformasiPerusahaan = ({
                                 <HookFormSelect
                                   {...props}
                                   options={zips}
-                                  disabled={!watchsubDistrict}
+                                  // disabled={!watchsubDistrict}
                                   placeholder='Zip'
                                 />
                               ) : (
@@ -793,7 +793,7 @@ const InformasiPerusahaan = ({
                                   ref={zipRef}
                                   placeholder='Kode Pos'
                                   type='number'
-                                  disabled={!watchsubDistrict}
+                                  // disabled={!watchsubDistrict}
                                   value={form.zip}
                                   className='form-input'
                                   onChange={handleInputChange}
@@ -1333,7 +1333,7 @@ const InformasiPerusahaan = ({
                               <HookFormSelect
                                 {...props}
                                 options={zips}
-                                disabled={!watchsubDistrict}
+                                // disabled={!watchsubDistrict}
                                 placeholder='Zip'
                               />
                             ) : (
@@ -1344,7 +1344,7 @@ const InformasiPerusahaan = ({
                                 ref={zipRef}
                                 placeholder='Kode Pos'
                                 type='number'
-                                disabled={!watchsubDistrict}
+                                // disabled={!watchsubDistrict}
                                 value={form.zip}
                                 className='form-input'
                                 onChange={handleInputChange}