diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js index a2a355209..831759279 100644 --- a/modules/travel/back/methods/travel/extraCommunityFilter.js +++ b/modules/travel/back/methods/travel/extraCommunityFilter.js @@ -13,65 +13,82 @@ module.exports = Self => { type: 'Object', description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string', http: {source: 'query'} - }, { + }, + { arg: 'search', type: 'String', description: 'Searchs the travel by id', http: {source: 'query'} - }, { + }, + { arg: 'id', type: 'Integer', description: 'The travel id', http: {source: 'query'} - }, { + }, + { arg: 'shippedFrom', type: 'Date', description: 'The shipped from date filter', http: {source: 'query'} - }, { + }, + { arg: 'shippedTo', type: 'Date', description: 'The shipped to date filter', http: {source: 'query'} - }, { + }, + { arg: 'landedFrom', type: 'Date', description: 'The landed from date filter', http: {source: 'query'} - }, { + }, + { arg: 'landedTo', type: 'Date', description: 'The landed to date filter', http: {source: 'query'} - }, { + }, + { arg: 'agencyFk', type: 'Number', description: 'The agencyModeFk id', http: {source: 'query'} - }, { + }, + { arg: 'warehouseOutFk', type: 'Number', description: 'The warehouseOutFk filter', http: {source: 'query'} - }, { + }, + { arg: 'warehouseInFk', type: 'Number', description: 'The warehouseInFk filter', http: {source: 'query'} - }, { + }, + { arg: 'totalEntries', type: 'Number', description: 'The totalEntries filter', http: {source: 'query'} - }, { + }, + { arg: 'ref', type: 'string', description: 'The reference' - }, { + }, + { arg: 'continent', type: 'string', description: 'The continent code' - } + }, + { + arg: 'cargoSupplierFk', + type: 'Number', + description: 'The freighter supplier id' + }, ], returns: { type: ['Object'], @@ -108,6 +125,7 @@ module.exports = Self => { case 'warehouseOutFk': case 'warehouseInFk': case 'totalEntries': + case 'cargoSupplierFk': param = `t.${param}`; return {[param]: value}; } diff --git a/modules/travel/front/extra-community-search-panel/index.html b/modules/travel/front/extra-community-search-panel/index.html index 00b1f14a0..73c158a03 100644 --- a/modules/travel/front/extra-community-search-panel/index.html +++ b/modules/travel/front/extra-community-search-panel/index.html @@ -80,6 +80,13 @@ + +
- @@ -37,13 +37,13 @@ Bl. KG Phy. KG Vol. KG - - Wh. In - - W. Shipped Wh. Out + W. Shipped + + Wh. In + W. Landed @@ -79,9 +79,9 @@ {{::travel.loadedKg}} {{::travel.volumeKg}} - {{::travel.warehouseInName}} - {{::travel.shipped | date: 'dd/MM/yyyy'}} {{::travel.warehouseOutName}} + {{::travel.shipped | date: 'dd/MM/yyyy'}} + {{::travel.warehouseInName}} {{::travel.landed | date: 'dd/MM/yyyy'}} this.dragStart(event)); @@ -77,20 +79,26 @@ class Controller extends Section { } } - changeReference(travel) { - const params = {ref: travel.ref}; - const endpoint = `Travels/${travel.id}`; - this.$http.patch(endpoint, params) - .then(() => this.vnApp.showSuccess(this.$t('Data saved!'))); - } - save(id, data) { const endpoint = `Travels/${id}`; this.$http.patch(endpoint, data) .then(() => this.vnApp.showSuccess(this.$t('Data saved!'))); } + + get reportParams() { + const userParams = this.$.model.userParams; + return Object.assign({ + authorization: this.vnToken.token + }, userParams); + } + + showReport() { + this.vnReport.show('extra-community', this.reportParams); + } } +Controller.$inject = ['$element', '$scope', 'vnReport']; + ngModule.vnComponent('vnTravelExtraCommunity', { template: require('./index.html'), controller: Controller diff --git a/print/common/css/spacing.css b/print/common/css/spacing.css index 670102d7c..96cb8c828 100644 --- a/print/common/css/spacing.css +++ b/print/common/css/spacing.css @@ -125,30 +125,56 @@ padding-right: 16px; } +/* Medium-Large */ + +.vn-pa-ml { + padding: 32px; +} +.vn-pl-ml { + padding-left: 32px; +} +.vn-pr-ml { + padding-right: 32px; +} +.vn-pt-ml { + padding-top: 32px; +} +.vn-pb-ml { + padding-bottom: 32px; +} +.vn-py-ml { + padding-top: 32px; + padding-bottom: 32px; +} +.vn-px-ml { + padding-left: 32px; + padding-right: 32px; +} + /* Large */ .vn-pa-lg { - padding: 32px; + padding: 64px; } .vn-pl-lg { - padding-left: 32px; + padding-left: 64px; } .vn-pr-lg { - padding-right: 32px; + padding-right: 64px; } .vn-pt-lg { - padding-top: 32px; + padding-top: 64px; } .vn-pb-lg { - padding-bottom: 32px; + padding-bottom: 64px; } .vn-py-lg { - padding-top: 32px; - padding-bottom: 32px; + padding-top: 64px; + padding-bottom: 64px; } .vn-px-lg { - padding-left: 32px; - padding-right: 32px; + padding-left: 64px; + padding-right: 64px; } /* Extra large */ @@ -296,30 +322,56 @@ margin-right: 16px; } +/* Medium-Large */ + +.vn-ma-ml { + margin: 32px; +} +.vn-mt-ml { + margin-top: 32px; +} +.vn-ml-ml { + margin-left: 32px; +} +.vn-mr-ml { + margin-right: 32px; +} +.vn-mb-ml { + margin-bottom: 32px; +} +.vn-my-ml { + margin-top: 32px; + margin-bottom: 32px; +} +.vn-mx-ml { + margin-left: 32px; + margin-right: 32px; +} + /* Large */ .vn-ma-lg { - margin: 32px; + margin: 64px; } .vn-mt-lg { - margin-top: 32px; + margin-top: 64px; } .vn-ml-lg { - margin-left: 32px; + margin-left: 64px; } .vn-mr-lg { - margin-right: 32px; + margin-right: 64px; } .vn-mb-lg { - margin-bottom: 32px; + margin-bottom: 64px; } .vn-my-lg { - margin-top: 32px; - margin-bottom: 32px; + margin-top: 64px; + margin-bottom: 64px; } .vn-mx-lg { - margin-left: 32px; - margin-right: 32px; + margin-left: 64px; + margin-right: 64px; } /* Extra large */ diff --git a/print/core/database.js b/print/core/database.js index 3cc508cef..e879d0e3a 100644 --- a/print/core/database.js +++ b/print/core/database.js @@ -1,6 +1,7 @@ const mysql = require('mysql2/promise'); const config = require('./config.js'); const fs = require('fs-extra'); +const PromisePoolConnection = mysql.PromisePoolConnection; module.exports = { init() { @@ -16,11 +17,17 @@ module.exports = { * Makes a query from a raw sql * @param {String} query - The raw SQL query * @param {Object} params - Parameterized values + * @param {Object} connection - Optional pool connection * * @return {Object} - Result promise */ - rawSql(query, params) { - return this.pool.query(query, params).then(([rows]) => { + rawSql(query, params, connection) { + let pool = this.pool; + if (params instanceof PromisePoolConnection) + connection = params; + if (connection) pool = connection; + + return pool.query(query, params).then(([rows]) => { return rows; }); }, @@ -85,5 +92,57 @@ module.exports = { return this.findOneFromDef(queryName, params).then(row => { return Object.values(row)[0]; }); + }, + + /** + * Returns the content of a SQL file + * @param {String} queryName - The SQL file name + * + * @return {Object} - SQL + */ + getSqlFromDef(queryName) { + return fs.readFileSync(`${queryName}.sql`, 'utf8'); + }, + + /** + * Merges two SQL strings + * + * @param {String} query - Input SQL + * @param {String} sql - String to merge + * + * @return {String} - Merged SQL string + */ + merge(query, sql) { + return query += `\r\n ${sql}`; + }, + + /** + * Builds where string + * + * @param {Object} args - Query params + * @param {Function} callback - Callback + * + * @return {String} - Where Sql string + */ + buildWhere(args, callback) { + let sql = ''; + + for (let prop in args) { + const value = args[prop]; + if (!value) continue; + + const sanitizedValue = mysql.escape(value); + const conditional = callback(prop, sanitizedValue); + + if (!conditional) continue; + + if (sql) sql += ' AND '; + sql += conditional; + } + let where = ''; + if (sql) + where = `WHERE ${sql}`; + + return where; } }; diff --git a/print/core/filters/number.js b/print/core/filters/number.js index a0c5e61f7..430639de4 100644 --- a/print/core/filters/number.js +++ b/print/core/filters/number.js @@ -4,6 +4,7 @@ const defaultLocale = config.i18n.locale; const number = function(value, locale = defaultLocale) { if (!locale) locale = defaultLocale; + if (value === null || value == '') return; return new Intl.NumberFormat(locale, { style: 'decimal' }).format(parseFloat(value)); diff --git a/print/core/mixins/db-helper.js b/print/core/mixins/db-helper.js index 06f4e196d..4a6f9e460 100644 --- a/print/core/mixins/db-helper.js +++ b/print/core/mixins/db-helper.js @@ -8,10 +8,12 @@ const dbHelper = { * Makes a query from a raw sql * @param {String} query - The raw SQL query * @param {Object} params - Parameterized values + * @param {Object} connection - Optional pool connection * * @return {Object} - Result promise */ - rawSql: db.rawSql, + rawSql: (query, params, connection) => + db.rawSql(query, params, connection), /** * Makes a query from a SQL file @@ -32,7 +34,7 @@ const dbHelper = { * * @return {Object} - Result promise */ - findOne: db.findOne, + findOne: (query, params) => db.findOne(query, params), /** * Returns the first row from a given SQL file @@ -53,7 +55,7 @@ const dbHelper = { * * @return {Object} - Result promise */ - findValue: db.findValue, + findValue: (query, params) => db.findValue(query, params), /** * Returns the first property from a given SQL file @@ -66,7 +68,18 @@ const dbHelper = { return this.findOneFromDef(queryName, params).then(row => { return Object.values(row)[0]; }); - } + }, + + /** + * Returns the content of an SQL file + * @param {String} queryName - The SQL file name + * + * @return {Object} - SQL + */ + getSqlFromDef(queryName) { + const absolutePath = path.join(__dirname, '../', this.tplPath, 'sql', queryName); + return db.getSqlFromDef(absolutePath); + }, }, props: ['tplPath'] }; diff --git a/print/templates/email/buyer-week-waste/buyer-week-waste.html b/print/templates/email/buyer-week-waste/buyer-week-waste.html index 9f6b22968..3b0c71160 100644 --- a/print/templates/email/buyer-week-waste/buyer-week-waste.html +++ b/print/templates/email/buyer-week-waste/buyer-week-waste.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('dear')}},

@@ -30,7 +30,7 @@
-
+
diff --git a/print/templates/email/campaign-metrics/campaign-metrics.html b/print/templates/email/campaign-metrics/campaign-metrics.html index 9d7014f34..ff8c661ee 100644 --- a/print/templates/email/campaign-metrics/campaign-metrics.html +++ b/print/templates/email/campaign-metrics/campaign-metrics.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('dear')}},

diff --git a/print/templates/email/claim-pickup-order/claim-pickup-order.html b/print/templates/email/claim-pickup-order/claim-pickup-order.html index cdde0dd92..f674dcee8 100644 --- a/print/templates/email/claim-pickup-order/claim-pickup-order.html +++ b/print/templates/email/claim-pickup-order/claim-pickup-order.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('description.dear')}},

