@atomsolution/sdk-merchant 1.6.13 → 1.7.0

package/dist/merchant-profile/MerchantRegistrationForm/AddressFields.d.ts

@@ -10,7 +10,7 @@ interface AddressFieldsProps {
     formData: MerchantFormData;
     onInputChange: (field: keyof MerchantFormData, value: string) => void;
     errors?: Partial<Record<keyof MerchantFormData, string>>;
-    lang?: "vi" | "en";
+    lang?: 'vi' | 'en';
 }
 export declare const AddressFields: React.FC<AddressFieldsProps>;
 export {};

package/dist/merchant-profile/MerchantRegistrationForm/MerchantRegistrationForm.d.ts

@@ -1,7 +1,7 @@
 import { default as React } from 'react';
 import { FormData } from '../types/formData';
 interface SubmitPayload {
-    entity_type: "PERSON" | "BUSINESS_HOUSEHOLD" | "ENTERPRISE";
+    entity_type: 'PERSON' | 'BUSINESS_HOUSEHOLD' | 'ENTERPRISE';
     tax_code: string;
     full_name: string;
     brand_name?: string;
@@ -31,7 +31,7 @@ interface MerchantRegistrationFormProps {
     className?: string;
     merchantId?: string;
     isHeader?: boolean;
-    lang?: "vi" | "en";
+    lang?: 'vi' | 'en';
 }
 export declare const MerchantRegistrationForm: React.FC<MerchantRegistrationFormProps>;
 export {};

package/dist/merchant-profile/hooks/use-address.d.ts

@@ -4,6 +4,8 @@ interface AddressState {
     cities: City[];
     districts: District[];
     wards: Ward[];
+    newCities: City[];
+    newWards: Ward[];
 }
 export declare const useAddress: (countryCode: string, cityCode: string, districtCode: string) => AddressState;
 export {};

package/dist/merchant-profile/services/addressService.d.ts

@@ -7,4 +7,6 @@ export declare const getCountries: () => Promise<LocationOption[]>;
 export declare const getCities: (countryCode: string) => Promise<LocationOption[]>;
 export declare const getDistricts: (cityId: string) => Promise<LocationOption[]>;
 export declare const getWards: (districtId: string) => Promise<LocationOption[]>;
+export declare const getNewCities: () => Promise<LocationOption[]>;
+export declare const getNewWards: (cityId: string) => Promise<LocationOption[]>;
 export {};

package/dist/merchant-profile.cjs

@@ -53,8 +53,8 @@ var __async = (__this, __arguments, generator) => {
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("./jsx-runtime-DV8UmLi4.cjs");
 const React = require("react");
-const dropdownMenuAbsolute = require("./dropdownMenuAbsolute-CkZt6He5.cjs");
-const useTranslation = require("./use-translation-DYlHWZXS.cjs");
+const dropdownMenuAbsolute = require("./dropdownMenuAbsolute-DQsYN_8b.cjs");
+const useTranslation = require("./use-translation-D7LoHT4I.cjs");
 const usePortalApiConfig_store = require("./use-portal-api-config.store-C8a2gebE.cjs");
 const axios = require("axios");
 var runtime = { exports: {} };
@@ -1342,7 +1342,7 @@ const portalAxiosClient = axios.create({
   timeout: 1e4
 });
 portalAxiosClient.interceptors.request.use((config) => {
-  const baseURL = usePortalApiConfig_store.usePortalApiConfig.getState().baseURL;
+  const baseURL = void 0;
   const accessToken = usePortalApiConfig_store.usePortalApiConfig.getState().accessToken;
   config.baseURL = baseURL;
   if (!config.headers.Authorization) {
@@ -1377,27 +1377,38 @@ const getWards = (districtId) => __async(exports, null, function* () {
   });
   return data.data;
 });
+const getNewCities = () => __async(exports, null, function* () {
+  const { data } = yield portalAxiosClient.get("/address/new-city", {
+    params: { page_size: -1 }
+  });
+  return data.data;
+});
+const getNewWards = (cityId) => __async(exports, null, function* () {
+  const { data } = yield portalAxiosClient.get("/address/new-ward", {
+    params: { city_id: cityId, page_size: -1 }
+  });
+  return data.data;
+});
 const useAddress = (countryCode, cityCode, districtCode) => {
   const [countries, setCountries] = React.useState([]);
   const [cities, setCities] = React.useState([]);
   const [districts, setDistricts] = React.useState([]);
   const [wards, setWards] = React.useState([]);
+  const [newCities, setNewCities] = React.useState([]);
+  const [newWards, setNewWards] = React.useState([]);
   const resetCities = React.useCallback(() => setCities([]), []);
   const resetDistricts = React.useCallback(() => setDistricts([]), []);
   const resetWards = React.useCallback(() => setWards([]), []);
+  const resetNewWards = React.useCallback(() => setNewWards([]), []);
   React.useEffect(() => {
     let active = true;
     const fetchCountries = () => __async(exports, null, function* () {
       try {
         const data = yield getCountries();
-        if (active) {
-          setCountries(data);
-        }
+        if (active) setCountries(data);
       } catch (error) {
         console.error("Failed to fetch countries:", error);
-        if (active) {
-          setCountries([]);
-        }
+        if (active) setCountries([]);
       }
     });
     if (countries.length === 0) {
@@ -1407,6 +1418,22 @@ const useAddress = (countryCode, cityCode, districtCode) => {
       active = false;
     };
   }, []);
+  React.useEffect(() => {
+    let active = true;
+    const fetchNewCities = () => __async(exports, null, function* () {
+      try {
+        const data = yield getNewCities();
+        if (active) setNewCities(data);
+      } catch (error) {
+        console.error("Failed to fetch new cities:", error);
+        if (active) setNewCities([]);
+      }
+    });
+    fetchNewCities();
+    return () => {
+      active = false;
+    };
+  }, []);
   React.useEffect(() => {
     let active = true;
     const fetchCities = () => __async(exports, null, function* () {
@@ -1473,14 +1500,10 @@ const useAddress = (countryCode, cityCode, districtCode) => {
       }
       try {
         const data = yield getWards(districtCode);
-        if (active) {
-          setWards(data);
-        }
+        if (active) setWards(data);
       } catch (error) {
         console.error("Failed to fetch wards:", error);
-        if (active) {
-          setWards([]);
-        }
+        if (active) setWards([]);
       }
     });
     fetchWards();
@@ -1488,11 +1511,33 @@ const useAddress = (countryCode, cityCode, districtCode) => {
       active = false;
     };
   }, [districtCode, resetWards]);
+  React.useEffect(() => {
+    let active = true;
+    const fetchNewWards = () => __async(exports, null, function* () {
+      if (!cityCode || cityCode.trim() === "") {
+        resetNewWards();
+        return;
+      }
+      try {
+        const data = yield getNewWards(cityCode);
+        if (active) setNewWards(data);
+      } catch (error) {
+        console.error("Failed to fetch new wards:", error);
+        if (active) setNewWards([]);
+      }
+    });
+    fetchNewWards();
+    return () => {
+      active = false;
+    };
+  }, [cityCode, resetNewWards]);
   return {
     countries,
     cities,
     districts,
-    wards
+    wards,
+    newCities,
+    newWards
   };
 };
 const AddressFields$2 = ({
@@ -1502,7 +1547,7 @@ const AddressFields$2 = ({
   lang = "vi"
 }) => {
   const { translate } = useTranslation.useTranslation("form", lang);
-  const { countries, cities, districts, wards } = useAddress(
+  const { countries, newCities, newWards } = useAddress(
     formData.country,
     formData.city,
     formData.district
@@ -1524,19 +1569,7 @@ const AddressFields$2 = ({
       label: "city",
       name: "city",
       value: formData.city,
-      options: cities.map((item) => {
-        var _a;
-        return {
-          value: (_a = item.id) != null ? _a : "",
-          label: item.name
-        };
-      })
-    },
-    {
-      label: "district",
-      name: "district",
-      value: formData.district,
-      options: districts.map((item) => {
+      options: newCities.map((item) => {
         var _a;
         return {
           value: (_a = item.id) != null ? _a : "",
@@ -1548,7 +1581,7 @@ const AddressFields$2 = ({
       label: "ward",
       name: "ward",
       value: formData.ward,
-      options: wards.map((item) => {
+      options: newWards.map((item) => {
         var _a;
         return {
           value: (_a = item.id) != null ? _a : "",
@@ -1559,7 +1592,7 @@ const AddressFields$2 = ({
   ];
   return /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs("div", { className: "space-y-2", children: [
     /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("h3", { className: "text-sm font-semibold font-inter leading-[18px] tracking-normal text-[#2C2C2C]", children: translate("address") }),
-    /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("div", { className: "grid grid-cols-2 gap-2", children: selects.map((select) => /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs("div", { className: "relative w-full", children: [
+    /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("div", { className: "flex flex-col gap-2", children: selects.map((select) => /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs("div", { className: "relative w-full", children: [
       /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs(
         "select",
         {
@@ -1602,7 +1635,7 @@ const AddressFields$2 = ({
         value: formData.address,
         onChange: (e) => onInputChange("address", e.target.value),
         placeholder: translate("street"),
-        className: `w-full px-3 py-3 border hover:ring-2 hover:ring-blue-900 ${(errors == null ? void 0 : errors.address) ? "border-red-500" : "border-[#E4E7EC]"} rounded-md text-[#6B7280] font-inter text-sm font-normal leading-[18px] tracking-normal `
+        className: `w-full px-3 py-3 border hover:ring-2 hover:ring-blue-900 ${(errors == null ? void 0 : errors.address) ? "border-red-500" : "border-[#E4E7EC]"} rounded-md text-[#6B7280] font-inter text-sm font-normal leading-[18px] tracking-normal`
       }
     ),
     (errors == null ? void 0 : errors.address) && /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("p", { className: "text-red-500 text-xs mt-1", children: errors.address })
@@ -2472,17 +2505,18 @@ const MerchantRegistrationForm = ({
   const [showSuccessModal, setShowSuccessModal] = React.useState(false);
   const [showErrorModal, setShowErrorModal] = React.useState(false);
   const [errorMessage, setErrorMessage] = React.useState("");
-  const {
-    submit: createMerchant2
-  } = useCreateMerchant();
+  const { submit: createMerchant2 } = useCreateMerchant();
+  React.useEffect(() => {
+    if (accessToken) {
+      usePortalApiConfig_store.usePortalApiConfig.setState({ accessToken });
+    }
+  }, [accessToken]);
   const generateRandomData = () => {
     const characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
     const referralCode = Array.from({ length: 8 }).map(
       () => characters.charAt(Math.floor(Math.random() * characters.length))
     ).join("");
-    return {
-      referralCode: `${referralCode}`
-    };
+    return { referralCode };
   };
   React.useEffect(() => {
     const randomData = generateRandomData();
@@ -2665,8 +2699,7 @@ const MerchantRegistrationForm = ({
       }
     } catch (err) {
       console.error("Submit error details:", { error: err });
-      let displayMessage = translate("submit_error");
-      setErrorMessage(displayMessage);
+      setErrorMessage(translate("submit_error"));
       setShowErrorModal(true);
       onError == null ? void 0 : onError(err);
     }
@@ -2714,7 +2747,7 @@ const MerchantRegistrationForm = ({
                           "userType",
                           e.target.value
                         ),
-                        className: "w-4 h-4 text-blue-600 "
+                        className: "w-4 h-4 text-blue-600"
                       }
                     ),
                     /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx("span", { className: "text-sm text-[#2C2C2C]", children: option.label })