Update app.py

app.py

@@ -63,7 +63,7 @@ def download_db_from_hf(specific_file=None, retries=3, delay=5):
                         try:
                             if file_name == DATA_FILE:
                                 with open(file_name, 'w', encoding='utf-8') as f:
-                                    json.dump({'products': [], 'categories': [], 'orders': {}, 'employees': [], 'workdays': {}, 'settings': {
+                                    json.dump({'products': [], 'categories': [], 'orders': {}, 'employees': [], 'workdays': {}, 'fines': {}, 'settings': {
                                         'cafe_name': 'HongKong',
                                         'wa_shift1': '+77470623684',
                                         'wa_shift2': '+77470623684',
@@ -122,6 +122,7 @@ def load_data():
         'orders': {}, 
         'employees': [],
         'workdays': {},
+        'fines': {},
         'settings': {
             'cafe_name': 'Sova',
             'wa_shift1': '+77470623684',
@@ -141,6 +142,7 @@ def load_data():
         if 'orders' not in data: data['orders'] = {}
         if 'employees' not in data: data['employees'] = []
         if 'workdays' not in data: data['workdays'] = {}
+        if 'fines' not in data: data['fines'] = {}
         if 'settings' not in data: data['settings'] = default_data['settings']
         if 'logo_version' not in data['settings']: data['settings']['logo_version'] = '1'
     except (FileNotFoundError, json.JSONDecodeError):
@@ -153,6 +155,7 @@ def load_data():
                 if 'orders' not in data: data['orders'] = {}
                 if 'employees' not in data: data['employees'] = []
                 if 'workdays' not in data: data['workdays'] = {}
+                if 'fines' not in data: data['fines'] = {}
                 if 'settings' not in data: data['settings'] = default_data['settings']
                 if 'logo_version' not in data['settings']: data['settings']['logo_version'] = '1'
             except Exception:
@@ -177,9 +180,9 @@ def load_data():
             
     for emp in data['employees']:
         if 'pin' not in emp: emp['pin'] = '0000'
-        if 'daily_rate' not in emp: emp['daily_rate'] = 0
-        if 'target_amount' not in emp: emp['target_amount'] = 0
-        if 'bonus_percentage' not in emp: emp['bonus_percentage'] = 0
+        if 'daily_rate' not in emp: emp['daily_rate'] = 230000
+        if 'target_amount' not in emp: emp['target_amount'] = 1500000
+        if 'bonus_percentage' not in emp: emp['bonus_percentage'] = 10
 
     if not os.path.exists(DATA_FILE):
         try:
@@ -198,6 +201,7 @@ def save_data(data):
         if 'orders' not in data: data['orders'] = {}
         if 'employees' not in data: data['employees'] = []
         if 'workdays' not in data: data['workdays'] = {}
+        if 'fines' not in data: data['fines'] = {}
         if 'settings' not in data: data['settings'] = {
             'cafe_name': 'Sova',
             'wa_shift1': '',
@@ -1229,6 +1233,7 @@ SALARY_TEMPLATE = '''
         const allOrders = {{ orders_json|safe }};
         const workdays = {{ workdays_json|safe }};
         const employees = {{ employees_json|safe }};
+        const fines = {{ fines_json|safe }};
         const currencyCode = '{{ currency_code }}';
 
         function getLocalDateStr(d) {
@@ -1249,7 +1254,7 @@ SALARY_TEMPLATE = '''
             const end = document.getElementById('salEnd').value;
             if (!start || !end) return;
 
-            let html = '<tr><th>Сотрудник</th><th>Дней отработано</th><th>Фикс. ЗП</th><th>Бонусы с продаж</th><th>Итого ЗП</th></tr>';
+            let html = '<tr><th>Сотрудник</th><th>Дней отработано</th><th>Фикс. ЗП</th><th>Бонусы с продаж</th><th>Штрафы</th><th>Итого ЗП</th></tr>';
             
             let empSales = {};
             allOrders.forEach(o => {
@@ -1264,7 +1269,7 @@ SALARY_TEMPLATE = '''
             employees.forEach(emp => {
                 let daysWorked = 0;
                 let fixedSal = 0;
-                let bonusSal = 0;
+                let totalSales = 0;
                 
                 let currDate = new Date(start);
                 const endDate = new Date(end);
@@ -1277,32 +1282,44 @@ SALARY_TEMPLATE = '''
                     
                     if (worked || dailySales > 0) {
                         daysWorked++;
-                        fixedSal += parseFloat(emp.daily_rate || 0);
-                        
-                        const target = parseFloat(emp.target_amount || 0);
-                        const pct = parseFloat(emp.bonus_percentage || 0);
-                        
-                        if (pct > 0 && dailySales >= target) {
-                            bonusSal += dailySales * (pct / 100);
-                        }
+                        fixedSal += parseFloat(emp.daily_rate || 230000);
                     }
+                    totalSales += dailySales;
                     currDate.setDate(currDate.getDate() + 1);
                 }
                 
-                const total = fixedSal + bonusSal;
-                if (daysWorked > 0 || total > 0) {
+                let bonusSal = 0;
+                const target = parseFloat(emp.target_amount || 1500000);
+                const pct = parseFloat(emp.bonus_percentage || 10);
+                
+                if (pct > 0 && totalSales > target) {
+                    bonusSal = (totalSales - target) * (pct / 100);
+                }
+
+                let totalFines = 0;
+                if (fines[emp.id]) {
+                    fines[emp.id].forEach(f => {
+                        if (f.date >= start && f.date <= end) {
+                            totalFines += parseFloat(f.amount || 0);
+                        }
+                    });
+                }
+                
+                const total = fixedSal + bonusSal - totalFines;
+                if (daysWorked > 0 || total > 0 || totalFines > 0) {
                     html += `<tr>
                         <td>${emp.name}</td>
                         <td>${daysWorked}</td>
                         <td>${fixedSal.toFixed(2)} ${currencyCode}</td>
                         <td>${bonusSal.toFixed(2)} ${currencyCode}</td>
+                        <td style="color:var(--danger);">${totalFines.toFixed(2)} ${currencyCode}</td>
                         <td style="font-weight:bold; color:var(--success);">${total.toFixed(2)} ${currencyCode}</td>
                     </tr>`;
                 }
             });
             
-            if (html === '<tr><th>Сотрудник</th><th>Дней отработано</th><th>Фикс. ЗП</th><th>Бонусы с продаж</th><th>Итого ЗП</th></tr>') {
-                html += '<tr><td colspan="5">За выбранный период данных нет</td></tr>';
+            if (html === '<tr><th>Сотрудник</th><th>Дней отработано</th><th>Фикс. ЗП</th><th>Бонусы с продаж</th><th>Штрафы</th><th>Итого ЗП</th></tr>') {
+                html += '<tr><td colspan="6">За выбранный период данных нет</td></tr>';
             }
             document.getElementById('tableSalary').innerHTML = html;
         }
@@ -1387,6 +1404,10 @@ ADMIN_TEMPLATE = '''
         .orders-table th { padding: 12px; background: #1a1a1a; border-bottom: 2px solid var(--border); color: var(--primary); font-size: 0.85rem; text-transform: uppercase; }
         .orders-table td { padding: 12px; border-bottom: 1px solid var(--border); vertical-align: middle; color: var(--text); }
         .orders-table tr:hover { background: #1a1a1a; }
+
+        .rep-table { width: 100%; border-collapse: collapse; font-size: 0.9rem; color: var(--text); }
+        .rep-table th, .rep-table td { padding: 8px 5px; border-bottom: 1px solid var(--border); text-align: left; }
+        .rep-table th { color: var(--text-muted); font-weight: normal; }
         
         @media (max-width: 600px) {
             .header-panel { flex-direction: column; align-items: stretch; text-align: center; }
@@ -1455,9 +1476,9 @@ ADMIN_TEMPLATE = '''
                         <input type="hidden" name="action" value="add_employee">
                         <div style="flex:1; min-width:150px;"><label>Имя</label><input type="text" name="employee_name" required autocomplete="off"></div>
                         <div style="flex:1; min-width:100px;"><label>PIN (4 цифры)</label><input type="text" name="pin" pattern="\\d{4}" required autocomplete="off"></div>
-                        <div style="flex:1; min-width:100px;"><label>Ставка за день</label><input type="number" name="daily_rate" value="0" required></div>
-                        <div style="flex:1; min-width:100px;"><label>Цель (n сумма)</label><input type="number" name="target_amount" value="0" required></div>
-                        <div style="flex:1; min-width:100px;"><label>Бонус (%)</label><input type="number" name="bonus_percentage" value="0" step="0.1" required></div>
+                        <div style="flex:1; min-width:100px;"><label>Ставка за день</label><input type="number" name="daily_rate" value="230000" required></div>
+                        <div style="flex:1; min-width:100px;"><label>Цель (n сумма)</label><input type="number" name="target_amount" value="1500000" required></div>
+                        <div style="flex:1; min-width:100px;"><label>Бонус (%)</label><input type="number" name="bonus_percentage" value="10" step="0.1" required></div>
                         <button type="submit" class="btn btn-dark" style="width:100%; margin-top:10px;"><i class="fas fa-plus"></i> Добавить</button>
                     </form>
                 </div>
@@ -1476,10 +1497,45 @@ ADMIN_TEMPLATE = '''
                             <div style="flex:1; min-width:100px;"><label>Бонус %</label><input type="number" name="bonus_percentage" value="{{ emp.bonus_percentage }}" step="0.1" required></div>
                             <button type="submit" class="btn btn-primary" title="Со��ранить"><i class="fas fa-save"></i></button>
                         </form>
-                        <form method="POST" style="margin-top:10px; text-align:right;" onsubmit="return confirm('Удалить сотрудника?');">
+                        
+                        <div style="margin-top:15px; border-top:1px dashed var(--border); padding-top:15px;">
+                            <h4 style="margin:0 0 10px 0; color:var(--primary);">Штрафы</h4>
+                            <form method="POST" style="display:flex; flex-wrap:wrap; gap:10px; align-items:flex-end; margin-bottom:10px;">
+                                <input type="hidden" name="action" value="add_fine">
+                                <input type="hidden" name="employee_id" value="{{ emp.id }}">
+                                <div style="flex:1; min-width:120px;"><label>Дата</label><input type="date" name="fine_date" required></div>
+                                <div style="flex:1; min-width:100px;"><label>Сумма</label><input type="number" name="fine_amount" required></div>
+                                <div style="flex:2; min-width:150px;"><label>Причина</label><input type="text" name="fine_reason" required autocomplete="off"></div>
+                                <button type="submit" class="btn btn-danger" style="padding:12px 15px;"><i class="fas fa-plus"></i></button>
+                            </form>
+                            {% if fines.get(emp.id) %}
+                            <table class="rep-table" style="font-size:0.85rem;">
+                                <tr><th>Дата</th><th>Причина</th><th>Сумма</th><th>Удалить</th></tr>
+                                {% for f in fines.get(emp.id) %}
+                                <tr>
+                                    <td>{{ f.date }}</td>
+                                    <td>{{ f.reason }}</td>
+                                    <td>{{ f.amount }} {{ currency_code }}</td>
+                                    <td>
+                                        <form method="POST" style="margin:0;" onsubmit="return confirm('Удалить штраф?');">
+                                            <input type="hidden" name="action" value="delete_fine">
+                                            <input type="hidden" name="employee_id" value="{{ emp.id }}">
+                                            <input type="hidden" name="fine_id" value="{{ f.id }}">
+                                            <button type="submit" class="btn btn-danger" style="padding:3px 8px; font-size:0.75rem;"><i class="fas fa-trash"></i></button>
+                                        </form>
+                                    </td>
+                                </tr>
+                                {% endfor %}
+                            </table>
+                            {% else %}
+                            <div style="font-size:0.85rem; color:var(--text-muted);">Нет штрафов</div>
+                            {% endif %}
+                        </div>
+
+                        <form method="POST" style="margin-top:15px; text-align:right;" onsubmit="return confirm('Удалить сотрудника?');">
                             <input type="hidden" name="action" value="delete_employee">
                             <input type="hidden" name="employee_id" value="{{ emp.id }}">
-                            <button type="submit" class="btn btn-danger"><i class="fas fa-trash"></i> Удалить</button>
+                            <button type="submit" class="btn btn-danger" style="margin-top: 10px;"><i class="fas fa-trash"></i> Удалить сотрудника</button>
                         </form>
                     </div>
                     {% endfor %}
@@ -1505,10 +1561,6 @@ ADMIN_TEMPLATE = '''
                             <th>Действия</th>
                         </tr>
                         {% for order in orders.values()|sort(attribute='created_at', reverse=True) %}
-                        {% set raw_total = 0 %}
-                        {% for item in order.cart %}
-                            {% set raw_total = raw_total + (item.price|float * item.quantity|int) %}
-                        {% endfor %}
                         <tr>
                             <td>
                                 <a href="/order/{{ order.id }}" target="_blank" style="color:var(--info); font-weight:bold; text-decoration:none;">{{ order.id }}</a><br>
@@ -1518,7 +1570,7 @@ ADMIN_TEMPLATE = '''
                                 Столик: {{ order.table_number }}<br>
                                 Сотрудник: {{ order.employee_name|default('Не указан') }}
                             </td>
-                            <td style="font-weight:600;">{{ raw_total }} {{ currency_code }}</td>
+                            <td style="font-weight:600;">{{ order.total_price }} {{ currency_code }}</td>
                             <td>
                                 <span style="text-transform:uppercase; font-size:0.8rem;">
                                     {% if order.payment_method == 'cash' %}Наличка
@@ -1900,12 +1952,14 @@ def admin_salary():
     orders = data.get('orders', {})
     employees = data.get('employees', [])
     workdays = data.get('workdays', {})
+    fines = data.get('fines', {})
     
     return render_template_string(
         SALARY_TEMPLATE,
         orders_json=json.dumps(list(orders.values())),
         employees_json=json.dumps(employees),
         workdays_json=json.dumps(workdays),
+        fines_json=json.dumps(fines),
         currency_code=CURRENCY_CODE
     )
 
@@ -1916,6 +1970,7 @@ def admin():
     categories = data.get('categories', [])
     orders = data.get('orders', {})
     employees = data.get('employees', [])
+    fines = data.get('fines', {})
     settings = data.get('settings', {})
 
     if request.method == 'POST':
@@ -1934,12 +1989,12 @@ def admin():
         elif action == 'add_employee':
             emp_name = request.form.get('employee_name', '').strip()
             pin = request.form.get('pin', '0000').strip()
-            try: daily_rate = float(request.form.get('daily_rate', 0))
-            except: daily_rate = 0
-            try: target_amount = float(request.form.get('target_amount', 0))
-            except: target_amount = 0
-            try: bonus_percentage = float(request.form.get('bonus_percentage', 0))
-            except: bonus_percentage = 0
+            try: daily_rate = float(request.form.get('daily_rate', 230000))
+            except: daily_rate = 230000
+            try: target_amount = float(request.form.get('target_amount', 1500000))
+            except: target_amount = 1500000
+            try: bonus_percentage = float(request.form.get('bonus_percentage', 10))
+            except: bonus_percentage = 10
             
             if emp_name:
                 employees.append({
@@ -1959,12 +2014,12 @@ def admin():
                 if e.get('id') == emp_id:
                     e['name'] = request.form.get('name', '').strip()
                     e['pin'] = request.form.get('pin', '0000').strip()
-                    try: e['daily_rate'] = float(request.form.get('daily_rate', 0))
-                    except: e['daily_rate'] = 0
-                    try: e['target_amount'] = float(request.form.get('target_amount', 0))
-                    except: e['target_amount'] = 0
-                    try: e['bonus_percentage'] = float(request.form.get('bonus_percentage', 0))
-                    except: e['bonus_percentage'] = 0
+                    try: e['daily_rate'] = float(request.form.get('daily_rate', 230000))
+                    except: e['daily_rate'] = 230000
+                    try: e['target_amount'] = float(request.form.get('target_amount', 1500000))
+                    except: e['target_amount'] = 1500000
+                    try: e['bonus_percentage'] = float(request.form.get('bonus_percentage', 10))
+                    except: e['bonus_percentage'] = 10
                     break
             data['employees'] = employees
             save_data(data)
@@ -1974,6 +2029,33 @@ def admin():
             data['employees'] = [e for e in employees if e.get('id') != emp_id]
             save_data(data)
 
+        elif action == 'add_fine':
+            emp_id = request.form.get('employee_id')
+            fine_date = request.form.get('fine_date')
+            try: fine_amount = float(request.form.get('fine_amount', 0))
+            except: fine_amount = 0
+            fine_reason = request.form.get('fine_reason', '').strip()
+            
+            if emp_id and fine_date and fine_amount > 0:
+                if 'fines' not in data:
+                    data['fines'] = {}
+                if emp_id not in data['fines']:
+                    data['fines'][emp_id] = []
+                data['fines'][emp_id].append({
+                    'id': uuid4().hex,
+                    'date': fine_date,
+                    'amount': fine_amount,
+                    'reason': fine_reason
+                })
+                save_data(data)
+
+        elif action == 'delete_fine':
+            emp_id = request.form.get('employee_id')
+            fine_id = request.form.get('fine_id')
+            if 'fines' in data and emp_id in data['fines']:
+                data['fines'][emp_id] = [f for f in data['fines'][emp_id] if f.get('id') != fine_id]
+                save_data(data)
+
         elif action == 'delete_order':
             order_id = request.form.get('order_id')
             if order_id in orders:
@@ -2118,6 +2200,7 @@ def admin():
         categories=categories,
         orders=orders,
         employees=employees,
+        fines=data.get('fines', {}),
         repo_id=REPO_ID,
         currency_code=CURRENCY_CODE,
         settings=settings