diff --git a/src/lib/ui-components/navbar.svelte b/src/lib/ui-components/navbar.svelte index 4bd0ade..3543018 100644 --- a/src/lib/ui-components/navbar.svelte +++ b/src/lib/ui-components/navbar.svelte @@ -55,7 +55,7 @@
  • Споры
  • Выплаты
    • -
  • Заявки
    • +
  • Депозиты
    • {#if jwtDecode(getAuthInfo()?.a)?.role == "4"}
  • Мерчанты
  • Валюты
    • @@ -156,7 +156,7 @@ on:click={() => { showMenu = false; }} - href="/admin/orders">ЗаявкиДепозиты
    diff --git a/src/routes/orders/+page.svelte b/src/routes/orders/+page.svelte index 6cac20f..ef0785c 100644 --- a/src/routes/orders/+page.svelte +++ b/src/routes/orders/+page.svelte @@ -26,28 +26,28 @@ let showFoundedOrderWindow = false; let showLoadingFind = false; - let foundedDispute; + let foundedDisputes = []; + let selectedDispute; + + let currentDepositSearchPage = 1; + let maxDepositSearchPages = 1; let external_uuidValue = ""; let uuidValue = ""; let external_user_idValue = ""; + let searchValue = ""; async function findDispute() { + if (searchValue.length < 5 || showLoadingFind) return; + showLoadingFind = true; - let sData = {}; - if (external_uuidValue !== "") { - sData["external_uuid"] = external_uuidValue; - } else if (uuidValue !== "") { - sData["uuid"] = uuidValue; - } else if (external_user_idValue !== "") { - sData["external_user_id"] = external_user_idValue; - } else { - showLoadingFind = false; - return; - } + let sData = { + searchData: searchValue.trim(), + page: currentDepositSearchPage, + }; const res = await makePost( - "admin/findOrder", + "admin/deposit/search", sData, makeAuthHeaderForAxios(getAuthInfo()?.a) ); @@ -57,9 +57,12 @@ showLoadingFind = false; return; } - foundedDispute = res.data; - console.log(foundedDispute); - showFoundedOrderWindow = true; + console.log(res.data); + + foundedDisputes = res.data.data; + maxDepositSearchPages = Number(res.data.pages); + console.log(foundedDisputes); + // showFoundedOrderWindow = true; showLoadingFind = false; } @@ -70,7 +73,7 @@ "admin/rollbackOrder", { id: uuid, - summa: foundedDispute["summa"], + summa: selectedDispute["summa"], }, makeAuthHeaderForAxios(getAuthInfo()?.a) ); @@ -192,13 +195,13 @@ let img64 = ""; let qrCode = false; - $: if (foundedDispute && foundedDispute["cardnumber"].length > 16) { + $: if (selectedDispute && selectedDispute["cardnumber"].length > 16) { qrCode = true; - QRCode.toDataURL(foundedDispute["cardnumber"], { type: "image/jpeg" }).then( - (url) => { - img64 = url; - } - ); + QRCode.toDataURL(selectedDispute["cardnumber"], { + type: "image/jpeg", + }).then((url) => { + img64 = url; + }); } else { qrCode = false; } @@ -207,28 +210,20 @@
    -

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

    +

    Поиск по депозитам

    -

    external_uuid

    - -

    uuid

    - - -

    external_user_id

    -
    +
    +
    + +
    + {"Страница"} + {currentDepositSearchPage} +
    + +
    +

    + {"Всего страниц:"} + {maxDepositSearchPages} +

    + {#if showLoadingFind} + + {:else} + + + + + + + + + + + {#each foundedDisputes as dep} + + + + + + + + + {/each} + +
    {"Статус"}{"Сумма"}{"Банк"}{"Время создания"}{"Трейдер"}
    {orderStatusMap[dep["status"]]}{Number(dep["summa"])} {dep["currency_code"]}{dep["bank_name"]}{dep["creationtime"]}{dep["trader_name"]} {dep["surname"]}
    + {/if} +
    {#if showFoundedOrderWindow} @@ -250,49 +320,49 @@ class="flex flex-col p-4 bg-base-100 rounded-md overflow-y-auto max-h-[90%]" >

    UUID

    -

    {foundedDispute["uuid"]}

    +

    {selectedDispute["uuid"]}

    ID клиента

    -

    {foundedDispute["external_user_id"]}

    +

    {selectedDispute["external_user_id"]}

    External ID

    -

    {foundedDispute["external_uuid"]}

    +

    {selectedDispute["external_uuid"]}

    Статус

    -

    {orderStatusMap[foundedDispute["status"]]}

    - {#if foundedDispute["token"] !== ""} +

    {orderStatusMap[selectedDispute["status"]]}

    + {#if selectedDispute["token"] !== ""}

    Токен трейдера

    -

    {foundedDispute["token"]}

    +

    {selectedDispute["token"]}

    {/if} - {#if foundedDispute["trader_name"] !== ""} + {#if selectedDispute["trader_name"] !== ""}

    Трейдер

    -

    {foundedDispute["trader_name"]} {foundedDispute["surname"]}

    +

    {selectedDispute["trader_name"]} {selectedDispute["surname"]}

    {/if} - {#if foundedDispute["close_reason"] !== ""} + {#if selectedDispute["close_reason"] !== ""}

    Причина отклонения

    -

    {foundedDispute["close_reason"]}

    +

    {selectedDispute["close_reason"]}

    {/if}

    Сумма

    - {toValidNumberFormat(foundedDispute["summa"])} - {foundedDispute["currency_code"]} + {toValidNumberFormat(selectedDispute["summa"])} + {selectedDispute["currency_code"]}

    - {#if foundedDispute["bank_name"] !== ""} + {#if selectedDispute["bank_name"] !== ""}

    Банк

    -

    {foundedDispute["bank_name"]}

    +

    {selectedDispute["bank_name"]}

    {/if} - {#if foundedDispute["name"] !== ""} + {#if selectedDispute["name"] !== ""}

    Владелец

    -

    {foundedDispute["name"]}

    +

    {selectedDispute["name"]}

    {/if} - {#if foundedDispute["cardnumber"] !== ""} - {#if foundedDispute["cardnumber"].length <= 16} + {#if selectedDispute["cardnumber"] !== ""} + {#if selectedDispute["cardnumber"].length <= 16}

    Карта

    -

    {foundedDispute["cardnumber"]}

    +

    {selectedDispute["cardnumber"]}

    {:else}

    QR

    {/if} {/if} - {#if foundedDispute["phone"] !== ""} + {#if selectedDispute["phone"] !== ""}

    Телефон

    -

    {foundedDispute["phone"]}

    +

    {selectedDispute["phone"]}

    {/if}

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

    -

    {foundedDispute["creationtime"]}

    - {#if foundedDispute["closetime"] && foundedDispute["closetime"] !== ""} +

    {selectedDispute["creationtime"]}

    + {#if selectedDispute["closetime"] && selectedDispute["closetime"] !== ""}

    Время закрытия

    -

    {foundedDispute["closetime"]}

    +

    {selectedDispute["closetime"]}

    {/if}