-1

src/routes/admin/+page.svelte

@@ -1,8 +1,12 @@
 <script>
+  import { checkAuth, checkAuthSync } from "$lib/auth/Auth";
   import { redirect } from "$lib/tools/url/URLTools";
   import { onMount } from "svelte";
 
     onMount(()=>{
+      if(checkAuthSync())
         redirect("/admin/userslist");
+      else
+        redirect("/admin/login");
     });
 </script>

src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.js

@@ -7,8 +7,10 @@ export async function load({ params }) {
   if(!browser) return;
   const { userToken } = params;
   const { reqID } = params;
+  let spt = reqID.split("_");
   return {
     token: userToken,
-    reqID: reqID
+    reqID: spt[0],
+    currency: spt[1]
   };
 }

src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.svelte

@@ -3,12 +3,13 @@
 
   import { browser } from "$app/environment";
   import { getAuthInfo, makeAuthHeaderForAxios } from "$lib/auth/Auth.js";
-  import { makePost } from "$lib/tools/requests/requests.js";
+  import { makeGet, makePost } from "$lib/tools/requests/requests.js";
   import { sayError } from "$lib/tools/toaster/Toaster.js";
   import { redirect } from "$lib/tools/url/URLTools.js";
 
   export let data;
   let { reqID } = data;
+  let {currency} = data;
   let { token } = data;
 
   let reqInfo = [];
@@ -24,33 +25,29 @@
   $: value_cardNumber, value_phone, value_status, checkFields();
 
   function bindValues() {
-    value_bankName = reqInfo[0]?.bankname;
+    value_bankName = reqInfo[0]?.bank_name;
     value_cardNumber = reqInfo[0]?.cardnumber;
     value_phone = reqInfo[0]?.phone;
     value_status = reqInfo[0]?.status === "t";
     value_limit = Number(reqInfo[0]?.daily_volume_limit);
+    value_bankName = reqInfo[0]?.bank_id;
   }
 
   function checkFields() {
-
+    if (value_cardNumber?.length !== 16) {
-    if(value_cardNumber?.length !== 16)
+      canChange = false;
-    {
+      return;
-        canChange = false;
-        return;
     }
-    if(value_phone?.length !== 11)
+    if (value_phone?.length !== 11) {
-    {
+      canChange = false;
-        canChange = false;
+      return;
-        return;
     }
-    if(value_limit < 0)
+    if (value_limit < 0) {
-    {
+      canChange = false;
-        canChange = false;
+      return;
-        return;
     }
 
     canChange = true;
-
   }
 
   async function getReqInfo() {
@@ -85,8 +82,8 @@
         bankname: value_bankName,
         cardnumber: value_cardNumber,
         phone: value_phone,
-        status: value_status ? "true":"false",
+        status: value_status ? "true" : "false",
-        limit: value_limit.toString()
+        limit: value_limit.toString(),
       },
       makeAuthHeaderForAxios(getAuthInfo()?.a)
     );
@@ -94,7 +91,7 @@
       sayError("Данные авторизации устарели");
       // window.location.href = "/";
       redirect("/admin/");
-    //   canChange = true;
+      //   canChange = true;
       return;
     }
     if (result.error) {
@@ -106,8 +103,23 @@
     // canChange = true;
   }
 
+  let activeBanks = [];
+  async function getActiveBanks() {
+    let res = await makeGet(
+      "client/banksList",
+      makeAuthHeaderForAxios(getAuthInfo()?.a)
+    );
+    if (res.error) {
+      sayError("Не удалось получить банки. Ошибка #4143");
+    } else {
+      console.log(res.data);
+      activeBanks = res.data;
+    }
+  }
+
   if (browser) {
     getReqInfo();
+    getActiveBanks();
   }
 </script>
 
@@ -123,7 +135,10 @@
         class="select select-bordered w-full text-base"
       >
         <option disabled selected value="-1">Банк</option>
-        <option value="sber">Сбер</option>
+        {#each activeBanks as bank}
+          <option value={bank.id}>{bank.name}</option>
+        {/each}
+        <!-- <option value="sber">Сбер</option> -->
         <!-- <option value="2">Модератор</option>
         <option value="4">Администратор</option> -->
       </select>
@@ -140,7 +155,7 @@
         <input type="text" class="grow text-info" bind:value={value_phone} />
       </label>
       <label class="input input-bordered flex items-center gap-2">
-        Лимит
+        Лимит ({currency})
         <input type="number" class="grow text-info" bind:value={value_limit} />
       </label>
       <div class="flex p-4 items-center gap-2">
@@ -151,8 +166,14 @@
           class="toggle toggle-primary"
         />
       </div>
-      <button on:click={()=>{changeRequisite()}} class="btn btn-primary" disabled={!canChange}>Сохранить</button>
+      <button
-      <a href={"/admin/user/profile/"+token} class="hidden" id="ref"></a>
+        on:click={() => {
+          changeRequisite();
+        }}
+        class="btn btn-primary"
+        disabled={!canChange}>Сохранить</button
+      >
+      <a href={"/admin/user/profile/" + token} class="hidden" id="ref"></a>
     {/each}
   </div>
 </div>

src/routes/admin/user/profile/[userToken]/+page.svelte

@@ -256,7 +256,7 @@
               <td class=""
                 >{requisite["status"] === "t" ? "активен" : "отключен"}</td
               >
-              <td>{requisite["bankname"]}</td>
+              <td>{requisite["bank_name"]}</td>
               <td>{requisite["is_sbp"] === "t" ? "да" : "нет"}</td>
               <td>{requisite["cardnumber"]}</td>
               <td>{requisite["phone"]}</td>
@@ -266,7 +266,7 @@
               <td>{requisite["daily_volume_limit"]}</td>
               <td class="flex gap-2">
                 <a
-                  href={"/admin/user/edit/req/" + token + "/" + requisite["id"]}
+                  href={"/admin/user/edit/req/" + token + "/" + requisite["id"] + "_" + userData.code}
                   class="btn btn-info">Изменить</a
                 >
                 <button class="btn btn-error">Удалить</button>