diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js index 42dbe3078..44d1f18e7 100644 --- a/modules/entry/back/methods/entry/filter.js +++ b/modules/entry/back/methods/entry/filter.js @@ -148,19 +148,27 @@ module.exports = Self => { s.name AS supplierName, s.nickname AS supplierAlias, co.code AS companyCode, - cu.code AS currencyCode + cu.code AS currencyCode, + IF(b.buyingValue, SUM(b.quantity * b.buyingValue), 0) AS totalEntry FROM vn.entry e JOIN vn.supplier s ON s.id = e.supplierFk JOIN vn.travel t ON t.id = e.travelFk JOIN vn.company co ON co.id = e.companyFk - JOIN vn.currency cu ON cu.id = e.currencyFk` + JOIN vn.currency cu ON cu.id = e.currencyFk + LEFT JOIN vn.buy b ON b.entryFk = e.id` ); + stmt.merge(conn.makeWhere(filter.where)); + stmt.merge(conn.makeGroupBy('b.entryFk')); + stmt.merge(conn.makeOrderBy('t.landed DESC')); + stmt.merge(conn.makeLimit(filter)); + // stmts.push(stmt); - stmt.merge(conn.makeSuffix(filter)); + // stmt.merge(conn.makeSuffix(filter)); let itemsIndex = stmts.push(stmt) - 1; let sql = ParameterizedSQL.join(stmts, ';'); let result = await conn.executeStmt(sql); + return itemsIndex === 0 ? result : result[itemsIndex]; }; }; diff --git a/modules/entry/front/index/index.html b/modules/entry/front/index/index.html index 2f3aa5636..8198db780 100644 --- a/modules/entry/front/index/index.html +++ b/modules/entry/front/index/index.html @@ -13,12 +13,11 @@ Landed Reference Supplier - Currency - Company + Import Booked Confirmed Ordered - Notes + @@ -49,19 +48,17 @@ {{::entry.ref}} {{::entry.supplierName}} - {{::entry.currencyCode}} - {{::entry.companyCode}} + {{::entry.totalEntry | currency: 'EUR': 2}} - - - - + + + + @@ -70,7 +67,11 @@ - + + + +
diff --git a/modules/entry/front/index/index.js b/modules/entry/front/index/index.js index 759ce2724..8635d3fb4 100644 --- a/modules/entry/front/index/index.js +++ b/modules/entry/front/index/index.js @@ -1,7 +1,12 @@ import ngModule from '../module'; import Section from 'salix/components/section'; -export default class Controller extends Section {} +export default class Controller extends Section { + preview(entry) { + this.entrySelected = entry; + this.$.summary.show(); + } +} ngModule.vnComponent('vnEntryIndex', { template: require('./index.html'),