Update app.py

app.py

@@ -145,11 +145,11 @@ def load_data():
                         'admin_password': '',
                         'logo_url': DEFAULT_LOGO_URL,
                         'whatsapp_number': DEFAULT_WHATSAPP_NUMBER,
-                        'currency': '₸',
                         'track_inventory': False,
                         'use_barcodes': False,
                         'business_type': 'mixed',
                         'system_mode': 'both',
+                        'currency': '₸',
                         'customer_fields': {
                             'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False
                         },
@@ -179,11 +179,11 @@ def load_data():
             if 'admin_password' not in settings: settings['admin_password'] = ''; changed = True
             if 'logo_url' not in settings: settings['logo_url'] = DEFAULT_LOGO_URL; changed = True
             if 'whatsapp_number' not in settings: settings['whatsapp_number'] = DEFAULT_WHATSAPP_NUMBER; changed = True
-            if 'currency' not in settings: settings['currency'] = '₸'; changed = True
             if 'track_inventory' not in settings: settings['track_inventory'] = False; changed = True
             if 'use_barcodes' not in settings: settings['use_barcodes'] = False; changed = True
             if 'business_type' not in settings: settings['business_type'] = 'mixed'; changed = True
             if 'system_mode' not in settings: settings['system_mode'] = 'both'; changed = True
