Commit ae0b9f20 by Damien Moulard

fix sales export

parent 4922c3e4
...@@ -32,6 +32,9 @@ class CagetteSales(models.Model): ...@@ -32,6 +32,9 @@ class CagetteSales(models.Model):
item = None item = None
try: try:
for payment in payments: for payment in payments:
# POS session can contain payments from another day (closing session on next morning, ...)
if payment["date"] >= date_from and payment["date"] <= date_to:
# If the consecutive payment in the results is from the same partner on the same day, we consider it's the same basket
if item is not None and item["partner_id"][0] == payment["partner_id"][0] and item["date"] == payment["date"]: if item is not None and item["partner_id"][0] == payment["partner_id"][0] and item["date"] == payment["date"]:
res[len(res)-1]["total_amount"] += round(float(payment["amount"]), 2) res[len(res)-1]["total_amount"] += round(float(payment["amount"]), 2)
res[len(res)-1]["payments"].append({ res[len(res)-1]["payments"].append({
......
...@@ -21,3 +21,6 @@ ...@@ -21,3 +21,6 @@
border-radius:5px; border-radius:5px;
} }
.btn_export_movements {
margin-top: 10px;
}
\ No newline at end of file
...@@ -32,14 +32,13 @@ function display_orders(orders) { ...@@ -32,14 +32,13 @@ function display_orders(orders) {
if (orders_table) { if (orders_table) {
orders_table.destroy(); orders_table.destroy();
} }
console.log(orders);
orders_table = $('#orders_table').DataTable({ orders_table = $('#orders_table').DataTable({
data: orders, data: orders,
columns:[ columns:[
{ {
data:"create_date", data:"create_date",
title:"Date", title:"Date de vente",
width: "10%" width: "10%"
}, },
{ {
...@@ -61,7 +60,6 @@ function display_orders(orders) { ...@@ -61,7 +60,6 @@ function display_orders(orders) {
{ {
data:"payments", data:"payments",
title:"Paiements", title:"Paiements",
className:"dt-body-center",
orderable: false, orderable: false,
render: function (data) { render: function (data) {
let res = '<ul>'; let res = '<ul>';
...@@ -79,8 +77,15 @@ function display_orders(orders) { ...@@ -79,8 +77,15 @@ function display_orders(orders) {
"asc" "asc"
] ]
], ],
dom: 'rtip', buttons: [
iDisplayLength: 25, {
extend: 'excelHtml5',
text: 'Export en Excel',
className: 'btn--primary btn_export_movements'
}
],
dom: '<lr<t>ip><"clear"><B>',
iDisplayLength: 100,
language: {url : '/static/js/datatables/french.json'} language: {url : '/static/js/datatables/french.json'}
}); });
...@@ -188,8 +193,4 @@ $(document).ready(function() { ...@@ -188,8 +193,4 @@ $(document).ready(function() {
event.preventDefault(); event.preventDefault();
get_sales(); get_sales();
}); });
// $('#dates_selection_button').click(function() {
// get_sales();
// });
}); });
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
<script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v="></script> <script type="text/javascript" src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}?v="></script>
<script type="text/javascript" src="{% static 'js/datatables/jquery.dataTables.min.js' %}"></script> <script type="text/javascript" src="{% static 'js/datatables/jquery.dataTables.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/dataTables.plugins.js' %}"></script> <script type="text/javascript" src="{% static 'js/datatables/dataTables.plugins.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/datatables.buttons.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/buttons.html5.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/datatables/jszip.min.js' %}"></script>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment