Update app.py

app.py

@@ -234,8 +234,16 @@ def sales_screen():
             active_inventory.append(p)
 
     active_inventory.sort(key=lambda x: x.get('name', '').lower())
+
+    grouped_inventory = defaultdict(list)
+    for p in active_inventory:
+        first_letter = p.get('name', '#')[0].upper()
+        grouped_inventory[first_letter].append(p)
+
+    sorted_grouped_inventory = sorted(grouped_inventory.items())
+
     html = BASE_TEMPLATE.replace('__TITLE__', "Касса").replace('__CONTENT__', SALES_SCREEN_CONTENT).replace('__SCRIPTS__', SALES_SCREEN_SCRIPTS)
-    return render_template_string(html, inventory=active_inventory, users=users, kassas=kassas)
+    return render_template_string(html, inventory=active_inventory, users=users, kassas=kassas, grouped_inventory=sorted_grouped_inventory)
 
 @app.route('/inventory', methods=['GET', 'POST'])
 @admin_required
@@ -717,13 +725,16 @@ def product_roi_report():
                             if t['type'] == 'sale':
                                 total_qty_sold += item['quantity']
                             elif t['type'] == 'return':
-                                total_qty_sold += item['quantity']
+                                total_qty_sold -= item['quantity'] # Corrected to subtract for returns
 
             current_stock = to_decimal(str(variant.get('stock', 0)))
             cost_price = to_decimal(variant.get('cost_price', '0'))
             
             inventory_value = current_stock * cost_price