+            if 'currency' not in settings: settings['currency'] = '₸'; changed = True
             if 'customer_fields' not in settings:
                 settings['customer_fields'] = {'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False}
                 changed = True
@@ -214,9 +214,9 @@ def load_data():
                 if 'status' not in order: order['status'] = 'confirmed'; changed = True
                 if 'staff_name' not in order: order['staff_name'] = ''; changed = True
                 if 'assembled' not in order: order['assembled'] = {}; changed = True
-                if 'global_discount' not in order: order['global_discount'] = 0.0; changed = True
+                if 'global_discount' not in order: order['global_discount'] = 0; changed = True
                 for item in order.get('cart', []):
-                    if 'discount' not in item: item['discount'] = 0.0; changed = True
+                    if 'discount' not in item: item['discount'] = 0; changed = True
                     if 'category' not in item: item['category'] = 'Без категории'; changed = True
 
         if changed or not os.path.exists(DATA_FILE):
@@ -258,11 +258,11 @@ def get_env_data(env_id):
                 'admin_password': '',
                 'logo_url': DEFAULT_LOGO_URL,
                 'whatsapp_number': DEFAULT_WHATSAPP_NUMBER,
-                'currency': '₸',
                 'track_inventory': False,
                 'use_barcodes': False,
                 'business_type': 'mixed',
                 'system_mode': 'both',
+                'currency': '₸',
                 'customer_fields': {'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False},
                 'socials': {
                     'wa': {'enabled': True, 'url': ''},
@@ -723,7 +723,7 @@ CATALOG_TEMPLATE = '''
             <div class="customer-form">
                 {% if mode == 'pos' %}
                     <div style="margin-top: 5px; margin-bottom: 15px; background: var(--bg); padding: 10px; border-radius: 12px; border: 1px solid var(--border);">
-                        <label style="font-size: 0.9rem; font-weight: 600; display:block; margin-bottom:5px;">Общая скидка на чек ({{ currency_code }})</label>
+                        <label style="font-size: 0.9rem; font-weight: 600; display:block; margin-bottom:5px;">Общая скидка на чек (сумма)</label>
                         <input type="number" id="globalDiscountVal" value="0" min="0" onchange="updateCartUI()" style="width: 100%; border:none; background:var(--surface); padding:10px; border-radius:8px; font-weight:600; outline:none;">
                     </div>
                     <input type="text" id="custNamePos" placeholder="Имя клиента (необязательно)">
@@ -1136,7 +1136,7 @@ CATALOG_TEMPLATE = '''
                 unit = cBoxPrice / ppb;
             }
             let discountedUnit = unit - disc;
-            if(discountedUnit < 0) discountedUnit = 0;
+            if (discountedUnit < 0) discountedUnit = 0;
             return discountedUnit * qty;
         }
 
@@ -1187,7 +1187,7 @@ CATALOG_TEMPLATE = '''
                 
                 let discountHtml = '';
                 if(mode === 'pos') {
-                    discountHtml = `<input type="number" style="width: 70px; font-size: 0.85rem; padding: 4px; border-radius:6px; border:1px solid var(--border); background:var(--surface); text-align:center; outline:none;" placeholder="Ск. ед." value="${item.discount || 0}" onchange="updateItemDiscount('${cKey}', this.value)" min="0" title="Скидка на 1 ед."> ${currency}`;
+                    discountHtml = `<input type="number" style="width: 70px; font-size: 0.85rem; padding: 4px; border-radius:6px; border:1px solid var(--border); background:var(--surface); text-align:center; outline:none;" placeholder="Скидка" value="${item.discount || 0}" onchange="updateItemDiscount('${cKey}', this.value)" min="0" title="Скидка на 1 шт"> ${currency}`;
                 }
 
                 list.innerHTML += `
@@ -1635,7 +1635,7 @@ ORDER_TEMPLATE = '''
                         <th style="text-align: left;">Наименование</th>
                         <th>Фото</th>
                         <th>Кол-во</th>
-                        <th>Цена со скидкой</th>
+                        <th>Цена</th>
                         <th>Сумма</th>
                     </tr>
                 </thead>
@@ -1655,7 +1655,7 @@ ORDER_TEMPLATE = '''
                             {% endif %}
                             <div style="font-size: 0.8rem; color: {% if assembled == item.quantity %}#00b894{% else %}#0984e3{% endif %}; margin-top: 4px; font-weight:600;">Собрано: {{ assembled }} / {{ item.quantity }}</div>
                             {% if item.discount and item.discount > 0 %}
-                            <div style="font-size: 0.8rem; color: #e17055; margin-top: 2px;">Скидка на ед.: {{ item.discount }} {{ currency_code }}</div>
+                            <div style="font-size: 0.8rem; color: #e17055; margin-top: 2px;">Скидка: {{ item.discount }} {{ currency_code }} (на 1 шт)</div>
                             {% endif %}
                         </td>
                         <td class="img-cell"><img src="{{ item.photo_url }}" alt="img"></td>
@@ -1697,7 +1697,7 @@ ORDER_TEMPLATE = '''
                     <tr class="total-row">
                         <td colspan="5" style="text-align: right; padding-right: 20px;">
                             {% if order.global_discount > 0 %}
-                            <div style="color:#e17055; font-size:0.9rem; margin-bottom:5px;">Применена общая скидка: {{ order.global_discount }} {{ currency_code }}</div>
+                            <div style="color:#e17055; font-size:0.9rem; margin-bottom:5px;">Общая скидка: {{ order.global_discount }} {{ currency_code }}</div>
                             {% endif %}
                             Итого:
                         </td>
@@ -2175,7 +2175,7 @@ ADMIN_TEMPLATE = '''
 
         .order-item { background: #fff; padding: 15px; border-radius: 10px; border: 1px solid var(--border); margin-bottom: 10px; }
         .order-header { display: flex; justify-content: space-between; font-weight: bold; margin-bottom: 10px; }
-        .order-actions { display: flex; gap: 10px; margin-top: 10px; flex-wrap: wrap; }
+        .order-actions { display: flex; gap: 10px; margin-top: 10px; }
 
         .staff-item { display: flex; flex-direction: column; gap: 10px; background: #fff; padding: 15px; border-radius: 10px; border: 1px solid var(--border); margin-bottom: 10px; }
 
@@ -2258,7 +2258,8 @@ ADMIN_TEMPLATE = '''
                             <div><b>Сумма:</b> {{ order.total_price }} {{ currency_code }}</div>
                         </div>
                         <div class="order-actions">
-                            <button type="button" class="btn btn-outline" style="padding: 5px 10px; font-size: 0.85rem;" onclick="openDiscountModal('{{ order.id }}')"><i class="fas fa-percent"></i> Сделать скидку</button>
+                            <button class="btn btn-warning" onclick="openDiscountModal('{{ order.id }}')" style="padding: 5px 10px; font-size: 0.85rem;"><i class="fas fa-tag"></i> Сделать скидку</button>
+                            <a href="/{{ env_id }}/order/{{ order.id }}" class="btn btn-outline" target="_blank" style="padding: 5px 10px; font-size: 0.85rem;"><i class="fas fa-eye"></i> Накладная</a>
                             <form method="POST" action="/{{ env_id }}/order_action/{{ order.id }}" style="margin:0;">
                                 <input type="hidden" name="action" value="confirm">
                                 <button type="submit" class="btn btn-success" style="padding: 5px 10px; font-size: 0.85rem;"><i class="fas fa-check"></i> Подтвердить</button>
@@ -2337,6 +2338,15 @@ ADMIN_TEMPLATE = '''
                         <input type="text" name="organization_name" value="{{ settings.organization_name }}" required>
                     </div>
                     
+                    <div class="settings-row">
+                        <label>Тип бизнеса:</label>
+                        <select name="business_type">
+                            <option value="retail" {% if settings.business_type == 'retail' %}selected{% endif %}>Розница</option>
+                            <option value="mixed" {% if settings.business_type == 'mixed' %}selected{% endif %}>Оптово-розничный</option>
+                            <option value="wholesale" {% if settings.business_type == 'wholesale' %}selected{% endif %}>Оптовый</option>
+                        </select>
+                    </div>
+                    
                     <div class="settings-row">
                         <label>Валюта:</label>
                         <select name="currency">
@@ -2346,15 +2356,6 @@ ADMIN_TEMPLATE = '''
                             <option value="$" {% if settings.currency == '$' %}selected{% endif %}>Доллар США ($)</option>
                         </select>
                     </div>
-                    
-                    <div class="settings-row">
-                        <label>Тип бизнеса:</label>
-                        <select name="business_type">
-                            <option value="retail" {% if settings.business_type == 'retail' %}selected{% endif %}>Розница</option>
-                            <option value="mixed" {% if settings.business_type == 'mixed' %}selected{% endif %}>Оптово-розничный</option>
-                            <option value="wholesale" {% if settings.business_type == 'wholesale' %}selected{% endif %}>Оптовый</option>
-                        </select>
-                    </div>
 
                     <div class="settings-row">
                         <label>WhatsApp магазина:</label>
@@ -2697,24 +2698,20 @@ ADMIN_TEMPLATE = '''
             <button class="btn btn-danger" onclick="stopScanner()">Отмена</button>
         </div>
     </div>
-
+    
     <div class="modal-overlay" id="discountModal" style="z-index:9999; display:none; position:fixed; top:0; left:0; width:100%; height:100%; background:rgba(0,0,0,0.6); align-items:center; justify-content:center;">
-        <div style="background:#fff; padding:20px; border-radius:12px; width:100%; max-width:500px; max-height:90vh; overflow-y:auto; text-align:left;">
-            <h3 style="margin-top:0;">Скидка на заказ <span id="discountOrderIdDisplay"></span></h3>
-            <form id="discountForm" method="POST" action="">
-                <input type="hidden" name="action" value="apply_discount">
-                <input type="hidden" name="order_id" id="discountOrderId">
-
-                <div style="margin-bottom: 15px;">
-                    <label style="font-weight: bold; display:block; margin-bottom:5px;">Общая скидка на сумму чека ({{ currency_code }}):</label>
-                    <input type="number" name="global_discount" id="globalDiscountInput" step="0.01" min="0" placeholder="Сумма скидки" style="width: 100%; padding: 10px; border-radius: 8px; border: 1px solid #ccc; outline: none;">
+        <div style="background:#fff; padding:20px; border-radius:12px; width:100%; max-width:600px; max-height:90vh; overflow-y:auto; position:relative;">
+            <h3 style="margin-top:0;">Скидка для заказа <span id="discOrderId"></span></h3>
+            <form method="POST" action="/{{ env_id }}/apply_discount">
+                <input type="hidden" name="order_id" id="discOrderInput">
+                <div style="margin-bottom:15px;">
+                    <label style="font-weight:bold;">Общая скидка на заказ (в сумме):</label>
+                    <input type="number" name="global_discount" id="discGlobal" step="0.01" min="0" style="width:100%; padding:10px; border-radius:8px; border:1px solid #ccc; margin-top:5px;">
                 </div>
-
-                <div style="font-weight: bold; margin-bottom:10px;">Скидка на позиции (на 1 ед. в {{ currency_code }}):</div>
-                <div id="discountItemsList" style="display:flex; flex-direction:column; gap:10px;"></div>
-
+                <h4 style="margin-bottom:10px;">Скидка на единицу товара:</h4>
+                <div id="discItemsContainer" style="display:flex; flex-direction:column; gap:10px;"></div>
                 <div style="margin-top:20px; display:flex; gap:10px; justify-content:flex-end;">
-                    <button type="button" class="btn btn-outline" onclick="closeDiscountModal()">Отмена</button>
+                    <button type="button" class="btn btn-danger" onclick="closeDiscountModal()">Отмена</button>
                     <button type="submit" class="btn btn-success">Сохранить</button>
                 </div>
             </form>
@@ -2722,39 +2719,10 @@ ADMIN_TEMPLATE = '''
     </div>
 
     <script>
+        const pendingOrdersData = {{ pending_orders | tojson }};
         const trackInventory = {{ 'true' if settings.track_inventory and sys_mode != 'external' else 'false' }};
         const useBarcodes = {{ 'true' if settings.use_barcodes and sys_mode != 'external' else 'false' }};
         const businessType = '{{ settings.business_type }}';
-        
-        const pendingOrdersData = {{ pending_orders | tojson }};
-        
-        function openDiscountModal(orderId) {
-            const order = pendingOrdersData.find(o => o.id === orderId);
-            if(!order) return;
-            document.getElementById('discountOrderIdDisplay').innerText = orderId;
-            document.getElementById('discountOrderId').value = orderId;
-            document.getElementById('globalDiscountInput').value = order.global_discount || 0;
-
-            const list = document.getElementById('discountItemsList');
-            list.innerHTML = '';
-            order.cart.forEach(item => {
-                list.innerHTML += `
-                    <div style="background:#fafafa; padding:10px; border-radius:8px; border:1px solid #e0e6ed;">
-                        <div style="font-size:0.9rem; margin-bottom:5px; font-weight:600;">${item.name} ${item.variant_name ? '('+item.variant_name+')' : ''} <span style="color:#0984e3;">— ${item.quantity} шт.</span></div>
-                        <div style="display:flex; align-items:center; gap:10px;">
-                            <label style="font-size:0.85rem; color:#636e72;">Скидка на 1 ед.:</label>
-                            <input type="number" name="item_discount_${item.c_key}" value="${item.discount || 0}" step="0.01" min="0" style="width:100px; padding:8px; border-radius:6px; border:1px solid #ccc; outline:none;">
-                        </div>
-                    </div>
-                `;
-            });
-
-            document.getElementById('discountModal').style.display = 'flex';
-        }
-        
-        function closeDiscountModal() {
-            document.getElementById('discountModal').style.display = 'none';
-        }
 
         function showLoading(form) {
             const btn = form.querySelector('button[type="submit"]');
@@ -3008,6 +2976,36 @@ ADMIN_TEMPLATE = '''
             document.getElementById('scannerModal').style.display = 'none';
         }
         
+        function openDiscountModal(orderId) {
+            const order = pendingOrdersData.find(o => o.id === orderId);
+            if(!order) return;
+            document.getElementById('discOrderId').innerText = order.id;
+            document.getElementById('discOrderInput').value = order.id;
+            document.getElementById('discGlobal').value = order.global_discount || 0;
+            
+            const container = document.getElementById('discItemsContainer');
+            container.innerHTML = '';
+            order.cart.forEach(item => {
+                let itemName = item.name + (item.variant_name ? ` (${item.variant_name})` : '');
+                container.innerHTML += `
+                    <div style="background:#fafafa; border:1px solid #e0e6ed; border-radius:8px; padding:10px; display:flex; justify-content:space-between; align-items:center; flex-wrap:wrap; gap:10px;">
+                        <div style="flex:1; min-width:200px;">
+                            <div style="font-weight:600; font-size:0.95rem;">${itemName}</div>
+                            <div style="font-size:0.85rem; color:#636e72;">Цена: ${item.price} | Кол-во: ${item.quantity}</div>
+                        </div>
+                        <div style="width:120px;">
+                            <input type="number" name="disc_item_${item.c_key}" value="${item.discount || 0}" step="0.01" min="0" style="width:100%; padding:8px; border-radius:6px; border:1px solid #ccc;" placeholder="Скидка (сумма)">
+                        </div>
+                    </div>
+                `;
+            });
+            document.getElementById('discountModal').style.display = 'flex';
+        }
+        
+        function closeDiscountModal() {
+            document.getElementById('discountModal').style.display = 'none';
+        }
+        
         document.querySelectorAll('.add-product-wrapper').forEach(wrapper => {
             const cb = wrapper.querySelector('input[name="has_variant_prices"]');
             if(cb) toggleVariantPrices(cb, wrapper.id);
@@ -3076,10 +3074,10 @@ REPORTS_TEMPLATE = '''
         <div class="tabs">
             <div class="tab active" onclick="switchTab('general')">Общий отчет</div>
             <div class="tab" onclick="switchTab('daily')">По дням</div>
-            <div class="tab" onclick="switchTab('hourly')">По часам</div>
             <div class="tab" onclick="switchTab('category')">По категориям</div>
             <div class="tab" onclick="switchTab('staff')">По сотрудникам</div>
-            <div class="tab" onclick="switchTab('customers')">По клиентам</div>
+            <div class="tab" onclick="switchTab('time')">По времени</div>
+            <div class="tab" onclick="switchTab('abc')">ABC-Анализ</div>
         </div>
 
         <div id="general" class="tab-content active">
@@ -3119,13 +3117,6 @@ REPORTS_TEMPLATE = '''
                         <i class="fas fa-undo icon"></i>
                     </div>
                 </div>
-                <div class="stat-card">
-                    <div class="stat-card-inner">
-                        <div class="title">Оценочн��я стоимость склада</div>
-                        <div class="value" id="warehouseValue" style="color:var(--success);">0</div>
-                        <i class="fas fa-cubes icon"></i>
-                    </div>
-                </div>
             </div>
 
             <div class="table-container">
@@ -3159,22 +3150,6 @@ REPORTS_TEMPLATE = '''
             </div>
         </div>
 
-        <div id="hourly" class="tab-content">
-            <div class="table-container">
-                <h3>Активность по часам (За все выбранное время)</h3>
-                <table>
-                    <thead>
-                        <tr>
-                            <th>Час</th>
-                            <th>Кол-во заказов</th>
-                            <th>Выручка ({{ currency_code }})</th>
-                        </tr>
-                    </thead>
-                    <tbody id="hourlySalesTable"></tbody>
-                </table>
-            </div>
-        </div>
-
         <div id="category" class="tab-content">
             <div class="table-container">
                 <h3>Продажи по категориям</h3>
@@ -3206,19 +3181,32 @@ REPORTS_TEMPLATE = '''
                 </table>
             </div>
         </div>
+        
+        <div id="time" class="tab-content">
+            <div class="stats-grid">
+                <div class="table-container">
+                    <h3>По дням недели</h3>
+                    <table>
+                        <thead><tr><th>День недели</th><th>Заказов</th><th>Сумма ({{ currency_code }})</th></tr></thead>
+                        <tbody id="weekdaySalesTable"></tbody>
+                    </table>
+                </div>
+                <div class="table-container">
+                    <h3>По часам</h3>
+                    <table>
+                        <thead><tr><th>Час</th><th>Заказов</th><th>Сумма ({{ currency_code }})</th></tr></thead>
+                        <tbody id="hourlySalesTable"></tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
 
-        <div id="customers" class="tab-content">
+        <div id="abc" class="tab-content">
             <div class="table-container">
-                <h3>Топ клиентов</h3>
+                <h3>ABC-Анализ товаров (по выручке)</h3>
                 <table>
-                    <thead>
-                        <tr>
-                            <th>Клиент</th>
-                            <th>Кол-во заказов</th>
-                            <th>Сумма покупок ({{ currency_code }})</th>
-                        </tr>
-                    </thead>
-                    <tbody id="customersSalesTable"></tbody>
+                    <thead><tr><th>Товар</th><th>Выручка ({{ currency_code }})</th><th>Доля (%)</th><th>Группа</th></tr></thead>
+                    <tbody id="abcTable"></tbody>
                 </table>
             </div>
         </div>
@@ -3226,7 +3214,6 @@ REPORTS_TEMPLATE = '''
 
     <script>
         const allOrders = {{ orders_json|safe }};
-        const allProducts = {{ products_json|safe }};
 
         function switchTab(tabId) {
             document.querySelectorAll('.tab').forEach(t => t.classList.remove('active'));
@@ -3272,12 +3259,10 @@ REPORTS_TEMPLATE = '''
             let productSales = {};
             let dailySales = {};
             let categorySales = {};
+            
+            let weekdaySales = {1:{n:'Пн',o:0,s:0}, 2:{n:'Вт',o:0,s:0}, 3:{n:'Ср',o:0,s:0}, 4:{n:'Чт',o:0,s:0}, 5:{n:'Пт',o:0,s:0}, 6:{n:'Сб',o:0,s:0}, 0:{n:'Вс',o:0,s:0}};
             let hourlySales = {};
-            let customerSales = {};
-
-            for(let i=0; i<24; i++) {
-                hourlySales[i] = { orders: 0, sum: 0 };
-            }
+            for(let i=0; i<24; i++) hourlySales[i] = {orders:0, sum:0};
 
             filteredOrders.forEach(o => {
                 if(o.status === 'returned') {
@@ -3291,27 +3276,24 @@ REPORTS_TEMPLATE = '''
                     staffSales[staff].orders += 1;
                     staffSales[staff].sum += o.total_price;
 
-                    const dateStr = o.created_at.split(' ')[0];
-                    if(!dailySales[dateStr]) dailySales[dateStr] = { orders: 0, sum: 0 };
-                    dailySales[dateStr].orders += 1;
-                    dailySales[dateStr].sum += o.total_price;
-
-                    const timeStr = o.created_at.split(' ')[1];
-                    if(timeStr) {
-                        const hour = parseInt(timeStr.split(':')[0]);
-                        if(!isNaN(hour)) {
-                            hourlySales[hour].orders += 1;
-                            hourlySales[hour].sum += o.total_price;
+                    let parts = o.created_at.split(' ');
+                    if(parts.length === 2) {
+                        const dateStr = parts[0];
+                        if(!dailySales[dateStr]) dailySales[dateStr] = { orders: 0, sum: 0 };
+                        dailySales[dateStr].orders += 1;
+                        dailySales[dateStr].sum += o.total_price;
+                        
+                        let dObj = new Date(parts[0] + 'T' + parts[1]);
+                        let wd = dObj.getDay();
+                        let hr = dObj.getHours();
+                        if(!isNaN(wd)) {
+                            weekdaySales[wd].o++;
+                            weekdaySales[wd].s += o.total_price;
+                        }
+                        if(!isNaN(hr)) {
+                            hourlySales[hr].orders++;
+                            hourlySales[hr].sum += o.total_price;
                         }
-                    }
-
-                    let cName = o.customer_name ? o.customer_name.trim() : '';
-                    let cPhone = o.customer_phone ? o.customer_phone.trim() : '';
-                    let cKey = cName + (cPhone ? ' (' + cPhone + ')' : '');
-                    if(cKey && cKey !== '()') {
-                        if(!customerSales[cKey]) customerSales[cKey] = { orders: 0, sum: 0 };
-                        customerSales[cKey].orders += 1;
-                        customerSales[cKey].sum += o.total_price;
                     }
 
                     o.cart.forEach(item => {
@@ -3343,31 +3325,12 @@ REPORTS_TEMPLATE = '''
             let aov = ordersCount > 0 ? (totalRev / ordersCount) : 0;
             document.getElementById('avgOrderValue').innerText = Math.round(aov).toLocaleString() + ' {{ currency_code }}';
 
-            let whValue = 0;
-            allProducts.forEach(p => {
-                if(p.variants && p.variants.length > 0) {
-                    p.variants.forEach(v => {
-                        let s = parseInt(v.stock);
-                        if(!isNaN(s) && s > 0) {
-                            let price = p.has_variant_prices ? parseFloat(v.price) : parseFloat(p.price);
-                            whValue += s * (price || 0);
-                        }
-                    });
-                } else {
-                    let s = parseInt(p.stock);
-                    if(!isNaN(s) && s > 0) {
-                        whValue += s * (parseFloat(p.price) || 0);
-                    }
-                }
-            });
-            document.getElementById('warehouseValue').innerText = Math.round(whValue).toLocaleString() + ' {{ currency_code }}';
-
             renderTopProducts(productSales);
             renderStaffTable(staffSales);
             renderDailyTable(dailySales);
-            renderHourlyTable(hourlySales);
             renderCategoryTable(categorySales);
-            renderCustomerTable(customerSales);
+            renderTimeTables(weekdaySales, hourlySales);
+            renderABC(productSales, totalRev);
         }
 
         function renderTopProducts(data) {
@@ -3427,27 +3390,6 @@ REPORTS_TEMPLATE = '''
             });
         }
 
-        function renderHourlyTable(data) {
-            const tbody = document.getElementById('hourlySalesTable');
-            tbody.innerHTML = '';
-            let hasData = false;
-            for(let i=0; i<24; i++) {
-                if(data[i].orders > 0) {
-                    hasData = true;
-                    tbody.innerHTML += `
-                        <tr>
-                            <td style="font-weight:500;">${i.toString().padStart(2, '0')}:00 - ${i.toString().padStart(2, '0')}:59</td>
-                            <td>${data[i].orders}</td>
-                            <td>${Math.round(data[i].sum).toLocaleString()}</td>
-                        </tr>
-                    `;
-                }
-            }
-            if(!hasData) {
-                tbody.innerHTML = '<tr><td colspan="3" style="text-align:center;">Нет данных</td></tr>';
-            }
-        }
-
         function renderCategoryTable(data) {
             const tbody = document.getElementById('categorySalesTable');
             tbody.innerHTML = '';
@@ -3467,20 +3409,52 @@ REPORTS_TEMPLATE = '''
             });
         }
 
-        function renderCustomerTable(data) {
-            const tbody = document.getElementById('customersSalesTable');
+        function renderTimeTables(wdData, hrData) {
+            const wTbody = document.getElementById('weekdaySalesTable');
+            wTbody.innerHTML = '';
+            for(let i=1; i<=7; i++) {
+                let idx = i === 7 ? 0 : i;
+                if(wdData[idx].o > 0) {
+                    wTbody.innerHTML += `<tr><td>${wdData[idx].n}</td><td>${wdData[idx].o}</td><td>${Math.round(wdData[idx].s).toLocaleString()}</td></tr>`;
+                }
+            }
+            
+            const hTbody = document.getElementById('hourlySalesTable');
+            hTbody.innerHTML = '';
+            for(let i=0; i<24; i++) {
+                if(hrData[i].orders > 0) {
+                    let hrStr = i.toString().padStart(2, '0') + ':00';
+                    hTbody.innerHTML += `<tr><td>${hrStr}</td><td>${hrData[i].orders}</td><td>${Math.round(hrData[i].sum).toLocaleString()}</td></tr>`;
+                }
+            }
+        }
+        
+        function renderABC(data, totalRev) {
+            const tbody = document.getElementById('abcTable');
             tbody.innerHTML = '';
-            const sorted = Object.keys(data).sort((a,b) => data[b].sum - data[a].sum).slice(0, 30);
-            if(sorted.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="3" style="text-align:center;">Нет данных</td></tr>';
+            if(totalRev <= 0) {
+                tbody.innerHTML = '<tr><td colspan="4" style="text-align:center;">Нет данных</td></tr>';
                 return;
             }
-            sorted.forEach(c => {
+            const sorted = Object.keys(data).sort((a,b) => data[b].sum - data[a].sum);
+            let cumulative = 0;
+            sorted.forEach(p => {
+                if (data[p].sum <= 0) return;
+                cumulative += data[p].sum;
+                let pct = (cumulative / totalRev) * 100;
+                let group = 'A';
+                if (pct > 80 && pct <= 95) group = 'B';
+                else if (pct > 95) group = 'C';
+                
+                let share = (data[p].sum / totalRev) * 100;
+                let color = group === 'A' ? '#27ae60' : (group === 'B' ? '#f39c12' : '#e17055');
+                
                 tbody.innerHTML += `
                     <tr>
-                        <td style="font-weight:500;">${c}</td>
-                        <td>${data[c].orders}</td>
-                        <td>${Math.round(data[c].sum).toLocaleString()}</td>
+                        <td>${p}</td>
+                        <td>${Math.round(data[p].sum).toLocaleString()}</td>
+                        <td>${share.toFixed(1)}%</td>
+                        <td style="font-weight:bold; color:${color};">${group}</td>
                     </tr>
                 `;
             });
@@ -3492,25 +3466,40 @@ REPORTS_TEMPLATE = '''
 </html>
 '''
 
-@app.route('/<env_id>/apply_discount/<order_id>', methods=['POST'])
-def apply_discount(env_id, order_id):
+@app.route('/<env_id>/apply_discount', methods=['POST'])
+def apply_discount(env_id):
     data = get_env_data(env_id)
+    order_id = request.form.get('order_id')
     order = data.get('orders', {}).get(order_id)
+    
     if order and order.get('status') == 'pending':
-        global_disc = float(request.form.get('global_discount') or 0)
+        try:
+            global_disc = float(request.form.get('global_discount', 0))
+        except ValueError:
+            global_disc = 0
+        if global_disc < 0: global_disc = 0
         order['global_discount'] = global_disc
+        
         for item in order.get('cart', []):
             c_key = item.get('c_key')
-            item_disc = float(request.form.get(f'item_discount_{c_key}') or 0)
-            item['discount'] = item_disc
+            disc_val_str = request.form.get(f'disc_item_{c_key}')
+            if disc_val_str is not None:
+                try:
+                    disc_val = float(disc_val_str)
+                    if disc_val < 0: disc_val = 0
+                    item['discount'] = disc_val
+                except ValueError:
+                    pass
         
         update_order_totals(order, data['settings'].get('business_type', 'mixed'))
         save_env_data(env_id, data)
-        flash('Скидка успешно применена', 'success')
-    else:
-        flash('Ошибка применения скидки', 'error')
+        
     return redirect(url_for('admin', env_id=env_id))
 
+@app.route('/<env_id>/update_settings', methods=['POST'])
+def update_settings(env_id):
+    pass
+
 if __name__ == '__main__':
     download_db_from_hf()
     load_data()