Update app.py

app.py

@@ -204,7 +204,10 @@ CATALOG_TEMPLATE = '''
         .quantity-control { display: flex; align-items: center; background: var(--bg); border-radius: 8px; overflow: hidden; border: 1px solid var(--border); }
         .quantity-control button { border: none; background: transparent; width: 32px; height: 32px; font-size: 1.1rem; cursor: pointer; color: var(--primary); display: flex; align-items: center; justify-content: center; transition: background 0.2s; }
         .quantity-control button:active { background: #e0e0e0; }
-        .quantity-control input { width: 36px; height: 32px; border: none; text-align: center; background: transparent; font-weight: 600; font-size: 0.95rem; pointer-events: none; color: var(--primary); }
+        .quantity-control input { width: 36px; height: 32px; border: none; text-align: center; background: transparent; font-weight: 600; font-size: 0.95rem; color: var(--primary); outline: none; }
+        .quantity-control input[type="number"]::-webkit-inner-spin-button, 
+        .quantity-control input[type="number"]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; }
+        .quantity-control input[type="number"] { -moz-appearance: textfield; }
         .box-btn { background: var(--primary); color: #fff; border: none; border-radius: 8px; padding: 0 10px; height: 32px; font-size: 0.8rem; font-weight: 600; cursor: pointer; transition: opacity 0.2s; }
         .box-btn:active { opacity: 0.8; }
         
@@ -232,7 +235,10 @@ CATALOG_TEMPLATE = '''
         .cart-item-controls { display: flex; align-items: center; background: var(--surface); border-radius: 8px; border: 1px solid var(--border); overflow: hidden; }
         .cart-item-controls button { border: none; background: transparent; width: 30px; height: 30px; font-size: 1rem; cursor: pointer; color: var(--primary); }
         .cart-item-controls button:active { background: #e0e0e0; }
-        .cart-item-controls span { width: 35px; text-align: center; font-weight: 600; font-size: 0.9rem; }
+        .cart-item-controls input { width: 35px; text-align: center; font-weight: 600; font-size: 0.9rem; border: none; background: transparent; color: var(--primary); outline: none; }
+        .cart-item-controls input[type="number"]::-webkit-inner-spin-button, 
+        .cart-item-controls input[type="number"]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; }
+        .cart-item-controls input[type="number"] { -moz-appearance: textfield; }
         .cart-item-price { font-weight: 700; color: var(--primary); min-width: 70px; text-align: right; }
         .cart-item-delete { color: #ff7675; background: none; border: none; font-size: 1.1rem; cursor: pointer; padding: 5px; }
         
@@ -446,7 +452,7 @@ CATALOG_TEMPLATE = '''
                             ${addBoxBtn}
                             <div class="quantity-control">
                                 <button onclick="updateCart('${p.product_id}', -1)"><i class="fas fa-minus" style="font-size:0.8rem;"></i></button>
-                                <input type="text" id="qty-${p.product_id}" value="${qty}" readonly>
+                                <input type="number" id="qty-${p.product_id}" value="${qty}" onchange="manualUpdateCart('${p.product_id}', this.value)">
                                 <button onclick="updateCart('${p.product_id}', 1)"><i class="fas fa-plus" style="font-size:0.8rem;"></i></button>
                             </div>
                         </div>
@@ -499,6 +505,12 @@ CATALOG_TEMPLATE = '''
             updateCartUI();
         }
 
