diff --git a/BTCPayServer/Components/StoreSelector/Default.cshtml b/BTCPayServer/Components/StoreSelector/Default.cshtml index c5cb6c5d3..dc972f15b 100644 --- a/BTCPayServer/Components/StoreSelector/Default.cshtml +++ b/BTCPayServer/Components/StoreSelector/Default.cshtml @@ -24,10 +24,6 @@
  • Create Store
  • - } else { diff --git a/BTCPayServer/Controllers/InvoiceController.UI.cs b/BTCPayServer/Controllers/InvoiceController.UI.cs index 5340b48d8..d05aff47f 100644 --- a/BTCPayServer/Controllers/InvoiceController.UI.cs +++ b/BTCPayServer/Controllers/InvoiceController.UI.cs @@ -857,7 +857,7 @@ namespace BTCPayServer.Controllers if (!stores.Any()) { TempData[WellKnownTempData.ErrorMessage] = "You need to create at least one store before creating a transaction"; - return RedirectToAction(nameof(UserStoresController.ListStores), "UserStores"); + return RedirectToAction(nameof(HomeController.Index), "Home"); } if (model?.StoreId != null) diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs index 9af266de0..b839d18b7 100644 --- a/BTCPayServer/Controllers/StoresController.cs +++ b/BTCPayServer/Controllers/StoresController.cs @@ -701,7 +701,7 @@ namespace BTCPayServer.Controllers { await _Repo.DeleteStore(CurrentStore.Id); TempData[WellKnownTempData.SuccessMessage] = "Store successfully deleted."; - return RedirectToAction(nameof(UserStoresController.ListStores), "UserStores"); + return RedirectToAction(nameof(HomeController.Index), "Home"); } private IEnumerable GetSupportedExchanges() @@ -873,7 +873,7 @@ namespace BTCPayServer.Controllers if (!model.Stores.Any()) { TempData[WellKnownTempData.ErrorMessage] = "You need to be owner of at least one store before pairing"; - return RedirectToAction(nameof(UserStoresController.ListStores), "UserStores"); + return RedirectToAction(nameof(HomeController.Index), "Home"); } return View(model); } @@ -932,7 +932,7 @@ namespace BTCPayServer.Controllers if (pairing == null) { TempData[WellKnownTempData.ErrorMessage] = "Unknown pairing code"; - return RedirectToAction(nameof(UserStoresController.ListStores), "UserStores"); + return RedirectToAction(nameof(HomeController.Index), "Home"); } else { diff --git a/BTCPayServer/Controllers/UserStoresController.cs b/BTCPayServer/Controllers/UserStoresController.cs index 07aaa7401..03ba145ee 100644 --- a/BTCPayServer/Controllers/UserStoresController.cs +++ b/BTCPayServer/Controllers/UserStoresController.cs @@ -78,60 +78,7 @@ namespace BTCPayServer.Controllers return NotFound(); await _repo.RemoveStore(storeId, userId); TempData[WellKnownTempData.SuccessMessage] = "Store removed successfully"; - return RedirectToAction(nameof(ListStores)); - } - - [HttpGet] - [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie, Policy = Policies.CanModifyStoreSettingsUnscoped)] - public async Task ListStores( - string sortOrder = null, - string sortOrderColumn = null - ) - { - StoresViewModel result = new StoresViewModel(); - var stores = await _repo.GetStoresByUserId(GetUserId()); - if (sortOrder != null && sortOrderColumn != null) - { - stores = stores.OrderByDescending(store => - { - switch (sortOrderColumn) - { - case nameof(store.StoreName): - return store.StoreName; - case nameof(store.StoreWebsite): - return store.StoreWebsite; - default: - return store.Id; - } - }).ToArray(); - - switch (sortOrder) - { - case "desc": - ViewData[$"{sortOrderColumn}SortOrder"] = "asc"; - break; - case "asc": - stores = stores.Reverse().ToArray(); - ViewData[$"{sortOrderColumn}SortOrder"] = "desc"; - break; - } - } - - for (int i = 0; i < stores.Length; i++) - { - var store = stores[i]; - var blob = store.GetStoreBlob(); - result.Stores.Add(new StoresViewModel.StoreViewModel() - { - Id = store.Id, - - Name = store.StoreName, - WebSite = store.StoreWebsite, - IsOwner = store.Role == StoreRoles.Owner, - HintWalletWarning = blob.Hints.Wallet && blob.Hints.Lightning - }); - } - return View(result); + return RedirectToAction(nameof(HomeController.Index), "Home"); } private string GetUserId() => _userManager.GetUserId(User); diff --git a/BTCPayServer/Models/StoreViewModels/StoresViewModel.cs b/BTCPayServer/Models/StoreViewModels/StoresViewModel.cs deleted file mode 100644 index 075a55bbe..000000000 --- a/BTCPayServer/Models/StoreViewModels/StoresViewModel.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections.Generic; - -namespace BTCPayServer.Models.StoreViewModels -{ - public class StoresViewModel - { - public List Stores { get; set; } = new List(); - - public class StoreViewModel - { - public string Id { get; set; } - public string Name { get; set; } - public string WebSite { get; set; } - public bool IsOwner { get; set; } - public bool HintWalletWarning { get; set; } - } - } -} diff --git a/BTCPayServer/Views/Home/Home.cshtml b/BTCPayServer/Views/Home/Home.cshtml index 7e84ecdff..cdf617b12 100644 --- a/BTCPayServer/Views/Home/Home.cshtml +++ b/BTCPayServer/Views/Home/Home.cshtml @@ -30,6 +30,8 @@ } + +

    Welcome to your BTCPay Server

    @if (Model.HasStore) diff --git a/BTCPayServer/Views/UserStores/ListStores.cshtml b/BTCPayServer/Views/UserStores/ListStores.cshtml deleted file mode 100644 index 1e6edd8b7..000000000 --- a/BTCPayServer/Views/UserStores/ListStores.cshtml +++ /dev/null @@ -1,95 +0,0 @@ -@model StoresViewModel -@{ - ViewData.SetActivePage(StoreNavPages.Index, "Stores"); - var storeNameSortOrder = (string)ViewData["StoreNameSortOrder"]; - var storeWebsiteSortOrder = (string)ViewData["StoreWebsiteSortOrder"]; - var sortByDesc = "Sort by descending..."; - var sortByAsc = "Sort by ascending..."; -} - - - -
    -

    @ViewData["Title"]

    - Create a new store -
    - -
    -
    - @if (Model.Stores.Any()) - { - - - - - - - - - - @foreach (var store in Model.Stores) - { - - - - - - } - -
    - - Name - - - - - Website - - - Actions
    - @if (store.IsOwner) - { - @store.Name - } - else - { - @store.Name - } - @if (store.HintWalletWarning) - { - - } - - @if (!string.IsNullOrEmpty(store.WebSite)) - { - @store.WebSite - } - - Invoices - - Pull Payments - @if (store.IsOwner) - { - - - Settings - - Delete - } -
    - } - else - { -

    - There are no stores yet. -

    - } -
    -
    - -