-            total_investment = total_cogs + inventory_value
+            
+            # For simplicity, calculate total investment as historical COGS + current inventory value.
+            # This is a basic model, more advanced models might consider purchase dates, etc.
+            total_investment = total_cogs + inventory_value 
             payback = total_revenue - total_investment
 
             product_stats.append({
@@ -972,6 +983,8 @@ def return_transaction(transaction_id):
     return_items = []
     inventory_updates = {}
     for item in original_transaction['items']:
+        # For a return, quantity becomes negative, and total becomes negative.
+        # This will reverse the effect on stock and total amount.
         return_items.append({**item, 'quantity': -item['quantity'], 'total': str(-to_decimal(item['total']))})
         product = find_item_by_field(inventory, 'id', item['product_id'])
         if product:
@@ -992,7 +1005,7 @@ def return_transaction(transaction_id):
         'kassa_id': original_transaction['kassa_id'],
         'kassa_name': original_transaction['kassa_name'],
         'items': return_items,
-        'total_amount': str(-total_amount),
+        'total_amount': str(-total_amount), # Total amount for return is negative
         'payment_method': original_transaction['payment_method']
     }
     transactions.append(return_transaction)
@@ -1016,7 +1029,7 @@ def return_transaction(transaction_id):
         for i, k in enumerate(kassas):
             if k['id'] == original_transaction['kassa_id']:
                 current_balance = to_decimal(k.get('balance', '0'))
-                kassas[i]['balance'] = str(current_balance - total_amount)
+                kassas[i]['balance'] = str(current_balance - total_amount) # Subtract total amount for cash return
                 kassas[i].setdefault('history', []).append({
                     'type': 'return', 'amount': str(-total_amount), 'timestamp': now_iso,
                     'transaction_id': return_transaction['id']
@@ -1253,20 +1266,34 @@ SALES_SCREEN_CONTENT = """
                     <button id="stop-scan-btn" class="btn btn-danger btn-sm mt-2">Остановить</button>
                 </div>
                 <input type="text" id="product-search" class="form-control mb-3" placeholder="Поиск по названию или штрих-коду...">
-                <div id="product-grid" class="d-grid gap-2" style="grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));">
-                    {% for p in inventory %}
-                    <div class="card text-center product-card" data-barcode="{{ p.barcode }}">
-                        <div class="card-body p-2">
-                            <h6 class="card-title small mb-1">{{ p.name }}</h6>
-                            <p class="card-text fw-bold mb-0">
-                                {% if p.variants|length > 1 %}
-                                    от {{ format_currency_py(p.variants|map(attribute='price')|min) }} с
-                                {% elif p.variants|length == 1 %}
-                                    {{ format_currency_py(p.variants[0].price) }} с
-                                {% else %}
-                                    Нет в наличии
-                                {% endif %}
-                            </p>
+                
+                <div id="product-accordion" class="accordion">
+                    {% for letter, products in grouped_inventory %}
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="heading-{{ letter }}">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-{{ letter }}" aria-expanded="false" aria-controls="collapse-{{ letter }}">
+                                {{ letter }}
+                            </button>
+                        </h2>
+                        <div id="collapse-{{ letter }}" class="accordion-collapse collapse" aria-labelledby="heading-{{ letter }}" data-bs-parent="#product-accordion">
+                            <div class="accordion-body d-grid gap-2" style="grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));">
+                                {% for p in products %}
+                                <div class="card text-center product-card" data-barcode="{{ p.barcode }}">
+                                    <div class="card-body p-2">
+                                        <h6 class="card-title small mb-1">{{ p.name }}</h6>
+                                        <p class="card-text fw-bold mb-0">
+                                            {% if p.variants|length > 1 %}
+                                                от {{ format_currency_py(p.variants|map(attribute='price')|min) }} с
+                                            {% elif p.variants|length == 1 %}
+                                                {{ format_currency_py(p.variants[0].price) }} с
+                                            {% else %}
+                                                Нет в наличии
+                                            {% endif %}
+                                        </p>
+                                    </div>
+                                </div>
+                                {% endfor %}
+                            </div>
                         </div>
                     </div>
                     {% endfor %}
@@ -1301,7 +1328,7 @@ SALES_SCREEN_SCRIPTS = """
 <script>
 document.addEventListener('DOMContentLoaded', () => {
     const cart = {};
-    const productGrid = document.getElementById('product-grid');
+    const productGrid = document.getElementById('product-accordion');
     const cartItemsEl = document.getElementById('cart-items');
     const cartTotalEl = document.getElementById('cart-total');
     let audioCtx;
@@ -1464,11 +1491,30 @@ document.addEventListener('DOMContentLoaded', () => {
 
     document.getElementById('product-search').addEventListener('input', e => {
         const term = e.target.value.toLowerCase();
-        document.querySelectorAll('.product-card').forEach(card => {
+        const productCards = document.querySelectorAll('#product-accordion .product-card');
+
+        productCards.forEach(card => {
             const productName = card.querySelector('.card-title').textContent.toLowerCase();
-            const show = productName.includes(term) || card.dataset.barcode.includes(term);
+            const barcode = card.dataset.barcode.toLowerCase();
+            const show = productName.includes(term) || barcode.includes(term);
             card.style.display = show ? '' : 'none';
         });
+
+        document.querySelectorAll('#product-accordion .accordion-item').forEach(accordionItem => {
+            const collapseElement = accordionItem.querySelector('.accordion-collapse');
+            const matchingCardsInGroup = accordionItem.querySelectorAll('.product-card:not([style*="display: none"])');
+            const bsCollapse = bootstrap.Collapse.getOrCreateInstance(collapseElement, { toggle: false });
+
+            if (term === '') {
+                bsCollapse.hide(); 
+            } else {
+                if (matchingCardsInGroup.length > 0) {
+                    bsCollapse.show();
+                } else {
+                    bsCollapse.hide();
+                }
+            }
+        });
     });
 
     const completeSale = (paymentMethod) => {
@@ -1511,7 +1557,7 @@ document.addEventListener('DOMContentLoaded', () => {
         if (phone && receiptUrl) {
             const fullPhone = '996' + phone;
             const message = encodeURIComponent(`Ваш чек: ${receiptUrl}`);
-            window.open(`https.wa.me/${fullPhone}?text=${message}`, '_blank');
+            window.open(`https://wa.me/${fullPhone}?text=${message}`, '_blank');
         } else {
             alert('Введите номер телефона.');
         }
@@ -1566,6 +1612,7 @@ INVENTORY_CONTENT = """
     <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addProductModal"><i class="fas fa-plus me-2"></i>Добавить товар</button>
     <button class="btn btn-success" data-bs-toggle="modal" data-bs-target="#stockInModal"><i class="fas fa-truck-loading me-2"></i>Оприходовать</button>
 </div>
+<input type="text" id="inventory-search" class="form-control mb-3" placeholder="Поиск по названию, варианту или штрих-коду...">
 
 <div class="accordion" id="inventoryAccordion">
   {% for p in inventory %}
@@ -1814,6 +1861,20 @@ document.addEventListener('DOMContentLoaded', () => {
             }
         }
     });
+
+    document.getElementById('inventory-search').addEventListener('input', e => {
+        const term = e.target.value.toLowerCase();
+        document.querySelectorAll('#inventoryAccordion .accordion-item').forEach(item => {
+            const productName = item.querySelector('.accordion-button strong').textContent.toLowerCase();
+            const barcode = item.querySelector('.accordion-button small').textContent.toLowerCase();
+            
+            const variantNameElements = item.querySelectorAll('.accordion-body table tbody tr td:first-child');
+            const variantMatch = Array.from(variantNameElements).some(td => td.textContent.toLowerCase().includes(term));
+
+            const show = productName.includes(term) || barcode.includes(term) || variantMatch;
+            item.style.display = show ? '' : 'none';
+        });
+    });
 });
 </script>
 """