diff --git a/back/Dockerfile b/back/Dockerfile
index 363192a0b..0f75f6949 100644
--- a/back/Dockerfile
+++ b/back/Dockerfile
@@ -32,8 +32,7 @@ RUN apt-get update \
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
samba-common-bin samba-dsdb-modules\
- && rm -rf /var/lib/apt/lists/* \
- && npm -g install pm2
+ && rm -rf /var/lib/apt/lists/*
# Salix
@@ -55,7 +54,4 @@ COPY \
README.md \
./
-CMD ["pm2-runtime", "./back/process.yml"]
-
-HEALTHCHECK --interval=15s --timeout=10s \
- CMD curl -f http://localhost:3000/api/Applications/status || exit 1
+CMD ["node", "--tls-min-v1.0", "--openssl-legacy-provider", "./loopback/server/server.js"]
\ No newline at end of file
diff --git a/back/methods/collection/getTickets.js b/back/methods/collection/getTickets.js
index 2a2b67524..48301a366 100644
--- a/back/methods/collection/getTickets.js
+++ b/back/methods/collection/getTickets.js
@@ -62,7 +62,8 @@ module.exports = Self => {
p.code parkingCodePrevia,
p.pickingOrder pickingOrderPrevia,
iss.id itemShelvingSaleFk,
- iss.isPicked
+ iss.isPicked,
+ iss.itemShelvingFk
FROM ticketCollection tc
LEFT JOIN collection c ON c.id = tc.collectionFk
JOIN sale s ON s.ticketFk = tc.ticketFk
@@ -102,7 +103,8 @@ module.exports = Self => {
p.code,
p.pickingOrder,
iss.id itemShelvingSaleFk,
- iss.isPicked
+ iss.isPicked,
+ iss.itemShelvingFk
FROM sectorCollection sc
JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk = sc.id
JOIN saleGroup sg ON sg.id = ss.saleGroupFk
diff --git a/back/methods/docuware/core.js b/back/methods/docuware/core.js
index 74d922236..3de33b786 100644
--- a/back/methods/docuware/core.js
+++ b/back/methods/docuware/core.js
@@ -4,21 +4,45 @@ module.exports = Self => {
/**
* Returns basic headers
*
- * @param {string} cookie - The docuware cookie
* @return {object} - The headers
*/
Self.getOptions = async() => {
const docuwareConfig = await Self.app.models.DocuwareConfig.findOne();
+ const now = Date.vnNow();
+ let {url, username, password, token, expired} = docuwareConfig;
+
+ if (process.env.NODE_ENV && (!expired || expired < now + 60)) {
+ const {data: {IdentityServiceUrl}} = await axios.get(`${url}/Home/IdentityServiceInfo`);
+ const {data: {token_endpoint}} = await axios.get(`${IdentityServiceUrl}/.well-known/openid-configuration`);
+ const {data} = await axios.post(token_endpoint, {
+ grant_type: 'password',
+ scope: 'docuware.platform',
+ client_id: 'docuware.platform.net.client',
+ username,
+ password
+ }, {headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/x-www-form-urlencoded'
+ }});
+
+ const newToken = data.access_token;
+ token = data.token_type + ' ' + newToken;
+ await docuwareConfig.updateAttributes({
+ token,
+ expired: now + data.expires_in
+ });
+ }
+
const headers = {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
- 'Cookie': docuwareConfig.cookie
+ 'Authorization': token
}
};
return {
- url: docuwareConfig.url,
+ url,
headers
};
};
diff --git a/back/methods/docuware/specs/core.spec.js b/back/methods/docuware/specs/core.spec.js
index cdf8a3b62..47580483d 100644
--- a/back/methods/docuware/specs/core.spec.js
+++ b/back/methods/docuware/specs/core.spec.js
@@ -2,87 +2,54 @@ const axios = require('axios');
const models = require('vn-loopback/server/server').models;
describe('Docuware core', () => {
- beforeAll(() => {
+ const fileCabinetCode = 'deliveryNote';
+ beforeAll(async() => {
process.env.NODE_ENV = 'testing';
- });
- afterAll(() => {
- delete process.env.NODE_ENV;
- });
-
- describe('getOptions()', () => {
- it('should return url and headers', async() => {
- const result = await models.Docuware.getOptions();
-
- expect(result.url).toBeDefined();
- expect(result.headers).toBeDefined();
+ const docuwareInfo = await models.Docuware.findOne({
+ where: {
+ code: fileCabinetCode
+ }
});
- });
- describe('getDialog()', () => {
- it('should return dialogId', async() => {
- const dialogs = {
- data: {
- Dialog: [
- {
- DisplayName: 'find',
- Id: 'getDialogTest'
- }
- ]
- }
- };
- spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
- const result = await models.Docuware.getDialog('deliveryNote', 'find', 'randomFileCabinetId');
+ spyOn(axios, 'get').and.callFake(url => {
+ if (url.includes('IdentityServiceInfo')) return {data: {IdentityServiceUrl: 'IdentityServiceUrl'}};
+ if (url.includes('IdentityServiceUrl')) return {data: {token_endpoint: 'token_endpoint'}};
+ if (url.includes('dialogs')) {
+ return {
+ data: {
+ Dialog: [
+ {
+ DisplayName: 'find',
+ Id: 'getDialogTest'
+ }
+ ]
+ }
+ };
+ }
- expect(result).toEqual('getDialogTest');
- });
- });
-
- describe('getFileCabinet()', () => {
- it('should return fileCabinetId', async() => {
- const code = 'deliveryNote';
- const docuwareInfo = await models.Docuware.findOne({
- where: {
- code
- }
- });
- const dialogs = {
- data: {
+ if (url.includes('FileCabinets')) {
+ return {data: {
FileCabinet: [
{
Name: docuwareInfo.fileCabinetName,
Id: 'getFileCabinetTest'
}
]
- }
- };
- spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
- const result = await models.Docuware.getFileCabinet(code);
-
- expect(result).toEqual('getFileCabinetTest');
- });
- });
-
- describe('get()', () => {
- it('should return data without parse', async() => {
- spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
- spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
- const data = {
- data: {
- id: 1
- }
- };
- spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
- const result = await models.Docuware.get('deliveryNote');
-
- expect(result.id).toEqual(1);
+ }};
+ }
});
- it('should return data with parse', async() => {
- spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
- spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
- const data = {
- data: {
+ spyOn(axios, 'post').and.callFake(url => {
+ if (url.includes('token_endpoint')) {
+ return {data: {
+ access_token: 'access_token',
+ token_type: 'bearer',
+ expires_in: 10000
+ }};
+ }
+ if (url.includes('DialogExpression')) {
+ return {data: {
Items: [{
Fields: [
{
@@ -103,12 +70,52 @@ describe('Docuware core', () => {
]
}]
}
- };
+ };
+ }
+ });
+ });
+
+ afterAll(() => {
+ delete process.env.NODE_ENV;
+ });
+
+ describe('getOptions()', () => {
+ it('should return url and headers', async() => {
+ const result = await models.Docuware.getOptions();
+
+ expect(result.url).toBeDefined();
+ expect(result.headers).toBeDefined();
+ });
+ });
+
+ describe('Dialog()', () => {
+ it('should return dialogId', async() => {
+ const result = await models.Docuware.getDialog('deliveryNote', 'find', 'randomFileCabinetId');
+
+ expect(result).toEqual('getDialogTest');
+ });
+ });
+
+ describe('getFileCabinet()', () => {
+ it('should return fileCabinetId', async() => {
+ const result = await models.Docuware.getFileCabinet(fileCabinetCode);
+
+ expect(result).toEqual('getFileCabinetTest');
+ });
+ });
+
+ describe('get()', () => {
+ it('should return data without parse', async() => {
+ const [result] = await models.Docuware.get('deliveryNote');
+
+ expect(result.firstRequiredField).toEqual(1);
+ });
+
+ it('should return data with parse', async() => {
const parse = {
'firstRequiredField': 'id',
'secondRequiredField': 'name',
};
- spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
const [result] = await models.Docuware.get('deliveryNote', null, parse);
expect(result.id).toEqual(1);
@@ -119,17 +126,14 @@ describe('Docuware core', () => {
describe('getById()', () => {
it('should return data', async() => {
- spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
- spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
- const data = {
- data: {
- id: 1
- }
- };
- spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
- const result = await models.Docuware.getById('deliveryNote', 1);
+ spyOn(models.Docuware, 'get');
+ await models.Docuware.getById('deliveryNote', 1);
- expect(result.id).toEqual(1);
+ expect(models.Docuware.get).toHaveBeenCalledWith(
+ 'deliveryNote',
+ {condition: [Object({DBName: 'N__ALBAR_N', Value: [1]})]},
+ undefined
+ );
});
});
});
diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js
index 0102911e0..5b35b7598 100644
--- a/back/methods/docuware/upload.js
+++ b/back/methods/docuware/upload.js
@@ -143,7 +143,7 @@ module.exports = Self => {
headers: {
'Content-Type': 'multipart/form-data',
'X-File-ModifiedDate': Date.vnNew(),
- 'Cookie': docuwareOptions.headers.headers.Cookie,
+ 'Authorization': docuwareOptions.headers.headers.Authorization,
...data.getHeaders()
},
};
diff --git a/back/models/autonomy.json b/back/models/autonomy.json
index 8c9d82936..214061cf5 100644
--- a/back/models/autonomy.json
+++ b/back/models/autonomy.json
@@ -16,6 +16,10 @@
"name": {
"type": "string",
"required": true
+ },
+ "hasDailyInvoice": {
+ "type": "boolean",
+ "description": "Indicates if the autonomy has daily invoice enabled"
}
},
"relations": {
@@ -40,4 +44,4 @@
"permission": "ALLOW"
}
]
-}
\ No newline at end of file
+}
diff --git a/back/models/country.json b/back/models/country.json
index 5b9d842a8..80d456702 100644
--- a/back/models/country.json
+++ b/back/models/country.json
@@ -28,6 +28,10 @@
},
"continentFk": {
"type": "number"
+ },
+ "hasDailyInvoice": {
+ "type": "boolean",
+ "description": "Indicates if the autonomy has daily invoice enabled"
}
},
"relations": {
diff --git a/back/models/docuware-config.json b/back/models/docuware-config.json
index 9d06c4874..b15cb4c03 100644
--- a/back/models/docuware-config.json
+++ b/back/models/docuware-config.json
@@ -16,17 +16,17 @@
"url": {
"type": "string"
},
- "cookie": {
+ "token": {
"type": "string"
+ },
+ "username": {
+ "type": "string"
+ },
+ "password": {
+ "type": "string"
+ },
+ "expired":{
+ "type": "number"
}
- },
- "acls": [
- {
- "property": "*",
- "accessType": "*",
- "principalType": "ROLE",
- "principalId": "$everyone",
- "permission": "ALLOW"
- }
- ]
+ }
}
diff --git a/back/models/province.json b/back/models/province.json
index 77e0b24a6..61a1574d7 100644
--- a/back/models/province.json
+++ b/back/models/province.json
@@ -16,6 +16,9 @@
"name": {
"type": "string",
"required": true
+ },
+ "autonomyFk": {
+ "type": "number"
}
},
"relations": {
@@ -55,4 +58,4 @@
"permission": "ALLOW"
}
]
-}
\ No newline at end of file
+}
diff --git a/back/process.yml b/back/process.yml
deleted file mode 100644
index 94072b57d..000000000
--- a/back/process.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-apps:
- - script: ./loopback/server/server.js
- name: salix-back
- instances: 1
- max_restarts: 0
- autorestart: false
- node_args: --tls-min-v1.0 --openssl-legacy-provider
diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index 7f7e50dd3..e93bb3b8e 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -388,23 +388,23 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
(4, 'GCN Channel'),
(5, 'The Newspaper');
-INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`)
+INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`)
VALUES
- (1101, 'Bruce Wayne', '84612325V', 'BATMAN', 'Alfred', '1007 MOUNTAIN DRIVE, GOTHAM', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
- (1102, 'Petter Parker', '87945234L', 'SPIDER MAN', 'Aunt May', '20 INGRAM STREET, QUEENS, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
- (1103, 'Clark Kent', '06815934E', 'SUPER MAN', 'lois lane', '344 CLINTON STREET, APARTAMENT 3-D', 'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 0, 19, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
- (1104, 'Tony Stark', '06089160W', 'IRON MAN', 'Pepper Potts', '10880 MALIBU POINT, 90265', 'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
- (1105, 'Max Eisenhardt', '251628698', 'MAGNETO', 'Rogue', 'UNKNOWN WHEREABOUTS', 'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 300, 8, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18, 0, 'florist','normal'),
- (1106, 'DavidCharlesHaller', '53136686Q', 'LEGION', 'Charles Xavier', 'CITY OF NEW YORK, NEW YORK, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 0, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19, 0, 'florist','normal'),
- (1107, 'Hank Pym', '09854837G', 'ANT MAN', 'Hawk', 'ANTHILL, SAN FRANCISCO, CALIFORNIA', 'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19, 0, 'florist','normal'),
- (1108, 'Charles Xavier', '22641921P', 'PROFESSOR X', 'Beast', '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com', NULL, 0, 1234567890, 0, 5, 1, 300, 13, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19, 0, 'florist','normal'),
- (1109, 'Bruce Banner', '16104829E', 'HULK', 'Black widow', 'SOMEWHERE IN NEW YORK', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9, 0, 'florist','normal'),
- (1110, 'Jessica Jones', '58282869H', 'JESSICA JONES', 'Luke Cage', 'NYCC 2015 POSTER', 'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
- (1111, 'Missing', NULL, 'MISSING MAN', 'Anton', 'THE SPACE, UNIVERSE FAR AWAY', 'Gotham', 46460, 1111111111, 222222222, 1, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
- (1112, 'Trash', NULL, 'GARBAGE MAN', 'Unknown name', 'NEW YORK CITY, UNDERGROUND', 'Gotham', 46460, 1111111111, 222222222, 1, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
+ (1101, 'Bruce Wayne', '84612325V', 'BATMAN', 'Alfred', '1007 MOUNTAIN DRIVE, GOTHAM', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
+ (1102, 'Petter Parker', '87945234L', 'SPIDER MAN', 'Aunt May', '20 INGRAM STREET, QUEENS, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
+ (1103, 'Clark Kent', '06815934E', 'SUPER MAN', 'lois lane', '344 CLINTON STREET, APARTAMENT 3-D', 'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 0, 19, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
+ (1104, 'Tony Stark', '06089160W', 'IRON MAN', 'Pepper Potts', '10880 MALIBU POINT, 90265', 'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal'),
+ (1105, 'Max Eisenhardt', '251628698', 'MAGNETO', 'Rogue', 'UNKNOWN WHEREABOUTS', 'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 300, 8, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18, 0, 'florist','normal'),
+ (1106, 'DavidCharlesHaller', '53136686Q', 'LEGION', 'Charles Xavier', 'CITY OF NEW YORK, NEW YORK, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 0, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19, 0, 'florist','normal'),
+ (1107, 'Hank Pym', '09854837G', 'ANT MAN', 'Hawk', 'ANTHILL, SAN FRANCISCO, CALIFORNIA', 'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19, 0, 'florist','normal'),
+ (1108, 'Charles Xavier', '22641921P', 'PROFESSOR X', 'Beast', '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com', NULL, 0, 1234567890, 0, 5, 1, 300, 13, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19, 0, 'florist','normal'),
+ (1109, 'Bruce Banner', '16104829E', 'HULK', 'Black widow', 'SOMEWHERE IN NEW YORK', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9, 0, 'florist','normal'),
+ (1110, 'Jessica Jones', '58282869H', 'JESSICA JONES', 'Luke Cage', 'NYCC 2015 POSTER', 'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
+ (1111, 'Missing', NULL, 'MISSING MAN', 'Anton', 'THE SPACE, UNIVERSE FAR AWAY', 'Gotham', 46460, 1111111111, 222222222, 1, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
+ (1112, 'Trash', NULL, 'GARBAGE MAN', 'Unknown name', 'NEW YORK CITY, UNDERGROUND', 'Gotham', 46460, 1111111111, 222222222, 1, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
-INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
- SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1
+INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
+ SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), UPPER(CONCAT(name, 'Street')), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1
FROM `account`.`role` `r`
WHERE `r`.`hasLogin` = 1;
@@ -632,14 +632,21 @@ INSERT INTO vn.invoiceOutConfig
SET id = 1,
parallelism = 8;
-INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
+INSERT INTO `vn`.`invoiceOutSerial`
+ (`code`,`description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
VALUES
- ('A', 'Global nacional', 1, 'NATIONAL', 0, 'global'),
- ('T', 'Española rapida', 1, 'NATIONAL', 0, 'quick'),
- ('V', 'Intracomunitaria global', 0, 'CEE', 1, 'global'),
- ('M', 'Múltiple nacional', 1, 'NATIONAL', 0, 'multiple'),
- ('R', 'Rectificativa', 1, 'NATIONAL', 0, NULL),
- ('E', 'Exportación rápida', 0, 'WORLD', 0, 'quick');
+ ('A', 'Global nacional', 1, 'NATIONAL', 0, 'global'),
+ ('T', 'Española rapida', 1, 'NATIONAL', 0, 'quick'),
+ ('V', 'Intracomunitaria global', 0, 'CEE', 1, 'global'),
+ ('M', 'Múltiple nacional', 1, 'NATIONAL', 0, 'multiple'),
+ ('R', 'Rectificativa', 1, 'NATIONAL', 0, NULL),
+ ('E', 'Exportación rápida', 0, 'WORLD', 0, 'quick'),
+ ('H', 'Intracomunitaria rápida', 0, 'CEE', 1, 'quick'),
+ ('P', 'Factura simplificada', 1, 'NATIONAL', 0, NULL),
+ ('PE', 'COOPERATIE FLORAHOLLAND UA', 0, 'CEE', 1, NULL),
+ ('S', 'Simplificada', 1, 'NATIONAL', 0, NULL),
+ ('X', 'Exportación global', 0, 'WORLD', 0, 'global'),
+ ('N', 'Múltiple Intracomunitaria', 0, 'CEE', 1, 'multiple');
INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
VALUES
@@ -2911,7 +2918,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
(6, 'book-entry-deleted', 'accounting entries deleted'),
(7, 'zone-included','An email to notify zoneCollisions'),
(8, 'backup-printer-selected','A backup printer has been selected'),
- (9, 'mrw-deadline','The MRW deadline has passed');
+ (9, 'mrw-deadline','The MRW deadline has passed'),
+ (10,'invoice-ticket-closure','Tickets not invoiced during the nightly closure ticket process');
TRUNCATE `util`.`notificationAcl`;
INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
@@ -3943,9 +3951,9 @@ INSERT INTO vn.medicalReview
(id, workerFk, centerFk, `date`, `time`, isFit, amount, invoice, remark)
VALUES(3, 9, 2, '2000-01-01', '8:00', 1, 150.0, NULL, NULL);
-INSERT INTO vn.stockBought (workerFk, bought, reserve, dated)
- VALUES(35, 1.00, 1.00, '2001-01-01');
-INSERT INTO vn.auctionConfig (id,conversionCoefficient,warehouseFk)
+INSERT INTO vn.stockBought (workerFk, bought, reserve, dated)
+ VALUES(35, 1.00, 1.00, '2001-01-01');
+INSERT INTO vn.auctionConfig (id,conversionCoefficient,warehouseFk)
VALUES (1,0.6,6);
INSERT INTO vn.payrollComponent
diff --git a/db/routines/bs/procedures/clientNewBorn_recalc.sql b/db/routines/bs/procedures/clientNewBorn_recalc.sql
index 1c89b5745..bb6b02aa7 100644
--- a/db/routines/bs/procedures/clientNewBorn_recalc.sql
+++ b/db/routines/bs/procedures/clientNewBorn_recalc.sql
@@ -6,25 +6,27 @@ BLOCK1: BEGIN
DECLARE vShipped DATE;
DECLARE vPreviousShipped DATE;
DECLARE vDone boolean;
- DECLARE cur cursor for
-
- SELECT clientFk, firstShipped
- FROM bs.clientNewBorn;
+
+ DECLARE cur CURSOR FOR
+ SELECT clientFk, firstShipped
+ FROM bs.clientNewBorn;
DECLARE continue HANDLER FOR NOT FOUND SET vDone = TRUE;
SET vDone := FALSE;
DELETE FROM bs.clientNewBorn WHERE isModified = FALSE;
- INSERT INTO clientNewBorn(clientFk, firstShipped, lastShipped)
- SELECT c.id, MAX(t.shipped), MAX(t.shipped)
- FROM vn.client c
- JOIN vn.ticket t on t.clientFk = c.id
- LEFT JOIN clientNewBorn cb on cb.clientFk = c.id
- WHERE t.shipped BETWEEN TIMESTAMPADD(YEAR, -1, util.VN_CURDATE()) AND util.VN_CURDATE() AND cb.isModified is null
- GROUP BY c.id;
+ INSERT INTO clientNewBorn(clientFk, firstShipped, lastShipped)
+ SELECT c.id, DATE(MAX(t.shipped)), DATE(MAX(t.shipped))
+ FROM vn.client c
+ JOIN vn.ticket t ON t.clientFk = c.id
+ LEFT JOIN clientNewBorn cb ON cb.clientFk = c.id
+ WHERE t.shipped BETWEEN util.VN_CURDATE() - INTERVAL 1 YEAR
+ AND util.VN_CURDATE()
+ AND cb.isModified IS NULL
+ GROUP BY c.id;
+
OPEN cur;
-
LOOP1: LOOP
SET vDone := FALSE;
FETCH cur INTO vClientFk, vShipped;
diff --git a/db/routines/vn/procedures/client_create.sql b/db/routines/vn/procedures/client_create.sql
index 3df3df905..fad01c107 100644
--- a/db/routines/vn/procedures/client_create.sql
+++ b/db/routines/vn/procedures/client_create.sql
@@ -34,22 +34,19 @@ BEGIN
DECLARE vIsTaxDataChecked TINYINT(1);
DECLARE vHasCoreVnl BOOLEAN;
DECLARE vMandateTypeFk INT;
- DECLARE vHasDailyInvoice BOOLEAN;
SELECT cc.defaultPayMethodFk,
cc.defaultDueDay,
cc.defaultCredit,
cc.defaultIsTaxDataChecked,
cc.defaultHasCoreVnl,
- cc.defaultMandateTypeFk,
- c.hasDailyInvoice
+ cc.defaultMandateTypeFk
INTO vPayMethodFk,
vDueDay,
vDefaultCredit,
vIsTaxDataChecked,
vHasCoreVnl,
- vMandateTypeFk,
- vHasDailyInvoice
+ vMandateTypeFk
FROM clientConfig cc
LEFT JOIN province p ON p.id = vProvinceFk
LEFT JOIN country c ON c.id = p.countryFk;
@@ -70,8 +67,7 @@ BEGIN
credit = vDefaultCredit,
isTaxDataChecked = vIsTaxDataChecked,
hasCoreVnl = vHasCoreVnl,
- isEqualizated = FALSE,
- hasDailyInvoice = vHasDailyInvoice
+ isEqualizated = FALSE
ON duplicate KEY UPDATE
payMethodFk = vPayMethodFk,
dueDay = vDueDay,
diff --git a/db/routines/vn/procedures/collection_addWithReservation.sql b/db/routines/vn/procedures/collection_addWithReservation.sql
index cc0b7fd9b..bb6e94a63 100644
--- a/db/routines/vn/procedures/collection_addWithReservation.sql
+++ b/db/routines/vn/procedures/collection_addWithReservation.sql
@@ -37,23 +37,23 @@ BEGIN
WHERE t.id = vTicketFk;
CALL cache.available_refresh(
- vCacheAvailableFk,
+ vCacheAvailableFk,
FALSE,
- vWarehouseFk,
+ vWarehouseFk,
util.VN_CURDATE());
SELECT available INTO vAvailable
FROM cache.available
- WHERE calc_id = vCacheAvailableFk
+ WHERE calc_id = vCacheAvailableFk
AND item_id = vItemFk;
-
+
IF vAvailable < vQuantity THEN
SET vHasThrow = TRUE;
ELSE
SELECT `name`,
- CONCAT(getUser(), ' ', DATE_FORMAT(util.VN_NOW(), '%H:%i'), ' ', name)
+ CONCAT(getUser(), ' ', DATE_FORMAT(util.VN_NOW(), '%H:%i'), ' ', name)
INTO vItemName, vConcept
- FROM item
+ FROM item
WHERE id = vItemFk;
START TRANSACTION;
@@ -69,7 +69,7 @@ BEGIN
CALL sale_calculateComponent(vSaleFk, NULL);
CALL itemShelvingSale_addBySale(vSaleFk, vSectorFk);
-
+
IF NOT EXISTS (SELECT TRUE FROM itemShelvingSale WHERE saleFk = vSaleFk LIMIT 1) THEN
SET vHasThrow = TRUE;
END IF;
@@ -78,13 +78,13 @@ BEGIN
IF vHasThrow THEN
CALL util.throw("There is no available for the selected item");
END IF;
-
+
IF vSaleGroupFk THEN
INSERT INTO saleGroupDetail
SET saleFk = vSaleFk,
saleGroupFk = vSaleGroupFk;
END IF;
-
+
COMMIT;
END$$
DELIMITER ;
diff --git a/db/routines/vn/procedures/itemShelvingSale_addBySale.sql b/db/routines/vn/procedures/itemShelvingSale_addBySale.sql
index 6625e89b8..06736732a 100644
--- a/db/routines/vn/procedures/itemShelvingSale_addBySale.sql
+++ b/db/routines/vn/procedures/itemShelvingSale_addBySale.sql
@@ -18,8 +18,9 @@ proc: BEGIN
DECLARE vReservedQuantity INT;
DECLARE vOutStanding INT;
DECLARE vUserFk INT;
- DECLARE vTotalReservedQuantity INT;
+ DECLARE vTotalReservedQuantity INT;
DECLARE vSaleQuantity INT;
+ DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
DECLARE vItemShelvingAvailable CURSOR FOR
SELECT ish.id itemShelvingFk,
@@ -29,7 +30,7 @@ proc: BEGIN
JOIN shelving sh ON sh.code = ish.shelvingFk
JOIN parking p ON p.id = sh.parkingFk
JOIN sector sc ON sc.id = p.sectorFk
- JOIN productionConfig pc
+ JOIN productionConfig pc
WHERE s.id = vSaleFk
AND NOT sc.isHideForPickers
AND (sc.id = vSectorFk OR vSectorFk IS NULL)
@@ -44,15 +45,15 @@ proc: BEGIN
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
- ROLLBACK;
+ CALL util.tx_rollback(vIsRequiredTx);
RESIGNAL;
END;
-
- START TRANSACTION;
-
+
+ CALL util.tx_start(vIsRequiredTx);
+
SELECT id INTO vSaleFk
FROM sale
- WHERE id = vSaleFk
+ WHERE id = vSaleFk
FOR UPDATE;
SELECT MAX(p.pickingOrder), s.quantity - SUM(IFNULL(iss.quantity, 0)), s.quantity
@@ -65,7 +66,7 @@ proc: BEGIN
WHERE s.id = vSaleFk;
IF vOutStanding <= 0 THEN
- COMMIT;
+ CALL util.tx_commit(vIsRequiredTx);
LEAVE proc;
END IF;
@@ -85,7 +86,7 @@ proc: BEGIN
IF vTotalReservedQuantity <> vSaleQuantity THEN
CALL util.debugAdd('itemShelvingSale_addBySale',
CONCAT(vSaleFk, ' - ', vSaleQuantity,' - ', vTotalReservedQuantity,'-', vOutStanding,'-', account.myUser_getId()));
-
+
UPDATE sale
SET quantity = vTotalReservedQuantity
WHERE id = vSaleFk;
@@ -93,7 +94,7 @@ proc: BEGIN
LEAVE l;
END IF;
- SELECT id INTO vItemShelvingFk
+ SELECT id INTO vItemShelvingFk
FROM itemShelving
WHERE id = vItemShelvingFk
FOR UPDATE;
@@ -102,19 +103,19 @@ proc: BEGIN
SET vOutStanding = vOutStanding - vReservedQuantity;
IF vReservedQuantity > 0 THEN
- CALL util.debugAdd('itemShelvingSale_addBySale_reservedQuantity',
- CONCAT(vSaleFk, ' - ', vReservedQuantity, ' - ', vOutStanding, account.myUser_getId()));
- INSERT INTO itemShelvingSale(
- itemShelvingFk,
- saleFk,
- quantity,
- userFk,
- isPicked)
- SELECT vItemShelvingFk,
- vSaleFk,
- vReservedQuantity,
- vUserFk,
- FALSE;
+ CALL util.debugAdd('itemShelvingSale_addBySale_reservedQuantity',
+ CONCAT(vSaleFk, ' - ', vReservedQuantity, ' - ', vOutStanding, account.myUser_getId()));
+ INSERT INTO itemShelvingSale(
+ itemShelvingFk,
+ saleFk,
+ quantity,
+ userFk,
+ isPicked)
+ SELECT vItemShelvingFk,
+ vSaleFk,
+ vReservedQuantity,
+ vUserFk,
+ FALSE;
UPDATE itemShelving
SET available = available - vReservedQuantity
@@ -123,6 +124,6 @@ proc: BEGIN
END IF;
END LOOP;
CLOSE vItemShelvingAvailable;
- COMMIT;
+ CALL util.tx_commit(vIsRequiredTx);
END$$
DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn/procedures/item_getSimilar.sql b/db/routines/vn/procedures/item_getSimilar.sql
index 537f53848..336f3521e 100644
--- a/db/routines/vn/procedures/item_getSimilar.sql
+++ b/db/routines/vn/procedures/item_getSimilar.sql
@@ -24,6 +24,7 @@ BEGIN
CALL cache.available_refresh(vAvailableCalcFk, FALSE, vWarehouseFk, vDated);
CALL cache.visible_refresh(vVisibleCalcFk, FALSE, vWarehouseFk);
+ CALL buy_getUltimate(NULL, vWarehouseFk, vDated);
WITH itemTags AS (
SELECT i.id,
@@ -74,14 +75,13 @@ BEGIN
AND a.calc_id = vAvailableCalcFk
LEFT JOIN cache.visible v ON v.item_id = i.id
AND v.calc_id = vVisibleCalcFk
- LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
- AND lb.warehouse_id = vWarehouseFk
+ LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id
AND ip.itemFk = vSelf
LEFT JOIN vn.itemTag it ON it.itemFk = i.id
AND it.priority = vPriority
LEFT JOIN vn.tag t ON t.id = it.tagFk
- LEFT JOIN vn.buy b ON b.id = lb.buy_id
+ LEFT JOIN vn.buy b ON b.id = bu.buyFk
JOIN itemTags its
WHERE a.available > 0
AND (i.typeFk = its.typeFk OR NOT vShowType)
@@ -98,5 +98,7 @@ BEGIN
(i.tag8 = its.tag8) DESC,
match8 DESC
LIMIT 100;
+
+ DROP TEMPORARY TABLE tmp.buyUltimate;
END$$
DELIMITER ;
diff --git a/db/routines/vn/procedures/saleTracking_sectorCollectionAddPrevOK.sql b/db/routines/vn/procedures/saleTracking_sectorCollectionAddPrevOK.sql
new file mode 100644
index 000000000..003168ec8
--- /dev/null
+++ b/db/routines/vn/procedures/saleTracking_sectorCollectionAddPrevOK.sql
@@ -0,0 +1,20 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`saleTracking_sectorCollectionAddPrevOK`(
+ vSectorCollectionFk INT
+)
+BEGIN
+/**
+ * Inserta los registros de sectorCollection con el estado PREVIA OK si la reserva está picked
+ *
+ * @param vSectorCollectionFk Identificador de vn.sectorCollection
+ */
+ REPLACE saleTracking(saleFk, isChecked, workerFk, stateFk)
+ SELECT sgd.saleFk, TRUE, sc.userFk, s.id
+ FROM sectorCollection sc
+ JOIN sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
+ JOIN saleGroupDetail sgd ON sgd.saleGroupFk = scsg.saleGroupFk
+ JOIN state s ON s.code = 'OK PREVIOUS'
+ JOIN itemShelvingSale iss ON iss.saleFk = sgd.saleFk
+ WHERE sc.id = vSectorCollectionFk AND iss.isPicked;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/ticket_canAdvance.sql b/db/routines/vn/procedures/ticket_canAdvance.sql
index 57c3f4235..e8fc70bba 100644
--- a/db/routines/vn/procedures/ticket_canAdvance.sql
+++ b/db/routines/vn/procedures/ticket_canAdvance.sql
@@ -51,7 +51,8 @@ BEGIN
origin.companyFk futureCompanyFk,
IFNULL(dest.nickname, origin.nickname) nickname,
dest.landed,
- dest.preparation
+ dest.preparation,
+ origin.departmentFk
FROM (
SELECT s.ticketFk,
c.salesPersonFk workerFk,
@@ -71,9 +72,11 @@ BEGIN
t.addressFk,
t.warehouseFk,
t.companyFk,
- t.agencyModeFk
+ t.agencyModeFk,
+ wd.departmentFk
FROM ticket t
JOIN client c ON c.id = t.clientFk
+ JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
JOIN sale s ON s.ticketFk = t.id
JOIN saleVolume sv ON sv.saleFk = s.id
JOIN item i ON i.id = s.itemFk
diff --git a/db/routines/vn/procedures/ticket_close.sql b/db/routines/vn/procedures/ticket_close.sql
index 0da001ffa..e2dcef9a5 100644
--- a/db/routines/vn/procedures/ticket_close.sql
+++ b/db/routines/vn/procedures/ticket_close.sql
@@ -43,7 +43,7 @@ BEGIN
c.isTaxDataChecked,
t.companyFk,
t.shipped,
- IFNULL(a.hasDailyInvoice, co.hasDailyInvoice),
+ c.hasDailyInvoice,
w.isManaged,
c.hasToInvoice
INTO vClientFk,
@@ -55,9 +55,6 @@ BEGIN
vHasToInvoice
FROM ticket t
JOIN `client` c ON c.id = t.clientFk
- JOIN province p ON p.id = c.provinceFk
- LEFT JOIN autonomy a ON a.id = p.autonomyFk
- JOIN country co ON co.id = p.countryFk
JOIN warehouse w ON w.id = t.warehouseFk
WHERE t.id = vCurTicketFk;
@@ -85,7 +82,7 @@ BEGIN
IF(vHasDailyInvoice) AND vHasToInvoice THEN
SELECT invoiceSerial(vClientFk, vCompanyFk, 'quick') INTO vSerial;
- IF vSerial IS NULL THEN
+ IF vSerial IS NULL THEN
CALL util.throw('Cannot booking without a serial');
END IF;
diff --git a/db/routines/vn/procedures/ticket_getTax.sql b/db/routines/vn/procedures/ticket_getTax.sql
index 947c45806..cb9dc09d9 100644
--- a/db/routines/vn/procedures/ticket_getTax.sql
+++ b/db/routines/vn/procedures/ticket_getTax.sql
@@ -1,5 +1,7 @@
DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_getTax`(IN vTaxArea VARCHAR(25))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_getTax`(
+ vTaxArea VARCHAR(25)
+)
BEGIN
/**
* Calcula la base imponible, el IVA y el recargo de equivalencia para
@@ -33,30 +35,39 @@ BEGIN
CREATE OR REPLACE TEMPORARY TABLE tmp.ticketTax
(PRIMARY KEY (ticketFk, code, rate))
ENGINE = MEMORY
- SELECT * FROM (
- SELECT tmpTicket.ticketFk,
- bp.pgcFk,
- SUM(s.quantity * s.price * (100 - s.discount) / 100 ) taxableBase,
- pgc.rate,
- tc.code,
- bp.priority
- FROM tmp.ticket tmpTicket
- JOIN sale s ON s.ticketFk = tmpTicket.ticketFk
- JOIN item i ON i.id = s.itemFk
- JOIN ticket t ON t.id = tmpTicket.ticketFk
- JOIN supplier su ON su.id = t.companyFk
+ WITH sales AS (
+ SELECT s.ticketFk,
+ s.itemFk,
+ s.quantity * s.price * (100 - s.discount) / 100 total,
+ t.companyFk,
+ t.addressFk,
+ su.countryFk,
+ ata.areaFk,
+ itc.taxClassFk
+ FROM vn.sale s
+ JOIN tmp.ticket tmp ON tmp.ticketFk = s.ticketFk
+ JOIN vn.ticket t ON t.id = s.ticketFk
+ JOIN vn.supplier su ON su.id = t.companyFk
JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
AND ata.companyFk = t.companyFk
- JOIN itemTaxCountry itc ON itc.itemFk = i.id
+ JOIN vn.itemTaxCountry itc ON itc.itemFk = s.itemFk
AND itc.countryFk = su.countryFk
- JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
- AND bp.taxAreaFk = ata.areaFk
- AND bp.taxClassFk = itc.taxClassFk
- JOIN pgc ON pgc.code = bp.pgcFk
- JOIN taxClass tc ON tc.id = bp.taxClassFk
- GROUP BY tmpTicket.ticketFk, pgc.code, pgc.rate
- HAVING taxableBase
- ) t3
+ HAVING total
+ )
+ SELECT s.ticketFk,
+ bp.pgcFk,
+ SUM(s.total) taxableBase,
+ pgc.rate,
+ tc.code,
+ bp.priority
+ FROM sales s
+ JOIN vn.bookingPlanner bp ON bp.countryFk = s.countryFk
+ AND bp.taxAreaFk = s.areaFk
+ AND bp.taxClassFk = s.taxClassFk
+ JOIN vn.pgc ON pgc.code = bp.pgcFk
+ JOIN vn.taxClass tc ON tc.id = bp.taxClassFk
+ GROUP BY s.ticketFk, pgc.code, pgc.rate
+ HAVING taxableBase
ORDER BY priority;
CREATE OR REPLACE TEMPORARY TABLE tmp.ticketServiceTax
diff --git a/db/routines/vn/triggers/itemShelvingSale_afterInsert.sql b/db/routines/vn/triggers/itemShelvingSale_afterInsert.sql
index 3531b094c..ad4a6f670 100644
--- a/db/routines/vn/triggers/itemShelvingSale_afterInsert.sql
+++ b/db/routines/vn/triggers/itemShelvingSale_afterInsert.sql
@@ -3,10 +3,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelvingSale_afterI
AFTER INSERT ON `itemShelvingSale`
FOR EACH ROW
BEGIN
-
UPDATE sale s
JOIN operator o ON o.workerFk = account.myUser_getId()
- SET s.isPicked = IF(o.isOnReservationMode, s.isPicked, TRUE)
- WHERE id = NEW.saleFk;
+ JOIN sector se ON se.id = o.sectorFk
+ SET s.isPicked = IF(IFNULL(se.isOnReservationMode, o.isOnReservationMode), s.isPicked, TRUE)
+ WHERE s.id = NEW.saleFk;
END$$
DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn2008/views/Clientes.sql b/db/routines/vn2008/views/Clientes.sql
index 153d875bc..9f8ef712e 100644
--- a/db/routines/vn2008/views/Clientes.sql
+++ b/db/routines/vn2008/views/Clientes.sql
@@ -22,7 +22,6 @@ AS SELECT `c`.`id` AS `id_cliente`,
`c`.`credit` AS `credito`,
`c`.`countryFk` AS `Id_Pais`,
`c`.`isActive` AS `activo`,
- `c`.`gestdocFk` AS `gestdoc_id`,
`c`.`quality` AS `calidad`,
`c`.`payMethodFk` AS `pay_met_id`,
`c`.`created` AS `created`,
diff --git a/db/versions/11274-redGerbera/00-firstScript copy.sql b/db/versions/11274-redGerbera/00-firstScript2.sql
similarity index 100%
rename from db/versions/11274-redGerbera/00-firstScript copy.sql
rename to db/versions/11274-redGerbera/00-firstScript2.sql
diff --git a/db/versions/11274-redGerbera/00-firstScript copy 2.sql b/db/versions/11274-redGerbera/00-firstScript3.sql
similarity index 100%
rename from db/versions/11274-redGerbera/00-firstScript copy 2.sql
rename to db/versions/11274-redGerbera/00-firstScript3.sql
diff --git a/db/versions/11274-redGerbera/00-firstScript copy 3.sql b/db/versions/11274-redGerbera/00-firstScript4.sql
similarity index 100%
rename from db/versions/11274-redGerbera/00-firstScript copy 3.sql
rename to db/versions/11274-redGerbera/00-firstScript4.sql
diff --git a/db/versions/11274-redGerbera/00-firstScript copy 4.sql b/db/versions/11274-redGerbera/00-firstScript5.sql
similarity index 100%
rename from db/versions/11274-redGerbera/00-firstScript copy 4.sql
rename to db/versions/11274-redGerbera/00-firstScript5.sql
diff --git a/db/versions/11274-redGerbera/00-firstScript copy 5.sql b/db/versions/11274-redGerbera/00-firstScript6.sql
similarity index 100%
rename from db/versions/11274-redGerbera/00-firstScript copy 5.sql
rename to db/versions/11274-redGerbera/00-firstScript6.sql
diff --git a/db/versions/11274-redGerbera/00-firstScript copy 6.sql b/db/versions/11274-redGerbera/00-firstScript7.sql
similarity index 100%
rename from db/versions/11274-redGerbera/00-firstScript copy 6.sql
rename to db/versions/11274-redGerbera/00-firstScript7.sql
diff --git a/db/versions/11290-blackOrchid/00-firstScript.sql b/db/versions/11290-blackOrchid/00-firstScript.sql
new file mode 100644
index 000000000..fe568ed6e
--- /dev/null
+++ b/db/versions/11290-blackOrchid/00-firstScript.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `vn`.`operator`
+ADD COLUMN `machineFk` int(11) DEFAULT NULL,
+ADD CONSTRAINT `operator_machine_FK` FOREIGN KEY (`machineFk`) REFERENCES `vn`.`machine` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+ VALUES ('Machine','*','*','ALLOW','ROLE','productionBoss');
diff --git a/db/versions/11291-purpleChico/00-firstScript.sql b/db/versions/11291-purpleChico/00-firstScript.sql
new file mode 100644
index 000000000..e60b90376
--- /dev/null
+++ b/db/versions/11291-purpleChico/00-firstScript.sql
@@ -0,0 +1,4 @@
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS username varchar(100) NULL;
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS password varchar(100) NULL;
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS token text NULL;
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS expired int(11) NULL;
diff --git a/db/versions/11300-limeMedeola/00-firstScript.sql b/db/versions/11300-limeMedeola/00-firstScript.sql
new file mode 100644
index 000000000..28b033b4a
--- /dev/null
+++ b/db/versions/11300-limeMedeola/00-firstScript.sql
@@ -0,0 +1,137 @@
+CREATE TABLE IF NOT EXISTS `vn`.`itemFarmingTag` (
+ `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT
+ CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemFarmingTag` (`name`) VALUES ('Enraizado');
+
+UPDATE vn.tag
+ SET isFree=0,
+ sourceTable='itemFarmingTag'
+ WHERE name= 'cultivo';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemWrappingTag` (
+ `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT
+ CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Bolsa');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Caja cartón');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Caja decorativa');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Celofán');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Papel kraft');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Plástico');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Variable');
+
+UPDATE vn.tag
+ SET isFree=0,
+ sourceTable='itemWrappingTag'
+ WHERE name= 'Envoltorio';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemLanguageTag` (
+ `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT
+ CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Castellano');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Catalán');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Euskera');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Francés');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Gallego');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Inglés');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Portugués');
+
+UPDATE vn.tag
+ SET isFree=0,
+ sourceTable='itemLanguageTag'
+ WHERE name= 'Idioma';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemStemTag` (
+ `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT
+ CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemStemTag` (`name`) VALUES ('Natural');
+INSERT IGNORE INTO `vn`.`itemStemTag` (`name`) VALUES ('Seminatural');
+INSERT IGNORE INTO `vn`.`itemStemTag` (`name`) VALUES ('Sintético');
+
+UPDATE vn.tag
+ SET isFree=0,
+ sourceTable='itemStemTag'
+ WHERE name= 'Tronco';
+
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemBreederTag` (
+ `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT
+ CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemBreederTag` (`name`) VALUES ('David Austin');
+
+UPDATE vn.tag
+ SET isFree=0,
+ sourceTable='itemBreederTag'
+ WHERE name= 'Obtentor';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemBaseTag` (
+ `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT
+ CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Biodegradable');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Caballete');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Cerámica');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Cristal');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Plástico por inyección');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Madera');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Plástico');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Rígido');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Ruedas');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Sin soporte rígido');
+
+UPDATE vn.tag
+ SET isFree=0,
+ sourceTable='itemBaseTag'
+ WHERE name= 'Soporte';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemVatRateTag` (
+ `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT
+ CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemVatRateTag` (`name`) VALUES ('General');
+INSERT IGNORE INTO `vn`.`itemVatRateTag` (`name`) VALUES ('Reducido');
+
+UPDATE vn.tag
+ SET isFree=0,
+ sourceTable='itemVatRateTag'
+ WHERE name= 'Tipo de IVA';
+
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemFarmingTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemWrappingTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemLanguageTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemStemTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemWrappingTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemBaseTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemBreederTag TO logisticAssist;
\ No newline at end of file
diff --git a/db/versions/11302-limeTulip/00-firstScript.sql b/db/versions/11302-limeTulip/00-firstScript.sql
new file mode 100644
index 000000000..7bda31b64
--- /dev/null
+++ b/db/versions/11302-limeTulip/00-firstScript.sql
@@ -0,0 +1,13 @@
+
+UPDATE `vn`.`client` c
+ JOIN `vn`.`country` co ON co.id=c.countryFk
+SET c.hasDailyInvoice = co.hasDailyInvoice
+WHERE co.hasDailyInvoice IS NOT NULL
+ AND c.hasDailyInvoice = FALSE;
+
+UPDATE `vn`.`client` c
+ JOIN `vn`.`province` p ON p.id=c.provinceFk
+ JOIN `vn`.`autonomy` a ON a.id = p.autonomyFk
+SET c.hasDailyInvoice = a.hasDailyInvoice
+WHERE a.hasDailyInvoice IS NOT NULL
+ AND c.hasDailyInvoice = FALSE;
diff --git a/db/versions/11311-tealFern/00-firstScript.sql b/db/versions/11311-tealFern/00-firstScript.sql
new file mode 100644
index 000000000..909747f3c
--- /dev/null
+++ b/db/versions/11311-tealFern/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.client CHANGE gestdocFk gestdocFk__ int(11) DEFAULT NULL NULL COMMENT '@deprecated 2024-10-17';
\ No newline at end of file
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 627be5122..0e6fa9b6b 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -242,5 +242,6 @@
"The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm",
"The quantity claimed cannot be greater than the quantity of the line": "The quantity claimed cannot be greater than the quantity of the line",
"null": "null",
- "Invalid or expired verification code": "Invalid or expired verification code"
-}
\ No newline at end of file
+ "Invalid or expired verification code": "Invalid or expired verification code",
+ "There are tickets for this area, delete them first": "There are tickets for this area, delete them first"
+}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 9308fd4ec..a97da3194 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -350,6 +350,7 @@
"Cmr file does not exist": "El archivo del cmr no existe",
"You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
"The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
+ "No invoice series found for these parameters": "No se encontró una serie para estos parámetros",
"The line could not be marked": "La linea no puede ser marcada",
"Through this procedure, it is not possible to modify the password of users with verified email": "Mediante este procedimiento, no es posible modificar la contraseña de usuarios con correo verificado",
"They're not your subordinate": "No es tu subordinado/a.",
@@ -382,5 +383,6 @@
"This buyer has already made a reservation for this date": "Este comprador ya ha hecho una reserva para esta fecha",
"No valid travel thermograph found": "No se encontró un termógrafo válido",
"The quantity claimed cannot be greater than the quantity of the line": "La cantidad reclamada no puede ser mayor que la cantidad de la línea",
- "type cannot be blank": "Se debe rellenar el tipo"
-}
\ No newline at end of file
+ "type cannot be blank": "Se debe rellenar el tipo",
+ "There are tickets for this area, delete them first": "Hay tickets para esta sección, borralos primero"
+}
diff --git a/loopback/locale/fr.json b/loopback/locale/fr.json
index a6648b186..23bd5cc04 100644
--- a/loopback/locale/fr.json
+++ b/loopback/locale/fr.json
@@ -350,6 +350,7 @@
"Cmr file does not exist": "Le fichier cmr n'existe pas",
"You are not allowed to modify the alias": "Vous n'êtes pas autorisé à modifier l'alias",
"The address of the customer must have information about Incoterms and Customs Agent": "L'adresse du client doit contenir des informations sur les Incoterms et l'agent des douanes",
+ "No invoice series found for these parameters": "Aucune série de facture trouvée pour ces paramètres",
"The line could not be marked": "La ligne ne peut pas être marquée",
"This password can only be changed by the user themselves": "Ce mot de passe ne peut être modifié que par l'utilisateur lui-même",
"They're not your subordinate": "Ce n'est pas votre subordonné.",
diff --git a/loopback/locale/pt.json b/loopback/locale/pt.json
index a43f0e780..f85afd607 100644
--- a/loopback/locale/pt.json
+++ b/loopback/locale/pt.json
@@ -350,6 +350,7 @@
"Cmr file does not exist": "O arquivo CMR não existe",
"You are not allowed to modify the alias": "Você não tem permissão para modificar o alias",
"The address of the customer must have information about Incoterms and Customs Agent": "O endereço do cliente deve ter informações sobre Incoterms e Agente Aduaneiro",
+ "No invoice series found for these parameters": "Nenhuma série de fatura encontrada para esses parâmetros",
"The line could not be marked": "A linha não pôde ser marcada",
"This password can only be changed by the user themselves": "Esta senha só pode ser alterada pelo próprio usuário",
"They're not your subordinate": "Eles não são seus subordinados.",
diff --git a/modules/claim/back/methods/claim/updateClaim.js b/modules/claim/back/methods/claim/updateClaim.js
index 326192385..563b5b53d 100644
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/modules/claim/back/methods/claim/updateClaim.js
@@ -85,16 +85,11 @@ module.exports = Self => {
const updatedClaim = await claim.updateAttributes(args, myOptions);
const salesPerson = claim.client().salesPersonUser();
- if (salesPerson) {
- if (changedPickup && updatedClaim.pickup)
- await notifyPickUp(ctx, salesPerson.id, claim);
-
- if (args.claimStateFk) {
- const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
- await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
- if (newState.code == 'canceled')
- await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
- }
+ if (salesPerson && args.claimStateFk) {
+ const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
+ await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
+ if (newState.code == 'canceled')
+ await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
}
if (tx) await tx.commit();
@@ -119,18 +114,4 @@ module.exports = Self => {
});
await models.Chat.sendCheckingPresence(ctx, workerId, message);
}
-
- async function notifyPickUp(ctx, workerId, claim) {
- const models = Self.app.models;
- const url = await models.Url.getUrl();
- const $t = ctx.req.__; // $translate
-
- const message = $t('Claim will be picked', {
- claimId: claim.id,
- clientName: claim.client().name,
- claimUrl: `${url}claim/${claim.id}/summary`,
- claimPickup: $t(claim.pickup)
- });
- await models.Chat.sendCheckingPresence(ctx, workerId, message);
- }
};
diff --git a/modules/client/back/methods/client/createWithUser.js b/modules/client/back/methods/client/createWithUser.js
index 06b885ab8..c8cd282e1 100644
--- a/modules/client/back/methods/client/createWithUser.js
+++ b/modules/client/back/methods/client/createWithUser.js
@@ -43,6 +43,23 @@ module.exports = function(Self) {
};
try {
+ const province = await models.Province.findOne({
+ where: {id: data.provinceFk},
+ fields: ['autonomyFk']
+ });
+
+ const autonomy = province ? await models.Autonomy.findOne({
+ where: {id: province.autonomyFk},
+ fields: ['hasDailyInvoice']
+ }) : null;
+
+ const country = await models.Country.findOne({
+ where: {id: data.countryFk},
+ fields: ['hasDailyInvoice']
+ });
+
+ const hasDailyInvoice = (autonomy?.hasDailyInvoice ?? country?.hasDailyInvoice) || false;
+
const account = await models.VnUser.create(user, myOptions);
const client = await Self.create({
id: account.id,
@@ -57,7 +74,8 @@ module.exports = function(Self) {
provinceFk: data.provinceFk,
countryFk: data.countryFk,
isEqualizated: data.isEqualizated,
- businessTypeFk: data.businessTypeFk
+ businessTypeFk: data.businessTypeFk,
+ hasDailyInvoice: hasDailyInvoice
}, myOptions);
const address = await models.Address.create({
diff --git a/modules/client/back/methods/client/specs/createWithUser.spec.js b/modules/client/back/methods/client/specs/createWithUser.spec.js
index 5b1ff5da9..8cff96ac5 100644
--- a/modules/client/back/methods/client/specs/createWithUser.spec.js
+++ b/modules/client/back/methods/client/specs/createWithUser.spec.js
@@ -1,67 +1,78 @@
const models = require('vn-loopback/server/server').models;
+
describe('Client Create', () => {
- const newAccount = {
- userName: 'deadpool',
- email: 'deadpool@marvel.com',
- fi: '16195279J',
- name: 'Wade',
- socialName: 'DEADPOOL MARVEL',
- street: 'WALL STREET',
- city: 'New York',
- businessTypeFk: 'florist',
- provinceFk: 1
- };
- const newAccountWithoutEmail = JSON.parse(JSON.stringify(newAccount));
- delete newAccountWithoutEmail.email;
+ let options;
+ let tx;
beforeAll.mockLoopBackContext();
- it(`should not find deadpool as he's not created yet`, async() => {
- const tx = await models.Client.beginTransaction({});
+ beforeEach(async() => {
+ tx = await models.Client.beginTransaction({});
+ options = {transaction: tx};
+ });
+ afterEach(async() => await tx.rollback());
+
+ it('should not find deadpool as he is not created yet', async() => {
try {
- const options = {transaction: tx};
+ const account = await models.VnUser.findOne({where: {name: 'deadpool'}}, options);
+ const client = await models.Client.findOne({where: {name: 'Wade'}}, options);
- const account = await models.VnUser.findOne({where: {name: newAccount.userName}}, options);
- const client = await models.Client.findOne({where: {name: newAccount.name}}, options);
-
- expect(account).toEqual(null);
- expect(client).toEqual(null);
-
- await tx.rollback();
+ expect(account).toBeNull();
+ expect(client).toBeNull();
} catch (e) {
await tx.rollback();
throw e;
}
});
- it('should not create a new account', async() => {
- const tx = await models.Client.beginTransaction({});
-
+ it('should throw an error when creating a new account without email', async() => {
let error;
+ const newAccountWithoutEmail = {
+ userName: 'deadpool',
+ fi: '16195279J',
+ name: 'Wade',
+ socialName: 'DEADPOOL MARVEL',
+ street: 'WALL STREET',
+ city: 'New York',
+ businessTypeFk: 'florist',
+ provinceFk: 1
+ };
+
try {
- const options = {transaction: tx};
await models.Client.createWithUser(newAccountWithoutEmail, options);
-
- await tx.rollback();
} catch (e) {
- error = e.message;
-
- await tx.rollback();
+ error = e;
}
- expect(error).toEqual(`An email is necessary`);
+ expect(error.message).toEqual('An email is necessary');
});
- it('should create a new account', async() => {
- const tx = await models.Client.beginTransaction({});
+ it('should create a new account with dailyInvoice', async() => {
+ const newAccount = {
+ userName: 'deadpool',
+ email: 'deadpool@marvel.com',
+ fi: '16195279J',
+ name: 'Wade',
+ socialName: 'DEADPOOL MARVEL',
+ street: 'WALL STREET',
+ city: 'New York',
+ businessTypeFk: 'florist',
+ provinceFk: 1
+ };
try {
- const options = {transaction: tx};
+ const province = await models.Province.findById(newAccount.provinceFk, {
+ fields: ['id', 'name', 'autonomyFk'],
+ include: {
+ relation: 'autonomy'
+ }
+ }, options);
const client = await models.Client.createWithUser(newAccount, options);
const account = await models.VnUser.findOne({where: {name: newAccount.userName}}, options);
+ expect(province.autonomy().hasDailyInvoice).toBeTruthy();
expect(account.name).toEqual(newAccount.userName);
expect(client.id).toEqual(account.id);
expect(client.name).toEqual(newAccount.name);
@@ -69,8 +80,38 @@ describe('Client Create', () => {
expect(client.fi).toEqual(newAccount.fi);
expect(client.socialName).toEqual(newAccount.socialName);
expect(client.businessTypeFk).toEqual(newAccount.businessTypeFk);
-
+ expect(client.hasDailyInvoice).toBeTruthy();
+ } catch (e) {
await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should create a new account without dailyInvoice', async() => {
+ const newAccount = {
+ userName: 'deadpool',
+ email: 'deadpool@marvel.com',
+ fi: '16195279J',
+ name: 'Wade',
+ socialName: 'DEADPOOL MARVEL',
+ street: 'WALL STREET',
+ city: 'New York',
+ businessTypeFk: 'florist',
+ provinceFk: 3
+ };
+
+ try {
+ const province = await models.Province.findById(newAccount.provinceFk, {
+ fields: ['id', 'name', 'autonomyFk'],
+ include: {
+ relation: 'autonomy'
+ }
+ }, options);
+
+ const client = await models.Client.createWithUser(newAccount, options);
+
+ expect(province.autonomy.hasDailyInvoice).toBeFalsy();
+ expect(client.hasDailyInvoice).toBeFalsy();
} catch (e) {
await tx.rollback();
throw e;
@@ -78,26 +119,25 @@ describe('Client Create', () => {
});
it('should not be able to create a user if exists', async() => {
- const tx = await models.Client.beginTransaction({});
-
let error;
-
+ const newAccount = {
+ userName: 'deadpool',
+ email: 'deadpool@marvel.com',
+ fi: '16195279J',
+ name: 'Wade',
+ socialName: 'DEADPOOL MARVEL',
+ street: 'WALL STREET',
+ city: 'New York',
+ businessTypeFk: 'florist',
+ provinceFk: 1
+ };
try {
- const options = {transaction: tx};
-
await models.Client.createWithUser(newAccount, options);
- const client = await models.Client.createWithUser(newAccount, options);
-
- expect(client).toBeNull();
-
- await tx.rollback();
+ await models.Client.createWithUser(newAccount, options);
} catch (e) {
- await tx.rollback();
error = e;
}
- const errorName = error.details.codes.name[0];
-
- expect(errorName).toEqual('uniqueness');
+ expect(error.message).toContain('already exists');
});
});
diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js
index 9f19dee0a..5359ce4a7 100644
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@@ -74,7 +74,8 @@ module.exports = Self => {
pm.name payMethod,
r.finished IS NULL hasRecovery,
dp.id departmentFk,
- dp.name departmentName
+ dp.name departmentName,
+ dp.notificationEmail departmentEmail
FROM defaulter d
JOIN client c ON c.id = d.clientFk
JOIN country cn ON cn.id = c.countryFk
diff --git a/modules/client/back/methods/defaulter/observationEmail.js b/modules/client/back/methods/defaulter/observationEmail.js
index c06d1d3d0..797e88f74 100644
--- a/modules/client/back/methods/defaulter/observationEmail.js
+++ b/modules/client/back/methods/defaulter/observationEmail.js
@@ -47,7 +47,7 @@ module.exports = Self => {
await models.Mail.create({
subject: $t('Comment added to client', {clientFk: defaulter.clientFk}),
body: body,
- receiver: `${defaulter.salesPersonName}@verdnatura.es`,
+ receiver: `${defaulter.departmentEmail}`,
replyTo: `${user.name}@verdnatura.es`
}, myOptions);
}
diff --git a/modules/invoiceOut/back/methods/invoiceOut/delete.js b/modules/invoiceOut/back/methods/invoiceOut/delete.js
index d6efd9961..1ab9a582b 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/delete.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/delete.js
@@ -37,7 +37,7 @@ module.exports = Self => {
const tickets = await models.Ticket.find({
where: {refFk: invoiceOut.ref}
}, myOptions);
-
+
const [bookEntry] = await models.Xdiario.find({
where: {
SERIE: invoiceOut.ref[0],
@@ -55,13 +55,13 @@ module.exports = Self => {
if (bookEntry) {
if (bookEntry.enlazadoSage) {
const params = {
- bookEntry: bookEntry.ASIEN,
+ bookEntry: bookEntry.ASIEN,
invoiceOutRef: invoiceOut.ref
- }
+ };
await Self.rawSql(`SELECT util.notification_send('book-entry-deleted', ?, NULL)`,
[JSON.stringify(params)],
myOptions);
- };
+ }
await models.Xdiario.destroyAll({
ASIEN: bookEntry.ASIEN
diff --git a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
index 76ef29604..9e491b35c 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
@@ -48,13 +48,13 @@ module.exports = Self => {
let stmt;
stmts.push(new ParameterizedSQL(
`CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
- (KEY (ticketFk))
+ (INDEX (ticketFk))
ENGINE = MEMORY
SELECT id ticketFk
- FROM ticket t
+ FROM ticket
WHERE shipped BETWEEN ? AND util.dayEnd(?)
AND refFk IS NULL`, [args.from, args.to]));
- stmts.push(`CALL vn.ticket_getTax(NULL)`);
+ stmts.push(`CALL ticket_getTax(NULL)`);
stmts.push(new ParameterizedSQL(
`CREATE OR REPLACE TEMPORARY TABLE tmp.filter
ENGINE = MEMORY
@@ -71,12 +71,12 @@ module.exports = Self => {
c.isTaxDataChecked,
w.id comercialId,
u.name workerName
- FROM vn.ticket t
- JOIN vn.company co ON co.id = t.companyFk
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.client c ON c.id = t.clientFk
- JOIN vn.country cou ON cou.id = c.countryFk
- LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
+ FROM ticket t
+ JOIN company co ON co.id = t.companyFk
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN client c ON c.id = t.clientFk
+ JOIN country cou ON cou.id = c.countryFk
+ LEFT JOIN worker w ON w.id = c.salesPersonFk
JOIN account.user u ON u.id = w.id
LEFT JOIN (
SELECT ticketFk, taxableBase
diff --git a/modules/invoiceOut/back/models/invoice-out.js b/modules/invoiceOut/back/models/invoice-out.js
index bab1fa375..f8fc8cdbf 100644
--- a/modules/invoiceOut/back/models/invoice-out.js
+++ b/modules/invoiceOut/back/models/invoice-out.js
@@ -79,6 +79,8 @@ module.exports = Self => {
type
],
myOptions);
+ if (!serial)
+ throw new UserError('No invoice series found for these parameters');
const invoiceOutSerial = await Self.app.models.InvoiceOutSerial.findById(serial);
if (invoiceOutSerial?.taxAreaFk == 'WORLD') {
diff --git a/modules/ticket/back/methods/sale/usesMana.js b/modules/ticket/back/methods/sale/usesMana.js
index 31beb3a4c..b4768d80a 100644
--- a/modules/ticket/back/methods/sale/usesMana.js
+++ b/modules/ticket/back/methods/sale/usesMana.js
@@ -31,6 +31,6 @@ module.exports = Self => {
const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
- return usesMana ? true : false;
+ return !!usesMana;
};
};
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index 5364cef9a..53f90b98f 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -59,6 +59,11 @@ module.exports = Self => {
arg: 'state',
type: 'string',
description: `Search request by request state`
+ },
+ {
+ arg: 'myTeam',
+ type: 'boolean',
+ description: `Team partners`
}
],
returns: {
@@ -75,6 +80,8 @@ module.exports = Self => {
const conn = Self.dataSource.connector;
const userId = ctx.req.accessToken.userId;
const myOptions = {};
+ const models = Self.app.models;
+ const args = ctx.args;
if (typeof options == 'object')
Object.assign(myOptions, options);
@@ -82,6 +89,21 @@ module.exports = Self => {
if (ctx.args.mine)
ctx.args.attenderFk = userId;
+ const teamMembersId = [];
+ if (args.myTeam != null) {
+ const worker = await models.Worker.findById(userId, {
+ include: {
+ relation: 'collegues'
+ }
+ }, myOptions);
+ const collegues = worker.collegues() || [];
+ for (let collegue of collegues)
+ teamMembersId.push(collegue.collegueFk);
+
+ if (teamMembersId.length == 0)
+ teamMembersId.push(userId);
+ }
+
let where = buildFilter(ctx.args, (param, value) => {
switch (param) {
case 'search':
@@ -113,6 +135,11 @@ module.exports = Self => {
return {'w.id': value};
case 'salesPersonFk':
return {'c.salesPersonFk': value};
+ case 'myTeam':
+ if (value)
+ return {'tr.requesterFk': {inq: teamMembersId}};
+ else
+ return {'tr.requesterFk': {nin: teamMembersId}};
}
});
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index 4fd72d454..71122808c 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -1,11 +1,17 @@
-const UserError = require('vn-loopback/util/user-error');
const closure = require('./closure');
module.exports = Self => {
Self.remoteMethodCtx('closeAll', {
description: 'Makes the closure process from all warehouses',
accessType: 'WRITE',
- accepts: [],
+ accepts: [
+ {
+ arg: 'options',
+ type: 'object',
+ http: {source: 'body'},
+ description: 'Optional parameters, including transaction.'
+ }
+ ],
returns: {
type: 'object',
root: true
@@ -16,21 +22,20 @@ module.exports = Self => {
}
});
- Self.closeAll = async ctx => {
+ Self.closeAll = async(ctx, options) => {
+ const userId = ctx.req.accessToken.userId;
+ const myOptions = {userId};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ let tx;
+ // IMPORTANT: Due to its high cost in production, wrapping this process in a transaction may cause timeouts.
+
const toDate = Date.vnNew();
toDate.setHours(0, 0, 0, 0);
toDate.setDate(toDate.getDate() - 1);
- const todayMinDate = Date.vnNew();
- todayMinDate.setHours(0, 0, 0, 0);
-
- const todayMaxDate = Date.vnNew();
- todayMaxDate.setHours(23, 59, 59, 59);
-
- // Prevent closure for current day
- if (toDate >= todayMinDate && toDate <= todayMaxDate)
- throw new UserError('You cannot close tickets for today');
-
const tickets = await Self.rawSql(`
SELECT t.id,
t.clientFk,
@@ -41,7 +46,7 @@ module.exports = Self => {
c.salesPersonFk,
c.isToBeMailed,
c.hasToInvoice,
- co.hasDailyInvoice,
+ c.hasDailyInvoice,
eu.email salesPersonEmail,
t.addressFk
FROM ticket t
@@ -58,12 +63,12 @@ module.exports = Self => {
AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
AND t.refFk IS NULL
GROUP BY t.id
- `, [toDate, toDate]);
+ `, [toDate, toDate], myOptions);
const ticketIds = tickets.map(ticket => ticket.id);
await Self.rawSql(`
INSERT INTO util.debug (variable, value)
VALUES ('nightInvoicing', ?)
- `, [ticketIds.join(',')]);
+ `, [ticketIds.join(',')], myOptions);
await Self.rawSql(`
WITH ticketNotInvoiceable AS(
@@ -120,7 +125,7 @@ module.exports = Self => {
WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
AND t.refFk IS NULL
- AND IFNULL(a.hasDailyInvoice, co.hasDailyInvoice)
+ AND c.hasDailyInvoice
GROUP BY ticketFk
HAVING hasErrorToInvoice
OR hasErrorTaxDataChecked
@@ -133,9 +138,9 @@ module.exports = Self => {
) SELECT IF(errors = '{"tickets": null}',
'No errors',
util.notification_send('invoice-ticket-closure', errors, NULL))
- FROM ticketNotInvoiceable`, [toDate, toDate]);
+ FROM ticketNotInvoiceable`, [toDate, toDate], myOptions);
- await closure(ctx, Self, tickets);
+ await closure(ctx, Self, tickets, myOptions);
await Self.rawSql(`
UPDATE ticket t
@@ -150,7 +155,10 @@ module.exports = Self => {
AND al.code NOT IN ('DELIVERED', 'PACKED')
AND NOT t.packages
AND tob.id IS NULL
- AND t.routeFk`, [toDate, toDate], {userId: ctx.req.accessToken.userId});
+ AND t.routeFk`, [toDate, toDate], myOptions);
+
+ if (tx)
+ await tx.commit();
return {
message: 'Success'
diff --git a/modules/ticket/back/methods/ticket/closeByTicket.js b/modules/ticket/back/methods/ticket/closeByTicket.js
index 40fe048a5..8a21267b6 100644
--- a/modules/ticket/back/methods/ticket/closeByTicket.js
+++ b/modules/ticket/back/methods/ticket/closeByTicket.js
@@ -50,7 +50,7 @@ module.exports = Self => {
c.salesPersonFk,
c.isToBeMailed,
c.hasToInvoice,
- co.hasDailyInvoice,
+ c.hasDailyInvoice,
eu.email salesPersonEmail,
t.addressFk
FROM expedition e
@@ -58,8 +58,6 @@ module.exports = Self => {
JOIN ticketState ts ON ts.ticketFk = t.id
JOIN alertLevel al ON al.id = ts.alertLevel
JOIN client c ON c.id = t.clientFk
- JOIN province p ON p.id = c.provinceFk
- JOIN country co ON co.id = p.countryFk
LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
WHERE al.code = 'PACKED'
AND t.id = ?
diff --git a/modules/ticket/back/methods/ticket/closure.js b/modules/ticket/back/methods/ticket/closure.js
index 56bd6eccd..e4cb49007 100644
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/modules/ticket/back/methods/ticket/closure.js
@@ -19,9 +19,14 @@ module.exports = async function(ctx, Self, tickets, options) {
const failedtickets = [];
for (const ticket of tickets) {
try {
- await Self.rawSql(`CALL util.debugAdd('invoicingTicket', ?)`, [ticket.id], {userId});
+ await Self.rawSql(`CALL util.debugAdd('invoicingTicket', ?)`, [ticket.id], myOptions);
- await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'quick');
+ await Self.app.models.InvoiceOut.getSerial(
+ ticket.clientFk,
+ ticket.companyFk,
+ ticket.addressFk,
+ 'quick',
+ myOptions);
await Self.rawSql(
`CALL vn.ticket_closeByTicket(?)`,
[ticket.id],
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index 06781c3c8..d3e53c702 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -228,52 +228,57 @@ module.exports = Self => {
stmt = new ParameterizedSQL(`
CREATE OR REPLACE TEMPORARY TABLE tmp.filter
(INDEX (id))
- ENGINE = MEMORY
+ ENGINE = InnoDB
SELECT t.id,
- t.shipped,
- CAST(DATE(t.shipped) AS CHAR) shippedDate,
- HOUR(t.shipped) shippedHour,
- t.nickname,
- t.refFk,
- t.routeFk,
- t.warehouseFk,
- t.clientFk,
- t.totalWithoutVat,
- t.totalWithVat,
- io.id invoiceOutId,
- a.provinceFk,
- p.name province,
- w.name warehouse,
- am.name agencyMode,
- am.id agencyModeFk,
- st.name state,
- st.classColor,
- wk.lastName salesPerson,
- ts.stateFk stateFk,
- ts.alertLevel alertLevel,
- ts.code alertLevelCode,
- u.name userName,
- c.salesPersonFk,
- z.hour zoneLanding,
- HOUR(z.hour) zoneHour,
- MINUTE(z.hour) zoneMinute,
- z.name zoneName,
- z.id zoneFk,
- CAST(z.hour AS CHAR) hour,
- a.nickname addressNickname
- FROM ticket t
- LEFT JOIN invoiceOut io ON t.refFk = io.ref
- LEFT JOIN zone z ON z.id = t.zoneFk
- LEFT JOIN address a ON a.id = t.addressFk
- LEFT JOIN province p ON p.id = a.provinceFk
- LEFT JOIN warehouse w ON w.id = t.warehouseFk
- LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
- LEFT JOIN ticketState ts ON ts.ticketFk = t.id
- LEFT JOIN state st ON st.id = ts.stateFk
- LEFT JOIN client c ON c.id = t.clientFk
- LEFT JOIN worker wk ON wk.id = c.salesPersonFk
- LEFT JOIN account.user u ON u.id = wk.id
- LEFT JOIN route r ON r.id = t.routeFk
+ t.shipped,
+ CAST(DATE(t.shipped) AS CHAR) shippedDate,
+ HOUR(t.shipped) shippedHour,
+ t.nickname,
+ t.refFk,
+ t.routeFk,
+ t.warehouseFk,
+ t.clientFk,
+ t.totalWithoutVat,
+ t.totalWithVat,
+ io.id invoiceOutId,
+ a.provinceFk,
+ p.name province,
+ w.name warehouse,
+ am.name agencyMode,
+ am.id agencyModeFk,
+ st.name state,
+ st.classColor,
+ wk.lastName salesPerson,
+ ts.stateFk stateFk,
+ ts.alertLevel alertLevel,
+ ts.code alertLevelCode,
+ u.name userName,
+ c.salesPersonFk,
+ z.hour zoneLanding,
+ HOUR(z.hour) zoneHour,
+ MINUTE(z.hour) zoneMinute,
+ z.name zoneName,
+ z.id zoneFk,
+ CAST(z.hour AS CHAR) hour,
+ a.nickname addressNickname,
+ (SELECT GROUP_CONCAT(DISTINCT i2.itemPackingTypeFk ORDER BY i2.itemPackingTypeFk SEPARATOR ',')
+ FROM sale s2
+ JOIN item i2 ON i2.id = s2.itemFk
+ WHERE s2.ticketFk = t.id
+ ) AS packing
+ FROM ticket t
+ LEFT JOIN invoiceOut io ON t.refFk = io.ref
+ LEFT JOIN zone z ON z.id = t.zoneFk
+ LEFT JOIN address a ON a.id = t.addressFk
+ LEFT JOIN province p ON p.id = a.provinceFk
+ LEFT JOIN warehouse w ON w.id = t.warehouseFk
+ LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+ LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+ LEFT JOIN state st ON st.id = ts.stateFk
+ LEFT JOIN client c ON c.id = t.clientFk
+ LEFT JOIN worker wk ON wk.id = c.salesPersonFk
+ LEFT JOIN account.user u ON u.id = wk.id
+ LEFT JOIN route r ON r.id = t.routeFk
`);
if (args.orderFk) {
@@ -292,6 +297,7 @@ module.exports = Self => {
}
stmt.merge(conn.makeWhere(filter.where));
+
stmts.push(stmt);
stmt = new ParameterizedSQL(`
diff --git a/modules/ticket/back/methods/ticket/getTicketsAdvance.js b/modules/ticket/back/methods/ticket/getTicketsAdvance.js
index 1bd5f83de..41f3ee79a 100644
--- a/modules/ticket/back/methods/ticket/getTicketsAdvance.js
+++ b/modules/ticket/back/methods/ticket/getTicketsAdvance.js
@@ -50,6 +50,11 @@ module.exports = Self => {
type: 'boolean',
description: 'True when lines and stock of origin are equal'
},
+ {
+ arg: 'departmentFk',
+ type: 'number',
+ description: 'Department identifier'
+ },
{
arg: 'filter',
type: 'object',
@@ -96,6 +101,8 @@ module.exports = Self => {
};
case 'isFullMovable':
return {'f.isFullMovable': value};
+ case 'departmentFk':
+ return {'f.departmentFk': value};
}
});
diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js
index a684e1cbc..fcab95ee2 100644
--- a/modules/ticket/back/methods/ticket/setDeleted.js
+++ b/modules/ticket/back/methods/ticket/setDeleted.js
@@ -49,9 +49,12 @@ module.exports = Self => {
where: {originalTicketFk: id}
}, myOptions);
+ const hasRefund = !!ticketRefunds?.length;
+
const allDeleted = ticketRefunds.every(refund => refund.refundTicket().isDeleted);
- if (ticketRefunds?.length && !allDeleted) {
+ if (!hasRefund) await models.TicketRefund.destroyAll({refundTicketFk: id}, myOptions);
+ if (hasRefund && !allDeleted) {
const notDeleted = [];
for (const refund of ticketRefunds)
if (!refund.refundTicket().isDeleted) notDeleted.push(refund.refundTicket().id);
diff --git a/modules/ticket/back/methods/ticket/specs/closeAll.spec.js b/modules/ticket/back/methods/ticket/specs/closeAll.spec.js
new file mode 100644
index 000000000..f01541eec
--- /dev/null
+++ b/modules/ticket/back/methods/ticket/specs/closeAll.spec.js
@@ -0,0 +1,54 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('Ticket Closure - closeAll function', () => {
+ let ctx = {
+ req: {
+ getLocale: () => 'es',
+ accessToken: {userId: 1106},
+ headers: {origin: 'http://localhost'},
+ __: value => value,
+ },
+ args: {}
+ };
+ let options;
+ let tx;
+ let originalVnNew;
+
+ beforeEach(async() => {
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({active: ctx.req});
+
+ tx = await models.Ticket.beginTransaction({});
+ options = {transaction: tx};
+ originalVnNew = Date.vnNew;
+ spyOn(Date, 'vnNew').and.callFake(() => {
+ const mockDate = originalVnNew();
+ mockDate.setDate(mockDate.getDate() + 1);
+ return mockDate;
+ });
+ });
+
+ afterEach(async() => {
+ if (tx)
+ await tx.rollback();
+ });
+
+ it('should set routeFk to NULL when conditions are met', async() => {
+ const ticketsBefore = await models.Ticket.find({
+ where: {
+ routeFk: {neq: null}
+ }
+ }, options);
+
+ await models.Ticket.closeAll(ctx, options);
+
+ const ticketsAfter = await models.Ticket.find({
+ where: {
+ id: {inq: ticketsBefore.map(ticket => ticket.id)},
+ routeFk: {neq: null}
+ }
+ }, options);
+
+ expect(ticketsBefore.length).toBeGreaterThan(ticketsAfter.length);
+ });
+});
diff --git a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
index 488cd1fc2..a941013cd 100644
--- a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
@@ -6,6 +6,9 @@ describe('TicketFuture getTicketsAdvance()', () => {
today.setHours(0, 0, 0, 0);
let tomorrow = Date.vnNew();
tomorrow.setDate(today.getDate() + 1);
+ const salesDeptId = 43;
+ const spain1DeptId = 95;
+ beforeAll.mockLoopBackContext();
it('should return the tickets passing the required data', async() => {
const tx = await models.Ticket.beginTransaction({});
@@ -129,4 +132,39 @@ describe('TicketFuture getTicketsAdvance()', () => {
throw e;
}
});
+
+ it('should return the tickets matching the right department', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ ctx.args = {
+ dateFuture: tomorrow,
+ dateToAdvance: today,
+ warehouseFk: 1,
+ };
+
+ await models.Ticket.updateAll({id: {inq: [12, 31]}}, {clientFk: 1}, options);
+ const client = await models.Client.findById(1, null, options);
+ await client.updateAttribute('salesPersonFk', 1, options);
+ const business = await models.Business.findById(1, null, options);
+ await business.updateAttributes({departmentFk: spain1DeptId}, options);
+
+ const saleTickets = await models.Ticket.getTicketsAdvance(ctx, options);
+ const filteredSaleTickets = await models.Ticket.getTicketsAdvance(
+ {args: {...ctx.args, departmentFk: spain1DeptId}},
+ options);
+
+ expect(saleTickets.length).toBeGreaterThan(filteredSaleTickets.length);
+ expect(saleTickets.some(ticket => ticket.departmentFk === salesDeptId)).toBeTrue();
+ expect(saleTickets.some(ticket => ticket.departmentFk === spain1DeptId)).toBeTrue();
+
+ expect(filteredSaleTickets.some(ticket => ticket.departmentFk === salesDeptId)).toBeFalse();
+ expect(filteredSaleTickets.some(ticket => ticket.departmentFk === spain1DeptId)).toBeTrue();
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
});
diff --git a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
index 782c31c02..b70c94cee 100644
--- a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
@@ -113,5 +113,27 @@ describe('ticket setDeleted()', () => {
expect(error.message).not.toContain('Tickets with associated refunds');
});
+
+ it('should delete the refund - original ticket relation', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+ try {
+ const options = {transaction: tx};
+
+ const ticketId = 24;
+ const refundTicket = await models.TicketRefund.findOne({where: {refundTicketFk: ticketId}}, options);
+
+ expect(refundTicket).toBeTruthy();
+
+ await models.Ticket.setDeleted(ctx, ticketId, options);
+ const removedRefundTicket = await models.TicketRefund.findOne({
+ where: {refundTicketFk: ticketId}},
+ options);
+
+ expect(removedRefundTicket).toBeNull();
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ }
+ });
});
});
diff --git a/modules/ticket/back/models/expedition.json b/modules/ticket/back/models/expedition.json
index 2dcca1e87..f3f912ec3 100644
--- a/modules/ticket/back/models/expedition.json
+++ b/modules/ticket/back/models/expedition.json
@@ -1,63 +1,66 @@
{
- "name": "Expedition",
- "base": "VnModel",
- "mixins": {
- "Loggable": true
+ "name": "Expedition",
+ "base": "VnModel",
+ "mixins": {
+ "Loggable": true
+ },
+ "options": {
+ "mysql": {
+ "table": "expedition"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
},
- "options": {
- "mysql": {
- "table": "expedition"
- }
+ "freightItemFk": {
+ "type": "number"
},
- "properties": {
- "id": {
- "id": true,
- "type": "number",
- "description": "Identifier"
- },
- "freightItemFk": {
- "type": "number"
- },
- "created": {
- "type": "date"
- },
- "counter": {
- "type": "number"
- },
- "externalId": {
- "type": "string"
- }
+ "created": {
+ "type": "date"
},
- "relations": {
- "ticket": {
- "type": "belongsTo",
- "model": "Ticket",
- "foreignKey": "ticketFk"
- },
- "agencyMode": {
- "type": "belongsTo",
- "model": "AgencyMode",
- "foreignKey": "agencyModeFk"
- },
- "worker": {
- "type": "belongsTo",
- "model": "Worker",
- "foreignKey": "workerFk"
- },
- "packages": {
- "type": "hasMany",
- "model": "TicketPackaging",
- "foreignKey": "ticketFk"
- },
- "freightItem": {
- "type": "belongsTo",
- "model": "Item",
- "foreignKey": "freightItemFk"
- },
- "packaging": {
- "type": "belongsTo",
- "model": "Package",
- "foreignKey": "packagingFk"
- }
+ "counter": {
+ "type": "number"
+ },
+ "externalId": {
+ "type": "string"
+ },
+ "stateTypeFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "ticket": {
+ "type": "belongsTo",
+ "model": "Ticket",
+ "foreignKey": "ticketFk"
+ },
+ "agencyMode": {
+ "type": "belongsTo",
+ "model": "AgencyMode",
+ "foreignKey": "agencyModeFk"
+ },
+ "worker": {
+ "type": "belongsTo",
+ "model": "Worker",
+ "foreignKey": "workerFk"
+ },
+ "packages": {
+ "type": "hasMany",
+ "model": "TicketPackaging",
+ "foreignKey": "ticketFk"
+ },
+ "freightItem": {
+ "type": "belongsTo",
+ "model": "Item",
+ "foreignKey": "freightItemFk"
+ },
+ "packaging": {
+ "type": "belongsTo",
+ "model": "Package",
+ "foreignKey": "packagingFk"
}
}
+}
\ No newline at end of file
diff --git a/modules/worker/back/models/operator.json b/modules/worker/back/models/operator.json
index d4832bccf..b75bf6732 100644
--- a/modules/worker/back/models/operator.json
+++ b/modules/worker/back/models/operator.json
@@ -24,13 +24,28 @@
"warehouseFk": {
"type": "number"
},
+ "sectorFk": {
+ "type": "number"
+ },
"labelerFk": {
"type": "number"
},
"isOnReservationMode": {
"type": "boolean",
"required": true
- }
+ },
+ "machineFk": {
+ "type": "number"
+ },
+ "linesLimit": {
+ "type": "number"
+ },
+ "volumeLimit": {
+ "type": "number"
+ },
+ "sizeLimit": {
+ "type": "number"
+ }
},
"relations": {
"sector": {
@@ -53,6 +68,11 @@
"model": "ItemPackingType",
"foreignKey": "itemPackingTypeFk",
"primaryKey": "code"
- }
+ },
+ "machine": {
+ "type": "belongsTo",
+ "model": "Machine",
+ "foreignKey": "machineFk"
+ }
}
-}
\ No newline at end of file
+}
diff --git a/modules/zone/back/methods/zone/deleteZone.js b/modules/zone/back/methods/zone/deleteZone.js
index a75302703..ffe23c9b9 100644
--- a/modules/zone/back/methods/zone/deleteZone.js
+++ b/modules/zone/back/methods/zone/deleteZone.js
@@ -1,3 +1,4 @@
+const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('deleteZone', {
description: 'Delete a zone',
@@ -49,26 +50,12 @@ module.exports = Self => {
}
}
};
- const promises = [];
const ticketList = await models.Ticket.find(filter, myOptions);
- const fixingState = await models.State.findOne({where: {code: 'FIXING'}}, myOptions);
- const worker = await models.Worker.findOne({
- where: {id: userId}
- }, myOptions);
- await models.Ticket.rawSql('UPDATE ticket SET zoneFk = NULL WHERE zoneFk = ?', [id], myOptions);
+ if (ticketList.length > 0)
+ throw new UserError('There are tickets for this area, delete them first');
- for (ticket of ticketList) {
- if (ticket.ticketState().alertLevel == 0) {
- promises.push(models.Ticket.state(ctx, {
- ticketFk: ticket.id,
- stateFk: fixingState.id,
- userFk: worker.id
- }, myOptions));
- }
- }
- await Promise.all(promises);
await models.Zone.destroyById(id, myOptions);
if (tx) await tx.commit();
diff --git a/modules/zone/back/methods/zone/specs/deleteZone.spec.js b/modules/zone/back/methods/zone/specs/deleteZone.spec.js
index 08dafd181..aef7fd290 100644
--- a/modules/zone/back/methods/zone/specs/deleteZone.spec.js
+++ b/modules/zone/back/methods/zone/specs/deleteZone.spec.js
@@ -8,9 +8,9 @@ describe('zone deletezone()', () => {
__: value => value
};
const ctx = {req: activeCtx};
- const zoneId = 9;
+ const zoneId = 4;
+ const zoneId2 = 3;
let ticketIDs;
- let originalTicketStates;
beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
@@ -35,18 +35,8 @@ describe('zone deletezone()', () => {
await models.Zone.deleteZone(ctx, zoneId, options);
const updatedZone = await models.Zone.findById(zoneId, null, options);
- const anUpdatedTicket = await models.Ticket.findById(ticketIDs[0], null, options);
-
- const updatedTicketStates = await models.TicketState.find({
- where: {
- ticketFk: {inq: ticketIDs},
- code: 'FIXING'
- }
- }, options);
expect(updatedZone).toBeNull();
- expect(anUpdatedTicket.zoneFk).toBeNull();
- expect(updatedTicketStates.length).toBeGreaterThan(originalTicketStates.length);
await tx.rollback();
} catch (e) {
@@ -54,4 +44,20 @@ describe('zone deletezone()', () => {
throw e;
}
});
+
+ it('should not delete the zone if it has tickets', async() => {
+ const tx = await models.Zone.beginTransaction({});
+
+ let error;
+ try {
+ const options = {transaction: tx};
+ await models.Zone.deleteZone(ctx, zoneId2, options);
+ await tx.rollback();
+ } catch (e) {
+ error = e.message;
+ await tx.rollback();
+ }
+
+ expect(error).toEqual('There are tickets for this area, delete them first');
+ });
});
diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html
index c1701e084..89bc07488 100644
--- a/print/templates/reports/delivery-note/delivery-note.html
+++ b/print/templates/reports/delivery-note/delivery-note.html
@@ -58,6 +58,7 @@
| {{$t('reference')}} |
{{$t('quantity')}} |
{{$t('concept')}} |
+ {{$t('producer')}} |
{{$t('price')}} |
{{$t('discount')}} |
{{$t('vat')}} |
@@ -69,6 +70,7 @@
{{sale.itemFk}} |
{{sale.quantity}} |
{{sale.concept}} |
+ {{sale.subName}} |
{{sale.price | currency('EUR', $i18n.locale)}} |
{{(sale.discount / 100) | percentage}} |
{{sale.vatType}} |
@@ -81,7 +83,6 @@
{{sale.tag5}} {{sale.value5}}
{{sale.tag6}} {{sale.value6}}
{{sale.tag7}} {{sale.value7}}
- {{$t('producer')}} {{ sale.subName }}