Update app.py

app.py

@@ -100,6 +100,7 @@ translations = {
         'error_page_title': 'Ошибка',
         'order_not_found_by_id': 'Заказ с таким ID не найден.',
         'whatsapp_greeting': 'Здравствуйте! Хочу подтвердить свой заказ на emir:',
+        'whatsapp_product_inquiry': 'Здравствуйте! Хочу уточнить цену на товар: {product_name}',
         'whatsapp_order_number': 'Номер заказа:',
         'whatsapp_order_link': 'Ссылка на заказ:',
         'whatsapp_contact_request': 'Пожалуйста, свяжитесь со мной для уточнения деталей оплаты и доставки.',
@@ -205,11 +206,11 @@ translations = {
         'flash_category_delete_success': "Категория '{category_name}' удалена.",
         'flash_category_delete_failed': "Не удалось удалить категорию '{category_name}'.",
         'flash_subcategory_added_success': "Подкатегория '{subcategory_name}' успешно добавлена.",
-        'flash_subcategory_name_empty': 'Название подкатегории не может быть пустым.',
+        'flash_subcategory_name_empty': 'Название подкатегодии не может быть пустым.',
         'flash_parent_category_not_selected': 'Необходимо выбрать родительскую категорию.',
         'flash_subcategory_already_exists': "Подкатегория '{subcategory_name}' уже существует в этой категории.",
         'flash_subcategory_delete_success': "Подкатегория '{subcategory_name}' удалена.",
-        'flash_subcategory_delete_failed': "Не удалось удалить подкатегорию.",
+        'flash_subcategory_delete_failed': "Не удалось удалить подкатегодию.",
         'flash_supplier_added_success': "Поставщик '{supplier_name}' успешно добавлен.",
         'flash_supplier_name_empty': 'Имя поставщика не может быть пустым.',
         'flash_supplier_already_exists': "Поставщик '{supplier_name}' уже существует.",
@@ -238,7 +239,7 @@ translations = {
         'flash_failed_delete_hf_files_warning': "Не удалось удалить файлы для товара '{product_name}' с сервера. Товар удален локально.",
         'flash_hf_token_write_not_set_files_not_deleted_warning': "Товар '{product_name}' удален локально, но файлы не удалены с сервера (токен не задан).",
         'flash_product_deleted_success': "Товар '{product_name}' удален.",
-        'flash_delete_error_not_found': "Ошибка удаления: товар с ID '{product_id}' не найден.",
+        'flash_delete_error_not_found': "Ошибка удаления: товар с таким ID не найден.",
         'flash_unknown_action': 'Неизвестное действие: {action}',
         'flash_internal_error': "Произошла внутренняя ошибка при выполнении действия '{action}'. Подробности в логе сервера.",
         'flash_data_uploaded_hf_success': 'Данные успешно загружены на Hugging Face.',
@@ -255,7 +256,7 @@ translations = {
         'flash_settings_updated': 'Настройки успешно обновлены.',
         'prices_disabled_notice_catalog': 'Цены временно не отображаются. Добавьте товары в корзину для запроса стоимости.',
         'prices_disabled_notice_cart': 'Цены не отображаются. Стоимость будет рассчитана после оформления заказа.',
-        'request_price_calculation_button': 'Запросить расчет стоимости',
+        'request_price_calculation_button': 'Уточнить цену в WhatsApp',
         'price_on_request': 'Цена по запросу',
         'video_modal_title': 'Видео о товаре',
         'save_all_changes_button': 'Сохранить все изменения ({count})',
@@ -941,14 +942,18 @@ CATALOG_TEMPLATE = '''
                             <div class="product-price-container">
                                 {% set discount = product.get('discount_percent', 0) %}
                                 {% set original_price_kgs = product.price_kgs %}
-                                {% if app_config.prices_enabled and original_price_kgs > 0 %}
+                                {% if app_config.prices_enabled %}
                                     {% if discount > 0 %}
                                         {% set discounted_price_kgs = original_price_kgs * (100 - discount) / 100 %}
                                         <span class="original-price">{{ "%.2f"|format(original_price_kgs) }} {{ currency_code }}</span><br>
                                         <span class="product-price discounted">{{ "%.2f"|format(discounted_price_kgs) }} {{ currency_code }}</span>
                                         <span class="discount-badge">{{ get_translation('discount_badge_text', discount=discount) }}</span>
                                     {% else %}
-                                        <span class="product-price">{{ "%.2f"|format(original_price_kgs) }} {{ currency_code }}</span>
+                                        {% if original_price_kgs > 0 %}
+                                            <span class="product-price">{{ "%.2f"|format(original_price_kgs) }} {{ currency_code }}</span>
+                                        {% else %}
+                                            <div class="product-price on-request">{{ get_translation('price_on_request') }}</div>
+                                        {% endif %}
                                     {% endif %}
                                 {% else %}
                                     <div class="product-price on-request">{{ get_translation('price_on_request') }}</div>
@@ -962,9 +967,16 @@ CATALOG_TEMPLATE = '''
                                <i class="fas fa-play-circle"></i> {{ get_translation('view_video_button') }}
                             </button>
                             {% endif %}
-                            <button class="product-button add-to-cart" onclick="openQuantityModal({{ loop.index0 }})">
-                               <i class="fas fa-cart-plus"></i> {{ get_translation('add_to_cart') }}
-                            </button>
+                            
+                            {% if app_config.prices_enabled %}
+                                <button class="product-button add-to-cart" onclick="openQuantityModal({{ loop.index0 }})">
+                                   <i class="fas fa-cart-plus"></i> {{ get_translation('add_to_cart') }}
+                                </button>
+                            {% else %}
+                                <button class="product-button add-to-cart" style="background-color: #25D366;" onclick="inquireProductWhatsApp({{ loop.index0 }})">
+                                   <i class="fab fa-whatsapp"></i> {{ get_translation('request_price_calculation_button') }}
+                                </button>
+                            {% endif %}
                         </div>
                     </div>
                 </div>
@@ -1061,6 +1073,21 @@ CATALOG_TEMPLATE = '''
                 return text;
             }
 
+            function inquireProductWhatsApp(index) {
+                const product = products[index];
+                if (!product) return;
+                
+                const phoneNumber = "996553303156";
+                
+                const inquiryMessageTemplate = `{{ get_translation('whatsapp_product_inquiry', product_name='PLACEHOLDER_NAME') }}`;
+                const inquiryMessage = encodeURIComponent(
+                    inquiryMessageTemplate.replace('PLACEHOLDER_NAME', product.name)
+                );
+                
+                const whatsappUrl = `https://wa.me/${phoneNumber}?text=${inquiryMessage}`;
+                window.open(whatsappUrl, '_blank');
+            }
+
             function openModal(index) {
                 loadProductDetails(index);
                 const modal = document.getElementById('productModal');
@@ -1202,6 +1229,12 @@ CATALOG_TEMPLATE = '''
                 if (product.discount_percent && product.discount_percent > 0) {
                     priceToAdd = product.price_kgs * (100 - product.discount_percent) / 100;
                 }
+                
+                // If price is 0 (optional price field not set by admin) but prices are enabled in config, we still use 0.
+                if (!pricesEnabled && priceToAdd === 0) {
+                    // If prices are disabled, we treat the price as irrelevant for calculation here, but we save 0 to the cart item if not set.
+                }
+
 
                 if (existingItemIndex > -1) {
                     cart[existingItemIndex].quantity += quantity;
@@ -1540,7 +1573,7 @@ PRODUCT_DETAIL_TEMPLATE = '''
             
             {% set discount = product_info.get('discount_percent', 0) %}
             {% set original_price_kgs = product_info.price_kgs %}
-            {% if app_config.prices_enabled and original_price_kgs > 0 %}
+            {% if app_config.prices_enabled %}
                 <div style="margin: 20px 0; padding: 15px; background: var(--bg-steel-mid); border-radius: 8px;">
                     <strong style="font-size: 1.1rem; color: var(--text-light);">{{ get_translation('price') }}</strong>
                     {% if discount > 0 %}
@@ -1548,7 +1581,11 @@ PRODUCT_DETAIL_TEMPLATE = '''
                         <span style="font-size: 1.8rem; font-weight: 700; color: var(--accent-red); margin-left: 10px;">{{ "%.2f"|format(discounted_price_kgs) }} {{ currency_code }}</span>
                         <span style="text-decoration: line-through; color: var(--text-steel); font-size: 1.2rem; margin-left: 15px;">{{ "%.2f"|format(original_price_kgs) }} {{ currency_code }}</span>
                     {% else %}
-                        <span style="font-size: 1.8rem; font-weight: 700; color: var(--text-light); margin-left: 10px;">{{ "%.2f"|format(original_price_kgs) }} {{ currency_code }}</span>
+                        {% if original_price_kgs > 0 %}
+                            <span style="font-size: 1.8rem; font-weight: 700; color: var(--text-light); margin-left: 10px;">{{ "%.2f"|format(original_price_kgs) }} {{ currency_code }}</span>
+                        {% else %}
+                            <span style="font-size: 1.2rem; font-weight: bold; color: var(--text-steel); margin-left: 10px;">{{ get_translation('price_on_request') }}</span>
+                        {% endif %}
                     {% endif %}
                 </div>
             {% else %}
@@ -1624,13 +1661,13 @@ ORDER_TEMPLATE = '''
                         <img src="{{ item.photo_url }}" alt="{{ item.name }}" {% if not item.photo %}style="opacity: 0.5;"{% endif %}>
                         <div class="item-details">
                             <strong>{{ item.name }} {% if item.color != 'N/A' %}({{ item.color }}){% endif %}</strong>
-                            {% if order.prices_were_enabled_at_order %}
+                            {% if order.prices_were_enabled_at_order and item.price_kgs_at_order > 0 %}
                                 <span>{{ "%.2f"|format(item.price_kgs_at_order) }} {{ currency_code }} × {{ item.quantity }}</span>
                             {% else %}
                                 <span>{{ get_translation('quantity') }} {{ item.quantity }}</span>
                             {% endif %}
                         </div>
-                        {% if order.prices_were_enabled_at_order %}
+                        {% if order.prices_were_enabled_at_order and item.price_kgs_at_order > 0 %}
                         <div class="item-total">
                             {{ "%.2f"|format(item.price_kgs_at_order * item.quantity) }} {{ currency_code }}
                         </div>
@@ -1643,7 +1680,7 @@ ORDER_TEMPLATE = '''
                 {% endfor %}
             </div>
 
-            {% if order.prices_were_enabled_at_order %}
+            {% if order.prices_were_enabled_at_order and order.total_price_kgs > 0 %}
             <div class="order-summary">
                 <p>{{ get_translation('total_products_sum') }} <strong>{{ "%.2f"|format(order.total_price_kgs) }} {{ currency_code }}</strong></p>
             </div>
@@ -1676,7 +1713,7 @@ ORDER_TEMPLATE = '''
                     message += `*{{ get_translation('whatsapp_order_number') | replace("'", "\\'") }}* ${orderId}` + "%0A";
                     message += `*{{ get_translation('whatsapp_order_link') | replace("'", "\\'") }}* ${encodedOrderUrl}` + "%0A%0A";
 
-                    {% if not order.prices_were_enabled_at_order %}
+                    {% if not order.prices_were_enabled_at_order or order.total_price_kgs == 0 %}
                         message += `{{ get_translation('whatsapp_request_price_calculation') | replace("'", "\\'") }}` + "%0A%0A";
                     {% endif %}
 
@@ -1805,6 +1842,7 @@ ADMIN_TEMPLATE = '''
                 <h2><i class="fas fa-cog"></i> {{ get_translation('admin_settings_title') }}</h2>
                 <form method="POST" action="{{ url_for('admin_actions') }}">
                     <input type="hidden" name="action" value="update_settings">
+                    <label>{{ get_translation('admin_prices_visibility_label') }}</label>
                     <div style="margin-top: 15px;">
                         <input type="checkbox" id="prices_enabled" name="prices_enabled" {% if app_config.prices_enabled %}checked{% endif %}>
                         <label for="prices_enabled" class="inline-label">{{ get_translation('admin_prices_enabled_checkbox_label') }}</label>
@@ -2039,7 +2077,7 @@ ADMIN_TEMPLATE = '''
                                 <p><strong>{{ get_translation('supplier') }}:</strong> {{ product_info.supplier_name }}</p>
                                 <p><strong>{{ get_translation('category') }}:</strong> {{ product_info.category_name }}</p>
                                 <p><strong>{{ get_translation('subcategory') }}:</strong> {{ product_info.subcategory_name }}</p>
-                                <p><strong>{{ get_translation('price') }}:</strong> {{ "%.2f"|format(product_info.price_kgs) }} {{ currency_code }}</p>
+                                <p><strong>{{ get_translation('price') }}:</strong> {% if product_info.price_kgs > 0 %} {{ "%.2f"|format(product_info.price_kgs) }} {{ currency_code }} {% else %} {{ get_translation('price_on_request') }} {% endif %}</p>
                                 {% if product_info.get('discount_percent', 0) > 0 %}
                                     <p><strong class="discount-info">{{ get_translation('discount_label_item') }} {{ product_info.discount_percent }}%</strong></p>
                                 {% endif %}
@@ -2538,10 +2576,11 @@ def create_order():
             price_kgs_in_cart = float(item['price_kgs'])
             original_price_kgs = float(item.get('original_price_kgs', price_kgs_in_cart))
             quantity = int(item['quantity'])
-            if price_kgs_in_cart < 0 or quantity <= 0:
-                raise ValueError("Invalid price or quantity")
-
-            if prices_currently_enabled:
+            if quantity <= 0:
+                raise ValueError("Invalid quantity")
+            
+            # If prices are enabled OR the price is positive, calculate total
+            if prices_currently_enabled and price_kgs_in_cart > 0:
                 total_price_kgs += price_kgs_in_cart * quantity
 
             processed_cart.append({
@@ -2673,24 +2712,24 @@ def admin_api():
     try:
         if action == 'add_product':
             name = request.form.get('name', '').strip()
+            
             if not name:
-                return jsonify({'error': get_translation('flash_product_name_price_required')}), 400
+                return jsonify({'error': get_translation('flash_product_name_price_required')}), 400 
 
-            price_kgs_str = request.form.get('price_kgs', '').replace(',', '.')
-            if not price_kgs_str:
-                price_kgs = 0.0
-            else:
-                try:
-                    price_kgs = round(float(price_kgs_str), 2)
-                    if price_kgs < 0: price_kgs = 0.0
-                except ValueError:
-                     return jsonify({'error': get_translation('flash_invalid_price_format')}), 400
+            price_kgs_str = request.form.get('price_kgs', '0').replace(',', '.')
+            if not price_kgs_str.strip(): price_kgs_str = '0'
+            
+            try:
+                price_kgs = round(float(price_kgs_str), 2)
+                if price_kgs < 0: price_kgs = 0
+            except ValueError:
+                 return jsonify({'error': get_translation('flash_invalid_price_format')}), 400
             
             discount_percent_str = request.form.get('discount_percent', '0')
             try:
                 discount_percent = int(discount_percent_str)
                 if not (0 <= discount_percent <= 100): discount_percent = 0
-            except (ValueError, TypeError):
+            except ValueError:
                 discount_percent = 0
             
             description = request.form.get('description', '').strip()
@@ -2701,6 +2740,9 @@ def admin_api():
             on_order = 'on_order' in request.form
             is_top = 'is_top' in request.form
 
+            if in_stock and on_order: # Ensure mutual exclusion
+                on_order = False
+
             photos_list = []
             video_filename = None
 
@@ -2769,24 +2811,25 @@ def admin_api():
 
             product_to_edit['name'] = request.form.get('name', product_to_edit['name']).strip()
             
-            price_kgs_str = request.form.get('price_kgs', '').replace(',', '.')
-            if not price_kgs_str:
-                product_to_edit['price_kgs'] = 0.0
-            else:
+            price_kgs_str = request.form.get('price_kgs')
+            
+            if price_kgs_str is not None:
+                price_kgs_str = price_kgs_str.replace(',', '.')
+                if not price_kgs_str.strip(): price_kgs_str = '0'
+                
                 try:
                     price_kgs = round(float(price_kgs_str), 2)
-                    if price_kgs < 0: price_kgs = 0.0
+                    if price_kgs < 0: price_kgs = 0
                     product_to_edit['price_kgs'] = price_kgs
-                except ValueError: 
-                    pass 
+                except ValueError:
+                    logging.warning(get_translation('flash_invalid_price_format_edit_warning', product_name=product_to_edit['name']))
 
             discount_percent_str = request.form.get('discount_percent', str(product_to_edit.get('discount_percent',0)))
             try:
                 discount_percent = int(discount_percent_str)
                 if not (0 <= discount_percent <= 100): discount_percent = product_to_edit.get('discount_percent', 0)
                 product_to_edit['discount_percent'] = discount_percent
-            except (ValueError, TypeError):
-                pass
+            except ValueError: pass
 
             product_to_edit['description'] = request.form.get('description', product_to_edit.get('description', '')).strip()
             product_to_edit['subcategory_id'] = request.form.get('subcategory_id') or None