diff --git a/src/routes/disputes/+page.svelte b/src/routes/disputes/+page.svelte index f8e5af5..30a847c 100644 --- a/src/routes/disputes/+page.svelte +++ b/src/routes/disputes/+page.svelte @@ -150,6 +150,49 @@ }; return mimeTypes[mimeType] || "bin"; // Если тип неизвестен, возвращаем .bin } + + let showDisputeReceiptImage = false; + let showLoadingReceiptShowing = false; + let receiptImage = ""; + async function showDisputeReceipt() { + // console.log(receiptImage); + showDisputeReceiptImage = false; + showLoadingReceiptShowing = true; + try { + + const response = await axios.get( + "https://hostapay.trade/api/v1/loadFile?dispute=" + + selectedDispute["order_id"], + // "17731", + { + responseType: "blob", + headers: makeAuthHeaderForAxios(getAuthInfo()?.a).headers, + } + ); + const url = window.URL.createObjectURL(new Blob([response.data])); + // console.log(url); + receiptImage = url; + showDisputeReceiptImage = true; + showLoadingReceiptShowing = false; + // const contentType = response?.data?.type; + // let extension = mimeToExtension(contentType); + // const a = document.createElement("a"); + // a.style.display = "none"; + // a.href = url; + // a.download = `Чек_${Date.now()}.${extension}`; + // document.body.appendChild(a); + // a.click(); + // window.URL.revokeObjectURL(url); + // document.body.removeChild(a); + // showLoadingReceipDownloading = false; + } catch (error) { + sayError("Ошибка загрузки изображения"); + showDisputeReceiptImage = false; + showLoadingReceiptShowing = false; + //console.log(error); + } + } +
@@ -328,6 +371,18 @@ > Скачать чек + {/if}
{/if} + +{#if showDisputeReceiptImage} +
+
+ receipt +
+ +
+{/if} diff --git a/src/routes/orders/+page.svelte b/src/routes/orders/+page.svelte index 05a64b0..f2e79aa 100644 --- a/src/routes/orders/+page.svelte +++ b/src/routes/orders/+page.svelte @@ -86,7 +86,7 @@ let showChangeSum = false; let newSum = 0; - $: if (foundedDispute !== 0) newSum = Number(foundedDispute?.summa); + // $: if (foundedDispute !== 0) newSum = Number(foundedDispute?.summa); let showLoadingChangeSum = false; async function changeSum(id) { diff --git a/src/routes/user/change/[userToken]/+page.svelte b/src/routes/user/change/[userToken]/+page.svelte index 6d0d207..1309d3c 100644 --- a/src/routes/user/change/[userToken]/+page.svelte +++ b/src/routes/user/change/[userToken]/+page.svelte @@ -2,14 +2,14 @@ import { getAuthInfo, makeAuthHeaderForAxios } from "$lib/auth/Auth.js"; import { makePost } from "$lib/tools/requests/requests.js"; import { isStringEmptyOrSpaces } from "$lib/tools/strings/Strings"; - import { sayError } from "$lib/tools/toaster/Toaster.js"; + import { sayError, sayInfo } from "$lib/tools/toaster/Toaster.js"; import { redirect } from "$lib/tools/url/URLTools.js"; import { jwtDecode } from "jwt-decode"; export let data; let { userData } = data; let { token } = data; - let value_role = jwtDecode(getAuthInfo()?.a).role.toString(); + let value_role = "1"; let changingUser = false; let canChangeUser = true; @@ -20,13 +20,15 @@ userData.balance, value_role, userData.bid, - userData.paid_bid + userData.payout_bid ); - function checkFields(name, surname, balance, role, bid, paid_bid) { + function checkFields(name, surname, balance, role, bid, payout_bid) { // balance = Number(balance); // bid = Number(balance); - if (isStringEmptyOrSpaces(name) || name.length < 3) { + console.log(name, surname, balance, role, bid, payout_bid); + + if (isStringEmptyOrSpaces(name) || name.length < 2) { canChangeUser = false; return; } @@ -34,11 +36,11 @@ canChangeUser = false; return; } - if ((paid_bid !== 0 && !paid_bid) || paid_bid < 0) { + if ((payout_bid !== 0 && !payout_bid) || payout_bid < 0) { canChangeUser = false; return; } - if (isStringEmptyOrSpaces(surname) || surname.length < 3) { + if (isStringEmptyOrSpaces(surname) || surname.length < 2) { canChangeUser = false; return; } @@ -67,15 +69,15 @@ can_trade_global: userData["can_trade_global"] ? "true":"false", role: value_role, bid: userData.bid.toString(), - paid_bid: userData.paid_bid.toString() + payout_bid: userData.payout_bid.toString() }, makeAuthHeaderForAxios(getAuthInfo()?.a) ); if (userResult.status === 401) { sayError("Данные авторизации устарели"); // window.location.href = "/"; - redirect("/admin/"); changingUser = false; + redirect("/admin/"); return; } if (userResult.error) { @@ -83,6 +85,7 @@ changingUser = false; return; } + sayInfo("Пользователь изменён!"); document.getElementById("ref")?.click(); } @@ -142,7 +145,7 @@ class="select select-bordered w-full text-base" > - + diff --git a/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte b/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte index 885ae18..784d922 100644 --- a/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte +++ b/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte @@ -38,7 +38,7 @@ canChange = false; return; } - if (value_phone?.length !== 11) { + if (value_phone?.length < 6) { canChange = false; return; } diff --git a/src/routes/user/profile/[userToken]/+page.svelte b/src/routes/user/profile/[userToken]/+page.svelte index 3cf5943..914e81e 100644 --- a/src/routes/user/profile/[userToken]/+page.svelte +++ b/src/routes/user/profile/[userToken]/+page.svelte @@ -74,7 +74,7 @@ "admin/getUserOrders", { token: token, - page: currentPageUserOrders - 1, + page: currentPageUserOrders, // orderBy: "id", statuses_to_send: Number(ordersFilter), }, @@ -100,11 +100,14 @@ disablePagesUserOrders = false; } + let reqsCurrentPage = 1; + let reqsMaxPage = 1; let userRequisites = []; async function getUserRequisites() { const result = await makePost( - "getRequisite", + "admin/getRequisite", { + page: Number(reqsCurrentPage), token: token, }, makeAuthHeaderForAxios(getAuthInfo()?.a) @@ -118,8 +121,9 @@ sayError("Не удалось получить реквизиты пользователя"); return; } - userRequisites = result.data; + userRequisites = result.data.data; if(!Array.isArray(userDeposits)) userRequisites = []; + reqsMaxPage = Number(result.data.pages); console.log(result.data); } @@ -258,6 +262,20 @@

Реквизиты пользователя

+
+
+ { + reqsCurrentPage = n; + getUserRequisites(); + }} + disableButtons={false} + css={"btn-neutral mt-2"} + /> +

Всего страниц: {reqsMaxPage}

+
+
@@ -290,7 +308,7 @@ - + + + @@ -365,6 +385,7 @@ {#each userOrders as order} + @@ -372,7 +393,7 @@ - +
{requisite["cardnumber"]} {requisite["phone"]} {requisite["name"]}{requisite["device_id"]}{requisite["device_uuid"]} {requisite["daily_volume"]} {requisite["daily_volume_limit"]} @@ -349,11 +367,13 @@
ID заявки UUID ID клиента Статус Сумма КурсНазвание реквизита СБП Мерчант Время создания
{order["id"]} {order["uuid"]} {order["external_user_id"]} {order["status"]}{order["rate"]} {userData?.code} {order["is_sbp"] === "t" ? "да" : "нет"} {order["merchant_id"]}{order["creationtime"]}{order["creation_time"]} {order["closetime"]}