+        function manualUpdateCart(productId, val) {
+            let num = parseInt(val);
+            if (isNaN(num) || num < 0) num = 0;
+            updateCart(productId, 0, num);
+        }
+
         function updateCartUI() {
             let total = 0;
             for (let id in cart) {
@@ -537,7 +549,7 @@ CATALOG_TEMPLATE = '''
                         <div style="display:flex; align-items:center; gap: 10px;">
                             <div class="cart-item-controls">
                                 <button onclick="updateCart('${id}', -1)"><i class="fas fa-minus" style="font-size:0.8rem;"></i></button>
-                                <span>${item.quantity}</span>
+                                <input type="number" value="${item.quantity}" onchange="manualUpdateCart('${id}', this.value)">
                                 <button onclick="updateCart('${id}', 1)"><i class="fas fa-plus" style="font-size:0.8rem;"></i></button>
                             </div>
                             <button class="cart-item-delete" onclick="updateCart('${id}', 0, 0)"><i class="fas fa-trash-alt"></i></button>
@@ -692,12 +704,16 @@ ORDER_TEMPLATE = '''
         .total-row { background: #fafafa; font-weight: 800; }
         .total-row td { font-size: 1.1rem; border-bottom: none; }
         
-        .qty-info { font-size: 0.8rem; color: #00b894; font-weight: 600; margin-top: 4px; display: block; }
+        .cart-item-controls { display: inline-flex; align-items: center; background: var(--surface); border-radius: 8px; border: 1px solid var(--border); overflow: hidden; margin-bottom: 5px; }
+        .cart-item-controls button { border: none; background: #f8f9fa; width: 30px; height: 30px; font-size: 1rem; cursor: pointer; color: var(--primary); transition: background 0.2s; }
+        .cart-item-controls button:active { background: #e0e0e0; }
+        .cart-item-controls input { width: 40px; text-align: center; font-weight: 600; font-size: 0.95rem; border: none; background: transparent; color: var(--primary); outline: none; }
+        .cart-item-controls input[type="number"]::-webkit-inner-spin-button, 
+        .cart-item-controls input[type="number"]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; }
+        .cart-item-controls input[type="number"] { -moz-appearance: textfield; }
         
-        .action-btns { display: flex; align-items: center; justify-content: center; gap: 5px; }
-        .edit-btn { background: #f1f2f6; border: 1px solid var(--border); border-radius: 6px; width: 28px; height: 28px; cursor: pointer; color: var(--primary); display: flex; align-items: center; justify-content: center; }
-        .edit-btn:active { background: #dfe6e9; }
-        .delete-btn { color: #ff7675; }
+        .screen-only { display: block; }
+        .print-only { display: none; }
         
         .action-bar { position: fixed; bottom: 0; left: 0; width: 100%; background: var(--surface); box-shadow: 0 -4px 20px rgba(0,0,0,0.08); padding: 15px 20px calc(15px + env(safe-area-inset-bottom)); display: flex; gap: 15px; z-index: 100; justify-content: center; border-top-left-radius: 20px; border-top-right-radius: 20px; }
         .action-bar-inner { display: flex; gap: 15px; width: 100%; max-width: 900px; }
@@ -715,7 +731,8 @@ ORDER_TEMPLATE = '''
             .table-responsive { border: none; overflow: visible; }
             table { min-width: 100%; }
             th, td { border: 1px solid #000; }
-            .action-bar, .no-print { display: none !important; }
+            .action-bar, .screen-only { display: none !important; }
+            .print-only { display: block !important; }
         }
         @media (max-width: 600px) {
             .header h1 { font-size: 1.4rem; }
@@ -758,7 +775,6 @@ ORDER_TEMPLATE = '''
                         <th style="text-align: left;">Наименование</th>
                         <th>Фото</th>
                         <th>Кол-во</th>
-                        <th class="no-print">Действия</th>
                         <th>Цена</th>
                         <th>Сумма</th>
                     </tr>
@@ -766,27 +782,38 @@ ORDER_TEMPLATE = '''
                 <tbody>
                     {% for item in order.cart %}
                     {% set ppb = item.pieces_per_box|default(1)|int %}
-                    {% set boxes = (item.quantity / ppb)|round(0, 'floor')|int %}
+                    {% set boxes = item.quantity // ppb %}
                     {% set remainder = item.quantity % ppb %}
                     <tr>
                         <td>{{ loop.index }}</td>
-                        <td style="text-align: left; font-weight: 500;">
-                            {{ item.name }}
-                            <span class="qty-info">
-                            {% if ppb > 1 and boxes > 0 %}
-                                {{ boxes }} кор.{% if remainder > 0 %} {{ remainder }} шт.{% endif %}
-                            {% else %}
-                                {{ item.quantity }} шт.
-                            {% endif %}
-                            </span>
-                        </td>
+                        <td style="text-align: left; font-weight: 500;">{{ item.name }}</td>
                         <td class="img-cell"><img src="{{ item.photo_url }}" alt="img"></td>
-                        <td style="font-weight: bold;">{{ item.quantity }}</td>
-                        <td class="no-print">
-                            <div class="action-btns">
-                                <button class="edit-btn" onclick="updateItem('{{ item.product_id }}', -1)"><i class="fas fa-minus" style="font-size:0.7rem;"></i></button>
-                                <button class="edit-btn" onclick="updateItem('{{ item.product_id }}', 1)"><i class="fas fa-plus" style="font-size:0.7rem;"></i></button>
-                                <button class="edit-btn delete-btn" onclick="updateItem('{{ item.product_id }}', 0, true)"><i class="fas fa-trash"></i></button>
+                        <td style="text-align: center;">
+                            <div class="screen-only">
+                                <div style="display:flex; flex-direction:column; align-items:center; gap:4px;">
+                                    <div style="display:flex; align-items:center; gap:8px;">
+                                        <div class="cart-item-controls">
+                                            <button onclick="updateItem('{{ item.product_id }}', -1)"><i class="fas fa-minus" style="font-size:0.7rem;"></i></button>
+                                            <input type="number" value="{{ item.quantity }}" onchange="manualUpdateOrder('{{ item.product_id }}', this.value)">
+                                            <button onclick="updateItem('{{ item.product_id }}', 1)"><i class="fas fa-plus" style="font-size:0.7rem;"></i></button>
+                                        </div>
+                                        <button onclick="updateItem('{{ item.product_id }}', 0, true)" style="color: #ff7675; background: none; border: none; font-size: 1.1rem; cursor: pointer; padding: 5px;"><i class="fas fa-trash-alt"></i></button>
+                                    </div>
+                                    <div style="font-size: 0.85rem; color: #00b894; font-weight: 600;">
+                                        {% if ppb > 1 and boxes > 0 %}
+                                            {{ boxes }} кор.{% if remainder > 0 %} {{ remainder }} шт.{% endif %}
+                                        {% else %}
+                                            {{ item.quantity }} шт.
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="print-only" style="font-weight: bold;">
+                                {% if ppb > 1 and boxes > 0 %}
+                                    {{ boxes }} кор.{% if remainder > 0 %} {{ remainder }} шт.{% endif %}
+                                {% else %}
+                                    {{ item.quantity }} шт.
+                                {% endif %}
                             </div>
                         </td>
                         <td>{{ item.price }}</td>
@@ -794,7 +821,7 @@ ORDER_TEMPLATE = '''
                     </tr>
                     {% endfor %}
                     <tr class="total-row">
-                        <td colspan="6" style="text-align: right; padding-right: 20px;">Итого:</td>
+                        <td colspan="5" style="text-align: right; padding-right: 20px;">Итого:</td>
                         <td>{{ order.total_price }} {{ currency_code }}</td>
                     </tr>
                 </tbody>
@@ -837,6 +864,30 @@ ORDER_TEMPLATE = '''
                 document.getElementById('loadingOverlay').style.display = 'none';
             });
         }
+
+        function manualUpdateOrder(productId, val) {
+            let num = parseInt(val);
+            if (isNaN(num) || num < 0) return;
+            document.getElementById('loadingOverlay').style.display = 'flex';
+            fetch(`/edit_order/{{ order.id }}`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ product_id: productId, exact_qty: num })
+            })
+            .then(r => r.json())
+            .then(data => {
+                if(data.success) {
+                    window.location.reload();
+                } else {
+                    alert('Ошибка обновления');
+                    document.getElementById('loadingOverlay').style.display = 'none';
+                }
+            })
+            .catch(() => {
+                alert('Произошла ошибка');
+                document.getElementById('loadingOverlay').style.display = 'none';
+            });
+        }
     </script>
 </body>
 </html>
@@ -1196,6 +1247,7 @@ def edit_order(order_id):
     req_data = request.get_json()
     product_id = req_data.get('product_id')
     change = req_data.get('change', 0)
+    exact_qty = req_data.get('exact_qty')
     remove = req_data.get('remove', False)
 
     for item in order['cart']:
@@ -1203,7 +1255,11 @@ def edit_order(order_id):
             if remove:
                 order['cart'].remove(item)
             else:
-                item['quantity'] += change
+                if exact_qty is not None:
+                    item['quantity'] = int(exact_qty)
+                else:
+                    item['quantity'] += change
+                
                 if item['quantity'] <= 0:
                     order['cart'].remove(item)
             break
@@ -1367,4 +1423,4 @@ if __name__ == '__main__':
         threading.Thread(target=periodic_backup, daemon=True).start()
 
     port = int(os.environ.get('PORT', 7860))
-    app.run(host='0.0.0.0', port=port)
+    app.run(host='0.0.0.0', port=port)