8355-testToMaster #3336
114
CHANGELOG.md
114
CHANGELOG.md
|
@ -1,3 +1,117 @@
|
||||||
|
# Version 24.48 - 2024-11-25
|
||||||
|
|
||||||
|
### Added 🆕
|
||||||
|
|
||||||
|
- feat: refs #4948 Added ticket_selfConsumptionPackaging by:guillermo
|
||||||
|
- feat: refs #6818 add config table by:jorgep
|
||||||
|
- feat: refs #6818 add records by:jorgep
|
||||||
|
- feat: refs #6818 saysimple integration by:jorgep
|
||||||
|
- feat: refs #6845 userInterface by:sergiodt
|
||||||
|
- feat: refs #6869 add back by:jorgep
|
||||||
|
- feat: refs #6869 define model by:jorgep
|
||||||
|
- feat: refs #6869 refs#6869 itemShelving_get (origin/6869-createGetDetails) by:sergiodt
|
||||||
|
- feat: refs #7006 itemTypeLog by:guillermo
|
||||||
|
- feat: refs #7006 itemTypeLog created by:guillermo
|
||||||
|
- feat: refs #7006 Requested changes by:guillermo
|
||||||
|
- feat: refs #7193 added scope in parking model by:Jon
|
||||||
|
- feat: refs #7244 Requested changes by:guillermo
|
||||||
|
- feat: refs #7266 Added details and improvements in item label reports by:guillermo
|
||||||
|
- feat: refs #7266 buyFkForPrint by:sergiodt
|
||||||
|
- feat: refs #7266 First commit by:guillermo
|
||||||
|
- feat: refs #7266 Item label barcode by:guillermo
|
||||||
|
- feat: refs #7266 Item label QR by:guillermo
|
||||||
|
- feat: refs #7266 Item label QR finished by:guillermo
|
||||||
|
- feat: refs #7266 Minor change by:guillermo
|
||||||
|
- feat: refs #7266 Print corrections by:guillermo
|
||||||
|
- feat: refs #7266 Requested changes and improvements by:guillermo
|
||||||
|
- feat: refs #7266 Requested changes and query optimization by:guillermo
|
||||||
|
- feat: refs #7266 Version by:guillermo
|
||||||
|
- feat: refs #7289 #7289 apply option 1 by:Javier Segarra
|
||||||
|
- feat: refs #7289 #7289 remove bad translation by:Javier Segarra
|
||||||
|
- feat: refs #7524 restrict fields by:jorgep
|
||||||
|
- feat: refs #7641 fine tunning by:jorgep
|
||||||
|
- feat: refs #7641 improve style by:jorgep
|
||||||
|
- feat: refs #7743 add simple spec for sendMail by:pablone
|
||||||
|
- feat: refs #7743 add try catch stmt to the test by:pablone
|
||||||
|
- feat: refs #7874 add default type by:jorgep
|
||||||
|
- feat: refs #7874 use name by:jorgep
|
||||||
|
- feat: refs #7920 Added ItemShelving in shelvingLog by:guillermo
|
||||||
|
- feat: refs #7921 refs#7921 sendLostExpedition by:sergiodt
|
||||||
|
- feat: refs #7922 refs #792 scanOrder by:sergiodt
|
||||||
|
- feat: refs #7943 quitar lectura en metodos comunes by:jgallego
|
||||||
|
- feat: refs #7943 return just the required content by:jorgep
|
||||||
|
- feat: refs #7943 usa back con permisos by:jgallego
|
||||||
|
- feat: refs #8020 machineWorkerDeprecated by:sergiodt
|
||||||
|
- feat: refs #8057 Added data updates by:guillermo
|
||||||
|
- feat: refs #8057 Added data updates (origin/8057-geoFk) by:guillermo
|
||||||
|
- feat: refs #8057 Added geoFk columns by:guillermo
|
||||||
|
- feat: refs #8057 Fix version by:guillermo
|
||||||
|
- feat: refs #8057 More precision in getGeo by:guillermo
|
||||||
|
- feat: refs #8057 Requested changes by:guillermo
|
||||||
|
- feat: refs #8071 quitar esquema by:robert
|
||||||
|
- feat: refs #8071 travel_weeklyClone by:robert
|
||||||
|
- feat: refs #8080 Added column comment by:guillermo
|
||||||
|
- feat: refs #8083 add prop by:jorgep
|
||||||
|
- feat: refs #8087 Traspasar redadas a travels by:Carlos Andrés
|
||||||
|
- feat: refs #8099 refs#8099 addComplmentSalary by:sergiodt
|
||||||
|
- feat: refs #8124 Enrutadores nuevos requerimientos by:Carlos Andrés
|
||||||
|
- feat: refs #8124 Enrutadores nuevos requerimientos (origin/8124-enrutadoresNuevosRequerimientos) by:Carlos Andrés
|
||||||
|
- feat: refs #8127 entry_getCommission by:robert
|
||||||
|
- feat: refs #8127 quitar esquemas by:robert
|
||||||
|
- feat: refs #8135 refs#8135 updateTicketACL (origin/8135-ticketACL) by:sergiodt
|
||||||
|
- feat: refs #8143 deprecate recoverPass and sync from account.user by:ivanm
|
||||||
|
- feat: refs #8150 movExpeditions by:sergiodt
|
||||||
|
- feat: refs #8151 Added test by:guillermo
|
||||||
|
- feat: refs #8151 moveExpeditions by:guillermo
|
||||||
|
- feat: refs #8151 Requested changes by:guillermo
|
||||||
|
- feat(Supplier): refs #6828 add companySize by:alexm
|
||||||
|
- refactor: refs #7641 entry report style by:jorgep
|
||||||
|
|
||||||
|
### Changed 📦
|
||||||
|
|
||||||
|
- refactor: refs #6920 add correct role by:alexm
|
||||||
|
- refactor: refs #7242 Deleted select column by:guillermo
|
||||||
|
- refactor: refs #7457 Added from param if not exists by:guillermo
|
||||||
|
- refactor: refs #7641 entry report style by:jorgep
|
||||||
|
- refactor: refs #7715 Deleted hasNewLabelMrwMethod column by:guillermo
|
||||||
|
- refactor: refs #7920 Fix tests by:guillermo
|
||||||
|
- refactor: refs #7920 Fix version by:guillermo
|
||||||
|
- refactor: refs #7920 itemShelvingLog by:guillermo
|
||||||
|
- refactor: refs #7920 Main change by:guillermo
|
||||||
|
- refactor: refs #7920 Major changes by:guillermo
|
||||||
|
- refactor: refs #7920 No changes in itemShelvingLog table by:guillermo
|
||||||
|
- refactor: refs #7920 Requested changes by:guillermo
|
||||||
|
- refactor: refs #7950 Created cmr model (7950-cmrModelUnify) by:guillermo
|
||||||
|
- refactor: refs #7950 Requested changes by:guillermo
|
||||||
|
- refactor: refs #8153 Optimized order_getTax by:guillermo
|
||||||
|
|
||||||
|
### Fixed 🛠️
|
||||||
|
|
||||||
|
- fix: clean deletes also zoneEvent range records by:jgallego
|
||||||
|
- fix: more data for fixture.before by:Pako
|
||||||
|
- fix: refs #4948 Tests by:guillermo
|
||||||
|
- fix: refs #6644 email and translations by:carlossa
|
||||||
|
- fix: refs #6818 add config by:jorgep
|
||||||
|
- fix: refs #6818 add defaultChannel by:jorgep
|
||||||
|
- fix: refs #6818 use right col type by:jorgep
|
||||||
|
- fix: refs #6869 use id as primaryKey by:jorgep
|
||||||
|
- fix: refs #7244 Added collection ACL by:guillermo
|
||||||
|
- fix: refs #7283 item filters by:carlossa
|
||||||
|
- fix: refs #7283 remove by:carlossa
|
||||||
|
- fix: refs #7283 remove tests by:carlossa
|
||||||
|
- fix: refs #7283 tback by:carlossa
|
||||||
|
- fix: refs #7323 add remaining fields (origin/7323-warfix-addRemainingFields) by:jorgep
|
||||||
|
- fix: refs #7457 add with on select to reduce by:pablone
|
||||||
|
- fix: refs #7457 empty commit for gitea by:pablone
|
||||||
|
- fix: refs #7457 error on empty from param and add translate by:pablone
|
||||||
|
- fix: refs #7457 remove group by calc time reduce bellow 1s by:pablone
|
||||||
|
- fix: refs #7457 remove translate and use param definition for restriction by:pablone
|
||||||
|
- fix: refs #7641 align columns by:jorgep
|
||||||
|
- fix: refs #7641 drop boilerplate code by:jorgep
|
||||||
|
- fix: refs #7920 refs#7920 itemShelvingLog by:sergiodt
|
||||||
|
- fix: refs #8153 Version by:guillermo
|
||||||
|
- revert cd7ed6987a88e00275b562d3248f368b6333620c by:Javier Segarra
|
||||||
|
|
||||||
# Version 24.38 - 2024-09-17
|
# Version 24.38 - 2024-09-17
|
||||||
|
|
||||||
### Added 🆕
|
### Added 🆕
|
||||||
|
|
|
@ -7,7 +7,8 @@ def RUN_BUILD
|
||||||
|
|
||||||
def BRANCH_ENV = [
|
def BRANCH_ENV = [
|
||||||
test: 'test',
|
test: 'test',
|
||||||
master: 'production'
|
master: 'production',
|
||||||
|
beta: 'production'
|
||||||
]
|
]
|
||||||
|
|
||||||
node {
|
node {
|
||||||
|
@ -18,7 +19,8 @@ node {
|
||||||
PROTECTED_BRANCH = [
|
PROTECTED_BRANCH = [
|
||||||
'dev',
|
'dev',
|
||||||
'test',
|
'test',
|
||||||
'master'
|
'master',
|
||||||
|
'beta'
|
||||||
].contains(env.BRANCH_NAME)
|
].contains(env.BRANCH_NAME)
|
||||||
|
|
||||||
FROM_GIT = env.JOB_NAME.startsWith('gitea/')
|
FROM_GIT = env.JOB_NAME.startsWith('gitea/')
|
||||||
|
@ -62,6 +64,18 @@ pipeline {
|
||||||
PROJECT_NAME = 'salix'
|
PROJECT_NAME = 'salix'
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
|
stage('Version') {
|
||||||
|
when {
|
||||||
|
expression { RUN_BUILD }
|
||||||
|
}
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
def packageJson = readJSON file: 'package.json'
|
||||||
|
def version = "${packageJson.version}-build${env.BUILD_ID}"
|
||||||
|
writeFile(file: 'VERSION.txt', text: version)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
stage('Install') {
|
stage('Install') {
|
||||||
environment {
|
environment {
|
||||||
NODE_ENV = ''
|
NODE_ENV = ''
|
||||||
|
@ -118,11 +132,10 @@ pipeline {
|
||||||
when {
|
when {
|
||||||
expression { RUN_BUILD }
|
expression { RUN_BUILD }
|
||||||
}
|
}
|
||||||
|
environment {
|
||||||
|
VERSION = readFile 'VERSION.txt'
|
||||||
|
}
|
||||||
steps {
|
steps {
|
||||||
script {
|
|
||||||
def packageJson = readJSON file: 'package.json'
|
|
||||||
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
|
|
||||||
}
|
|
||||||
sh 'docker-compose build back'
|
sh 'docker-compose build back'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -156,11 +169,10 @@ pipeline {
|
||||||
when {
|
when {
|
||||||
expression { RUN_BUILD }
|
expression { RUN_BUILD }
|
||||||
}
|
}
|
||||||
|
environment {
|
||||||
|
VERSION = readFile 'VERSION.txt'
|
||||||
|
}
|
||||||
steps {
|
steps {
|
||||||
script {
|
|
||||||
def packageJson = readJSON file: 'package.json'
|
|
||||||
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
|
|
||||||
}
|
|
||||||
sh 'gulp build'
|
sh 'gulp build'
|
||||||
sh 'docker-compose build front'
|
sh 'docker-compose build front'
|
||||||
}
|
}
|
||||||
|
@ -175,12 +187,9 @@ pipeline {
|
||||||
}
|
}
|
||||||
environment {
|
environment {
|
||||||
CREDENTIALS = credentials('docker-registry')
|
CREDENTIALS = credentials('docker-registry')
|
||||||
|
VERSION = readFile 'VERSION.txt'
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
script {
|
|
||||||
def packageJson = readJSON file: 'package.json'
|
|
||||||
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
|
|
||||||
}
|
|
||||||
sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
|
sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
|
||||||
sh 'docker-compose push'
|
sh 'docker-compose push'
|
||||||
}
|
}
|
||||||
|
@ -207,11 +216,10 @@ pipeline {
|
||||||
when {
|
when {
|
||||||
expression { FROM_GIT }
|
expression { FROM_GIT }
|
||||||
}
|
}
|
||||||
|
environment {
|
||||||
|
VERSION = readFile 'VERSION.txt'
|
||||||
|
}
|
||||||
steps {
|
steps {
|
||||||
script {
|
|
||||||
def packageJson = readJSON file: 'package.json'
|
|
||||||
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
|
|
||||||
}
|
|
||||||
withKubeConfig([
|
withKubeConfig([
|
||||||
serverUrl: "$KUBERNETES_API",
|
serverUrl: "$KUBERNETES_API",
|
||||||
credentialsId: 'kubernetes',
|
credentialsId: 'kubernetes',
|
||||||
|
|
|
@ -63,7 +63,8 @@ module.exports = Self => {
|
||||||
p.pickingOrder pickingOrder,
|
p.pickingOrder pickingOrder,
|
||||||
iss.id itemShelvingSaleFk,
|
iss.id itemShelvingSaleFk,
|
||||||
iss.isPicked,
|
iss.isPicked,
|
||||||
iss.itemShelvingFk
|
iss.itemShelvingFk,
|
||||||
|
st.code stateCode
|
||||||
FROM ticketCollection tc
|
FROM ticketCollection tc
|
||||||
LEFT JOIN collection c ON c.id = tc.collectionFk
|
LEFT JOIN collection c ON c.id = tc.collectionFk
|
||||||
JOIN sale s ON s.ticketFk = tc.ticketFk
|
JOIN sale s ON s.ticketFk = tc.ticketFk
|
||||||
|
@ -77,6 +78,7 @@ module.exports = Self => {
|
||||||
LEFT JOIN parking p ON p.id = sh.parkingFk
|
LEFT JOIN parking p ON p.id = sh.parkingFk
|
||||||
LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
|
LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
|
||||||
LEFT JOIN origin o ON o.id = i.originFk
|
LEFT JOIN origin o ON o.id = i.originFk
|
||||||
|
LEFT JOIN state st ON st.id = sg.stateFk
|
||||||
WHERE tc.collectionFk = ?
|
WHERE tc.collectionFk = ?
|
||||||
GROUP BY s.id, ish.id, p.code, p2.code
|
GROUP BY s.id, ish.id, p.code, p2.code
|
||||||
UNION ALL
|
UNION ALL
|
||||||
|
@ -104,7 +106,8 @@ module.exports = Self => {
|
||||||
p.pickingOrder,
|
p.pickingOrder,
|
||||||
iss.id itemShelvingSaleFk,
|
iss.id itemShelvingSaleFk,
|
||||||
iss.isPicked,
|
iss.isPicked,
|
||||||
iss.itemShelvingFk
|
iss.itemShelvingFk,
|
||||||
|
st.code stateCode
|
||||||
FROM sectorCollection sc
|
FROM sectorCollection sc
|
||||||
JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk = sc.id
|
JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk = sc.id
|
||||||
JOIN saleGroup sg ON sg.id = ss.saleGroupFk
|
JOIN saleGroup sg ON sg.id = ss.saleGroupFk
|
||||||
|
@ -118,6 +121,7 @@ module.exports = Self => {
|
||||||
LEFT JOIN parking p ON p.id = sh.parkingFk
|
LEFT JOIN parking p ON p.id = sh.parkingFk
|
||||||
LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
|
LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
|
||||||
LEFT JOIN origin o ON o.id = i.originFk
|
LEFT JOIN origin o ON o.id = i.originFk
|
||||||
|
LEFT JOIN state st ON st.id = sg.stateFk
|
||||||
WHERE sc.id = ?
|
WHERE sc.id = ?
|
||||||
AND sgd.saleGroupFk
|
AND sgd.saleGroupFk
|
||||||
GROUP BY s.id, ish.id, p.code, p2.code`, [id, id], myOptions);
|
GROUP BY s.id, ish.id, p.code, p2.code`, [id, id], myOptions);
|
||||||
|
|
|
@ -24,12 +24,13 @@ module.exports = Self => {
|
||||||
|
|
||||||
Self.cancelShipment = async expeditionFk => {
|
Self.cancelShipment = async expeditionFk => {
|
||||||
const models = Self.app.models;
|
const models = Self.app.models;
|
||||||
|
|
||||||
const mrw = await models.MrwConfig.findOne();
|
const mrw = await models.MrwConfig.findOne();
|
||||||
const {externalId} = await models.Expedition.findById(expeditionFk);
|
const {externalId} = await models.Expedition.findById(expeditionFk);
|
||||||
const clientType = await models.MrwConfig.getClientType(expeditionFk);
|
const clientType = await models.MrwConfig.getClientType(expeditionFk);
|
||||||
const template = fs.readFileSync(__dirname + '/cancelShipment.ejs', 'utf-8');
|
const template = fs.readFileSync(__dirname + '/cancelShipment.ejs', 'utf-8');
|
||||||
const renderedXml = ejs.render(template, {mrw, externalId, clientType});
|
const renderedXml = ejs.render(template, {mrw, externalId, clientType});
|
||||||
|
|
||||||
|
await Self.rawSql('CALL util.debugAdd(?,?);', ['cancelShipment', renderedXml]);
|
||||||
const response = await axios.post(mrw.url, renderedXml, {
|
const response = await axios.post(mrw.url, renderedXml, {
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/soap+xml; charset=utf-8'
|
'Content-Type': 'application/soap+xml; charset=utf-8'
|
||||||
|
@ -37,12 +38,11 @@ module.exports = Self => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const xmlString = response.data;
|
const xmlString = response.data;
|
||||||
|
await Self.rawSql('CALL util.debugAdd(?,?);', ['cancelShipmentResponse', xmlString]);
|
||||||
const parser = new DOMParser();
|
const parser = new DOMParser();
|
||||||
const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
|
const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
|
||||||
|
|
||||||
await Self.rawSql('CALL util.debugAdd(?,?);', ['cancelShipment', xmlDoc]);
|
|
||||||
|
|
||||||
const result = xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
|
const result = xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
|
||||||
return result.toLowerCase().includes('se ha cancelado correctamente');
|
return ['no se ha encontrado', 'se ha cancelado correctamente'].some(res => result.toLowerCase().includes(res));
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -29,35 +29,34 @@ module.exports = Self => {
|
||||||
});
|
});
|
||||||
|
|
||||||
Self.sendToSupport = async(ctx, reason, additionalData) => {
|
Self.sendToSupport = async(ctx, reason, additionalData) => {
|
||||||
|
const userId = ctx.req.accessToken.userId;
|
||||||
const emailUser =
|
const emailUser =
|
||||||
await Self.app.models.EmailUser.findById(ctx.req.accessToken.userId, {fields: ['email']});
|
await Self.app.models.EmailUser.findById(userId, {fields: ['email']});
|
||||||
|
|
||||||
let html = `<strong>Motivo</strong>:<br/>${reason}<br/>`;
|
let html = `<h2>Motivo: ${reason}</h2>`;
|
||||||
html += `<strong>Usuario</strong>:<br/>${ctx.req.accessToken.userId} ${emailUser.email}<br/>`;
|
html += `<h3>Usuario: ${userId} ${emailUser.email}</h3>`;
|
||||||
|
html += `<h3>Additional Data:</h3>`;
|
||||||
|
html += '<ul>';
|
||||||
|
for (const [key, val] of Object.entries(additionalData)) {
|
||||||
|
if (key !== 'config') html += `<li>${key}: ${parse(val)}</li>`;
|
||||||
|
else {
|
||||||
|
html += `<li>${key}:</li><ul style="list-style-type: square;">`;
|
||||||
|
for (const [confKey, confVal] of Object.entries(val))
|
||||||
|
html += `<li>${confKey}: ${parse(confVal)}</li>`;
|
||||||
|
html += '</ul>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
html += '</ul>';
|
||||||
|
|
||||||
delete additionalData.backError.config.headers.Authorization;
|
const {message, path, name} = additionalData;
|
||||||
const httpRequest = JSON.parse(additionalData?.httpRequest);
|
|
||||||
|
|
||||||
if (httpRequest)
|
|
||||||
delete httpRequest.config.headers.Authorization;
|
|
||||||
additionalData.httpRequest = httpRequest;
|
|
||||||
|
|
||||||
for (const data in additionalData)
|
|
||||||
html += `<strong>${data}</strong>:<br/>${tryParse(additionalData[data])}<br/>`;
|
|
||||||
|
|
||||||
const subjectReason = httpRequest?.data?.error;
|
|
||||||
await smtp.send({
|
await smtp.send({
|
||||||
to: `${config.app.reportEmail}, ${emailUser.email}`,
|
to: `${config.app.reportEmail}, ${emailUser.email}`,
|
||||||
subject:
|
subject: `[Support-Salix] ${path} ${name}: ${message}`,
|
||||||
'[Support-Salix] ' +
|
|
||||||
additionalData?.frontPath + ' ' +
|
|
||||||
subjectReason?.name + ':' +
|
|
||||||
subjectReason?.message,
|
|
||||||
html
|
html
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
function tryParse(value) {
|
function parse(value) {
|
||||||
try {
|
try {
|
||||||
try {
|
try {
|
||||||
value = JSON.parse(value);
|
value = JSON.parse(value);
|
||||||
|
|
|
@ -1,88 +0,0 @@
|
||||||
const axios = require('axios');
|
|
||||||
const UserError = require('vn-loopback/util/user-error');
|
|
||||||
const moment = require('moment');
|
|
||||||
|
|
||||||
module.exports = Self => {
|
|
||||||
Self.remoteMethod('sendOrders', {
|
|
||||||
description: 'Sends a set of orders',
|
|
||||||
accessType: 'WRITE',
|
|
||||||
accepts: [{
|
|
||||||
arg: 'tickets',
|
|
||||||
type: ['number'],
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
returns: {
|
|
||||||
type: 'string',
|
|
||||||
root: true
|
|
||||||
},
|
|
||||||
http: {
|
|
||||||
path: `/sendOrders`,
|
|
||||||
verb: 'POST'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
Self.sendOrders = async tickets => {
|
|
||||||
const config = await Self.app.models.QuadmindsApiConfig.findOne();
|
|
||||||
if (!config) throw new UserError('Config params not set');
|
|
||||||
|
|
||||||
if (tickets.length > config.maxObjects)
|
|
||||||
throw new UserError(`Quadminds does not support more than ${config.maxObjects} tickets`);
|
|
||||||
|
|
||||||
let poisData = [];
|
|
||||||
let isOk;
|
|
||||||
for (let offset = 0; !isOk; offset = offset + config.limit) {
|
|
||||||
const pois = await axios.get(`${config.url}pois/search?limit=${config.limit}&offset=${offset}`, {
|
|
||||||
headers: {
|
|
||||||
'Accept': 'application/json',
|
|
||||||
'X-Saas-Apikey': config.key
|
|
||||||
}
|
|
||||||
});
|
|
||||||
pois.data.data.length ? poisData.push(...pois.data.data) : isOk = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
const poiMap = new Map(poisData.map(poi => [poi.code, poi._id]));
|
|
||||||
|
|
||||||
let orders = await Self.rawSql(`
|
|
||||||
SELECT a.id poiCode,
|
|
||||||
t.id code,
|
|
||||||
t.shipped date,
|
|
||||||
'PEDIDO' operation,
|
|
||||||
t.totalWithVat totalAmount,
|
|
||||||
t.totalWithoutVat totalAmountWithoutTaxes,
|
|
||||||
SUM(sv.volume) volume
|
|
||||||
FROM ticket t
|
|
||||||
JOIN address a ON a.id = t.addressFk
|
|
||||||
JOIN saleVolume sv ON sv.ticketFk = t.id
|
|
||||||
WHERE t.id IN (?)
|
|
||||||
GROUP BY t.id
|
|
||||||
`, [tickets]);
|
|
||||||
|
|
||||||
// Transformo code en string ya que lo obtenermos como integer
|
|
||||||
orders = orders.map(order => {
|
|
||||||
return {
|
|
||||||
...order,
|
|
||||||
poiId: poiMap.get(order.poiCode.toString()) || undefined,
|
|
||||||
code: order.code.toString(),
|
|
||||||
date: moment(order.date).format('YYYY-MM-DD'),
|
|
||||||
totalAmount: order.totalAmount || undefined,
|
|
||||||
totalAmountWithoutTaxes: order.totalAmountWithoutTaxes || undefined,
|
|
||||||
timeWindow: [{
|
|
||||||
from: config.orderTimeFrom,
|
|
||||||
to: config.orderTimeTo
|
|
||||||
}],
|
|
||||||
orderMeasures: [{
|
|
||||||
constraintId: 3, // Volumen
|
|
||||||
value: order.volume
|
|
||||||
}]
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
await axios.post(`${config.url}orders`, orders, {
|
|
||||||
headers: {
|
|
||||||
'Accept': 'application/json',
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
'X-Saas-Apikey': config.key
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
};
|
|
|
@ -1,87 +0,0 @@
|
||||||
const axios = require('axios');
|
|
||||||
const UserError = require('vn-loopback/util/user-error');
|
|
||||||
|
|
||||||
module.exports = Self => {
|
|
||||||
Self.remoteMethod('sendPois', {
|
|
||||||
description: 'Sends a set of pois',
|
|
||||||
accessType: 'WRITE',
|
|
||||||
accepts: [{
|
|
||||||
arg: 'tickets',
|
|
||||||
type: ['number'],
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
returns: {
|
|
||||||
type: 'string',
|
|
||||||
root: true
|
|
||||||
},
|
|
||||||
http: {
|
|
||||||
path: `/sendPois`,
|
|
||||||
verb: 'POST'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
Self.sendPois = async tickets => {
|
|
||||||
const config = await Self.app.models.QuadmindsApiConfig.findOne();
|
|
||||||
if (!config) throw new UserError('Config params not set');
|
|
||||||
|
|
||||||
if (tickets.length > config.maxObjects)
|
|
||||||
throw new UserError(`Quadminds does not support more than ${config.maxObjects} tickets`);
|
|
||||||
|
|
||||||
let pois = await Self.rawSql(`
|
|
||||||
WITH deliveryNotes AS (
|
|
||||||
SELECT t.id, t.routeFk, tn.description
|
|
||||||
FROM ticket t
|
|
||||||
JOIN ticketObservation tn ON tn.ticketFk = t.id
|
|
||||||
JOIN observationType ot ON ot.id = tn.observationTypeFk
|
|
||||||
WHERE ot.code = 'delivery'
|
|
||||||
)
|
|
||||||
SELECT a.id code,
|
|
||||||
c.socialName name,
|
|
||||||
IF(ABS(a.latitude - ROUND(a.latitude)) < 0.000001, NULL, a.latitude) latitude,
|
|
||||||
IF(ABS(a.longitude - ROUND(a.longitude)) < 0.000001, NULL, a.longitude) longitude,
|
|
||||||
a.street,
|
|
||||||
a.city locality,
|
|
||||||
p.name state,
|
|
||||||
co.name country,
|
|
||||||
CONCAT_WS(', ', IFNULL(a.street, ''), IFNULL(a.city, ''), IFNULL(p.name, '')) longAddress,
|
|
||||||
CONCAT(IFNULL(a.mobile, c.mobile)) phoneNumber,
|
|
||||||
dn.description poiDeliveryComments,
|
|
||||||
c.email email
|
|
||||||
FROM ticket t
|
|
||||||
JOIN address a ON a.id = t.addressFk
|
|
||||||
JOIN province p ON p.id = a.provinceFk
|
|
||||||
JOIN country co ON co.id = p.countryFk
|
|
||||||
JOIN client c ON c.id = t.clientFk
|
|
||||||
LEFT JOIN deliveryNotes dn ON dn.id = t.id
|
|
||||||
WHERE t.id IN (?)
|
|
||||||
GROUP BY t.id
|
|
||||||
`, [tickets]);
|
|
||||||
|
|
||||||
// Transformo code en string ya que lo obtenermos como integer
|
|
||||||
pois = pois.map(poi => {
|
|
||||||
return {
|
|
||||||
...poi,
|
|
||||||
code: poi.code.toString(),
|
|
||||||
latitude: poi.latitude || undefined,
|
|
||||||
longitude: poi.longitude || undefined,
|
|
||||||
address: {
|
|
||||||
street: poi.street || undefined,
|
|
||||||
locality: poi.locality || undefined,
|
|
||||||
state: poi.state || undefined,
|
|
||||||
country: poi.country || undefined
|
|
||||||
},
|
|
||||||
poiDeliveryComments: poi.poiDeliveryComments || undefined,
|
|
||||||
phoneNumber: poi.phoneNumber || undefined,
|
|
||||||
email: poi.email || undefined
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
await axios.post(`${config.url}pois`, pois, {
|
|
||||||
headers: {
|
|
||||||
'Accept': 'application/json',
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
'X-Saas-Apikey': config.key
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
};
|
|
|
@ -22,7 +22,7 @@ module.exports = Self => {
|
||||||
const url = await Self.app.models.Url.findOne({
|
const url = await Self.app.models.Url.findOne({
|
||||||
where: {
|
where: {
|
||||||
appName,
|
appName,
|
||||||
environment: process.env.NODE_ENV || 'dev'
|
environment: process.env.NODE_ENV || 'development'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return url?.url;
|
return url?.url;
|
||||||
|
|
|
@ -10,10 +10,10 @@ describe('workerActivity insert()', () => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await models.WorkerActivityType.create(
|
await models.WorkerActivityType.create(
|
||||||
{'code': 'STOP', 'description': 'STOP'}, options
|
{'code': 'TEST', 'description': 'TEST'}, options
|
||||||
);
|
);
|
||||||
|
|
||||||
await models.WorkerActivity.add(ctx, 'STOP', 'APP', options);
|
await models.WorkerActivity.add(ctx, 'TEST', 'APP', options);
|
||||||
|
|
||||||
count = await models.WorkerActivity.count(
|
count = await models.WorkerActivity.count(
|
||||||
{'workerFK': 1106}, options
|
{'workerFK': 1106}, options
|
||||||
|
|
|
@ -121,18 +121,21 @@
|
||||||
"Province": {
|
"Province": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
"QuadmindsApiConfig": {
|
|
||||||
"dataSource": "vn"
|
|
||||||
},
|
|
||||||
"Autonomy": {
|
"Autonomy": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
"Payment": {
|
"Payment": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
"PbxConfig": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
"Postcode": {
|
"Postcode": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
"Prefix": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
"ReferenceRate": {
|
"ReferenceRate": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
|
|
@ -14,9 +14,6 @@
|
||||||
},
|
},
|
||||||
"itemFk": {
|
"itemFk": {
|
||||||
"type": "number"
|
"type": "number"
|
||||||
},
|
|
||||||
"isChecked": {
|
|
||||||
"type": "boolean"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,27 @@
|
||||||
|
{
|
||||||
|
"name": "PbxConfig",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "pbx.config"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"id": {
|
||||||
|
"type": "number",
|
||||||
|
"id": true
|
||||||
|
},
|
||||||
|
"defaultPrefix": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"acls": [
|
||||||
|
{
|
||||||
|
"property": "*",
|
||||||
|
"accessType": "READ",
|
||||||
|
"principalType": "ROLE",
|
||||||
|
"principalId": "employee",
|
||||||
|
"permission": "ALLOW"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,27 @@
|
||||||
|
{
|
||||||
|
"name": "Prefix",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "pbx.prefix"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"country": {
|
||||||
|
"type": "string",
|
||||||
|
"id": true
|
||||||
|
},
|
||||||
|
"prefix": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"acls": [
|
||||||
|
{
|
||||||
|
"property": "*",
|
||||||
|
"accessType": "READ",
|
||||||
|
"principalType": "ROLE",
|
||||||
|
"principalId": "employee",
|
||||||
|
"permission": "ALLOW"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -20,6 +20,9 @@
|
||||||
},
|
},
|
||||||
"backupPrinterNotificationDelay": {
|
"backupPrinterNotificationDelay": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
},
|
||||||
|
"itemOrderReviewHours": {
|
||||||
|
"type": "number"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,4 +0,0 @@
|
||||||
module.exports = Self => {
|
|
||||||
require('../methods/quadminds-api-config/sendPois')(Self);
|
|
||||||
require('../methods/quadminds-api-config/sendOrders')(Self);
|
|
||||||
};
|
|
|
@ -1,34 +0,0 @@
|
||||||
{
|
|
||||||
"name": "QuadmindsApiConfig",
|
|
||||||
"base": "VnModel",
|
|
||||||
"options": {
|
|
||||||
"mysql": {
|
|
||||||
"table": "quadmindsApiConfig"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"properties": {
|
|
||||||
"id": {
|
|
||||||
"type": "number",
|
|
||||||
"id": true,
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
"url": {
|
|
||||||
"type": "string"
|
|
||||||
},
|
|
||||||
"key": {
|
|
||||||
"type": "string"
|
|
||||||
},
|
|
||||||
"maxObjects": {
|
|
||||||
"type": "number"
|
|
||||||
},
|
|
||||||
"limit": {
|
|
||||||
"type": "number"
|
|
||||||
},
|
|
||||||
"orderTimeFrom": {
|
|
||||||
"type": "string"
|
|
||||||
},
|
|
||||||
"orderTimeTo": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -9,7 +9,7 @@
|
||||||
},
|
},
|
||||||
"vn": {
|
"vn": {
|
||||||
"view": {
|
"view": {
|
||||||
"expeditionPallet_Print": "99f75145ac2e7b612a6d71e74b6e55f194a465780fd9875a15eb01e6596b447e"
|
"expeditionPallet_Print": "04fc5f2967ce53bfbb85f7f48b9a3dca4a4f7111ac41e1775f4cc7d6538774b2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ USE `util`;
|
||||||
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
||||||
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
||||||
|
|
||||||
INSERT INTO `version` VALUES ('vn-database','11311','315864403260623fede9f0471ef3d9036faf23b1','2024-11-12 08:00:59','11336');
|
INSERT INTO `version` VALUES ('vn-database','11377','d3fe5098277c3935c434838b53facb271f84ebec','2024-12-10 07:22:33','11379');
|
||||||
|
|
||||||
INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
|
INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
|
||||||
INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
|
INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
|
||||||
|
@ -1065,11 +1065,70 @@ INSERT INTO `versionLog` VALUES ('vn-database','11290','00-firstScript.sql','jen
|
||||||
INSERT INTO `versionLog` VALUES ('vn-database','11291','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-17 09:10:30',NULL,NULL);
|
INSERT INTO `versionLog` VALUES ('vn-database','11291','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-17 09:10:30',NULL,NULL);
|
||||||
INSERT INTO `versionLog` VALUES ('vn-database','11294','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:37',NULL,NULL);
|
INSERT INTO `versionLog` VALUES ('vn-database','11294','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:37',NULL,NULL);
|
||||||
INSERT INTO `versionLog` VALUES ('vn-database','11295','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-10 08:45:13',NULL,NULL);
|
INSERT INTO `versionLog` VALUES ('vn-database','11295','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-10 08:45:13',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11297','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:29',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11297','01-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
INSERT INTO `versionLog` VALUES ('vn-database','11298','00-closure.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:37',NULL,NULL);
|
INSERT INTO `versionLog` VALUES ('vn-database','11298','00-closure.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:37',NULL,NULL);
|
||||||
INSERT INTO `versionLog` VALUES ('vn-database','11300','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-18 08:27:05',NULL,NULL);
|
INSERT INTO `versionLog` VALUES ('vn-database','11300','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-18 08:27:05',NULL,NULL);
|
||||||
INSERT INTO `versionLog` VALUES ('vn-database','11302','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:57',NULL,NULL);
|
INSERT INTO `versionLog` VALUES ('vn-database','11302','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:57',NULL,NULL);
|
||||||
INSERT INTO `versionLog` VALUES ('vn-database','11308','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-23 12:41:55',NULL,NULL);
|
INSERT INTO `versionLog` VALUES ('vn-database','11308','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-23 12:41:55',NULL,NULL);
|
||||||
INSERT INTO `versionLog` VALUES ('vn-database','11311','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:57',NULL,NULL);
|
INSERT INTO `versionLog` VALUES ('vn-database','11311','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:57',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11312','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11314','00-restrictedAsterisk.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11315','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11316','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11317','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11319','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11321','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11322','00-entryAcl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11324','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-13 10:49:47',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11325','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11326','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11330','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11331','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11332','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11336','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11337','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11338','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 09:14:12',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11339','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11341','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11342','00-itemShelving.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:06:34',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11342','01-itemShelving.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:06:35',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11342','02-itemShelving.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:06:37',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11342','03-itemShelving.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:07',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11342','04-itemShelvingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:07',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11342','05-itemShelvingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:07',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11342','06-itemShelvingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:07',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11343','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:07',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11344','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-13 17:36:45',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11344','01-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-13 17:46:26',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11345','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:08',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11346','00-address.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:15:02',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11346','01-client.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:16:29',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11346','02-supplier.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:27:57',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11347','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:27:57',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11348','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11349','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11350','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11351','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11353','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11354','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11355','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11357','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:16',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11358','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:21',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11359','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11362','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-28 08:52:33',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11363','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11366','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11367','00-deprecate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11369','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:05',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11371','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:05',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11371','01-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:47',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11371','02-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:22:29',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11371','03-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:22:31',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11372','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-09 13:30:30',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11373','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-02 16:09:01',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11375','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-03 08:58:20',NULL,NULL);
|
||||||
|
INSERT INTO `versionLog` VALUES ('vn-database','11377','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:22:31',NULL,NULL);
|
||||||
|
|
||||||
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
|
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
|
||||||
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
||||||
|
@ -1627,7 +1686,6 @@ INSERT INTO `ACL` VALUES (209,'Ticket','recalculateComponents','WRITE','ALLOW','
|
||||||
INSERT INTO `ACL` VALUES (211,'TravelLog','*','READ','ALLOW','ROLE','buyer',NULL);
|
INSERT INTO `ACL` VALUES (211,'TravelLog','*','READ','ALLOW','ROLE','buyer',NULL);
|
||||||
INSERT INTO `ACL` VALUES (212,'Thermograph','*','*','ALLOW','ROLE','buyer',NULL);
|
INSERT INTO `ACL` VALUES (212,'Thermograph','*','*','ALLOW','ROLE','buyer',NULL);
|
||||||
INSERT INTO `ACL` VALUES (213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer',NULL);
|
INSERT INTO `ACL` VALUES (213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer',NULL);
|
||||||
INSERT INTO `ACL` VALUES (214,'Entry','*','*','ALLOW','ROLE','buyer',NULL);
|
|
||||||
INSERT INTO `ACL` VALUES (216,'TravelThermograph','*','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (216,'TravelThermograph','*','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (218,'Intrastat','*','*','ALLOW','ROLE','buyer',NULL);
|
INSERT INTO `ACL` VALUES (218,'Intrastat','*','*','ALLOW','ROLE','buyer',NULL);
|
||||||
INSERT INTO `ACL` VALUES (221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','guest',NULL);
|
INSERT INTO `ACL` VALUES (221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','guest',NULL);
|
||||||
|
@ -1656,7 +1714,6 @@ INSERT INTO `ACL` VALUES (258,'PayDem','*','READ','ALLOW','ROLE','employee',NULL
|
||||||
INSERT INTO `ACL` VALUES (259,'Client','createReceipt','*','ALLOW','ROLE','salesAssistant',NULL);
|
INSERT INTO `ACL` VALUES (259,'Client','createReceipt','*','ALLOW','ROLE','salesAssistant',NULL);
|
||||||
INSERT INTO `ACL` VALUES (260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (261,'SupplierAccount','*','WRITE','ALLOW','ROLE','administrative',783);
|
INSERT INTO `ACL` VALUES (261,'SupplierAccount','*','WRITE','ALLOW','ROLE','administrative',783);
|
||||||
INSERT INTO `ACL` VALUES (262,'Entry','*','*','ALLOW','ROLE','administrative',NULL);
|
|
||||||
INSERT INTO `ACL` VALUES (263,'InvoiceIn','*','READ','ALLOW','ROLE','administrative',NULL);
|
INSERT INTO `ACL` VALUES (263,'InvoiceIn','*','READ','ALLOW','ROLE','administrative',NULL);
|
||||||
INSERT INTO `ACL` VALUES (264,'StarredModule','*','*','ALLOW','ROLE','$authenticated',NULL);
|
INSERT INTO `ACL` VALUES (264,'StarredModule','*','*','ALLOW','ROLE','$authenticated',NULL);
|
||||||
INSERT INTO `ACL` VALUES (265,'ItemBotanical','*','WRITE','ALLOW','ROLE','logisticBoss',NULL);
|
INSERT INTO `ACL` VALUES (265,'ItemBotanical','*','WRITE','ALLOW','ROLE','logisticBoss',NULL);
|
||||||
|
@ -1973,13 +2030,11 @@ INSERT INTO `ACL` VALUES (605,'Ticket','sendSms','WRITE','ALLOW','ROLE','employe
|
||||||
INSERT INTO `ACL` VALUES (606,'Ticket','isLocked','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (606,'Ticket','isLocked','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (607,'Ticket','freightCost','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (607,'Ticket','freightCost','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (608,'Ticket','getComponentsSum','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (608,'Ticket','getComponentsSum','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (609,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','delivery',NULL);
|
INSERT INTO `ACL` VALUES (609,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','delivery',19295);
|
||||||
INSERT INTO `ACL` VALUES (610,'Ticket','deliveryNoteCsv','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (610,'Ticket','deliveryNoteCsv','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (611,'State','find','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (611,'State','find','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (612,'State','findById','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (612,'State','findById','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (613,'State','findOne','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (613,'State','findOne','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (614,'Worker','find','READ','ALLOW','ROLE','employee',NULL);
|
|
||||||
INSERT INTO `ACL` VALUES (616,'Worker','findOne','READ','ALLOW','ROLE','employee',NULL);
|
|
||||||
INSERT INTO `ACL` VALUES (617,'Worker','filter','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (617,'Worker','filter','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (618,'Worker','getWorkedHours','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (618,'Worker','getWorkedHours','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (619,'Worker','active','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (619,'Worker','active','READ','ALLOW','ROLE','employee',NULL);
|
||||||
|
@ -2045,7 +2100,6 @@ INSERT INTO `ACL` VALUES (716,'ExpeditionMistake','*','WRITE','ALLOW','ROLE','em
|
||||||
INSERT INTO `ACL` VALUES (717,'WorkerMistake','*','WRITE','ALLOW','ROLE','coolerAssist',NULL);
|
INSERT INTO `ACL` VALUES (717,'WorkerMistake','*','WRITE','ALLOW','ROLE','coolerAssist',NULL);
|
||||||
INSERT INTO `ACL` VALUES (718,'MistakesTypes','*','WRITE','ALLOW','ROLE','coolerAssist',NULL);
|
INSERT INTO `ACL` VALUES (718,'MistakesTypes','*','WRITE','ALLOW','ROLE','coolerAssist',NULL);
|
||||||
INSERT INTO `ACL` VALUES (719,'MistakeType','*','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (719,'MistakeType','*','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (720,'MachineWorker','*','READ','ALLOW','ROLE','coolerAssist',NULL);
|
|
||||||
INSERT INTO `ACL` VALUES (721,'Printer','*','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (721,'Printer','*','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (722,'SaleMistake','*','WRITE','ALLOW','ROLE','production',NULL);
|
INSERT INTO `ACL` VALUES (722,'SaleMistake','*','WRITE','ALLOW','ROLE','production',NULL);
|
||||||
INSERT INTO `ACL` VALUES (723,'Item','setVisibleDiscard','WRITE','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (723,'Item','setVisibleDiscard','WRITE','ALLOW','ROLE','employee',NULL);
|
||||||
|
@ -2083,13 +2137,10 @@ INSERT INTO `ACL` VALUES (755,'Route','findById','READ','ALLOW','ROLE','employee
|
||||||
INSERT INTO `ACL` VALUES (756,'Route','findOne','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (756,'Route','findOne','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (757,'Route','getRoutesByWorker','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (757,'Route','getRoutesByWorker','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (758,'Route','canViewAllRoute','READ','ALLOW','ROLE','deliveryAssistant',NULL);
|
INSERT INTO `ACL` VALUES (758,'Route','canViewAllRoute','READ','ALLOW','ROLE','deliveryAssistant',NULL);
|
||||||
INSERT INTO `ACL` VALUES (759,'Route','cmr','READ','ALLOW','ROLE','employee',NULL);
|
|
||||||
INSERT INTO `ACL` VALUES (760,'Cmr','downloadZip','READ','ALLOW','ROLE','employee',NULL);
|
|
||||||
INSERT INTO `ACL` VALUES (761,'Route','downloadZip','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (761,'Route','downloadZip','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (762,'Route','filter','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (762,'Route','filter','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (763,'Route','getByWorker','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (763,'Route','getByWorker','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (764,'Route','getDeliveryPoint','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (764,'Route','getDeliveryPoint','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (765,'Route','cmrs','READ','ALLOW','ROLE','employee',NULL);
|
|
||||||
INSERT INTO `ACL` VALUES (766,'Route','getSuggestedTickets','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (766,'Route','getSuggestedTickets','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (767,'Route','getTickets','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (767,'Route','getTickets','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (768,'Route','guessPriority','WRITE','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (768,'Route','guessPriority','WRITE','ALLOW','ROLE','employee',NULL);
|
||||||
|
@ -2130,7 +2181,6 @@ INSERT INTO `ACL` VALUES (802,'MailAliasAccount','deleteById','WRITE','ALLOW','R
|
||||||
INSERT INTO `ACL` VALUES (804,'DeviceProduction','*','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (804,'DeviceProduction','*','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (805,'Collection','assign','WRITE','ALLOW','ROLE','production',NULL);
|
INSERT INTO `ACL` VALUES (805,'Collection','assign','WRITE','ALLOW','ROLE','production',NULL);
|
||||||
INSERT INTO `ACL` VALUES (806,'ExpeditionPallet','getPallet','READ','ALLOW','ROLE','production',NULL);
|
INSERT INTO `ACL` VALUES (806,'ExpeditionPallet','getPallet','READ','ALLOW','ROLE','production',NULL);
|
||||||
INSERT INTO `ACL` VALUES (807,'MachineWorker','updateInTime','WRITE','ALLOW','ROLE','production',NULL);
|
|
||||||
INSERT INTO `ACL` VALUES (808,'MobileAppVersionControl','getVersion','READ','ALLOW','ROLE','employee',NULL);
|
INSERT INTO `ACL` VALUES (808,'MobileAppVersionControl','getVersion','READ','ALLOW','ROLE','employee',NULL);
|
||||||
INSERT INTO `ACL` VALUES (809,'SaleTracking','delete','WRITE','ALLOW','ROLE','production',NULL);
|
INSERT INTO `ACL` VALUES (809,'SaleTracking','delete','WRITE','ALLOW','ROLE','production',NULL);
|
||||||
INSERT INTO `ACL` VALUES (810,'SaleTracking','updateTracking','WRITE','ALLOW','ROLE','production',NULL);
|
INSERT INTO `ACL` VALUES (810,'SaleTracking','updateTracking','WRITE','ALLOW','ROLE','production',NULL);
|
||||||
|
@ -2216,9 +2266,9 @@ INSERT INTO `ACL` VALUES (895,'ItemShelvingLog','*','READ','ALLOW','ROLE','produ
|
||||||
INSERT INTO `ACL` VALUES (901,'WorkerTimeControl','sendMail','WRITE','ALLOW','ROLE','system',NULL);
|
INSERT INTO `ACL` VALUES (901,'WorkerTimeControl','sendMail','WRITE','ALLOW','ROLE','system',NULL);
|
||||||
INSERT INTO `ACL` VALUES (902,'Entry','filter','READ','ALLOW','ROLE','supplier',NULL);
|
INSERT INTO `ACL` VALUES (902,'Entry','filter','READ','ALLOW','ROLE','supplier',NULL);
|
||||||
INSERT INTO `ACL` VALUES (903,'Entry','getBuys','READ','ALLOW','ROLE','supplier',NULL);
|
INSERT INTO `ACL` VALUES (903,'Entry','getBuys','READ','ALLOW','ROLE','supplier',NULL);
|
||||||
INSERT INTO `ACL` VALUES (904,'Entry','buyLabel','READ','ALLOW','ROLE','supplier',NULL);
|
INSERT INTO `ACL` VALUES (904,'Entry','buyLabelSupplier','READ','ALLOW','ROLE','supplier',19295);
|
||||||
INSERT INTO `ACL` VALUES (905,'AddressWaste','*','READ','ALLOW','ROLE','production',NULL);
|
INSERT INTO `ACL` VALUES (905,'AddressWaste','*','READ','ALLOW','ROLE','production',NULL);
|
||||||
INSERT INTO `ACL` VALUES (906,'Entry','print','READ','ALLOW','ROLE','supplier',NULL);
|
INSERT INTO `ACL` VALUES (906,'Entry','labelSupplier','READ','ALLOW','ROLE','supplier',19295);
|
||||||
INSERT INTO `ACL` VALUES (907,'Expedition_PrintOut','*','*','ALLOW','ROLE','production',NULL);
|
INSERT INTO `ACL` VALUES (907,'Expedition_PrintOut','*','*','ALLOW','ROLE','production',NULL);
|
||||||
INSERT INTO `ACL` VALUES (908,'Docuware','upload','WRITE','ALLOW','ROLE','hrBuyer',13657);
|
INSERT INTO `ACL` VALUES (908,'Docuware','upload','WRITE','ALLOW','ROLE','hrBuyer',13657);
|
||||||
INSERT INTO `ACL` VALUES (909,'Entry','getBuysCsv','READ','ALLOW','ROLE','supplier',19295);
|
INSERT INTO `ACL` VALUES (909,'Entry','getBuysCsv','READ','ALLOW','ROLE','supplier',19295);
|
||||||
|
@ -2230,7 +2280,6 @@ INSERT INTO `ACL` VALUES (914,'VnToken','killSession','*','ALLOW','ROLE','develo
|
||||||
INSERT INTO `ACL` VALUES (915,'ACL','*','WRITE','ALLOW','ROLE','developerBoss',10578);
|
INSERT INTO `ACL` VALUES (915,'ACL','*','WRITE','ALLOW','ROLE','developerBoss',10578);
|
||||||
INSERT INTO `ACL` VALUES (917,'InvoiceOut','refundAndInvoice','WRITE','ALLOW','ROLE','administrative',10578);
|
INSERT INTO `ACL` VALUES (917,'InvoiceOut','refundAndInvoice','WRITE','ALLOW','ROLE','administrative',10578);
|
||||||
INSERT INTO `ACL` VALUES (918,'Worker','__get__descriptor','READ','ALLOW','ROLE','employee',10578);
|
INSERT INTO `ACL` VALUES (918,'Worker','__get__descriptor','READ','ALLOW','ROLE','employee',10578);
|
||||||
INSERT INTO `ACL` VALUES (919,'Worker','findById','READ','ALLOW','ROLE','employee',10578);
|
|
||||||
INSERT INTO `ACL` VALUES (920,'QuadmindsApiConfig','*','*','ALLOW','ROLE','delivery',19295);
|
INSERT INTO `ACL` VALUES (920,'QuadmindsApiConfig','*','*','ALLOW','ROLE','delivery',19295);
|
||||||
INSERT INTO `ACL` VALUES (922,'SaleGroup','*','WRITE','ALLOW','ROLE','production',19294);
|
INSERT INTO `ACL` VALUES (922,'SaleGroup','*','WRITE','ALLOW','ROLE','production',19294);
|
||||||
INSERT INTO `ACL` VALUES (923,'Worker','__get__advancedSummary','READ','ALLOW','ROLE','hr',10578);
|
INSERT INTO `ACL` VALUES (923,'Worker','__get__advancedSummary','READ','ALLOW','ROLE','hr',10578);
|
||||||
|
@ -2250,6 +2299,76 @@ INSERT INTO `ACL` VALUES (936,'Device','handleUser','*','ALLOW','ROLE','employee
|
||||||
INSERT INTO `ACL` VALUES (937,'WorkerTimeControlMail','count','READ','ALLOW','ROLE','employee',10578);
|
INSERT INTO `ACL` VALUES (937,'WorkerTimeControlMail','count','READ','ALLOW','ROLE','employee',10578);
|
||||||
INSERT INTO `ACL` VALUES (938,'Worker','__get__mail','READ','ALLOW','ROLE','hr',10578);
|
INSERT INTO `ACL` VALUES (938,'Worker','__get__mail','READ','ALLOW','ROLE','hr',10578);
|
||||||
INSERT INTO `ACL` VALUES (939,'Machine','*','*','ALLOW','ROLE','productionBoss',10578);
|
INSERT INTO `ACL` VALUES (939,'Machine','*','*','ALLOW','ROLE','productionBoss',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (940,'ItemTypeLog','find','READ','ALLOW','ROLE','employee',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (941,'Entry','buyLabel','READ','ALLOW','ROLE','employee',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (942,'Cmr','filter','READ','ALLOW','ROLE','production',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (943,'Cmr','downloadZip','READ','ALLOW','ROLE','production',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (944,'Cmr','print','READ','ALLOW','ROLE','production',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (945,'Collection','create','WRITE','ALLOW','ROLE','productionBoss',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (946,'Collection','upsert','WRITE','ALLOW','ROLE','productionBoss',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (947,'Collection','replaceById','WRITE','ALLOW','ROLE','productionBoss',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (948,'Collection','updateAll','WRITE','ALLOW','ROLE','productionBoss',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (949,'Collection','updateAttributes','WRITE','ALLOW','ROLE','productionBoss',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (950,'Collection','deleteById','WRITE','ALLOW','ROLE','productionBoss',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (951,'Collection','destroyAll','WRITE','ALLOW','ROLE','productionBoss',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (952,'Collection','destroyById','WRITE','ALLOW','ROLE','productionBoss',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (953,'RouteAction','find','READ','ALLOW','ROLE','delivery',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (954,'RouteComplement','find','READ','ALLOW','ROLE','delivery',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (955,'RouteComplement','create','WRITE','ALLOW','ROLE','delivery',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (956,'RouteComplement','deleteById','WRITE','ALLOW','ROLE','delivery',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (957,'SaleGroup','find','READ','ALLOW','ROLE','production',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (958,'Worker','canCreateAbsenceInPast','WRITE','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (959,'WorkerRelative','updateAttributes','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (960,'WorkerRelative','crud','WRITE','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (961,'WorkerRelative','findById','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (962,'WorkerRelative','find','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (963,'WorkerRelative','upsert','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (964,'WorkerRelative','filter','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (965,'WorkerIrpf','updateAttributes','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (966,'WorkerIrpf','crud','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (967,'WorkerIrpf','findById','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (968,'WorkerIrpf','find','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (969,'WorkerIrpf','upsert','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (970,'WorkerIrpf','filter','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (971,'DisabilityGrade','updateAttributes','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (972,'DisabilityGrade','crud','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (973,'DisabilityGrade','findById','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (974,'DisabilityGrade','find','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (975,'DisabilityGrade','upsert','*','ALLOW','ROLE','hr',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (976,'Entry','upsert','WRITE','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (977,'Entry','updateAttributes','WRITE','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (978,'Entry','isBooked','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (979,'Entry','findById','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (980,'Entry','find','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (981,'Entry','filter','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (982,'Entry','count','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (983,'Entry','getEntry','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (984,'Entry','getBuys','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (985,'Entry','findOne','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (986,'Entry','deleteBuys','WRITE','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (987,'Entry','editLatestBuys','WRITE','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (988,'Entry','importBuys','WRITE','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (989,'Entry','importBuysPreview','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (990,'Entry','lastItemBuys','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (991,'Entry','latestBuysFilter','READ','ALLOW','ROLE','administrative',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (992,'Entry','upsert','WRITE','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (993,'Entry','updateAttributes','WRITE','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (994,'Entry','findById','READ','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (995,'Entry','find','READ','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (996,'Entry','filter','READ','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (997,'Entry','count','READ','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (998,'Entry','getEntry','READ','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (999,'Entry','getBuys','READ','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (1000,'Entry','findOne','READ','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (1001,'Entry','deleteBuys','WRITE','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (1002,'Entry','editLatestBuys','WRITE','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (1003,'Entry','importBuys','WRITE','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (1004,'Entry','importBuysPreview','READ','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (1005,'Entry','lastItemBuys','READ','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (1006,'Entry','latestBuysFilter','READ','ALLOW','ROLE','buyer',10578);
|
||||||
|
INSERT INTO `ACL` VALUES (1007,'ItemShelving','getItemsByReviewOrder','READ','ALLOW','ROLE','production',19294);
|
||||||
|
INSERT INTO `ACL` VALUES (1008,'Entry','buyLabelSupplier','READ','ALLOW','ROLE','employee',19295);
|
||||||
|
INSERT INTO `ACL` VALUES (1009,'Entry','buyLabel','READ','ALLOW','ROLE','supplier',19295);
|
||||||
|
|
||||||
INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
|
INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
|
||||||
INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
|
INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
|
||||||
|
@ -2424,70 +2543,47 @@ INSERT INTO `cplusTaxBreak` VALUES (7,'E6 - Exenta por otros');
|
||||||
|
|
||||||
INSERT INTO `claimResponsible` VALUES (1,'Compradores',0,'buy');
|
INSERT INTO `claimResponsible` VALUES (1,'Compradores',0,'buy');
|
||||||
INSERT INTO `claimResponsible` VALUES (2,'Proveedor',0,'sup');
|
INSERT INTO `claimResponsible` VALUES (2,'Proveedor',0,'sup');
|
||||||
INSERT INTO `claimResponsible` VALUES (3,'Entradores',0,'ent');
|
|
||||||
INSERT INTO `claimResponsible` VALUES (4,'Camareros',0,'bar');
|
INSERT INTO `claimResponsible` VALUES (4,'Camareros',0,'bar');
|
||||||
INSERT INTO `claimResponsible` VALUES (6,'Sacadores',0,'pic');
|
INSERT INTO `claimResponsible` VALUES (6,'Sacadores',0,'pic');
|
||||||
INSERT INTO `claimResponsible` VALUES (7,'Revisadores',0,'chk');
|
INSERT INTO `claimResponsible` VALUES (7,'Revisadores',0,'chk');
|
||||||
INSERT INTO `claimResponsible` VALUES (8,'Calidad general',0,'qas');
|
|
||||||
INSERT INTO `claimResponsible` VALUES (9,'Encajadores',0,'pck');
|
INSERT INTO `claimResponsible` VALUES (9,'Encajadores',0,'pck');
|
||||||
INSERT INTO `claimResponsible` VALUES (10,'Clima',0,'wea');
|
INSERT INTO `claimResponsible` VALUES (10,'Clima',0,'wea');
|
||||||
INSERT INTO `claimResponsible` VALUES (11,'Comerciales',1,'com');
|
INSERT INTO `claimResponsible` VALUES (11,'Comerciales',1,'com');
|
||||||
INSERT INTO `claimResponsible` VALUES (12,'Clientes',1,'cli');
|
INSERT INTO `claimResponsible` VALUES (12,'Clientes',1,'cli');
|
||||||
INSERT INTO `claimResponsible` VALUES (13,'Administración',0,'adm');
|
|
||||||
INSERT INTO `claimResponsible` VALUES (14,'Agencia',0,'age');
|
INSERT INTO `claimResponsible` VALUES (14,'Agencia',0,'age');
|
||||||
INSERT INTO `claimResponsible` VALUES (15,'Repartidores',0,'del');
|
INSERT INTO `claimResponsible` VALUES (15,'Repartidores',0,'del');
|
||||||
INSERT INTO `claimResponsible` VALUES (16,'Informatica',0,'ite');
|
INSERT INTO `claimResponsible` VALUES (16,'Informatica',0,'ite');
|
||||||
INSERT INTO `claimResponsible` VALUES (17,'Transp.origen',0,'tra');
|
INSERT INTO `claimResponsible` VALUES (17,'Transp.origen',0,'tra');
|
||||||
INSERT INTO `claimResponsible` VALUES (18,'Confeccion',0,'con');
|
INSERT INTO `claimResponsible` VALUES (18,'Confeccion',0,'con');
|
||||||
INSERT INTO `claimResponsible` VALUES (19,'OTROS',0,'oth');
|
INSERT INTO `claimResponsible` VALUES (19,'OTROS',0,'oth');
|
||||||
INSERT INTO `claimResponsible` VALUES (21,'Gerencia',0,'man');
|
|
||||||
INSERT INTO `claimResponsible` VALUES (22,'Paletizadores',0,'pal');
|
INSERT INTO `claimResponsible` VALUES (22,'Paletizadores',0,'pal');
|
||||||
INSERT INTO `claimResponsible` VALUES (23,'Preparación Previa',0,'pre');
|
INSERT INTO `claimResponsible` VALUES (23,'Preparación Previa',0,'pre');
|
||||||
INSERT INTO `claimResponsible` VALUES (24,'Almacén PCA',0,'war');
|
|
||||||
INSERT INTO `claimResponsible` VALUES (25,'Huelga',0,'str');
|
INSERT INTO `claimResponsible` VALUES (25,'Huelga',0,'str');
|
||||||
INSERT INTO `claimResponsible` VALUES (27,'Prep. por caja',0,'');
|
INSERT INTO `claimResponsible` VALUES (27,'Prep. por caja',0,'pbb');
|
||||||
INSERT INTO `claimResponsible` VALUES (45,'Negativo',0,'neg');
|
INSERT INTO `claimResponsible` VALUES (45,'Negativo',0,'neg');
|
||||||
|
|
||||||
INSERT INTO `claimReason` VALUES (1,'Prisas',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (2,'Novato',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (3,'Exceso de confianza',0);
|
INSERT INTO `claimReason` VALUES (3,'Exceso de confianza',0);
|
||||||
INSERT INTO `claimReason` VALUES (4,'Exceso de celo',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (5,'Indiferencia',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (6,'Extraviado o Hurto',0);
|
INSERT INTO `claimReason` VALUES (6,'Extraviado o Hurto',0);
|
||||||
INSERT INTO `claimReason` VALUES (7,'Incompetencia',0);
|
INSERT INTO `claimReason` VALUES (7,'Incompetencia',0);
|
||||||
INSERT INTO `claimReason` VALUES (8,'Ubicación erronea',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (9,'Dat.Inctos/Pak.conf',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (10,'Datos duplicados',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (11,'Fallo stock',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (12,'Innovación',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (13,'Distracción',1);
|
INSERT INTO `claimReason` VALUES (13,'Distracción',1);
|
||||||
INSERT INTO `claimReason` VALUES (15,'Portes indebidos',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (16,'Baja calidad',0);
|
INSERT INTO `claimReason` VALUES (16,'Baja calidad',0);
|
||||||
INSERT INTO `claimReason` VALUES (17,'Defectuoso',0);
|
INSERT INTO `claimReason` VALUES (17,'Defectuoso',0);
|
||||||
INSERT INTO `claimReason` VALUES (19,'Endiñado',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (20,'Calor',0);
|
INSERT INTO `claimReason` VALUES (20,'Calor',0);
|
||||||
INSERT INTO `claimReason` VALUES (21,'Frio',0);
|
INSERT INTO `claimReason` VALUES (21,'Frio',0);
|
||||||
INSERT INTO `claimReason` VALUES (22,'Cambiado',0);
|
INSERT INTO `claimReason` VALUES (22,'Cambiado',0);
|
||||||
INSERT INTO `claimReason` VALUES (24,'Cansancio',1);
|
|
||||||
INSERT INTO `claimReason` VALUES (25,'Mal etiquetado',1);
|
INSERT INTO `claimReason` VALUES (25,'Mal etiquetado',1);
|
||||||
INSERT INTO `claimReason` VALUES (26,'Cantidad malentendido',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (30,'No revisado',1);
|
|
||||||
INSERT INTO `claimReason` VALUES (34,'Error fotografia',0);
|
INSERT INTO `claimReason` VALUES (34,'Error fotografia',0);
|
||||||
INSERT INTO `claimReason` VALUES (40,'Fallo Personal VN',0);
|
INSERT INTO `claimReason` VALUES (40,'Fallo Personal VN',0);
|
||||||
INSERT INTO `claimReason` VALUES (41,'Fallo Personal Cliente',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (42,'Otros',0);
|
INSERT INTO `claimReason` VALUES (42,'Otros',0);
|
||||||
INSERT INTO `claimReason` VALUES (43,'Precio alto',0);
|
INSERT INTO `claimReason` VALUES (43,'Precio alto',0);
|
||||||
INSERT INTO `claimReason` VALUES (44,'Abuso de confianza',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (45,'Retraso Agencia',0);
|
INSERT INTO `claimReason` VALUES (45,'Retraso Agencia',0);
|
||||||
INSERT INTO `claimReason` VALUES (46,'Delicado',0);
|
INSERT INTO `claimReason` VALUES (46,'Delicado',0);
|
||||||
INSERT INTO `claimReason` VALUES (47,'Seco',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (48,'Retraso Reparto',0);
|
INSERT INTO `claimReason` VALUES (48,'Retraso Reparto',0);
|
||||||
INSERT INTO `claimReason` VALUES (49,'Mal Embalado',0);
|
INSERT INTO `claimReason` VALUES (49,'Mal Embalado',0);
|
||||||
INSERT INTO `claimReason` VALUES (50,'Tumbado',0);
|
INSERT INTO `claimReason` VALUES (50,'Tumbado',0);
|
||||||
INSERT INTO `claimReason` VALUES (51,'Enfermo/Plaga',0);
|
INSERT INTO `claimReason` VALUES (51,'Enfermo/Plaga',0);
|
||||||
INSERT INTO `claimReason` VALUES (52,'Mala gestión comercial',0);
|
INSERT INTO `claimReason` VALUES (52,'Mala gestión comercial',0);
|
||||||
INSERT INTO `claimReason` VALUES (53,'Mala gestión comprador',0);
|
INSERT INTO `claimReason` VALUES (53,'Mala gestión comprador',0);
|
||||||
INSERT INTO `claimReason` VALUES (54,'A2',0);
|
|
||||||
INSERT INTO `claimReason` VALUES (55,'Entrega 48h o más',0);
|
INSERT INTO `claimReason` VALUES (55,'Entrega 48h o más',0);
|
||||||
INSERT INTO `claimReason` VALUES (56,'Error cliente',0);
|
INSERT INTO `claimReason` VALUES (56,'Error cliente',0);
|
||||||
INSERT INTO `claimReason` VALUES (57,'A2/B1',0);
|
INSERT INTO `claimReason` VALUES (57,'A2/B1',0);
|
||||||
|
@ -2501,7 +2597,6 @@ INSERT INTO `claimRedelivery` VALUES (5,'Tour');
|
||||||
INSERT INTO `claimRedelivery` VALUES (6,'Fuera Peninsula');
|
INSERT INTO `claimRedelivery` VALUES (6,'Fuera Peninsula');
|
||||||
INSERT INTO `claimRedelivery` VALUES (7,'Francia');
|
INSERT INTO `claimRedelivery` VALUES (7,'Francia');
|
||||||
|
|
||||||
INSERT INTO `claimResult` VALUES (1,'Otros daños');
|
|
||||||
INSERT INTO `claimResult` VALUES (2,'Roces');
|
INSERT INTO `claimResult` VALUES (2,'Roces');
|
||||||
INSERT INTO `claimResult` VALUES (3,'Humedad');
|
INSERT INTO `claimResult` VALUES (3,'Humedad');
|
||||||
INSERT INTO `claimResult` VALUES (4,'Deshidratacion');
|
INSERT INTO `claimResult` VALUES (4,'Deshidratacion');
|
||||||
|
@ -2510,26 +2605,20 @@ INSERT INTO `claimResult` VALUES (6,'Incompleto (Faltas)');
|
||||||
INSERT INTO `claimResult` VALUES (7,'Error packing');
|
INSERT INTO `claimResult` VALUES (7,'Error packing');
|
||||||
INSERT INTO `claimResult` VALUES (8,'Error color');
|
INSERT INTO `claimResult` VALUES (8,'Error color');
|
||||||
INSERT INTO `claimResult` VALUES (9,'Error medida');
|
INSERT INTO `claimResult` VALUES (9,'Error medida');
|
||||||
INSERT INTO `claimResult` VALUES (10,'Error origen');
|
|
||||||
INSERT INTO `claimResult` VALUES (11,'Envejecido');
|
INSERT INTO `claimResult` VALUES (11,'Envejecido');
|
||||||
INSERT INTO `claimResult` VALUES (12,'Venta Perdida');
|
|
||||||
INSERT INTO `claimResult` VALUES (13,'Duplicacion');
|
INSERT INTO `claimResult` VALUES (13,'Duplicacion');
|
||||||
INSERT INTO `claimResult` VALUES (14,'Rechazado');
|
INSERT INTO `claimResult` VALUES (14,'Rechazado');
|
||||||
INSERT INTO `claimResult` VALUES (15,'Rotura');
|
INSERT INTO `claimResult` VALUES (15,'Rotura');
|
||||||
INSERT INTO `claimResult` VALUES (16,'Deterioro/Estropeado');
|
INSERT INTO `claimResult` VALUES (16,'Deterioro/Estropeado');
|
||||||
INSERT INTO `claimResult` VALUES (17,'Podrido');
|
INSERT INTO `claimResult` VALUES (17,'Podrido');
|
||||||
INSERT INTO `claimResult` VALUES (18,'Baboso');
|
|
||||||
INSERT INTO `claimResult` VALUES (19,'Cocido');
|
|
||||||
INSERT INTO `claimResult` VALUES (20,'Congelado');
|
INSERT INTO `claimResult` VALUES (20,'Congelado');
|
||||||
INSERT INTO `claimResult` VALUES (21,'Machacado');
|
INSERT INTO `claimResult` VALUES (21,'Machacado');
|
||||||
INSERT INTO `claimResult` VALUES (22,'Error precio');
|
|
||||||
INSERT INTO `claimResult` VALUES (23,'Manchado');
|
INSERT INTO `claimResult` VALUES (23,'Manchado');
|
||||||
INSERT INTO `claimResult` VALUES (24,'No entregado');
|
INSERT INTO `claimResult` VALUES (24,'No entregado');
|
||||||
INSERT INTO `claimResult` VALUES (25,'Cobro indebido');
|
|
||||||
INSERT INTO `claimResult` VALUES (26,'Decepcion/Esperaba mas');
|
INSERT INTO `claimResult` VALUES (26,'Decepcion/Esperaba mas');
|
||||||
INSERT INTO `claimResult` VALUES (27,'Otros');
|
INSERT INTO `claimResult` VALUES (27,'Otros');
|
||||||
INSERT INTO `claimResult` VALUES (28,'Baboso/Cocido');
|
INSERT INTO `claimResult` VALUES (28,'Baboso/Cocido');
|
||||||
INSERT INTO `claimResult` VALUES (29,'Video Camara');
|
INSERT INTO `claimResult` VALUES (29,'Videocámaras');
|
||||||
|
|
||||||
INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices',0);
|
INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices',0);
|
||||||
INSERT INTO `component` VALUES (14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay',0);
|
INSERT INTO `component` VALUES (14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay',0);
|
||||||
|
@ -2577,64 +2666,71 @@ INSERT INTO `continent` VALUES (3,'África','AF');
|
||||||
INSERT INTO `continent` VALUES (4,'Europa','EU');
|
INSERT INTO `continent` VALUES (4,'Europa','EU');
|
||||||
INSERT INTO `continent` VALUES (5,'Oceanía','OC');
|
INSERT INTO `continent` VALUES (5,'Oceanía','OC');
|
||||||
|
|
||||||
INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,116,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,130,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,5,NULL,72,0,0,1,1,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,5,NULL,72,0,0,1,1,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (23,'CMA','CAMARA',15,16,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,'PREVIOUS');
|
INSERT INTO `department` VALUES (23,'CMA','CAMARA',15,16,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,'PREVIOUS');
|
||||||
INSERT INTO `department` VALUES (31,'it','INFORMATICA',6,7,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (31,'it','INFORMATICA',6,7,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (35,'finance','FINANZAS',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (35,'finance','FINANZAS',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (36,'labor','LABORAL',12,13,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (36,'labor','LABORAL',12,13,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',14,37,NULL,72,1,1,1,11,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',14,37,NULL,72,1,1,1,11,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (38,'picking','SACADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,1,NULL,NULL,NULL,'ON_PREPARATION');
|
INSERT INTO `department` VALUES (38,'picking','SACADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,1,NULL,NULL,NULL,'ON_PREPARATION');
|
||||||
INSERT INTO `department` VALUES (39,'packing','ENCAJADO',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PACKING');
|
INSERT INTO `department` VALUES (39,'packing','ENCAJADO',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PACKING');
|
||||||
INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',38,39,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',38,39,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (43,'VT','VENTAS',40,75,NULL,0,0,0,1,17,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (43,'VT','VENTAS',40,89,NULL,0,0,0,1,24,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (44,'management','GERENCIA',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (44,'management','GERENCIA',90,91,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',92,93,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (46,'delivery','REPARTO',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
|
INSERT INTO `department` VALUES (46,'delivery','REPARTO',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
|
||||||
INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',82,83,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
|
INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',96,97,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
|
||||||
INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',84,85,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',86,87,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',100,101,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',41,42,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',41,42,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',88,89,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',21,22,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',21,22,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',23,24,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',23,24,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (58,'CMP','CAMPOS',90,93,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
|
INSERT INTO `department` VALUES (58,'CMP','CAMPOS',104,107,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
|
||||||
INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',108,109,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',43,44,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'CLAIM');
|
INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',43,44,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'CLAIM');
|
||||||
INSERT INTO `department` VALUES (61,NULL,'VNH',96,99,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (61,NULL,'VNH',110,113,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',100,101,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',114,115,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',25,26,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',25,26,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',102,103,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',116,117,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (80,'spainTeam5','EQUIPO ESPAÑA 5',45,46,4250,0,0,0,2,0,43,'/1/43/','es5_equipo',1,'es5@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
|
INSERT INTO `department` VALUES (80,'spainTeam5','EQUIPO ESPAÑA 5',45,46,4250,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',104,105,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',118,119,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (89,NULL,'COORDINACION',106,107,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (89,NULL,'COORDINACION',120,121,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (90,NULL,'TRAILER',97,98,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (90,NULL,'TRAILER',111,112,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',27,28,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PREVIOUS');
|
INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',27,28,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PREVIOUS');
|
||||||
INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',47,48,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',47,48,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',49,50,3797,0,0,0,2,0,43,'/1/43/','es2_equipo',1,'es2@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
|
INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',49,50,3797,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',51,52,24065,0,0,0,2,0,43,'/1/43/','es1_equipo',1,'es1@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
|
INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',51,52,24065,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',53,54,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',53,54,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',55,56,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',55,56,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',57,58,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',57,58,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',108,109,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',122,123,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',59,60,1118,0,0,0,2,0,43,'/1/43/','es3_equipo',1,'es3@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
|
INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',59,60,1118,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PALLETIZING');
|
INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PALLETIZING');
|
||||||
INSERT INTO `department` VALUES (130,NULL,'REVISION',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_CHECKING');
|
INSERT INTO `department` VALUES (130,NULL,'REVISION',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_CHECKING');
|
||||||
INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',91,92,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',105,106,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',61,62,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',61,62,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (133,'franceTeam','EQUIPO FRANCIA',63,64,1731,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'gestionfrancia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
|
INSERT INTO `department` VALUES (133,'franceTeamManagement','EQUIPO GESTIÓN FRANCIA',63,64,9751,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'gestionfrancia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
|
||||||
INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',65,66,6264,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500',NULL);
|
INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',65,66,8964,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500',NULL);
|
||||||
INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',110,111,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',124,125,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',112,113,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',126,127,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (137,'sorter','SORTER',114,115,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (137,'sorter','SORTER',128,129,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (139,'spainTeam4','EQUIPO ESPAÑA 4',67,68,3803,0,0,0,2,0,43,'/1/43/','es4_equipo',1,'es4@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
|
INSERT INTO `department` VALUES (139,'spainTeam4','EQUIPO ESPAÑA 4',67,68,3803,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (140,'internationalTeam','EQUIPO INTERNACIONAL',69,70,33320,0,0,0,2,0,43,'/1/43/','int_equipo',1,'international@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (140,'internationalTeam','EQUIPO INTERNACIONAL',69,70,24065,0,0,0,2,0,43,'/1/43/','int_equipo',1,'international@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (141,NULL,'PREVIA',35,36,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PREVIOUS');
|
INSERT INTO `department` VALUES (141,NULL,'PREVIA',35,36,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PREVIOUS');
|
||||||
INSERT INTO `department` VALUES (146,NULL,'VERDNACOLOMBIA',3,4,NULL,72,0,0,2,0,22,'/1/22/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
INSERT INTO `department` VALUES (146,NULL,'VERDNACOLOMBIA',3,4,NULL,72,0,0,2,0,22,'/1/22/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',71,72,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',0,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);
|
INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',71,72,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',1,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);
|
||||||
INSERT INTO `department` VALUES (148,NULL,'CAPTATION FRANCIA',73,74,NULL,0,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,0,0,0,NULL,NULL,'6000',NULL);
|
INSERT INTO `department` VALUES (148,'franceTeamCatchment','EQUIPO CAPTACIÓN FRANCIA',73,74,25178,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,'6000',NULL);
|
||||||
|
INSERT INTO `department` VALUES (149,'spainTeamCatchment','EQUIPO ESPAÑA CAPTACIÓN',75,76,1203,0,0,0,2,0,43,'/1/43/','es_captacion_equipo',1,'es_captacion@verdnatura.es',0,0,0,0,NULL,NULL,'5700',NULL);
|
||||||
|
INSERT INTO `department` VALUES (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE/ISLAS',77,78,1118,0,0,0,2,0,43,'/1/43/','es_levanteislas_equipo',1,'levanteislas.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5000',NULL);
|
||||||
|
INSERT INTO `department` VALUES (151,'spainTeamNorthwest','EQUIPO ESPAÑA NOROESTE',79,80,7102,0,0,0,2,0,43,'/1/43/','es_noroeste_equipo',1,'noroeste.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5300',NULL);
|
||||||
|
INSERT INTO `department` VALUES (152,'spainTeamNortheast','EQUIPO ESPAÑA NORESTE',81,82,1118,0,0,0,2,0,43,'/1/43/','es_noreste_equipo',1,'noreste.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5200',NULL);
|
||||||
|
INSERT INTO `department` VALUES (153,'spainTeamSouth','EQUIPO ESPAÑA SUR',83,84,36578,0,0,0,2,0,43,'/1/43/','es_sur_equipo',1,'sur.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5400',NULL);
|
||||||
|
INSERT INTO `department` VALUES (154,'spainTeamCenter','EQUIPO ESPAÑA CENTRO',85,86,4661,0,0,0,2,0,43,'/1/43/','es_centro_equipo',1,'centro.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5100',NULL);
|
||||||
|
INSERT INTO `department` VALUES (155,'spainTeamVip','EQUIPO ESPAÑA VIP',87,88,5432,0,0,0,2,0,43,'/1/43/','es_vip_equipo',1,'vip.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5600',NULL);
|
||||||
|
|
||||||
INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
|
INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
|
||||||
INSERT INTO `docuware` VALUES (2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL);
|
INSERT INTO `docuware` VALUES (2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL);
|
||||||
|
@ -2736,7 +2832,6 @@ INSERT INTO `state` VALUES (7,'Sin Acabar',1,0,'NOT_READY',7,0,0,0,0,0,0,4,1,'al
|
||||||
INSERT INTO `state` VALUES (8,'Revisado',8,2,'CHECKED',8,0,1,0,3,0,0,1,0,'warning');
|
INSERT INTO `state` VALUES (8,'Revisado',8,2,'CHECKED',8,0,1,0,3,0,0,1,0,'warning');
|
||||||
INSERT INTO `state` VALUES (9,'Encajando',9,3,'PACKING',9,0,1,0,0,0,0,1,0,NULL);
|
INSERT INTO `state` VALUES (9,'Encajando',9,3,'PACKING',9,0,1,0,0,0,0,1,0,NULL);
|
||||||
INSERT INTO `state` VALUES (10,'Encajado',10,3,'PACKED',10,0,1,0,0,0,0,0,0,NULL);
|
INSERT INTO `state` VALUES (10,'Encajado',10,3,'PACKED',10,0,1,0,0,0,0,0,0,NULL);
|
||||||
INSERT INTO `state` VALUES (11,'Facturado',0,4,'INVOICED',11,0,1,0,0,0,0,0,0,NULL);
|
|
||||||
INSERT INTO `state` VALUES (12,'Bloqueado',0,0,'BLOCKED',12,0,0,0,0,0,0,4,1,'alert');
|
INSERT INTO `state` VALUES (12,'Bloqueado',0,0,'BLOCKED',12,0,0,0,0,0,0,4,1,'alert');
|
||||||
INSERT INTO `state` VALUES (13,'En Reparto',11,4,'ON_DELIVERY',13,0,1,0,0,0,0,0,0,NULL);
|
INSERT INTO `state` VALUES (13,'En Reparto',11,4,'ON_DELIVERY',13,0,1,0,0,0,0,0,0,NULL);
|
||||||
INSERT INTO `state` VALUES (14,'Preparado',6,2,'PREPARED',14,0,1,0,2,0,0,1,0,'warning');
|
INSERT INTO `state` VALUES (14,'Preparado',6,2,'PREPARED',14,0,1,0,2,0,0,1,0,'warning');
|
||||||
|
@ -2749,19 +2844,15 @@ INSERT INTO `state` VALUES (23,'URGENTE',5,2,'LAST_CALL',23,1,0,1,0,0,0,4,1,'suc
|
||||||
INSERT INTO `state` VALUES (24,'Encadenado',4,0,'CHAINED',24,0,0,0,0,0,0,3,1,'success');
|
INSERT INTO `state` VALUES (24,'Encadenado',4,0,'CHAINED',24,0,0,0,0,0,0,3,1,'success');
|
||||||
INSERT INTO `state` VALUES (25,'Embarcando',3,0,'BOARDING',25,1,0,0,0,0,0,3,0,'alert');
|
INSERT INTO `state` VALUES (25,'Embarcando',3,0,'BOARDING',25,1,0,0,0,0,0,3,0,'alert');
|
||||||
INSERT INTO `state` VALUES (26,'Prep Previa',5,0,'PREVIOUS_PREPARATION',28,1,0,0,1,0,0,2,0,'warning');
|
INSERT INTO `state` VALUES (26,'Prep Previa',5,0,'PREVIOUS_PREPARATION',28,1,0,0,1,0,0,2,0,'warning');
|
||||||
INSERT INTO `state` VALUES (27,'Prep Asistida',5,2,'ASSISTED_PREPARATION',27,0,0,0,0,0,0,2,0,'success');
|
|
||||||
INSERT INTO `state` VALUES (28,'Previa OK',3,0,'OK PREVIOUS',28,1,0,1,1,1,1,3,0,'warning');
|
INSERT INTO `state` VALUES (28,'Previa OK',3,0,'OK PREVIOUS',28,1,0,1,1,1,1,3,0,'warning');
|
||||||
INSERT INTO `state` VALUES (29,'Previa Impreso',4,0,'PRINTED PREVIOUS',29,1,0,1,0,0,1,2,0,'success');
|
INSERT INTO `state` VALUES (29,'Previa Impreso',4,0,'PRINTED PREVIOUS',29,1,0,1,0,0,1,2,0,'success');
|
||||||
INSERT INTO `state` VALUES (30,'Embarcado',4,2,'BOARD',30,0,0,0,2,0,0,3,0,'success');
|
|
||||||
INSERT INTO `state` VALUES (31,'Polizon Impreso',4,2,'PRINTED STOWAWAY',29,1,0,1,0,0,1,2,0,'success');
|
INSERT INTO `state` VALUES (31,'Polizon Impreso',4,2,'PRINTED STOWAWAY',29,1,0,1,0,0,1,2,0,'success');
|
||||||
INSERT INTO `state` VALUES (32,'Polizon OK',3,2,'OK STOWAWAY',31,1,0,0,1,1,1,3,0,'warning');
|
|
||||||
INSERT INTO `state` VALUES (33,'Auto_Impreso',4,0,'PRINTED_AUTO',29,1,0,1,0,0,1,2,0,'success');
|
INSERT INTO `state` VALUES (33,'Auto_Impreso',4,0,'PRINTED_AUTO',29,1,0,1,0,0,1,2,0,'success');
|
||||||
INSERT INTO `state` VALUES (34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',34,0,0,0,0,0,0,4,1,'alert');
|
INSERT INTO `state` VALUES (34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',34,0,0,0,0,0,0,4,1,'alert');
|
||||||
INSERT INTO `state` VALUES (35,'Semi-Encajado',9,3,'HALF_PACKED',10,0,1,0,0,0,0,1,0,NULL);
|
INSERT INTO `state` VALUES (35,'Semi-Encajado',9,3,'HALF_PACKED',10,0,1,0,0,0,0,1,0,NULL);
|
||||||
INSERT INTO `state` VALUES (36,'Previa Revisando',3,0,'PREVIOUS_CONTROL',37,1,0,0,4,0,1,2,0,'warning');
|
INSERT INTO `state` VALUES (36,'Previa Revisando',3,0,'PREVIOUS_CONTROL',37,1,0,0,4,0,1,2,0,'warning');
|
||||||
INSERT INTO `state` VALUES (37,'Previa Revisado',3,0,'PREVIOUS_CONTROLLED',29,1,0,1,0,0,1,2,0,'warning');
|
INSERT INTO `state` VALUES (37,'Previa Revisado',3,0,'PREVIOUS_CONTROLLED',29,1,0,1,0,0,1,2,0,'warning');
|
||||||
INSERT INTO `state` VALUES (38,'Prep Cámara',6,2,'COOLER_PREPARATION',14,0,0,0,2,0,0,2,0,'warning');
|
INSERT INTO `state` VALUES (38,'Prep Cámara',6,2,'COOLER_PREPARATION',14,0,0,0,2,0,0,2,0,'warning');
|
||||||
INSERT INTO `state` VALUES (41,'Prep Parcial',6,2,'PARTIAL_PREPARATION',14,0,0,0,2,0,0,2,0,'warning');
|
|
||||||
INSERT INTO `state` VALUES (42,'Entregado en parte',13,3,'PARTIAL_DELIVERED',16,0,1,0,0,0,0,0,0,NULL);
|
INSERT INTO `state` VALUES (42,'Entregado en parte',13,3,'PARTIAL_DELIVERED',16,0,1,0,0,0,0,0,0,NULL);
|
||||||
INSERT INTO `state` VALUES (43,'Preparación por caja',6,2,'BOX_PICKING',42,0,0,0,2,0,0,2,0,'warning');
|
INSERT INTO `state` VALUES (43,'Preparación por caja',6,2,'BOX_PICKING',42,0,0,0,2,0,0,2,0,'warning');
|
||||||
|
|
||||||
|
@ -2772,6 +2863,17 @@ INSERT INTO `ticketCanAdvanceConfig` VALUES (1,5);
|
||||||
|
|
||||||
INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57,2.0,50,200,10,167.0);
|
INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57,2.0,50,200,10,167.0);
|
||||||
|
|
||||||
|
INSERT INTO `workerActivityType` VALUES ('CLAIM','RECLAMACIONES');
|
||||||
|
INSERT INTO `workerActivityType` VALUES ('DELIVERY','REPARTO');
|
||||||
|
INSERT INTO `workerActivityType` VALUES ('FIELD','CAMPOS');
|
||||||
|
INSERT INTO `workerActivityType` VALUES ('ON_CHECKING','REVISION');
|
||||||
|
INSERT INTO `workerActivityType` VALUES ('ON_PREPARATION','SACADO');
|
||||||
|
INSERT INTO `workerActivityType` VALUES ('PACKING','ENCAJADO');
|
||||||
|
INSERT INTO `workerActivityType` VALUES ('PALLETIZING','PALETIZADO');
|
||||||
|
INSERT INTO `workerActivityType` VALUES ('PREVIOUS','ARTIFICIAL-CÁMARA');
|
||||||
|
INSERT INTO `workerActivityType` VALUES ('STOP','PARADA');
|
||||||
|
INSERT INTO `workerActivityType` VALUES ('STORAGE','ALMACENAJE');
|
||||||
|
|
||||||
INSERT INTO `workCenter` VALUES (1,'Silla',20,859,1,'Av espioca 100',552703,NULL);
|
INSERT INTO `workCenter` VALUES (1,'Silla',20,859,1,'Av espioca 100',552703,NULL);
|
||||||
INSERT INTO `workCenter` VALUES (2,'Mercaflor',19,NULL,NULL,NULL,NULL,NULL);
|
INSERT INTO `workCenter` VALUES (2,'Mercaflor',19,NULL,NULL,NULL,NULL,NULL);
|
||||||
INSERT INTO `workCenter` VALUES (3,'Marjales',26,20008,NULL,NULL,NULL,NULL);
|
INSERT INTO `workCenter` VALUES (3,'Marjales',26,20008,NULL,NULL,NULL,NULL);
|
||||||
|
@ -3101,6 +3203,7 @@ USE `sage`;
|
||||||
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
||||||
|
|
||||||
INSERT INTO `TiposIva` VALUES (2,0,'Operaciones no sujetas',0.0000000000,0.0000000000,0.0000000000,'','4770000020','','','','','','','95B21A93-5910-489D-83BB-C32788C9B19D','','','','','','','','','',0);
|
INSERT INTO `TiposIva` VALUES (2,0,'Operaciones no sujetas',0.0000000000,0.0000000000,0.0000000000,'','4770000020','','','','','','','95B21A93-5910-489D-83BB-C32788C9B19D','','','','','','','','','',0);
|
||||||
|
INSERT INTO `TiposIva` VALUES (3,0,'IVA ESPECIAL 2%',0.0000000000,2.0000000000,0.0000000000,'4720000002','4770000012','','','','','','','9E6160D5-984E-4643-ACBC-1EBC3BF73360','','','','','','','','','',0);
|
||||||
INSERT INTO `TiposIva` VALUES (4,0,'I.V.A. 4%',0.0000000000,4.0000000000,0.0000000000,'4720000004','4770000004','','6310000000','','','','','9E6160D5-984E-4643-ACBC-1EBC3BF73360','','','','','','','','','',0);
|
INSERT INTO `TiposIva` VALUES (4,0,'I.V.A. 4%',0.0000000000,4.0000000000,0.0000000000,'4720000004','4770000004','','6310000000','','','','','9E6160D5-984E-4643-ACBC-1EBC3BF73360','','','','','','','','','',0);
|
||||||
INSERT INTO `TiposIva` VALUES (5,0,'I.V.A. 4% y R.E. 0.5%',0.0000000000,4.0000000000,0.5000000000,'','4770000504','4770000405','','','','','','DBEFA562-63FB-4FFC-8171-64F0C6F065FF','','','','','','','','','',0);
|
INSERT INTO `TiposIva` VALUES (5,0,'I.V.A. 4% y R.E. 0.5%',0.0000000000,4.0000000000,0.5000000000,'','4770000504','4770000405','','','','','','DBEFA562-63FB-4FFC-8171-64F0C6F065FF','','','','','','','','','',0);
|
||||||
INSERT INTO `TiposIva` VALUES (6,0,'H.P. IVA 4% CEE',0.0000000000,4.0000000000,0.0000000000,'4721000004','4771000004','','','','','','','DD0ECBA8-2EF5-425E-911B-623580BADA77','','','','','','','','','',0);
|
INSERT INTO `TiposIva` VALUES (6,0,'H.P. IVA 4% CEE',0.0000000000,4.0000000000,0.0000000000,'4721000004','4771000004','','','','','','','DD0ECBA8-2EF5-425E-911B-623580BADA77','','','','','','','','','',0);
|
||||||
|
|
|
@ -49,6 +49,7 @@ INSERT IGNORE INTO `db` VALUES ('','geo','developerBoss','Y','Y','Y','Y','N','N'
|
||||||
INSERT IGNORE INTO `db` VALUES ('','floranet','developer','Y','Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
|
INSERT IGNORE INTO `db` VALUES ('','floranet','developer','Y','Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
|
||||||
INSERT IGNORE INTO `db` VALUES ('','tmp','guest','Y','Y','Y','Y','N','Y','N','N','N','N','Y','N','N','N','N','N','N','N','N','N');
|
INSERT IGNORE INTO `db` VALUES ('','tmp','guest','Y','Y','Y','Y','N','Y','N','N','N','N','Y','N','N','N','N','N','N','N','N','N');
|
||||||
INSERT IGNORE INTO `db` VALUES ('','util','salix','Y','Y','Y','Y','N','N','N','N','N','N','Y','N','N','N','N','N','Y','N','N','N');
|
INSERT IGNORE INTO `db` VALUES ('','util','salix','Y','Y','Y','Y','N','N','N','N','N','N','Y','N','N','N','N','N','Y','N','N','N');
|
||||||
|
INSERT IGNORE INTO `db` VALUES ('','srt','maintenanceBoss','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
|
||||||
INSERT IGNORE INTO `db` VALUES ('','dipole','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
|
INSERT IGNORE INTO `db` VALUES ('','dipole','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
|
||||||
INSERT IGNORE INTO `db` VALUES ('','bi','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
|
INSERT IGNORE INTO `db` VALUES ('','bi','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
|
||||||
INSERT IGNORE INTO `db` VALUES ('','sage','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
|
INSERT IGNORE INTO `db` VALUES ('','sage','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
|
||||||
|
@ -804,7 +805,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','edi','grafana','supplyResponse','ju
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','cache','customer','last_buy','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','cache','customer','last_buy','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','client','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','client','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','invoiceInTax','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','invoiceInTax','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','workerTeam','juan@10.5.1.2','0000-00-00 00:00:00','Select,Insert,Update','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','workerTeam','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','postgresql','hr','profile_type','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','postgresql','hr','profile_type','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','postgresql','hr','profile_media','alexm@%','0000-00-00 00:00:00','Select,Insert','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','postgresql','hr','profile_media','alexm@%','0000-00-00 00:00:00','Select,Insert','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financial','recovery','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financial','recovery','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
|
@ -834,7 +835,6 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','bi','salesPerson','tarifa_component
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','employee','expeditionLog','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','employee','expeditionLog','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','bs','salesPerson','clientNewBorn','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','bs','salesPerson','clientNewBorn','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleItemShelving__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleItemShelving__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesBoss','workerTeam','juan@10.5.1.2','0000-00-00 00:00:00','Delete','');
|
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','employee','expedition','alexm@%','0000-00-00 00:00:00','Update','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','employee','expedition','alexm@%','0000-00-00 00:00:00','Update','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemShelvingStock','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemShelvingStock','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleParking__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleParking__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
|
@ -886,7 +886,6 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketDms','alexm@%
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','ektEntryAssign','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','ektEntryAssign','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','intrastat','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','intrastat','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','supplierAgencyTerm','alexm@%','0000-00-00 00:00:00','Update','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','supplierAgencyTerm','alexm@%','0000-00-00 00:00:00','Update','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','entryConfig','alexm@%','0000-00-00 00:00:00','Select','');
|
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packager','franceExpressConfig','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packager','franceExpressConfig','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','manager','ticketLog','juan@10.5.1.2','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','manager','ticketLog','juan@10.5.1.2','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','ticketCollection','alexm@%','0000-00-00 00:00:00','Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','ticketCollection','alexm@%','0000-00-00 00:00:00','Delete','');
|
||||||
|
@ -941,11 +940,10 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','volumeConfig','alex
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerBoss','ticketTrackingState','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerBoss','ticketTrackingState','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','warehouse','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','warehouse','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','role','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','role','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workCenter','alexm@%','0000-00-00 00:00:00','Select','');
|
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientCredit','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientCredit','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','worker','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','worker','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','workerAppTester','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','workerAppTester','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financial','propertyGroup','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financial','propertyGroup','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','worker','alexm@%','0000-00-00 00:00:00','Update','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','worker','alexm@%','0000-00-00 00:00:00','Update','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerBusinessType','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerBusinessType','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','workerDepartment','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','workerDepartment','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
|
@ -964,7 +962,6 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','workerMana','alexm@%',
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','workerMana','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','workerMana','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','ticketPackaging','alexm@%','0000-00-00 00:00:00','Insert','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','ticketPackaging','alexm@%','0000-00-00 00:00:00','Insert','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','ticketPackagingStartingStock','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','ticketPackagingStartingStock','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','entryConfig','alexm@%','0000-00-00 00:00:00','Select','');
|
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','officeBoss','ticketPackagingStartingStock','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','officeBoss','ticketPackagingStartingStock','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerRelatives','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerRelatives','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','ticketPackagingStartingStock','alexm@%','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','ticketPackagingStartingStock','alexm@%','0000-00-00 00:00:00','Select','');
|
||||||
|
@ -1246,7 +1243,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','bs','deliveryAssistant','m3','alexm
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','ticketDms','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','ticketDms','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','time','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','time','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','v_Articles_botanical','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','v_Articles_botanical','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','workCenter','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','inventoryConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','workerDepartment','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','workerDepartment','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','zoneEvent','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','zoneEvent','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','bi','deliveryAssistant','rotacion','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','bi','deliveryAssistant','rotacion','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
|
@ -1388,7 +1385,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','entry','jenki
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos_Retorno','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos_Retorno','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimDestination','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimDestination','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','entryConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','entryConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','farmingDeliveryNote','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','farmingDeliveryNote','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','sage','grafana','TiposIva','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','sage','grafana','TiposIva','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','bs','buyer','waste','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','bs','buyer','waste','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientObservation','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientObservation','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
|
@ -1419,13 +1416,10 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','accountDetail'
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','accountDetail','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','accountDetail','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','project','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','project','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','machineDetail','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','machineDetail','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','antenna','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','workerActivityType','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','bufferPool','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyerSalesAssistant','route','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','enteringLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','workCenter','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','expeditionLoading','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerSalesAssistant','Rutas','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','failureLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','movingLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','sorterLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','genericAllocation','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','genericAllocation','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','businessReasonEnd','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','businessReasonEnd','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','buy_edi','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','buy_edi','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
|
@ -1463,7 +1457,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleDms','gu
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleInvoiceIn','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleInvoiceIn','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleNotes','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleNotes','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','production','saleGroup','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','production','saleGroup','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','bufferLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','shelvingLog','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','supplierAccount','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','supplierAccount','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','tillSerial','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','tillSerial','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','stockBuyed','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','stockBuyed','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
|
@ -1485,7 +1479,6 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemStateTag'
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','material','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','material','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','saleUnit','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','saleUnit','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','origin','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','origin','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','itemType','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
|
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','delivery','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','delivery','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemFarmingTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemFarmingTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemWrappingTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemWrappingTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
|
@ -1494,6 +1487,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemStemTag',
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemBaseTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemBaseTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemBreederTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemBreederTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemShelvingLog','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemShelvingLog','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
|
||||||
|
INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemTextureTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
|
||||||
/*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
|
/*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
|
||||||
|
|
||||||
/*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
|
/*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
|
||||||
|
@ -1873,6 +1867,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_getVolumeByE
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_moveNotPrinted','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_moveNotPrinted','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getVolume','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getVolume','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','stockBuyedByWorker','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getsplit','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getsplit','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','subordinategetlist','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','subordinategetlist','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_afterUpsert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_afterUpsert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -1914,7 +1909,6 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','util','android','debugadd','PROCEDUR
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','copyComponentsFromSaleList','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','copyComponentsFromSaleList','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaEntryValueUpdate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaEntryValueUpdate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaInvoiceInBooking','PROCEDURE','carlosap@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaInvoiceInBooking','PROCEDURE','carlosap@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemshelvinglog_get','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','expedition_getstate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','expedition_getstate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','srt','production','expedition_scan','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','srt','production','expedition_scan','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','productionBoss','saleSplit','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','productionBoss','saleSplit','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -1925,7 +1919,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofyear','FU
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','util','claimManager','dayend','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','util','claimManager','dayend','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','util','employee','log_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','util','employee','log_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','srt','employee','moving_between','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','srt','employee','moving_between','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','bi','financial','defaultersfromdate','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','bi','financial','defaultersfromdate','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','getuser','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','getuser','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','hasanynegativebase','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','hasanynegativebase','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','hasanynegativebase','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','hasanynegativebase','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -2020,6 +2014,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','hr','logshow','PROCEDURE','alex
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyerBoss','supplierpackaging_reportsource','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyerBoss','supplierpackaging_reportsource','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','financialBoss','supplierexpenses','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','financialBoss','supplierexpenses','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','grafana','firstdayofweek','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','grafana','firstdayofweek','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','stockBuyed_add','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','mail_insert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','mail_insert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaParcialMake','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaParcialMake','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','palletizerBoss','packingsite_startcollection','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','palletizerBoss','packingsite_startcollection','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -2099,7 +2094,6 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','collection_printst
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','deviceproductionuser_getworker','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','deviceproductionuser_getworker','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','ticket_printlabelprevious','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','ticket_printlabelprevious','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','ticket_isoutclosurezone','FUNCTION','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','ticket_isoutclosurezone','FUNCTION','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','workermachinery_isregistered','FUNCTION','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','ticketstatetoday_setstate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','ticketstatetoday_setstate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','device_checklogin','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','device_checklogin','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','worker_getfromhasmistake','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','worker_getfromhasmistake','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -2107,7 +2101,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','sectorcollection_n
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','sectorcollection_get','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','sectorcollection_get','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','setparking','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','setparking','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','shelvingparking_get','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','shelvingparking_get','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','machine_getworkerplate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','report_print','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','saletracking_addprevok','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','saletracking_addprevok','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','sectorcollectionsalegroup_add','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','sectorcollectionsalegroup_add','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','saletracking_updateischecked','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','saletracking_updateischecked','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -2116,7 +2110,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','travel_updatepacki
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','freelance_getinfo','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','freelance_getinfo','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','company_getfiscaldata','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','company_getfiscaldata','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','expedition_getfromroute','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','expedition_getfromroute','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','machineworker_gethistorical','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_getUltimate','FUNCTION','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemplacementsupplyaiming','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemplacementsupplyaiming','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','expeditionstate_addbypallet','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','expeditionstate_addbypallet','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','srt','production','expeditionloading_add','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','srt','production','expeditionloading_add','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -2137,7 +2131,6 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','srt','delivery','buffer_settypebynam
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expedition_getstate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expedition_getstate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','srt','delivery','expedition_scan','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','srt','delivery','expedition_scan','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_get','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_get','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelvinglog_get','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_getsaledate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_getsaledate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_filterbuyer','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_filterbuyer','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -2150,7 +2143,6 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','collection_printstic
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','deviceproductionuser_getworker','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','deviceproductionuser_getworker','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticket_printlabelprevious','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticket_printlabelprevious','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticket_isoutclosurezone','FUNCTION','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticket_isoutclosurezone','FUNCTION','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','workermachinery_isregistered','FUNCTION','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticketstatetoday_setstate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticketstatetoday_setstate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','device_checklogin','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','device_checklogin','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','worker_getfromhasmistake','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','worker_getfromhasmistake','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -2158,7 +2150,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','sectorcollection_new
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','sectorcollection_get','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','sectorcollection_get','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','setparking','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','setparking','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','shelvingparking_get','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','shelvingparking_get','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','machine_getworkerplate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getLastWithoutInventory','FUNCTION','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','saletracking_addprevok','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','saletracking_addprevok','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','sectorcollectionsalegroup_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','sectorcollectionsalegroup_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','saletracking_updateischecked','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','saletracking_updateischecked','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -2167,7 +2159,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','travel_updatepacking
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','freelance_getinfo','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','freelance_getinfo','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','company_getfiscaldata','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','company_getfiscaldata','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expedition_getfromroute','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expedition_getfromroute','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','machineworker_gethistorical','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','zone_getPostalCode','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemplacementsupplyaiming','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemplacementsupplyaiming','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expeditionstate_addbypallet','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expeditionstate_addbypallet','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
INSERT IGNORE INTO `procs_priv` VALUES ('','srt','delivery','expeditionloading_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
INSERT IGNORE INTO `procs_priv` VALUES ('','srt','delivery','expeditionloading_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
|
||||||
|
@ -2257,9 +2249,10 @@ INSERT IGNORE INTO `global_priv` VALUES ('','assetManager','{\"access\":0,\"vers
|
||||||
INSERT IGNORE INTO `global_priv` VALUES ('','buyer','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
|
INSERT IGNORE INTO `global_priv` VALUES ('','buyer','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
|
||||||
INSERT IGNORE INTO `global_priv` VALUES ('','buyerAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
INSERT IGNORE INTO `global_priv` VALUES ('','buyerAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
||||||
INSERT IGNORE INTO `global_priv` VALUES ('','buyerBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
|
INSERT IGNORE INTO `global_priv` VALUES ('','buyerBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
|
||||||
|
INSERT IGNORE INTO `global_priv` VALUES ('','buyerSalesAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
||||||
INSERT IGNORE INTO `global_priv` VALUES ('','claimManager','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
INSERT IGNORE INTO `global_priv` VALUES ('','claimManager','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
||||||
INSERT IGNORE INTO `global_priv` VALUES ('','cooler','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
INSERT IGNORE INTO `global_priv` VALUES ('','cooler','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
||||||
INSERT IGNORE INTO `global_priv` VALUES ('','coolerAssist','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
|
INSERT IGNORE INTO `global_priv` VALUES ('','coolerAssist','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
||||||
INSERT IGNORE INTO `global_priv` VALUES ('','coolerBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
INSERT IGNORE INTO `global_priv` VALUES ('','coolerBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
||||||
INSERT IGNORE INTO `global_priv` VALUES ('','customer','{\"access\": 0, \"max_questions\": 0, \"max_updates\": 30000, \"max_connections\": 300000, \"max_user_connections\": 400, \"max_statement_time\": 0.000000, \"is_role\": true,\"version_id\":100707}');
|
INSERT IGNORE INTO `global_priv` VALUES ('','customer','{\"access\": 0, \"max_questions\": 0, \"max_updates\": 30000, \"max_connections\": 300000, \"max_user_connections\": 400, \"max_statement_time\": 0.000000, \"is_role\": true,\"version_id\":100707}');
|
||||||
INSERT IGNORE INTO `global_priv` VALUES ('','delivery','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
INSERT IGNORE INTO `global_priv` VALUES ('','delivery','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -875,7 +875,7 @@ BEGIN
|
||||||
b.stickers = NEW.NumberOfUnits
|
b.stickers = NEW.NumberOfUnits
|
||||||
WHERE i.supplyResponseFk = NEW.ID
|
WHERE i.supplyResponseFk = NEW.ID
|
||||||
AND am.name = 'LOGIFLORA'
|
AND am.name = 'LOGIFLORA'
|
||||||
AND e.isRaid
|
AND tr.isRaid
|
||||||
AND tr.landed >= util.VN_CURDATE();
|
AND tr.landed >= util.VN_CURDATE();
|
||||||
|
|
||||||
END */;;
|
END */;;
|
||||||
|
@ -1460,6 +1460,9 @@ DELIMITER ;;
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
SET NEW.editorFk = account.myUser_getId();
|
SET NEW.editorFk = account.myUser_getId();
|
||||||
|
IF NEW.`property` = '*' THEN
|
||||||
|
CALL util.throw('The property field cannot be *');
|
||||||
|
END IF;
|
||||||
END */;;
|
END */;;
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||||
|
@ -2000,6 +2003,7 @@ BEGIN
|
||||||
DECLARE vIsEqualizated BOOL;
|
DECLARE vIsEqualizated BOOL;
|
||||||
|
|
||||||
SET NEW.editorFk = account.myUser_getId();
|
SET NEW.editorFk = account.myUser_getId();
|
||||||
|
SET NEW.geoFk = address_getGeo(NEW.id);
|
||||||
|
|
||||||
IF (NEW.phone <> '') THEN
|
IF (NEW.phone <> '') THEN
|
||||||
CALL pbx.phone_isValid(NEW.phone);
|
CALL pbx.phone_isValid(NEW.phone);
|
||||||
|
@ -2036,7 +2040,6 @@ DELIMITER ;;
|
||||||
BEFORE UPDATE ON `address`
|
BEFORE UPDATE ON `address`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
||||||
SET NEW.editorFk = account.myUser_getId();
|
SET NEW.editorFk = account.myUser_getId();
|
||||||
|
|
||||||
IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
|
IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
|
||||||
|
@ -2047,6 +2050,11 @@ BEGIN
|
||||||
CALL pbx.phone_isValid(NEW.mobile);
|
CALL pbx.phone_isValid(NEW.mobile);
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
IF NOT (NEW.provinceFk <=> OLD.provinceFk)
|
||||||
|
OR (NEW.postalCode <=> OLD.postalCode) THEN
|
||||||
|
|
||||||
|
SET NEW.geoFk = address_getGeo(NEW.id);
|
||||||
|
END IF;
|
||||||
END */;;
|
END */;;
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||||
|
@ -3423,8 +3431,10 @@ DELIMITER ;;
|
||||||
BEFORE INSERT ON `client`
|
BEFORE INSERT ON `client`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
||||||
SET NEW.editorFk = account.myUser_getId();
|
SET NEW.editorFk = account.myUser_getId();
|
||||||
|
SET NEW.accountingAccount = 4300000000 + NEW.id;
|
||||||
|
SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
|
||||||
|
SET NEW.geoFk = client_getGeo(NEW.id);
|
||||||
|
|
||||||
IF (NEW.phone <> '') THEN
|
IF (NEW.phone <> '') THEN
|
||||||
CALL pbx.phone_isValid(NEW.phone);
|
CALL pbx.phone_isValid(NEW.phone);
|
||||||
|
@ -3433,10 +3443,6 @@ BEGIN
|
||||||
IF (NEW.mobile <> '') THEN
|
IF (NEW.mobile <> '') THEN
|
||||||
CALL pbx.phone_isValid(NEW.mobile);
|
CALL pbx.phone_isValid(NEW.mobile);
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SET NEW.accountingAccount = 4300000000 + NEW.id;
|
|
||||||
|
|
||||||
SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
|
|
||||||
END */;;
|
END */;;
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||||
|
@ -3550,6 +3556,12 @@ BEGIN
|
||||||
IF NOT (NEW.businessTypeFk <=> OLD.businessTypeFk) AND (NEW.businessTypeFk = 'individual' OR OLD.businessTypeFk = 'individual') THEN
|
IF NOT (NEW.businessTypeFk <=> OLD.businessTypeFk) AND (NEW.businessTypeFk = 'individual' OR OLD.businessTypeFk = 'individual') THEN
|
||||||
SET NEW.isTaxDataChecked = 0;
|
SET NEW.isTaxDataChecked = 0;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
IF NOT (NEW.provinceFk <=> OLD.provinceFk)
|
||||||
|
OR (NEW.postcode <=> OLD.postcode) THEN
|
||||||
|
|
||||||
|
SET NEW.geoFk = client_getGeo(NEW.id);
|
||||||
|
END IF;
|
||||||
END */;;
|
END */;;
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||||
|
@ -4960,7 +4972,7 @@ DELIMITER ;;
|
||||||
BEFORE UPDATE ON `entry`
|
BEFORE UPDATE ON `entry`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
DECLARE vIsVirtual BOOL;
|
DECLARE vIsRaid BOOL;
|
||||||
DECLARE vPrintedCount INT;
|
DECLARE vPrintedCount INT;
|
||||||
DECLARE vHasDistinctWarehouses BOOL;
|
DECLARE vHasDistinctWarehouses BOOL;
|
||||||
DECLARE vTotalBuy INT;
|
DECLARE vTotalBuy INT;
|
||||||
|
@ -4995,17 +5007,19 @@ BEGIN
|
||||||
CALL travel_throwAwb(NEW.travelFk);
|
CALL travel_throwAwb(NEW.travelFk);
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT COUNT(*) > 0 INTO vIsVirtual
|
SELECT t.isRaid INTO vIsRaid
|
||||||
FROM entryVirtual WHERE entryFk = NEW.id;
|
FROM travel t
|
||||||
|
JOIN entry e ON e.travelFk = t.id
|
||||||
|
WHERE e.id = NEW.id;
|
||||||
|
|
||||||
SELECT NOT (o.warehouseInFk <=> n.warehouseInFk)
|
SELECT NOT (o.warehouseInFk <=> n.warehouseInFk)
|
||||||
OR NOT (o.warehouseOutFk <=> n.warehouseOutFk)
|
OR NOT (o.warehouseOutFk <=> n.warehouseOutFk)
|
||||||
INTO vHasDistinctWarehouses
|
INTO vHasDistinctWarehouses
|
||||||
FROM travel o, travel n
|
FROM travel o, travel n
|
||||||
WHERE o.id = OLD.travelFk
|
WHERE o.id = OLD.travelFk
|
||||||
AND n.id = NEW.travelFk;
|
AND n.id = NEW.travelFk;
|
||||||
|
|
||||||
IF vIsVirtual AND vHasDistinctWarehouses THEN
|
IF vIsRaid AND vHasDistinctWarehouses THEN
|
||||||
SIGNAL SQLSTATE '45000'
|
SIGNAL SQLSTATE '45000'
|
||||||
SET MESSAGE_TEXT = 'A cloned entry cannot be moved to a travel with different warehouses';
|
SET MESSAGE_TEXT = 'A cloned entry cannot be moved to a travel with different warehouses';
|
||||||
END IF;
|
END IF;
|
||||||
|
@ -5326,6 +5340,7 @@ BEGIN
|
||||||
FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk)
|
FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk)
|
||||||
WHERE t.id = OLD.ticketFk;
|
WHERE t.id = OLD.ticketFk;
|
||||||
|
|
||||||
|
CALL expedition_selfConsumptionPackaging(OLD.id, 'remove');
|
||||||
END */;;
|
END */;;
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||||
|
@ -6432,7 +6447,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND ic.itemFk = NEW.itemFk
|
AND ic.itemFk = NEW.itemFk
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
IF NEW.cm3Delivery = 0 AND NEW.warehouseFk = 60 THEN
|
IF NEW.cm3Delivery = 0 AND NEW.warehouseFk = 60 THEN
|
||||||
CALL mail_insert(
|
CALL mail_insert(
|
||||||
|
@ -6531,36 +6546,6 @@ BEGIN
|
||||||
SET NEW.userFk = account.myUser_getId();
|
SET NEW.userFk = account.myUser_getId();
|
||||||
SET NEW.available = NEW.visible;
|
SET NEW.available = NEW.visible;
|
||||||
|
|
||||||
END */;;
|
|
||||||
DELIMITER ;
|
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
|
||||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
|
||||||
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
|
||||||
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
|
||||||
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
|
||||||
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
|
||||||
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
|
|
||||||
/*!50003 SET character_set_client = utf8mb4 */ ;
|
|
||||||
/*!50003 SET character_set_results = utf8mb4 */ ;
|
|
||||||
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
|
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
|
||||||
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
|
||||||
DELIMITER ;;
|
|
||||||
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_afterInsert`
|
|
||||||
AFTER INSERT ON `itemShelving`
|
|
||||||
FOR EACH ROW
|
|
||||||
BEGIN
|
|
||||||
INSERT INTO itemShelvingLog
|
|
||||||
SET itemShelvingFk = NEW.id,
|
|
||||||
workerFk = account.myUser_getId(),
|
|
||||||
accion = 'CREA REGISTRO',
|
|
||||||
itemFk = NEW.itemFk,
|
|
||||||
shelvingFk = NEW.shelvingFk,
|
|
||||||
visible = NEW.visible,
|
|
||||||
`grouping` = NEW.`grouping`,
|
|
||||||
packing = NEW.packing,
|
|
||||||
available = NEW.available;
|
|
||||||
|
|
||||||
END */;;
|
END */;;
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||||
|
@ -6604,63 +6589,6 @@ DELIMITER ;
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||||
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
||||||
DELIMITER ;;
|
DELIMITER ;;
|
||||||
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_afterUpdate`
|
|
||||||
AFTER UPDATE ON `itemShelving`
|
|
||||||
FOR EACH ROW
|
|
||||||
BEGIN
|
|
||||||
INSERT INTO itemShelvingLog
|
|
||||||
SET itemShelvingFk = NEW.id,
|
|
||||||
workerFk = account.myUser_getId(),
|
|
||||||
accion = 'CAMBIO',
|
|
||||||
itemFk = NEW.itemFk,
|
|
||||||
shelvingFk = NEW.shelvingFk,
|
|
||||||
visible = NEW.visible,
|
|
||||||
`grouping` = NEW.`grouping`,
|
|
||||||
packing = NEW.packing,
|
|
||||||
available = NEW.available;
|
|
||||||
|
|
||||||
END */;;
|
|
||||||
DELIMITER ;
|
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
|
||||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
|
||||||
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
|
||||||
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
|
||||||
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
|
||||||
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
|
||||||
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
|
|
||||||
/*!50003 SET character_set_client = utf8mb4 */ ;
|
|
||||||
/*!50003 SET character_set_results = utf8mb4 */ ;
|
|
||||||
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
|
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
|
||||||
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
|
||||||
DELIMITER ;;
|
|
||||||
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_beforeDelete`
|
|
||||||
BEFORE DELETE ON `itemShelving`
|
|
||||||
FOR EACH ROW
|
|
||||||
INSERT INTO vn.itemShelvingLog(itemShelvingFk,
|
|
||||||
workerFk,
|
|
||||||
accion,
|
|
||||||
shelvingFk,
|
|
||||||
itemFk)
|
|
||||||
VALUES( OLD.id,
|
|
||||||
account.myUser_getId(),
|
|
||||||
'ELIMINADO',
|
|
||||||
OLD.shelvingFk,
|
|
||||||
OLD.itemFk) */;;
|
|
||||||
DELIMITER ;
|
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
|
||||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
|
||||||
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
|
||||||
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
|
||||||
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
|
||||||
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
|
||||||
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
|
|
||||||
/*!50003 SET character_set_client = utf8mb4 */ ;
|
|
||||||
/*!50003 SET character_set_results = utf8mb4 */ ;
|
|
||||||
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
|
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
|
||||||
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
|
||||||
DELIMITER ;;
|
|
||||||
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_afterDelete`
|
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemShelving_afterDelete`
|
||||||
AFTER DELETE ON `itemShelving`
|
AFTER DELETE ON `itemShelving`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
|
@ -6909,10 +6837,31 @@ DELIMITER ;
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||||
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
||||||
DELIMITER ;;
|
DELIMITER ;;
|
||||||
|
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemType_beforeInsert`
|
||||||
|
BEFORE INSERT ON `itemType`
|
||||||
|
FOR EACH ROW
|
||||||
|
BEGIN
|
||||||
|
SET NEW.editorFk = account.myUser_getId();
|
||||||
|
END */;;
|
||||||
|
DELIMITER ;
|
||||||
|
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||||
|
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
||||||
|
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
||||||
|
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
||||||
|
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
||||||
|
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
||||||
|
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
|
||||||
|
/*!50003 SET character_set_client = utf8mb4 */ ;
|
||||||
|
/*!50003 SET character_set_results = utf8mb4 */ ;
|
||||||
|
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
|
||||||
|
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||||
|
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
||||||
|
DELIMITER ;;
|
||||||
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemType_beforeUpdate`
|
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemType_beforeUpdate`
|
||||||
BEFORE UPDATE ON `itemType`
|
BEFORE UPDATE ON `itemType`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
|
SET NEW.editorFk = account.myUser_getId();
|
||||||
IF NEW.itemPackingTypeFk = '' THEN
|
IF NEW.itemPackingTypeFk = '' THEN
|
||||||
|
|
||||||
SET NEW.itemPackingTypeFk = NULL;
|
SET NEW.itemPackingTypeFk = NULL;
|
||||||
|
@ -6939,6 +6888,30 @@ DELIMITER ;
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||||
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
||||||
DELIMITER ;;
|
DELIMITER ;;
|
||||||
|
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemType_afterDelete`
|
||||||
|
AFTER DELETE ON `itemType`
|
||||||
|
FOR EACH ROW
|
||||||
|
BEGIN
|
||||||
|
INSERT INTO itemTypeLog
|
||||||
|
SET `action` = 'delete',
|
||||||
|
`changedModel` = 'ItemType',
|
||||||
|
`changedModelId` = OLD.id,
|
||||||
|
`userFk` = account.myUser_getId();
|
||||||
|
END */;;
|
||||||
|
DELIMITER ;
|
||||||
|
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||||
|
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
||||||
|
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
||||||
|
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
||||||
|
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
||||||
|
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
||||||
|
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
|
||||||
|
/*!50003 SET character_set_client = utf8mb4 */ ;
|
||||||
|
/*!50003 SET character_set_results = utf8mb4 */ ;
|
||||||
|
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
|
||||||
|
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||||
|
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
||||||
|
DELIMITER ;;
|
||||||
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`machine_beforeInsert`
|
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`machine_beforeInsert`
|
||||||
BEFORE INSERT ON `machine`
|
BEFORE INSERT ON `machine`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
|
@ -7584,7 +7557,7 @@ DELIMITER ;;
|
||||||
AFTER DELETE ON `productionConfig`
|
AFTER DELETE ON `productionConfig`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
INSERT INTO productionConfig
|
INSERT INTO productionConfigLog
|
||||||
SET `action` = 'delete',
|
SET `action` = 'delete',
|
||||||
`changedModel` = 'ProductionConfig',
|
`changedModel` = 'ProductionConfig',
|
||||||
`changedModelId` = OLD.id,
|
`changedModelId` = OLD.id,
|
||||||
|
@ -8078,7 +8051,7 @@ BEGIN
|
||||||
SELECT IFNULL(b.workCenterFK, r.defaultWorkCenterFk)
|
SELECT IFNULL(b.workCenterFK, r.defaultWorkCenterFk)
|
||||||
FROM vn.routeConfig r
|
FROM vn.routeConfig r
|
||||||
LEFT JOIN vn.business b ON b.workerFk = vUserFk
|
LEFT JOIN vn.business b ON b.workerFk = vUserFk
|
||||||
AND NEW.created BETWEEN b.started AND IFNULL(b.ended, NEW.created));
|
AND NEW.dated BETWEEN b.started AND IFNULL(b.ended, NEW.dated));
|
||||||
|
|
||||||
IF ISNULL(NEW.agencyModeFk) THEN
|
IF ISNULL(NEW.agencyModeFk) THEN
|
||||||
SELECT r.agencyModeFk INTO vDefaultAgencyModeFk
|
SELECT r.agencyModeFk INTO vDefaultAgencyModeFk
|
||||||
|
@ -8187,7 +8160,8 @@ BEGIN
|
||||||
OR !(NEW.kmEnd <=> OLD.kmEnd)
|
OR !(NEW.kmEnd <=> OLD.kmEnd)
|
||||||
OR !(NEW.workerFk <=> OLD.workerFk)
|
OR !(NEW.workerFk <=> OLD.workerFk)
|
||||||
OR !(NEW.m3 <=> OLD.m3)
|
OR !(NEW.m3 <=> OLD.m3)
|
||||||
OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)THEN
|
OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)
|
||||||
|
OR !(NEW.vehicleFk <=> OLD.vehicleFk)THEN
|
||||||
CALL route_calcCommission(NEW.id);
|
CALL route_calcCommission(NEW.id);
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
@ -8339,7 +8313,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND s.id = NEW.id
|
AND s.id = NEW.id
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
END IF;
|
END IF;
|
||||||
END */;;
|
END */;;
|
||||||
|
@ -8447,7 +8421,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND s.id = NEW.id
|
AND s.id = NEW.id
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
@ -8489,7 +8463,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND s.id = OLD.id
|
AND s.id = OLD.id
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
END IF;
|
END IF;
|
||||||
END */;;
|
END */;;
|
||||||
|
@ -9086,6 +9060,7 @@ DELIMITER ;;
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
SET NEW.editorFk = account.myUser_getId();
|
SET NEW.editorFk = account.myUser_getId();
|
||||||
|
SET NEW.geoFk = supplier_getGeo(NEW.id);
|
||||||
END */;;
|
END */;;
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||||
|
@ -9180,6 +9155,11 @@ BEGIN
|
||||||
SET NEW.isPayMethodChecked = FALSE;
|
SET NEW.isPayMethodChecked = FALSE;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
IF NOT (NEW.provinceFk <=> OLD.provinceFk)
|
||||||
|
OR (NEW.postCode <=> OLD.postCode) THEN
|
||||||
|
|
||||||
|
SET NEW.geoFk = supplier_getGeo(NEW.id);
|
||||||
|
END IF;
|
||||||
END */;;
|
END */;;
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||||
|
@ -9590,7 +9570,7 @@ BEGIN
|
||||||
FROM `route`
|
FROM `route`
|
||||||
WHERE NOT isOk
|
WHERE NOT isOk
|
||||||
AND id IN (OLD.routeFk, NEW.routeFk)
|
AND id IN (OLD.routeFk, NEW.routeFk)
|
||||||
AND created >= util.VN_CURDATE()
|
AND dated >= util.VN_CURDATE()
|
||||||
GROUP BY id;
|
GROUP BY id;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
@ -9613,7 +9593,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND t.id = NEW.id
|
AND t.id = NEW.id
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
SET NEW.shipped = DATE_FORMAT(NEW.shipped, '2000-%m-%d %T');
|
SET NEW.shipped = DATE_FORMAT(NEW.shipped, '2000-%m-%d %T');
|
||||||
SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T');
|
SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T');
|
||||||
|
@ -9692,7 +9672,7 @@ BEGIN
|
||||||
FROM vn.route r
|
FROM vn.route r
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND r.id = OLD.routeFk
|
AND r.id = OLD.routeFk
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
|
|
||||||
DELETE FROM sale WHERE ticketFk = OLD.id;
|
DELETE FROM sale WHERE ticketFk = OLD.id;
|
||||||
|
@ -10501,28 +10481,6 @@ DELIMITER ;
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||||
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
||||||
DELIMITER ;;
|
DELIMITER ;;
|
||||||
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_beforeUpdate`
|
|
||||||
BEFORE UPDATE ON `town`
|
|
||||||
FOR EACH ROW
|
|
||||||
BEGIN
|
|
||||||
-- IF !(OLD.geoFk <=> NEW.geoFk) THEN
|
|
||||||
-- CALL zoneGeo_throwNotEditable;
|
|
||||||
-- END IF;
|
|
||||||
END */;;
|
|
||||||
DELIMITER ;
|
|
||||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
|
||||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
|
||||||
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
|
||||||
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
|
||||||
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
|
||||||
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
|
||||||
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
|
|
||||||
/*!50003 SET character_set_client = utf8mb4 */ ;
|
|
||||||
/*!50003 SET character_set_results = utf8mb4 */ ;
|
|
||||||
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
|
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
|
||||||
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
|
|
||||||
DELIMITER ;;
|
|
||||||
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_afterUpdate`
|
/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_afterUpdate`
|
||||||
AFTER UPDATE ON `town`
|
AFTER UPDATE ON `town`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
|
@ -10581,6 +10539,10 @@ BEGIN
|
||||||
|
|
||||||
CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
|
CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
|
||||||
|
|
||||||
|
IF NEW.isRaid IS NOT NULL OR NEW.daysInForward IS NOT NULL THEN
|
||||||
|
CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
|
||||||
|
END IF;
|
||||||
|
|
||||||
IF NEW.awbFk IS NOT NULL THEN
|
IF NEW.awbFk IS NOT NULL THEN
|
||||||
CALL travel_throwAwb(NEW.id);
|
CALL travel_throwAwb(NEW.id);
|
||||||
END IF;
|
END IF;
|
||||||
|
@ -11526,4 +11488,4 @@ USE `vn2008`;
|
||||||
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
||||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||||
|
|
||||||
-- Dump completed on 2024-11-12 7:06:44
|
-- Dump completed on 2024-12-10 8:18:11
|
||||||
|
|
|
@ -745,15 +745,15 @@ INSERT INTO `vn`.`zoneClosure` (`zoneFk`, `dated`, `hour`)
|
||||||
|
|
||||||
INSERT INTO `vn`.`zoneConfig` (`id`, `scope`) VALUES (1, '1');
|
INSERT INTO `vn`.`zoneConfig` (`id`, `scope`) VALUES (1, '1');
|
||||||
|
|
||||||
INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `zoneFk`)
|
INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `zoneFk`, `dated`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, '1899-12-30 12:15:00', 56, util.VN_CURDATE(), 1, 1, 'first route', 1.8, 10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1),
|
(1, '1899-12-30 12:15:00', 56, util.VN_CURDATE(), 1, 1, 'first route', 1.8, 10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1, util.VN_CURDATE()),
|
||||||
(2, '1899-12-30 13:20:00', 56, util.VN_CURDATE(), 1, 2, 'second route', 0.2, 20, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 9),
|
(2, '1899-12-30 13:20:00', 56, util.VN_CURDATE(), 1, 2, 'second route', 0.2, 20, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 9, util.VN_CURDATE()),
|
||||||
(3, '1899-12-30 14:30:00', 56, util.VN_CURDATE(), 2, 3, 'third route', 0.5, 30, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 10),
|
(3, '1899-12-30 14:30:00', 56, util.VN_CURDATE(), 2, 3, 'third route', 0.5, 30, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 10, util.VN_CURDATE()),
|
||||||
(4, '1899-12-30 15:45:00', 56, util.VN_CURDATE(), 3, 4, 'fourth route', 0, 40, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 12),
|
(4, '1899-12-30 15:45:00', 56, util.VN_CURDATE(), 3, 4, 'fourth route', 0, 40, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 12, util.VN_CURDATE()),
|
||||||
(5, '1899-12-30 16:00:00', 56, util.VN_CURDATE(), 4, 5, 'fifth route', 0.1, 50, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 13),
|
(5, '1899-12-30 16:00:00', 56, util.VN_CURDATE(), 4, 5, 'fifth route', 0.1, 50, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 13, util.VN_CURDATE()),
|
||||||
(6, NULL, 57, util.VN_CURDATE(), 5, 7, 'sixth route', 1.7, 60, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 3),
|
(6, NULL, 57, util.VN_CURDATE(), 5, 7, 'sixth route', 1.7, 60, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 3, util.VN_CURDATE()),
|
||||||
(7, NULL, 57, util.VN_CURDATE(), 6, 8, 'seventh route', 0, 70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5);
|
(7, NULL, 57, util.VN_CURDATE(), 6, 8, 'seventh route', 0, 70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5, util.VN_CURDATE());
|
||||||
|
|
||||||
INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`, `cmrFk`, `problem`, `risk`)
|
INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`, `cmrFk`, `problem`, `risk`)
|
||||||
VALUES
|
VALUES
|
||||||
|
@ -2042,7 +2042,7 @@ INSERT INTO `vn`.`ticketService`(`id`, `description`, `quantity`, `price`, `taxC
|
||||||
INSERT INTO `pbx`.`config` (id,defaultPrefix)
|
INSERT INTO `pbx`.`config` (id,defaultPrefix)
|
||||||
VALUES (1,'0034');
|
VALUES (1,'0034');
|
||||||
|
|
||||||
INSERT INTO `pbx`.`prefix` (country, prefix)
|
INSERT IGNORE INTO `pbx`.`prefix` (country, prefix)
|
||||||
VALUES
|
VALUES
|
||||||
('es', '0034'),
|
('es', '0034'),
|
||||||
('fr', '0033'),
|
('fr', '0033'),
|
||||||
|
@ -3774,7 +3774,8 @@ VALUES
|
||||||
(999992, 18, 50, '2023-09-21', NULL, 1, NULL, 103, NULL),
|
(999992, 18, 50, '2023-09-21', NULL, 1, NULL, 103, NULL),
|
||||||
(1000000, 18, 25, '2023-09-21', 25, 500, NULL, 103, NULL),
|
(1000000, 18, 25, '2023-09-21', 25, 500, NULL, 103, NULL),
|
||||||
(999996, 19, 5, '2023-09-27', 1, 5, NULL, 103, NULL),
|
(999996, 19, 5, '2023-09-27', 1, 5, NULL, 103, NULL),
|
||||||
(999997, 21, 10, '2023-09-27', 5, 100, NULL, 103, NULL);
|
(999997, 21, 10, '2023-09-27', 5, 100, NULL, 103, NULL),
|
||||||
|
(1000000, 16, 25, '2023-08-21',25, 500, NULL, NULL, NULL);
|
||||||
|
|
||||||
-- Previous for Bolas de madera
|
-- Previous for Bolas de madera
|
||||||
INSERT IGNORE INTO vn.sectorCollection
|
INSERT IGNORE INTO vn.sectorCollection
|
||||||
|
@ -4028,10 +4029,11 @@ INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, c
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
|
INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
|
||||||
VALUES (19, '1169'),
|
VALUES (19, '1169'),
|
||||||
(8, '1183');
|
(8, '1183'),
|
||||||
|
(1, '1320');
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
|
INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
|
||||||
VALUES ('saysimle-url-mock', 1320);
|
VALUES ('saysimle-url-mock', '1819');
|
||||||
|
|
||||||
INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
|
INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
|
||||||
VALUES (1106,'26493101E','2019-09-20');
|
VALUES (1106,'26493101E','2019-09-20');
|
||||||
|
|
|
@ -19,14 +19,14 @@ BEGIN
|
||||||
bultos)
|
bultos)
|
||||||
SELECT r.id,
|
SELECT r.id,
|
||||||
r.agencyModeFk,
|
r.agencyModeFk,
|
||||||
r.created,
|
r.dated,
|
||||||
SUM(sv.volume / ebv.m3)
|
SUM(sv.volume / ebv.m3)
|
||||||
FROM vn.route r
|
FROM vn.route r
|
||||||
JOIN vn.ticket t ON t.routeFk = r.id
|
JOIN vn.ticket t ON t.routeFk = r.id
|
||||||
LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
|
LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
|
||||||
JOIN vn.saleVolume sv ON sv.ticketFk = t.id
|
JOIN vn.saleVolume sv ON sv.ticketFk = t.id
|
||||||
JOIN vn.expeditionBoxVol ebv ON ebv.code = 'transportBox'
|
JOIN vn.expeditionBoxVol ebv ON ebv.code = 'transportBox'
|
||||||
WHERE r.created BETWEEN vDatedFrom AND vDatedTo
|
WHERE r.dated BETWEEN vDatedFrom AND vDatedTo
|
||||||
AND z.isVolumetric
|
AND z.isVolumetric
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
|
|
||||||
|
@ -38,12 +38,12 @@ BEGIN
|
||||||
Bultos)
|
Bultos)
|
||||||
SELECT r.id,
|
SELECT r.id,
|
||||||
r.agencyModeFk,
|
r.agencyModeFk,
|
||||||
r.created,
|
r.dated,
|
||||||
SUM(t.packages)
|
SUM(t.packages)
|
||||||
FROM vn.route r
|
FROM vn.route r
|
||||||
JOIN vn.ticket t ON t.routeFk = r.id
|
JOIN vn.ticket t ON t.routeFk = r.id
|
||||||
LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
|
LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
|
||||||
WHERE r.created BETWEEN vDatedFrom AND vDatedTo
|
WHERE r.dated BETWEEN vDatedFrom AND vDatedTo
|
||||||
AND NOT z.isVolumetric
|
AND NOT z.isVolumetric
|
||||||
GROUP BY r.id
|
GROUP BY r.id
|
||||||
ON DUPLICATE KEY UPDATE Bultos = Bultos + VALUES(Bultos);
|
ON DUPLICATE KEY UPDATE Bultos = Bultos + VALUES(Bultos);
|
||||||
|
@ -60,7 +60,7 @@ BEGIN
|
||||||
JOIN vn.component c ON c.id = sc.componentFk
|
JOIN vn.component c ON c.id = sc.componentFk
|
||||||
JOIN vn.componentType ct ON ct.id = c.typeFk
|
JOIN vn.componentType ct ON ct.id = c.typeFk
|
||||||
WHERE ct.code = 'freight'
|
WHERE ct.code = 'freight'
|
||||||
AND r.created BETWEEN vDatedFrom AND vDatedTo
|
AND r.dated BETWEEN vDatedFrom AND vDatedTo
|
||||||
GROUP BY r.id
|
GROUP BY r.id
|
||||||
) sub ON sub.routeFk = r.Id_Ruta
|
) sub ON sub.routeFk = r.Id_Ruta
|
||||||
SET r.practico = IFNULL(sub.totalPractice / r.Bultos, 0);
|
SET r.practico = IFNULL(sub.totalPractice / r.Bultos, 0);
|
||||||
|
@ -77,7 +77,7 @@ BEGIN
|
||||||
JOIN vn.address ad ON ad.id = t.addressFk
|
JOIN vn.address ad ON ad.id = t.addressFk
|
||||||
JOIN vn.client c ON c.id = ad.clientFk
|
JOIN vn.client c ON c.id = ad.clientFk
|
||||||
LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
|
LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
|
||||||
WHERE r.created BETWEEN vDatedFrom AND vDatedTo
|
WHERE r.dated BETWEEN vDatedFrom AND vDatedTo
|
||||||
AND NOT z.isVolumetric
|
AND NOT z.isVolumetric
|
||||||
GROUP BY t.routeFk
|
GROUP BY t.routeFk
|
||||||
) sub ON r.Id_Ruta = sub.routeFk
|
) sub ON r.Id_Ruta = sub.routeFk
|
||||||
|
@ -93,7 +93,7 @@ BEGIN
|
||||||
JOIN vn.saleVolume sf ON sf.ticketFk = t.id
|
JOIN vn.saleVolume sf ON sf.ticketFk = t.id
|
||||||
JOIN vn.client c ON c.id = t.clientFk
|
JOIN vn.client c ON c.id = t.clientFk
|
||||||
JOIN vn.`zone` z ON z.id = t.zoneFk
|
JOIN vn.`zone` z ON z.id = t.zoneFk
|
||||||
WHERE r.created BETWEEN vDatedFrom AND vDatedTo
|
WHERE r.dated BETWEEN vDatedFrom AND vDatedTo
|
||||||
AND z.isVolumetric
|
AND z.isVolumetric
|
||||||
GROUP BY t.routeFk
|
GROUP BY t.routeFk
|
||||||
) sub ON r.Id_Ruta = sub.routeFk
|
) sub ON r.Id_Ruta = sub.routeFk
|
||||||
|
@ -108,7 +108,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
JOIN vn.greuge g ON g.ticketFk = t.id
|
JOIN vn.greuge g ON g.ticketFk = t.id
|
||||||
JOIN vn.greugeType gt ON gt.id = g.greugeTypeFk
|
JOIN vn.greugeType gt ON gt.id = g.greugeTypeFk
|
||||||
WHERE r.created BETWEEN vDatedFrom AND vDatedTo
|
WHERE r.dated BETWEEN vDatedFrom AND vDatedTo
|
||||||
AND gt.code = 'freightDifference'
|
AND gt.code = 'freightDifference'
|
||||||
GROUP BY t.routeFk
|
GROUP BY t.routeFk
|
||||||
) sub ON r.Id_Ruta = sub.routeFk
|
) sub ON r.Id_Ruta = sub.routeFk
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
|
||||||
SQL SECURITY DEFINER
|
|
||||||
VIEW `bi`.`rotacion`
|
|
||||||
AS SELECT `ic`.`itemFk` AS `Id_Article`,
|
|
||||||
`ic`.`warehouseFk` AS `warehouse_id`,
|
|
||||||
`ic`.`quantity` AS `total`,
|
|
||||||
`ic`.`rotation` AS `rotacion`,
|
|
||||||
`ic`.`cm3` AS `cm3`,
|
|
||||||
`ic`.`storage` AS `almacenaje`,
|
|
||||||
`ic`.`handling` AS `manipulacion`,
|
|
||||||
`ic`.`extraCharge` AS `auxiliar`,
|
|
||||||
`ic`.`wasted` AS `mermas`,
|
|
||||||
`ic`.`cm3delivery` AS `cm3reparto`,
|
|
||||||
`ic`.`grams` AS `grams`
|
|
||||||
FROM `vn`.`itemCost` `ic`
|
|
|
@ -26,7 +26,7 @@ BEGIN
|
||||||
|
|
||||||
DECLARE vCursor CURSOR FOR
|
DECLARE vCursor CURSOR FOR
|
||||||
SELECT it.taxableBase,
|
SELECT it.taxableBase,
|
||||||
CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
|
CAST(SUM((( it.taxableBase / 100) * t.PorcentajeIva)) AS DECIMAL (10,2)),
|
||||||
t.PorcentajeIva,
|
t.PorcentajeIva,
|
||||||
it.transactionTypeSageFk,
|
it.transactionTypeSageFk,
|
||||||
it.taxTypeSageFk,
|
it.taxTypeSageFk,
|
||||||
|
@ -39,7 +39,8 @@ BEGIN
|
||||||
JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
|
JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
|
||||||
LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
|
LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
|
||||||
WHERE i.id = vInvoiceInFk
|
WHERE i.id = vInvoiceInFk
|
||||||
AND d.id IS NULL;
|
AND d.id IS NULL
|
||||||
|
GROUP BY it.taxTypeSageFk;
|
||||||
|
|
||||||
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
|
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`buy_getLastWithoutInventory`(
|
||||||
|
vItemFk INT,
|
||||||
|
vWarehouseFk INT
|
||||||
|
)
|
||||||
|
RETURNS int(11)
|
||||||
|
DETERMINISTIC
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Retorna la última compra que no sea inventario.
|
||||||
|
*
|
||||||
|
* @param vItemFk Id del artículo
|
||||||
|
* @param vWarehouseFk Id del almacén
|
||||||
|
* @return Id de compra
|
||||||
|
*/
|
||||||
|
DECLARE vBuyFk INT;
|
||||||
|
|
||||||
|
SELECT b.id INTO vBuyFk
|
||||||
|
FROM buy b
|
||||||
|
JOIN entry e ON e.id = b.entryFk
|
||||||
|
JOIN travel t ON t.id = e.travelFk
|
||||||
|
WHERE e.id <> (SELECT defaultEntry FROM entryConfig)
|
||||||
|
AND e.supplierFk <> (SELECT supplierFk FROM inventoryConfig)
|
||||||
|
AND e.typeFk <> 'inventory'
|
||||||
|
AND b.itemFk = vItemFk
|
||||||
|
AND (t.warehouseInFk = vWarehouseFk OR t.warehouseInFk IS NULL)
|
||||||
|
ORDER BY ABS(DATEDIFF(util.VN_CURDATE(), t.landed)), e.created DESC
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
|
RETURN vBuyFk;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -26,7 +26,7 @@ BEGIN
|
||||||
JOIN cache.zoneAgencyFriendship zf ON zf.agencyModeFk = r.agencyModeFk
|
JOIN cache.zoneAgencyFriendship zf ON zf.agencyModeFk = r.agencyModeFk
|
||||||
WHERE friendship >= vSignificativeFriendship
|
WHERE friendship >= vSignificativeFriendship
|
||||||
AND zf.zoneFk = vZoneFk
|
AND zf.zoneFk = vZoneFk
|
||||||
AND r.created = vLanded
|
AND r.dated = vLanded
|
||||||
ORDER BY friendship;
|
ORDER BY friendship;
|
||||||
|
|
||||||
-- Se eliminan aquellas que superan el volumen máximo
|
-- Se eliminan aquellas que superan el volumen máximo
|
||||||
|
|
|
@ -26,7 +26,7 @@ BEGIN
|
||||||
JOIN cache.zoneAgencyFriendship zf ON zf.agencyModeFk = r.agencyModeFk
|
JOIN cache.zoneAgencyFriendship zf ON zf.agencyModeFk = r.agencyModeFk
|
||||||
WHERE friendship >= vSignificativeFriendship
|
WHERE friendship >= vSignificativeFriendship
|
||||||
AND zf.zoneFk = vZoneFk
|
AND zf.zoneFk = vZoneFk
|
||||||
AND r.created = vLanded
|
AND r.dated = vLanded
|
||||||
ORDER BY friendship;
|
ORDER BY friendship;
|
||||||
|
|
||||||
-- Se eliminan aquellas que superan el volumen máximo
|
-- Se eliminan aquellas que superan el volumen máximo
|
||||||
|
|
|
@ -23,12 +23,13 @@ BEGIN
|
||||||
LEAST(bb.stickers, FLOOR(ish.visible / ish.packing)) ishStickers,
|
LEAST(bb.stickers, FLOOR(ish.visible / ish.packing)) ishStickers,
|
||||||
bb.stickers buyStickers
|
bb.stickers buyStickers
|
||||||
FROM itemShelving ish
|
FROM itemShelving ish
|
||||||
|
JOIN shelving sh ON sh.id = ish.shelvingFk
|
||||||
JOIN (SELECT b.id, b.itemFk, b.stickers
|
JOIN (SELECT b.id, b.itemFk, b.stickers
|
||||||
FROM buy b
|
FROM buy b
|
||||||
WHERE b.entryFk = vFromEntryFk
|
WHERE b.entryFk = vFromEntryFk
|
||||||
ORDER BY b.stickers DESC
|
ORDER BY b.stickers DESC
|
||||||
LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
|
LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
|
||||||
WHERE ish.shelvingFk = vShelvingCode COLLATE utf8_general_ci
|
WHERE sh.code = vShelvingCode COLLATE utf8_general_ci
|
||||||
AND NOT ish.isSplit
|
AND NOT ish.isSplit
|
||||||
GROUP BY ish.id;
|
GROUP BY ish.id;
|
||||||
|
|
||||||
|
|
|
@ -4,12 +4,12 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expeditionScan_Put`(
|
||||||
vExpeditionFk INT
|
vExpeditionFk INT
|
||||||
)
|
)
|
||||||
BEGIN
|
BEGIN
|
||||||
IF NOT (SELECT TRUE FROM expedition WHERE id = vExpeditionFk LIMIT 1) THEN
|
IF NOT EXISTS (SELECT id FROM expeditionPallet WHERE id = vPalletFk) THEN
|
||||||
CALL util.throw('Expedition not exists');
|
CALL util.throw('Pallet not exists');
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
IF NOT (SELECT TRUE FROM expeditionPallet WHERE id = vPalletFk LIMIT 1) THEN
|
IF NOT EXISTS (SELECT id FROM expedition WHERE id = vExpeditionFk) THEN
|
||||||
CALL util.throw('Pallet not exists');
|
CALL util.throw('Expedition not exists');
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
REPLACE expeditionScan(expeditionFk, palletFk)
|
REPLACE expeditionScan(expeditionFk, palletFk)
|
||||||
|
|
|
@ -41,6 +41,6 @@ BEGIN
|
||||||
WHERE expeditionFk = e.id)
|
WHERE expeditionFk = e.id)
|
||||||
LEFT JOIN expeditionState es2 ON es2.id = es.id
|
LEFT JOIN expeditionState es2 ON es2.id = es.id
|
||||||
WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
|
WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
|
||||||
ORDER BY r.created, t.priority DESC;
|
ORDER BY r.dated, t.priority DESC;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expedition_selfConsum
|
||||||
vSelf INT,
|
vSelf INT,
|
||||||
vAction ENUM('add', 'remove')
|
vAction ENUM('add', 'remove')
|
||||||
)
|
)
|
||||||
BEGIN
|
proc:BEGIN
|
||||||
/**
|
/**
|
||||||
* Maneja el consumo de cajas para autoconsumo, permitiendo
|
* Maneja el consumo de cajas para autoconsumo, permitiendo
|
||||||
* añadir o quitar cajas utilizadas según la acción indicada.
|
* añadir o quitar cajas utilizadas según la acción indicada.
|
||||||
|
@ -37,14 +37,14 @@ BEGIN
|
||||||
vWarehouseFk,
|
vWarehouseFk,
|
||||||
vCreated
|
vCreated
|
||||||
FROM expedition e
|
FROM expedition e
|
||||||
JOIN packaging p ON p.id = e.packagingFk
|
LEFT JOIN packaging p ON p.id = e.packagingFk
|
||||||
JOIN item i ON i.id = p.itemFk
|
LEFT JOIN item i ON i.id = p.itemFk
|
||||||
JOIN ticket t ON t.id = e.ticketFk
|
JOIN ticket t ON t.id = e.ticketFk
|
||||||
JOIN productionConfig pc
|
JOIN productionConfig pc
|
||||||
WHERE e.id = vSelf;
|
WHERE e.id = vSelf;
|
||||||
|
|
||||||
IF vClientFk IS NULL OR vAddressFk IS NULL THEN
|
IF vClientFk IS NULL OR vItemFk IS NULL THEN
|
||||||
CALL util.throw('Some config parameters are not set');
|
LEAVE proc;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SET vCreated = DATE(vCreated);
|
SET vCreated = DATE(vCreated);
|
||||||
|
@ -54,7 +54,9 @@ BEGIN
|
||||||
WHERE shipped BETWEEN vCreated AND util.dayEnd(vCreated)
|
WHERE shipped BETWEEN vCreated AND util.dayEnd(vCreated)
|
||||||
AND clientFk = vClientFk
|
AND clientFk = vClientFk
|
||||||
AND addressFk = vAddressFk
|
AND addressFk = vAddressFk
|
||||||
AND warehouseFk = vWarehouseFk;
|
AND warehouseFk = vWarehouseFk
|
||||||
|
AND nickname = 'CAJAS AUTOCONSUMO'
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
IF vTicketFk IS NULL AND vAction = 'add' THEN
|
IF vTicketFk IS NULL AND vAction = 'add' THEN
|
||||||
INSERT INTO ticket(clientFk, warehouseFk, shipped, nickname, addressFk)
|
INSERT INTO ticket(clientFk, warehouseFk, shipped, nickname, addressFk)
|
||||||
|
|
|
@ -219,7 +219,7 @@ BEGIN
|
||||||
) eWithheld ON TRUE
|
) eWithheld ON TRUE
|
||||||
WHERE tii.taxTypeSageFk IS NOT NULL
|
WHERE tii.taxTypeSageFk IS NOT NULL
|
||||||
AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21'))
|
AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21'))
|
||||||
GROUP BY tii.PorcentajeIva, tii.expenseFk;
|
GROUP BY tii.CuentaIvaRepercutido;
|
||||||
|
|
||||||
-- Línea iva inversor sujeto pasivo
|
-- Línea iva inversor sujeto pasivo
|
||||||
INSERT INTO XDiario(
|
INSERT INTO XDiario(
|
||||||
|
@ -284,7 +284,7 @@ BEGIN
|
||||||
AND NOT(tii.isVies
|
AND NOT(tii.isVies
|
||||||
AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk
|
AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk
|
||||||
AND tii.taxCode = 'nonTaxable')
|
AND tii.taxCode = 'nonTaxable')
|
||||||
GROUP BY tii.PorcentajeIva, tii.expenseFk;
|
GROUP BY tii.CuentaIvaRepercutido;
|
||||||
|
|
||||||
-- Actualización del registro original
|
-- Actualización del registro original
|
||||||
UPDATE invoiceIn ii
|
UPDATE invoiceIn ii
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingLog_get`(
|
|
||||||
vShelvingCode VARCHAR(10)
|
|
||||||
)
|
|
||||||
BEGIN
|
|
||||||
/**
|
|
||||||
* Devuelve el log de los item en cada carro
|
|
||||||
*
|
|
||||||
* @param vShelvingCode Matrícula del carro
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
SELECT isl.itemShelvingFk,
|
|
||||||
isl.created,
|
|
||||||
isl.accion,
|
|
||||||
isl.itemFk,
|
|
||||||
isl.shelvingFk,
|
|
||||||
isl.quantity,
|
|
||||||
isl.visible,
|
|
||||||
isl.available,
|
|
||||||
isl.grouping,
|
|
||||||
isl.packing,
|
|
||||||
isl.stars,
|
|
||||||
item.longName,
|
|
||||||
item.size,
|
|
||||||
item.subName,
|
|
||||||
worker.code,
|
|
||||||
isl.accion
|
|
||||||
FROM item
|
|
||||||
JOIN itemShelvingLog isl ON item.id = isl.itemFk
|
|
||||||
JOIN worker ON isl.workerFk = worker.id
|
|
||||||
JOIN shelving sh ON sh.id = isl.shelvingFk
|
|
||||||
WHERE sh.code = vShelvingCode COLLATE utf8mb3_unicode_ci
|
|
||||||
OR isl.itemFk = vShelvingCode -- ?? Respeto porque ya estaba
|
|
||||||
ORDER BY isl.created DESC;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -27,7 +27,7 @@ BEGIN
|
||||||
rm.ticketFree = 0,
|
rm.ticketFree = 0,
|
||||||
rm.ticketProduction = 0,
|
rm.ticketProduction = 0,
|
||||||
rm.ticketPacked = 0,
|
rm.ticketPacked = 0,
|
||||||
rm.dated = r.created;
|
rm.dated = r.dated;
|
||||||
|
|
||||||
UPDATE routesMonitor rm
|
UPDATE routesMonitor rm
|
||||||
JOIN (
|
JOIN (
|
||||||
|
|
|
@ -11,8 +11,10 @@ BEGIN
|
||||||
*/
|
*/
|
||||||
DECLARE vIsUpdatable, vIsFreelance BOOL DEFAULT 0;
|
DECLARE vIsUpdatable, vIsFreelance BOOL DEFAULT 0;
|
||||||
DECLARE vAgencyModePricePercentage DOUBLE;
|
DECLARE vAgencyModePricePercentage DOUBLE;
|
||||||
|
DECLARE vIsKmTruckRate BOOL;
|
||||||
|
DECLARE vCountryFk INT;
|
||||||
|
|
||||||
SELECT r.created >= rc.cutoffDated INTO vIsUpdatable
|
SELECT r.dated >= rc.cutoffDated INTO vIsUpdatable
|
||||||
FROM route r
|
FROM route r
|
||||||
JOIN routeConfig rc
|
JOIN routeConfig rc
|
||||||
WHERE r.id = vSelf;
|
WHERE r.id = vSelf;
|
||||||
|
@ -21,10 +23,17 @@ BEGIN
|
||||||
DELETE FROM routeCommission
|
DELETE FROM routeCommission
|
||||||
WHERE routeFk = vSelf;
|
WHERE routeFk = vSelf;
|
||||||
|
|
||||||
SELECT w.isFreelance INTO vIsFreelance
|
SELECT w.isFreelance, v.isKmTruckRate, p.countryFk INTO vIsFreelance, vIsKmTruckRate, vCountryFk
|
||||||
FROM route r
|
FROM route r
|
||||||
JOIN worker w ON w.id = r.workerFk
|
JOIN worker w ON w.id = r.workerFk
|
||||||
WHERE r.id = vSelf;
|
JOIN vehicle v ON v.id = r.vehicleFk
|
||||||
|
LEFT JOIN ticket t ON t.routeFk = r.id
|
||||||
|
LEFT JOIN address a ON a.id = t.addressFk
|
||||||
|
LEFT JOIN province p ON p.id = a.provinceFk
|
||||||
|
WHERE r.id = vSelf
|
||||||
|
GROUP BY p.countryFk
|
||||||
|
ORDER BY COUNT(*) DESC
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
SELECT ampp.percentage INTO vAgencyModePricePercentage
|
SELECT ampp.percentage INTO vAgencyModePricePercentage
|
||||||
FROM route r
|
FROM route r
|
||||||
|
@ -39,7 +48,9 @@ BEGIN
|
||||||
workCenterFk,
|
workCenterFk,
|
||||||
freelanceYearlyM3,
|
freelanceYearlyM3,
|
||||||
cat4m3,
|
cat4m3,
|
||||||
cat5m3
|
cat5m3,
|
||||||
|
isKmTruckRate,
|
||||||
|
countryFk
|
||||||
)
|
)
|
||||||
SELECT vSelf,
|
SELECT vSelf,
|
||||||
r.commissionWorkCenterFk,
|
r.commissionWorkCenterFk,
|
||||||
|
@ -51,11 +62,14 @@ BEGIN
|
||||||
IFNULL(r.m3, 0),
|
IFNULL(r.m3, 0),
|
||||||
0
|
0
|
||||||
),
|
),
|
||||||
rc.distributionCat4M3 * IFNULL(r.m3, 0),
|
IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
|
||||||
rc.distributionCat5M3 * IFNULL(r.m3, 0)
|
IFNULL(wc.distributionCat5M3, rc.distributionCat5M3) * IFNULL(r.m3, 0),
|
||||||
|
vIsKmTruckRate,
|
||||||
|
vCountryFk
|
||||||
FROM route r
|
FROM route r
|
||||||
JOIN vehicle v ON v.id = r.vehicleFk
|
JOIN vehicle v ON v.id = r.vehicleFk
|
||||||
JOIN routeConfig rc
|
JOIN routeConfig rc
|
||||||
|
LEFT JOIN workCenterCommission wc ON wc.workCenterFk = r.commissionWorkCenterFk
|
||||||
WHERE r.id = vSelf
|
WHERE r.id = vSelf
|
||||||
AND r.workerFk
|
AND r.workerFk
|
||||||
AND r.commissionWorkCenterFk;
|
AND r.commissionWorkCenterFk;
|
||||||
|
@ -68,21 +82,28 @@ BEGIN
|
||||||
yearlyKm,
|
yearlyKm,
|
||||||
yearlyM3,
|
yearlyM3,
|
||||||
cat4m3,
|
cat4m3,
|
||||||
cat5m3
|
cat5m3,
|
||||||
|
isKmTruckRate,
|
||||||
|
countryFk
|
||||||
)
|
)
|
||||||
SELECT vSelf,
|
SELECT vSelf,
|
||||||
r.commissionWorkCenterFk,
|
r.commissionWorkCenterFk,
|
||||||
(r.kmEnd - r.kmStart) *
|
(r.kmEnd - r.kmStart) *
|
||||||
IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight),
|
IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight),
|
||||||
IFNULL(r.m3, 0) *
|
IFNULL(r.m3, 0) *
|
||||||
IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4),
|
IF(v.isKmTruckRate,
|
||||||
|
IFNULL(wc.deliveryM3Cat5, rc.deliveryM3Cat5),
|
||||||
|
IFNULL(wc.deliveryM3Cat4, rc.deliveryM3Cat4)),
|
||||||
(r.kmEnd - r.kmStart) * rc.kmYearly,
|
(r.kmEnd - r.kmStart) * rc.kmYearly,
|
||||||
IFNULL(r.m3, 0) * rc.m3Yearly,
|
IFNULL(r.m3, 0) * rc.m3Yearly,
|
||||||
rc.distributionCat4M3 * IFNULL(r.m3, 0),
|
IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
|
||||||
rc.distributionCat5M3 * IFNULL(r.m3, 0)
|
IFNULL(wc.distributionCat5M3, rc.distributionCat5M3) * IFNULL(r.m3, 0),
|
||||||
|
vIsKmTruckRate,
|
||||||
|
vCountryFk
|
||||||
FROM route r
|
FROM route r
|
||||||
JOIN vehicle v ON v.id = r.vehicleFk
|
JOIN vehicle v ON v.id = r.vehicleFk
|
||||||
JOIN routeConfig rc
|
JOIN routeConfig rc
|
||||||
|
LEFT JOIN workCenterCommission wc ON wc.workCenterFk = r.commissionWorkCenterFk
|
||||||
WHERE r.id = vSelf
|
WHERE r.id = vSelf
|
||||||
AND r.kmStart
|
AND r.kmStart
|
||||||
AND r.kmEnd
|
AND r.kmEnd
|
||||||
|
|
|
@ -16,7 +16,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND ic.itemFk = NEW.itemFk
|
AND ic.itemFk = NEW.itemFk
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
IF NEW.cm3Delivery = 0 AND NEW.warehouseFk = 60 THEN
|
IF NEW.cm3Delivery = 0 AND NEW.warehouseFk = 60 THEN
|
||||||
CALL mail_insert(
|
CALL mail_insert(
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelving_afterInsert`
|
|
||||||
AFTER INSERT ON `itemShelving`
|
|
||||||
FOR EACH ROW
|
|
||||||
BEGIN
|
|
||||||
INSERT INTO itemShelvingLog
|
|
||||||
SET itemShelvingFk = NEW.id,
|
|
||||||
workerFk = account.myUser_getId(),
|
|
||||||
accion = 'CREA REGISTRO',
|
|
||||||
itemFk = NEW.itemFk,
|
|
||||||
shelvingFk = NEW.shelvingFk,
|
|
||||||
visible = NEW.visible,
|
|
||||||
`grouping` = NEW.`grouping`,
|
|
||||||
packing = NEW.packing,
|
|
||||||
available = NEW.available;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,18 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelving_afterUpdate`
|
|
||||||
AFTER UPDATE ON `itemShelving`
|
|
||||||
FOR EACH ROW
|
|
||||||
BEGIN
|
|
||||||
INSERT INTO itemShelvingLog
|
|
||||||
SET itemShelvingFk = NEW.id,
|
|
||||||
workerFk = account.myUser_getId(),
|
|
||||||
accion = 'CAMBIO',
|
|
||||||
itemFk = NEW.itemFk,
|
|
||||||
shelvingFk = NEW.shelvingFk,
|
|
||||||
visible = NEW.visible,
|
|
||||||
`grouping` = NEW.`grouping`,
|
|
||||||
packing = NEW.packing,
|
|
||||||
available = NEW.available;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,15 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelving_beforeDelete`
|
|
||||||
BEFORE DELETE ON `itemShelving`
|
|
||||||
FOR EACH ROW
|
|
||||||
INSERT INTO vn.itemShelvingLog(itemShelvingFk,
|
|
||||||
workerFk,
|
|
||||||
accion,
|
|
||||||
shelvingFk,
|
|
||||||
itemFk)
|
|
||||||
VALUES( OLD.id,
|
|
||||||
account.myUser_getId(),
|
|
||||||
'ELIMINADO',
|
|
||||||
OLD.shelvingFk,
|
|
||||||
OLD.itemFk)$$
|
|
||||||
DELIMITER ;
|
|
|
@ -14,7 +14,7 @@ BEGIN
|
||||||
SELECT IFNULL(b.workCenterFK, r.defaultWorkCenterFk)
|
SELECT IFNULL(b.workCenterFK, r.defaultWorkCenterFk)
|
||||||
FROM vn.routeConfig r
|
FROM vn.routeConfig r
|
||||||
LEFT JOIN vn.business b ON b.workerFk = vUserFk
|
LEFT JOIN vn.business b ON b.workerFk = vUserFk
|
||||||
AND NEW.created BETWEEN b.started AND IFNULL(b.ended, NEW.created));
|
AND NEW.dated BETWEEN b.started AND IFNULL(b.ended, NEW.dated));
|
||||||
|
|
||||||
IF ISNULL(NEW.agencyModeFk) THEN
|
IF ISNULL(NEW.agencyModeFk) THEN
|
||||||
SELECT r.agencyModeFk INTO vDefaultAgencyModeFk
|
SELECT r.agencyModeFk INTO vDefaultAgencyModeFk
|
||||||
|
|
|
@ -23,7 +23,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND s.id = NEW.id
|
AND s.id = NEW.id
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
END IF;
|
END IF;
|
||||||
END$$
|
END$$
|
||||||
|
|
|
@ -54,7 +54,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND s.id = NEW.id
|
AND s.id = NEW.id
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND s.id = OLD.id
|
AND s.id = OLD.id
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
END IF;
|
END IF;
|
||||||
END$$
|
END$$
|
||||||
|
|
|
@ -8,7 +8,7 @@ BEGIN
|
||||||
FROM vn.route r
|
FROM vn.route r
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND r.id = OLD.routeFk
|
AND r.id = OLD.routeFk
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
|
|
||||||
DELETE FROM sale WHERE ticketFk = OLD.id;
|
DELETE FROM sale WHERE ticketFk = OLD.id;
|
||||||
|
|
|
@ -22,7 +22,7 @@ BEGIN
|
||||||
FROM `route`
|
FROM `route`
|
||||||
WHERE NOT isOk
|
WHERE NOT isOk
|
||||||
AND id IN (OLD.routeFk, NEW.routeFk)
|
AND id IN (OLD.routeFk, NEW.routeFk)
|
||||||
AND created >= util.VN_CURDATE()
|
AND dated >= util.VN_CURDATE()
|
||||||
GROUP BY id;
|
GROUP BY id;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ BEGIN
|
||||||
JOIN vn.route r ON r.id = t.routeFk
|
JOIN vn.route r ON r.id = t.routeFk
|
||||||
WHERE r.isOk = FALSE
|
WHERE r.isOk = FALSE
|
||||||
AND t.id = NEW.id
|
AND t.id = NEW.id
|
||||||
AND r.created >= util.VN_CURDATE()
|
AND r.dated >= util.VN_CURDATE()
|
||||||
GROUP BY r.id;
|
GROUP BY r.id;
|
||||||
SET NEW.shipped = DATE_FORMAT(NEW.shipped, '2000-%m-%d %T');
|
SET NEW.shipped = DATE_FORMAT(NEW.shipped, '2000-%m-%d %T');
|
||||||
SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T');
|
SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T');
|
||||||
|
|
|
@ -20,10 +20,6 @@ BEGIN
|
||||||
CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
|
CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
IF NOT (NEW.isRaid <=> OLD.isRaid) OR NOT (NEW.daysInForward <=> OLD.daysInForward) THEN
|
|
||||||
CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NOT (NEW.awbFk <=> OLD.awbFk)THEN
|
IF NOT (NEW.awbFk <=> OLD.awbFk)THEN
|
||||||
SELECT COUNT(*) INTO vHasAnyInvoiceBooked
|
SELECT COUNT(*) INTO vHasAnyInvoiceBooked
|
||||||
FROM travel t
|
FROM travel t
|
||||||
|
|
|
@ -9,8 +9,8 @@ AS SELECT `rs2`.`description` AS `truck`,
|
||||||
`rs`.`id` <=> `rm`.`roadmapStopFk` AS `isMatch`,
|
`rs`.`id` <=> `rm`.`roadmapStopFk` AS `isMatch`,
|
||||||
`t`.`warehouseFk` AS `warehouseFk`,
|
`t`.`warehouseFk` AS `warehouseFk`,
|
||||||
IF(
|
IF(
|
||||||
`r`.`created` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY,
|
`r`.`dated` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY,
|
||||||
ucase(dayname(`r`.`created`)),
|
ucase(dayname(`r`.`dated`)),
|
||||||
NULL
|
NULL
|
||||||
) AS `nombreDia`
|
) AS `nombreDia`
|
||||||
FROM (
|
FROM (
|
||||||
|
|
|
@ -6,7 +6,7 @@ AS SELECT `r`.`id` AS `routeFk`,
|
||||||
COUNT(DISTINCT `e`.`id`) AS `expeditions`,
|
COUNT(DISTINCT `e`.`id`) AS `expeditions`,
|
||||||
COUNT(DISTINCT `es`.`id`) AS `scanned`,
|
COUNT(DISTINCT `es`.`id`) AS `scanned`,
|
||||||
max(`e`.`created`) AS `lastPacked`,
|
max(`e`.`created`) AS `lastPacked`,
|
||||||
`r`.`created` AS `created`
|
`r`.`dated` AS `created`
|
||||||
FROM (
|
FROM (
|
||||||
(
|
(
|
||||||
(
|
(
|
||||||
|
@ -23,5 +23,5 @@ FROM (
|
||||||
)
|
)
|
||||||
LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`expeditionFk` = `e`.`id`)
|
LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`expeditionFk` = `e`.`id`)
|
||||||
)
|
)
|
||||||
WHERE `r`.`created` >= `util`.`yesterday`()
|
WHERE `r`.`dated` >= `util`.`yesterday`()
|
||||||
GROUP BY `r`.`id`
|
GROUP BY `r`.`id`
|
||||||
|
|
|
@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||||
VIEW `vn2008`.`Rutas`
|
VIEW `vn2008`.`Rutas`
|
||||||
AS SELECT `r`.`id` AS `Id_Ruta`,
|
AS SELECT `r`.`id` AS `Id_Ruta`,
|
||||||
`r`.`workerFk` AS `Id_Trabajador`,
|
`r`.`workerFk` AS `Id_Trabajador`,
|
||||||
`r`.`created` AS `Fecha`,
|
`r`.`dated` AS `Fecha`,
|
||||||
`r`.`vehicleFk` AS `Id_Vehiculo`,
|
`r`.`vehicleFk` AS `Id_Vehiculo`,
|
||||||
`r`.`agencyModeFk` AS `Id_Agencia`,
|
`r`.`agencyModeFk` AS `Id_Agencia`,
|
||||||
`r`.`time` AS `Hora`,
|
`r`.`time` AS `Hora`,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ALTER TABLE vn.travel ADD isRaid tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Redada';
|
ALTER TABLE vn.travel ADD IF NOT EXISTS isRaid tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Redada';
|
||||||
|
|
||||||
ALTER TABLE vn.travel MODIFY COLUMN daysInForward int(10) unsigned DEFAULT NULL
|
ALTER TABLE vn.travel MODIFY COLUMN daysInForward int(10) unsigned DEFAULT NULL
|
||||||
COMMENT 'Cuando es una redada, indica el número de días que se añadirán a la fecha de hoy para establecer el landed. NULL si no es una redada';
|
COMMENT 'Cuando es una redada, indica el número de días que se añadirán a la fecha de hoy para establecer el landed. NULL si no es una redada';
|
|
@ -0,0 +1,51 @@
|
||||||
|
|
||||||
|
ALTER TABLE vn.routeCommission ADD IF NOT EXISTS countryFk mediumint(8) unsigned DEFAULT NULL NULL;
|
||||||
|
ALTER TABLE vn.routeCommission ADD IF NOT EXISTS isKmTruckRate TINYINT(1) DEFAULT NULL NULL;
|
||||||
|
|
||||||
|
ALTER TABLE vn.routeCommission DROP FOREIGN KEY IF EXISTS routeCommission_country_FK;
|
||||||
|
ALTER TABLE vn.routeCommission ADD CONSTRAINT routeCommission_country_FK FOREIGN KEY (countryFk)
|
||||||
|
REFERENCES vn.country(id) ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS vn.workCenterCommission (
|
||||||
|
`workCenterFk` INT(11) NOT NULL,
|
||||||
|
`deliveryManAdjustment` DECIMAL(4,2) DEFAULT NULL
|
||||||
|
COMMENT 'Número de trabajadores para equilibrar los repartidores de diferentes centros.
|
||||||
|
Utilizado en repartidores de grafana',
|
||||||
|
`distributionM3Category1` decimal(5,2) DEFAULT NULL,
|
||||||
|
`distributionM3Category2` decimal(5,2) DEFAULT NULL,
|
||||||
|
`distributionCat4M3` DECIMAL(5,2) DEFAULT NULL
|
||||||
|
COMMENT 'Comisión por gestión de la distribución Cat IV',
|
||||||
|
`distributionCat5M3` DECIMAL(5,2) DEFAULT NULL
|
||||||
|
COMMENT 'Comisión por gestión de la distribución Cat V',
|
||||||
|
PRIMARY KEY (`workCenterFk`),
|
||||||
|
CONSTRAINT `workCenterCommission_workCenterFk` FOREIGN KEY (`workCenterFk`)
|
||||||
|
REFERENCES `workCenter` (`id`) ON UPDATE CASCADE ON DELETE RESTRICT
|
||||||
|
);
|
||||||
|
|
||||||
|
UPDATE vn.routeCommission rc
|
||||||
|
JOIN (SELECT id, countryFk, isKmTruckRate
|
||||||
|
FROM (SELECT r.id, c.countryFk, v.isKmTruckRate
|
||||||
|
FROM vn.route r
|
||||||
|
JOIN vn.routeCommission rc ON rc.routeFk = r.id
|
||||||
|
LEFT JOIN vn.ticket t ON t.routeFk = r.id
|
||||||
|
LEFT JOIN vn.client c ON c.id = t.clientFk
|
||||||
|
LEFT JOIN vn.vehicle v ON v.id = r.vehicleFk
|
||||||
|
WHERE r.created >= '2023-12-01'
|
||||||
|
GROUP BY r.id, c.countryFk
|
||||||
|
ORDER BY r.id, COUNT(*) DESC
|
||||||
|
LIMIT 100000000000
|
||||||
|
)sub
|
||||||
|
GROUP BY id
|
||||||
|
)sub ON sub.id = rc.routeFk
|
||||||
|
SET rc.isKmTruckRate = sub.isKmTruckRate,
|
||||||
|
rc.countryFk = sub.countryFk;
|
||||||
|
|
||||||
|
ALTER TABLE vn.workerDistributionCategory ADD IF NOT EXISTS countryFk mediumint(8) unsigned DEFAULT NULL NULL;
|
||||||
|
ALTER TABLE vn.workerDistributionCategory ADD IF NOT EXISTS isKmTruckRate TINYINT(1) DEFAULT NULL NULL;
|
||||||
|
|
||||||
|
ALTER TABLE vn.workerDistributionCategory DROP FOREIGN KEY IF EXISTS workerDistributionCategory_country_FK;
|
||||||
|
ALTER TABLE vn.workerDistributionCategory ADD CONSTRAINT workerDistributionCategory_country_FK FOREIGN KEY (countryFk)
|
||||||
|
REFERENCES vn.country(id) ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
ALTER TABLE vn.workerDistributionCategory ADD IF NOT EXISTS commissionSplitWorkers INT UNSIGNED NOT NULL DEFAULT 1
|
||||||
|
COMMENT 'Número de enrutadores entr los que se reparte la comsión';
|
|
@ -0,0 +1,8 @@
|
||||||
|
DELETE FROM vn.stateI18n
|
||||||
|
WHERE `name` IN ('Billed', 'Facturado', 'Assisted preparation', 'Preparación asistida', 'Shipped', 'Embarcado', 'Stowaway OK', 'Polizón OK');
|
||||||
|
|
||||||
|
UPDATE vn.`state` SET nextStateFk = 43
|
||||||
|
WHERE nextStateFk IN (11, 27, 30, 32, 41);
|
||||||
|
|
||||||
|
DELETE FROM vn.`state`
|
||||||
|
WHERE code IN ('INVOICED', 'ASSISTED_PREPARATION', 'BOARD', 'OK STOWAWAY', 'PARTIAL_PREPARATION');
|
|
@ -0,0 +1,4 @@
|
||||||
|
|
||||||
|
|
||||||
|
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
|
||||||
|
VALUES('SaleGroup', 'find', 'READ', 'ALLOW', 'ROLE', 'production');
|
|
@ -0,0 +1,7 @@
|
||||||
|
ALTER TABLE vn.workCenterCommission ADD IF NOT EXISTS deliveryM3Cat4 DECIMAL(5,2) DEFAULT NULL NULL;
|
||||||
|
ALTER TABLE vn.workCenterCommission ADD IF NOT EXISTS deliveryM3Cat5 DECIMAL(5,2) DEFAULT NULL NULL;
|
||||||
|
|
||||||
|
INSERT IGNORE INTO vn.workCenterCommission (workCenterFk, deliveryM3Cat4, deliveryM3Cat5)
|
||||||
|
VALUES (5,8.0,8.0);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
RENAME TABLE vn.itemShelvingLog TO vn.itemShelvingLog__;
|
||||||
|
ALTER TABLE vn.itemShelvingLog__ COMMENT='@deprecated 2024-11-26';
|
|
@ -0,0 +1,7 @@
|
||||||
|
ALTER TABLE `vn`.`creditInsurance` DROP COLUMN `creditClassification__`;
|
||||||
|
ALTER TABLE `vn`.`worker` DROP COLUMN `isF11Allowed__`;
|
||||||
|
ALTER TABLE `util`.`config` DROP COLUMN `dbVersion__`;
|
||||||
|
ALTER TABLE `util`.`config` DROP COLUMN `hasTriggersDisabled__`;
|
||||||
|
ALTER TABLE `vn`.`agencyMode` DROP COLUMN `showAgencyName__`;
|
||||||
|
DROP TABLE `account`.`accountLog__`;
|
||||||
|
DROP TABLE `vn`.`silexACL__`;
|
|
@ -0,0 +1,5 @@
|
||||||
|
ALTER TABLE vn.duaInvoiceIn DROP KEY IF EXISTS duaFk_UNIQUE;
|
||||||
|
ALTER TABLE vn.duaInvoiceIn DROP KEY IF EXISTS duaInvoiceIn_unique;
|
||||||
|
ALTER TABLE vn.duaInvoiceIn ADD CONSTRAINT duaInvoiceIn_unique
|
||||||
|
UNIQUE KEY (invoiceInFk);
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE vn.route ADD dated DATE;
|
|
@ -0,0 +1 @@
|
||||||
|
UPDATE vn.route SET dated = created;
|
|
@ -0,0 +1,2 @@
|
||||||
|
ALTER TABLE vn.route
|
||||||
|
MODIFY COLUMN dated DATE NOT NULL;
|
|
@ -0,0 +1,2 @@
|
||||||
|
ALTER TABLE vn.route
|
||||||
|
MODIFY COLUMN created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
|
|
@ -0,0 +1,2 @@
|
||||||
|
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
|
||||||
|
VALUES ('Worker','canCreateAbsenceInPast','WRITE','ALLOW','ROLE','hr');
|
|
@ -0,0 +1,107 @@
|
||||||
|
INSERT IGNORE INTO vn.saySimpleCountry
|
||||||
|
SET countryFk = 1,
|
||||||
|
channel = '1320';
|
||||||
|
|
||||||
|
UPDATE vn.saySimpleConfig
|
||||||
|
SET defaultChannel = '1819';
|
||||||
|
|
||||||
|
INSERT IGNORE INTO pbx.prefix (country, prefix) VALUES
|
||||||
|
('ES', '0034'),
|
||||||
|
('IT', '0039'),
|
||||||
|
('DE', '0049'),
|
||||||
|
('RO', '0040'),
|
||||||
|
('NL', '0031'),
|
||||||
|
('BE', '0032'),
|
||||||
|
('RU', '007'),
|
||||||
|
('PT', '00351'),
|
||||||
|
('LT', '00370'),
|
||||||
|
('UA', '00380'),
|
||||||
|
('CO', '0057'),
|
||||||
|
('FI', '00358'),
|
||||||
|
('EC', '00593'),
|
||||||
|
('LB', '00961'),
|
||||||
|
('IL', '00972'),
|
||||||
|
('TH', '0066'),
|
||||||
|
('PA', '00507'),
|
||||||
|
('GB', '0044'),
|
||||||
|
('FR', '0033'),
|
||||||
|
('PL', '0048'),
|
||||||
|
('MX', '0052'),
|
||||||
|
('MA', '00212'),
|
||||||
|
('AI', '001268'),
|
||||||
|
('GH', '00233'),
|
||||||
|
('SE', '0046'),
|
||||||
|
('AE', '00971'),
|
||||||
|
('KE', '00254'),
|
||||||
|
('AD', '00376'),
|
||||||
|
('AO', '00244'),
|
||||||
|
('LU', '00352'),
|
||||||
|
('BY', '00375'),
|
||||||
|
('MD', '00373'),
|
||||||
|
('DK', '0045'),
|
||||||
|
('ET', '00251'),
|
||||||
|
('AU', '0061'),
|
||||||
|
('CA', '0001'),
|
||||||
|
('CL', '0056'),
|
||||||
|
('CN', '0086'),
|
||||||
|
('CR', '00506'),
|
||||||
|
('GT', '00502'),
|
||||||
|
('CI', '00225'),
|
||||||
|
('PE', '0051'),
|
||||||
|
('LK', '0094'),
|
||||||
|
('ZA', '0027'),
|
||||||
|
('TR', '0090'),
|
||||||
|
('ZW', '00263'),
|
||||||
|
('MY', '0060'),
|
||||||
|
('NZ', '0064'),
|
||||||
|
('IE', '00353'),
|
||||||
|
('MN', '00976'),
|
||||||
|
('SV', '00503'),
|
||||||
|
('ZM', '00260'),
|
||||||
|
('JP', '0081'),
|
||||||
|
('RW', '00250'),
|
||||||
|
('AL', '00355'),
|
||||||
|
('KW', '00965'),
|
||||||
|
('SG', '0065'),
|
||||||
|
('SR', '00597'),
|
||||||
|
('KR', '0082'),
|
||||||
|
('US', '0001'),
|
||||||
|
('RS', '00381'),
|
||||||
|
('AT', '0043'),
|
||||||
|
('EG', '0020'),
|
||||||
|
('LV', '00371'),
|
||||||
|
('CY', '00357'),
|
||||||
|
('CZ', '00420'),
|
||||||
|
('BB', '001246'),
|
||||||
|
('SK', '00421'),
|
||||||
|
('IN', '0091'),
|
||||||
|
('DZ', '00213'),
|
||||||
|
('BR', '0055'),
|
||||||
|
('GR', '0030'),
|
||||||
|
('MC', '00377'),
|
||||||
|
('SI', '00386'),
|
||||||
|
('GP', '00590'),
|
||||||
|
('NO', '0047'),
|
||||||
|
('CH', '0041'),
|
||||||
|
('AR', '0054'),
|
||||||
|
('CU', '0053'),
|
||||||
|
('GQ', '00240'),
|
||||||
|
('GN', '00224'),
|
||||||
|
('HN', '00504'),
|
||||||
|
('ML', '00223'),
|
||||||
|
('NI', '00505'),
|
||||||
|
('PK', '0092'),
|
||||||
|
('PY', '00595'),
|
||||||
|
('SN', '00221'),
|
||||||
|
('UY', '00598'),
|
||||||
|
('VE', '0058'),
|
||||||
|
('BG', '00359'),
|
||||||
|
('GE', '00995'),
|
||||||
|
('EE', '00372'),
|
||||||
|
('SA', '00966'),
|
||||||
|
('RN', '00234'),
|
||||||
|
('HK', '00852'),
|
||||||
|
('GI', '00350'),
|
||||||
|
('CM', '00237'),
|
||||||
|
('HU', '0036'),
|
||||||
|
('AM', '00374');
|
|
@ -0,0 +1,2 @@
|
||||||
|
ALTER TABLE vn.ticket DROP FOREIGN KEY tickets_zone_fk;
|
||||||
|
ALTER TABLE vn.ticket ADD CONSTRAINT tickets_zone_fk FOREIGN KEY (zoneFk) REFERENCES vn.`zone`(id) ON DELETE SET NULL ON UPDATE CASCADE;
|
|
@ -0,0 +1,2 @@
|
||||||
|
ALTER TABLE vn.`zone` MODIFY COLUMN `price` DECIMAL(10,2);
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
-- Place your SQL code here
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE vn.productionConfig ADD IF NOT EXISTS itemOrderReviewHours int(11) DEFAULT 24 NULL
|
||||||
|
COMMENT 'Horas que no se tienen en cuenta para comprobar orden en el almacén, null para desactivar revisión';
|
|
@ -0,0 +1 @@
|
||||||
|
DROP TABLE vn.quadmindsApiConfig;
|
|
@ -791,7 +791,7 @@ export default {
|
||||||
},
|
},
|
||||||
createRouteView: {
|
createRouteView: {
|
||||||
worker: 'vn-route-create vn-worker-autocomplete[ng-model="$ctrl.route.workerFk"]',
|
worker: 'vn-route-create vn-worker-autocomplete[ng-model="$ctrl.route.workerFk"]',
|
||||||
createdDatePicker: 'vn-route-create vn-date-picker[ng-model="$ctrl.route.created"]',
|
createdDatePicker: 'vn-route-create vn-date-picker[ng-model="$ctrl.route.dated"]',
|
||||||
vehicleAuto: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.vehicleFk"]',
|
vehicleAuto: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.vehicleFk"]',
|
||||||
agency: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.agencyModeFk"]',
|
agency: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.agencyModeFk"]',
|
||||||
description: 'vn-route-create [ng-model="$ctrl.route.description"]',
|
description: 'vn-route-create [ng-model="$ctrl.route.description"]',
|
||||||
|
|
|
@ -0,0 +1,133 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Item summary path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('employee', 'item');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should search for an item', async() => {
|
||||||
|
await page.doSearch('Ranged weapon');
|
||||||
|
const resultsCount = await page.countElement(selectors.itemsIndex.searchResult);
|
||||||
|
|
||||||
|
await page.waitForTextInElement(selectors.itemsIndex.firstSearchResult, 'Ranged weapon');
|
||||||
|
await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton);
|
||||||
|
const isVisible = await page.isVisible(selectors.itemSummary.basicData);
|
||||||
|
|
||||||
|
expect(resultsCount).toBe(4);
|
||||||
|
expect(isVisible).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the item summary preview shows fields from basic data`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.itemSummary.basicData, 'Ranged weapon longbow 200cm');
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('Ranged weapon longbow 200cm');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the item summary preview shows fields from tags`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.itemSummary.tags, 'Brown');
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('Brown');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the item summary preview shows fields from botanical`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.itemSummary.botanical, 'Abelia');
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('Abelia');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the item summary preview shows fields from barcode`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.itemSummary.barcode, '1');
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.barcode, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('1');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should close the summary popup`, async() => {
|
||||||
|
await page.closePopup();
|
||||||
|
await page.waitForSelector(selectors.itemSummary.basicData, {hidden: true});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should search for other item', async() => {
|
||||||
|
await page.doSearch('Melee Reinforced');
|
||||||
|
const resultsCount = await page.countElement(selectors.itemsIndex.searchResult);
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton);
|
||||||
|
await page.waitForSelector(selectors.itemSummary.basicData, {visible: true});
|
||||||
|
|
||||||
|
expect(resultsCount).toBe(3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should now check the item summary preview shows fields from basic data`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.itemSummary.basicData, 'Melee Reinforced weapon combat fist 15cm');
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('Melee Reinforced weapon combat fist 15cm');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should now check the item summary preview shows fields from tags`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.itemSummary.tags, 'Silver');
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('Silver');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should now check the item summary preview shows fields from botanical`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.itemSummary.botanical, '-');
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('-');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should now close the summary popup`, async() => {
|
||||||
|
await page.closePopup();
|
||||||
|
await page.waitForSelector(selectors.itemSummary.basicData, {hidden: true});
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should navigate to one of the items detailed section`, async() => {
|
||||||
|
await page.accessToSearchResult('Melee weapon combat fist 15cm');
|
||||||
|
await page.waitForState('item.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the descritor edit button is not visible for employee`, async() => {
|
||||||
|
const visibleButton = await page.isVisible(selectors.itemDescriptor.editButton);
|
||||||
|
|
||||||
|
expect(visibleButton).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the item summary shows fields from basic data section`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.itemSummary.basicData, 'Melee weapon combat fist 15cm');
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('Melee weapon combat fist 15cm');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the item summary shows fields from tags section`, async() => {
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('Silver');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the item summary shows fields from botanical section`, async() => {
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('procera');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the item summary shows fields from barcodes section`, async() => {
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemSummary.barcode, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('4');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,64 @@
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
const $ = {
|
||||||
|
form: 'vn-item-basic-data form',
|
||||||
|
intrastatForm: '.vn-dialog.shown form',
|
||||||
|
newIntrastatButton: 'vn-item-basic-data vn-icon-button[vn-tooltip="New intrastat"] > button'
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('Item Edit basic data path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('buyer', 'item');
|
||||||
|
await page.accessToSearchResult('Melee weapon combat fist 15cm');
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async() => {
|
||||||
|
await page.accessToSection('item.card.basicData');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should edit the item basic data and confirm the item data was edited`, async() => {
|
||||||
|
const values = {
|
||||||
|
type: 'Anthurium',
|
||||||
|
intrastat: 'Coral y materiales similares',
|
||||||
|
relevancy: 1,
|
||||||
|
generic: 'Pallet',
|
||||||
|
isActive: false,
|
||||||
|
priceInKg: true,
|
||||||
|
isFragile: true,
|
||||||
|
packingOut: 5
|
||||||
|
};
|
||||||
|
|
||||||
|
const message = await page.sendForm($.form, values);
|
||||||
|
await page.reloadSection('item.card.basicData');
|
||||||
|
const formValues = await page.fetchForm($.form, Object.keys(values));
|
||||||
|
|
||||||
|
expect(message.isSuccess).toBeTrue();
|
||||||
|
expect(formValues).toEqual(values);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should create a new intrastat and save it`, async() => {
|
||||||
|
await page.click($.newIntrastatButton);
|
||||||
|
await page.waitForSelector($.intrastatForm);
|
||||||
|
await page.fillForm($.intrastatForm, {
|
||||||
|
id: '588420239',
|
||||||
|
description: 'Tropical Flowers'
|
||||||
|
});
|
||||||
|
await page.respondToDialog('accept');
|
||||||
|
|
||||||
|
const message = await page.sendForm($.form);
|
||||||
|
await page.reloadSection('item.card.basicData');
|
||||||
|
const formValues = await page.fetchForm($.form, ['intrastat']);
|
||||||
|
|
||||||
|
expect(message.isSuccess).toBeTrue();
|
||||||
|
expect(formValues).toEqual({intrastat: 'Tropical Flowers'});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,48 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Item edit tax path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('buyer', 'item');
|
||||||
|
await page.accessToSearchResult('Ranged weapon longbow 200cm');
|
||||||
|
await page.accessToSection('item.card.tax');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should add the item tax to all countries`, async() => {
|
||||||
|
await page.autocompleteSearch(selectors.itemTax.firstClass, 'General VAT');
|
||||||
|
await page.autocompleteSearch(selectors.itemTax.secondClass, 'General VAT');
|
||||||
|
await page.waitToClick(selectors.itemTax.submitTaxButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the first item tax class was edited`, async() => {
|
||||||
|
await page.reloadSection('item.card.tax');
|
||||||
|
const firstVatType = await page.waitToGetProperty(selectors.itemTax.firstClass, 'value');
|
||||||
|
|
||||||
|
expect(firstVatType).toEqual('General VAT');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the second item tax class was edited`, async() => {
|
||||||
|
const secondVatType = await page
|
||||||
|
.waitToGetProperty(selectors.itemTax.secondClass, 'value');
|
||||||
|
|
||||||
|
expect(secondVatType).toEqual('General VAT');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should edit the first class without saving the form`, async() => {
|
||||||
|
await page.autocompleteSearch(selectors.itemTax.firstClass, 'Reduced VAT');
|
||||||
|
const firstVatType = await page.waitToGetProperty(selectors.itemTax.firstClass, 'value');
|
||||||
|
|
||||||
|
expect(firstVatType).toEqual('Reduced VAT');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,79 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Item create tags path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('buyer', 'item');
|
||||||
|
await page.accessToSearchResult('Ranged weapon longbow 200cm');
|
||||||
|
await page.accessToSection('item.card.tags');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create a new tag and delete a former one', async() => {
|
||||||
|
await page.waitToClick(selectors.itemTags.fourthRemoveTagButton);
|
||||||
|
await page.waitToClick(selectors.itemTags.addItemTagButton);
|
||||||
|
await page.autocompleteSearch(selectors.itemTags.seventhTag, 'Ancho de la base');
|
||||||
|
await page.write(selectors.itemTags.seventhValue, '50');
|
||||||
|
await page.clearInput(selectors.itemTags.seventhRelevancy);
|
||||||
|
await page.write(selectors.itemTags.seventhRelevancy, '4');
|
||||||
|
await page.waitToClick(selectors.itemTags.submitItemTagsButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the fourth row data is the expected one', async() => {
|
||||||
|
await page.reloadSection('item.card.tags');
|
||||||
|
await page.waitForSelector('vn-item-tags');
|
||||||
|
let result = await page.waitToGetProperty(selectors.itemTags.fourthTag, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('Ancho de la base');
|
||||||
|
|
||||||
|
result = await page
|
||||||
|
.waitToGetProperty(selectors.itemTags.fourthValue, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('50');
|
||||||
|
|
||||||
|
result = await page
|
||||||
|
.waitToGetProperty(selectors.itemTags.fourthRelevancy, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('4');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the fifth row data is the expected one', async() => {
|
||||||
|
let tag = await page
|
||||||
|
.waitToGetProperty(selectors.itemTags.fifthTag, 'value');
|
||||||
|
|
||||||
|
let value = await page
|
||||||
|
.waitToGetProperty(selectors.itemTags.fifthValue, 'value');
|
||||||
|
|
||||||
|
let relevancy = await page
|
||||||
|
.waitToGetProperty(selectors.itemTags.fifthRelevancy, 'value');
|
||||||
|
|
||||||
|
expect(tag).toEqual('Color');
|
||||||
|
expect(value).toEqual('Brown');
|
||||||
|
expect(relevancy).toEqual('5');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the sixth row data is the expected one', async() => {
|
||||||
|
let tag = await page
|
||||||
|
.waitToGetProperty(selectors.itemTags.sixthTag, 'value');
|
||||||
|
|
||||||
|
let value = await page
|
||||||
|
.waitToGetProperty(selectors.itemTags.sixthValue, 'value');
|
||||||
|
|
||||||
|
let relevancy = await page
|
||||||
|
.waitToGetProperty(selectors.itemTags.sixthRelevancy, 'value');
|
||||||
|
|
||||||
|
expect(tag).toEqual('Categoria');
|
||||||
|
expect(value).toEqual('+1 precission');
|
||||||
|
expect(relevancy).toEqual('6');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,66 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Item Create botanical path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('buyer', 'item');
|
||||||
|
await page.accessToSearchResult('Ranged weapon pistol 9mm');
|
||||||
|
await page.accessToSection('item.card.botanical');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should create a new botanical for the item`, async() => {
|
||||||
|
await page.autocompleteSearch(selectors.itemBotanical.genus, 'Abelia');
|
||||||
|
await page.autocompleteSearch(selectors.itemBotanical.species, 'dealbata');
|
||||||
|
await page.waitToClick(selectors.itemBotanical.submitBotanicalButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the Genus for the item was created`, async() => {
|
||||||
|
await page.waitForTextInField(selectors.itemBotanical.genus, 'Abelia');
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.itemBotanical.genus, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('Abelia');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the Species for the item was created`, async() => {
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.itemBotanical.species, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('dealbata');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should edit botanical for the item`, async() => {
|
||||||
|
await page.autocompleteSearch(selectors.itemBotanical.genus, 'Abies');
|
||||||
|
await page.autocompleteSearch(selectors.itemBotanical.species, 'decurrens');
|
||||||
|
await page.waitToClick(selectors.itemBotanical.submitBotanicalButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the Genus for the item was edited`, async() => {
|
||||||
|
await page.waitForTextInField(selectors.itemBotanical.genus, 'Abies');
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.itemBotanical.genus, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('Abies');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the Species for the item was edited`, async() => {
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.itemBotanical.species, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('decurrens');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,37 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Item Create barcodes path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('buyer', 'item');
|
||||||
|
await page.accessToSearchResult('Ranged weapon longbow 200cm');
|
||||||
|
await page.accessToSection('item.card.itemBarcode');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should click create a new code and delete a former one`, async() => {
|
||||||
|
await page.waitToClick(selectors.itemBarcodes.firstCodeRemoveButton);
|
||||||
|
await page.waitToClick(selectors.itemBarcodes.addBarcodeButton);
|
||||||
|
await page.write(selectors.itemBarcodes.thirdCode, '5');
|
||||||
|
await page.waitToClick(selectors.itemBarcodes.submitBarcodesButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the barcode 5 is created and it is now the third barcode as the first was deleted`, async() => {
|
||||||
|
await page.reloadSection('item.card.itemBarcode');
|
||||||
|
await page.waitForTextInField(selectors.itemBarcodes.thirdCode, '5');
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.itemBarcodes.thirdCode, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('5');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,65 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
const $ = {
|
||||||
|
form: 'vn-item-create form'
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('Item Create', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('buyer', 'item');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should access to the create item view by clicking the create floating button', async() => {
|
||||||
|
await page.waitToClick(selectors.itemsIndex.createItemButton);
|
||||||
|
await page.waitForState('item.create');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return to the item index by clickig the cancel button', async() => {
|
||||||
|
await page.waitToClick(selectors.itemCreateView.cancelButton);
|
||||||
|
await page.waitForState('item.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should now access to the create item view by clicking the create floating button', async() => {
|
||||||
|
await page.waitToClick(selectors.itemsIndex.createItemButton);
|
||||||
|
await page.waitForState('item.create');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should throw an error when insert an invalid priority', async() => {
|
||||||
|
const values = {
|
||||||
|
name: 'Infinity Gauntlet',
|
||||||
|
type: 'Crisantemo',
|
||||||
|
intrastat: 'Coral y materiales similares',
|
||||||
|
origin: 'Holand',
|
||||||
|
priority: null
|
||||||
|
};
|
||||||
|
const message = await page.sendForm($.form, values);
|
||||||
|
|
||||||
|
expect(message.text).toContain('Valid priorities');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create the Infinity Gauntlet item', async() => {
|
||||||
|
const values = {
|
||||||
|
name: 'Infinity Gauntlet',
|
||||||
|
type: 'Crisantemo',
|
||||||
|
intrastat: 'Coral y materiales similares',
|
||||||
|
origin: 'Holand',
|
||||||
|
priority: '2'
|
||||||
|
};
|
||||||
|
|
||||||
|
await page.fillForm($.form, values);
|
||||||
|
const formValues = await page.fetchForm($.form, Object.keys(values));
|
||||||
|
const message = await page.sendForm($.form);
|
||||||
|
|
||||||
|
expect(message.isSuccess).toBeTrue();
|
||||||
|
expect(formValues).toEqual(values);
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,141 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Item regularize path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('employee', 'item');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should edit the user local warehouse', async() => {
|
||||||
|
await page.waitForSpinnerLoad();
|
||||||
|
await page.waitToClick(selectors.globalItems.userMenuButton);
|
||||||
|
await page.autocompleteSearch(selectors.globalItems.userLocalWarehouse, 'Warehouse Four');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should check the local settings were saved', async() => {
|
||||||
|
const userLocalWarehouse = await page
|
||||||
|
.waitToGetProperty(selectors.globalItems.userLocalWarehouse, 'value');
|
||||||
|
|
||||||
|
await page.closePopup();
|
||||||
|
|
||||||
|
expect(userLocalWarehouse).toContain('Warehouse Four');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should search for a specific item', async() => {
|
||||||
|
await page.accessToSearchResult('Ranged weapon pistol 9mm');
|
||||||
|
await page.waitForState('item.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should open the regularize dialog and check the warehouse matches the local user settings', async() => {
|
||||||
|
await page.waitToClick(selectors.itemDescriptor.moreMenu);
|
||||||
|
await page.waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton);
|
||||||
|
const result = await page.waitToGetProperty(selectors.itemDescriptor.regularizeWarehouse, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('Warehouse Four');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should regularize the item', async() => {
|
||||||
|
await page.write(selectors.itemDescriptor.regularizeQuantity, '100');
|
||||||
|
await page.autocompleteSearch(selectors.itemDescriptor.regularizeWarehouse, 'Warehouse One');
|
||||||
|
await page.waitToClick(selectors.itemDescriptor.regularizeSaveButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should click on the Tickets button of the top bar menu', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.applicationsMenuButton);
|
||||||
|
await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
|
||||||
|
await Promise.all([
|
||||||
|
page.waitForNavigation({waitUntil: ['load', 'networkidle0', 'domcontentloaded']}),
|
||||||
|
page.waitToClick(selectors.globalItems.ticketsButton)
|
||||||
|
]);
|
||||||
|
await page.waitForState('ticket.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should clear the user local settings now', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.userMenuButton);
|
||||||
|
await page.waitForContentLoaded();
|
||||||
|
await page.clearInput(selectors.globalItems.userConfigFirstAutocomplete);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should search for the ticket with alias missing', async() => {
|
||||||
|
await page.keyboard.press('Escape');
|
||||||
|
await page.accessToSearchResult('missing');
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the ticket sale quantity is showing a negative value`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.ticketSummary.firstSaleQuantity, '-100');
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSummary.firstSaleQuantity, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('-100');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the ticket sale discount is 100%`, async() => {
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSummary.firstSaleDiscount, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('100 %');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should now click on the Items button of the top bar menu', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.applicationsMenuButton);
|
||||||
|
await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
|
||||||
|
await page.waitToClick(selectors.globalItems.itemsButton);
|
||||||
|
await page.waitForState('item.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should search for the item once again', async() => {
|
||||||
|
await page.accessToSearchResult('Ranged weapon pistol 9mm');
|
||||||
|
await page.waitForState('item.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should regularize the item once more', async() => {
|
||||||
|
await page.waitToClick(selectors.itemDescriptor.moreMenu);
|
||||||
|
await page.waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton);
|
||||||
|
await page.write(selectors.itemDescriptor.regularizeQuantity, '100');
|
||||||
|
await page.autocompleteSearch(selectors.itemDescriptor.regularizeWarehouse, 'Warehouse One');
|
||||||
|
await page.waitToClick(selectors.itemDescriptor.regularizeSaveButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should again click on the Tickets button of the top bar menu', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.applicationsMenuButton);
|
||||||
|
await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
|
||||||
|
await Promise.all([
|
||||||
|
page.waitForNavigation({waitUntil: ['load', 'networkidle0', 'domcontentloaded']}),
|
||||||
|
page.waitToClick(selectors.globalItems.ticketsButton)
|
||||||
|
]);
|
||||||
|
await page.waitForState('ticket.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should search for the ticket missing once again', async() => {
|
||||||
|
await page.accessToSearchResult('Missing');
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the ticket contains now two sales`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.ticketSummary.firstSaleQuantity, '-100');
|
||||||
|
const result = await page.countElement(selectors.ticketSummary.sale);
|
||||||
|
|
||||||
|
expect(result).toEqual(2);
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,84 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Item index path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('salesPerson', 'item');
|
||||||
|
await page.waitToClick(selectors.globalItems.searchButton);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should click on the fields to show button to open the list of columns to show', async() => {
|
||||||
|
await page.waitToClick(selectors.itemsIndex.shownColumns);
|
||||||
|
const visible = await page.isVisible(selectors.itemsIndex.shownColumnsList);
|
||||||
|
|
||||||
|
expect(visible).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should unmark all checkboxes except the first and the last ones', async() => {
|
||||||
|
await page.waitToClick(selectors.itemsIndex.idCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.stemsCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.sizeCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.typeCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.categoryCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.intrastadCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.originCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.buyerCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.weightByPieceCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.saveFieldsButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should navigate forth and back to see the images column is still visible', async() => {
|
||||||
|
await page.closePopup();
|
||||||
|
await page.waitToClick(selectors.itemsIndex.firstSearchResult);
|
||||||
|
await page.waitToClick(selectors.itemDescriptor.goBackToModuleIndexButton);
|
||||||
|
await page.waitToClick(selectors.globalItems.searchButton);
|
||||||
|
await page.waitForSelector(selectors.itemsIndex.searchResult);
|
||||||
|
await page.waitImgLoad(selectors.itemsIndex.firstItemImage);
|
||||||
|
const imageVisible = await page.isVisible(selectors.itemsIndex.firstItemImageTd);
|
||||||
|
|
||||||
|
expect(imageVisible).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should check the ids column is not visible', async() => {
|
||||||
|
await page.waitForSelector(selectors.itemsIndex.firstItemId, {hidden: true});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should mark all unchecked boxes to leave the index as it was', async() => {
|
||||||
|
await page.waitToClick(selectors.itemsIndex.shownColumns);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.idCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.stemsCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.sizeCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.typeCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.categoryCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.intrastadCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.originCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.buyerCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.weightByPieceCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemsIndex.saveFieldsButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should now navigate forth and back to see the ids column is now visible', async() => {
|
||||||
|
await page.closePopup();
|
||||||
|
await page.waitToClick(selectors.itemsIndex.firstSearchResult);
|
||||||
|
await page.waitToClick(selectors.itemDescriptor.goBackToModuleIndexButton);
|
||||||
|
await page.waitToClick(selectors.globalItems.searchButton);
|
||||||
|
await page.waitForSelector(selectors.itemsIndex.searchResult);
|
||||||
|
const idVisible = await page.isVisible(selectors.itemsIndex.firstItemId);
|
||||||
|
|
||||||
|
expect(idVisible).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,45 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Item log path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('developer', 'item');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should search for the Knowledge artifact to confirm it isn't created yet`, async() => {
|
||||||
|
await page.doSearch('Knowledge artifact');
|
||||||
|
const nResults = await page.countElement(selectors.itemsIndex.searchResult);
|
||||||
|
|
||||||
|
expect(nResults).toEqual(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should access to the create item view by clicking the create floating button', async() => {
|
||||||
|
await page.waitToClick(selectors.itemsIndex.createItemButton);
|
||||||
|
await page.waitForState('item.create');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create the Knowledge artifact item', async() => {
|
||||||
|
await page.write(selectors.itemCreateView.temporalName, 'Knowledge artifact');
|
||||||
|
await page.autocompleteSearch(selectors.itemCreateView.type, 'Crisantemo');
|
||||||
|
await page.autocompleteSearch(selectors.itemCreateView.intrastat, 'Coral y materiales similares');
|
||||||
|
await page.autocompleteSearch(selectors.itemCreateView.origin, 'Holand');
|
||||||
|
await page.waitToClick(selectors.itemCreateView.createButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return to the items index by clicking the return to items button', async() => {
|
||||||
|
await page.waitToClick(selectors.itemBasicData.goToItemIndexButton);
|
||||||
|
await page.waitForSelector(selectors.itemsIndex.createItemButton);
|
||||||
|
await page.waitForState('item.index');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,41 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Item descriptor path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('buyer', 'item');
|
||||||
|
await page.accessToSearchResult('1');
|
||||||
|
await page.accessToSection('item.card.basicData');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set the item to inactive', async() => {
|
||||||
|
await page.waitToClick(selectors.itemBasicData.isActiveCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemBasicData.submitBasicDataButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should reload the section and check the inactive icon is visible', async() => {
|
||||||
|
await page.reloadSection('item.card.basicData');
|
||||||
|
const visibleIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon);
|
||||||
|
|
||||||
|
expect(visibleIcon).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set the item back to active', async() => {
|
||||||
|
await page.waitToClick(selectors.itemBasicData.isActiveCheckbox);
|
||||||
|
await page.waitToClick(selectors.itemBasicData.submitBasicDataButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,45 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Item request path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('buyer', 'item');
|
||||||
|
await page.accessToSection('item.request');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should reach the item request section', async() => {
|
||||||
|
await page.waitForState('item.request');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should fill the id and quantity then check the concept was updated', async() => {
|
||||||
|
await page.writeOnEditableTD(selectors.itemRequest.firstRequestItemID, '4');
|
||||||
|
await page.writeOnEditableTD(selectors.itemRequest.firstRequestQuantity, '10');
|
||||||
|
await page.waitForTextInElement(selectors.itemRequest.firstRequestConcept, 'Melee weapon heavy shield 100cm');
|
||||||
|
let filledConcept = await page.waitToGetProperty(selectors.itemRequest.firstRequestConcept, 'innerText');
|
||||||
|
|
||||||
|
expect(filledConcept).toContain('Melee weapon heavy shield 100cm');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should check the status of the request should now be accepted', async() => {
|
||||||
|
let status = await page.waitToGetProperty(selectors.itemRequest.firstRequestStatus, 'innerText');
|
||||||
|
|
||||||
|
expect(status).toContain('Accepted');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should now click on the second declain request icon then type the reason', async() => {
|
||||||
|
await page.waitToClick(selectors.itemRequest.secondRequestDecline);
|
||||||
|
await page.write(selectors.itemRequest.declineReason, 'Not quite as expected');
|
||||||
|
await page.respondToDialog('accept');
|
||||||
|
let status = await page.waitToGetProperty(selectors.itemRequest.secondRequestStatus, 'innerText');
|
||||||
|
|
||||||
|
expect(status).toContain('Denied');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,97 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
const $ = selectors.itemFixedPrice;
|
||||||
|
|
||||||
|
describe('Item fixed prices path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
let httpRequest;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('buyer', 'item');
|
||||||
|
await page.accessToSection('item.fixedPrice');
|
||||||
|
page.on('request', req => {
|
||||||
|
if (req.url().includes(`FixedPrices/filter`))
|
||||||
|
httpRequest = req.url();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should filter using all the fields', async() => {
|
||||||
|
await page.write($.generalSearchFilter, 'item');
|
||||||
|
await page.keyboard.press('Enter');
|
||||||
|
|
||||||
|
expect(httpRequest).toContain('search=item');
|
||||||
|
|
||||||
|
await page.click($.chip);
|
||||||
|
await page.click($.reignFilter);
|
||||||
|
|
||||||
|
expect(httpRequest).toContain('categoryFk');
|
||||||
|
|
||||||
|
await page.autocompleteSearch($.typeFilter, 'Alstroemeria');
|
||||||
|
|
||||||
|
expect(httpRequest).toContain('typeFk');
|
||||||
|
|
||||||
|
await page.click($.chip);
|
||||||
|
await page.autocompleteSearch($.buyerFilter, 'buyerNick');
|
||||||
|
|
||||||
|
expect(httpRequest).toContain('buyerFk');
|
||||||
|
|
||||||
|
await page.click($.chip);
|
||||||
|
await page.autocompleteSearch($.warehouseFilter, 'Algemesi');
|
||||||
|
|
||||||
|
expect(httpRequest).toContain('warehouseFk');
|
||||||
|
|
||||||
|
await page.click($.chip);
|
||||||
|
await page.click($.mineFilter);
|
||||||
|
|
||||||
|
expect(httpRequest).toContain('mine=true');
|
||||||
|
|
||||||
|
await page.click($.chip);
|
||||||
|
await page.click($.hasMinPriceFilter);
|
||||||
|
|
||||||
|
expect(httpRequest).toContain('hasMinPrice=true');
|
||||||
|
|
||||||
|
await page.click($.chip);
|
||||||
|
await page.click($.addTag);
|
||||||
|
await page.autocompleteSearch($.tagFilter, 'Color');
|
||||||
|
await page.autocompleteSearch($.tagValueFilter, 'Brown');
|
||||||
|
|
||||||
|
expect(httpRequest).toContain('tags');
|
||||||
|
|
||||||
|
await page.click($.chip);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should click on the add new fixed price button', async() => {
|
||||||
|
await page.waitToClick($.add);
|
||||||
|
await page.waitForSelector($.fourthFixedPrice);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should fill the fixed price data', async() => {
|
||||||
|
const now = Date.vnNew();
|
||||||
|
await page.autocompleteSearch($.fourthWarehouse, 'Warehouse one');
|
||||||
|
await page.writeOnEditableTD($.fourthGroupingPrice, '1');
|
||||||
|
await page.writeOnEditableTD($.fourthPackingPrice, '1');
|
||||||
|
await page.write($.fourthMinPrice, '1');
|
||||||
|
await page.pickDate($.fourthStarted, now);
|
||||||
|
await page.pickDate($.fourthEnded, now);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should reload the section and check the created price has the expected ID', async() => {
|
||||||
|
await page.goto(`http://localhost:5000/#!/item/fixed-price`);
|
||||||
|
await page.autocompleteSearch($.warehouseFilter, 'Warehouse one');
|
||||||
|
await page.click($.chip);
|
||||||
|
const result = await page.waitToGetProperty($.fourthItemID, 'value');
|
||||||
|
|
||||||
|
expect(result).toContain('13');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,99 @@
|
||||||
|
import selectors from '../../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket List sale path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('employee', 'ticket');
|
||||||
|
await page.accessToSearchResult('13');
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the first ticket sale contains the colour tag', async() => {
|
||||||
|
const value = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSales.firstSaleColour, 'innerText');
|
||||||
|
|
||||||
|
expect(value).toContain('Black');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the first sale contains the price', async() => {
|
||||||
|
const value = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSales.firstSalePrice, 'innerText');
|
||||||
|
|
||||||
|
expect(value).toContain('1.72');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the first sale contains the discount', async() => {
|
||||||
|
const value = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSales.firstSaleDiscount, 'innerText');
|
||||||
|
|
||||||
|
expect(value).toContain('0.00%');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the first sale contains the total import', async() => {
|
||||||
|
const value = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSales.firstSaleImport, 'innerText');
|
||||||
|
|
||||||
|
expect(value).toContain('34.40');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should add an empty item to the sale list', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.newItemButton);
|
||||||
|
const sales = await page
|
||||||
|
.countElement(selectors.ticketSales.saleLine);
|
||||||
|
|
||||||
|
expect(sales).toEqual(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should select a valid item to be added as the second item in the sales list', async() => {
|
||||||
|
let searchValue = 'Melee weapon heavy shield 100cm';
|
||||||
|
await page.autocompleteSearch(selectors.ticketSales.secondSaleIdAutocomplete, searchValue);
|
||||||
|
await page.waitToClick(selectors.ticketSales.secondSaleQuantityCell);
|
||||||
|
await page.type(selectors.ticketSales.secondSaleQuantity, '8');
|
||||||
|
await page.keyboard.press('Enter');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update the description of the new sale', async() => {
|
||||||
|
await page.click(selectors.ticketSales.secondSaleConceptCell);
|
||||||
|
await page.write(selectors.ticketSales.secondSaleConceptInput, 'Aegis of Valor');
|
||||||
|
await page.keyboard.press('Enter');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should add a third empty item to the sale list', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.newItemButton);
|
||||||
|
await page.waitForNumberOfElements(selectors.ticketSales.saleLine, 3);
|
||||||
|
const sales = await page.countElement(selectors.ticketSales.saleLine);
|
||||||
|
|
||||||
|
expect(sales).toEqual(3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should select the 2nd and 3th item and delete both', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.deleteSaleButton);
|
||||||
|
await page.waitToClick(selectors.globalItems.acceptButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should verify there's only 1 single line remaining`, async() => {
|
||||||
|
const sales = await page.countElement(selectors.ticketSales.saleLine);
|
||||||
|
|
||||||
|
expect(sales).toEqual(1);
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,415 @@
|
||||||
|
import selectors from '../../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket Edit sale path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('salesPerson', 'ticket');
|
||||||
|
await page.accessToSearchResult('16');
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should click on the first sale claim icon to navigate over there`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleClaimIcon);
|
||||||
|
await page.waitForNavigation();
|
||||||
|
await page.goBack();
|
||||||
|
await page.goBack();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should navigate to the tickets index', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.applicationsMenuButton);
|
||||||
|
await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
|
||||||
|
await page.waitToClick(selectors.globalItems.ticketsButton);
|
||||||
|
await page.waitForState('ticket.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should search for a ticket and then navigate to it's sales`, async() => {
|
||||||
|
await page.accessToSearchResult('16');
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should set the ticket as libre`, async() => {
|
||||||
|
const searchValue = 'libre';
|
||||||
|
await page.waitToClick(selectors.ticketSales.stateMenuButton);
|
||||||
|
await page.write(selectors.ticketSales.moreMenuState, searchValue);
|
||||||
|
try {
|
||||||
|
await page.waitForFunction(searchValue => {
|
||||||
|
const element = document.querySelector('li.active');
|
||||||
|
if (element)
|
||||||
|
return element.innerText.toLowerCase().includes(searchValue.toLowerCase());
|
||||||
|
}, {}, searchValue);
|
||||||
|
} catch (error) {
|
||||||
|
const builtSelector = await page.selectorFormater(selectors.ticketSales.moreMenuState);
|
||||||
|
const inputValue = await page.evaluate(() => {
|
||||||
|
return document.querySelector('.vn-drop-down.shown vn-textfield input').value;
|
||||||
|
});
|
||||||
|
throw new Error(`${builtSelector} value is ${inputValue}! ${error}`);
|
||||||
|
}
|
||||||
|
await page.waitForState('ticket.card.sale');
|
||||||
|
await page.keyboard.press('Enter');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check it's state is libre now`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.ticketDescriptor.stateLabelValue, 'Libre');
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketDescriptor.stateLabelValue, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toEqual('State Libre');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should set the ticket as OK`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.setOk);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check it's state is OK now`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.ticketDescriptor.stateLabelValue, 'OK');
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketDescriptor.stateLabelValue, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toEqual('State OK');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the zoomed image isn't present`, async() => {
|
||||||
|
const result = await page.countElement(selectors.ticketSales.firstSaleZoomedImage);
|
||||||
|
|
||||||
|
expect(result).toEqual(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should click on the thumbnail image of the 1st sale and see the zoomed image`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleThumbnailImage);
|
||||||
|
const result = await page.countElement(selectors.ticketSales.firstSaleZoomedImage);
|
||||||
|
|
||||||
|
expect(result).toEqual(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should click on the zoomed image to close it`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleZoomedImage);
|
||||||
|
const result = await page.countElement(selectors.ticketSales.firstSaleZoomedImage);
|
||||||
|
|
||||||
|
expect(result).toEqual(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should click on the first sale ID making now the item descriptor visible`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleId);
|
||||||
|
await page.waitImgLoad(selectors.ticketSales.firstSaleDescriptorImage);
|
||||||
|
const visible = await page.isVisible(selectors.ticketSales.saleDescriptorPopover);
|
||||||
|
|
||||||
|
expect(visible).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should click on the descriptor image of the 1st sale and see the zoomed image`, async() => {
|
||||||
|
await page.waitToClick('vn-item-descriptor img');
|
||||||
|
const result = await page.countElement(selectors.ticketSales.firstSaleZoomedImage);
|
||||||
|
|
||||||
|
expect(result).toEqual(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should now click on the zoomed image to close it`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleZoomedImage);
|
||||||
|
const result = await page.countElement(selectors.ticketSales.firstSaleZoomedImage);
|
||||||
|
|
||||||
|
expect(result).toEqual(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should click on the summary icon of the item-descriptor to access to the item summary`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.saleDescriptorPopoverSummaryButton);
|
||||||
|
await page.waitForState('item.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return to ticket sales section', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.applicationsMenuButton);
|
||||||
|
await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
|
||||||
|
await page.waitToClick(selectors.globalItems.ticketsButton);
|
||||||
|
await page.accessToSearchResult('16');
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should remove 1 from the first sale quantity', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleQuantityCell);
|
||||||
|
await page.waitForSelector(selectors.ticketSales.firstSaleQuantity);
|
||||||
|
await page.type(selectors.ticketSales.firstSaleQuantity, '9\u000d');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update the price', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSalePrice);
|
||||||
|
await page.waitForSelector(selectors.ticketSales.firstSalePriceInput);
|
||||||
|
await page.type(selectors.ticketSales.firstSalePriceInput, '5\u000d');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the price have been updated', async() => {
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketSales.firstSalePrice, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('5.00');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the total price for that item have been updated', async() => {
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketSales.firstSaleImport, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('45.00');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update the discount', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleDiscount);
|
||||||
|
await page.waitForSelector(selectors.ticketSales.firstSaleDiscountInput);
|
||||||
|
await page.type(selectors.ticketSales.firstSaleDiscountInput, '50');
|
||||||
|
await page.waitToClick(selectors.ticketSales.saveSaleDiscountButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the discount have been updated', async() => {
|
||||||
|
await page.waitForTextInElement(selectors.ticketSales.firstSaleDiscount, '50.00%');
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketSales.firstSaleDiscount, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('50.00%');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the total import for that item have been updated', async() => {
|
||||||
|
await page.waitForTextInElement(selectors.ticketSales.firstSaleImport, '22.50');
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketSales.firstSaleImport, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('22.50');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should recalculate price of sales', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenuRecalculatePrice);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should log in as salesAssistant and navigate to ticket sales', async() => {
|
||||||
|
await page.loginAndModule('salesAssistant', 'ticket');
|
||||||
|
await page.accessToSearchResult('15');
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should select the first sale and create a refund with warehouse', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenuRefund);
|
||||||
|
await page.waitToClick(selectors.ticketSales.refundWithWarehouse);
|
||||||
|
await page.waitForSnackbar();
|
||||||
|
await page.waitForState('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should select the first sale and create a refund without warehouse', async() => {
|
||||||
|
await page.accessToSearchResult('18');
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenuRefund);
|
||||||
|
await page.waitToClick(selectors.ticketSales.refundWithoutWarehouse);
|
||||||
|
await page.waitForSnackbar();
|
||||||
|
await page.waitForState('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should show error trying to delete a ticket with a refund', async() => {
|
||||||
|
await page.loginAndModule('salesPerson', 'ticket');
|
||||||
|
await page.accessToSearchResult('8');
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
|
||||||
|
await page.waitToClick(selectors.globalItems.acceptButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Tickets with associated refunds can\'t be deleted');
|
||||||
|
await page.waitToClick(selectors.globalItems.cancelButton);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should select the third sale and create a claim of it', async() => {
|
||||||
|
await page.accessToSearchResult('16');
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
|
||||||
|
await page.waitToClick(selectors.globalItems.acceptButton);
|
||||||
|
await page.waitForNavigation();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should search for a ticket then access to the sales section', async() => {
|
||||||
|
await page.goBack();
|
||||||
|
await page.goBack();
|
||||||
|
await page.loginAndModule('salesPerson', 'ticket');
|
||||||
|
await page.accessToSearchResult('16');
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should select the third sale and delete it', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.deleteSaleButton);
|
||||||
|
await page.waitToClick(selectors.globalItems.acceptButton);
|
||||||
|
await page.waitForSpinnerLoad();
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the third sale was deleted`, async() => {
|
||||||
|
const result = await page.countElement(selectors.ticketSales.saleLine);
|
||||||
|
|
||||||
|
expect(result).toEqual(3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should select the second sale and transfer it to a valid ticket', async() => {
|
||||||
|
const targetTicketId = '12';
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.transferSaleButton);
|
||||||
|
await page.waitToClick(selectors.ticketSales.transferQuantityCell);
|
||||||
|
await page.type(selectors.ticketSales.transferQuantityInput, '10\u000d');
|
||||||
|
await page.type(selectors.ticketSales.moveToTicketInput, targetTicketId);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moveToTicketButton);
|
||||||
|
await page.expectURL(`ticket/${targetTicketId}/sale`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the transfered line is the correct one', async() => {
|
||||||
|
await page.waitForSelector(selectors.ticketSales.secondSaleText);
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketSales.secondSaleText, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain(`Melee weapon heavy shield`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the transfered quantity is the correct one', async() => {
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketSales.firstSaleQuantityCell, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('20');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should go back to the original ticket sales section', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.goBackToModuleIndexButton);
|
||||||
|
await page.accessToSearchResult('16');
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the original ticket has still three lines`, async() => {
|
||||||
|
await page.waitForSelector(selectors.ticketSales.saleLine);
|
||||||
|
const result = await page.countElement(selectors.ticketSales.saleLine);
|
||||||
|
|
||||||
|
expect(result).toEqual(3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the second sale quantity is now half of it's original value after the transfer`, async() => {
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketSales.secondSaleQuantityCell, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('10');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should go back to the receiver ticket sales section', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.goBackToModuleIndexButton);
|
||||||
|
await page.accessToSearchResult('12');
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should transfer the sale back to the original ticket', async() => {
|
||||||
|
const targetTicketId = '16';
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.transferSaleButton);
|
||||||
|
await page.type(selectors.ticketSales.moveToTicketInput, targetTicketId);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moveToTicketButton);
|
||||||
|
await page.expectURL(`ticket/${targetTicketId}/sale`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the original ticket received the line', async() => {
|
||||||
|
const expectedLines = 4;
|
||||||
|
await page.waitForNumberOfElements(selectors.ticketSales.saleLine, expectedLines);
|
||||||
|
const result = await page.countElement(selectors.ticketSales.saleLine);
|
||||||
|
|
||||||
|
expect(result).toEqual(expectedLines);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should throw an error when attempting to create a ticket for an inactive client`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.transferSaleButton);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moveToNewTicketButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain(`You can't create a ticket for an inactive client`);
|
||||||
|
|
||||||
|
await page.closePopup();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should go now to the ticket sales section of an active, not frozen client', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.goBackToModuleIndexButton);
|
||||||
|
await page.accessToSearchResult('13');
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should select all sales, tranfer them to a new ticket and delete the sender ticket as it would've been left empty`, async() => {
|
||||||
|
const senderTicketId = '13';
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.ticketSales.selectAllSalesCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketSales.transferSaleButton);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moveToNewTicketButton);
|
||||||
|
await page.evaluate((selector, ticketId) => {
|
||||||
|
return document.querySelector(selector).innerText.toLowerCase().indexOf(`#${ticketId}`) == -1;
|
||||||
|
}, selectors.ticketDescriptor.id, senderTicketId);
|
||||||
|
await page.waitForState('ticket.card.sale');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the new ticket received the line', async() => {
|
||||||
|
const expectedLines = 1;
|
||||||
|
const result = await page.countElement(selectors.ticketSales.saleLine);
|
||||||
|
|
||||||
|
expect(result).toEqual(expectedLines);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should check the first sale reserved icon isnt visible', async() => {
|
||||||
|
const result = await page.isVisible(selectors.ticketSales.firstSaleReservedIcon);
|
||||||
|
|
||||||
|
expect(result).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should mark the first sale as reserved', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenuReserve);
|
||||||
|
await page.closePopup();
|
||||||
|
await page.waitForClassNotPresent(selectors.ticketSales.firstSaleReservedIcon, 'ng-hide');
|
||||||
|
const result = await page.isVisible(selectors.ticketSales.firstSaleReservedIcon);
|
||||||
|
|
||||||
|
expect(result).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should unmark the first sale as reserved', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketSales.moreMenuUnmarkReseved);
|
||||||
|
await page.waitForClassPresent(selectors.ticketSales.firstSaleReservedIcon, 'ng-hide');
|
||||||
|
const result = await page.isVisible(selectors.ticketSales.firstSaleReservedIcon);
|
||||||
|
|
||||||
|
expect(result).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should log in as Production role and go to a target ticket summary', async() => {
|
||||||
|
await page.loginAndModule('production', 'ticket');
|
||||||
|
await page.accessToSearchResult('13');
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the ticket is deleted`, async() => {
|
||||||
|
await page.waitForSelector(selectors.ticketDescriptor.isDeletedIcon);
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,50 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket Create notes path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('employee', 'ticket');
|
||||||
|
await page.accessToSearchResult('5');
|
||||||
|
await page.accessToSection('ticket.card.observation');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create a new note', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketNotes.addNoteButton);
|
||||||
|
await page.autocompleteSearch(selectors.ticketNotes.firstNoteType, 'ItemPicker');
|
||||||
|
await page.write(selectors.ticketNotes.firstDescription, 'description');
|
||||||
|
await page.waitToClick(selectors.ticketNotes.submitNotesButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the note is the expected one', async() => {
|
||||||
|
await page.reloadSection('ticket.card.observation');
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketNotes.firstNoteType, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('ItemPicker');
|
||||||
|
|
||||||
|
const firstDescription = await page
|
||||||
|
.waitToGetProperty(selectors.ticketNotes.firstDescription, 'value');
|
||||||
|
|
||||||
|
expect(firstDescription).toEqual('description');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should delete the note', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketNotes.firstNoteRemoveButton);
|
||||||
|
await page.waitToClick(selectors.ticketNotes.submitNotesButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,32 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket expeditions and log path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('production', 'ticket');
|
||||||
|
await page.accessToSearchResult('1');
|
||||||
|
await page.accessToSection('ticket.card.expedition');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should delete a former expedition and confirm the remaining expedition are the expected ones`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketExpedition.thirdSaleCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketExpedition.deleteExpeditionButton);
|
||||||
|
await page.waitToClick(selectors.globalItems.acceptButton);
|
||||||
|
await page.reloadSection('ticket.card.expedition');
|
||||||
|
|
||||||
|
await page.waitForSelector(selectors.ticketExpedition.expeditionRow, {});
|
||||||
|
const result = await page
|
||||||
|
.countElement(selectors.ticketExpedition.expeditionRow);
|
||||||
|
|
||||||
|
expect(result).toEqual(6);
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,78 @@
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
const $ = {
|
||||||
|
firstPackage: 'vn-autocomplete[label="Package"]',
|
||||||
|
firstQuantity: 'vn-ticket-package vn-horizontal:nth-child(1) vn-input-number[ng-model="package.quantity"]',
|
||||||
|
firstRemovePackageButton: 'vn-icon-button[vn-tooltip="Remove package"]',
|
||||||
|
addPackageButton: 'vn-icon-button[vn-tooltip="Add package"]',
|
||||||
|
savePackagesButton: `button[type=submit]`
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('Ticket Create packages path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('employee', 'ticket');
|
||||||
|
await page.accessToSearchResult('1');
|
||||||
|
await page.accessToSection('ticket.card.package');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should attempt create a new package but receive an error if package is blank`, async() => {
|
||||||
|
await page.waitToClick($.firstRemovePackageButton);
|
||||||
|
await page.waitToClick($.addPackageButton);
|
||||||
|
await page.write($.firstQuantity, '99');
|
||||||
|
await page.waitToClick($.savePackagesButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Package cannot be blank');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should delete the first package and receive and error to save a new one with blank quantity`, async() => {
|
||||||
|
await page.clearInput($.firstQuantity);
|
||||||
|
await page.autocompleteSearch($.firstPackage, 'Container medical box 100cm');
|
||||||
|
await page.waitToClick($.savePackagesButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Some fields are invalid');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the quantity input isn't invalid yet`, async() => {
|
||||||
|
const result = await page
|
||||||
|
.evaluate(selector => {
|
||||||
|
return document.querySelector(`${selector} input`).checkValidity();
|
||||||
|
}, $.firstQuantity);
|
||||||
|
|
||||||
|
expect(result).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should create a new package with correct data`, async() => {
|
||||||
|
await page.clearInput($.firstQuantity);
|
||||||
|
await page.write($.firstQuantity, '-99');
|
||||||
|
await page.waitToClick($.savePackagesButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the first select is the expected one`, async() => {
|
||||||
|
await page.reloadSection('ticket.card.package');
|
||||||
|
await page.waitForTextInField($.firstPackage, 'Container medical box 100cm');
|
||||||
|
const result = await page.waitToGetProperty($.firstPackage, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('Container medical box 100cm');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm quantity is just a number and the string part was ignored by the imput number`, async() => {
|
||||||
|
await page.waitForTextInField($.firstQuantity, '-99');
|
||||||
|
const result = await page.waitToGetProperty($.firstQuantity, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('-99');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,72 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket Create new tracking state path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('as production', () => {
|
||||||
|
it('should log into the ticket 1 tracking', async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('production', 'ticket');
|
||||||
|
await page.accessToSearchResult('1');
|
||||||
|
await page.accessToSection('ticket.card.tracking.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should access to the create state view by clicking the create floating button', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketTracking.createStateButton);
|
||||||
|
await page.waitForSelector(selectors.createStateView.state, {visible: true});
|
||||||
|
await page.waitForState('ticket.card.tracking.edit');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should create a new state`, async() => {
|
||||||
|
await page.autocompleteSearch(selectors.createStateView.state, 'OK');
|
||||||
|
await page.waitToClick(selectors.createStateView.saveStateButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('as salesPerson', () => {
|
||||||
|
it('should now log into the ticket 1 tracking', async() => {
|
||||||
|
await page.loginAndModule('salesPerson', 'ticket');
|
||||||
|
await page.accessToSearchResult('1');
|
||||||
|
await page.accessToSection('ticket.card.tracking.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should now access to the create state view by clicking the create floating button', async() => {
|
||||||
|
await page.waitForSelector('.vn-popup', {hidden: true});
|
||||||
|
await page.waitToClick(selectors.ticketTracking.createStateButton);
|
||||||
|
await page.waitForState('ticket.card.tracking.edit');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should attemp to create an state for which salesPerson doesn't have permissions`, async() => {
|
||||||
|
await page.autocompleteSearch(selectors.createStateView.state, 'Encajado');
|
||||||
|
await page.waitToClick(selectors.createStateView.saveStateButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain(`You don't have enough privileges`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should make sure the worker gets autocomplete uppon selecting the assigned state`, async() => {
|
||||||
|
await page.autocompleteSearch(selectors.createStateView.state, 'asignado');
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.createStateView.worker, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('salesperson');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should succesfully create a valid state`, async() => {
|
||||||
|
await page.waitToClick(selectors.createStateView.saveStateButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,143 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket Edit basic data path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('employee', 'ticket');
|
||||||
|
await page.accessToSearchResult('11');
|
||||||
|
await page.accessToSection('ticket.card.basicData.stepOne');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the zone autocomplete is disabled unless your role is productionBoss`, async() => {
|
||||||
|
await page.waitForSelector(selectors.ticketBasicData.zone, {});
|
||||||
|
const disabled = await page.evaluate(selector => {
|
||||||
|
return document.querySelector(selector).disabled;
|
||||||
|
}, `${selectors.ticketBasicData.zone} input`);
|
||||||
|
|
||||||
|
expect(disabled).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should now log as productionBoss to perform the rest of the tests`, async() => {
|
||||||
|
await page.loginAndModule('productionBoss', 'ticket');
|
||||||
|
await page.accessToSearchResult('11');
|
||||||
|
await page.accessToSection('ticket.card.basicData.stepOne');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the zone autocomplete is enabled for the role productionBoss`, async() => {
|
||||||
|
await page.waitForSpinnerLoad();
|
||||||
|
await page.waitForSelector(selectors.ticketBasicData.zone);
|
||||||
|
const disabled = await page.evaluate(selector => {
|
||||||
|
return document.querySelector(selector).disabled;
|
||||||
|
}, `${selectors.ticketBasicData.zone} input`);
|
||||||
|
|
||||||
|
expect(disabled).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the zone is for Gotham247`, async() => {
|
||||||
|
let zone = await page
|
||||||
|
.waitToGetProperty(selectors.ticketBasicData.zone, 'value');
|
||||||
|
|
||||||
|
expect(zone).toContain('Zone 247 A');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should edit the ticket agency then check there are no zones for it`, async() => {
|
||||||
|
await page.autocompleteSearch(selectors.ticketBasicData.agency, 'Super-Man delivery');
|
||||||
|
let emptyZone = await page
|
||||||
|
.expectPropertyValue(selectors.ticketBasicData.zone, 'value', '');
|
||||||
|
|
||||||
|
expect(emptyZone).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should edit the ticket zone then check the agency is for the new zone`, async() => {
|
||||||
|
await page.clearInput(selectors.ticketBasicData.agency);
|
||||||
|
await page.autocompleteSearch(selectors.ticketBasicData.zone, 'Zone expensive A');
|
||||||
|
let zone = await page
|
||||||
|
.waitToGetProperty(selectors.ticketBasicData.agency, 'value');
|
||||||
|
|
||||||
|
expect(zone).toContain('Gotham247Expensive');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should click next`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketBasicData.nextStepButton);
|
||||||
|
await page.waitForState('ticket.card.basicData.stepTwo');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should have a price diference`, async() => {
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('-€228.25');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should select a new reason for the changes made then click on finalize`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketBasicData.chargesReason);
|
||||||
|
await page.waitToClick(selectors.ticketBasicData.finalizeButton);
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should not find ticket`, async() => {
|
||||||
|
await page.doSearch('29');
|
||||||
|
const count = await page.countElement(selectors.ticketsIndex.searchResult);
|
||||||
|
|
||||||
|
expect(count).toEqual(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should split ticket without negatives`, async() => {
|
||||||
|
const newAgency = 'Gotham247';
|
||||||
|
const newDate = Date.vnNew();
|
||||||
|
newDate.setDate(newDate.getDate() - 1);
|
||||||
|
|
||||||
|
await page.accessToSearchResult('14');
|
||||||
|
await page.accessToSection('ticket.card.basicData.stepOne');
|
||||||
|
|
||||||
|
await page.autocompleteSearch(selectors.ticketBasicData.agency, newAgency);
|
||||||
|
await page.pickDate(selectors.ticketBasicData.shipped, newDate);
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.ticketBasicData.nextStepButton);
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.ticketBasicData.finalizeButton);
|
||||||
|
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
|
||||||
|
const newTicketAgency = await page
|
||||||
|
.waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryAgency, 'innerText');
|
||||||
|
const newTicketDate = await page
|
||||||
|
.waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryDate, 'innerText');
|
||||||
|
|
||||||
|
expect(newAgency).toEqual(newTicketAgency);
|
||||||
|
expect(newTicketDate).toContain(newDate.getDate());
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should new ticket have sale of old ticket`, async() => {
|
||||||
|
await page.accessToSection('ticket.card.sale');
|
||||||
|
await page.waitForState('ticket.card.sale');
|
||||||
|
|
||||||
|
const item = await page.waitToGetProperty(selectors.ticketSales.firstSaleId, 'innerText');
|
||||||
|
|
||||||
|
expect(item).toEqual('4');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should old ticket have old date and agency`, async() => {
|
||||||
|
const oldDate = Date.vnNew();
|
||||||
|
const oldAgency = 'Super-Man delivery';
|
||||||
|
|
||||||
|
await page.accessToSearchResult('14');
|
||||||
|
|
||||||
|
const oldTicketAgency = await page
|
||||||
|
.waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryAgency, 'innerText');
|
||||||
|
const oldTicketDate = await page
|
||||||
|
.waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryDate, 'innerText');
|
||||||
|
|
||||||
|
expect(oldTicketAgency).toEqual(oldAgency);
|
||||||
|
expect(oldTicketDate).toContain(oldDate.getDate());
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,30 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket List components path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('employee', 'ticket');
|
||||||
|
await page.accessToSearchResult('1');
|
||||||
|
await page.accessToSection('ticket.card.components');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the total base is correct', async() => {
|
||||||
|
const name = 'Base €';
|
||||||
|
const minLength = name.length;
|
||||||
|
|
||||||
|
await page.waitPropertyLength(selectors.ticketComponents.base, 'innerText', minLength);
|
||||||
|
const base = await page.waitToGetProperty(selectors.ticketComponents.base, 'innerText');
|
||||||
|
|
||||||
|
expect(base).toContain('Base');
|
||||||
|
expect(base.length).toBeGreaterThan(minLength);
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,123 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket descriptor path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('buyerBoss', 'ticket');
|
||||||
|
await page.accessToSection('ticket.weekly.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should count the amount of tickets in the turns section', async() => {
|
||||||
|
const result = await page.countElement(selectors.ticketsIndex.weeklyTicket);
|
||||||
|
|
||||||
|
expect(result).toEqual(6);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should go back to the ticket index then search and access a ticket summary', async() => {
|
||||||
|
await page.accessToSection('ticket.index');
|
||||||
|
await page.accessToSearchResult('33');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should add the ticket to thursday turn using the descriptor more menu', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuAddToTurn);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.thursdayButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Current ticket deleted and added to shift');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should again click on the Tickets button of the top bar menu', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.applicationsMenuButton);
|
||||||
|
await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
|
||||||
|
await page.waitToClick(selectors.globalItems.ticketsButton);
|
||||||
|
await page.waitForState('ticket.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the ticket 33 was added to thursday', async() => {
|
||||||
|
await page.accessToSection('ticket.weekly.index');
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('Thursday');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should click on the Tickets button of the top bar menu once more', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.applicationsMenuButton);
|
||||||
|
await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
|
||||||
|
await page.waitToClick(selectors.globalItems.ticketsButton);
|
||||||
|
await page.waitForState('ticket.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should now search for the ticket 33', async() => {
|
||||||
|
await page.accessToSearchResult('33');
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should add the ticket to saturday turn using the descriptor more menu', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuAddToTurn);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.saturdayButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Current ticket deleted and added to shift');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should click on the Tickets button of the top bar menu once again', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.applicationsMenuButton);
|
||||||
|
await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
|
||||||
|
await page.waitToClick(selectors.globalItems.ticketsButton);
|
||||||
|
await page.waitForState('ticket.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the ticket 33 was added on saturday', async() => {
|
||||||
|
await page.accessToSection('ticket.weekly.index');
|
||||||
|
await page.waitForTimeout(5000);
|
||||||
|
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('Saturday');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should now search for the weekly ticket 33', async() => {
|
||||||
|
await page.doSearch('33');
|
||||||
|
const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
|
||||||
|
|
||||||
|
expect(nResults).toEqual(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should delete the weekly ticket 33', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.firstWeeklyTicketDeleteIcon);
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.acceptDeleteTurn);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the sixth weekly ticket was deleted', async() => {
|
||||||
|
await page.doSearch();
|
||||||
|
const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
|
||||||
|
|
||||||
|
expect(nResults).toEqual(6);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update the agency then remove it afterwards', async() => {
|
||||||
|
await page.autocompleteSearch(selectors.ticketsIndex.firstWeeklyTicketAgency, 'Gotham247');
|
||||||
|
let message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
|
||||||
|
await page.clearInput(selectors.ticketsIndex.firstWeeklyTicketAgency);
|
||||||
|
message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,77 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket purchase request path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('salesPerson', 'ticket');
|
||||||
|
await page.accessToSearchResult('1');
|
||||||
|
await page.accessToSection('ticket.card.request.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should add a new request', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketRequests.addRequestButton);
|
||||||
|
await page.write(selectors.ticketRequests.descriptionInput, 'New stuff');
|
||||||
|
await page.write(selectors.ticketRequests.quantity, '9');
|
||||||
|
await page.autocompleteSearch(selectors.ticketRequests.atender, 'buyerNick');
|
||||||
|
await page.write(selectors.ticketRequests.price, '999');
|
||||||
|
await page.waitToClick(selectors.ticketRequests.saveButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should have been redirected to the request index', async() => {
|
||||||
|
await page.waitForState('ticket.card.request.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should edit the third request quantity as it's state is still new`, async() => {
|
||||||
|
await page.write(selectors.ticketRequests.thirdRequestQuantity, '9');
|
||||||
|
await page.keyboard.press('Enter');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should check the new request was added', async() => {
|
||||||
|
await page.reloadSection('ticket.card.request.index');
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketRequests.thirdRequestQuantity, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('99');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the first request can't be edited as its state is different to new`, async() => {
|
||||||
|
await page.waitForClassPresent(selectors.ticketRequests.firstRequestQuantity, 'disabled');
|
||||||
|
const result = await page.isDisabled(selectors.ticketRequests.firstRequestQuantity);
|
||||||
|
|
||||||
|
expect(result).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the second request can't be edited as its state is different to new`, async() => {
|
||||||
|
await page.waitForClassPresent(selectors.ticketRequests.secondRequestQuantity, 'disabled');
|
||||||
|
const result = await page.isDisabled(selectors.ticketRequests.secondRequestQuantity);
|
||||||
|
|
||||||
|
expect(result).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should delete the added request', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketRequests.thirdRemoveRequestButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should check the request was deleted', async() => {
|
||||||
|
await page.reloadSection('ticket.card.request.index');
|
||||||
|
await page.waitForSelector(selectors.ticketRequests.addRequestButton);
|
||||||
|
await page.waitForSelector(selectors.ticketRequests.thirdDescription, {hidden: true});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,148 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket descriptor path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('salesperson', 'ticket');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Delete ticket', () => {
|
||||||
|
it('should search for an specific ticket', async() => {
|
||||||
|
await page.accessToSearchResult('18');
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should update the shipped hour using the descriptor menu`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuChangeShippedHour);
|
||||||
|
await page.pickTime(selectors.ticketDescriptor.changeShippedHour, '08:15');
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.acceptChangeHourButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Shipped hour updated');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the ticket descriptor shows the correct shipping hour`, async() => {
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryDate, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('08:15');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should delete the ticket using the descriptor menu', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Ticket deleted. You can undo this action within the first hour');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should have been relocated to the ticket index', async() => {
|
||||||
|
await page.waitForState('ticket.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should search for the deleted ticket and check the deletedTicket icon and it's date`, async() => {
|
||||||
|
await page.write(selectors.ticketsIndex.topbarSearch, '18');
|
||||||
|
await page.waitToClick(selectors.globalItems.searchButton);
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
await page.isVisible(selectors.ticketDescriptor.isDeletedIcon);
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketsIndex.searchResultDate, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain(2000);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Restore ticket', () => {
|
||||||
|
it('should restore the ticket using the descriptor menu', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuRestoreTicket);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Make invoice', () => {
|
||||||
|
it('should login as administrative role then search for a ticket', async() => {
|
||||||
|
const invoiceableTicketId = '14';
|
||||||
|
|
||||||
|
await page.loginAndModule('administrative', 'ticket');
|
||||||
|
await page.accessToSearchResult(invoiceableTicketId);
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should make sure the ticket doesn't have an invoiceOutFk yet`, async() => {
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSummary.invoiceOutRef, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toEqual('-');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should invoice the ticket using the descriptor menu', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||||
|
await page.waitForContentLoaded();
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuMakeInvoice);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.acceptInvoiceOutButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Ticket invoiced');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should make sure the ticket summary have an invoiceOutFk`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.ticketSummary.invoiceOutRef, 'T4444445');
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketSummary.invoiceOutRef, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toEqual('T4444445');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should regenerate the invoice using the descriptor menu`, async() => {
|
||||||
|
const expectedMessage = 'The invoice PDF document has been regenerated';
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||||
|
await page.waitForContentLoaded();
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuRegenerateInvoice);
|
||||||
|
await page.respondToDialog('accept');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain(expectedMessage);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('SMS', () => {
|
||||||
|
it('should send the payment SMS using the descriptor menu', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuSMSOptions);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuPaymentSMS);
|
||||||
|
await page.waitForSelector(selectors.ticketDescriptor.SMStext);
|
||||||
|
await page.waitPropertyLength(selectors.ticketDescriptor.SMStext, 'value', 128);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.sendSMSbutton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should send the import SMS using the descriptor menu', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuSMSOptions);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuSendImportSms);
|
||||||
|
await page.waitForSelector(selectors.ticketDescriptor.SMStext);
|
||||||
|
await page.waitPropertyLength(selectors.ticketDescriptor.SMStext, 'value', 144);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.sendSMSbutton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,127 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket services path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
const invoicedTicketId = '1';
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('as employee', () => {
|
||||||
|
it('should log in as employee, search for an invoice and get to services', async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('employee', 'ticket');
|
||||||
|
await page.accessToSearchResult(invoicedTicketId);
|
||||||
|
await page.accessToSection('ticket.card.service');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should find the add descripton button disabled for this user role', async() => {
|
||||||
|
await page.waitForClassPresent(selectors.ticketService.firstAddServiceTypeButton, 'disabled');
|
||||||
|
await page.waitToClick(selectors.ticketService.addServiceButton);
|
||||||
|
await page.waitForSelector(selectors.ticketService.firstAddServiceTypeButton);
|
||||||
|
const disabled = await page.isDisabled(selectors.ticketService.firstAddServiceTypeButton);
|
||||||
|
|
||||||
|
expect(disabled).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should receive an error if you attempt to save a service without access rights', async() => {
|
||||||
|
await page.clearInput(selectors.ticketService.firstPrice);
|
||||||
|
await page.write(selectors.ticketService.firstPrice, '999');
|
||||||
|
await page.waitToClick(selectors.ticketService.saveServiceButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain(`The current ticket can't be modified`);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('as administrative', () => {
|
||||||
|
let editableTicketId = '16';
|
||||||
|
it('should navigate to the services of a target ticket', async() => {
|
||||||
|
await page.loginAndModule('administrative', 'ticket');
|
||||||
|
await page.accessToSearchResult(editableTicketId);
|
||||||
|
await page.accessToSection('ticket.card.service');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should click on the add button to prepare the form to create a new service', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketService.addServiceButton);
|
||||||
|
const result = await page
|
||||||
|
.isVisible(selectors.ticketService.firstServiceType);
|
||||||
|
|
||||||
|
expect(result).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should receive an error if you attempt to save it with empty fields', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketService.saveServiceButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain(`can't be blank`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should click on the add new service type to open the dialog', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketService.firstAddServiceTypeButton);
|
||||||
|
await page.waitForSelector('.vn-dialog.shown');
|
||||||
|
const result = await page.isVisible(selectors.ticketService.newServiceTypeName);
|
||||||
|
|
||||||
|
expect(result).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should receive an error if service type is empty on submit', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketService.saveServiceTypeButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain(`Name can't be empty`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create a new service type then add price then create the service', async() => {
|
||||||
|
await page.write(selectors.ticketService.newServiceTypeName, 'Documentos');
|
||||||
|
await page.waitToClick(selectors.ticketService.saveServiceTypeButton);
|
||||||
|
await page.write(selectors.ticketService.firstPrice, '999');
|
||||||
|
await page.waitToClick(selectors.ticketService.saveServiceButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the service description was created correctly', async() => {
|
||||||
|
await page.reloadSection('ticket.card.service');
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketService.firstServiceType, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('Documentos');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the service quantity was created correctly', async() => {
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketService.firstQuantity, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('1');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the service price was created correctly', async() => {
|
||||||
|
const result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketService.firstPrice, 'value');
|
||||||
|
|
||||||
|
expect(result).toEqual('999');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should delete the service', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketService.fistDeleteServiceButton);
|
||||||
|
await page.waitForNumberOfElements(selectors.ticketService.serviceLine, 0);
|
||||||
|
await page.waitToClick(selectors.ticketService.saveServiceButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should confirm the service was removed`, async() => {
|
||||||
|
await page.reloadSection('ticket.card.service');
|
||||||
|
const nResults = await page.countElement(selectors.ticketService.serviceLine);
|
||||||
|
|
||||||
|
expect(nResults).toEqual(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,69 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket create path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
let nextMonth = Date.vnNew();
|
||||||
|
nextMonth.setMonth(nextMonth.getMonth() + 1);
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('salesPerson', 'ticket');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should open the new ticket form', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.newTicketButton);
|
||||||
|
await page.waitForState('ticket.create');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should succeed to create a ticket', async() => {
|
||||||
|
await page.autocompleteSearch(selectors.createTicketView.client, 'Clark Kent');
|
||||||
|
await page.pickDate(selectors.createTicketView.deliveryDate, nextMonth);
|
||||||
|
await page.autocompleteSearch(selectors.createTicketView.warehouse, 'Warehouse Two');
|
||||||
|
await page.autocompleteSearch(selectors.createTicketView.agency, 'Gotham247');
|
||||||
|
await page.waitToClick(selectors.createTicketView.createButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should check the url is now the summary of the ticket', async() => {
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should again open the new ticket form', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.returnToModuleIndexButton);
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.newTicketButton);
|
||||||
|
await page.waitForState('ticket.create');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should succeed to create another ticket for the same client', async() => {
|
||||||
|
await page.autocompleteSearch(selectors.createTicketView.client, 'Clark Kent');
|
||||||
|
await page.pickDate(selectors.createTicketView.deliveryDate, nextMonth);
|
||||||
|
await page.autocompleteSearch(selectors.createTicketView.warehouse, 'Warehouse One');
|
||||||
|
await page.autocompleteSearch(selectors.createTicketView.agency, 'Gotham247');
|
||||||
|
await page.waitToClick(selectors.createTicketView.createButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should check the url is now the summary of the created ticket', async() => {
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should delete the current ticket', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
|
||||||
|
await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Ticket deleted. You can undo this action within the first hour');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,37 @@
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
const $ = {
|
||||||
|
form: 'vn-ticket-create-card',
|
||||||
|
moreMenu: 'vn-client-descriptor vn-icon-button[icon=more_vert]',
|
||||||
|
simpleTicketButton: '.vn-menu [name="simpleTicket"]'
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('Ticket create from client path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('employee', 'client');
|
||||||
|
await page.accessToSearchResult('Petter Parker');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create simple ticket and check if the client details are the expected ones', async() => {
|
||||||
|
await page.waitToClick($.moreMenu);
|
||||||
|
await page.waitToClick($.simpleTicketButton);
|
||||||
|
await page.waitForState('ticket.create');
|
||||||
|
|
||||||
|
const values = {
|
||||||
|
client: 'Petter Parker',
|
||||||
|
address: 'Petter Parker'
|
||||||
|
};
|
||||||
|
const formValues = await page.fetchForm($.form, Object.keys(values));
|
||||||
|
|
||||||
|
expect(formValues).toEqual(values);
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,108 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket Summary path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
const ticketId = '20';
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should navigate to the target ticket summary section', async() => {
|
||||||
|
await page.loginAndModule('employee', 'ticket');
|
||||||
|
await page.accessToSearchResult(ticketId);
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should display details from the ticket and it's client on the top of the header`, async() => {
|
||||||
|
await page.waitForTextInElement(selectors.ticketSummary.header, 'Bruce Banner');
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketSummary.header, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain(`Ticket #${ticketId}`);
|
||||||
|
expect(result).toContain('Bruce Banner (1109)');
|
||||||
|
expect(result).toContain('Somewhere in Thailand');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should display ticket details', async() => {
|
||||||
|
let result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSummary.state, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('Arreglar');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should display delivery details', async() => {
|
||||||
|
let result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSummary.route, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('3');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should display the ticket total', async() => {
|
||||||
|
let result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSummary.total, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('€155.54');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should display the ticket line(s)', async() => {
|
||||||
|
let result = await page
|
||||||
|
.waitToGetProperty(selectors.ticketSummary.firstSaleItemId, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('2');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should click on the first sale ID to make the item descriptor visible`, async() => {
|
||||||
|
await page.waitToClick(selectors.ticketSummary.firstSaleItemId);
|
||||||
|
await page.waitImgLoad(selectors.ticketSummary.firstSaleDescriptorImage);
|
||||||
|
const visible = await page.isVisible(selectors.ticketSummary.itemDescriptorPopover);
|
||||||
|
|
||||||
|
expect(visible).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check the url for the item diary link of the descriptor is for the right item id`, async() => {
|
||||||
|
await page.waitForSelector(selectors.ticketSummary.itemDescriptorPopoverItemDiaryButton, {visible: true});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should log in as production then navigate to the summary of the same ticket', async() => {
|
||||||
|
await page.loginAndModule('production', 'ticket');
|
||||||
|
await page.accessToSearchResult(ticketId);
|
||||||
|
await page.waitForState('ticket.card.summary');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set the ticket state to OK using the top right button', async() => {
|
||||||
|
const searchValue = 'OK';
|
||||||
|
await page.waitToClick(selectors.ticketSummary.stateButton);
|
||||||
|
await page.write(selectors.ticketSummary.stateAutocomplete, searchValue);
|
||||||
|
try {
|
||||||
|
await page.waitForFunction(text => {
|
||||||
|
const element = document.querySelector('li.active');
|
||||||
|
if (element)
|
||||||
|
return element.innerText.toLowerCase().includes(text.toLowerCase());
|
||||||
|
}, {}, searchValue);
|
||||||
|
} catch (error) {
|
||||||
|
const state = await page.evaluate(() => {
|
||||||
|
const stateSelector = 'vn-ticket-summary vn-label-value:nth-child(1) > section > span';
|
||||||
|
return document.querySelector(stateSelector).value;
|
||||||
|
});
|
||||||
|
throw new Error(`${stateSelector} innerText is ${state}! ${error}`);
|
||||||
|
}
|
||||||
|
await page.keyboard.press('Enter');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should confirm the ticket state was updated', async() => {
|
||||||
|
await page.waitForSpinnerLoad();
|
||||||
|
const result = await page.waitToGetProperty(selectors.ticketSummary.state, 'innerText');
|
||||||
|
|
||||||
|
expect(result).toContain('OK');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,34 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket log path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
const ticketId = '5';
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should navigate to the target ticket notes section', async() => {
|
||||||
|
await page.loginAndModule('employee', 'ticket');
|
||||||
|
await page.accessToSearchResult(ticketId);
|
||||||
|
await page.accessToSection('ticket.card.observation');
|
||||||
|
await page.waitForState('ticket.card.observation');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create a new note for the test', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketNotes.addNoteButton);
|
||||||
|
await page.autocompleteSearch(selectors.ticketNotes.firstNoteType, 'ItemPicker');
|
||||||
|
await page.write(selectors.ticketNotes.firstDescription, 'description');
|
||||||
|
await page.waitToClick(selectors.ticketNotes.submitNotesButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,70 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
const $ = {
|
||||||
|
newPayment: '.vn-dialog.shown',
|
||||||
|
anyBalanceLine: 'vn-client-balance-index vn-tbody > vn-tr',
|
||||||
|
firstLineReference: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable'
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('Ticket index payout path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('administrative', 'ticket');
|
||||||
|
await page.waitForState('ticket.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should check the second ticket from a client and 1 of another', async() => {
|
||||||
|
await page.waitToClick(selectors.globalItems.searchButton);
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.thirdTicketCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.fifthTicketCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.payoutButton);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('You cannot make a payment on account from multiple clients');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should search for tickets of the same client then open the payout form', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.openAdvancedSearchButton);
|
||||||
|
await page.write(selectors.ticketsIndex.advancedSearchClient, '1101');
|
||||||
|
await page.keyboard.press('Enter');
|
||||||
|
await page.waitForNumberOfElements(selectors.ticketsIndex.anySearchResult, 10);
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.firstTicketCheckbox);
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.secondTicketCheckbox);
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.ticketsIndex.payoutButton);
|
||||||
|
|
||||||
|
await page.waitForSelector(selectors.ticketsIndex.payoutCompany);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should fill the company and bank to perform a payout and check a new balance line was entered', async() => {
|
||||||
|
await page.fillForm($.newPayment, {
|
||||||
|
company: 'VNL',
|
||||||
|
bank: 'cash',
|
||||||
|
amountPaid: 100,
|
||||||
|
description: 'Payment',
|
||||||
|
viewReceipt: false
|
||||||
|
});
|
||||||
|
await page.respondToDialog('accept');
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
await page.waitToClick(selectors.globalItems.homeButton);
|
||||||
|
await page.selectModule('client');
|
||||||
|
await page.accessToSearchResult('1101');
|
||||||
|
await page.accessToSection('client.card.balance.index');
|
||||||
|
await page.waitForSelector($.anyBalanceLine);
|
||||||
|
const count = await page.countElement($.anyBalanceLine);
|
||||||
|
const reference = await page.innerText($.firstLineReference);
|
||||||
|
|
||||||
|
expect(message.isSuccess).toBeTrue();
|
||||||
|
expect(count).toEqual(4);
|
||||||
|
expect(reference).toContain('Payment');
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,49 @@
|
||||||
|
import selectors from '../../helpers/selectors.js';
|
||||||
|
import getBrowser from '../../helpers/puppeteer';
|
||||||
|
|
||||||
|
describe('Ticket DMS path', () => {
|
||||||
|
let browser;
|
||||||
|
let page;
|
||||||
|
|
||||||
|
beforeAll(async() => {
|
||||||
|
browser = await getBrowser();
|
||||||
|
page = browser.page;
|
||||||
|
await page.loginAndModule('employee', 'ticket');
|
||||||
|
await page.accessToSearchResult('1');
|
||||||
|
await page.accessToSection('ticket.card.dms.index');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async() => {
|
||||||
|
await browser.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should import a document', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDms.import);
|
||||||
|
await page.autocompleteSearch(selectors.ticketDms.document, '1');
|
||||||
|
await page.waitToClick(selectors.ticketDms.saveImport);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('Data saved!');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check there's a listed document now`, async() => {
|
||||||
|
const result = await page.countElement(selectors.ticketDms.anyDocument);
|
||||||
|
|
||||||
|
expect(result).toEqual(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should attempt to import an existing document on this ticket', async() => {
|
||||||
|
await page.waitToClick(selectors.ticketDms.import);
|
||||||
|
await page.autocompleteSearch(selectors.ticketDms.document, '1');
|
||||||
|
await page.waitToClick(selectors.ticketDms.saveImport);
|
||||||
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
|
expect(message.text).toContain('This document already exists on this ticket');
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should check there's still one document`, async() => {
|
||||||
|
const result = await page.countElement(selectors.ticketDms.anyDocument);
|
||||||
|
|
||||||
|
expect(result).toEqual(1);
|
||||||
|
});
|
||||||
|
});
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue