From c04071366f250caa066d470368f2fd808e9e7ca8 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Tue, 29 Jan 2019 08:53:29 +0100 Subject: [PATCH 1/6] =?UTF-8?q?#1063=20client.summary=20a=C3=B1adir=20expl?= =?UTF-8?q?icaciones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/components/label-value/label-value.html | 7 ++++++- front/core/components/label-value/label-value.js | 6 ++++-- front/core/components/label-value/style.scss | 6 ++++++ modules/client/front/summary/index.html | 15 ++++++++++----- modules/client/front/summary/locale/es.yml | 5 +++++ 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/front/core/components/label-value/label-value.html b/front/core/components/label-value/label-value.html index ab7cdbc28..714c0f278 100644 --- a/front/core/components/label-value/label-value.html +++ b/front/core/components/label-value/label-value.html @@ -1,4 +1,9 @@
- + + +
\ No newline at end of file diff --git a/front/core/components/label-value/label-value.js b/front/core/components/label-value/label-value.js index 88edb5381..ecf3bf4b3 100644 --- a/front/core/components/label-value/label-value.js +++ b/front/core/components/label-value/label-value.js @@ -2,9 +2,11 @@ import ngModule from '../../module'; import './style.scss'; export default class Controller { - constructor($element, $translate) { + constructor($element, $translate, $attrs) { this.element = $element[0]; this._ = $translate; + this.hasInfo = Boolean($attrs.info); + this.info = $attrs.info || null; } set label(value) { let label = this.element.querySelector('vn-label'); @@ -24,7 +26,7 @@ export default class Controller { return this._value; } } -Controller.$inject = ['$element', '$translate']; +Controller.$inject = ['$element', '$translate', '$attrs']; ngModule.component('vnLabelValue', { controller: Controller, diff --git a/front/core/components/label-value/style.scss b/front/core/components/label-value/style.scss index e4360cec4..7caa0175f 100644 --- a/front/core/components/label-value/style.scss +++ b/front/core/components/label-value/style.scss @@ -11,4 +11,10 @@ vn-label-value > section { & > span { color: $main-font-color; } + + & > vn-icon { + vertical-align: middle; + color: $secondary-font-color; + font-size: 1.2em + } } \ No newline at end of file diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html index e47c2e76a..f14f4e651 100644 --- a/modules/client/front/summary/index.html +++ b/modules/client/front/summary/index.html @@ -168,22 +168,27 @@

Financial information

+ ng-class="{alert: $ctrl.summary.debt.debt > $ctrl.summary.credit}" + info="Invoices minus payments plus orders not yet invoiced"> + ($ctrl.summary.credit && $ctrl.summary.creditInsurance == null)}" + info="Verdnatura's maximum risk"> + value="{{$ctrl.summary.creditInsurance | currency:'€':2}} ({{$ctrl.summary.classifications[0].insurances[0].grade}})" + info="Solunion's maximum risk"> + value="{{$ctrl.summary.sumRisk | currency:'€':2}}" + info="Invoices minus payments"> + ng-class="{alert: $ctrl.summary.defaulters[0].amount}" + info="Deviated invoices minus payments"> Date: Tue, 29 Jan 2019 11:07:37 +0100 Subject: [PATCH 2/6] removed gulp docker from gulp backTest sequence --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index f100e66ad..f490e1191 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -100,7 +100,7 @@ function backTest(done) { nodemon({ exec: gulpBin, - args: ['dockerAndBackTest'], + args: ['backendUnitTest'], watch: backSources, done: done }); From f6f1dba1d94824645ceba22cd978666d883ddd51 Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 29 Jan 2019 11:14:01 +0100 Subject: [PATCH 3/6] #1071 modificar update.claim para que no utilice updateAll --- .../methods/claim/specs/updateClaim.spec.js | 12 ++++------- .../claim/back/methods/claim/updateClaim.js | 20 ++++++++++++------- modules/claim/front/action/index.js | 2 +- modules/claim/front/basic-data/index.html | 2 +- modules/claim/front/basic-data/index.js | 9 +++++++++ .../methods/client/addressesPropagateRe.js | 12 ++++++----- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/modules/claim/back/methods/claim/specs/updateClaim.spec.js b/modules/claim/back/methods/claim/specs/updateClaim.spec.js index 9e9c8aa40..a3f04d11d 100644 --- a/modules/claim/back/methods/claim/specs/updateClaim.spec.js +++ b/modules/claim/back/methods/claim/specs/updateClaim.spec.js @@ -24,7 +24,6 @@ describe('Update Claim', () => { it('should throw error if isSaleAssistant is false and try to modify a forbidden field', async() => { let params = { - id: newInstance.id, ticketFk: 3, clientFk: 101, ticketCreated: newDate, @@ -40,7 +39,7 @@ describe('Update Claim', () => { } } }; - await app.models.Claim.updateClaim(ctx, params) + await app.models.Claim.updateClaim(ctx, newInstance.id, params) .catch(e => { error = e; }); @@ -50,7 +49,6 @@ describe('Update Claim', () => { it('should throw error if isSaleAssistant is false and try to modify a valid field but a forbidden stated', async() => { let params = { - id: newInstance.id, ticketFk: 3, clientFk: 101, ticketCreated: newDate, @@ -65,7 +63,7 @@ describe('Update Claim', () => { } } }; - await app.models.Claim.updateClaim(ctx, params) + await app.models.Claim.updateClaim(ctx, newInstance.id, params) .catch(e => { error = e; }); @@ -75,7 +73,6 @@ describe('Update Claim', () => { it('should change field observation', async() => { let params = { - id: newInstance.id, ticketCreated: newDate, observation: 'another3' }; @@ -86,7 +83,7 @@ describe('Update Claim', () => { } } }; - await app.models.Claim.updateClaim(ctx, params); + await app.models.Claim.updateClaim(ctx, newInstance.id, params); let claimUpdated = await app.models.Claim.findById(newInstance.id); @@ -95,7 +92,6 @@ describe('Update Claim', () => { it('should change sensible fields as salesAssistant', async() => { let params = { - id: newInstance.id, ticketFk: 3, clientFk: 101, ticketCreated: newDate, @@ -112,7 +108,7 @@ describe('Update Claim', () => { } } }; - await app.models.Claim.updateClaim(ctx, params); + await app.models.Claim.updateClaim(ctx, newInstance.id, params); let claimUpdated = await app.models.Claim.findById(newInstance.id); diff --git a/modules/claim/back/methods/claim/updateClaim.js b/modules/claim/back/methods/claim/updateClaim.js index 21dc23abb..8125d814b 100644 --- a/modules/claim/back/methods/claim/updateClaim.js +++ b/modules/claim/back/methods/claim/updateClaim.js @@ -7,6 +7,12 @@ module.exports = Self => { description: 'Update a claim with privileges', accessType: 'WRITE', accepts: [{ + arg: 'id', + type: 'string', + required: true, + description: 'Client id', + http: {source: 'path'} + }, { arg: 'params', type: 'object', required: true, @@ -18,22 +24,21 @@ module.exports = Self => { root: true }, http: { - path: `/updateClaim`, + path: `/:id/updateClaim`, verb: 'post' } }); - Self.updateClaim = async(ctx, params) => { + Self.updateClaim = async(ctx, id, params) => { let models = Self.app.models; let isSalesAssistant; - let token = ctx.req.accessToken; - let currentUserId = token && token.userId; + let currentUserId = ctx.req.accessToken.userId; isSalesAssistant = await models.Account.hasRole(currentUserId, 'SalesAssistant'); if (!isSalesAssistant) { - let oldClaim = await models.Claim.findById(params.id); - let notModifiable = ['responsibility', 'isChargedToMana']; + let oldClaim = await models.Claim.findById(id); + let notModifiable = ['id', 'responsibility', 'isChargedToMana']; let changedFields = diff(oldClaim, params); let changedFieldsPicked = pick(changedFields, notModifiable); let statesViables = ['Gestionado', 'Pendiente', 'Anulado']; @@ -45,6 +50,7 @@ module.exports = Self => { throw new UserError(`You don't have enough privileges to change that field`); } - return await Self.updateAll({id: params.id}, params); + let claim = await Self.findById(id); + return await claim.updateAttributes(params); }; }; diff --git a/modules/claim/front/action/index.js b/modules/claim/front/action/index.js index 4d571312b..4ef3fd82a 100644 --- a/modules/claim/front/action/index.js +++ b/modules/claim/front/action/index.js @@ -147,7 +147,7 @@ class Controller { } saveResponsibility(value) { - let query = `/claim/api/Claims/updateClaim`; + let query = `/api/Claims/${this.$stateParams.id}/updateClaim`; this.$http.post(query, {responsibility: value}).then(() => { this.vnApp.showSuccess(this.$translate.instant('Data saved!')); diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html index 6158d2fc4..fe122ce29 100644 --- a/modules/claim/front/basic-data/index.html +++ b/modules/claim/front/basic-data/index.html @@ -2,7 +2,7 @@ vn-id="watcher" data="$ctrl.claim" form="form" - url="/claim/api/Claims/updateClaim" + url="/api/Claims/{{$ctrl.$stateParams.id}}/updateClaim" save="post">
diff --git a/modules/claim/front/basic-data/index.js b/modules/claim/front/basic-data/index.js index be5ab2fde..16b63767d 100644 --- a/modules/claim/front/basic-data/index.js +++ b/modules/claim/front/basic-data/index.js @@ -1,8 +1,17 @@ import ngModule from '../module'; import './style.scss'; +class Controller { + constructor($stateParams) { + this.$stateParams = $stateParams; + } +} + +Controller.$inject = ['$stateParams']; + ngModule.component('vnClaimBasicData', { template: require('./index.html'), + controller: Controller, bindings: { claim: '<' } diff --git a/modules/client/back/methods/client/addressesPropagateRe.js b/modules/client/back/methods/client/addressesPropagateRe.js index b94462c93..31cafa654 100644 --- a/modules/client/back/methods/client/addressesPropagateRe.js +++ b/modules/client/back/methods/client/addressesPropagateRe.js @@ -29,12 +29,14 @@ module.exports = function(Self) { } }); - Self.addressesPropagateRe = async (id, data) => { + Self.addressesPropagateRe = async(id, data) => { if (data.hasOwnProperty('isEqualizated')) { - await Self.app.models.Address.updateAll({clientFk: id}, data); - let client = await Self.app.models.Client.findById(id) - await client.updateAttributes({hasToInvoiceByAddress: false}); - return true; + let client = await Self.app.models.Client.findById(id); + if (client) { + await Self.app.models.Address.updateAll({clientFk: id}, data); + await client.updateAttributes({hasToInvoiceByAddress: false}); + return true; + } } return false; }; From 94f19c2cb5205dcc6866dd802fbaf88ab8371d90 Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 29 Jan 2019 14:38:31 +0100 Subject: [PATCH 4/6] =?UTF-8?q?#1073=20item.tags=20no=20busca=20tags=20cua?= =?UTF-8?q?ndo=20se=20a=C3=B1ade=20una=20linea=20nueva?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/model-proxy/model-proxy.js | 20 ++++++++++++------- modules/item/front/tags/index.html | 2 +- modules/item/front/tags/index.js | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/front/core/components/model-proxy/model-proxy.js b/front/core/components/model-proxy/model-proxy.js index 3ea2fed55..de809dc2a 100644 --- a/front/core/components/model-proxy/model-proxy.js +++ b/front/core/components/model-proxy/model-proxy.js @@ -145,8 +145,9 @@ export default class ModelProxy extends DataModel { }); return new Proxy(obj, { set: (obj, prop, value) => { - let changed = prop.charAt(0) !== '$' && value !== obj[prop] && !obj.$isNew; - if (changed) { + let changed = prop.charAt(0) !== '$' && value !== obj[prop]; + + if (changed && !obj.$isNew) { if (!obj.$oldData) obj.$oldData = {}; if (!obj.$oldData[prop]) @@ -159,7 +160,8 @@ export default class ModelProxy extends DataModel { if (changed) { this.emit('rowChange', {obj, prop, value}); this.emit('dataUpdate'); - if (this.autoSave) + + if (!obj.$isNew && this.autoSave) this.save(); } @@ -173,9 +175,10 @@ export default class ModelProxy extends DataModel { this.isChanged = false; let data = this.proxiedData; - if (data) + if (data) { for (let row of data) row.$oldData = null; + } } /** @@ -186,18 +189,21 @@ export default class ModelProxy extends DataModel { let orgData = this.orgData; if (!data) return; - for (let row of data) + for (let row of data) { if (row.$isNew) { let orgRow = {}; - for (let prop in row) + for (let prop in row) { if (prop.charAt(0) !== '$') orgRow[prop] = row[prop]; + } row.$orgIndex = orgData.push(orgRow) - 1; row.$orgRow = orgRow; row.$isNew = false; - } else if (row.$oldData) + } else if (row.$oldData) { for (let prop in row.$oldData) row.$orgRow[prop] = row[prop]; + } + } let removed = this.removed; diff --git a/modules/item/front/tags/index.html b/modules/item/front/tags/index.html index e8a6d6214..8ce050546 100644 --- a/modules/item/front/tags/index.html +++ b/modules/item/front/tags/index.html @@ -5,7 +5,6 @@ link="{itemFk: $ctrl.$stateParams.id}" include="$ctrl.include" order="priority ASC" - on-row-change="$ctrl.getSourceTable(obj)" data="$ctrl.itemTags" auto-load="true"> @@ -31,6 +30,7 @@ initial-data="itemTag.tag" field="itemTag.tagFk" data="tags" + on-change="$ctrl.getSourceTable(tag)" show-field="name" vn-acl="buyer" vn-focus> diff --git a/modules/item/front/tags/index.js b/modules/item/front/tags/index.js index d221263c1..2fc30e1ac 100644 --- a/modules/item/front/tags/index.js +++ b/modules/item/front/tags/index.js @@ -30,7 +30,7 @@ class Controller { getSourceTable(obj) { let sourceTable; this.sourceTables[obj.id] = {}; - let tag = obj.tag; + let tag = obj.tag || obj.selection; if (!tag || !tag.sourceTable && (tag.isFree === true || tag.isFree === undefined)) sourceTable = null; From 8f7fd03d6e0a888c228910143a9f5bebd2622c0f Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Tue, 29 Jan 2019 14:46:21 +0100 Subject: [PATCH 5/6] #1035 ticket al borrar falta traduccion --- loopback/locale/en.json | 3 ++- modules/ticket/front/locale/es.yml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/loopback/locale/en.json b/loopback/locale/en.json index bc7db2e30..e9395682f 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -29,5 +29,6 @@ "You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows", "You can't create a ticket for a inactive client": "You can't create a ticket for a inactive client", "Worker cannot be blank": "Worker cannot be blank", - "You don't have enough privileges to change the state of this ticket": "You don't have enough privileges to change the state of this ticket" + "You don't have enough privileges to change the state of this ticket": "You don't have enough privileges to change the state of this ticket", + "You must delete the claim id %d first": "You must delete the claim id %d first" } \ No newline at end of file diff --git a/modules/ticket/front/locale/es.yml b/modules/ticket/front/locale/es.yml index b56740e7b..16c8a1409 100644 --- a/modules/ticket/front/locale/es.yml +++ b/modules/ticket/front/locale/es.yml @@ -58,6 +58,8 @@ Delay: Retraso Code 100: Código 100 Invoice: Factura Client card: Ficha del cliente +You are going to delete this ticket: Vas a borrar este ticket +Ticket deleted: Ticket borrado #sections List: Listado From 7537d35446f4661894e3b2553676b936564ce2ad Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Tue, 29 Jan 2019 15:04:38 +0100 Subject: [PATCH 6/6] uncheck zones,removed treeview model #1066 --- .../{zone-treeview => zone-geo}/getLeaves.js | 8 ++--- .../methods/zone-included/toggleIsIncluded.js | 6 ++-- modules/agency/back/model-config.json | 3 -- modules/agency/back/models/zone-geo.js | 3 ++ modules/agency/back/models/zone-geo.json | 6 ++++ modules/agency/back/models/zone-treeview.js | 3 -- modules/agency/back/models/zone-treeview.json | 30 ------------------- modules/agency/front/location/index.html | 2 +- modules/client/front/billing-data/index.js | 2 +- modules/client/front/sample/index/index.js | 12 ++++---- print/report/email-footer/index.js | 4 +-- 11 files changed, 26 insertions(+), 53 deletions(-) rename modules/agency/back/methods/{zone-treeview => zone-geo}/getLeaves.js (93%) create mode 100644 modules/agency/back/models/zone-geo.js delete mode 100644 modules/agency/back/models/zone-treeview.js delete mode 100644 modules/agency/back/models/zone-treeview.json diff --git a/modules/agency/back/methods/zone-treeview/getLeaves.js b/modules/agency/back/methods/zone-geo/getLeaves.js similarity index 93% rename from modules/agency/back/methods/zone-treeview/getLeaves.js rename to modules/agency/back/methods/zone-geo/getLeaves.js index 08774aa6c..c0496f765 100644 --- a/modules/agency/back/methods/zone-treeview/getLeaves.js +++ b/modules/agency/back/methods/zone-geo/getLeaves.js @@ -38,7 +38,7 @@ module.exports = Self => { stmts.push(new ParameterizedSQL( `SELECT lft, rgt, depth + 1 INTO @lft, @rgt, @depth - FROM zoneTreeview WHERE id = ?`, [parentFk])); + FROM zoneGeo WHERE id = ?`, [parentFk])); stmts.push(`DROP TEMPORARY TABLE IF EXISTS tChilds`); @@ -46,7 +46,7 @@ module.exports = Self => { `CREATE TEMPORARY TABLE tChilds ENGINE = MEMORY SELECT id, lft, rgt - FROM zoneTreeview pt`); + FROM zoneGeo pt`); stmt.merge(conn.makeSuffix(filter)); if (!filter.where) { @@ -63,7 +63,7 @@ module.exports = Self => { ENGINE = MEMORY SELECT t.id FROM tChilds t - JOIN zoneTreeview zt + JOIN zoneGeo zt ON zt.lft > t.lft AND zt.rgt < t.rgt JOIN zoneIncluded zi ON zi.geoFk = zt.id AND zi.zoneFk = ? @@ -80,7 +80,7 @@ module.exports = Self => { ti.id IS NOT NULL hasCheckedChilds, zi.geoFk IS NOT NULL AS selected, zi.isIncluded AS excluded - FROM zoneTreeview pt + FROM zoneGeo pt LEFT JOIN vn.zoneIncluded zi ON zi.geoFk = pt.id AND zi.zoneFk = ? JOIN tChilds c ON c.id = pt.id diff --git a/modules/agency/back/methods/zone-included/toggleIsIncluded.js b/modules/agency/back/methods/zone-included/toggleIsIncluded.js index 766c51835..f93df8b35 100644 --- a/modules/agency/back/methods/zone-included/toggleIsIncluded.js +++ b/modules/agency/back/methods/zone-included/toggleIsIncluded.js @@ -24,20 +24,20 @@ module.exports = Self => { Self.toggleIsIncluded = async(zoneFk, geoFk) => { const models = Self.app.models; - const geo = await models.ZoneTreeview.findById(geoFk); + const geo = await models.ZoneGeo.findById(geoFk); const isIncluded = await Self.findOne({ where: {zoneFk, geoFk} }); const hasCheckedParents = await Self.rawSql( `SELECT id - FROM vn.zoneTreeview zt + FROM vn.zoneGeo zt JOIN vn.zoneIncluded zi ON zi.geoFk = zt.id WHERE zt.lft < ? AND zt.rgt > ?`, [geo.lft, geo.rgt] ); const hasCheckedChilds = await Self.rawSql( `SELECT id - FROM vn.zoneTreeview zt + FROM vn.zoneGeo zt JOIN vn.zoneIncluded zi ON zi.geoFk = zt.id WHERE zt.lft > ? AND zt.rgt < ?`, [geo.lft, geo.rgt] ); diff --git a/modules/agency/back/model-config.json b/modules/agency/back/model-config.json index d0959864d..d910a1602 100644 --- a/modules/agency/back/model-config.json +++ b/modules/agency/back/model-config.json @@ -20,9 +20,6 @@ "ZoneIncluded": { "dataSource": "vn" }, - "ZoneTreeview": { - "dataSource": "vn" - }, "LabourHoliday": { "dataSource": "vn" }, diff --git a/modules/agency/back/models/zone-geo.js b/modules/agency/back/models/zone-geo.js new file mode 100644 index 000000000..987e2de71 --- /dev/null +++ b/modules/agency/back/models/zone-geo.js @@ -0,0 +1,3 @@ +module.exports = Self => { + require('../methods/zone-geo/getLeaves')(Self); +}; diff --git a/modules/agency/back/models/zone-geo.json b/modules/agency/back/models/zone-geo.json index 14f436133..0a001235f 100644 --- a/modules/agency/back/models/zone-geo.json +++ b/modules/agency/back/models/zone-geo.json @@ -19,6 +19,12 @@ }, "rgt": { "type": "Number" + }, + "depth": { + "type": "Number" + }, + "sons": { + "type": "Number" } } } \ No newline at end of file diff --git a/modules/agency/back/models/zone-treeview.js b/modules/agency/back/models/zone-treeview.js deleted file mode 100644 index 36c76e12f..000000000 --- a/modules/agency/back/models/zone-treeview.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = Self => { - require('../methods/zone-treeview/getLeaves')(Self); -}; diff --git a/modules/agency/back/models/zone-treeview.json b/modules/agency/back/models/zone-treeview.json deleted file mode 100644 index 9ffd14d7e..000000000 --- a/modules/agency/back/models/zone-treeview.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "ZoneTreeview", - "base": "VnModel", - "options": { - "mysql": { - "table": "zoneTreeview" - } - }, - "properties": { - "id": { - "id": true, - "type": "Number" - }, - "name": { - "type": "String" - }, - "lft": { - "type": "Number" - }, - "rgt": { - "type": "Number" - }, - "depth": { - "type": "Number" - }, - "sons": { - "type": "Number" - } - } -} \ No newline at end of file diff --git a/modules/agency/front/location/index.html b/modules/agency/front/location/index.html index 86d5f9f34..70fed6ff6 100644 --- a/modules/agency/front/location/index.html +++ b/modules/agency/front/location/index.html @@ -1,6 +1,6 @@ diff --git a/modules/client/front/billing-data/index.js b/modules/client/front/billing-data/index.js index 40116b416..fd7a0e8b8 100644 --- a/modules/client/front/billing-data/index.js +++ b/modules/client/front/billing-data/index.js @@ -35,7 +35,7 @@ export default class Controller { } notifyChanges() { - this.$http.post(`/email/payment-update`, {clientFk: this.client.id}).then( + this.$http.post(`/api/email/payment-update`, {clientFk: this.client.id}).then( () => this.vnApp.showMessage(this.$translate.instant('Notification sent!')) ); } diff --git a/modules/client/front/sample/index/index.js b/modules/client/front/sample/index/index.js index 7fd84f54c..78fd7f37e 100644 --- a/modules/client/front/sample/index/index.js +++ b/modules/client/front/sample/index/index.js @@ -6,21 +6,21 @@ class Controller { this.filter = { include: [ { - relation: "type", + relation: 'type', scope: { - fields: ["code", "description"] + fields: ['code', 'description'] } }, { - relation: "worker", + relation: 'worker', scope: { - fields: ["firstName", "name"] + fields: ['firstName', 'name'] } }, { - relation: "company", + relation: 'company', scope: { - fields: ["code"] + fields: ['code'] } } ] diff --git a/print/report/email-footer/index.js b/print/report/email-footer/index.js index a2ed8473e..6cd80b610 100755 --- a/print/report/email-footer/index.js +++ b/print/report/email-footer/index.js @@ -16,8 +16,8 @@ module.exports = { data() { return { files: [ - '/assets/images/action.png', - '/assets/images/info.png', + /* '/assets/images/action.png', + '/assets/images/info.png', */ '/assets/images/facebook.png', '/assets/images/twitter.png', '/assets/images/youtube.png',