Commit e84119f3 by Damien Moulard

display total packages by supplier

parent 2e70b732
...@@ -279,8 +279,9 @@ ...@@ -279,8 +279,9 @@
font-weight: bold; font-weight: bold;
} }
.supplier_total_value_container { .supplier_data {
font-size: 1.5rem; font-size: 1.5rem;
display: flex;
} }
.remove_supplier_icon { .remove_supplier_icon {
......
...@@ -324,6 +324,7 @@ function add_supplier() { ...@@ -324,6 +324,7 @@ function add_supplier() {
openModal(); openModal();
supplier.total_value = 0; supplier.total_value = 0;
supplier.total_packages = 0;
selected_suppliers.push(supplier); selected_suppliers.push(supplier);
// Fetch supplier products // Fetch supplier products
...@@ -583,15 +584,19 @@ function _compute_total_values_by_supplier() { ...@@ -583,15 +584,19 @@ function _compute_total_values_by_supplier() {
// Reinit // Reinit
for (let s of selected_suppliers) { for (let s of selected_suppliers) {
s.total_value = 0; s.total_value = 0;
s.total_packages = 0;
} }
for (let p of products) { for (let p of products) {
for (let supinfo of p.suppliersinfo) { for (let supinfo of p.suppliersinfo) {
let supplier_index = selected_suppliers.findIndex(s => s.id == supinfo.supplier_id); let supplier_index = selected_suppliers.findIndex(s => s.id == supinfo.supplier_id);
// Value
let product_supplier_value = ('qty' in supinfo) ? supinfo.qty * supinfo.package_qty * supinfo.price : 0; let product_supplier_value = ('qty' in supinfo) ? supinfo.qty * supinfo.package_qty * supinfo.price : 0;
selected_suppliers[supplier_index].total_value += product_supplier_value; selected_suppliers[supplier_index].total_value += product_supplier_value;
// Packages
selected_suppliers[supplier_index].total_packages += ('qty' in supinfo) ? supinfo.qty : 0;
} }
} }
} }
...@@ -1668,6 +1673,9 @@ function display_total_values() { ...@@ -1668,6 +1673,9 @@ function display_total_values() {
$(`#pill_supplier_${supplier.id}`).find('.supplier_total_value') $(`#pill_supplier_${supplier.id}`).find('.supplier_total_value')
.text(parseFloat(supplier.total_value).toFixed(2)); .text(parseFloat(supplier.total_value).toFixed(2));
order_total_value += supplier.total_value; order_total_value += supplier.total_value;
$(`#pill_supplier_${supplier.id}`).find('.supplier_total_packages')
.text(+parseFloat(supplier.total_packages).toFixed(2));
} }
order_total_value = parseFloat(order_total_value).toFixed(2); order_total_value = parseFloat(order_total_value).toFixed(2);
......
...@@ -153,8 +153,14 @@ ...@@ -153,8 +153,14 @@
<span class="pill_supplier_name"></span> <span class="pill_supplier_name"></span>
<i class="fas fa-times remove_supplier_icon"></i> <i class="fas fa-times remove_supplier_icon"></i>
</div> </div>
<div class="supplier_total_value_container"> <div class="supplier_data">
Total: <span class="supplier_total_value">0</span> <div class="supplier_total_value_container">
Total : <span class="supplier_total_value">0</span>
</div>
&nbsp;&nbsp;|&nbsp;&nbsp;
<div class="supplier_total_packages_container">
Nb colis : <span class="supplier_total_packages">0</span>
</div>
</div> </div>
</div> </div>
</div> </div>
......
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