Update app.py

app.py

@@ -169,7 +169,7 @@ def generate_receipt_html(transaction):
     if has_discounts:
         table_headers = """
         <th style="text-align: center; width: 5%; white-space: nowrap;">№</th>
-        <th style="text-align: left; white-space: nowrap;">Наименование</th>
+        <th class="name-col" style="text-align: left;">Наименование</th>
         <th style="text-align: right; white-space: nowrap;">Кол-во</th>
         <th style="text-align: right; white-space: nowrap;">Цена</th>
         <th style="text-align: right; white-space: nowrap;">Скидка</th>
@@ -179,7 +179,7 @@ def generate_receipt_html(transaction):
     else:
         table_headers = """
         <th style="text-align: center; width: 5%; white-space: nowrap;">№</th>
-        <th style="text-align: left; white-space: nowrap;">Наименование</th>
+        <th class="name-col" style="text-align: left;">Наименование</th>
         <th style="text-align: right; white-space: nowrap;">Кол-во</th>
         <th style="text-align: right; white-space: nowrap;">Цена</th>
         <th style="text-align: right; white-space: nowrap;">Сумма</th>
@@ -194,7 +194,7 @@ def generate_receipt_html(transaction):
         items_html += f"""
         <tr>
             <td style="text-align: center; white-space: nowrap;">{i + 1}</td>
-            <td style="white-space: nowrap;">{item['name']}</td>
+            <td class="name-col">{item['name']}</td>
             <td style="text-align: right; white-space: nowrap;">{item['quantity']}</td>
             <td style="text-align: right; white-space: nowrap;">{format_currency_py(item['price_at_sale'])}</td>
             {discount_cell}
@@ -266,9 +266,11 @@ def generate_receipt_html(transaction):
             .details-grid {{ display: grid; grid-template-columns: 1fr 1fr; gap: 20px; margin-bottom: 20px; font-size: 14px; }}
             table {{ width: 100%; line-height: inherit; text-align: left; border-collapse: collapse; }}
             table th {{ background: #f2f2f2; font-weight: bold; padding: 8px; border-bottom: 2px solid #ddd; white-space: nowrap; }}
+            table th.name-col {{ white-space: normal; }}
             table td {{ padding: 8px; border-bottom: 1px solid #eee; white-space: nowrap; }}
+            table td.name-col {{ white-space: normal; word-wrap: break-word; max-width: 250px; min-width: 150px; }}
             table tr.total td {{ font-weight: bold; font-size: 1.1em; border-top: 2px solid #ddd; }}
-            .footer-info {{ font-size: 14px; margin-top: 20px; }}
+            .footer-info {{ font-size: 14px; margin-top: 20px; display: flex; justify-content: space-between; align-items: flex-end; }}
             .print-hide {{ display: block; }}
             @media print {{
                 body {{ margin: 0; padding: 0; background-color: #fff; }}
@@ -307,8 +309,13 @@ def generate_receipt_html(transaction):
             </table>
             {note_html}
             <div class="footer-info">
-                <p>Способ оплаты: {'Наличные' if transaction['payment_method'] == 'cash' else 'Карта'}</p>
-                <p>Кассир: {transaction['user_name']}</p>
+                <div>
+                    <p style="margin: 2px 0;">Способ оплаты: {'Наличные' if transaction['payment_method'] == 'cash' else 'Карта'}</p>
+                    <p style="margin: 2px 0;">Кассир: {transaction['user_name']}</p>
+                </div>
+                <div>
+                    <img src="https://huggingface.co/spaces/metastore/tech/resolve/main/1778729143842-019e2483-619b-7600-b6f1-03c567356039.png" style="width: 80px; height: auto;">
+                </div>
             </div>
             {links_html}
         </div>
@@ -1591,6 +1598,39 @@ def manage_link():
     upload_db_to_hf('links')
     return redirect(url_for('admin_panel'))
 
+@app.route('/api/notifications/stock', methods=['GET'])
+def get_stock_notifications():
+    user_id = request.args.get('user_id')
+    if not user_id:
+        return jsonify({'success': False, 'message': 'Missing user_id'}), 400
+    users = load_json_data('users')
+    user = find_item_by_field(users, 'id', user_id)
+    if not user:
+        return jsonify({'success': False, 'message': 'User not found'}), 404
+    
+    last_view = user.get('last_stock_view', '2000-01-01T00:00:00')
+    stock_history = load_json_data('stock_history')
+    new_stocks = [
+        s for s in stock_history 
+        if s.get('type') == 'stock_in' and s.get('timestamp', '') > last_view
+    ]
+    return jsonify({'success': True, 'count': len(new_stocks), 'items': new_stocks[-50:]})
+
+@app.route('/api/notifications/stock/view', methods=['POST'])
+def mark_stock_viewed():
+    data = request.json
+    user_id = data.get('user_id')
+    if not user_id:
+        return jsonify({'success': False})
+    users = load_json_data('users')
+    for i, u in enumerate(users):
+        if u.get('id') == user_id:
+            users[i]['last_stock_view'] = get_current_time().isoformat()
+            save_json_data('users', users)
+            upload_db_to_hf('users')
+            return jsonify({'success': True})
+    return jsonify({'success': False})
+
 @app.route('/cashier_login', methods=['GET', 'POST'])
 def cashier_login():
     if request.method == 'POST':
@@ -2118,6 +2158,12 @@ BASE_TEMPLATE = """
         <button class="btn btn-dark d-lg-none" id="sidebar-toggle"><i class="fas fa-bars"></i></button>
         <h2 class="h3 mb-0">__TITLE__</h2>
         <div class="d-flex align-items-center">