{{$t('description.instructions')}}

diff --git a/print/templates/email/client-welcome/client-welcome.html b/print/templates/email/client-welcome/client-welcome.html index 1d21846d7..07b61b3e6 100644 --- a/print/templates/email/client-welcome/client-welcome.html +++ b/print/templates/email/client-welcome/client-welcome.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('dearClient')}},

diff --git a/print/templates/email/delivery-note-link/delivery-note-link.html b/print/templates/email/delivery-note-link/delivery-note-link.html index 78fa2c922..ab58cbb24 100644 --- a/print/templates/email/delivery-note-link/delivery-note-link.html +++ b/print/templates/email/delivery-note-link/delivery-note-link.html @@ -27,7 +27,7 @@
-
+

{{ $t('title') }}

{{$t('dear')}}

@@ -35,7 +35,7 @@
-
+

{{$t('copyLink')}}

https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={{ticketId}} @@ -44,7 +44,7 @@
-
+

diff --git a/print/templates/email/delivery-note/delivery-note.html b/print/templates/email/delivery-note/delivery-note.html index 71de29a3e..96c53b1d7 100644 --- a/print/templates/email/delivery-note/delivery-note.html +++ b/print/templates/email/delivery-note/delivery-note.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('dear')}},

diff --git a/print/templates/email/driver-route/driver-route.html b/print/templates/email/driver-route/driver-route.html index 815b28b8c..069edbfc4 100644 --- a/print/templates/email/driver-route/driver-route.html +++ b/print/templates/email/driver-route/driver-route.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('description.instructions')}}

