Merge branch 'dev' into 'staging'

Dev

See merge request frontend/squiz!353

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}`];
   }

src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx

@@ -430,7 +430,7 @@ export const AmoCRMModal: FC<IntegrationsModalProps> = ({ isModalOpen, handleClo
               />
             ) : (
               <>
-                {isTryRemoveAccount && <AmoRemoveAccount stopThisPage={() => setIsTryRemoveAccount(false)} />}
+                {isTryRemoveAccount && <AmoRemoveAccount handleCloseModal={handleCloseModal} stopThisPage={() => setIsTryRemoveAccount(false)} />}
                 {isSettingsBlock && (
                   <Box sx={{ flexGrow: 1, width: "100%" }}>
                     <AmoSettingsBlock
@@ -462,7 +462,5 @@ export const AmoCRMModal: FC<IntegrationsModalProps> = ({ 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));
 }

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<Props> = ({
     stopThisPage,
+    handleCloseModal,
 
 }: Props) => {
     const theme = useTheme();
@@ -20,7 +22,7 @@ export const AmoRemoveAccount: FC<Props> = ({
         if (error) {
             enqueueSnackbar(error)
         } else {
-            stopThisPage()
+            handleCloseModal()
         }
     };
 

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));
   });
+  }
+
 };

src/utils/parse-error.ts

@@ -25,9 +25,15 @@ const translateMessage: Record<string, string> = {
 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;