diff --git a/src/lib/ui-components/navbar.svelte b/src/lib/ui-components/navbar.svelte index 07c6d7e..68f6b69 100644 --- a/src/lib/ui-components/navbar.svelte +++ b/src/lib/ui-components/navbar.svelte @@ -7,11 +7,13 @@ import { redirect } from "$lib/tools/url/URLTools"; import { jwtDecode } from "jwt-decode"; + let showMenu = false; +
-
+
- +
HostaPay

{jwtDecode(getAuthInfo()?.a)?.role == "4" ? "Admin":"Moder"}

@@ -56,6 +43,7 @@
  • Споры
  • Выплаты
    • +
  • Заявки
    • {#if jwtDecode(getAuthInfo()?.a)?.role == "4"}
  • Мерчанты
    • {/if} @@ -72,3 +60,22 @@ }} class="btn btn-error btn-outline">Выход
    + +
    + +
    \ No newline at end of file diff --git a/src/routes/disputes/+page.svelte b/src/routes/disputes/+page.svelte index fd545a3..f8e5af5 100644 --- a/src/routes/disputes/+page.svelte +++ b/src/routes/disputes/+page.svelte @@ -34,7 +34,7 @@ const result = await makePost( "admin/getDisputes", { - page: 1, + page: currentPageDisputes, filter: currentDisputesFilter }, makeAuthHeaderForAxios(getAuthInfo()?.a) @@ -263,13 +263,13 @@

    Сумма в споре

    - {(Number(selectedDispute.new_amount) / Number(selectedDispute.order_rate)).toFixed(2)} {selectedDispute.out_code} ({Number(selectedDispute.new_amount)} USDT) + {Number(selectedDispute.new_amount)} {selectedDispute.out_code} ({(Number(selectedDispute.new_amount) / Number(selectedDispute.order_rate)).toFixed(2)} USDT)

    Сумма в заявке

    - {Number(selectedDispute.order_rate) * Number(selectedDispute.amount)} {selectedDispute.out_code} ({Number(selectedDispute.amount)} USDT) + {Number(selectedDispute.amount)} {selectedDispute.out_code} ({(Number(selectedDispute.amount) / Number(selectedDispute.order_rate)).toFixed(2)} USDT)

    {#if selectedDispute["order_status"] === "4" || selectedDispute["order_status"] === "8"} diff --git a/src/routes/orders/+page.svelte b/src/routes/orders/+page.svelte new file mode 100644 index 0000000..716ec58 --- /dev/null +++ b/src/routes/orders/+page.svelte @@ -0,0 +1,241 @@ + + +
    +
    +
    +

    Поиск по заявкам

    +
    +
    +

    external_uuid

    + + +

    uuid

    + + +

    external_user_id

    + + + +
    +
    + +{#if showFoundedOrderWindow} +
    +
    +

    UUID

    +

    {foundedDispute["uuid"]}

    +

    ID заявки

    +

    {foundedDispute["id"]}

    +

    ID клиента

    +

    {foundedDispute["external_user_id"]}

    +

    Статус

    +

    {orderStatusMap[foundedDispute["status"]]}

    +

    Сумма

    +

    + {foundedDispute["summa"]} + {foundedDispute["currency_code"]} ({( + Number(foundedDispute["summa"]) / Number(foundedDispute["rate"]) + ).toFixed(2)} USDT) +

    +

    Курс

    +

    {foundedDispute["rate"]} {foundedDispute["currency_code"]}

    +

    Карта

    +

    {foundedDispute["cardnumber"]}

    +

    Время создания

    +

    {foundedDispute["creationtime"]}

    + + + + +
    +
    +{/if} + +{#if showChangeSum} +
    +
    +

    Укажите новую сумму ({foundedDispute["currency_code"]})

    + + + +
    +
    +{/if} diff --git a/src/routes/user/profile/[userToken]/+page.svelte b/src/routes/user/profile/[userToken]/+page.svelte index ae32b6a..3cf5943 100644 --- a/src/routes/user/profile/[userToken]/+page.svelte +++ b/src/routes/user/profile/[userToken]/+page.svelte @@ -12,6 +12,12 @@ let userInfoReloading = false; + const orderStatusMap = { + "1": "Ожидает исполнения", + "2": "Время заявки истекло", + "3": "Исполнена", + }; + async function deleteUser() { const result = await makePost( "deleteUser", @@ -61,15 +67,16 @@ let numPagesUserOrders = 1; let currentPageUserOrders = 1; let disablePagesUserOrders = false; + let ordersFilter = "1"; async function getUserOrders() { disablePagesUserOrders = true; const result = await makePost( - "getUserOrders", + "admin/getUserOrders", { token: token, page: currentPageUserOrders - 1, - orderBy: "id", - statuses_to_send: 2, + // orderBy: "id", + statuses_to_send: Number(ordersFilter), }, makeAuthHeaderForAxios(getAuthInfo()?.a) ); @@ -154,11 +161,25 @@ // console.log(result.data, 'depos'); } + $: if(browser || Number(ordersFilter) > -999) getUserOrders(); + if (browser) { getUserOrders(); getUserRequisites(); getUserDeposits(); } + + let findFieldValue = ""; + let showLoadingFind = false; + let showFoundedOrderWindow = false; + async function findOrder() { + showLoadingFind = true; + const res = await makePost("admin/find", { + + }, makeAuthHeaderForAxios(getAuthInfo()?.a)); + } + showLoadingFind = false; +
    @@ -299,6 +320,10 @@
    + { @@ -306,16 +331,26 @@ getUserOrders(); }} disableButtons={disablePagesUserOrders} - css={"btn-neutral"} + css={"btn-neutral mt-2"} />

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

    +
    - + + @@ -330,14 +365,18 @@ {#each userOrders as order} - + + - - + + + \ No newline at end of file diff --git a/svelte.config.js b/svelte.config.js index ee5e685..d2ecc55 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -30,7 +30,8 @@ const config = { "/userslist", "/disputes", "/payouts", - "/merchants" + "/merchants", + "/orders" ], }, },
    IDUUIDID клиента Статус Сумма Курс
    {order["id"]}{order["uuid"]}{order["external_user_id"]} {order["status"]}{order["summa"]} USDT{order["rate"]} RUB{order["summa"]} {userData?.code}{order["rate"]} {userData?.code} {order["is_sbp"] === "t" ? "да" : "нет"} {order["merchant_id"]} {order["creationtime"]} {order["closetime"]}