summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorit-fixcomart <it@fixcomart.co.id>2025-03-19 10:07:25 +0700
committerit-fixcomart <it@fixcomart.co.id>2025-03-19 10:07:25 +0700
commit4f672d76536af35b6945693fd21a94d97d72ec30 (patch)
tree92745e0c0eca8c148f561ce4240a106c463b6d22
parentb261f7fd592965fe60fbfb8842d9769b96988573 (diff)
parent6a036ddb5daf9c3d1307059fcc6b4d41d0d566c6 (diff)
Merge branch 'new-release' into CR/renca-banner
-rw-r--r--src-migrate/modules/register/index.tsx7
-rw-r--r--src-migrate/types/auth.ts2
-rw-r--r--src-migrate/types/tempo.ts2
-rw-r--r--src/lib/address/components/EditAddress.jsx2
-rw-r--r--src/lib/checkout/components/CheckoutSection.jsx2
5 files changed, 11 insertions, 4 deletions
diff --git a/src-migrate/modules/register/index.tsx b/src-migrate/modules/register/index.tsx
index 39f4771c..06f7cbea 100644
--- a/src-migrate/modules/register/index.tsx
+++ b/src-migrate/modules/register/index.tsx
@@ -101,6 +101,13 @@ const Register = () => {
status: 'warning',
});
break;
+ case 'BISNIS_NOT_FOUND':
+ toast({
+ ...toastProps,
+ title: 'Bisnis tidak ditemukan',
+ status: 'warning',
+ });
+ break;
}
};
diff --git a/src-migrate/types/auth.ts b/src-migrate/types/auth.ts
index 1b400e95..f451ef75 100644
--- a/src-migrate/types/auth.ts
+++ b/src-migrate/types/auth.ts
@@ -30,7 +30,7 @@ export type RegisterProps = z.infer<typeof registerSchema>;
export type RegisterResApiProps = {
register: boolean;
- reason: 'EMAIL_USED' | 'NOT_ACTIVE' | null;
+ reason: 'EMAIL_USED' | 'NOT_ACTIVE' | 'BISNIS_NOT_FOUND' | null;
};
type ActivationResProps = {
diff --git a/src-migrate/types/tempo.ts b/src-migrate/types/tempo.ts
index 27b0c67e..880a30bb 100644
--- a/src-migrate/types/tempo.ts
+++ b/src-migrate/types/tempo.ts
@@ -85,7 +85,7 @@ export type TempoPropsDokumen = z.infer<typeof TempoSchemaDokumen>;
export type TempoResApiProps = {
Tempo: boolean;
- reason: 'EMAIL_USED' | 'NOT_ACTIVE' | null;
+ reason: 'EMAIL_USED' | 'NOT_ACTIVE' | 'BISNIS_NOT_FOUND' | null;
};
type ActivationResProps = {
diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx
index f9fe9785..ba6bd25b 100644
--- a/src/lib/address/components/EditAddress.jsx
+++ b/src/lib/address/components/EditAddress.jsx
@@ -38,7 +38,7 @@ const EditAddress = ({ id, defaultValues }) => {
useEffect(() => {
const loadProfile = async () => {
- const dataProfile = await addressApi({ id: auth.parentId });
+ const dataProfile = await addressApi({ id: auth.partnerId });
setValue('industry', dataProfile.industryId);
setValue('companyType', dataProfile.companyTypeId);
setValue('taxName', dataProfile.taxName);
diff --git a/src/lib/checkout/components/CheckoutSection.jsx b/src/lib/checkout/components/CheckoutSection.jsx
index 623152c6..c82e15c7 100644
--- a/src/lib/checkout/components/CheckoutSection.jsx
+++ b/src/lib/checkout/components/CheckoutSection.jsx
@@ -33,7 +33,7 @@ export const SectionAddress = ({ address, label, url }) => {
};
export const SectionValidation = ({ address }) =>
- address?.rajaongkirCityId == 0 && (
+ address?.stateId == 0 && (
<BottomPopup active={true} title='Update Alamat'>
<div className='leading-7 text-gray_r-12/80'>
Mohon untuk memperbarui alamat Anda dengan mengklik tombol di bawah ini.{' '}