Kgshop commited on
Commit
3f81809
·
verified ·
1 Parent(s): 1c9c66a

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +169 -181
app.py CHANGED
@@ -4,7 +4,7 @@ import os
4
  import logging
5
  import threading
6
  import time
7
- from datetime import datetime, timedelta
8
  import pytz
9
  from huggingface_hub import HfApi, hf_hub_download
10
  from huggingface_hub.utils import RepositoryNotFoundError, HfHubHTTPError
@@ -36,7 +36,7 @@ HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE", "YOUR_WRITE_TOKEN_HERE")
36
  HF_TOKEN_READ = os.getenv("HF_TOKEN_READ", "YOUR_READ_TOKEN_HERE")
37
  REPO_ID = "Kgshop/postest"
38
 
39
- BISHKEK_TZ = pytz.timezone('Asia/Bishkek')
40
 
41
  logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
42
 
@@ -288,6 +288,7 @@ def complete_sale():
288
 
289
  sale_items = []
290
  total_amount = Decimal('0.00')
 
291
  inventory_updates = {}
292
 
293
  for item_id, cart_item in cart.items():
@@ -304,7 +305,10 @@ def complete_sale():
304
  price_at_sale = to_decimal(product.get('price', '0'))
305
  cost_price_at_sale = to_decimal(product.get('cost_price', '0'))
306
  item_total = price_at_sale * Decimal(quantity_sold)
 
 
307
  total_amount += item_total
 
308
 
