diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 9601e4923..f2bc66720 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -844,7 +844,8 @@ export default { }, travelExtraCommunity: { anySearchResult: 'vn-travel-extra-community > vn-data-viewer div > vn-tbody > vn-tr', - firstTravelReference: 'vn-travel-extra-community vn-card:nth-child(1) vn-td-editable', + firstTravelReference: 'vn-travel-extra-community vn-card:nth-child(1) vn-td-editable[name="reference"]', + firstTravelLockedKg: 'vn-travel-extra-community vn-card:nth-child(1) vn-td-editable[name="lockedKg"]', removeContinentFilter: 'vn-searchbar > form > vn-textfield > div.container > div.prepend > prepend > div > span:nth-child(3) > vn-icon > i' }, travelBasicData: { diff --git a/e2e/paths/10-travel/04_extra_community.spec.js b/e2e/paths/10-travel/04_extra_community.spec.js index 7a37b89e4..d902bb45e 100644 --- a/e2e/paths/10-travel/04_extra_community.spec.js +++ b/e2e/paths/10-travel/04_extra_community.spec.js @@ -16,19 +16,22 @@ describe('Travel extra community path', () => { await browser.close(); }); - it('should edit the travel reference', async() => { + it('should edit the travel reference and the locked kilograms', async() => { await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter); await page.waitForSpinnerLoad(); await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelReference, 'edited reference'); + await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelLockedKg, '1500'); }); - it('should reload the index and confirm the reference was edited', async() => { + it('should reload the index and confirm the reference and locked kg were edited', async() => { await page.accessToSection('travel.index'); await page.accessToSection('travel.extraCommunity'); await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter); await page.waitForTextInElement(selectors.travelExtraCommunity.firstTravelReference, 'edited reference'); const reference = await page.getProperty(selectors.travelExtraCommunity.firstTravelReference, 'innerText'); + const lockedKg = await page.getProperty(selectors.travelExtraCommunity.firstTravelLockedKg, 'innerText'); expect(reference).toContain('edited reference'); + expect(lockedKg).toContain(1500); }); }); diff --git a/modules/order/front/catalog/index.js b/modules/order/front/catalog/index.js index 318f5dbca..5fdd2e238 100644 --- a/modules/order/front/catalog/index.js +++ b/modules/order/front/catalog/index.js @@ -25,8 +25,15 @@ class Controller extends Section { } $onChanges() { - if (this.order && this.order.isConfirmed) - this.$state.go('order.card.line'); + this.getData().then(() => { + if (this.order && this.order.isConfirmed) + this.$state.go('order.card.line'); + }); + } + + getData() { + return this.$http.get(`Orders/${this.$params.id}`) + .then(res => this.order = res.data); } /** @@ -366,8 +373,5 @@ class Controller extends Section { ngModule.vnComponent('vnOrderCatalog', { template: require('./index.html'), - controller: Controller, - bindings: { - order: '<' - } + controller: Controller }); diff --git a/modules/order/front/catalog/index.spec.js b/modules/order/front/catalog/index.spec.js index 109893ae1..03d7c41ba 100644 --- a/modules/order/front/catalog/index.spec.js +++ b/modules/order/front/catalog/index.spec.js @@ -28,6 +28,22 @@ describe('Order', () => { }; })); + describe('getData()', () => { + it(`should make a query an fetch the order data`, () => { + controller._order = null; + + $httpBackend.expect('GET', `Orders/4`).respond(200, {id: 4, isConfirmed: true}); + $httpBackend.expect('GET', `Orders/4/getItemTypeAvailable?itemCategoryId=1`).respond(); + controller.getData(); + $httpBackend.flush(); + + const order = controller.order; + + expect(order.id).toEqual(4); + expect(order.isConfirmed).toBeTruthy(); + }); + }); + describe('order() setter', () => { it(`should call scope $applyAsync() method and apply filters from state params`, () => { $httpBackend.expect('GET', `Orders/4/getItemTypeAvailable?itemCategoryId=1`).respond(); diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js index 6dbe52524..5341de8d1 100644 --- a/modules/ticket/back/methods/ticket/filter.js +++ b/modules/ticket/back/methods/ticket/filter.js @@ -10,75 +10,75 @@ module.exports = Self => { accepts: [ { arg: 'ctx', - type: 'Object', + type: 'object', http: {source: 'context'} }, { arg: 'filter', - type: 'Object', + type: 'object', description: `Filter defining where, order, offset, and limit - must be a JSON-encoded string` }, { arg: 'search', - type: 'String', - description: `If it's and integer searchs by id, otherwise it searchs by nickname` + type: 'string', + description: `If it's and number searchs by id, otherwise it searchs by nickname` }, { arg: 'from', - type: 'Date', + type: 'date', description: `The from date filter` }, { arg: 'to', - type: 'Date', + type: 'date', description: `The to date filter` }, { arg: 'nickname', - type: 'String', + type: 'string', description: `The nickname filter` }, { arg: 'id', - type: 'Integer', + type: 'number', description: `The ticket id filter` }, { arg: 'clientFk', - type: 'Integer', + type: 'number', description: `The client id filter` }, { arg: 'agencyModeFk', - type: 'Integer', + type: 'number', description: `The agency mode id filter` }, { arg: 'warehouseFk', - type: 'Integer', + type: 'number', description: `The warehouse id filter` }, { arg: 'salesPersonFk', - type: 'Integer', + type: 'number', description: `The salesperson id filter` }, { arg: 'provinceFk', - type: 'Integer', + type: 'number', description: `The province id filter` }, { arg: 'stateFk', - type: 'Number', + type: 'number', description: `The state id filter` }, { arg: 'myTeam', - type: 'Boolean', + type: 'boolean', description: `Whether to show only tickets for the current logged user team (For now it shows only the current user tickets)` }, { arg: 'problems', - type: 'Boolean', + type: 'boolean', description: `Whether to show only tickets with problems` }, { arg: 'pending', - type: 'Boolean', + type: 'boolean', description: `Whether to show only tickets with state 'Pending'` }, { arg: 'mine', - type: 'Boolean', + type: 'boolean', description: `Whether to show only tickets for the current logged user` }, { arg: 'orderFk', - type: 'Number', + type: 'number', description: `The order id filter` }, { arg: 'refFk', @@ -86,12 +86,12 @@ module.exports = Self => { description: `The invoice reference filter` }, { arg: 'alertLevel', - type: 'Number', + type: 'number', description: `The alert level of the tickets` } ], returns: { - type: ['Object'], + type: ['object'], root: true }, http: { diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js index 4a49b4401..f4132c631 100644 --- a/modules/travel/back/methods/travel/extraCommunityFilter.js +++ b/modules/travel/back/methods/travel/extraCommunityFilter.js @@ -10,68 +10,74 @@ module.exports = Self => { accepts: [ { arg: 'filter', - type: 'Object', - description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string', - http: {source: 'query'} - }, { + type: 'object', + description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string' + }, + { arg: 'search', - type: 'String', - description: 'Searchs the travel by id', - http: {source: 'query'} - }, { + type: 'string', + description: 'Searchs the travel by id' + }, + { arg: 'id', - type: 'Integer', - description: 'The travel id', - http: {source: 'query'} - }, { + type: 'number', + description: 'The travel id' + }, + { arg: 'shippedFrom', - type: 'Date', - description: 'The shipped from date filter', - http: {source: 'query'} - }, { + type: 'date', + description: 'The shipped from date filter' + }, + { arg: 'shippedTo', - type: 'Date', - description: 'The shipped to date filter', - http: {source: 'query'} - }, { + type: 'date', + description: 'The shipped to date filter' + }, + { arg: 'landedFrom', - type: 'Date', - description: 'The landed from date filter', - http: {source: 'query'} - }, { + type: 'date', + description: 'The landed from date filter' + }, + { arg: 'landedTo', - type: 'Date', - description: 'The landed to date filter', - http: {source: 'query'} - }, { + type: 'date', + description: 'The landed to date filter' + }, + { arg: 'agencyFk', - type: 'Number', - description: 'The agencyModeFk id', - http: {source: 'query'} - }, { + type: 'number', + description: 'The agencyModeFk id' + }, + { arg: 'warehouseOutFk', - type: 'Number', - description: 'The warehouseOutFk filter', - http: {source: 'query'} - }, { + type: 'number', + description: 'The warehouseOutFk filter' + }, + { arg: 'warehouseInFk', - type: 'Number', - description: 'The warehouseInFk filter', - http: {source: 'query'} - }, { + type: 'number', + description: 'The warehouseInFk filter' + }, + { arg: 'totalEntries', - type: 'Number', - description: 'The totalEntries filter', - http: {source: 'query'} - }, { + type: 'number', + description: 'The totalEntries filter' + }, + { 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 +114,7 @@ module.exports = Self => { case 'warehouseOutFk': case 'warehouseInFk': case 'totalEntries': + case 'cargoSupplierFk': param = `t.${param}`; return {[param]: value}; } @@ -172,8 +179,8 @@ module.exports = Self => { e.notes, 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 entry e - JOIN tmp.travel tr ON tr.id = e.travelFk + FROM tmp.travel tr + JOIN entry e ON e.travelFk = tr.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 diff --git a/modules/travel/back/models/travel.json b/modules/travel/back/models/travel.json index df5b183b1..cd2f1d653 100644 --- a/modules/travel/back/models/travel.json +++ b/modules/travel/back/models/travel.json @@ -37,6 +37,9 @@ "m3": { "type": "Number" }, + "kg": { + "type": "Number" + }, "cargoSupplierFk": { "type": "Number" }, diff --git a/modules/travel/front/extra-community-search-panel/index.html b/modules/travel/front/extra-community-search-panel/index.html index 85a30907a..73c158a03 100644 --- a/modules/travel/front/extra-community-search-panel/index.html +++ b/modules/travel/front/extra-community-search-panel/index.html @@ -39,24 +39,28 @@ + ng-model="filter.shippedFrom" + on-change="$ctrl.shippedFrom = value"> + ng-model="filter.shippedTo" + on-change="$ctrl.shippedTo = value"> + ng-model="filter.landedFrom" + on-change="$ctrl.landedFrom = value"> + ng-model="filter.landedTo" + on-change="$ctrl.landedTo = value"> @@ -76,6 +80,13 @@ + + - +
- + + + + + - + Id Supplier Freighter @@ -33,14 +41,14 @@ Wh. Out - Shipped + W. Shipped Wh. In - Landed + W. Landed - + {{::travel.agencyModeName}} {{::travel.cargoSupplierNickname}} - + {{travel.ref}} + on-change="$ctrl.save(travel.id, {ref: value})"> {{::travel.stickers}} - {{::travel.kg}} + + {{travel.kg}} + + + + + {{::travel.loadedKg}} {{::travel.volumeKg}} {{::travel.warehouseOutName}} @@ -80,17 +97,17 @@ {{::entry.supplierName}} {{::entry.ref}} - {{::entry.stickers}} + {{::entry.stickers}} {{::entry.loadedkg}} {{::entry.volumeKg}} - + {{::entry.notes}} - + {{::entry.evaNotes}} diff --git a/modules/travel/front/extra-community/index.js b/modules/travel/front/extra-community/index.js index 221d6cb0d..08d4a168f 100644 --- a/modules/travel/front/extra-community/index.js +++ b/modules/travel/front/extra-community/index.js @@ -3,9 +3,11 @@ import Section from 'salix/components/section'; import './style.scss'; class Controller extends Section { - constructor($element, $) { + constructor($element, $, vnReport) { super($element, $); + this.vnReport = vnReport; + const draggable = this.element.querySelector('.travel-list'); draggable.addEventListener('dragstart', event => this.dragStart(event)); @@ -13,7 +15,7 @@ class Controller extends Section { event => this.dragEnd(event)); this.draggableElement = 'a[draggable]'; - this.droppableElement = 'vn-table[vn-droppable]'; + this.droppableElement = 'vn-tbody[vn-droppable]'; const scopeDays = 14; const landedFrom = new Date(); @@ -77,14 +79,26 @@ class Controller extends Section { } } - changeReference(travel) { - const params = {ref: travel.ref}; - const endpoint = `Travels/${travel.id}`; - this.$http.patch(endpoint, params) + 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/modules/travel/front/extra-community/index.spec.js b/modules/travel/front/extra-community/index.spec.js index 2f510f22f..7815bdd4f 100644 --- a/modules/travel/front/extra-community/index.spec.js +++ b/modules/travel/front/extra-community/index.spec.js @@ -14,20 +14,6 @@ describe('Travel Component vnTravelExtraCommunity', () => { controller.$.model.refresh = jest.fn(); })); - describe('changeReference()', () => { - it('should make an HTTP query', () => { - jest.spyOn(controller.vnApp, 'showSuccess'); - - const travel = {id: 1, ref: 'New reference'}; - const expectedData = {ref: 'New reference'}; - $httpBackend.expect('PATCH', `Travels/${travel.id}`, expectedData).respond(200); - controller.changeReference(travel); - $httpBackend.flush(); - - expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!'); - }); - }); - describe('findDraggable()', () => { it('should find the draggable element', () => { const draggable = document.createElement('a'); @@ -46,7 +32,7 @@ describe('Travel Component vnTravelExtraCommunity', () => { describe('findDroppable()', () => { it('should find the droppable element', () => { - const droppable = document.createElement('vn-table'); + const droppable = document.createElement('vn-tbody'); droppable.setAttribute('vn-droppable', true); const $event = new Event('drop'); @@ -103,13 +89,13 @@ describe('Travel Component vnTravelExtraCommunity', () => { describe('onDrop()', () => { it('should make an HTTP patch query', () => { - const droppable = document.createElement('vn-table'); + const droppable = document.createElement('vn-tbody'); droppable.setAttribute('vn-droppable', true); droppable.setAttribute('id', 1); jest.spyOn(controller, 'findDroppable').mockReturnValue(droppable); - const oldDroppable = document.createElement('vn-table'); + const oldDroppable = document.createElement('vn-tbody'); oldDroppable.setAttribute('vn-droppable', true); const entry = document.createElement('div'); oldDroppable.appendChild(entry); @@ -124,4 +110,19 @@ describe('Travel Component vnTravelExtraCommunity', () => { $httpBackend.flush(); }); }); + + describe('save()', () => { + it('should make an HTTP query', () => { + jest.spyOn(controller.vnApp, 'showSuccess'); + + const travelId = 1; + const data = {ref: 'New reference'}; + const expectedData = {ref: 'New reference'}; + $httpBackend.expect('PATCH', `Travels/${travelId}`, expectedData).respond(200); + controller.save(travelId, data); + $httpBackend.flush(); + + expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!'); + }); + }); }); diff --git a/modules/travel/front/extra-community/locale/es.yml b/modules/travel/front/extra-community/locale/es.yml index e377a1011..dc231226f 100644 --- a/modules/travel/front/extra-community/locale/es.yml +++ b/modules/travel/front/extra-community/locale/es.yml @@ -4,5 +4,8 @@ Freighter: Transitario Bl. KG: KG Bloq. Phy. KG: KG físico Vol. KG: KG Vol. -Search by travel id or reference: Buscar por id travel o referencia -Continent Out: Continente salida \ No newline at end of file +Search by travel id or reference: Buscar por id de travel o referencia +Search by extra community travel: Buscar por envío extra comunitario +Continent Out: Continente salida +W. Shipped: F. envío +W. Landed: F. llegada \ No newline at end of file diff --git a/modules/travel/front/extra-community/style.scss b/modules/travel/front/extra-community/style.scss index e7265781d..41544242d 100644 --- a/modules/travel/front/extra-community/style.scss +++ b/modules/travel/front/extra-community/style.scss @@ -26,11 +26,11 @@ vn-travel-extra-community { color: $color-active } - vn-td-editable text:after { + vn-td-editable:hover text:after { font-family: 'Material Icons'; content: 'edit'; position: absolute; - margin-left: 5px; + right: -15px; color: $color-spacer } diff --git a/modules/travel/front/thermograph/create/index.html b/modules/travel/front/thermograph/create/index.html index a183390c0..f73938f5b 100644 --- a/modules/travel/front/thermograph/create/index.html +++ b/modules/travel/front/thermograph/create/index.html @@ -84,13 +84,6 @@ value-field="id"> - - - - { + 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/delivery-note/delivery-note.js b/print/templates/reports/delivery-note/delivery-note.js index 5e5752e36..549759651 100755 --- a/print/templates/reports/delivery-note/delivery-note.js +++ b/print/templates/reports/delivery-note/delivery-note.js @@ -99,13 +99,8 @@ module.exports = { getBotanical() { let phytosanitary = []; this.sales.forEach(sale => { - let itemPhytosanitary; - if (sale.latinGenusName || sale.latinSpeciesName) - itemPhytosanitary = [sale.latinGenusName, sale.latinSpeciesName].filter(Boolean).join(' '); - else if (sale.botanical) - itemPhytosanitary = sale.botanical; - - phytosanitary.push(itemPhytosanitary); + if (sale.botanical) + phytosanitary.push(sale.botanical); }); return phytosanitary.filter((item, index) => diff --git a/print/templates/reports/delivery-note/sql/sales.sql b/print/templates/reports/delivery-note/sql/sales.sql index 08c349f5a..d17f6feee 100644 --- a/print/templates/reports/delivery-note/sql/sales.sql +++ b/print/templates/reports/delivery-note/sql/sales.sql @@ -14,9 +14,7 @@ SELECT i.inkFk, s.ticketFk, tcl.code vatType, - ib.botanical, - eg.latinGenusName, - es.latinSpeciesName, + ib.ediBotanic botanical, i.tag5, i.value5, i.tag6, @@ -37,10 +35,8 @@ FROM vn.sale s LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = sp.countryFk LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk - LEFT JOIN itemBotanical ib ON ib.itemFk = i.id + LEFT JOIN itemBotanicalWithGenus ib ON ib.itemFk = i.id AND ic.code = 'plant' - LEFT JOIN ediGenus eg ON eg.id = ib.genusFk - LEFT JOIN ediSpecie es ON es.id = ib.specieFk WHERE s.ticketFk = ? GROUP BY s.id ORDER BY (it.isPackaging), s.concept, s.itemFk \ No newline at end of file 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