mirror of
				https://github.com/ae-utbm/sith.git
				synced 2025-11-04 02:53:06 +00:00 
			
		
		
		
	bux fixing on new eboutic (#493)
- les alt des images des produits n'étaient pas bonnes - les noms de produits avec une apostrophe dedans n'étaient pas cliquables
This commit is contained in:
		@@ -23,56 +23,56 @@
 | 
			
		||||
    <h1 id="eboutic-title">{% trans %}Eboutic{% endtrans %}</h1>
 | 
			
		||||
    <div id="eboutic" x-data="basket">
 | 
			
		||||
        <div id="basket">
 | 
			
		||||
            <h3>Panier</h3>
 | 
			
		||||
            {% if errors %}
 | 
			
		||||
                <div class="error-message">
 | 
			
		||||
                    {% for error in errors %}
 | 
			
		||||
                        <p>{{ error }}</p>
 | 
			
		||||
                    {% endfor %}
 | 
			
		||||
                {% trans %}Your basket has been cleaned accordingly to those errors.{% endtrans %}
 | 
			
		||||
                </div>
 | 
			
		||||
            {% endif %}
 | 
			
		||||
            <ul class="item-list">
 | 
			
		||||
                {# Starting money #}
 | 
			
		||||
                <li>
 | 
			
		||||
                    <span class="item-name">
 | 
			
		||||
                        <strong>{% trans %}Current account amount: {% endtrans %}</strong>
 | 
			
		||||
                    </span>
 | 
			
		||||
                    <span class="item-price">
 | 
			
		||||
                        <strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
 | 
			
		||||
                    </span>
 | 
			
		||||
                </li>
 | 
			
		||||
                <template x-for="item in items" :key="item.id">
 | 
			
		||||
                    <li class="item-row" x-show="item.quantity > 0">
 | 
			
		||||
                        <span class="item-name" x-text="item.name"></span>
 | 
			
		||||
                        <div class="item-quantity">
 | 
			
		||||
                            <i class="fa fa-minus fa-xs" @click="remove(item.id)"></i>
 | 
			
		||||
                            <span x-text="item.quantity"></span>
 | 
			
		||||
                            <i class="fa fa-plus" @click="add(item)"></i>
 | 
			
		||||
                        </div>
 | 
			
		||||
                        <span class="item-price" x-text="(item.unit_price * item.quantity).toFixed(2) + ' €'"></span>
 | 
			
		||||
                <h3>Panier</h3>
 | 
			
		||||
                {% if errors %}
 | 
			
		||||
                    <div class="error-message">
 | 
			
		||||
                        {% for error in errors %}
 | 
			
		||||
                            <p>{{ error }}</p>
 | 
			
		||||
                        {% endfor %}
 | 
			
		||||
                    {% trans %}Your basket has been cleaned accordingly to those errors.{% endtrans %}
 | 
			
		||||
                    </div>
 | 
			
		||||
                {% endif %}
 | 
			
		||||
                <ul class="item-list">
 | 
			
		||||
                    {# Starting money #}
 | 
			
		||||
                    <li>
 | 
			
		||||
                        <span class="item-name">
 | 
			
		||||
                            <strong>{% trans %}Current account amount: {% endtrans %}</strong>
 | 
			
		||||
                        </span>
 | 
			
		||||
                        <span class="item-price">
 | 
			
		||||
                            <strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
 | 
			
		||||
                        </span>
 | 
			
		||||
                    </li>
 | 
			
		||||
                </template>
 | 
			
		||||
                {# Total price #}
 | 
			
		||||
                <li style="margin-top: 20px">
 | 
			
		||||
                    <span class="item-name"><strong>{% trans %}Basket amount: {% endtrans %}</strong></span>
 | 
			
		||||
                    <span x-text="get_total().toFixed(2) + ' €'" class="item-price"></span>
 | 
			
		||||
                </li>
 | 
			
		||||
            </ul>
 | 
			
		||||
            <div class="catalog-buttons">
 | 
			
		||||
                <button @click="clear_basket()" class="clear">
 | 
			
		||||
                    <i class="fa fa-trash"></i>
 | 
			
		||||
                    {% trans %}Clear{% endtrans %}
 | 
			
		||||
                </button>
 | 
			
		||||
                <form method="post" action="{{ url('eboutic:command') }}">
 | 
			
		||||
                    {% csrf_token %}
 | 
			
		||||
                    <button class="validate">
 | 
			
		||||
                        <i class="fa fa-check"></i>
 | 
			
		||||
                        <input type="submit" value="{% trans %}Validate{% endtrans %}"/>
 | 
			
		||||
                    <template x-for="item in items" :key="item.id">
 | 
			
		||||
                        <li class="item-row" x-show="item.quantity > 0">
 | 
			
		||||
                            <span class="item-name" x-text="item.name"></span>
 | 
			
		||||
                            <div class="item-quantity">
 | 
			
		||||
                                <i class="fa fa-minus fa-xs" @click="remove(item.id)"></i>
 | 
			
		||||
                                <span x-text="item.quantity"></span>
 | 
			
		||||
                                <i class="fa fa-plus" @click="add(item)"></i>
 | 
			
		||||
                            </div>
 | 
			
		||||
                            <span class="item-price" x-text="(item.unit_price * item.quantity).toFixed(2) + ' €'"></span>
 | 
			
		||||
                        </li>
 | 
			
		||||
                    </template>
 | 
			
		||||
                    {# Total price #}
 | 
			
		||||
                    <li style="margin-top: 20px">
 | 
			
		||||
                        <span class="item-name"><strong>{% trans %}Basket amount: {% endtrans %}</strong></span>
 | 
			
		||||
                        <span x-text="get_total().toFixed(2) + ' €'" class="item-price"></span>
 | 
			
		||||
                    </li>
 | 
			
		||||
                </ul>
 | 
			
		||||
                <div class="catalog-buttons">
 | 
			
		||||
                    <button @click="clear_basket()" class="clear">
 | 
			
		||||
                        <i class="fa fa-trash"></i>
 | 
			
		||||
                        {% trans %}Clear{% endtrans %}
 | 
			
		||||
                    </button>
 | 
			
		||||
                </form>
 | 
			
		||||
                    <form method="post" action="{{ url('eboutic:command') }}">
 | 
			
		||||
                        {% csrf_token %}
 | 
			
		||||
                        <button class="validate">
 | 
			
		||||
                            <i class="fa fa-check"></i>
 | 
			
		||||
                            <input type="submit" value="{% trans %}Validate{% endtrans %}"/>
 | 
			
		||||
                        </button>
 | 
			
		||||
                    </form>
 | 
			
		||||
                </div>
 | 
			
		||||
            </div>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div id="catalog">
 | 
			
		||||
            {% if not request.user.date_of_birth %}
 | 
			
		||||
                <div class="alert" x-data="{show_alert: true}" x-show="show_alert" x-transition>
 | 
			
		||||
@@ -102,10 +102,10 @@
 | 
			
		||||
                        <div class="product-group">
 | 
			
		||||
                            {% for p in items %}
 | 
			
		||||
                                <button class="product-button"
 | 
			
		||||
                                        @click="add_from_catalog({{ p.id }}, '{{ p.name }}', {{ p.selling_price }})">
 | 
			
		||||
                                        @click='add_from_catalog({{ p.id }}, {{ p.name|tojson }}, {{ p.selling_price }})'>
 | 
			
		||||
                                    {% if p.icon %}
 | 
			
		||||
                                        <img src="{{ p.icon.url }}" alt="image de {{ p.product_name }}" width="40px"
 | 
			
		||||
                                             height="40px">
 | 
			
		||||
                                        <img src="{{ p.icon.url }}" alt="image de {{ p.name }}"
 | 
			
		||||
                                             width="40px" height="40px">
 | 
			
		||||
                                    {% else %}
 | 
			
		||||
                                        <i class="fa fa-2x fa-picture-o"></i>
 | 
			
		||||
                                    {% endif %}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user