From e3f2e33b908776c0ecece08cf51595e2768d93d6 Mon Sep 17 00:00:00 2001
From: you <you@example.com>
Date: Thu, 31 Oct 2024 09:29:11 +0300
Subject: [PATCH] prod updt

---
 src/lib/tools/requests/requests.js            |  2 +-
 src/routes/disputes/+page.svelte              |  4 ++--
 src/routes/merchants/+page.svelte             |  4 ++--
 src/routes/newuser/+page.svelte               | 20 ++++++++++++++--
 src/routes/orders/+page.svelte                | 14 +++++------
 src/routes/payouts/+page.svelte               |  2 +-
 src/routes/user/profile/[userToken]/+page.js  |  6 ++---
 .../user/profile/[userToken]/+page.svelte     | 24 ++++++++++++-------
 src/routes/userslist/+page.svelte             |  2 +-
 9 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/lib/tools/requests/requests.js b/src/lib/tools/requests/requests.js
index 5384da5..59efe16 100644
--- a/src/lib/tools/requests/requests.js
+++ b/src/lib/tools/requests/requests.js
@@ -16,7 +16,7 @@ function defaultDataResponseProcessor(data) {
 export const API_PATH_MAIN = "https://hostapay.trade/api/v1/"; 
 export const API_PATH_TEST = "https://test.0x000f.ru/api/v1/"; 
 
-let BasicURLValue = API_PATH_TEST;
+let BasicURLValue = API_PATH_MAIN;
 
 async function makePost(url, data, options = undefined, 
     responseProcessor = defaultResponseProcessor, 
diff --git a/src/routes/disputes/+page.svelte b/src/routes/disputes/+page.svelte
index 037483a..7b8ad9b 100644
--- a/src/routes/disputes/+page.svelte
+++ b/src/routes/disputes/+page.svelte
@@ -161,7 +161,7 @@
     try {
       
       const response = await axios.get(
-        API_PATH_TEST + "loadFile?dispute=" +
+        API_PATH_MAIN + "loadFile?dispute=" +
           selectedDispute["order_id"],
           // "17731",
         {
@@ -338,7 +338,7 @@
           on:click={() => {
             axios
               .get(
-                API_PATH_TEST + "loadFile?dispute=" +
+                API_PATH_MAIN + "loadFile?dispute=" +
                   selectedDispute["order_id"],
                 {
                   responseType: "blob",
diff --git a/src/routes/merchants/+page.svelte b/src/routes/merchants/+page.svelte
index b0887f6..4d239b2 100644
--- a/src/routes/merchants/+page.svelte
+++ b/src/routes/merchants/+page.svelte
@@ -280,7 +280,7 @@
               <th>Регион</th>
               <th>Статус</th>
               <th>Баланс</th>
-              <th>Тип баланса</th>
+              <!-- <th>Тип баланса</th> -->
               <th>Pay In</th>
               <th>Pay Out</th>
             </tr>
@@ -291,7 +291,7 @@
                 <td class="font-semibold">{merch["code"]}</td>
                 <td>{merch["is_active"] === "t" ? "Активен":"Отключен"}</td>
                 <td>{merch["balance"]} {merch["balance_type"] === "0" ? "USDT":merch["code"]}</td>
-                <td>{merch["balance_type"] === "0" ? "crypto":"fiat"}</td>
+                <!-- <td>{merch["balance_type"] === "0" ? "crypto":"fiat"}</td> -->
                 <td>{merch["payin"]}%</td>
                 <td>{merch["payout"]}%</td>
               </tr>
diff --git a/src/routes/newuser/+page.svelte b/src/routes/newuser/+page.svelte
index 535e91c..a996b06 100644
--- a/src/routes/newuser/+page.svelte
+++ b/src/routes/newuser/+page.svelte
@@ -30,14 +30,19 @@
     value_bid,
     value_currency_code,
     value_paid_bid,
-    value_deposit_address
+    value_deposit_address,
+    value_insurance
   );
 
-  function checkFields(name, surname, balance, role, bid, code, pbid, addr) {
+  function checkFields(name, surname, balance, role, bid, code, pbid, addr, insurance) {
     if (isStringEmptyOrSpaces(code) || code === "-1") {
       canCreateUser = false;
       return;
     }
+    if(!Number.isFinite(insurance) || insurance < 0) {
+      canCreateUser = false;
+      return;
+    }
     if (isStringEmptyOrSpaces(addr) || addr.length < 8) {
       canCreateUser = false;
       return;
@@ -97,6 +102,7 @@
     setupNewUser();
   }
 
+  let value_insurance = 0;
   async function setupNewUser() {
     //todo
     const result = await makePost(
@@ -113,6 +119,7 @@
         payout_bid: Number(value_paid_bid) + "",
         bid: value_bid.toString(),
         deposit_address: value_deposit_address + "",
+        insurance: value_insurance.toString()
       },
       makeAuthHeaderForAxios(getAuthInfo()?.a)
     );
@@ -186,6 +193,15 @@
         class="grow text-lg text-info"
       />
     </label>
+    <label class={"input input-bordered flex items-center gap-2 "}>
+      Страховка (USDT):
+      <input
+        bind:value={value_insurance}
+        type="number"
+        min="0"
+        class="grow text-lg text-info"
+      />
+    </label>
     <label class={"input input-bordered flex items-center gap-2 "}>
       Ставка (%):
       <input
diff --git a/src/routes/orders/+page.svelte b/src/routes/orders/+page.svelte
index 4086112..66be253 100644
--- a/src/routes/orders/+page.svelte
+++ b/src/routes/orders/+page.svelte
@@ -60,12 +60,12 @@
   }
 
   let showLoadingRollback = false;
-  async function rollbackOrder(id) {
+  async function rollbackOrder(uuid) {
     showLoadingRollback = true;
     const res = await makePost(
       "admin/rollbackOrder",
       {
-        id: Number(id),
+        id: uuid,
         summa: foundedDispute["summa"],
       },
       makeAuthHeaderForAxios(getAuthInfo()?.a)
@@ -160,8 +160,8 @@
     <div class="flex flex-col p-4 bg-base-100 rounded-md">
       <p class="text-sm">UUID</p>
       <p class="font-semibold">{foundedDispute["uuid"]}</p>
-      <p class="text-sm mt-3">ID заявки</p>
-      <p class="font-semibold">{foundedDispute["id"]}</p>
+      <!-- <p class="text-sm mt-3">ID заявки</p>
+      <p class="font-semibold">{foundedDispute["id"]}</p> -->
       <p class="text-sm mt-3">ID клиента</p>
       <p class="font-semibold">{foundedDispute["external_user_id"]}</p>
       <p class="text-sm mt-3">Статус</p>
@@ -173,8 +173,8 @@
           Number(foundedDispute["summa"]) / Number(foundedDispute["rate"])
         ).toFixed(2)} USDT)
       </p>
-      <p class="text-sm mt-3">Курс</p>
-      <p>{foundedDispute["rate"]} {foundedDispute["currency_code"]}</p>
+      <!-- <p class="text-sm mt-3">Курс</p>
+      <p>{foundedDispute["rate"]} {foundedDispute["currency_code"]}</p> -->
       <p class="text-sm mt-3">Владелец</p>
       <p>{foundedDispute["name"]}</p>
       <p class="text-sm mt-3">Карта</p>
@@ -186,7 +186,7 @@
       <!-- <p>{foundedDispute["closetime"]}</p> -->
       <button
         on:click={() => {
-          rollbackOrder(foundedDispute["id"]);
+          rollbackOrder(foundedDispute["uuid"]);
         }}
         class="btn btn-outline btn-info mt-4"
       >
diff --git a/src/routes/payouts/+page.svelte b/src/routes/payouts/+page.svelte
index 42dc7f5..3610d93 100644
--- a/src/routes/payouts/+page.svelte
+++ b/src/routes/payouts/+page.svelte
@@ -451,7 +451,7 @@
           on:click={() => {
             axios
               .get(
-                API_PATH_TEST + "loadFile?dispute=" +
+                API_PATH_MAIN + "loadFile?dispute=" +
                   selectedPayout["order_id"],
                 {
                   responseType: "blob",
diff --git a/src/routes/user/profile/[userToken]/+page.js b/src/routes/user/profile/[userToken]/+page.js
index b5f86c8..bb4b077 100644
--- a/src/routes/user/profile/[userToken]/+page.js
+++ b/src/routes/user/profile/[userToken]/+page.js
@@ -5,7 +5,7 @@ import { sayError } from "$lib/tools/toaster/Toaster";
 import { redirect } from "$lib/tools/url/URLTools";
 
 export async function load({ params }) {
-  if(!browser) return;
+  if (!browser) return;
   const { userToken } = params;
   const userResult = await makePost(
     "getUser",
@@ -18,7 +18,7 @@ export async function load({ params }) {
     sayError("Данные авторизации устарели");
     // window.location.href = "/";
     redirect("/admin/");
-    return {};
+    return { };
   }
   if (userResult.error) {
     sayError("Не удалось настроить пользователя");
@@ -26,6 +26,6 @@ export async function load({ params }) {
   }
   return {
     token: userToken,
-    userData: userResult.data
+    userData: userResult.data,
   };
 }
diff --git a/src/routes/user/profile/[userToken]/+page.svelte b/src/routes/user/profile/[userToken]/+page.svelte
index f151970..3cb383b 100644
--- a/src/routes/user/profile/[userToken]/+page.svelte
+++ b/src/routes/user/profile/[userToken]/+page.svelte
@@ -183,7 +183,11 @@
     }, makeAuthHeaderForAxios(getAuthInfo()?.a));
   }
   showLoadingFind = false;
-
+  const orderTypesMap = {
+    "card": "Карта",
+    "sbp": "СБП",
+    "clearing_account": "По номеру счёта"
+  }
 </script>
 
 <div class="w-full flex flex-col gap-8">
@@ -367,14 +371,15 @@
         <!-- head -->
         <thead>
           <tr>
-            <th>ID заявки</th>
+            <!-- <th>ID заявки</th> -->
             <th>UUID</th>
             <th>ID клиента</th>
             <th>Статус</th>
             <th>Сумма</th>
-            <th>Курс</th>
-            <th>Название реквизита</th>
-            <th>СБП</th>
+            <th>Тип заявки</th>
+            <!-- <th>Курс</th> -->
+            <!-- <th>Название реквизита</th> -->
+            <!-- <th>СБП</th> -->
             <th>Мерчант</th>
             <th>Время создания</th>
             <th>Время закрытия</th>
@@ -385,14 +390,15 @@
         <tbody>
           {#each userOrders as order}
             <tr class="hover:bg-neutral group">
-              <td class="font-semibold">{order["id"]}</td>
+              <!-- <td class="font-semibold">{order["id"]}</td> -->
               <td class="font-semibold">{order["uuid"]}</td>
               <td class="font-semibold">{order["external_user_id"]}</td>
               <td class="">{order["status"]}</td>
               <td>{order["summa"]} {userData?.code}</td>
-              <td>{order["rate"]} {userData?.code}</td>
-              <td>{order["is_sbp"] === "t" ? "да" : "нет"}</td>
-              <td>{order["merchant_id"]}</td>
+              <td>{orderTypesMap[order["order_type"]]}</td>
+              <!-- <td>{order["rate"]} {userData?.code}</td> -->
+              <!-- <td>{order["is_sbp"] === "t" ? "да" : "нет"}</td> -->
+              <td>{order["merchant"]}</td>
               <td>{order["creation_time"]}</td>
               <td>{order["closetime"]}</td>
               <!-- <td>
diff --git a/src/routes/userslist/+page.svelte b/src/routes/userslist/+page.svelte
index 41ab369..26184cd 100644
--- a/src/routes/userslist/+page.svelte
+++ b/src/routes/userslist/+page.svelte
@@ -55,7 +55,7 @@
              <tr class="hover:bg-neutral group">
                 <th class="font-normal">{user["token"]}</th>
                 <td class="font-semibold">{user["name"]} {user["surname"]}</td>
-                <td>{(Number(user["balance"]) / 1e6)} USDT</td>
+                <td>{(Number(user["balance"]))} {user["code"]}</td>
                 <td>
                   <a href={"/admin/user/profile/"+user["token"]} class="btn btn-outline btn-info group-hover:btn-warning">Профиль</a>
                 </td>