@atomsolution/sdk-merchant 1.6.13 → 1.7.0

package/dist/merchant-profile.esm.js

@@ -51,8 +51,8 @@ var __async = (__this, __arguments, generator) => {
 };
 import { j as jsxRuntimeExports } from "./jsx-runtime-ClP9nxnW.js";
 import { useState, useCallback, useEffect, useRef, memo, useMemo } from "react";
-import { c as commonjsRequire, g as getDefaultExportFromCjs, B as Button, D as DropdownMenu, u as useMediaQuery, T as TableSkeleton, R as ReusableTable, a as DropdownMenuAbsolute } from "./dropdownMenuAbsolute-BP6Ub_KP.js";
-import { u as useTranslation } from "./use-translation-C4KiJlNu.js";
+import { c as commonjsRequire, g as getDefaultExportFromCjs, B as Button, D as DropdownMenu, u as useMediaQuery, T as TableSkeleton, R as ReusableTable, a as DropdownMenuAbsolute } from "./dropdownMenuAbsolute-D9T3Cxw8.js";
+import { u as useTranslation } from "./use-translation-CpsANKUQ.js";
 import { u as usePortalApiConfig } from "./use-portal-api-config.store-C1UTTpK9.js";
 import axios from "axios";
 var runtime = { exports: {} };
@@ -1340,7 +1340,7 @@ const portalAxiosClient = axios.create({
   timeout: 1e4
 });
 portalAxiosClient.interceptors.request.use((config) => {
-  const baseURL = usePortalApiConfig.getState().baseURL;
+  const baseURL = void 0;
   const accessToken = usePortalApiConfig.getState().accessToken;
   config.baseURL = baseURL;
   if (!config.headers.Authorization) {
@@ -1375,27 +1375,38 @@ const getWards = (districtId) => __async(void 0, null, function* () {
   });
   return data.data;
 });
+const getNewCities = () => __async(void 0, null, function* () {
+  const { data } = yield portalAxiosClient.get("/address/new-city", {
+    params: { page_size: -1 }
+  });
+  return data.data;
+});
+const getNewWards = (cityId) => __async(void 0, 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] = useState([]);
   const [cities, setCities] = useState([]);
   const [districts, setDistricts] = useState([]);
   const [wards, setWards] = useState([]);
+  const [newCities, setNewCities] = useState([]);
+  const [newWards, setNewWards] = useState([]);
   const resetCities = useCallback(() => setCities([]), []);
   const resetDistricts = useCallback(() => setDistricts([]), []);
   const resetWards = useCallback(() => setWards([]), []);
+  const resetNewWards = useCallback(() => setNewWards([]), []);
   useEffect(() => {
     let active = true;
     const fetchCountries = () => __async(void 0, 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) {
@@ -1405,6 +1416,22 @@ const useAddress = (countryCode, cityCode, districtCode) => {
       active = false;
     };
   }, []);
+  useEffect(() => {
+    let active = true;
+    const fetchNewCities = () => __async(void 0, 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;
+    };
+  }, []);
   useEffect(() => {
     let active = true;
     const fetchCities = () => __async(void 0, null, function* () {
@@ -1471,14 +1498,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();
@@ -1486,11 +1509,33 @@ const useAddress = (countryCode, cityCode, districtCode) => {
       active = false;
     };
   }, [districtCode, resetWards]);
+  useEffect(() => {
+    let active = true;
+    const fetchNewWards = () => __async(void 0, 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 = ({
@@ -1500,7 +1545,7 @@ const AddressFields$2 = ({
   lang = "vi"
 }) => {
   const { translate } = useTranslation("form", lang);
-  const { countries, cities, districts, wards } = useAddress(
+  const { countries, newCities, newWards } = useAddress(
     formData.country,
     formData.city,
     formData.district
@@ -1522,19 +1567,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 : "",
@@ -1546,7 +1579,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 : "",
@@ -1557,7 +1590,7 @@ const AddressFields$2 = ({
   ];
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-2", children: [
     /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-sm font-semibold font-inter leading-[18px] tracking-normal text-[#2C2C2C]", children: translate("address") }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "grid grid-cols-2 gap-2", children: selects.map((select) => /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative w-full", children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex flex-col gap-2", children: selects.map((select) => /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative w-full", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsxs(
         "select",
         {
@@ -1600,7 +1633,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__ */ jsxRuntimeExports.jsx("p", { className: "text-red-500 text-xs mt-1", children: errors.address })
@@ -2470,17 +2503,18 @@ const MerchantRegistrationForm = ({
   const [showSuccessModal, setShowSuccessModal] = useState(false);
   const [showErrorModal, setShowErrorModal] = useState(false);
   const [errorMessage, setErrorMessage] = useState("");
-  const {
-    submit: createMerchant2
-  } = useCreateMerchant();
+  const { submit: createMerchant2 } = useCreateMerchant();
+  useEffect(() => {
+    if (accessToken) {
+      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 };
   };
   useEffect(() => {
     const randomData = generateRandomData();
@@ -2663,8 +2697,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);
     }
@@ -2712,7 +2745,7 @@ const MerchantRegistrationForm = ({
                           "userType",
                           e.target.value
                         ),
-                        className: "w-4 h-4 text-blue-600 "
+                        className: "w-4 h-4 text-blue-600"
                       }
                     ),
                     /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-sm text-[#2C2C2C]", children: option.label })