diff --git a/print/templates/reports/supplier-campaign-metrics/sql/entries.sql b/print/templates/reports/supplier-campaign-metrics/sql/entries.sql
index 8a3ebb915d..60ef0fed36 100644
--- a/print/templates/reports/supplier-campaign-metrics/sql/entries.sql
+++ b/print/templates/reports/supplier-campaign-metrics/sql/entries.sql
@@ -6,5 +6,4 @@ SELECT
FROM vn.entry e
JOIN vn.travel t ON t.id = e.travelFk
WHERE e.supplierFk = ? AND DATE(t.shipped) BETWEEN ? AND ?
- ORDER BY
- t.shipped DESC;
+ ORDER BY t.shipped DESC;
diff --git a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html
index 4a1978a379..fd04deab1a 100644
--- a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html
+++ b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html
@@ -65,6 +65,8 @@
{{buy.tag5}} {{buy.value5}}
{{buy.tag6}} {{buy.value6}}
{{buy.tag7}} {{buy.value7}}
+
{{total.quantity}}
+
diff --git a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js
index 82cfaa5d34..dfc91cc3ce 100755
--- a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js
+++ b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js
@@ -7,9 +7,7 @@ module.exports = {
this.supplier = await this.findOneFromDef('supplier', [this.id]);
this.checkMainEntity(this.supplier);
let entries = await this.rawSqlFromDef('entries', [this.id, this.from, this.to]);
- let totalEntry;
- let total;
-
+ this.total = {quantity: 0, price: 0};
const entriesId = [];
for (let entry of entries)
@@ -25,26 +23,13 @@ module.exports = {
const entry = entriesMap.get(buy.entryFk);
if (entry) {
if (!entry.buys) entry.buys = [];
-
+ this.total.quantity = this.total.quantity + buy.quantity;
+ this.total.price = this.total.price + (buy.price * buy.quantity);
entry.buys.push(buy);
}
}
this.entries = entries;
-
- // for (let buy of entry.buys)
- // total += buy.total;
-
- // getTotal(entry) {
- // if (entry.buys) {
- // let total = 0;
- // for (let buy of entry.buys)
- // total += buy.total;
-
- // return total;
- // }
- // console.log('total', total);
- // };
},
getTotal(entry) {
if (entry.buys) {
@@ -54,7 +39,6 @@ module.exports = {
return total;
}
- console.log('total', total);
},
props: {
id: {