Update app.py
Browse files
app.py
CHANGED
|
@@ -309,8 +309,32 @@ def inventory_management():
|
|
| 309 |
|
| 310 |
inventory_list = load_json_data('inventory')
|
| 311 |
inventory_list.sort(key=lambda x: x.get('name', '').lower())
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 312 |
html = BASE_TEMPLATE.replace('__TITLE__', "Склад").replace('__CONTENT__', INVENTORY_CONTENT).replace('__SCRIPTS__', INVENTORY_SCRIPTS)
|
| 313 |
-
return render_template_string(html, inventory=inventory_list)
|
| 314 |
|
| 315 |
@app.route('/inventory/edit/<product_id>', methods=['POST'])
|
| 316 |
@admin_required
|
|
@@ -651,6 +675,7 @@ def view_receipt(transaction_id):
|
|
| 651 |
@app.route('/transactions')
|
| 652 |
def transaction_history():
|
| 653 |
selected_date_str = request.args.get('date', get_current_time().strftime('%Y-%m-%d'))
|
|
|
|
| 654 |
try:
|
| 655 |
selected_date = datetime.strptime(selected_date_str, '%Y-%m-%d').date()
|
| 656 |
except ValueError:
|
|
@@ -658,18 +683,25 @@ def transaction_history():
|
|
| 658 |
selected_date_str = selected_date.strftime('%Y-%m-%d')
|
| 659 |
|
| 660 |
transactions = load_json_data('transactions')
|
|
|
|
| 661 |
|
| 662 |
filtered_transactions = [
|
| 663 |
t for t in transactions
|
| 664 |
if datetime.fromisoformat(t['timestamp']).date() == selected_date
|
| 665 |
]
|
| 666 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 667 |
total_sales = sum(to_decimal(t['total_amount']) for t in filtered_transactions if t.get('type') == 'sale')
|
| 668 |
|
| 669 |
filtered_transactions.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
|
| 670 |
|
| 671 |
html = BASE_TEMPLATE.replace('__TITLE__', "История транзакций").replace('__CONTENT__', TRANSACTIONS_CONTENT).replace('__SCRIPTS__', TRANSACTIONS_SCRIPTS)
|
| 672 |
-
return render_template_string(html, transactions=filtered_transactions, total_sales=total_sales, selected_date=selected_date_str)
|
| 673 |
|
| 674 |
@app.route('/admin/transaction/edit/<transaction_id>', methods=['POST'])
|
| 675 |
@admin_required
|
|
@@ -2175,6 +2207,32 @@ document.addEventListener('DOMContentLoaded', () => {
|
|
| 2175 |
"""
|
| 2176 |
|
| 2177 |
INVENTORY_CONTENT = """
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2178 |
<div class="d-flex justify-content-between mb-3">
|
| 2179 |
<button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addProductModal"><i class="fas fa-plus me-2"></i>Добавить товар</button>
|
| 2180 |
<button class="btn btn-success" data-bs-toggle="modal" data-bs-target="#stockInModal"><i class="fas fa-truck-loading me-2"></i>Оприходовать</button>
|
|
@@ -2502,15 +2560,25 @@ TRANSACTIONS_CONTENT = """
|
|
| 2502 |
<div class="card-body">
|
| 2503 |
<form method="GET" class="row g-2 align-items-end">
|
| 2504 |
<div class="col-auto">
|
| 2505 |
-
<label for="date-filter" class="form-label">
|
| 2506 |
<input type="date" id="date-filter" name="date" value="{{ selected_date }}" class="form-control">
|
| 2507 |
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2508 |
<div class="col-auto">
|
| 2509 |
<button type="submit" class="btn btn-primary">Показать</button>
|
| 2510 |
</div>
|
| 2511 |
</form>
|
| 2512 |
<hr>
|
| 2513 |
-
|
|
|
|
| 2514 |
</div>
|
| 2515 |
</div>
|
| 2516 |
<div class="card">
|
|
@@ -3100,4 +3168,3 @@ if __name__ == '__main__':
|
|
| 3100 |
for key in DATA_FILES.keys():
|
| 3101 |
load_json_data(key)
|
| 3102 |
app.run(debug=False, host='0.0.0.0', port=7860, use_reloader=False)
|
| 3103 |
-
|
|
|
|
| 309 |
|
| 310 |
inventory_list = load_json_data('inventory')
|
| 311 |
inventory_list.sort(key=lambda x: x.get('name', '').lower())
|
| 312 |
+
|
| 313 |
+
total_units = 0
|
| 314 |
+
total_cost_value = Decimal('0.00')
|
| 315 |
+
total_retail_value = Decimal('0.00')
|
| 316 |
+
|
| 317 |
+
for product in inventory_list:
|
| 318 |
+
if isinstance(product, dict) and 'variants' in product:
|
| 319 |
+
for variant in product.get('variants', []):
|
| 320 |
+
stock = variant.get('stock', 0)
|
| 321 |
+
cost_price = to_decimal(variant.get('cost_price', '0'))
|
| 322 |
+
price = to_decimal(variant.get('price', '0'))
|
| 323 |
+
|
| 324 |
+
total_units += stock
|
| 325 |
+
total_cost_value += Decimal(stock) * cost_price
|
| 326 |
+
total_retail_value += Decimal(stock) * price
|
| 327 |
+
|
| 328 |
+
potential_profit = total_retail_value - total_cost_value
|
| 329 |
+
|
| 330 |
+
inventory_summary = {
|
| 331 |
+
'total_units': total_units,
|
| 332 |
+
'total_cost_value': total_cost_value,
|
| 333 |
+
'potential_profit': potential_profit
|
| 334 |
+
}
|
| 335 |
+
|
| 336 |
html = BASE_TEMPLATE.replace('__TITLE__', "Склад").replace('__CONTENT__', INVENTORY_CONTENT).replace('__SCRIPTS__', INVENTORY_SCRIPTS)
|
| 337 |
+
return render_template_string(html, inventory=inventory_list, inventory_summary=inventory_summary)
|
| 338 |
|
| 339 |
@app.route('/inventory/edit/<product_id>', methods=['POST'])
|
| 340 |
@admin_required
|
|
|
|
| 675 |
@app.route('/transactions')
|
| 676 |
def transaction_history():
|
| 677 |
selected_date_str = request.args.get('date', get_current_time().strftime('%Y-%m-%d'))
|
| 678 |
+
selected_kassa_id = request.args.get('kassa', '')
|
| 679 |
try:
|
| 680 |
selected_date = datetime.strptime(selected_date_str, '%Y-%m-%d').date()
|
| 681 |
except ValueError:
|
|
|
|
| 683 |
selected_date_str = selected_date.strftime('%Y-%m-%d')
|
| 684 |
|
| 685 |
transactions = load_json_data('transactions')
|
| 686 |
+
kassas = load_json_data('kassas')
|
| 687 |
|
| 688 |
filtered_transactions = [
|
| 689 |
t for t in transactions
|
| 690 |
if datetime.fromisoformat(t['timestamp']).date() == selected_date
|
| 691 |
]
|
| 692 |
|
| 693 |
+
if selected_kassa_id:
|
| 694 |
+
filtered_transactions = [
|
| 695 |
+
t for t in filtered_transactions
|
| 696 |
+
if t.get('kassa_id') == selected_kassa_id
|
| 697 |
+
]
|
| 698 |
+
|
| 699 |
total_sales = sum(to_decimal(t['total_amount']) for t in filtered_transactions if t.get('type') == 'sale')
|
| 700 |
|
| 701 |
filtered_transactions.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
|
| 702 |
|
| 703 |
html = BASE_TEMPLATE.replace('__TITLE__', "История транзакций").replace('__CONTENT__', TRANSACTIONS_CONTENT).replace('__SCRIPTS__', TRANSACTIONS_SCRIPTS)
|
| 704 |
+
return render_template_string(html, transactions=filtered_transactions, total_sales=total_sales, selected_date=selected_date_str, kassas=kassas, selected_kassa_id=selected_kassa_id)
|
| 705 |
|
| 706 |
@app.route('/admin/transaction/edit/<transaction_id>', methods=['POST'])
|
| 707 |
@admin_required
|
|
|
|
| 2207 |
"""
|
| 2208 |
|
| 2209 |
INVENTORY_CONTENT = """
|
| 2210 |
+
<div class="row mb-4">
|
| 2211 |
+
<div class="col-md-4">
|
| 2212 |
+
<div class="card text-center">
|
| 2213 |
+
<div class="card-body">
|
| 2214 |
+
<h6 class="card-subtitle mb-2 text-muted">Единиц товара на складе</h6>
|
| 2215 |
+
<h4 class="card-title">{{ inventory_summary.total_units }} шт.</h4>
|
| 2216 |
+
</div>
|
| 2217 |
+
</div>
|
| 2218 |
+
</div>
|
| 2219 |
+
<div class="col-md-4">
|
| 2220 |
+
<div class="card text-center">
|
| 2221 |
+
<div class="card-body">
|
| 2222 |
+
<h6 class="card-subtitle mb-2 text-muted">Сумма по себестоимости</h6>
|
| 2223 |
+
<h4 class="card-title">{{ format_currency_py(inventory_summary.total_cost_value) }} с</h4>
|
| 2224 |
+
</div>
|
| 2225 |
+
</div>
|
| 2226 |
+
</div>
|
| 2227 |
+
<div class="col-md-4">
|
| 2228 |
+
<div class="card text-center">
|
| 2229 |
+
<div class="card-body">
|
| 2230 |
+
<h6 class="card-subtitle mb-2 text-muted">Потенциальная прибыль</h6>
|
| 2231 |
+
<h4 class="card-title text-success">{{ format_currency_py(inventory_summary.potential_profit) }} с</h4>
|
| 2232 |
+
</div>
|
| 2233 |
+
</div>
|
| 2234 |
+
</div>
|
| 2235 |
+
</div>
|
| 2236 |
<div class="d-flex justify-content-between mb-3">
|
| 2237 |
<button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addProductModal"><i class="fas fa-plus me-2"></i>Добавить товар</button>
|
| 2238 |
<button class="btn btn-success" data-bs-toggle="modal" data-bs-target="#stockInModal"><i class="fas fa-truck-loading me-2"></i>Оприходовать</button>
|
|
|
|
| 2560 |
<div class="card-body">
|
| 2561 |
<form method="GET" class="row g-2 align-items-end">
|
| 2562 |
<div class="col-auto">
|
| 2563 |
+
<label for="date-filter" class="form-label">Дата</label>
|
| 2564 |
<input type="date" id="date-filter" name="date" value="{{ selected_date }}" class="form-control">
|
| 2565 |
</div>
|
| 2566 |
+
<div class="col-auto">
|
| 2567 |
+
<label for="kassa-filter" class="form-label">Касса</label>
|
| 2568 |
+
<select id="kassa-filter" name="kassa" class="form-select">
|
| 2569 |
+
<option value="">Все кассы</option>
|
| 2570 |
+
{% for k in kassas %}
|
| 2571 |
+
<option value="{{ k.id }}" {% if k.id == selected_kassa_id %}selected{% endif %}>{{ k.name }}</option>
|
| 2572 |
+
{% endfor %}
|
| 2573 |
+
</select>
|
| 2574 |
+
</div>
|
| 2575 |
<div class="col-auto">
|
| 2576 |
<button type="submit" class="btn btn-primary">Показать</button>
|
| 2577 |
</div>
|
| 2578 |
</form>
|
| 2579 |
<hr>
|
| 2580 |
+
{% set selected_kassa = kassas|selectattr('id', 'equalto', selected_kassa_id)|first %}
|
| 2581 |
+
<h4 class="mb-0">Общая выручка за {{ selected_date }}{% if selected_kassa %} (Касса: {{ selected_kassa.name }}){% endif %}: <span class="text-success">{{ format_currency_py(total_sales) }} с</span></h4>
|
| 2582 |
</div>
|
| 2583 |
</div>
|
| 2584 |
<div class="card">
|
|
|
|
| 3168 |
for key in DATA_FILES.keys():
|
| 3169 |
load_json_data(key)
|
| 3170 |
app.run(debug=False, host='0.0.0.0', port=7860, use_reloader=False)
|
|
|