From f08bd29ab81bcf99b08bffc8df1179e630167dcd Mon Sep 17 00:00:00 2001
From: Tamara <tamara.zelenko555@yandex.ru>
Date: Sun, 14 Apr 2024 02:48:51 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=B7=D1=8F=D1=82=D0=B8=D0=B5=20=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=B4=D0=BB=D1=81=D1=82=D0=B0=D1=8E=D1=89=D0=B5=D0=B9=20?=
 =?UTF-8?q?=D1=81=D1=83=D0=BC=D0=BC=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D1=82=D1=8B=20=D0=BD=D0=B0=20=D1=85=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=B5=20=D0=B8=D0=B7=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/InfoPrivilege.tsx   | 52 +++++++++++++++++------------------
 src/pages/Tariffs/Tariffs.tsx | 52 +++++++++++++++++------------------
 2 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/src/pages/InfoPrivilege.tsx b/src/pages/InfoPrivilege.tsx
index 355628bb..00e6a44e 100644
--- a/src/pages/InfoPrivilege.tsx
+++ b/src/pages/InfoPrivilege.tsx
@@ -1,29 +1,29 @@
 import { Typography, Box } from "@mui/material";
-import { useUserStore } from "@root/user"
+import { useUserStore } from "@root/user";
 import { Link } from "react-router-dom";
 export const InfoPrivilege = () => {
-    const user = useUserStore();
-    console.log(user)
-    return (
-        <Box>
-            <Link to="/list">К списку квизов</Link>
-            {Object.values(user?.userAccount?.privileges || {}).map((privilege) => {
-                console.log(privilege)
-                return (
-                    <Box
-                        sx={{
-                            border: "1px solid",
-                            margin: "0 10px",
-                            display: "flex",
-                            justifyContent: "space-around",
-                            padding: "5px 0",
-                        }}
-                    >
-                        <Typography>{privilege?.privilege_name}</Typography>
-                        <Typography>{privilege?.amount}</Typography>
-                    </Box>
-                )
-            })}
-        </Box>
-    )
-}
\ No newline at end of file
+  const user = useUserStore();
+  console.log(user);
+  return (
+    <Box>
+      <Link to="/list">К списку квизов</Link>
+      {Object.values(user?.userAccount?.privileges || {}).map((privilege) => {
+        console.log(privilege);
+        return (
+          <Box
+            sx={{
+              border: "1px solid",
+              margin: "0 10px",
+              display: "flex",
+              justifyContent: "space-around",
+              padding: "5px 0",
+            }}
+          >
+            <Typography>{privilege?.privilege_name}</Typography>
+            <Typography>{privilege?.amount}</Typography>
+          </Box>
+        );
+      })}
+    </Box>
+  );
+};
diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx
index 5292fa8c..712efc19 100644
--- a/src/pages/Tariffs/Tariffs.tsx
+++ b/src/pages/Tariffs/Tariffs.tsx
@@ -121,35 +121,33 @@ function TariffPage() {
       url: process.env.REACT_APP_DOMAIN + `/customer/cart?id=${id}`,
     });
     //Если нам хватает денежек - покупаем тариф
-    if (price * 100 <= cashCop) {
-      try {
-        const data = await makeRequest({
-          method: "POST",
-          url: process.env.REACT_APP_DOMAIN + "/customer/cart/pay",
-        });
-        console.log(data);
-        setCash(
-          currencyFormatter.format(Number(data.wallet.cash) / 100),
-          Number(data.wallet.cash),
-          Number(data.wallet.cash) / 100,
-        );
-        enqueueSnackbar("Тариф успешно приобретён");
-      } catch (e) {
-        enqueueSnackbar("Произошла ошибка. Попробуйте позже");
-      }
-      //Развращаем товары в корзину
-      inCart();
-    } else {
-      //Деняк не хватило
-      // history.pushState({}, null, "https://hub.pena.digital/wallet?action=squizpay");
 
-      var link = document.createElement("a");
-      link.href = `https://${isTestServer ? "s" : ""}hub.pena.digital/quizpayment?action=squizpay&dif=${Math.round(
-        price * 100 - cashCop,
-      )}&data=${token}&userid=${userId}`;
-      document.body.appendChild(link);
-      link.click();
+    try {
+      const data = await makeRequest({
+        method: "POST",
+        url: process.env.REACT_APP_DOMAIN + "/customer/cart/pay",
+      });
+      console.log(data);
+      setCash(
+        currencyFormatter.format(Number(data.wallet.cash) / 100),
+        Number(data.wallet.cash),
+        Number(data.wallet.cash) / 100,
+      );
+      enqueueSnackbar("Тариф успешно приобретён");
+    } catch (e) {
+      //если денег не хватило
+      if (e.response.data.message.includes("insufficient funds")) {
+        let cashDif = Number(e.response.data.message.split(":")[1]);
+        var link = document.createElement("a");
+        link.href = `https://${isTestServer ? "s" : ""}hub.pena.digital/quizpayment?action=squizpay&dif=${cashDif}&data=${token}&userid=${userId}`;
+        document.body.appendChild(link);
+        link.click();
+      }
+      //другая ошибка
+      enqueueSnackbar("Произошла ошибка. Попробуйте позже");
     }
+    //Развращаем товары в корзину
+    inCart();
   };
 
   const filteredTariffs = tariffs.filter((tariff) => {