diff --git a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/ApiClient.cs b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/ApiClient.cs index 0d05a18..eebebac 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/ApiClient.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/ApiClient.cs @@ -15,7 +15,7 @@ namespace BlacksmithWorkshopShopApp _client.BaseAddress = new Uri(configuration["IPAddress"]); _client.DefaultRequestHeaders.Accept.Clear(); _client.DefaultRequestHeaders.Accept.Add(new - MediaTypeWithQualityHeaderValue("application/json")); + MediaTypeWithQualityHeaderValue("application/json")); } public static T? GetRequest(string requestUrl) { diff --git a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Controllers/HomeController.cs b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Controllers/HomeController.cs index db1e079..0ba4273 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Controllers/HomeController.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Controllers/HomeController.cs @@ -20,8 +20,7 @@ namespace BlacksmithWorkshopShopApp.Controllers { return Redirect("~/Home/Enter"); } - return - View(ApiClient.GetRequest>($"api/shop/getshops")); + return View(ApiClient.GetRequest>($"api/shop/getshops")); } [HttpGet] @@ -147,10 +146,10 @@ namespace BlacksmithWorkshopShopApp.Controllers result.Item1.ShopManufactures.Clear(); for (int i = 0; i < result.Item2.Count; i++) { - var icecream = result.Item2[i].Item1; + var manufacture = result.Item2[i].Item1; var count = result.Item2[i].Item2; table += ""; - table += $"{icecream}"; + table += $"{manufacture}"; table += $"{count}"; table += ""; } @@ -167,7 +166,7 @@ namespace BlacksmithWorkshopShopApp.Controllers return View(); } [HttpPost] - public void MakeSupply(int shop, int icecream, int count) + public void MakeSupply(int shop, int manufacture, int count) { if (ApiClient.Access == false) { @@ -175,7 +174,7 @@ namespace BlacksmithWorkshopShopApp.Controllers } ApiClient.PostRequest("api/shop/makesupply", Tuple.Create( new ShopSearchModel() { Id = shop }, - new ManufactureViewModel() { Id = icecream }, + new ManufactureViewModel() { Id = manufacture }, count )); Response.Redirect("Index"); diff --git a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/MakeSupply.cshtml b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/MakeSupply.cshtml index 31cc8df..a889965 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/MakeSupply.cshtml +++ b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/MakeSupply.cshtml @@ -20,7 +20,7 @@
Кузнечное изделие:
- +