From 2b40c29f3668224737fd40f3f355bb84e7b8230c Mon Sep 17 00:00:00 2001
From: Ino <irisha1234517@gmail.com>
Date: Fri, 28 Apr 2023 11:16:11 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D1=8F=D1=8E?=
 =?UTF-8?q?=D1=89=D0=B8=D1=85=D1=81=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/DataService.js            |  2 +-
 front/src/Pages/CreateOrderPage.jsx | 16 ++++++++++++++--
 front/src/Pages/OrdersPage.jsx      |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/front/src/DataService.js b/front/src/DataService.js
index afe502d..7cd5077 100644
--- a/front/src/DataService.js
+++ b/front/src/DataService.js
@@ -42,7 +42,7 @@ export default class DataService {
     static async create(url, data) {
         const response = await axios.post(getFullUrl(this.mainUrl + url, data))
         const res = response.data
-        console.log(res)
+        //console.log(res)
         return res
     }
 
diff --git a/front/src/Pages/CreateOrderPage.jsx b/front/src/Pages/CreateOrderPage.jsx
index fafd740..c689918 100644
--- a/front/src/Pages/CreateOrderPage.jsx
+++ b/front/src/Pages/CreateOrderPage.jsx
@@ -43,6 +43,10 @@ export default function CreateOrderPage(props){
     }
 
     const createOrder = () => {
+        if(order.supplierId === ''){
+            window.alert ('Заказ был заполнен неверно, попробуйте еще раз')
+            return 
+        }
         DataService.create(url, order)
         .then(data => {
             order.products.map(product =>{
@@ -54,8 +58,16 @@ export default function CreateOrderPage(props){
     const addProductInOrder = () => {
         DataService.read(`${productUrl}${addsProduct.id}`, transformerProduct)
         .then(data => {
-            order.products.push(data)
-            setOrder({ ...order, products: order.products })
+            let contains = false
+            order.products.map(product => {
+                if(product.id === data.id) contains = true
+            })
+            if(!contains){
+                order.products.push(data)
+                setOrder({ ...order, products: order.products })
+            }
+            else 
+                window.alert ('Такой продукт уже был добавлен')
         })
     }
 
diff --git a/front/src/Pages/OrdersPage.jsx b/front/src/Pages/OrdersPage.jsx
index d0f9856..55d5b69 100644
--- a/front/src/Pages/OrdersPage.jsx
+++ b/front/src/Pages/OrdersPage.jsx
@@ -24,7 +24,7 @@ export default function OrderPage(){
 
     const loadItems = () => {
         DataService.getOrders(url).then(data => {
-            console.log(data)
+            // console.log(data)
             setOrders([])
             data.map(order => {
                 setOrders(prevState => [...prevState, new Order(order)])