diff --git a/BlacksmithWorkshop/BlacksmithWorkshop.sln b/BlacksmithWorkshop/BlacksmithWorkshop.sln index 7e24895..6e8a974 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop.sln +++ b/BlacksmithWorkshop/BlacksmithWorkshop.sln @@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopRestApi", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopClientApp", "BlacksmithWorkshopClientApp\BlacksmithWorkshopClientApp.csproj", "{7C06FD73-C60D-44A6-8699-C3BA0CCCB95B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopShopApp", "BlacksmithWorkshopShopApp\BlacksmithWorkshopShopApp.csproj", "{AB28AF85-782E-41C6-8D28-BB08154CEE2B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopShopApp", "BlacksmithWorkshopShopApp\BlacksmithWorkshopShopApp.csproj", "{AB28AF85-782E-41C6-8D28-BB08154CEE2B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Controllers/HomeController.cs b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Controllers/HomeController.cs index 8dbc6f2..fc51846 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Controllers/HomeController.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Controllers/HomeController.cs @@ -134,7 +134,7 @@ namespace BlacksmithWorkshopShopApp.Controllers { throw new Exception("Вместимость магазина должна быть больше нуля"); } - var listManufacture = ApiClient.GetRequest>($"api/shop/getshopmanufactures?shopId={shop}"); + var listManufacture = ApiClient.GetRequest>($"api/shop/getlistmanufacture?shopId={shop}"); ApiClient.PostRequest("api/shop/updateshop", new ShopBindingModel { Id = shop, diff --git a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Update.cshtml b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Update.cshtml index c3395fa..f15532f 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Update.cshtml +++ b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Update.cshtml @@ -43,7 +43,7 @@ - +
@@ -59,7 +59,7 @@ if (shop) { $.ajax({ method: "GET", - url: "/Home/GetShopWithTravels", + url: "/Home/GetShopWithManufactures", data: { shopId: shop }, success: function (result) { if (result != null) {