diff --git a/print/templates/email/letter-debtor-nd/letter-debtor-nd.html b/print/templates/email/letter-debtor-nd/letter-debtor-nd.html index 630cce8a2..64bc7ca69 100644 --- a/print/templates/email/letter-debtor-nd/letter-debtor-nd.html +++ b/print/templates/email/letter-debtor-nd/letter-debtor-nd.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{ $t('sections.introduction.title') }},

{{ $t('sections.introduction.description') }}

@@ -62,7 +62,7 @@
-
+
-
+

{{ $t('title') }} {{$i18n.locale}}

{{ $t('sections.introduction.title') }},

{{ $t('sections.introduction.description') }}

@@ -45,7 +45,7 @@
-
+
-
+

{{ $t('title') }}

{{ $t('sections.introduction.title') }},

diff --git a/print/templates/email/printer-setup/printer-setup.html b/print/templates/email/printer-setup/printer-setup.html index df0b43f0c..fff21eb90 100644 --- a/print/templates/email/printer-setup/printer-setup.html +++ b/print/templates/email/printer-setup/printer-setup.html @@ -22,7 +22,7 @@
-
+

{{ $t('title') }}

{{$t('description.dear')}},

{{$t('description.instructions')}}

@@ -41,7 +41,7 @@
-
+

