diff --git a/src/lib/tools/requests/requests.js b/src/lib/tools/requests/requests.js index 8899c0c..e5076fc 100644 --- a/src/lib/tools/requests/requests.js +++ b/src/lib/tools/requests/requests.js @@ -22,7 +22,7 @@ function defaultDataResponseProcessor(data) { export const API_PATH_MAIN = "https://hostapay.trade/api/v1/"; export const API_PATH_TEST = "https://test.0x000f.ru/api/v1/"; -export const API_PATH_VALUE = API_PATH_TEST; +export const API_PATH_VALUE = API_PATH_MAIN; async function makePost( url, diff --git a/src/routes/merchants/+page.svelte b/src/routes/merchants/+page.svelte index 20628bb..56360e6 100644 --- a/src/routes/merchants/+page.svelte +++ b/src/routes/merchants/+page.svelte @@ -47,6 +47,7 @@ } showMerchants = true; selectedMerchant = ""; + newSettleMerchantId = ""; } let selectedMerchant = ""; @@ -95,6 +96,9 @@ makeAuthHeaderForAxios(getAuthInfo()?.a) ); merchantsGeos = res.data.data; + if (!Array.isArray(merchantsGeos)) { + merchantsGeos = []; + } console.log("geos", merchantsGeos); showStats = true; @@ -175,8 +179,17 @@ let selectedSettleNewSum = 0; let selectedSettleNewHash = ""; let selectedSettleId = ""; + let selectedSettleRate = ""; let showLoadingChangeSettle = false; + let showCreateSettleWindow = false; + let newSettleCode = ""; + let newSettleMerchantId = ""; + let newSettleAmount = ""; + let newSettleAddress = ""; + let newSettleRate = ""; + let showLoadingCreateSettle = false; + async function changeSettle(id) { showLoadingChangeSettle = true; const res = await makePost( @@ -185,6 +198,7 @@ id, amount: selectedSettleNewSum.toString(), tx_hash: selectedSettleNewHash, + rate: selectedSettleRate, }, makeAuthHeaderForAxios(getAuthInfo()?.a) ); @@ -200,6 +214,32 @@ showLoadingChangeSettle = false; getMerchantSettles(); } + + async function createSettle() { + showLoadingCreateSettle = true; + const res = await makePost( + "admin/settle/create", + { + code: newSettleCode, + merchant_id: newSettleMerchantId, + amount: newSettleAmount, + settle_address: newSettleAddress, + rate: newSettleRate, + }, + makeAuthHeaderForAxios(getAuthInfo()?.a) + ); + + if (res.error) { + sayError("Не удалось изменить сеттл"); + showLoadingCreateSettle = false; + return; + } + + sayInfo("Сеттл создан"); + showCreateSettleWindow = false; + showLoadingCreateSettle = false; + getMerchantSettles(); + }
@@ -248,6 +288,7 @@ on:click={() => { if (selectedMerchant !== merch["id"]) { selectedMerchant = merch["id"]; + newSettleMerchantId = merch["id"]; getStatistics(); console.log(selectedMerchant); } @@ -371,14 +412,24 @@ -->

Сеттлы

- +
+ + +
{#if showSettlesLoading} {:else} @@ -408,6 +459,7 @@ selectedSettleNewSum = Number(settle["amount"]); selectedSettleNewHash = settle["tx_hash"]; selectedSettleId = settle["id"]; + selectedSettleRate = settle["rate"]; showChangeSettleWindow = true; }} class="btn btn-info">Изменить +

Новый курс

+ + + + +{/if} diff --git a/src/routes/orders/+page.svelte b/src/routes/orders/+page.svelte index 8e66301..fa4e725 100644 --- a/src/routes/orders/+page.svelte +++ b/src/routes/orders/+page.svelte @@ -256,6 +256,10 @@ {/if}

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

{foundedDispute["creationtime"]}

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

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

+

{foundedDispute["closetime"]}

+ {/if}