Merge branch 'master' into feature/order-columns

# Conflicts:
#	Dockerfile
#	templates/productList.html.twig
This commit is contained in:
Krzysztof Płaczek
2025-03-17 12:52:07 +01:00
11 changed files with 126 additions and 66 deletions

View File

@@ -1,6 +1,7 @@
{% extends "template.html.twig" %}
{% block content %}
<div class="table-responsive">
{{ app.request.get('order') }}
<table class='table table-hover'>
<thead>
@@ -26,7 +27,10 @@
{% else %}
<span class="badge text-bg-warning">out of stock</span>
{% endif %}
{% if product.isnew() %}
{% if product.isDiscontinued() %}
<span class="badge text-bg-secondary" data-bs-toggle="tooltip" data-bs-title="Last update: {{ product.updated_at }}">is discontinued</span>
{% endif %}
{% if product.isNew() %}
<span class="badge text-bg-success">is new</span>
{% endif %}
<span class="badge text-bg-light">{{ product.subTitle }}</span>
@@ -53,4 +57,5 @@
</tr>
{% endfor %}
</table>
{% endblock %}
</div>
{% endblock %}