{{$t('sections.help.title')}}

{{$t('sections.help.description')}}

@@ -49,7 +49,7 @@
-
+
{{$t('salesPersonName')}}: {{client.salesPersonName}}
@@ -64,7 +64,7 @@
-
+
-
+

{{ $t('title') }}

{{$t('description.dear')}},

@@ -31,7 +31,7 @@
-
+
-
+

{{ $t('title') }}

{{$t('dear')}},

diff --git a/print/templates/reports/claim-pickup-order/claim-pickup-order.html b/print/templates/reports/claim-pickup-order/claim-pickup-order.html index 3cc335887..20c29f0ee 100644 --- a/print/templates/reports/claim-pickup-order/claim-pickup-order.html +++ b/print/templates/reports/claim-pickup-order/claim-pickup-order.html @@ -49,7 +49,7 @@
-
+
diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html index b6529dbe3..0004d171b 100644 --- a/print/templates/reports/delivery-note/delivery-note.html +++ b/print/templates/reports/delivery-note/delivery-note.html @@ -14,7 +14,7 @@
-
+

{{$t('title')}}

{{$t('reference')}}
diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html index dcd2f3ed9..956d4e2f6 100644 --- a/print/templates/reports/entry-order/entry-order.html +++ b/print/templates/reports/entry-order/entry-order.html @@ -54,7 +54,7 @@ -
+
diff --git a/print/templates/reports/extra-community/assets/css/import.js b/print/templates/reports/extra-community/assets/css/import.js new file mode 100644 index 000000000..fd8796c2b --- /dev/null +++ b/print/templates/reports/extra-community/assets/css/import.js @@ -0,0 +1,9 @@ +const Stylesheet = require(`${appPath}/core/stylesheet`); + +module.exports = new Stylesheet([ + `${appPath}/common/css/spacing.css`, + `${appPath}/common/css/misc.css`, + `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, + `${__dirname}/style.css`]) + .mergeStyles(); diff --git a/print/templates/reports/extra-community/assets/css/style.css b/print/templates/reports/extra-community/assets/css/style.css new file mode 100644 index 000000000..305a174d2 --- /dev/null +++ b/print/templates/reports/extra-community/assets/css/style.css @@ -0,0 +1,7 @@ +h1 { + text-align: center; +} + +th.align-right { + padding-right: 1em; +} \ No newline at end of file diff --git a/print/templates/reports/extra-community/extra-community.html b/print/templates/reports/extra-community/extra-community.html new file mode 100644 index 000000000..86baf858b --- /dev/null +++ b/print/templates/reports/extra-community/extra-community.html @@ -0,0 +1,84 @@ + + + +
{{$t('boxes')}}
+ + + + + +
+ + +
+
+

{{$t('title')}}

+
+
+ + +
+
+
+
{{$t('information')}}
+
+
+ + + + + + + + + + + + + + + + + + + + + +
{{$t('reference')}}{{travel.ref}}{{$t('blockedKg')}}{{travel.kg | number($i18n.locale)}}
{{$t('packages')}}{{travel.stickers}}{{$t('volumeKg')}}{{travel.volumeKg | number($i18n.locale)}}
{{$t('shipped')}}{{travel.shipped | date('%d-%m-%Y')}}{{$t('physicalKg')}}{{travel.loadedKg | number($i18n.locale)}}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
{{$t('supplier')}}{{$t('reference')}}{{$t('volKg')}}{{$t('phyKg')}}{{$t('packages')}}
{{entry.supplierName}}{{entry.ref}}{{entry.volumeKg | number($i18n.locale)}}{{entry.loadedKg | number($i18n.locale)}}{{entry.stickers}}
{{$t('noRows')}}
+
+
+ + + +
+ + \ No newline at end of file diff --git a/print/templates/reports/extra-community/extra-community.js b/print/templates/reports/extra-community/extra-community.js new file mode 100755 index 000000000..ddeabb49b --- /dev/null +++ b/print/templates/reports/extra-community/extra-community.js @@ -0,0 +1,115 @@ +const Component = require(`${appPath}/core/component`); +const reportHeader = new Component('report-header'); +const reportFooter = new Component('report-footer'); +const db = require(`${appPath}/core/database`); + +module.exports = { + name: 'extra-community', + async serverPrefetch() { + this.filters = this.$options.filters; + const args = { + landedFrom: this.landedStart, + landedTo: this.landedEnd, + shippedFrom: this.shippedStart, + shippedTo: this.shippedEnd, + continent: this.continent + }; + + const connection = await db.pool.getConnection(); + + await this.fetchTravels(args, connection); + + const travels = await this.rawSql(` + SELECT * FROM tmp.travel`, connection); + const entries = await this.fetchEntries(connection); + + await this.rawSql(` + DROP TEMPORARY TABLE + tmp.travel`, connection); + + await connection.release(); + + const map = new Map(); + + for (let travel of travels) + map.set(travel.id, travel); + + for (let entry of entries) { + const travel = map.get(entry.travelFk); + if (!travel.entries) travel.entries = []; + travel.entries.push(entry); + } + + this.travels = travels; + + if (!this.travels) + throw new Error('Something went wrong'); + }, + computed: { + dated: function() { + return this.filters.date(new Date(), '%d-%m-%Y'); + }, + landedStart: function() { + if (!this.landedFrom) return; + + return this.filters.date(this.landedFrom, '%Y-%m-%d'); + }, + landedEnd: function() { + if (!this.landedTo) return; + + return this.filters.date(this.landedTo, '%Y-%m-%d'); + }, + shippedStart: function() { + if (!this.shippedFrom) return; + + return this.filters.date(this.shippedFrom, '%Y-%m-%d'); + }, + shippedEnd: function() { + if (!this.shippedTo) return; + + return this.filters.date(this.shippedTo, '%Y-%m-%d'); + } + }, + methods: { + fetchTravels(args, connection) { + const where = db.buildWhere(args, (key, value) => { + switch (key) { + case 'shippedFrom': + return `t.shipped >= ${value}`; + case 'shippedTo': + return `t.shipped <= ${value}`; + case 'landedFrom': + return `t.landed >= ${value}`; + case 'landedTo': + return `t.landed <= ${value}`; + case 'continent': + return `cnt.code = ${value}`; + } + }); + + let query = this.getSqlFromDef('travels'); + query = db.merge(query, where); + query = db.merge(query, 'GROUP BY t.id'); + + return this.rawSql(query, connection); + }, + + fetchEntries(connection) { + let query = this.getSqlFromDef('entries'); + query = db.merge(query, 'GROUP BY e.id'); + + return this.rawSql(query, connection); + } + }, + components: { + 'report-header': reportHeader.build(), + 'report-footer': reportFooter.build() + }, + props: [ + 'landedFrom', + 'landedTo', + 'shippedFrom', + 'shippedTo', + 'continent' + ] +}; diff --git a/print/templates/reports/extra-community/locale/es.yml b/print/templates/reports/extra-community/locale/es.yml new file mode 100644 index 000000000..1112b0fe8 --- /dev/null +++ b/print/templates/reports/extra-community/locale/es.yml @@ -0,0 +1,15 @@ +title: Orden de carga +reference: Referencia +information: Información +packages: Bultos +blockedKg: KG Bloqueado +volumeKg: KG Volumen +physicalKg: KG Físico +volKg: KG Vol. +phyKg: KG Fís. +warehouseIn: Alm. entrada +shipped: F. envío +warehouseOut: Alm. salida +landed: F. llegada +noRows: Sin líneas que mostrar +supplier: Proveedor \ No newline at end of file diff --git a/print/templates/reports/extra-community/sql/entries.sql b/print/templates/reports/extra-community/sql/entries.sql new file mode 100644 index 000000000..5cf22fe44 --- /dev/null +++ b/print/templates/reports/extra-community/sql/entries.sql @@ -0,0 +1,15 @@ +SELECT + e.id, + e.travelFk, + e.ref, + s.name AS supplierName, + SUM(b.stickers) AS stickers, + CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as loadedKg, + CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as volumeKg + FROM tmp.travel t + JOIN entry e ON e.travelFk = t.id + JOIN buy b ON b.entryFk = e.id + JOIN packaging pkg ON pkg.id = b.packageFk + JOIN item i ON i.id = b.itemFk + JOIN itemType it ON it.id = i.typeFk + JOIN supplier s ON s.id = e.supplierFk \ No newline at end of file diff --git a/print/templates/reports/extra-community/sql/travels.sql b/print/templates/reports/extra-community/sql/travels.sql new file mode 100644 index 000000000..f9b421df7 --- /dev/null +++ b/print/templates/reports/extra-community/sql/travels.sql @@ -0,0 +1,24 @@ +CREATE TEMPORARY TABLE tmp.travel + (INDEX (id)) + ENGINE = MEMORY + SELECT + t.id, + t.ref, + t.shipped, + t.landed, + t.kg, + SUM(b.stickers) AS stickers, + CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as loadedKg, + CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as volumeKg + FROM travel t + LEFT JOIN supplier s ON s.id = t.cargoSupplierFk + LEFT JOIN entry e ON e.travelFk = t.id + LEFT JOIN buy b ON b.entryFk = e.id + LEFT JOIN packaging pkg ON pkg.id = b.packageFk + LEFT JOIN item i ON i.id = b.itemFk + LEFT JOIN itemType it ON it.id = i.typeFk + JOIN warehouse w ON w.id = t.warehouseInFk + JOIN warehouse wo ON wo.id = t.warehouseOutFk + JOIN country c ON c.id = wo.countryFk + LEFT JOIN continent cnt ON cnt.id = c.continentFk + JOIN agencyMode am ON am.id = t.agencyFk \ No newline at end of file