309
  sale_items.append({
310
  'product_id': item_id,
@@ -328,6 +332,7 @@ def complete_sale():
328
  'kassa_name': kassa.get('name', 'N/A'),
329
  'items': sale_items,
330
  'total_amount': str(total_amount),
 
331
  'payment_method': payment_method
332
  }
333
 
@@ -377,14 +382,59 @@ def transaction_history():
377
  html = BASE_TEMPLATE.replace('__TITLE__', "История продаж").replace('__CONTENT__', TRANSACTIONS_CONTENT).replace('__SCRIPTS__', TRANSACTIONS_SCRIPTS)
378
  return render_template_string(html, transactions=transactions)
379
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
380
  @app.route('/admin', methods=['GET'])
381
  def admin_panel():
382
  users = load_json_data('users')
383
  kassas = load_json_data('kassas')
384
- expenses = load_json_data('expenses')
385
- expenses.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
386
  html = BASE_TEMPLATE.replace('__TITLE__', "Админ-панель").replace('__CONTENT__', ADMIN_CONTENT).replace('__SCRIPTS__', ADMIN_SCRIPTS)
387
- return render_template_string(html, users=users, kassas=kassas, expenses=expenses[:10])
388
 
389
  @app.route('/admin/user', methods=['POST'])
390
  def manage_user():
@@ -501,9 +551,9 @@ def kassa_operation():
501
  return redirect(url_for('admin_panel'))
502
 
503
  @app.route('/admin/expense', methods=['POST'])
504
- def manage_expense():
505
  try:
506
- amount = to_decimal(request.form.get('amount', '0'))
507
  category = request.form.get('category', 'Прочее').strip()
508
  description = request.form.get('description', '').strip()
509
 
@@ -511,7 +561,6 @@ def manage_expense():
511
  flash("Сумма расхода должна быть положительной.", "danger")
512
  return redirect(url_for('admin_panel'))
513
 
514
- expenses = load_json_data('expenses')
515
  new_expense = {
516
  'id': uuid.uuid4().hex,
517
  'timestamp': get_current_time().isoformat(),
@@ -519,72 +568,17 @@ def manage_expense():
519
  'category': category,
520
  'description': description
521
  }
 
 
522
  expenses.append(new_expense)
523
  save_json_data('expenses', expenses)
524
  upload_db_to_hf('expenses')
525
- flash("Расход успешно добавлен.", "success")
526
  except Exception as e:
527
  flash(f"Ошибка при добавлении расхода: {e}", "danger")
528
 
529
  return redirect(url_for('admin_panel'))
530
 
531
-
532
- @app.route('/reports')
533
- def reports_page():
534
- today = get_current_time().date()
535
- start_date_str = request.args.get('start_date', today.strftime('%Y-%m-%d'))
536
- end_date_str = request.args.get('end_date', today.strftime('%Y-%m-%d'))
537
-
538
- try:
539
- start_date = BISHKEK_TZ.localize(datetime.strptime(start_date_str, '%Y-%m-%d'))
540
- end_date = BISHKEK_TZ.localize(datetime.strptime(end_date_str, '%Y-%m-%d')) + timedelta(days=1, seconds=-1)
541
- except ValueError:
542
- flash("Неверный формат даты.", "danger")
543
- start_date = BISHKEK_TZ.localize(datetime.combine(today, datetime.min.time()))
544
- end_date = BISHKEK_TZ.localize(datetime.combine(today, datetime.max.time()))
545
-
546
- transactions = load_json_data('transactions')
547
- expenses = load_json_data('expenses')
548
-
549
- filtered_transactions = [
550
- t for t in transactions
551
- if start_date <= datetime.fromisoformat(t['timestamp']) <= end_date
552
- ]
553
- filtered_expenses = [
554
- e for e in expenses
555
- if start_date <= datetime.fromisoformat(e['timestamp']) <= end_date
556
- ]
557
-
558
- total_revenue = Decimal('0.00')
559
- total_cogs = Decimal('0.00')
560
- for t in filtered_transactions:
561
- total_revenue += to_decimal(t.get('total_amount', '0'))
562
- for item in t.get('items', []):
563
- cost = to_decimal(item.get('cost_price_at_sale', '0'))
564
- quantity = Decimal(item.get('quantity', 0))
565
- total_cogs += cost * quantity
566
-
567
- total_expenses = sum(to_decimal(e.get('amount', '0')) for e in filtered_expenses)
568
- gross_profit = total_revenue - total_cogs
569
- net_profit = gross_profit - total_expenses
570
-
571
- filtered_transactions.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
572
- filtered_expenses.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
573
-
574
- report_data = {
575
- 'total_revenue': total_revenue,
576
- 'total_cogs': total_cogs,
577
- 'gross_profit': gross_profit,
578
- 'total_expenses': total_expenses,
579
- 'net_profit': net_profit,
580
- 'transactions': filtered_transactions,
581
- 'expenses': filtered_expenses
582
- }
583
-
584
- html = BASE_TEMPLATE.replace('__TITLE__', "Отчеты").replace('__CONTENT__', REPORTS_CONTENT).replace('__SCRIPTS__', REPORTS_SCRIPTS)
585
- return render_template_string(html, report=report_data, start_date=start_date_str, end_date=end_date_str)
586
-
587
-
588
  @app.route('/backup', methods=['POST'])
589
  def backup_hf():
590
  try:
@@ -650,7 +644,7 @@ BASE_TEMPLATE = """
650
  <li class="nav-item"><a class="nav-link {% if request.endpoint == 'sales_screen' %}active{% endif %}" href="{{ url_for('sales_screen') }}"><i class="fas fa-fw fa-dollar-sign me-2"></i>Касса</a></li>
651
  <li class="nav-item"><a class="nav-link {% if request.endpoint == 'inventory_management' %}active{% endif %}" href="{{ url_for('inventory_management') }}"><i class="fas fa-fw fa-boxes me-2"></i>Склад</a></li>
652
  <li class="nav-item"><a class="nav-link {% if request.endpoint == 'transaction_history' %}active{% endif %}" href="{{ url_for('transaction_history') }}"><i class="fas fa-fw fa-history me-2"></i>Продажи</a></li>
653
- <li class="nav-item"><a class="nav-link {% if request.endpoint == 'reports_page' %}active{% endif %}" href="{{ url_for('reports_page') }}"><i class="fas fa-fw fa-chart-line me-2"></i>Отчеты</a></li>
654
  <li class="nav-item"><a class="nav-link {% if request.endpoint == 'admin_panel' %}active{% endif %}" href="{{ url_for('admin_panel') }}"><i class="fas fa-fw fa-cogs me-2"></i>Админка</a></li>
655
  </ul>
656
  <div class="mt-auto p-3 text-secondary small">
@@ -763,7 +757,7 @@ document.addEventListener('DOMContentLoaded', () => {
763
  const cartItemsEl = document.getElementById('cart-items');
764
  const cartTotalEl = document.getElementById('cart-total');
765
  let audioCtx;
766
- let isScanningLocked = false;
767
 
768
  function playBeep() {
769
  if (!audioCtx) {
@@ -823,6 +817,12 @@ document.addEventListener('DOMContentLoaded', () => {
823
  playBeep();
824
  updateCartView();
825
  };
 
 
 
 
 
 
826
 
827
  productGrid.addEventListener('click', e => {
828
  const card = e.target.closest('.product-card');
@@ -883,7 +883,6 @@ document.addEventListener('DOMContentLoaded', () => {
883
  alert('Продажа завершена!');
884
  for(const id in cart) delete cart[id];
885
  updateCartView();
886
- location.reload();
887
  } else {
888
  alert(`Ошибка: ${data.message}`);
889
  }
@@ -894,19 +893,16 @@ document.addEventListener('DOMContentLoaded', () => {
894
  document.getElementById('pay-cash-btn').addEventListener('click', () => completeSale('cash'));
895
  document.getElementById('pay-card-btn').addEventListener('click', () => completeSale('card'));
896
 
897
- const html5QrCode = new Html5Qrcode("reader");
898
  const onScanSuccess = (decodedText, decodedResult) => {
899
- if (isScanningLocked) return;
900
- isScanningLocked = true;
901
-
902
  fetch(`/api/product_by_barcode/${decodedText}`)
903
  .then(res => res.json())
904
  .then(data => {
905
- if (data.success) addToCart(data.product);
906
- else alert(data.message);
907
- })
908
- .finally(() => {
909
- setTimeout(() => { isScanningLocked = false; }, 1500);
 
910
  });
911
  };
912
 
@@ -915,13 +911,6 @@ document.addEventListener('DOMContentLoaded', () => {
915
  const config = { fps: 10, qrbox: { width: 250, height: 250 } };
916
  html5QrCode.start({ facingMode: "environment" }, config, onScanSuccess);
917
  };
918
-
919
- const stopScanner = () => {
920
- html5QrCode.stop().then(() => {
921
- document.getElementById('scanner-container').style.display = 'none';
922
- isScanningLocked = false;
923
- }).catch(err => console.error("Failed to stop scanner", err));
924
- };
925
 
926
  document.getElementById('scan-btn').addEventListener('click', startScanner);
927
  document.getElementById('stop-scan-btn').addEventListener('click', stopScanner);
@@ -1076,6 +1065,97 @@ TRANSACTIONS_CONTENT = """
1076
 
1077
  TRANSACTIONS_SCRIPTS = ""
1078
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1079
  ADMIN_CONTENT = """
1080
  <div class="row">
1081
  <div class="col-md-6 mb-4">
@@ -1142,34 +1222,16 @@ ADMIN_CONTENT = """
1142
  </div>
1143
  <div class="col-12 mb-4">
1144
  <div class="card">
1145
- <div class="card-header"><h5 class="mb-0">Управление расходами</h5></div>
1146
  <div class="card-body">
1147
- <form action="{{ url_for('manage_expense') }}" method="POST" class="mb-4">
1148
- <div class="row g-2 align-items-end">
1149
  <div class="col-md-3"><label class="form-label">Сумма</label><input type="text" name="amount" class="form-control" required inputmode="decimal"></div>
1150
  <div class="col-md-3"><label class="form-label">Категория</label><input type="text" name="category" class="form-control" value="Прочее"></div>
1151
  <div class="col-md-4"><label class="form-label">Описание</label><input type="text" name="description" class="form-control"></div>
1152
- <div class="col-md-2"><button type="submit" class="btn btn-warning w-100">Добавить расход</button></div>
1153
  </div>
1154
  </form>
1155
- <h6>Последние 10 расходов</h6>
1156
- <div class="table-responsive">
1157
- <table class="table table-sm">
1158
- <thead><tr><th>Дата</th><th>Сумма</th><th>Категория</th><th>Описание</th></tr></thead>
1159
- <tbody>
1160
- {% for e in expenses %}
1161
- <tr>
1162
- <td><small>{{ e.timestamp[:16]|replace('T', ' ') }}</small></td>
1163
- <td>{{ format_currency_py(e.amount) }} с</td>
1164
- <td>{{ e.category }}</td>
1165
- <td>{{ e.description }}</td>
1166
- </tr>
1167
- {% else %}
1168
- <tr><td colspan="4" class="text-center">Расходов пока нет.</td></tr>
1169
- {% endfor %}
1170
- </tbody>
1171
- </table>
1172
- </div>
1173
  </div>
1174
  </div>
1175
  </div>
@@ -1180,7 +1242,6 @@ ADMIN_CONTENT = """
1180
  <p>Данные периодически сохраняются в облако. Можно сделать это вручную.</p>
1181
  <form method="POST" action="{{ url_for('backup_hf') }}" class="d-inline-block me-2">
1182
  <button type="submit" class="btn btn-outline-primary"><i class="fas fa-cloud-upload-alt me-2"></i>Сохранить в облако</button>
1183
-
1184
  </form>
1185
  <form method="GET" action="{{ url_for('download_hf') }}" class="d-inline-block" onsubmit="return confirm('ВНИМАНИЕ! Это действие заменит все локальные данные данными из облака. Продолжить?');">
1186
  <button type="submit" class="btn btn-outline-danger"><i class="fas fa-cloud-download-alt me-2"></i>Загрузить из облака</button>
@@ -1193,79 +1254,6 @@ ADMIN_CONTENT = """
1193
 
1194
  ADMIN_SCRIPTS = ""
1195
 
1196
- REPORTS_CONTENT = """
1197
- <div class="card mb-4">
1198
- <div class="card-body">
1199
- <form method="GET" action="{{ url_for('reports_page') }}">
1200
- <div class="row g-2 align-items-end">
1201
- <div class="col-md-4"><label for="start_date" class="form-label">Начало периода</label><input type="date" id="start_date" name="start_date" class="form-control" value="{{ start_date }}"></div>
1202
- <div class="col-md-4"><label for="end_date" class="form-label">Конец периода</label><input type="date" id="end_date" name="end_date" class="form-control" value="{{ end_date }}"></div>
1203
- <div class="col-md-4"><button type="submit" class="btn btn-primary w-100">Сформировать</button></div>
1204
- </div>
1205
- </form>
1206
- </div>
1207
- </div>
1208
-
1209
- <div class="row">
1210
- <div class="col-md-4 col-xl-3 mb-4"><div class="card"><div class="card-body"><h6 class="card-title">Выручка</h6><h4 class="card-text">{{ format_currency_py(report.total_revenue) }} с</h4></div></div></div>
1211
- <div class="col-md-4 col-xl-3 mb-4"><div class="card"><div class="card-body"><h6 class="card-title">Себестоимость</h6><h4 class="card-text">{{ format_currency_py(report.total_cogs) }} с</h4></div></div></div>
1212
- <div class="col-md-4 col-xl-3 mb-4"><div class="card bg-light"><div class="card-body"><h6 class="card-title">Валовая прибыль</h6><h4 class="card-text fw-bold">{{ format_currency_py(report.gross_profit) }} с</h4></div></div></div>
1213
- <div class="col-md-4 col-xl-3 mb-4"><div class="card"><div class="card-body"><h6 class="card-title">Расходы</h6><h4 class="card-text text-danger">{{ format_currency_py(report.total_expenses) }} с</h4></div></div></div>
1214
- <div class="col-md-4 col-xl-3 mb-4"><div class="card bg-success text-white"><div class="card-body"><h6 class="card-title">Чистая прибыль</h6><h4 class="card-text fw-bold">{{ format_currency_py(report.net_profit) }} с</h4></div></div></div>
1215
- </div>
1216
-
1217
- <div class="row">
1218
- <div class="col-lg-7 mb-4">
1219
- <div class="card">
1220
- <div class="card-header"><h5>Продажи за период</h5></div>
1221
- <div class="card-body">
1222
- <div class="table-responsive" style="max-height: 400px;">
1223
- <table class="table table-sm">
1224
- <thead><tr><th>Дата</th><th>Кассир</th><th>Сумма</th><th>Позиции</th></tr></thead>
1225
- <tbody>
1226
- {% for t in report.transactions %}
1227
- <tr>
1228
- <td><small>{{ t.timestamp[:16]|replace('T', ' ') }}</small></td>
1229
- <td>{{ t.user_name }}</td>
1230
- <td class="fw-bold">{{ format_currency_py(t.total_amount) }}</td>
1231
- <td><ul class="list-unstyled mb-0 small">{% for item in t.items %}<li>{{item.name}} ({{item.quantity}}шт)</li>{% endfor %}</ul></td>
1232
- </tr>
1233
- {% else %}
1234
- <tr><td colspan="4" class="text-center">Продаж за период нет.</td></tr>
1235
- {% endfor %}
1236
- </tbody>
1237
- </table>
1238
- </div>
1239
- </div>
1240
- </div>
1241
- </div>
1242
- <div class="col-lg-5 mb-4">
1243
- <div class="card">
1244
- <div class="card-header"><h5>Расходы за период</h5></div>
1245
- <div class="card-body">
1246
- <div class="table-responsive" style="max-height: 400px;">
1247
- <table class="table table-sm">
1248
- <thead><tr><th>Дата</th><th>Сумма</th><th>Категория</th></tr></thead>
1249
- <tbody>
1250
- {% for e in report.expenses %}
1251
- <tr>
1252
- <td><small>{{ e.timestamp[:16]|replace('T', ' ') }}</small></td>
1253
- <td class="fw-bold">{{ format_currency_py(e.amount) }}</td>
1254
- <td>{{ e.category }}<br><small class="text-muted">{{e.description}}</small></td>
1255
- </tr>
1256
- {% else %}
1257
- <tr><td colspan="3" class="text-center">Расходов за период нет.</td></tr>
1258
- {% endfor %}
1259
- </tbody>
1260
- </table>
1261
- </div>
1262
- </div>
1263
- </div>
1264
- </div>
1265
- </div>
1266
- """
1267
- REPORTS_SCRIPTS = ""
1268
-
1269
  if __name__ == '__main__':
1270
  backup_thread = threading.Thread(target=periodic_backup, daemon=True)
1271
  backup_thread.start()
 
4
  import logging
5
  import threading
6
  import time
7
+ from datetime import datetime, date, timedelta
8
  import pytz
9
  from huggingface_hub import HfApi, hf_hub_download
10
  from huggingface_hub.utils import RepositoryNotFoundError, HfHubHTTPError
 
36
  HF_TOKEN_READ = os.getenv("HF_TOKEN_READ", "YOUR_READ_TOKEN_HERE")
37
  REPO_ID = "Kgshop/postest"
38
 
39
+ BISHKEK_TZ = pytz.timezone('Asia/Bbishkek')
40
 
41
  logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
42
 
 
288
 
289
  sale_items = []
290
  total_amount = Decimal('0.00')
291
+ total_cost = Decimal('0.00')
292
  inventory_updates = {}
293
 
294
  for item_id, cart_item in cart.items():
 
305
  price_at_sale = to_decimal(product.get('price', '0'))
306
  cost_price_at_sale = to_decimal(product.get('cost_price', '0'))
307
  item_total = price_at_sale * Decimal(quantity_sold)
308
+ item_cost_total = cost_price_at_sale * Decimal(quantity_sold)
309
+
310
  total_amount += item_total
311
+ total_cost += item_cost_total
312
 
313
  sale_items.append({
314
  'product_id': item_id,
 
332
  'kassa_name': kassa.get('name', 'N/A'),
333
  'items': sale_items,
334
  'total_amount': str(total_amount),
335
+ 'total_cost': str(total_cost),
336
  'payment_method': payment_method
337
  }
338
 
 
382
  html = BASE_TEMPLATE.replace('__TITLE__', "История продаж").replace('__CONTENT__', TRANSACTIONS_CONTENT).replace('__SCRIPTS__', TRANSACTIONS_SCRIPTS)
383
  return render_template_string(html, transactions=transactions)
384
 
385
+ @app.route('/reports')
386
+ def reports():
387
+ today = get_current_time().date()
388
+ start_date_str = request.args.get('start_date', (today.replace(day=1)).strftime('%Y-%m-%d'))
389
+ end_date_str = request.args.get('end_date', today.strftime('%Y-%m-%d'))
390
+
391
+ try:
392
+ start_date = BISHKEK_TZ.localize(datetime.strptime(start_date_str, '%Y-%m-%d'))
393
+ end_date = BISHKEK_TZ.localize(datetime.strptime(end_date_str, '%Y-%m-%d')) + timedelta(days=1)
394
+ except ValueError:
395
+ flash("Неверный формат даты.", "danger")
396
+ return redirect(url_for('reports'))
397
+
398
+ all_transactions = load_json_data('transactions')
399
+ all_expenses = load_json_data('expenses')
400
+
401
+ filtered_transactions = [
402
+ t for t in all_transactions
403
+ if start_date <= datetime.fromisoformat(t['timestamp']) < end_date
404
+ ]
405
+ filtered_expenses = [
406
+ e for e in all_expenses
407
+ if start_date <= datetime.fromisoformat(e['timestamp']) < end_date
408
+ ]
409
+
410
+ total_sales = sum(to_decimal(t.get('total_amount', '0')) for t in filtered_transactions)
411
+ total_cost = sum(to_decimal(t.get('total_cost', '0')) for t in filtered_transactions)
412
+ gross_profit = total_sales - total_cost
413
+ total_expenses = sum(to_decimal(e.get('amount', '0')) for e in filtered_expenses)
414
+ net_profit = gross_profit - total_expenses
415
+
416
+ filtered_transactions.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
417
+ filtered_expenses.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
418
+
419
+ stats = {
420
+ 'total_sales': total_sales,
421
+ 'total_cost': total_cost,
422
+ 'gross_profit': gross_profit,
423
+ 'total_expenses': total_expenses,
424
+ 'net_profit': net_profit,
425
+ 'start_date': start_date_str,
426
+ 'end_date': end_date_str
427
+ }
428
+
429
+ html = BASE_TEMPLATE.replace('__TITLE__', "Отчеты").replace('__CONTENT__', REPORTS_CONTENT).replace('__SCRIPTS__', REPORTS_SCRIPTS)
430
+ return render_template_string(html, stats=stats, transactions=filtered_transactions, expenses=filtered_expenses)
431
+
432
  @app.route('/admin', methods=['GET'])
433
  def admin_panel():
434
  users = load_json_data('users')
435
  kassas = load_json_data('kassas')
 
 
436
  html = BASE_TEMPLATE.replace('__TITLE__', "Админ-панель").replace('__CONTENT__', ADMIN_CONTENT).replace('__SCRIPTS__', ADMIN_SCRIPTS)
437
+ return render_template_string(html, users=users, kassas=kassas)
438
 
439
  @app.route('/admin/user', methods=['POST'])
440
  def manage_user():
 
551
  return redirect(url_for('admin_panel'))
552
 
553
  @app.route('/admin/expense', methods=['POST'])
554
+ def add_expense():
555
  try:
556
+ amount = to_decimal(request.form.get('amount'))
557
  category = request.form.get('category', 'Прочее').strip()
558
  description = request.form.get('description', '').strip()
559
 
 
561
  flash("Сумма расхода должна быть положительной.", "danger")
562
  return redirect(url_for('admin_panel'))
563
 
 
564
  new_expense = {
565
  'id': uuid.uuid4().hex,
566
  'timestamp': get_current_time().isoformat(),
 
568
  'category': category,
569
  'description': description
570
  }
571
+
572
+ expenses = load_json_data('expenses')
573
  expenses.append(new_expense)
574
  save_json_data('expenses', expenses)
575
  upload_db_to_hf('expenses')
576
+ flash(f"Расход '{category}' на сумму {amount} добавлен.", "success")
577
  except Exception as e:
578
  flash(f"Ошибка при добавлении расхода: {e}", "danger")
579
 
580
  return redirect(url_for('admin_panel'))
581
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
582
  @app.route('/backup', methods=['POST'])
583
  def backup_hf():
584
  try:
 
644
  <li class="nav-item"><a class="nav-link {% if request.endpoint == 'sales_screen' %}active{% endif %}" href="{{ url_for('sales_screen') }}"><i class="fas fa-fw fa-dollar-sign me-2"></i>Касса</a></li>
645
  <li class="nav-item"><a class="nav-link {% if request.endpoint == 'inventory_management' %}active{% endif %}" href="{{ url_for('inventory_management') }}"><i class="fas fa-fw fa-boxes me-2"></i>Склад</a></li>
646
  <li class="nav-item"><a class="nav-link {% if request.endpoint == 'transaction_history' %}active{% endif %}" href="{{ url_for('transaction_history') }}"><i class="fas fa-fw fa-history me-2"></i>Продажи</a></li>
647
+ <li class="nav-item"><a class="nav-link {% if request.endpoint == 'reports' %}active{% endif %}" href="{{ url_for('reports') }}"><i class="fas fa-fw fa-chart-line me-2"></i>Отчеты</a></li>
648
  <li class="nav-item"><a class="nav-link {% if request.endpoint == 'admin_panel' %}active{% endif %}" href="{{ url_for('admin_panel') }}"><i class="fas fa-fw fa-cogs me-2"></i>Админка</a></li>
649
  </ul>
650
  <div class="mt-auto p-3 text-secondary small">
 
757
  const cartItemsEl = document.getElementById('cart-items');
758
  const cartTotalEl = document.getElementById('cart-total');
759
  let audioCtx;
760
+ const html5QrCode = new Html5Qrcode("reader");
761
 
762
  function playBeep() {
763
  if (!audioCtx) {
 
817
  playBeep();
818
  updateCartView();
819
  };
820
+
821
+ const stopScanner = () => {
822
+ html5QrCode.stop().then(() => {
823
+ document.getElementById('scanner-container').style.display = 'none';
824
+ }).catch(err => console.error("Failed to stop scanner", err));
825
+ };
826
 
827
  productGrid.addEventListener('click', e => {
828
  const card = e.target.closest('.product-card');
 
883
  alert('Продажа завершена!');
884
  for(const id in cart) delete cart[id];
885
  updateCartView();
 
886
  } else {
887
  alert(`Ошибка: ${data.message}`);
888
  }
 
893
  document.getElementById('pay-cash-btn').addEventListener('click', () => completeSale('cash'));
894
  document.getElementById('pay-card-btn').addEventListener('click', () => completeSale('card'));
895
 
 
896
  const onScanSuccess = (decodedText, decodedResult) => {
 
 
 
897
  fetch(`/api/product_by_barcode/${decodedText}`)
898
  .then(res => res.json())
899
  .then(data => {
900
+ if (data.success) {
901
+ addToCart(data.product);
902
+ stopScanner();
903
+ } else {
904
+ alert(data.message);
905
+ }
906
  });
907
  };
908
 
 
911
  const config = { fps: 10, qrbox: { width: 250, height: 250 } };
912
  html5QrCode.start({ facingMode: "environment" }, config, onScanSuccess);
913
  };
 
 
 
 
 
 
 
914
 
915
  document.getElementById('scan-btn').addEventListener('click', startScanner);
916
  document.getElementById('stop-scan-btn').addEventListener('click', stopScanner);
 
1065
 
1066
  TRANSACTIONS_SCRIPTS = ""
1067
 
1068
+ REPORTS_CONTENT = """
1069
+ <div class="card mb-4">
1070
+ <div class="card-body">
1071
+ <form method="GET" action="{{ url_for('reports') }}">
1072
+ <div class="row g-2 align-items-end">
1073
+ <div class="col-md-4"><label class="form-label">Начало периода</label><input type="date" name="start_date" class="form-control" value="{{ stats.start_date }}"></div>
1074
+ <div class="col-md-4"><label class="form-label">Конец периода</label><input type="date" name="end_date" class="form-control" value="{{ stats.end_date }}"></div>
1075
+ <div class="col-md-4"><button type="submit" class="btn btn-primary w-100">Сформировать отчет</button></div>
1076
+ </div>
1077
+ </form>
1078
+ </div>
1079
+ </div>
1080
+
1081
+ <div class="row">
1082
+ <div class="col-md-4 col-xl-4 mb-4">
1083
+ <div class="card border-primary h-100"><div class="card-body">
1084
+ <h6 class="card-title text-primary">Выручка</h6>
1085
+ <h3 class="fw-bold">{{ format_currency_py(stats.total_sales) }} с</h3>
1086
+ </div></div>
1087
+ </div>
1088
+ <div class="col-md-4 col-xl-4 mb-4">
1089
+ <div class="card border-success h-100"><div class="card-body">
1090
+ <h6 class="card-title text-success">Валовая прибыль</h6>
1091
+ <h3 class="fw-bold">{{ format_currency_py(stats.gross_profit) }} с</h3>
1092
+ <small class="text-muted">Себестоимость: {{ format_currency_py(stats.total_cost) }} с</small>
1093
+ </div></div>
1094
+ </div>
1095
+ <div class="col-md-4 col-xl-4 mb-4">
1096
+ <div class="card border-danger h-100"><div class="card-body">
1097
+ <h6 class="card-title text-danger">Расходы</h6>
1098
+ <h3 class="fw-bold">{{ format_currency_py(stats.total_expenses) }} с</h3>
1099
+ </div></div>
1100
+ </div>
1101
+ <div class="col-12 mb-4">
1102
+ <div class="card bg-info text-white"><div class="card-body text-center">
1103
+ <h5 class="card-title">Чистая прибыль</h5>
1104
+ <h2 class="display-4 fw-bold">{{ format_currency_py(stats.net_profit) }} с</h2>
1105
+ </div></div>
1106
+ </div>
1107
+ </div>
1108
+
1109
+ <div class="row">
1110
+ <div class="col-lg-7 mb-4">
1111
+ <div class="card h-100">
1112
+ <div class="card-header"><h5 class="mb-0">Продажи за период</h5></div>
1113
+ <div class="card-body">
1114
+ <div class="table-responsive">
1115
+ <table class="table table-sm">
1116
+ <thead><tr><th>Дата</th><th>Сумма</th><th>Прибыль</th><th>Кассир</th></tr></thead>
1117
+ <tbody>
1118
+ {% for t in transactions %}
1119
+ <tr>
1120
+ <td><small>{{ t.timestamp[:16]|replace('T', ' ') }}</small></td>
1121
+ <td class="fw-bold">{{ format_currency_py(t.total_amount) }}</td>
1122
+ <td>{{ format_currency_py(t.total_amount|float - t.total_cost|float) }}</td>
1123
+ <td><small>{{ t.user_name }}</small></td>
1124
+ </tr>
1125
+ {% endfor %}
1126
+ </tbody>
1127
+ </table>
1128
+ </div>
1129
+ </div>
1130
+ </div>
1131
+ </div>
1132
+ <div class="col-lg-5 mb-4">
1133
+ <div class="card h-100">
1134
+ <div class="card-header"><h5 class="mb-0">Расходы за период</h5></div>
1135
+ <div class="card-body">
1136
+ <div class="table-responsive">
1137
+ <table class="table table-sm">
1138
+ <thead><tr><th>Дата</th><th>Сумма</th><th>Категория</th><th>Описание</th></tr></thead>
1139
+ <tbody>
1140
+ {% for e in expenses %}
1141
+ <tr>
1142
+ <td><small>{{ e.timestamp[:16]|replace('T', ' ') }}</small></td>
1143
+ <td class="fw-bold">{{ format_currency_py(e.amount) }}</td>
1144
+ <td><small>{{ e.category }}</small></td>
1145
+ <td><small>{{ e.description }}</small></td>
1146
+ </tr>
1147
+ {% endfor %}
1148
+ </tbody>
1149
+ </table>
1150
+ </div>
1151
+ </div>
1152
+ </div>
1153
+ </div>
1154
+ </div>
1155
+ """
1156
+
1157
+ REPORTS_SCRIPTS = ""
1158
+
1159
  ADMIN_CONTENT = """
1160
  <div class="row">
1161
  <div class="col-md-6 mb-4">
 
1222
  </div>
1223
  <div class="col-12 mb-4">
1224
  <div class="card">
1225
+ <div class="card-header"><h5 class="mb-0">Добавить расход</h5></div>
1226
  <div class="card-body">
1227
+ <form action="{{ url_for('add_expense') }}" method="POST">
1228
+ <div class="row g-2 align-items-end">
1229
  <div class="col-md-3"><label class="form-label">Сумма</label><input type="text" name="amount" class="form-control" required inputmode="decimal"></div>
1230
  <div class="col-md-3"><label class="form-label">Категория</label><input type="text" name="category" class="form-control" value="Прочее"></div>
1231
  <div class="col-md-4"><label class="form-label">Описание</label><input type="text" name="description" class="form-control"></div>
1232
+ <div class="col-md-2"><button type="submit" class="btn btn-warning w-100">Добавить</button></div>
1233
  </div>
1234
  </form>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1235
  </div>
1236
  </div>
1237
  </div>
 
1242
  <p>Данные периодически сохраняются в облако. Можно сделать это вручную.</p>
1243
  <form method="POST" action="{{ url_for('backup_hf') }}" class="d-inline-block me-2">
1244
  <button type="submit" class="btn btn-outline-primary"><i class="fas fa-cloud-upload-alt me-2"></i>Сохранить в облако</button>
 
1245
  </form>
1246
  <form method="GET" action="{{ url_for('download_hf') }}" class="d-inline-block" onsubmit="return confirm('ВНИМАНИЕ! Это действие заменит все локальные данные данными из облака. Продолжить?');">
1247
  <button type="submit" class="btn btn-outline-danger"><i class="fas fa-cloud-download-alt me-2"></i>Загрузить из облака</button>
 
1254
 
1255
  ADMIN_SCRIPTS = ""
1256
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1257
  if __name__ == '__main__':
1258
  backup_thread = threading.Thread(target=periodic_backup, daemon=True)
1259
  backup_thread.start()