Merge branch 'CI/CD' of ssh://git.tjoyspotifylastfm.tech:10022/ParkSuMin/Cursovaya into CI/CD
This commit is contained in:
@@ -74,12 +74,12 @@ def button_click(request):
|
||||
session["total"] = str(int(session["total"]) + price)
|
||||
session.modified = True
|
||||
else:
|
||||
print("NEW WORKPIECE")
|
||||
# print("NEW WORKPIECE")
|
||||
pr_id = product["work_id"]
|
||||
price = product["price"]
|
||||
session["waybill"][str(pr_id)] = "1"
|
||||
session["total"] = str(int(session["total"]) + price)
|
||||
print(session["waybill"])
|
||||
# print(session["waybill"])
|
||||
session.modified = True
|
||||
|
||||
elif request.form.get("product_display_minus"):
|
||||
|
||||
@@ -39,22 +39,34 @@
|
||||
<div class="col-md-4">
|
||||
<h4>Накладная</h4>
|
||||
{% if waybill %}
|
||||
{% for item in waybill %}
|
||||
{{ card.render_item(item, show_form = False, show_amount = True) }}
|
||||
{% endfor %}
|
||||
<div class="mt-3">
|
||||
<h5>Итого: {{ session.get('total', '0') }} ₽</h5>
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
<div class="row row-cols-1 g-3">
|
||||
{% for item in waybill %}
|
||||
<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 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 %}
|
||||
<span>Ваша накладная пуста</span>
|
||||
<div class="d-grid gap-2 mt-3">
|
||||
<a href="{{url_for('index')}}"><button class="btn btn-secondary">На главную</button></a>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
<span>Ваша накладная пуста</span>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<a href="{{url_for('index')}}"><button class="btn btn-secondary">На главную</button></a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
2
App/cache/wrapper.py
vendored
2
App/cache/wrapper.py
vendored
@@ -17,7 +17,7 @@ def fetch_from_cache(cache_name: str, cache_config: dict):
|
||||
@wraps(f)
|
||||
def wrapper(*args, **kwargs):
|
||||
cached_value = cache_conn.get_value(cache_name)
|
||||
print("cached_value=", cached_value)
|
||||
# print("cached_value=", cached_value)
|
||||
if cached_value:
|
||||
return cached_value
|
||||
response = f(*args, **kwargs)
|
||||
|
||||
Reference in New Issue
Block a user