From f4e7d83c28a379fc07a6270220954b5bf4233254 Mon Sep 17 00:00:00 2001
From: you <you@example.com>
Date: Thu, 5 Dec 2024 17:51:14 +0300
Subject: [PATCH] fixes

---
 src/routes/merchants/+page.svelte             | 62 +++++++++++--------
 .../user/profile/[userToken]/+page.svelte     | 40 +++++++-----
 2 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/src/routes/merchants/+page.svelte b/src/routes/merchants/+page.svelte
index 560481c..3658808 100644
--- a/src/routes/merchants/+page.svelte
+++ b/src/routes/merchants/+page.svelte
@@ -278,34 +278,36 @@
       </p>
     {:else}
       <div class="flex flex-col p-2">
-        <table class="table">
-          <!-- head -->
-          <thead>
-            <tr>
-              <th>Регион</th>
-              <th>Статус</th>
-              <th>Баланс</th>
-              <!-- <th>Тип баланса</th> -->
-              <th>Pay In</th>
-              <th>Pay Out</th>
-            </tr>
-          </thead>
-          <tbody>
-            {#each merchantsGeos as merch}
+        <div class="overflow-x-auto">
+          <table class="table">
+            <!-- head -->
+            <thead>
               <tr>
-                <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["payin"]}%</td>
-                <td>{merch["payout"]}%</td>
+                <th>Регион</th>
+                <th>Статус</th>
+                <th>Баланс</th>
+                <!-- <th>Тип баланса</th> -->
+                <th>Pay In</th>
+                <th>Pay Out</th>
               </tr>
-            {/each}
-          </tbody>
-        </table>
+            </thead>
+            <tbody>
+              {#each merchantsGeos as merch}
+                <tr>
+                  <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["payin"]}%</td>
+                  <td>{merch["payout"]}%</td>
+                </tr>
+              {/each}
+            </tbody>
+          </table>
+        </div>
         <div class="mt-4"></div>
         {#each merchantsGeos as merch}
           <p class="text-2xl font-bold">Объем для региона {merch["code"]}:</p>
@@ -377,8 +379,10 @@
                 <th> Опции </th>
                 <th> ID </th>
                 <th> Статус </th>
+                <th> Мерчант </th>
                 <th> Регион </th>
                 <th> Сумма </th>
+                <th> Сумма сеттла от мерча</th>
                 <th> Адрес кошелька </th>
                 <th> Хэш транзакции </th>
                 <th> Время создания </th>
@@ -405,12 +409,18 @@
                   <td>
                     {settlesStatusMap[settle["status"]]}
                   </td>
+                  <td>
+                    {settle["name"]}
+                  </td>
                   <td>
                     {settle["code"]}
                   </td>
                   <td>
                     {settle["amount"]} USDT
                   </td>
+                  <td>
+                    {settle["merchant_amount"]} USDT
+                  </td>
                   <td class="">
                     <p>{settle["settle_address"]}</p>
                     {#if settle["settle_address"].length > 2}
diff --git a/src/routes/user/profile/[userToken]/+page.svelte b/src/routes/user/profile/[userToken]/+page.svelte
index e438c75..1244f21 100644
--- a/src/routes/user/profile/[userToken]/+page.svelte
+++ b/src/routes/user/profile/[userToken]/+page.svelte
@@ -93,7 +93,7 @@
       return;
     }
     userOrders = result.data.data;
-    if(!Array.isArray(userOrders)) userOrders = [];
+    if (!Array.isArray(userOrders)) userOrders = [];
     numPagesUserOrders = Number(result.data?.pages);
     if (numPagesUserOrders === 0) numPagesUserOrders = 1;
     console.log(result.data);
@@ -122,7 +122,7 @@
       return;
     }
     userRequisites = result.data.data;
-    if(!Array.isArray(userDeposits)) userRequisites = [];
+    if (!Array.isArray(userDeposits)) userRequisites = [];
     reqsMaxPage = Number(result.data.pages);
     console.log(result.data);
   }
@@ -134,7 +134,7 @@
   const depoStatusMap = {
     "0": "Активна",
     "1": "Завершена",
-    "2": "Отклонена"
+    "2": "Отклонена",
   };
   ///api/v1/admin/getUserDeposits
   async function getUserDeposits() {
@@ -159,13 +159,13 @@
       return;
     }
     userDeposits = result.data.deposits;
-    if(!Array.isArray(userDeposits)) userDeposits = [];
+    if (!Array.isArray(userDeposits)) userDeposits = [];
     numPagesUserOrders = result.data.pages;
     disablePagesUserDeposits = false;
     // console.log(result.data, 'depos');
   }
 
-  $: if(browser || Number(ordersFilter) > -999) getUserOrders();
+  $: if (browser || Number(ordersFilter) > -999) getUserOrders();
 
   if (browser) {
     getUserOrders();
@@ -178,16 +178,18 @@
   let showFoundedOrderWindow = false;
   async function findOrder() {
     showLoadingFind = true;
-    const res = await makePost("admin/find", {
-
-    }, makeAuthHeaderForAxios(getAuthInfo()?.a));
+    const res = await makePost(
+      "admin/find",
+      {},
+      makeAuthHeaderForAxios(getAuthInfo()?.a)
+    );
   }
   showLoadingFind = false;
   const orderTypesMap = {
-    "card": "Карта",
-    "sbp": "СБП",
-    "clearing_account": "По номеру счёта"
-  }
+    card: "Карта",
+    sbp: "СБП",
+    clearing_account: "По номеру счёта",
+  };
 </script>
 
 <div class="w-full flex flex-col gap-8">
@@ -210,7 +212,7 @@
     </div>
     <div class="flex gap-2 p-2 items-center text-lg">
       <p class="font-bold">Баланс:</p>
-      <p class="text-info">{Number(userData.balance)/1e6} USDT</p>
+      <p class="text-info">{Number(userData.balance)} USDT</p>
     </div>
     <div class="flex gap-2 p-2 items-center text-lg">
       <p class="font-bold">Заморожено:</p>
@@ -313,11 +315,16 @@
               <td>{requisite["phone"]}</td>
               <td>{requisite["name"]}</td>
               <td>{requisite["device_uuid"]}</td>
-              <td>{requisite["daily_volume"]}</td>
+              <td>{requisite["total_volume"]}</td>
               <td>{requisite["daily_volume_limit"]}</td>
               <td class="flex gap-2">
                 <a
-                  href={"/admin/user/edit/req/" + token + "/" + requisite["uuid"] + "_" + userData.code}
+                  href={"/admin/user/edit/req/" +
+                    token +
+                    "/" +
+                    requisite["uuid"] +
+                    "_" +
+                    userData.code}
                   class="btn btn-info">Изменить</a
                 >
                 <button class="btn btn-error">Удалить</button>
@@ -464,7 +471,6 @@
   </div>
 </div>
 
-
 <!-- {#if showFoundedOrderWindow}
 <div class="fixed z-[1000] inset-0 flex justify-center items-center bg-black bg-opacity-50">
   <div class="bg-base-100 rounded-md p-4 flex flex-col">
@@ -472,4 +478,4 @@
     <button class="btn btn-outline" on:click={()=>{showFoundedOrderWindow = false;}}>Закрыть</button>
   </div>
 </div>
-{/if} -->
\ No newline at end of file
+{/if} -->