diff --git a/BeautyStudio/StoreKeeperWebApp/Controllers/CosmeticController.cs b/BeautyStudio/StoreKeeperWebApp/Controllers/CosmeticController.cs
index f7d5a56..6cd0229 100644
--- a/BeautyStudio/StoreKeeperWebApp/Controllers/CosmeticController.cs
+++ b/BeautyStudio/StoreKeeperWebApp/Controllers/CosmeticController.cs
@@ -71,14 +71,14 @@ namespace StoreKeeperWebApp.Controllers
}
[HttpPost]
- public void CreateCosmetics(string name, string brand, double price, int laborCost)
+ public void CreateCosmetics(string name, double price, int laborCost)
{
if (APIStoreKeeper.Storekeeper == null)
{
throw new Exception("Необходимо авторизоваться!");
}
- if (string.IsNullOrEmpty(name) || string.IsNullOrEmpty(brand) || price <= 0 || laborCost <= 0)
+ if (string.IsNullOrEmpty(name) || price <= 0 || laborCost <= 0)
{
throw new Exception("Введены не все данные!");
}
diff --git a/BeautyStudio/StoreKeeperWebApp/Controllers/HomeController.cs b/BeautyStudio/StoreKeeperWebApp/Controllers/HomeController.cs
index 2d9d045..f7c0628 100644
--- a/BeautyStudio/StoreKeeperWebApp/Controllers/HomeController.cs
+++ b/BeautyStudio/StoreKeeperWebApp/Controllers/HomeController.cs
@@ -103,7 +103,7 @@ namespace StoreKeeperWebApp.Controllers
APIStoreKeeper.Storekeeper = _logic.ReadElement(new StoreKeeperSearchModel
{
- StoreKeeperEmail = login,
+ StoreKeeperLogin = login,
StoreKeeperPassword = password
});
if (APIStoreKeeper.Storekeeper == null)
@@ -125,16 +125,16 @@ namespace StoreKeeperWebApp.Controllers
return View();
}
[HttpPost]
- public void Register(string fullname, string email, string password, string phone)
+ public void Register(string fio, string email, string password, string phone)
{
- if (string.IsNullOrEmpty(fullname) || string.IsNullOrEmpty(email) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(phone))
+ if (string.IsNullOrEmpty(fio) || string.IsNullOrEmpty(email) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(phone))
{
throw new Exception(" !");
}
_logic.Create(new StoreKeeperBindingModel
{
- StoreKeeperFIO = fullname,
+ StoreKeeperFIO = fio,
StoreKeeperEmail = email,
StoreKeeperPassword = password,
StoreKeeperLogin = email,
diff --git a/BeautyStudio/StoreKeeperWebApp/Controllers/LaborCostController.cs b/BeautyStudio/StoreKeeperWebApp/Controllers/LaborCostController.cs
index 32526d7..5b6d8cd 100644
--- a/BeautyStudio/StoreKeeperWebApp/Controllers/LaborCostController.cs
+++ b/BeautyStudio/StoreKeeperWebApp/Controllers/LaborCostController.cs
@@ -28,7 +28,7 @@ namespace StoreKeeperWebApp.Controllers
}
[HttpGet]
- public LaborCostViewModel? GetLaborCost(int id)
+ public LaborCostViewModel? GetLaborCosts(int id)
{
try
{
@@ -45,7 +45,7 @@ namespace StoreKeeperWebApp.Controllers
}
[HttpGet]
- public IActionResult LaborCost()
+ public IActionResult LaborCosts()
{
if (APIStoreKeeper.Storekeeper == null)
{
@@ -56,7 +56,7 @@ namespace StoreKeeperWebApp.Controllers
}
[HttpGet]
- public IActionResult CreateLaborCost()
+ public IActionResult CreateLaborCosts()
{
if (APIStoreKeeper.Storekeeper == null)
{
@@ -72,7 +72,7 @@ namespace StoreKeeperWebApp.Controllers
}
[HttpPost]
- public void CreateLaborCost(int hours, string difficulty, int cosmeticId)
+ public void CreateLaborCosts(int hours, string difficulty, int cosmeticId)
{
if (APIStoreKeeper.Storekeeper == null)
{
@@ -110,12 +110,12 @@ namespace StoreKeeperWebApp.Controllers
});
}
- Response.Redirect("/LaborCost/LaborCost");
+ Response.Redirect("/LaborCost/LaborCosts");
}
[HttpGet]
- public IActionResult UpdateLaborCost(int id)
+ public IActionResult UpdateLaborCosts(int id)
{
if (APIStoreKeeper.Storekeeper == null)
{
@@ -134,7 +134,7 @@ namespace StoreKeeperWebApp.Controllers
}
[HttpPost]
- public void UpdateLaborCost(int hours, string difficulty)
+ public void UpdateLaborCosts(int hours, string difficulty)
{
if (APIStoreKeeper.Storekeeper == null)
{
@@ -153,7 +153,7 @@ namespace StoreKeeperWebApp.Controllers
StoreKeeperId = APIStoreKeeper.Storekeeper.Id
});
- Response.Redirect("/LaborCost/LaborCost");
+ Response.Redirect("/LaborCost/LaborCosts");
}
///
Бренд | -Наименование косметики | -Стоимость | -
---|---|---|
@item.Brand | -@item.CosmeticName | -@item.CosmeticPrice | -
Количество часов | -Сложность | -
---|---|
@item.NumberHours | -@item.Difficlty | -
Выбранные процедуры:
-Наименование | -Стоимость | -- |
---|---|---|
Не выбрано | -- | - |
Добавить процедуру:
-