diff --git a/modules/route/back/methods/roadmap/clone.js b/modules/route/back/methods/roadmap/clone.js new file mode 100644 index 000000000..456ed823d --- /dev/null +++ b/modules/route/back/methods/roadmap/clone.js @@ -0,0 +1,81 @@ +const UserError = require('vn-loopback/util/user-error'); +module.exports = Self => { + Self.remoteMethod('clone', { + description: 'Clones the selected routes', + accessType: 'WRITE', + accepts: [ + { + arg: 'ids', + type: ['number'], + required: true, + description: 'The routes ids to clone' + }, + { + arg: 'etd', + type: 'date', + required: true, + description: 'The estimated time of departure for all roadmaps' + } + ], + returns: { + type: ['Object'], + root: true + }, + http: { + path: `/clone`, + verb: 'POST' + } + }); + + Self.clone = async(ids, etd) => { + const tx = await Self.beginTransaction({}); + try { + const models = Self.app.models; + const options = {transaction: tx}; + const originalRoadmaps = await models.Roadmap.find({ + where: {id: {inq: ids}}, + fields: [ + 'id', + 'name', + 'tractorPlate', + 'trailerPlate', + 'phone', + 'supplierFk', + 'etd', + 'observations', + 'price'], + include: [{ + relation: 'expeditionTruck', + scope: { + fields: ['roadmapFk', 'warehouseFk', 'eta', 'description'] + } + }] + + }, options); + + if (ids.length != originalRoadmaps.length) + throw new UserError(`The amount of roadmaps found don't match`); + + for (const roadmap of originalRoadmaps) { + roadmap.id = undefined; + roadmap.etd = etd; + + const clone = await models.Roadmap.create(roadmap, options); + + const expeditionTrucks = roadmap.expeditionTruck(); + expeditionTrucks.map(expeditionTruck => { + expeditionTruck.roadmapFk = clone.id; + return expeditionTruck; + }); + await models.ExpeditionTruck.create(expeditionTrucks, options); + } + + await tx.commit(); + + return true; + } catch (e) { + await tx.rollback(); + throw e; + } + }; +}; diff --git a/modules/route/back/methods/roadmap/specs/clone.spec.js b/modules/route/back/methods/roadmap/specs/clone.spec.js new file mode 100644 index 000000000..41e696157 --- /dev/null +++ b/modules/route/back/methods/roadmap/specs/clone.spec.js @@ -0,0 +1,109 @@ +const app = require('vn-loopback/server/server'); +const models = require('vn-loopback/server/server').models; + +describe('AgencyTerm filter()', () => { + const authUserId = 9; + const today = Date.vnNew(); + today.setHours(2, 0, 0, 0); + + it('should return all results matching the filter', async() => { + const tx = await models.AgencyTerm.beginTransaction({}); + + try { + const options = {transaction: tx}; + const filter = {}; + const ctx = {req: {accessToken: {userId: authUserId}}}; + + const agencyTerms = await models.AgencyTerm.filter(ctx, filter, options); + const firstAgencyTerm = agencyTerms[0]; + + expect(firstAgencyTerm.routeFk).toEqual(1); + expect(agencyTerms.length).toEqual(5); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); + + it('should return results matching "search" searching by integer', async() => { + let ctx = { + args: { + search: 1, + } + }; + + let result = await app.models.AgencyTerm.filter(ctx); + + expect(result.length).toEqual(1); + expect(result[0].routeFk).toEqual(1); + }); + + it('should return results matching "search" searching by string', async() => { + let ctx = { + args: { + search: 'Plants SL', + } + }; + + let result = await app.models.AgencyTerm.filter(ctx); + + expect(result.length).toEqual(2); + }); + + it('should return results matching "from" and "to"', async() => { + const tx = await models.Buy.beginTransaction({}); + const options = {transaction: tx}; + + try { + const from = Date.vnNew(); + from.setHours(0, 0, 0, 0); + + const to = Date.vnNew(); + to.setHours(23, 59, 59, 999); + + const ctx = { + args: { + from: from, + to: to + } + }; + + const results = await models.AgencyTerm.filter(ctx, options); + + expect(results.length).toBe(5); + + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } + }); + + it('should return results matching "agencyModeFk"', async() => { + let ctx = { + args: { + agencyModeFk: 1, + } + }; + + let result = await app.models.AgencyTerm.filter(ctx); + + expect(result.length).toEqual(1); + expect(result[0].routeFk).toEqual(1); + }); + + it('should return results matching "agencyFk"', async() => { + let ctx = { + args: { + agencyFk: 2, + } + }; + + let result = await app.models.AgencyTerm.filter(ctx); + + expect(result.length).toEqual(1); + expect(result[0].routeFk).toEqual(2); + }); +}); diff --git a/modules/route/back/methods/vehicle/sorted.js b/modules/route/back/methods/vehicle/sorted.js new file mode 100644 index 000000000..b379743bc --- /dev/null +++ b/modules/route/back/methods/vehicle/sorted.js @@ -0,0 +1,27 @@ +module.exports = Self => { + Self.remoteMethod('sorted', { + description: 'Sort the vehicles by warehouse', + accessType: 'WRITE', + accepts: [{ + arg: 'warehouseFk', + type: 'number' + }], + returns: { + type: ['object'], + root: true + }, + http: { + path: `/sorted`, + verb: `POST` + } + }); + + Self.sorted = async warehouseFk => { + return Self.rawSql(` + SELECT v.id, v.warehouseFk, v.numberPlate, w.name + FROM vehicle v + JOIN warehouse w ON w.id = v.warehouseFk + ORDER BY v.warehouseFk = ? DESC, w.id, v.numberPlate ASC; + `, [warehouseFk]); + }; +}; diff --git a/modules/route/back/model-config.json b/modules/route/back/model-config.json index 31aaad9f5..6688a243a 100644 --- a/modules/route/back/model-config.json +++ b/modules/route/back/model-config.json @@ -5,18 +5,22 @@ "AgencyTermConfig": { "dataSource": "vn" }, - "Route": { + "DeliveryPoint": { "dataSource": "vn" }, - "Vehicle": { + "ExpeditionTruck": { + "dataSource": "vn" + }, + "Roadmap": { + "dataSource": "vn" + }, + "Route": { "dataSource": "vn" }, "RouteLog": { "dataSource": "vn" }, - "DeliveryPoint": { + "Vehicle": { "dataSource": "vn" } } - - diff --git a/modules/route/back/models/expedition-truck.json b/modules/route/back/models/expedition-truck.json new file mode 100644 index 000000000..8edc7347f --- /dev/null +++ b/modules/route/back/models/expedition-truck.json @@ -0,0 +1,43 @@ +{ + "name": "ExpeditionTruck", + "base": "VnModel", + "options": { + "mysql": { + "table": "expeditionTruck" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "roadmapFk": { + "type": "number" + }, + "warehouseFk": { + "type": "number" + }, + "eta": { + "type": "date" + }, + "description": { + "type": "string" + }, + "userFk": { + "type": "number" + } + }, + "relations": { + "roadmap": { + "type": "belongsTo", + "model": "Roadmap", + "foreignKey": "roadmapFk" + }, + "warehouse": { + "type": "belongsTo", + "model": "Warehouse", + "foreignKey": "warehouseFk" + } + } +} diff --git a/modules/route/back/models/roadmap.js b/modules/route/back/models/roadmap.js new file mode 100644 index 000000000..4a2a02022 --- /dev/null +++ b/modules/route/back/models/roadmap.js @@ -0,0 +1,3 @@ +module.exports = Self => { + require('../methods/roadmap/clone')(Self); +}; diff --git a/modules/route/back/models/roadmap.json b/modules/route/back/models/roadmap.json new file mode 100644 index 000000000..7ca8fe0f6 --- /dev/null +++ b/modules/route/back/models/roadmap.json @@ -0,0 +1,63 @@ +{ + "name": "Roadmap", + "base": "VnModel", + "options": { + "mysql": { + "table": "roadmap" + } + }, + "properties": { + "id": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "name": { + "type": "string" + }, + "tractorPlate": { + "type": "string" + }, + "trailerPlate": { + "type": "string" + }, + "phone": { + "type": "string" + }, + "supplierFk": { + "type": "number" + }, + "etd": { + "type": "date" + }, + "observations": { + "type": "string" + }, + "userFk": { + "type": "number" + }, + "price": { + "type": "number" + }, + "driverName": { + "type": "string" + } + }, + "relations": { + "worker": { + "type": "belongsTo", + "model": "Worker", + "foreignKey": "userFk" + }, + "supplier": { + "type": "belongsTo", + "model": "Supplier", + "foreignKey": "supplierFk" + }, + "expeditionTruck": { + "type": "hasMany", + "model": "ExpeditionTruck", + "foreignKey": "roadmapFk" + } + } +} diff --git a/modules/route/back/models/vehicle.js b/modules/route/back/models/vehicle.js new file mode 100644 index 000000000..73e321443 --- /dev/null +++ b/modules/route/back/models/vehicle.js @@ -0,0 +1,3 @@ +module.exports = Self => { + require('../methods/vehicle/sorted')(Self); +}; diff --git a/modules/route/front/basic-data/index.html b/modules/route/front/basic-data/index.html index c63fee53b..ade9230e8 100644 --- a/modules/route/front/basic-data/index.html +++ b/modules/route/front/basic-data/index.html @@ -23,19 +23,21 @@
+
+
+
+
+
+
+ {{$ctrl.roadmap.supplier.nickname}}
+
+
+
+
+
+
diff --git a/modules/route/front/roadmap/search-panel/index.js b/modules/route/front/roadmap/search-panel/index.js
new file mode 100644
index 000000000..499027d14
--- /dev/null
+++ b/modules/route/front/roadmap/search-panel/index.js
@@ -0,0 +1,7 @@
+import ngModule from '../../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+ngModule.component('vnRoadmapSearchPanel', {
+ template: require('./index.html'),
+ controller: SearchPanel
+});
diff --git a/modules/route/front/roadmap/stops/index.html b/modules/route/front/roadmap/stops/index.html
new file mode 100644
index 000000000..b69492a21
--- /dev/null
+++ b/modules/route/front/roadmap/stops/index.html
@@ -0,0 +1,71 @@
++ {{summary.id}} - {{summary.name}} +
+
+
+ Stops
+
+
+
+
+
+
Autonomous worker
@@ -31,7 +31,7 @@
+
-
diff --git a/modules/worker/front/calendar/index.js b/modules/worker/front/calendar/index.js
index 87e806cc3..5606ad0ce 100644
--- a/modules/worker/front/calendar/index.js
+++ b/modules/worker/front/calendar/index.js
@@ -31,6 +31,8 @@ class Controller extends Section {
}
set businessId(value) {
+ if (!this.card.hasWorkCenter) return;
+
this._businessId = value;
if (value) {
this.refresh()
@@ -64,7 +66,7 @@ class Controller extends Section {
set worker(value) {
this._worker = value;
- if (value && value.hasWorkCenter) {
+ if (value) {
this.getIsSubordinate();
this.getActiveContract();
}
@@ -293,5 +295,8 @@ ngModule.vnComponent('vnWorkerCalendar', {
controller: Controller,
bindings: {
worker: '<'
+ },
+ require: {
+ card: '^vnWorkerCard'
}
});
diff --git a/modules/worker/front/calendar/index.spec.js b/modules/worker/front/calendar/index.spec.js
index 4b78d883b..5d7ae0795 100644
--- a/modules/worker/front/calendar/index.spec.js
+++ b/modules/worker/front/calendar/index.spec.js
@@ -20,6 +20,9 @@ describe('Worker', () => {
controller.absenceType = {id: 1, name: 'Holiday', code: 'holiday', rgb: 'red'};
controller.$params.id = 1106;
controller._worker = {id: 1106};
+ controller.card = {
+ hasWorkCenter: true
+ };
}));
describe('year() getter', () => {
@@ -74,7 +77,7 @@ describe('Worker', () => {
let yesterday = new Date(today.getTime());
yesterday.setDate(yesterday.getDate() - 1);
- controller.worker = {id: 1107, hasWorkCenter: true};
+ controller.worker = {id: 1107};
expect(controller.getIsSubordinate).toHaveBeenCalledWith();
expect(controller.getActiveContract).toHaveBeenCalledWith();
diff --git a/modules/worker/front/card/index.js b/modules/worker/front/card/index.js
index e1eb97327..0bf9ae5c4 100644
--- a/modules/worker/front/card/index.js
+++ b/modules/worker/front/card/index.js
@@ -3,7 +3,7 @@ import ModuleCard from 'salix/components/module-card';
class Controller extends ModuleCard {
reload() {
- let filter = {
+ const filter = {
include: [
{
relation: 'user',
@@ -32,12 +32,12 @@ class Controller extends ModuleCard {
]
};
- this.$http.get(`Workers/${this.$params.id}`, {filter})
- .then(res => this.worker = res.data);
- this.$http.get(`Workers/${this.$params.id}/activeContract`)
- .then(res => {
- if (res.data) this.worker.hasWorkCenter = res.data.workCenterFk;
- });
+ return Promise.all([
+ this.$http.get(`Workers/${this.$params.id}`, {filter})
+ .then(res => this.worker = res.data),
+ this.$http.get(`Workers/${this.$params.id}/activeContract`)
+ .then(res => this.hasWorkCenter = res.data.workCenterFk)
+ ]);
}
}
diff --git a/modules/worker/front/create/index.html b/modules/worker/front/create/index.html
index eb45704a7..481746761 100644
--- a/modules/worker/front/create/index.html
+++ b/modules/worker/front/create/index.html
@@ -38,7 +38,7 @@
![]()
-
- Click to exclude the user from getting disabled
-
-
- Click to allow the user to be disabled
-
+
+ {{$ctrl.workerExcluded
+ ? 'Click to allow the user to be disabled'
+ : 'Click to exclude the user from getting disabled'}}
+
@@ -84,7 +77,7 @@
-
-
\ No newline at end of file
+
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index ef2f64e85..a53528ef2 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -18,28 +18,19 @@ class Controller extends Descriptor {
this.getIsExcluded();
}
- get excluded() {
- return this.entity.excluded;
- }
-
- set excluded(value) {
- this.entity.excluded = value;
- }
-
getIsExcluded() {
- this.$http.get(`workerDisableExcludeds/${this.entity.id}/exists`).then(data => {
- this.excluded = data.data.exists;
+ this.$http.get(`WorkerDisableExcludeds/${this.entity.id}/exists`).then(data => {
+ this.workerExcluded = data.data.exists;
});
}
handleExcluded() {
- if (this.excluded) {
- this.$http.delete(`workerDisableExcludeds/${this.entity.id}`);
- this.excluded = false;
- } else {
- this.$http.post(`workerDisableExcludeds`, {workerFk: this.entity.id, dated: new Date});
- this.excluded = true;
- }
+ if (this.workerExcluded)
+ this.$http.delete(`WorkerDisableExcludeds/${this.entity.id}`);
+ else
+ this.$http.post(`WorkerDisableExcludeds`, {workerFk: this.entity.id, dated: new Date});
+
+ this.workerExcluded = !this.workerExcluded;
}
loadData() {
diff --git a/modules/worker/front/dms/index/index.html b/modules/worker/front/dms/index/index.html
index 1404336a2..aefbbcf34 100644
--- a/modules/worker/front/dms/index/index.html
+++ b/modules/worker/front/dms/index/index.html
@@ -1,6 +1,6 @@
-
+ ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
{{::document.file}}
@@ -63,16 +63,14 @@
+ ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
-
+
-
-
+
+
+
+
@@ -91,9 +97,9 @@
fixed-bottom-right>
-
\ No newline at end of file
+
diff --git a/modules/worker/front/dms/index/index.js b/modules/worker/front/dms/index/index.js
index 9bb3c896a..489fe1732 100644
--- a/modules/worker/front/dms/index/index.js
+++ b/modules/worker/front/dms/index/index.js
@@ -17,9 +17,15 @@ class Controller extends Component {
});
}
- downloadFile(dmsId) {
+ downloadFile(dmsId, isDocuware) {
+ if (isDocuware) return this.vnFile.download(`api/workerDms/${dmsId}/docuwareDownload`);
this.vnFile.download(`api/workerDms/${dmsId}/downloadFile`);
}
+
+ async openDocuware() {
+ const url = await this.vnApp.getUrl(`WebClient`, 'docuware');
+ if (url) window.open(url).focus();
+ }
}
Controller.$inject = ['$element', '$scope', 'vnFile'];
diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html
index 5f0855ee6..760b0dafc 100644
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@@ -4,7 +4,7 @@
filter="::$ctrl.filter"
data="$ctrl.hours">
-
-
+
+
+
+{{'Contract' | translate}} #{{$ctrl.card.worker.hasWorkCenter}}
+{{'Contract' | translate}} #{{$ctrl.businessId}}
{{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed || 0}}
{{'of' | translate}} {{$ctrl.contractHolidays.totalHolidays || 0}} {{'days' | translate}}
@@ -73,41 +73,39 @@
value-field="businessFk"
order="businessFk DESC"
limit="5">
-
-
-
-
-
- #{{businessFk}}
-
- {{started | date: 'dd/MM/yyyy'}} - {{ended ? (ended | date: 'dd/MM/yyyy') : 'Indef.'}}
-
-
-
-
-
- Festive
-
-
-
-
- Current day
-
-
+ #{{businessFk}}
+
+ {{started | date: 'dd/MM/yyyy'}} - {{ended ? (ended | date: 'dd/MM/yyyy') : 'Indef.'}}
+
+
+
+
+
+ Festive
+
+
+
+
+ Current day
+
+
+
+
@@ -107,7 +107,7 @@
{
+ if (!this.card.hasWorkCenter) return;
+
this.getWorkedHours(this.started, this.ended);
this.getAbsences();
});
@@ -151,7 +153,6 @@ class Controller extends Section {
}
getAbsences() {
- if (!this.worker.hasWorkerCenter) return;
const fullYear = this.started.getFullYear();
let params = {
workerFk: this.$params.id,
@@ -486,5 +487,8 @@ ngModule.vnComponent('vnWorkerTimeControl', {
controller: Controller,
bindings: {
worker: '<'
+ },
+ require: {
+ card: '^vnWorkerCard'
}
});
diff --git a/modules/worker/front/time-control/index.spec.js b/modules/worker/front/time-control/index.spec.js
index 0132f50fe..6d8510ba8 100644
--- a/modules/worker/front/time-control/index.spec.js
+++ b/modules/worker/front/time-control/index.spec.js
@@ -16,9 +16,8 @@ describe('Component vnWorkerTimeControl', () => {
$scope = $rootScope.$new();
$element = angular.element('
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/print/templates/email/auth-code/auth-code.js b/print/templates/email/auth-code/auth-code.js
index 362b307d8..b16833036 100755
--- a/print/templates/email/auth-code/auth-code.js
+++ b/print/templates/email/auth-code/auth-code.js
@@ -1,10 +1,10 @@
const Component = require(`vn-print/core/component`);
-const emailBody = new Component('email-body');
+const emailHeader = new Component('email-header');
module.exports = {
name: 'auth-code',
components: {
- 'email-body': emailBody.build(),
+ 'email-header': emailHeader.build(),
},
props: {
code: {
diff --git a/print/templates/email/auth-code/locale/en.yml b/print/templates/email/auth-code/locale/en.yml
index 27b493e20..74ea87e32 100644
--- a/print/templates/email/auth-code/locale/en.yml
+++ b/print/templates/email/auth-code/locale/en.yml
@@ -3,5 +3,4 @@ title: Verification code
description: Somebody did request a verification code for login. If you didn't request it, please ignore this email.
device: 'Device'
ip: 'IP'
-Enter the following code to continue to your account: Enter the following code to continue to your account
-It expires in 5 minutes: It expires in 5 minutes
+Enter the following code to continue to your account. It expires in 5 minutes.: Enter the following code to continue to your account. It expires in 5 minutes.
diff --git a/print/templates/email/auth-code/locale/es.yml b/print/templates/email/auth-code/locale/es.yml
index 463ea95fa..92150c4ed 100644
--- a/print/templates/email/auth-code/locale/es.yml
+++ b/print/templates/email/auth-code/locale/es.yml
@@ -3,5 +3,4 @@ title: Código de verificación
description: Alguien ha solicitado un código de verificación para poder iniciar sesión. Si no lo has solicitado tu, ignora este email.
device: 'Dispositivo'
ip: 'IP'
-Enter the following code to continue to your account: Introduce el siguiente código para poder continuar con tu cuenta
-It expires in 5 minutes: Expira en 5 minutos
+Enter the following code to continue to your account. It expires in 5 minutes.: Introduce el siguiente código para poder continuar con tu cuenta. Expira en 5 minutos.
diff --git a/print/templates/email/auth-code/locale/fr.yml b/print/templates/email/auth-code/locale/fr.yml
index 454bb80ae..0b71d4228 100644
--- a/print/templates/email/auth-code/locale/fr.yml
+++ b/print/templates/email/auth-code/locale/fr.yml
@@ -3,5 +3,4 @@ title: Code de vérification
description: Quelqu'un a demandé un code de vérification pour se connecter. Si ce n'était pas toi, ignore cet email.
device: 'Appareil'
ip: 'IP'
-Enter the following code to continue to your account: Entrez le code suivant pour continuer avec votre compte
-It expires in 5 minutes: Il expire dans 5 minutes.
+Enter the following code to continue to your account. It expires in 5 minutes.: Entrez le code suivant pour continuer avec votre compte. Il expire dans 5 minutes.
diff --git a/print/templates/email/auth-code/locale/pt.yml b/print/templates/email/auth-code/locale/pt.yml
index 7f9eb85f5..1cf5d23be 100644
--- a/print/templates/email/auth-code/locale/pt.yml
+++ b/print/templates/email/auth-code/locale/pt.yml
@@ -3,5 +3,4 @@ title: Código de verificação
description: Alguém solicitou um código de verificação para entrar. Se você não fez essa solicitação, ignore este e-mail.
device: 'Dispositivo'
ip: 'IP'
-Enter the following code to continue to your account: Insira o seguinte código para continuar com sua conta.
-It expires in 5 minutes: Expira em 5 minutos.
+Enter the following code to continue to your account. It expires in 5 minutes.: Insira o seguinte código para continuar com sua conta. Expira em 5 minutos.
diff --git a/print/templates/reports/invoice/sql/sales.sql b/print/templates/reports/invoice/sql/sales.sql
index f5721a594..3833a3700 100644
--- a/print/templates/reports/invoice/sql/sales.sql
+++ b/print/templates/reports/invoice/sql/sales.sql
@@ -1,31 +1,19 @@
-SELECT
+SELECT
io.ref,
- c.socialName,
- sa.iban,
- pm.name AS payMethod,
- t.clientFk,
- t.shipped,
- t.nickname,
s.ticketFk,
- s.itemFk,
- s.concept,
- s.quantity,
- s.price,
+ ib.ediBotanic botanical,
+ s.quantity,
+ s.price,
s.discount,
- i.tag5,
- i.value5,
- i.tag6,
- i.value6,
- i.tag7,
- i.value7,
- tc.code AS vatType,
- ib.ediBotanic botanical
+ s.itemFk,
+ s.concept,
+ tc.code vatType
FROM vn.invoiceOut io
JOIN vn.ticket t ON t.refFk = io.ref
JOIN vn.supplier su ON su.id = io.companyFk
- JOIN vn.client c ON c.id = t.clientFk
+ JOIN vn.client c ON c.id = t.clientFk
JOIN vn.payMethod pm ON pm.id = c.payMethodFk
- JOIN vn.company co ON co.id = io.companyFk
+ JOIN vn.company co ON co.id = io.companyFk
JOIN vn.supplierAccount sa ON sa.id = co.supplierAccountFk
JOIN vn.sale s ON s.ticketFk = t.id
JOIN item i ON i.id = s.itemFk
@@ -38,35 +26,23 @@ SELECT
AND itc.itemFk = s.itemFk
JOIN vn.taxClass tc ON tc.id = itc.taxClassFk
WHERE t.refFk = ?
- UNION ALL
-SELECT
+ UNION ALL
+SELECT
io.ref,
- c.socialName,
- sa.iban,
- pm.name AS payMethod,
- t.clientFk,
- t.shipped,
- t.nickname,
- t.id AS ticketFk,
+ t.id ticketFk,
+ NULL botanical,
+ ts.quantity,
+ ts.price,
+ 0 discount,
'',
- ts.description concept,
- ts.quantity,
- ts.price,
- 0 discount,
- NULL AS tag5,
- NULL AS value5,
- NULL AS tag6,
- NULL AS value6,
- NULL AS tag7,
- NULL AS value7,
- tc.code AS vatType,
- NULL AS botanical
+ ts.description concept,
+ tc.code vatType
FROM vn.invoiceOut io
JOIN vn.ticket t ON t.refFk = io.ref
JOIN vn.ticketService ts ON ts.ticketFk = t.id
- JOIN vn.client c ON c.id = t.clientFk
+ JOIN vn.client c ON c.id = t.clientFk
JOIN vn.payMethod pm ON pm.id = c.payMethodFk
- JOIN vn.company co ON co.id = io.companyFk
+ JOIN vn.company co ON co.id = io.companyFk
JOIN vn.supplierAccount sa ON sa.id = co.supplierAccountFk
JOIN vn.taxClass tc ON tc.id = ts.taxClassFk
- WHERE t.refFk = ?
\ No newline at end of file
+ WHERE t.refFk = ?
Autonomous worker
@@ -136,6 +136,7 @@
+
-
-
-
- {{ $t('title') }}
-{{ $t('description') }}
-- {{ $t('device') }}: {{ device }} -
-- {{$t('ip')}}: {{ ip }} -
-
-
-
-
- {{ $t('Enter the following code to continue to your account') }}
-
- {{ code }}
-
- {{ $t('It expires in 5 minutes') }}
-|
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('title') }}+{{ $t('description') }} ++ {{ $t('device') }}: {{ device }} + ++ {{$t('ip')}}: {{ ip }} + +
+
+
+
+ {{ $t('Enter the following code to continue to your account. It expires in 5 minutes.') }} +
+ {{ code }}
+
+ |
+