diff --git a/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/Storekeeper/OrderLogic.cs b/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/Storekeeper/OrderLogic.cs index 5410cc0..623ec1f 100644 --- a/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/Storekeeper/OrderLogic.cs +++ b/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/Storekeeper/OrderLogic.cs @@ -120,5 +120,17 @@ namespace HardwareShopBusinessLogic.BusinessLogics.Storekeeper { return StatusUpdate(model, OrderStatus.Выдан); } + + public bool Delete(OrderBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id: {Id}", model.Id); + if (_orderStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } } } diff --git a/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs b/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs index 4e74580..a47f727 100644 --- a/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs +++ b/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs @@ -10,11 +10,16 @@ namespace HardwareShopClientApp.Controllers { _logger = logger; } + public IActionResult CreateOrder() + { + return View(); + } public IActionResult CreateGood() { return View(); } + public IActionResult LinkBuilds() { return View(); diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml index 7eb80d0..013a662 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml @@ -10,29 +10,24 @@
- @{ -

- Создать комплектующее - Изменить комплектующее - Удалить комплектующее - Привязка сборок -

- - - - - - - - - - -
- Название - - Цена - - Сборки -
- } +

+ Создать комплектующее + Изменить комплектующее + Удалить комплектующее + Привязка сборок +

+ + + + + + + + + +
+ Название + + Цена +
\ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml index 8ac79ae..977b76a 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml @@ -14,7 +14,7 @@
- +
diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateGood.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateGood.cshtml index ab5be4f..77f889e 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateGood.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateGood.cshtml @@ -14,13 +14,24 @@
- + +
+

Добавление комплектующих

+
+ + + + +
+ +
- + + diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateOrder.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateOrder.cshtml index bdbb5a6..38cdd61 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateOrder.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateOrder.cshtml @@ -14,7 +14,7 @@
- +
diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml index 693a8b2..92fb8d2 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml @@ -9,28 +9,26 @@
- @{ -

- Создать товар - Изменить товар - Удалить товар -

-
КомплектующееСтоимостьКоличествоСумма
- - - - - - - - - -
- Название - - Цена - - Комплектующие -
- } +

+ Создать товар + Изменить товар + Удалить товар +

+ + + + + + + + + + +
+ Название + + Цена + + Комплектующие +
\ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml index d29df00..17db230 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml @@ -12,12 +12,20 @@
+ + + + +
+ +
+

Привязанные сборки

- + diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml index 13cfbf9..78b17a5 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml @@ -5,5 +5,23 @@ }
-

Список сборок

-
\ No newline at end of file +

Получение списка сборок

+ + + +

Выбранные товары

+
СборкаЦенаКоличество
+ + + + + + + +
+ Товар +
+
+ +
+ \ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Orders.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Orders.cshtml index 409a20b..aaae7fd 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Orders.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Orders.cshtml @@ -4,6 +4,47 @@ Layout = "~/Views/Shared/_LayoutStorekeeper.cshtml"; } -
- привет, мы в заказах +
+

Заказы

+
+ + +
+

+ Создать заказ + Удалить заказ + Принят + Выполняется + Готов + Выдан +

+ + + + + + + + + + + + + + +
+ Номер + + Товар + + Количество + + Сумма + + Статус + + Дата создания + + Дата выполнения +
\ No newline at end of file diff --git a/HardwareShop/HardwareShopContracts/BusinessLogicsContracts/IOrderLogic.cs b/HardwareShop/HardwareShopContracts/BusinessLogicsContracts/IOrderLogic.cs index 0b84dfc..96af2cd 100644 --- a/HardwareShop/HardwareShopContracts/BusinessLogicsContracts/IOrderLogic.cs +++ b/HardwareShop/HardwareShopContracts/BusinessLogicsContracts/IOrderLogic.cs @@ -11,5 +11,6 @@ namespace HardwareShopContracts.BuisnessLogicsContracts bool TakeOrderInWork(OrderBindingModel model); bool FinishOrder(OrderBindingModel model); bool DeliveryOrder(OrderBindingModel model); + bool Delete(OrderBindingModel model); } }