diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte index ced3ef6..bba4aea 100644 --- a/src/routes/admin/+page.svelte +++ b/src/routes/admin/+page.svelte @@ -1,8 +1,12 @@ \ No newline at end of file diff --git a/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.js b/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.js index 6b70881..3cede5d 100644 --- a/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.js +++ b/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] }; } \ No newline at end of file diff --git a/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.svelte b/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.svelte index 97d7bf5..885ae18 100644 --- a/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.svelte +++ b/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) - { - canChange = false; - return; + if (value_cardNumber?.length !== 16) { + canChange = false; + return; } - if(value_phone?.length !== 11) - { - canChange = false; - return; + if (value_phone?.length !== 11) { + canChange = false; + return; } - if(value_limit < 0) - { - canChange = false; - return; + if (value_limit < 0) { + canChange = false; + return; } canChange = true; - } async function getReqInfo() { @@ -85,8 +82,8 @@ bankname: value_bankName, cardnumber: value_cardNumber, phone: value_phone, - status: value_status ? "true":"false", - limit: value_limit.toString() + status: value_status ? "true" : "false", + 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(); } @@ -123,7 +135,10 @@ class="select select-bordered w-full text-base" > - + {#each activeBanks as bank} + + {/each} + @@ -140,7 +155,7 @@
@@ -151,8 +166,14 @@ class="toggle toggle-primary" />
- - + + {/each} diff --git a/src/routes/admin/user/profile/[userToken]/+page.svelte b/src/routes/admin/user/profile/[userToken]/+page.svelte index 45af1ac..86cdbd7 100644 --- a/src/routes/admin/user/profile/[userToken]/+page.svelte +++ b/src/routes/admin/user/profile/[userToken]/+page.svelte @@ -256,7 +256,7 @@ {requisite["status"] === "t" ? "активен" : "отключен"} - {requisite["bankname"]} + {requisite["bank_name"]} {requisite["is_sbp"] === "t" ? "да" : "нет"} {requisite["cardnumber"]} {requisite["phone"]} @@ -266,7 +266,7 @@ {requisite["daily_volume_limit"]} Изменить