klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-11 04:19:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into stock

Browse Source
This commit is contained in:
Skia
2017-04-24 18:07:25 +02:00
parent 7d10c5d837 83deae5964
commit 20deda8a8e
178 changed files with 8217 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
counter/templates/counter/cash_register_summary.jinja
View File

@ -19,7 +19,7 @@
{% endif %}
</p>
{% endfor %}
<p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
<p><input type="submit" name="submit" value="{% trans %}Save{% endtrans %}" onclick="return confirm('{% trans %}Are you sure ?{% endtrans %}');return false;" /></p>
</form>
{% endblock %}

22
counter/templates/counter/cash_summary_list.jinja
View File

@ -38,7 +38,7 @@
</tr>
</thead>
<tbody>
{% for c in cashsummary_list.order_by('-date') %}
{% for c in cashsummary_list %}
<tr>
<td>{{ user_profile_link(c.user) }}</td>
<td>{{ c.counter }}</td>
@ -55,6 +55,26 @@
{% endfor %}
</tbody>
</table>
<br>
{% if is_paginated %}
{% if page_obj.has_previous() %}
<a href="?page={{ page_obj.previous_page_number() }}">{% trans %}Previous{% endtrans %}</a>
{% else %}
<span class="disabled">{% trans %}Previous{% endtrans %}</span>
{% endif %}
{% for i in paginator.page_range %}
{% if page_obj.number == i %}
<span class="active">{{ i }} <span class="sr-only">({% trans %}current{% endtrans %})</span></span>
{% else %}
<a href="?page={{ i }}">{{ i }}</a>
{% endif %}
{% endfor %}
{% if page_obj.has_next() %}
<a href="?page={{ page_obj.next_page_number() }}">{% trans %}Next{% endtrans %}</a>
{% else %}
<span class="disabled">{% trans %}Next{% endtrans %}</span>
{% endif %}
{% endif %}
{% else %}
{% trans %}There is no cash register summary in this website.{% endtrans %}
{% endif %}

3
counter/templates/counter/counter_click.jinja
View File

@ -51,7 +51,7 @@
<form method="post" action="{{ url('counter:click', counter_id=counter.id, user_id=customer.user.id) }}">
{% csrf_token %}
<input type="hidden" name="action" value="code">
<input type="input" name="code" value="" autofocus class="focus" id="code_field"/>
<input type="input" name="code" value="" class="focus" id="code_field"/>
<input type="submit" value="{% trans %}Go{% endtrans %}" />
</form>
<p>{% trans %}Basket: {% endtrans %}</p>
@ -179,6 +179,7 @@ $( function() {
}
});
$("#products").tabs();
$("#code_field").focus();
});
</script>
{% endblock %}

3
counter/templates/counter/invoices_call.jinja
View File

@ -15,6 +15,9 @@
</select>
<input type="submit" value="{% trans %}Go{% endtrans %}" />
</form>
<br>
<p>{% trans %}CB Payments{% endtrans %} : {{ sum_cb }} €</p>
<br>
<table>
<thead>
<td>{% trans %}Club{% endtrans %}</td>