Update app.py

app.py

@@ -146,11 +146,24 @@ async def show_products_in_category(callback_query: types.CallbackQuery):
 
         async def send_product_batch(products_batch):
             for product in products_batch:
-                photo_url = f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/photos/{product['photo']}" if product.get('photo') else None
                 caption = f"🏷 {product['name']} - {product['price']} сом\nОписание: {product['description']}\n/id: {product['id']}"
+                photos = product.get('photos', [])
                 try:
-                    if photo_url:
-                        await bot.send_photo(chat_id=callback_query.from_user.id, photo=photo_url, caption=caption, reply_markup=get_product_keyboard(product['id']))
+                    if photos:
+                        if len(photos) == 1:
+                            photo_url = f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/photos/{photos[0]}"
+                            await bot.send_photo(chat_id=callback_query.from_user.id, photo=photo_url, caption=caption, reply_markup=get_product_keyboard(product['id']))
+                        else:
+                            media_group = []
+                            for idx, photo in enumerate(photos):
+                                photo_url = f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/photos/{photo}"
+                                if idx == 0:
+                                    media_group.append(types.InputMediaPhoto(media=photo_url, caption=caption))
+                                else:
+                                    media_group.append(types.InputMediaPhoto(media=photo_url))
+                            await bot.send_media_group(chat_id=callback_query.from_user.id, media=media_group)
+                            # После отправки медиа-группы дополнительно отправляем клавиатуру
+                            await bot.send_message(callback_query.from_user.id, "Выберите действие:", reply_markup=get_product_keyboard(product['id']))
                     else:
                         await bot.send_message(callback_query.from_user.id, caption, reply_markup=get_product_keyboard(product['id']))
                 except Exception as e:
@@ -186,10 +199,29 @@ async def show_cart(message: types.Message):
     builder.button(text="Оформить заказ", callback_data=f"complete_{user_id}")
     await message.answer(response, reply_markup=builder.as_markup())
 
+# Первый этап: после нажатия кнопки "Добавить в корзину" предлагается выбрать количество
 @dp.callback_query(F.data.startswith("add_"))
-async def add_to_cart(callback_query: types.CallbackQuery):
+async def choose_quantity(callback_query: types.CallbackQuery):
     try:
         product_id = int(callback_query.data.split('_')[1])
+        builder = InlineKeyboardBuilder()
+        # Предлагаем выбрать количество от 1 до 10
+        for i in range(1, 11):
+            builder.button(text=str(i), callback_data=f"confirm_{product_id}_{i}")
+        builder.adjust(5)
+        await bot.send_message(callback_query.from_user.id, "Выберите количество:", reply_markup=builder.as_markup())
+        await bot.answer_callback_query(callback_query.id)
+    except Exception as e:
+        logger.error(f"Ошибка при выборе количества: {e}")
+        await bot.answer_callback_query(callback_query.id, "Ошибка")
+
+# Второй этап: подтверждение добавления товара в корзину с выбранным количеством
+@dp.callback_query(F.data.startswith("confirm_"))
+async def confirm_add_to_cart(callback_query: types.CallbackQuery):
+    try:
+        parts = callback_query.data.split('_')
+        product_id = int(parts[1])
+        quantity = int(parts[2])
         product = next((p for p in data['products'] if p['id'] == product_id), None)
         if product:
             user_id = callback_query.from_user.id
@@ -197,11 +229,13 @@ async def add_to_cart(callback_query: types.CallbackQuery):
             if not cart:
                 cart = {'user_id': user_id, 'items': [], 'date': datetime.now().isoformat()}
                 data['orders'].append(cart)
-            cart['items'].append({'product_id': product_id, 'quantity': 1})
+            cart['items'].append({'product_id': product_id, 'quantity': quantity})
             save_data(data)
             await bot.answer_callback_query(callback_query.id, "Товар добавлен в корзину!")
+        else:
+            await bot.answer_callback_query(callback_query.id, "Товар не найден")
     except Exception as e:
-        logger.error(f"Ошибка при добавлении в корзину: {e}")
+        logger.error(f"Ошибка при добавлении товара с количеством: {e}")
         await bot.answer_callback_query(callback_query.id, "Ошибка")
 
 @dp.callback_query(F.data.startswith("complete_"))
@@ -354,7 +388,8 @@ admin_html = """
                     <option value="{{ category.id }}">{{ category.name }}</option>
                     {% endfor %}
                 </select>
-                <input type="file" name="photo" accept="image/*">
+                <!-- Разрешаем загрузку нескольких фото -->
+                <input type="file" name="photo" accept="image/*" multiple>
                 <button type="submit">Добавить товар</button>
             </form>
             <h3>Существующие товары</h3>
@@ -363,8 +398,10 @@ admin_html = """
                 <div class="item">
                     {{ product.name }} - {{ product.price }} сом<br>
                     {{ product.description }}<br>
-                    {% if product.photo %}
-                        <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product.photo }}" alt="{{ product.name }}">
+                    {% if product.photos and product.photos|length > 0 %}
+                        {% for photo in product.photos %}
+                            <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ photo }}" alt="{{ product.name }}">
+                        {% endfor %}
                     {% endif %}
                     <button onclick="deleteProduct({{ product.id }})">Удалить</button>
                 </div>
@@ -439,24 +476,28 @@ def add_product():
         price = float(request.form['price'])
         description = request.form['description']
         category_id = int(request.form['category_id'])
-        photo = request.files.get('photo')
+        photos = request.files.getlist('photo')
         product_id = max((p['id'] for p in data['products']), default=0) + 1
 
-        photo_filename = None
-        if photo and photo.filename:
-            photo_filename = secure_filename(photo.filename)
-            temp_path = os.path.join(".", photo_filename)
-            photo.save(temp_path)
-            api = HfApi()
-            api.upload_file(
-                path_or_fileobj=temp_path,
-                path_in_repo=f"photos/{photo_filename}",
-                repo_id=REPO_ID,
-                repo_type="dataset",
-                token=HF_TOKEN_WRITE,
-                commit_message=f"Добавлено фото для товара {name}"
-            )
-            os.remove(temp_path)
+        photos_filenames = []
+        if photos:
+            # Обрабатываем до 3 фото
+            for photo in photos[:3]:
+                if photo and photo.filename:
+                    photo_filename = secure_filename(photo.filename)
+                    temp_path = os.path.join(".", photo_filename)
+                    photo.save(temp_path)
+                    api = HfApi()
+                    api.upload_file(
+                        path_or_fileobj=temp_path,
+                        path_in_repo=f"photos/{photo_filename}",
+                        repo_id=REPO_ID,
+                        repo_type="dataset",
+                        token=HF_TOKEN_WRITE,
+                        commit_message=f"Добавлено фото для товара {name}"
+                    )
+                    os.remove(temp_path)
+                    photos_filenames.append(photo_filename)
 
         data['products'].append({
             'id': product_id,
@@ -464,7 +505,7 @@ def add_product():
             'price': price,
             'description': description,
             'category_id': category_id,
-            'photo': photo_filename
+            'photos': photos_filenames
         })
         save_data(data)
         update_event.set()