diff --git a/src/api/cart.ts b/src/api/cart.ts index de3f0707..a497a51d 100644 --- a/src/api/cart.ts +++ b/src/api/cart.ts @@ -16,7 +16,7 @@ const payCart = async (): Promise<[UserAccount | null, string?]> => { return [payCartResponse]; } catch (nativeError) { - const [error] = parseAxiosError(nativeError); + const error = parseAxiosError(nativeError); return [null, `Не удалось оплатить товар из корзины. ${error}`]; } diff --git a/src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx b/src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx index afc82b42..84acfb08 100644 --- a/src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx +++ b/src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx @@ -430,7 +430,7 @@ export const AmoCRMModal: FC = ({ isModalOpen, handleClo /> ) : ( <> - {isTryRemoveAccount && setIsTryRemoveAccount(false)} />} + {isTryRemoveAccount && setIsTryRemoveAccount(false)} />} {isSettingsBlock && ( = ({ isModalOpen, handleClo }; export const diffArr = (arr_A: MinifiedData[], arr_B: MinifiedData[]) => { - console.log("arr_A", arr_A) - console.log("arr_B", arr_B) return arr_A.filter(person_A => !arr_B.some(person_B => person_A.id === person_B.id)); } \ No newline at end of file diff --git a/src/pages/IntegrationsPage/IntegrationsModal/AmoRemoveAccount/AmoRemoveAccount.tsx b/src/pages/IntegrationsPage/IntegrationsModal/AmoRemoveAccount/AmoRemoveAccount.tsx index 032ed4c2..0547a7b2 100644 --- a/src/pages/IntegrationsPage/IntegrationsModal/AmoRemoveAccount/AmoRemoveAccount.tsx +++ b/src/pages/IntegrationsPage/IntegrationsModal/AmoRemoveAccount/AmoRemoveAccount.tsx @@ -6,11 +6,13 @@ import { enqueueSnackbar } from "notistack"; interface Props { stopThisPage: () => void; + handleCloseModal: () => void; } export const AmoRemoveAccount: FC = ({ stopThisPage, + handleCloseModal, }: Props) => { const theme = useTheme(); @@ -20,7 +22,7 @@ export const AmoRemoveAccount: FC = ({ if (error) { enqueueSnackbar(error) } else { - stopThisPage() + handleCloseModal() } }; diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx index 81de8455..c93051ca 100644 --- a/src/pages/Tariffs/Tariffs.tsx +++ b/src/pages/Tariffs/Tariffs.tsx @@ -134,6 +134,7 @@ function TariffPage() { //Если нам хватает денежек - покупаем тариф const [data, payError] = await cartApi.pay(); + console.log(payError) if (payError || !data) { //если денег не хватило @@ -427,7 +428,8 @@ export const inCart = () => { }; const outCart = (cart: string[]) => { //Сделаем муторно и подольше, зато при прерывании сессии данные потеряются минимально - cart.forEach(async (id: string) => { + if (cart.length > 0) { + cart.forEach(async (id: string) => { const [_, deleteError] = await cartApi.delete(id); if (deleteError) { @@ -437,7 +439,14 @@ const outCart = (cart: string[]) => { } let saveCart = JSON.parse(localStorage.getItem("saveCart") || "[]") || []; + console.log("saveCart") + console.log(saveCart) + if (!Array.isArray(saveCart)) saveCart = [] + console.log("saveCart") + console.log(saveCart) saveCart = saveCart.push(id); localStorage.setItem("saveCart", JSON.stringify(saveCart)); }); + } + }; diff --git a/src/utils/parse-error.ts b/src/utils/parse-error.ts index 4a08892d..af94459d 100644 --- a/src/utils/parse-error.ts +++ b/src/utils/parse-error.ts @@ -25,9 +25,15 @@ const translateMessage: Record = { export const parseAxiosError = (nativeError: unknown): [string, number?] => { const error = nativeError as AxiosError; console.error(error); - if (process.env.NODE_ENV !== "production") console.error(error); + // if (process.env.NODE_ENV !== "production") console.error(error); if (error.message === "Failed to fetch") return ["Ошибка сети"]; + //ДЛЯ ОПЛАТЫ ТАРИФА + if(error.response.status === 402) { + console.log(error.response?.data.message) + return error.response?.data.message + } + if (error.response?.data) { const serverError = error.response.data as ServerError; let SEMessage;