Update app.py

app.py

@@ -186,6 +186,8 @@ def load_data():
                         'system_mode': 'both',
                         'hide_stock_online': False,
                         'closed_catalog_enabled': False,
+                        'commission_enabled': False,
+                        'commission_percent': 0.0,
                         'theme': 'light',
                         'customer_fields': {
                             'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False
@@ -226,6 +228,8 @@ def load_data():
             if 'system_mode' not in settings: settings['system_mode'] = 'both'; changed = True
             if 'hide_stock_online' not in settings: settings['hide_stock_online'] = False; changed = True
             if 'closed_catalog_enabled' not in settings: settings['closed_catalog_enabled'] = False; changed = True
+            if 'commission_enabled' not in settings: settings['commission_enabled'] = False; changed = True
+            if 'commission_percent' not in settings: settings['commission_percent'] = 0.0; changed = True
             if 'theme' not in settings: settings['theme'] = 'light'; changed = True
             if 'customer_fields' not in settings:
                 settings['customer_fields'] = {'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False}
@@ -263,6 +267,7 @@ def load_data():
                 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; changed = True
+                if 'commission_amount' not in order: order['commission_amount'] = 0; changed = True
                 for item in order.get('cart', []):
                     if 'discount' not in item: item['discount'] = 0; changed = True
                     if 'category' not in item: item['category'] = 'Без категории'; changed = True
@@ -317,6 +322,8 @@ def get_env_data(env_id):
                 'system_mode': 'both',
                 'hide_stock_online': False,
                 'closed_catalog_enabled': False,
+                'commission_enabled': False,
+                'commission_percent': 0.0,
                 'theme': 'light',
                 'customer_fields': {'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False},
                 'socials': {
@@ -334,7 +341,10 @@ def save_env_data(env_id, env_data):
     all_data[env_id] = env_data
     save_data(all_data)
 
-def update_order_totals(order, business_type):
+def update_order_totals(order, settings):
+    business_type = settings.get('business_type', 'mixed')
+    commission_enabled = settings.get('commission_enabled', False)
+    commission_percent = float(settings.get('commission_percent', 0.0))
     total = 0
     global_discount = float(order.get('global_discount', 0))
     for i in order['cart']:
@@ -363,6 +373,14 @@ def update_order_totals(order, business_type):
         total += item_total
         
     total = max(0, total - global_discount)
+
+    if commission_enabled and commission_percent > 0:
+        commission_amount = total * (commission_percent / 100.0)
+        order['commission_amount'] = round(commission_amount, 2)
+        total += commission_amount
+    else:
+        order['commission_amount'] = 0
+
     order['total_price'] = round(total, 2)
 
 def is_order_fully_assembled(order):
@@ -967,6 +985,8 @@ CATALOG_TEMPLATE = '''
         const hideStockOnline = {{ 'true' if settings.hide_stock_online else 'false' }};
         const businessType = '{{ settings.business_type }}'; 
         const cFields = {{ settings.customer_fields|tojson }};
+        const commissionEnabled = {{ 'true' if settings.commission_enabled else 'false' }};
+        const commissionPercent = {{ settings.commission_percent | default(0) }};
         
         let cart = {};
         let currentGalleryPhotos =[];
@@ -1374,6 +1394,10 @@ CATALOG_TEMPLATE = '''
             
             total = total - globalDisc;
             if(total < 0) total = 0;
+
+            if (commissionEnabled && commissionPercent > 0) {
+                total += total * (commissionPercent / 100.0);
+            }
             
             const cartBar = document.getElementById('cartBar');
             if (total > 0 || Object.keys(cart).length > 0) {
@@ -1427,6 +1451,10 @@ CATALOG_TEMPLATE = '''
                     </div>
                 `;
             }
+
+            if (commissionEnabled && commissionPercent > 0) {
+                list.innerHTML += `<div style="text-align: right; font-size: 0.85rem; color: #0984e3; margin-top: 10px; font-weight: 600;">Включая комиссию ${commissionPercent}%</div>`;
+            }
         }
 
         function openCartModal() {
@@ -1927,6 +1955,9 @@ ORDER_TEMPLATE = '''
                             {% if order.global_discount > 0 %}
                             <div style="color:#e17055; font-size:0.9rem; margin-bottom:5px;">Применена общая скидка: -{{ order.global_discount }} {{ currency_code }}</div>
                             {% endif %}
+                            {% if settings.commission_enabled and order.commission_amount and order.commission_amount > 0 %}
+                            <div style="color:#0984e3; font-size:0.9rem; margin-bottom:5px;">Комиссия ({{ settings.commission_percent }}%): +{{ order.commission_amount }} {{ currency_code }}</div>
+                            {% endif %}
                             Итого:
                         </td>
                         <td>{{ order.total_price }} {{ currency_code }}</td>
@@ -2702,6 +2733,12 @@ ADMIN_TEMPLATE = '''
                         <label><input type="checkbox" name="closed_catalog_enabled" {% if settings.closed_catalog_enabled %}checked{% endif %}> Включить закрытый каталог (доступ только по паролю из раздела пользователей)</label>
                         {% endif %}
 
+                        <div style="font-weight: 600; margin-bottom: 5px; border-top: 1px solid var(--border); padding-top: 15px; margin-top: 10px;">Комиссия на заказы:</div>
+                        <div class="social-item" style="margin-bottom: 10px;">
+                            <label style="width: auto; margin-right: 15px;"><input type="checkbox" name="commission_enabled" {% if settings.commission_enabled %}checked{% endif %}> Добавить комиссию</label>
+                            <input type="number" step="0.01" name="commission_percent" value="{{ settings.commission_percent }}" placeholder="Процент (например, 0.95)" style="flex: 1; min-width: 150px;">
+                        </div>
+
                         <div style="font-weight: 600; margin-bottom: 5px; border-top: 1px solid var(--border); padding-top: 15px; margin-top: 10px;">Безопасность (Админ-панель):</div>
                         <div class="social-item" style="margin-bottom: 10px;">
                             <label style="width: auto; margin-right: 15px;"><input type="checkbox" name="admin_password_enabled" {% if settings.admin_password_enabled %}checked{% endif %}> Пароль на вход</label>
@@ -3538,7 +3575,7 @@ REPORTS_TEMPLATE = '''
         .tabs { display: flex; gap: 10px; margin-bottom: 20px; border-bottom: 2px solid var(--border); padding-bottom: 10px; flex-wrap: wrap; }
         .tab { padding: 10px 20px; cursor: pointer; font-weight: 600; color: #636e72; border-radius: 8px; transition: background 0.2s; }
         .tab:hover { background: #e9ecef; }
-        .tab.active { background: var(--primary); color: #fff; }
+        .tab.active {background: var(--primary); color: #fff; }
         
         .tab-content { display: none; }
         .tab-content.active { display: block; }
@@ -3615,6 +3652,15 @@ REPORTS_TEMPLATE = '''
                         <i class="fas fa-undo icon"></i>
                     </div>
                 </div>
+                {% if settings.commission_enabled %}
+                <div class="stat-card">
+                    <div class="stat-card-inner">
+                        <div class="title">Сумма комиссий ({{ settings.commission_percent }}%)</div>
+                        <div class="value" id="totalCommissions" style="color:var(--info);">0</div>
+                        <i class="fas fa-percentage icon"></i>
+                    </div>
+                </div>
+                {% endif %}
             </div>
 
             <div class="table-container">
@@ -3723,6 +3769,7 @@ REPORTS_TEMPLATE = '''
             let totalRet = 0;
             let totalItems = 0;
             let ordersCount = 0;
+            let totalCommissions = 0;
             
             let staffSales = {};
             let productSales = {};
@@ -3735,6 +3782,10 @@ REPORTS_TEMPLATE = '''
                 } else {
                     totalRev += o.total_price;
                     ordersCount++;
+                    
+                    if (o.commission_amount) {
+                        totalCommissions += o.commission_amount;
+                    }
 
                     const staff = o.staff_name || 'Онлайн (Без сотрудника)';
                     if(!staffSales[staff]) staffSales[staff] = { orders: 0, sum: 0 };
@@ -3772,6 +3823,11 @@ REPORTS_TEMPLATE = '''
             document.getElementById('totalReturns').innerText = totalRet.toLocaleString() + ' {{ currency_code }}';
             document.getElementById('totalItemsSold').innerText = totalItems.toLocaleString();
             
+            let tcEl = document.getElementById('totalCommissions');
+            if (tcEl) {
+                tcEl.innerText = totalCommissions.toLocaleString() + ' {{ currency_code }}';
+            }
+            
             let aov = ordersCount > 0 ? (totalRev / ordersCount) : 0;
             document.getElementById('avgOrderValue').innerText = Math.round(aov).toLocaleString() + ' {{ currency_code }}';
 
@@ -4147,6 +4203,8 @@ def create_environment():
             "system_mode": "both",
             "hide_stock_online": False,
             "closed_catalog_enabled": False,
+            "commission_enabled": False,
+            "commission_percent": 0.0,
             "theme": "light",
             "customer_fields": {'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False},
             "socials": {
@@ -4338,7 +4396,7 @@ def finish_assembly(env_id, order_id):
             new_cart.append(item)
 
     order['cart'] = new_cart
-    update_order_totals(order, data['settings'].get('business_type', 'mixed'))
+    update_order_totals(order, data['settings'])
     save_env_data(env_id, data)
     
     return jsonify({"success": True})
@@ -4369,7 +4427,7 @@ def process_return(env_id, order_id):
                     restore_stock(c_key, item.get('product_id'), item.get('variant_idx', -1), ret_qty, data['products'])
                 break
 
-    update_order_totals(order, data['settings'].get('business_type', 'mixed'))
+    update_order_totals(order, data['settings'])
     if order['total_price'] <= 0:
         order['status'] = 'returned'
 
@@ -4446,10 +4504,11 @@ def create_order(env_id):
         "customer_zip": customer_zip,
         "customer_whatsapp": customer_whatsapp,
         "global_discount": global_discount,
-        "assembled": {}
+        "assembled": {},
+        "commission_amount": 0
     }
 
-    update_order_totals(new_order, data['settings'].get('business_type', 'mixed'))
+    update_order_totals(new_order, data['settings'])
 
     if order_status == 'pos' and data['settings'].get('track_inventory', False) and data['settings'].get('system_mode', 'both') not in ['external', 'light_external']:
         deduct_stock(processed_cart, data['products'])
@@ -4525,7 +4584,7 @@ def edit_order(env_id, order_id):
                     order['cart'].remove(item)
             break
 
-    update_order_totals(order, data['settings'].get('business_type', 'mixed'))
+    update_order_totals(order, data['settings'])
     save_env_data(env_id, data)
     
     return jsonify({"success": True, "total_price": order['total_price']})
@@ -4554,7 +4613,7 @@ def apply_discount(env_id, order_id):
         except ValueError:
             item['discount'] = 0
 
-    update_order_totals(order, data['settings'].get('business_type', 'mixed'))
+    update_order_totals(order, data['settings'])
     save_env_data(env_id, data)
     flash('Скидка успешно применена.', 'success')
     return redirect(url_for('admin', env_id=env_id))
@@ -4642,6 +4701,7 @@ def reports(env_id):
     return render_template_string(
         REPORTS_TEMPLATE,
         env_id=env_id,
+        settings=settings,
         currency_code=settings.get('currency', 'T'),
         orders_json=json.dumps(orders_list)
     )
@@ -4778,6 +4838,12 @@ def admin(env_id):
             settings['admin_password_enabled'] = 'admin_password_enabled' in request.form
             settings['admin_password'] = request.form.get('admin_password', '').strip()
             
+            settings['commission_enabled'] = 'commission_enabled' in request.form
+            try:
+                settings['commission_percent'] = float(request.form.get('commission_percent', 0.0))
+            except ValueError:
+                settings['commission_percent'] = 0.0
+            
             settings['customer_fields'] = {
                 'name': 'cf_name' in request.form,
                 'phone': 'cf_phone' in request.form,