+            <div id="stock-notification-container" class="me-3" style="display:none;">
+                <button id="stock-notification-btn" class="btn btn-outline-info btn-sm position-relative" data-bs-toggle="modal" data-bs-target="#stockNotificationModal">
+                    <i class="fas fa-bell"></i>
+                    <span id="stock-notification-badge" class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger" style="display:none; font-size: 0.65em;">0</span>
+                </button>
+            </div>
             {% if not session.admin_logged_in %}
             <a href="{{ url_for('admin_login') }}" class="btn btn-outline-primary btn-sm me-3"><i class="fas fa-user-shield me-1"></i>Войти как админ</a>
             {% endif %}
@@ -2208,6 +2254,21 @@ BASE_TEMPLATE = """
   </div>
 </div>
 
+<div class="modal fade" id="stockNotificationModal" tabindex="-1">
+    <div class="modal-dialog modal-dialog-scrollable">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">Новые поступления</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                <ul id="stock-notification-list" class="list-group">
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
 <script src="https://unpkg.com/html5-qrcode@2.3.8/html5-qrcode.min.js"></script>
 <script>
@@ -2505,6 +2566,7 @@ document.addEventListener('DOMContentLoaded', () => {
     
     let audioCtx;
     let isScannerPaused = false;
+    let stockInterval;
     
     const variantSelectModal = new bootstrap.Modal(document.getElementById('variantSelectModal'));
     const priceSelectModal = new bootstrap.Modal(document.getElementById('priceSelectModal'));
@@ -2987,14 +3049,59 @@ document.addEventListener('DOMContentLoaded', () => {
     document.getElementById('scan-btn').addEventListener('click', startScanner);
     document.getElementById('stop-scan-btn').addEventListener('click', stopScanner);
 
+    const checkStockNotifications = () => {
+        if (!session.cashier) {
+            document.getElementById('stock-notification-container').style.display = 'none';
+            return;
+        }
+        document.getElementById('stock-notification-container').style.display = 'block';
+        fetch(`/api/notifications/stock?user_id=${session.cashier.id}`)
+            .then(r => r.json())
+            .then(data => {
+                if (data.success) {
+                    const badge = document.getElementById('stock-notification-badge');
+                    const list = document.getElementById('stock-notification-list');
+                    if (data.count > 0) {
+                        badge.textContent = data.count;
+                        badge.style.display = 'block';
+                        let itemsHtml = data.items.reverse().map(item => `<li class="list-group-item"><strong>${item.product_name}</strong> (${item.variant_name}) - ${item.quantity} шт.<br><small class="text-muted">${new Date(item.timestamp).toLocaleString('ru-RU')}</small></li>`).join('');
+                        list.innerHTML = itemsHtml;
+                    } else {
+                        badge.style.display = 'none';
+                        list.innerHTML = '<li class="list-group-item text-center text-muted">Нет новых поступлений</li>';
+                    }
+                }
+            });
+    };
+
+    const stockNotificationModalEl = document.getElementById('stockNotificationModal');
+    if (stockNotificationModalEl) {
+        stockNotificationModalEl.addEventListener('hidden.bs.modal', () => {
+            if (session.cashier && document.getElementById('stock-notification-badge').style.display === 'block') {
+                fetch('/api/notifications/stock/view', {
+                    method: 'POST',
+                    headers: {'Content-Type': 'application/json'},
+                    body: JSON.stringify({user_id: session.cashier.id})
+                }).then(() => {
+                    document.getElementById('stock-notification-badge').style.display = 'none';
+                    checkStockNotifications();
+                });
+            }
+        });
+    }
+
     const updateSessionUI = () => {
         const sessionInfoEl = document.getElementById('session-info');
         const shiftControlsEl = document.getElementById('shift-controls');
         
+        clearInterval(stockInterval);
+        
         if (session.shift) {
             sessionInfoEl.innerHTML = `Кассир: <strong>${session.cashier.name}</strong> | Касса: <strong>${session.kassa.name}</strong>`;
             shiftControlsEl.innerHTML = '<button id="end-shift-btn" class="btn btn-danger btn-sm">Закончить смену</button>';
             document.getElementById('end-shift-btn').addEventListener('click', handleEndShift);
+            checkStockNotifications();
+            stockInterval = setInterval(checkStockNotifications, 30000);
         } else if (session.cashier) {
             sessionInfoEl.innerHTML = `Кассир: <strong>${session.cashier.name}</strong>. Смена не начата.`;
             shiftControlsEl.innerHTML = '<button id="start-shift-btn" class="btn btn-success btn-sm">Начать смену</button>';
@@ -3002,9 +3109,12 @@ document.addEventListener('DOMContentLoaded', () => {
                  document.getElementById('start-shift-cashier-name').textContent = session.cashier.name;
                  startShiftModal.show();
             });
+            checkStockNotifications();
+            stockInterval = setInterval(checkStockNotifications, 30000);
         } else {
             sessionInfoEl.innerHTML = 'Нет активного кассира';
             shiftControlsEl.innerHTML = '';
+            document.getElementById('stock-notification-container').style.display = 'none';
         }
     };
     
@@ -4198,7 +4308,7 @@ ITEM_MOVEMENT_CONTENT = """
                             {% else %}<span class="badge bg-secondary">{{ m.type }}</span>{% endif %}
                         </td>
                         <td>{{ m.variant_name }}</td>
-                        <td>{{ m.doc_id }}</td>
+<td>{{ m.doc_id }}</td>
                         <td>{{ m.user }}</td>
                         <td class="text-end">{{ format_currency_py(m.price) }} ₸</td>
                         <td class="text-end fw-bold {% if m.qty > 0 %}text-success{% elif m.qty < 0 %}text-danger{% endif %}">