From e4886b3166bcd41352a66ade7504aafc3bc081d3 Mon Sep 17 00:00:00 2001 From: Bivekich Date: Fri, 18 Jul 2025 16:18:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D1=80?= =?UTF-8?q?=D0=B7=D0=B8=D0=BD=D1=8B=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=BB=D0=B8=D1=87=D0=B8=D0=B8=20=D1=82=D0=BE=D0=B2=D0=B0=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B8=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B5=20?= =?UTF-8?q?=D0=BE=D0=BF=D1=82=D0=BE=D0=B2=D0=B8=D0=BA=D0=B0.=20=D0=9E?= =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=81=D1=82?= =?UTF-8?q?=D0=B8=D0=BB=D0=B8=20=D0=B8=20=D1=84=D1=83=D0=BD=D0=BA=D1=86?= =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BA=D0=BE=D1=80=D0=B7=D0=B8=D0=BD=D1=8B,=20=D1=83?= =?UTF-8?q?=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BD?= =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BE=20?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D0=B0=D1=85=20=D0=B8=20=D0=BE?= =?UTF-8?q?=D0=BF=D1=82=D0=BE=D0=B2=D0=B8=D0=BA=D0=B0=D1=85.=20=D0=A0?= =?UTF-8?q?=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D1=80=D0=B7=D0=B8?= =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=82=D0=BE=D0=B2=D0=B0=D1=80?= =?UTF-8?q?=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplies/create-supply-page.tsx | 65 ++++++++++++++----- 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/src/components/supplies/create-supply-page.tsx b/src/components/supplies/create-supply-page.tsx index b9966ba..905c678 100644 --- a/src/components/supplies/create-supply-page.tsx +++ b/src/components/supplies/create-supply-page.tsx @@ -1,6 +1,6 @@ "use client" -import React, { useState } from 'react' +import React, { useState, useEffect } from 'react' import { Card } from '@/components/ui/card' import { Button } from '@/components/ui/button' import { Badge } from '@/components/ui/badge' @@ -226,6 +226,13 @@ export function CreateSupplyPage() { const [selectedProducts, setSelectedProducts] = useState([]) const [showSummary, setShowSummary] = useState(false) + // Автоматически показываем корзину если в ней есть товары и мы на этапе выбора оптовиков + useEffect(() => { + if (selectedVariant === 'wholesaler' && !selectedWholesaler && selectedProducts.length > 0) { + setShowSummary(true) + } + }, [selectedVariant, selectedWholesaler, selectedProducts.length]) + const formatCurrency = (amount: number) => { return new Intl.NumberFormat('ru-RU', { style: 'currency', @@ -299,10 +306,12 @@ export function CreateSupplyPage() { const handleGoBack = () => { if (selectedWholesaler) { setSelectedWholesaler(null) - setSelectedProducts([]) + // НЕ очищаем корзину! setSelectedProducts([]) setShowSummary(false) } else if (selectedVariant) { setSelectedVariant(null) + setSelectedProducts([]) // Очищаем корзину только при полном выходе + setShowSummary(false) } else { router.push('/supplies') } @@ -677,7 +686,12 @@ export function CreateSupplyPage() {

Выбор оптовика

-

Выберите оптовика для создания поставки

+

+ {selectedProducts.length > 0 + ? `Выберите еще оптовика или перейдите к оформлению (${selectedProducts.length} товаров в корзине)` + : "Выберите оптовика для создания поставки" + } +

{selectedProducts.length > 0 && ( @@ -693,22 +707,27 @@ export function CreateSupplyPage() { )} - {/* Корзина как в маркете */} + {/* Корзина */} {showSummary && selectedProducts.length > 0 && ( - +
-

- - Корзина ({selectedProducts.length}) -

+
+
+ +
+
+

Корзина

+

{selectedProducts.length} товаров от {Object.keys(selectedProducts.reduce((acc, p) => ({ ...acc, [p.wholesalerId]: true }), {})).length} поставщиков

+
+
@@ -834,13 +853,23 @@ export function CreateSupplyPage() { {formatCurrency(getTotalAmount())}
- +
+ + +