diff --git a/print/templates/reports/vehicle-event-expired/campaign-metrics.js b/print/templates/reports/vehicle-event-expired/campaign-metrics.js deleted file mode 100755 index 6669ce0679..0000000000 --- a/print/templates/reports/vehicle-event-expired/campaign-metrics.js +++ /dev/null @@ -1,38 +0,0 @@ -const Component = require(`${appPath}/core/component`); -const reportHeader = new Component('report-header'); -const reportFooter = new Component('report-footer'); - -module.exports = { - name: 'campaign-metrics', - async serverPrefetch() { - this.client = await this.fetchClient(this.recipientId); - this.sales = await this.fetchSales(this.recipientId, this.from, this.to); - - if (!this.client) - throw new Error('Something went wrong'); - }, - methods: { - fetchClient(clientId) { - return this.findOneFromDef('client', [clientId]); - }, - fetchSales(clientId, from, to) { - return this.rawSqlFromDef('sales', [clientId, from, to]); - }, - }, - components: { - 'report-header': reportHeader.build(), - 'report-footer': reportFooter.build() - }, - props: { - recipientId: { - type: [Number, String], - required: true - }, - from: { - required: true - }, - to: { - required: true - } - } -}; diff --git a/print/templates/reports/vehicle-event-expired/locale/es.yml b/print/templates/reports/vehicle-event-expired/locale/es.yml index e73c8ef982..ba76850479 100644 --- a/print/templates/reports/vehicle-event-expired/locale/es.yml +++ b/print/templates/reports/vehicle-event-expired/locale/es.yml @@ -1,12 +1,4 @@ -reportName: consumo-cliente title: Expiración Tarjetas Vehículos -Client: Cliente -clientData: Datos del cliente -dated: Fecha -From: Desde -To: Hasta -client: Cliente {0} -Stems: Tallos Plate: Matrícula Concept: Concepto expirationDate: Fecha caducidad \ No newline at end of file diff --git a/print/templates/reports/vehicle-event-expired/sql/client.sql b/print/templates/reports/vehicle-event-expired/sql/client.sql deleted file mode 100644 index 9f392c97eb..0000000000 --- a/print/templates/reports/vehicle-event-expired/sql/client.sql +++ /dev/null @@ -1,13 +0,0 @@ -SELECT - c.street, - c.socialName, - c.city, - c.postcode, - c.id, - c.name AS clientName, - p.name AS province, - co.country -FROM client c - JOIN province p ON c.provinceFk = p.id - JOIN country co ON c.countryFk = co.id -WHERE c.id = ? \ No newline at end of file diff --git a/print/templates/reports/vehicle-event-expired/sql/sales.sql b/print/templates/reports/vehicle-event-expired/sql/sales.sql deleted file mode 100644 index 2daa72aaa6..0000000000 --- a/print/templates/reports/vehicle-event-expired/sql/sales.sql +++ /dev/null @@ -1,20 +0,0 @@ -SELECT - SUM(s.quantity) AS subtotal, - s.itemFk, - s.concept, - i.subName, - i.tag5, - i.value5, - i.tag6, - i.value6, - i.tag7, - i.value7 -FROM sale s - JOIN ticket t ON t.id = s.ticketFk - JOIN item i ON i.id = s.itemFk - JOIN itemType it ON it.id = i.typeFk -WHERE - t.clientFk = ? AND it.isPackaging = FALSE - AND DATE(t.shipped) BETWEEN ? AND ? -GROUP BY s.itemFk -ORDER BY i.typeFk , i.name \ No newline at end of file diff --git a/print/templates/reports/vehicle-event-expired/sql/vehicleEvents.sql b/print/templates/reports/vehicle-event-expired/sql/vehicleEvents.sql new file mode 100644 index 0000000000..09f9e5853c --- /dev/null +++ b/print/templates/reports/vehicle-event-expired/sql/vehicleEvents.sql @@ -0,0 +1,7 @@ +SELECT + v.numberPlate, + ve.description, + ve.finished +FROM vehicleEvent ve + JOIN vehicle v ON v.id = ve.vehicleFk +WHERE ve.id IN (?) \ No newline at end of file diff --git a/print/templates/reports/vehicle-event-expired/campaign-metrics.html b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.html similarity index 58% rename from print/templates/reports/vehicle-event-expired/campaign-metrics.html rename to print/templates/reports/vehicle-event-expired/vehicle-event-expired.html index 60b8dd717b..2045f2adbe 100644 --- a/print/templates/reports/vehicle-event-expired/campaign-metrics.html +++ b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.html @@ -10,11 +10,9 @@
{{$t('expirationDate')}} | |||||
---|---|---|---|---|---|
{{sale.itemFk | zerofill('000000')}} | -{{Math.trunc(sale.subtotal)}} | -{{sale.concept}} | +{{vehicleEvent.numberPlate}} | +{{vehicleEvent.description}} | +{{vehicleEvent.finished | date('%d-%m-%Y')}} |