ParkSuMin/RIS
Archived
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Косметические изменения

Browse Source
This commit is contained in:
Anton Kamalov
2024-12-12 21:02:35 +03:00
parent ae5b4cdd8a
commit eacce0130a
3 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
App/Waybill/model.py
View File

@@ -74,12 +74,12 @@ def button_click(request):
session["total"] = str(int(session["total"]) + price) session["total"] = str(int(session["total"]) + price)
session.modified = True session.modified = True
else: else:
print("NEW WORKPIECE") # print("NEW WORKPIECE")
pr_id = product["work_id"] pr_id = product["work_id"]
price = product["price"] price = product["price"]
session["waybill"][str(pr_id)] = "1" session["waybill"][str(pr_id)] = "1"
session["total"] = str(int(session["total"]) + price) session["total"] = str(int(session["total"]) + price)
print(session["waybill"]) # print(session["waybill"])
session.modified = True session.modified = True
elif request.form.get("product_display_minus"): elif request.form.get("product_display_minus"):

40
App/Waybill/templates/waybill.html
View File

@@ -39,22 +39,34 @@
<div class="col-md-4"> <div class="col-md-4">
<h4>Накладная</h4> <h4>Накладная</h4>
{% if waybill %} {% if waybill %}
{% for item in waybill %} <div class="row">
{{ card.render_item(item, show_form = False, show_amount = True) }} <div class="col-8">
{% endfor %} <div class="row row-cols-1 g-3">
<div class="mt-3"> {% for item in waybill %}
<h5>Итого: {{ session.get('total', '0') }} ₽</h5> <div class="col">
{{ card.render_item(item, show_form = False, show_amount = True) }}
</div>
{% endfor %}
</div>
</div>
<div class="col-4 d-flex flex-column">
<h5 class="mb-3">Итого: {{ session.get('total', '0') }} ₽</h5>
<div class="d-flex flex-column gap-2">
<a href="{{url_for('waybill_bp.save_order')}}"><button class="btn btn-primary">Оформить накладную</button></a>
<a href="{{url_for('waybill_bp.clear_waybill')}}"><button class="btn btn-danger">Очистить накладную</button></a>
<a href="{{url_for('index')}}"><button class="btn btn-secondary">На главную</button></a>
</div>
</div>
</div> </div>
<div class="d-grid gap-2 mt-3">
<a href="{{url_for('waybill_bp.save_order')}}"><button class="btn btn-primary">Оформить накладную</button></a>
<a href="{{url_for('waybill_bp.clear_waybill')}}"><button class="btn btn-danger">Очистить накладную</button></a>
<a href="{{url_for('index')}}"><button class="btn btn-secondary">На главную</button></a>
</div>
{% else %} {% else %}
<span>Ваша накладная пуста</span> <div class="row">
<div class="d-grid gap-2 mt-3"> <div class="col-8">
<a href="{{url_for('index')}}"><button class="btn btn-secondary">На главную</button></a> <span>Ваша накладная пуста</span>
</div> </div>
<div class="col-4">
<a href="{{url_for('index')}}"><button class="btn btn-secondary">На главную</button></a>
</div>
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>

2
App/cache/wrapper.py vendored
View File

@@ -17,7 +17,7 @@ def fetch_from_cache(cache_name: str, cache_config: dict):
@wraps(f) @wraps(f)
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
cached_value = cache_conn.get_value(cache_name) cached_value = cache_conn.get_value(cache_name)
print("cached_value=", cached_value) # print("cached_value=", cached_value)
if cached_value: if cached_value:
return cached_value return cached_value
response = f(*args, **kwargs) response = f(*args, **kwargs)