verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

4037-fix(multi-check) #973

Merged
carlosjr merged 4 commits from 4037-multi-check_align into dev 2022-05-16 08:35:57 +00:00
Conversation 0 Commits 4 Files Changed 4 +858 -752
158 changed files with 858 additions and 752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5747fbbd2f - Show all commits

2
back/models/account.json
View File

@ -47,7 +47,7 @@
"type": "date"
},
"image": {
"type": "String"
"type": "string"
}
},
"relations": {

2
back/models/autonomy.json
View File

@ -9,7 +9,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},

6
back/models/bank-entity.json
View File

@ -8,15 +8,15 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"bic": {
"type": "String"
"type": "string"
},
"name": {
"type": "String"
"type": "string"
}
},
"relations": {

14
back/models/bank.json
View File

@ -8,35 +8,35 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"bank": {
"type": "String",
"type": "string",
"required": true
},
"account": {
"type": "String",
"type": "string",
"required": true
},
"accountingTypeFk": {
"type": "Number",
"type": "number",
"required": true,
"mysql": {
"columnName": "cash"
}
},
"entityFk": {
"type": "Number",
"type": "number",
"required": true
},
"isActive": {
"type": "Boolean",
"type": "boolean",
"required": true
},
"currencyFk": {
"type": "Number",
"type": "number",
"required": true
}
},

10
back/models/chat-config.json
View File

@ -10,20 +10,20 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"host": {
"type": "String"
"type": "string"
},
"api": {
"type": "String"
"type": "string"
},
"user": {
"type": "String"
"type": "string"
},
"password": {
"type": "String"
"type": "string"
}
},
"acls": [{

4
back/models/company.json
View File

@ -10,11 +10,11 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"code": {
"type": "String"
"type": "string"
},
"expired": {
"type": "date"

4
back/models/country.json
View File

@ -9,7 +9,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
@ -21,7 +21,7 @@
"type": "string"
},
"isUeeMember": {
"type": "Boolean"
"type": "boolean"
}
},
"relations": {

8
back/models/delivery.json
View File

@ -9,17 +9,17 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"forceId": false
},
"date": {
"type": "Date"
"type": "date"
},
"m3":{
"type": "Number"
"type": "number"
},
"warehouseFk":{
"type": "Number"
"type": "number"
}
}
}

2
back/models/dms-type.json
View File

@ -9,7 +9,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},

4
back/models/dms.json
View File

@ -13,7 +13,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
@ -36,7 +36,7 @@
"type": "boolean"
},
"created": {
"type": "Date"
"type": "date"
}
},
"relations": {

2
back/models/email-user.json
View File

@ -9,7 +9,7 @@
"properties": {
"userFk": {
"id": true,
"type": "Number",
"type": "number",
"required": true
},
"email": {

8
back/models/image-collection-size.json
View File

@ -8,20 +8,20 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"width": {
"type": "Number",
"type": "number",
"required": true
},
"height": {
"type": "Number",
"type": "number",
"required": true
},
"crop": {
"type": "Boolean",
"type": "boolean",
"required": true
}
},

14
back/models/image-collection.json
View File

@ -8,32 +8,32 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "String",
"type": "string",
"required": true
},
"desc": {
"type": "String",
"type": "string",
"required": true
},
"maxWidth": {
"type": "Number",
"type": "number",
"required": true
},
"maxHeight": {
"type": "Number",
"type": "number",
"required": true
},
"model": {
"type": "String",
"type": "string",
"required": true
},
"property": {
"type": "String",
"type": "string",
"required": true
}
},

2
back/models/postcode.json
View File

@ -9,7 +9,7 @@
"properties": {
"code": {
"id": true,
"type": "String"
"type": "string"
}
},
"relations": {

2
back/models/sage-withholding.json
View File

@ -11,7 +11,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier",
"mysql": {

4
back/models/town.json
View File

@ -9,10 +9,10 @@
"properties": {
"id": {
"id": true,
"type": "Number"
"type": "number"
},
"name": {
"type": "String"
"type": "string"
}
},
"relations": {

8
back/models/user-config-view.json
View File

@ -9,18 +9,18 @@
"properties": {
"id": {
"id": true,
"type": "Number"
"type": "number"
},
"userFk": {
"type": "String",
"type": "string",
"required": true
},
"tableCode": {
"type": "String",
"type": "string",
"required": true
},
"configuration": {
"type": "Object"
"type": "object"
}
},
"relations": {

22
back/models/user-log.json
View File

@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"forceId": false
},
"originFk": {
"type": "Number",
"type": "number",
"required": true
},
"userFk": {
"type": "Number"
"type": "number"
},
"action": {
"type": "String",
"type": "string",
"required": true
},
"changedModel": {
"type": "String"
"type": "string"
},
"oldInstance": {
"type": "Object"
"type": "object"
},
"newInstance": {
"type": "Object"
"type": "object"
},
"creationDate": {
"type": "Date"
"type": "date"
},
"changedModelId": {
"type": "Number"
"type": "number"
},
"changedModelValue": {
"type": "String"
"type": "string"
},
"description": {
"type": "String"
"type": "string"
}
},
"relations": {

2
back/models/user.json
View File

@ -9,7 +9,7 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"forceId": false
},
"username":{

8
back/models/warehouse.json
View File

@ -10,17 +10,17 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"forceId": false
},
"name": {
"type": "String"
"type": "string"
},
"code": {
"type": "String"
"type": "string"
},
"isInventory": {
"type": "Number"
"type": "number"
},
"isManaged":{
"type": "boolean"

5
db/changes/10460-mothersDay/00-clientConfig.sql Normal file
View File

@ -0,0 +1,5 @@
ALTER TABLE `vn`.`clientConfig` ADD `maxCreditRows` int(11) NULL COMMENT 'Máximo número de registros a mantener en la tabla clientCredit';
UPDATE `vn`.`clientConfig`
SET `maxCreditRows` = 10
WHERE `id` = 1;

24
db/dump/fixtures.sql
View File

@ -313,9 +313,9 @@ INSERT INTO `vn`.`clientManaCache`(`clientFk`, `mana`, `dated`)
(1103, 0, DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
(1104, -30, DATE_ADD(CURDATE(), INTERVAL -1 MONTH));
INSERT INTO `vn`.`clientConfig`(`riskTolerance`)
INSERT INTO `vn`.`clientConfig`(`riskTolerance`, `maxCreditRows`)
VALUES
(200);
(200, 10);
INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `clientFk`, `agencyModeFk`, `longitude`, `latitude`, `isEqualizated`, `isDefaultAddress`)
VALUES
@ -393,17 +393,17 @@ DROP TEMPORARY TABLE tmp.address;
INSERT INTO `vn`.`clientCredit`(`id`, `clientFk`, `workerFk`, `amount`, `created`)
VALUES
(1 , 1101, 5, 300, DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
(2 , 1101, 5, 900, DATE_ADD(CURDATE(), INTERVAL -2 MONTH)),
(3 , 1101, 5, 800, DATE_ADD(CURDATE(), INTERVAL -3 MONTH)),
(4 , 1101, 5, 700, DATE_ADD(CURDATE(), INTERVAL -4 MONTH)),
(5 , 1101, 5, 600, DATE_ADD(CURDATE(), INTERVAL -5 MONTH)),
(1 , 1101, 5, 300, DATE_ADD(CURDATE(), INTERVAL -11 MONTH)),
(2 , 1101, 5, 900, DATE_ADD(CURDATE(), INTERVAL -10 MONTH)),
(3 , 1101, 5, 800, DATE_ADD(CURDATE(), INTERVAL -9 MONTH)),
(4 , 1101, 5, 700, DATE_ADD(CURDATE(), INTERVAL -8 MONTH)),
(5 , 1101, 5, 600, DATE_ADD(CURDATE(), INTERVAL -7 MONTH)),
(6 , 1101, 5, 500, DATE_ADD(CURDATE(), INTERVAL -6 MONTH)),
(7 , 1101, 5, 400, DATE_ADD(CURDATE(), INTERVAL -7 MONTH)),
(8 , 1101, 9, 300, DATE_ADD(CURDATE(), INTERVAL -8 MONTH)),
(9 , 1101, 9, 200, DATE_ADD(CURDATE(), INTERVAL -9 MONTH)),
(10, 1101, 9, 100, DATE_ADD(CURDATE(), INTERVAL -10 MONTH)),
(11, 1101, 9, 50 , DATE_ADD(CURDATE(), INTERVAL -11 MONTH)),
(7 , 1101, 5, 400, DATE_ADD(CURDATE(), INTERVAL -5 MONTH)),
(8 , 1101, 9, 300, DATE_ADD(CURDATE(), INTERVAL -4 MONTH)),
(9 , 1101, 9, 200, DATE_ADD(CURDATE(), INTERVAL -3 MONTH)),
(10, 1101, 9, 100, DATE_ADD(CURDATE(), INTERVAL -2 MONTH)),
(11, 1101, 9, 50 , DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
(12, 1102, 9, 800, CURDATE()),
(14, 1104, 9, 90 , CURDATE()),
(15, 1105, 9, 90 , CURDATE());

10
loopback/common/models/field-acl.json
View File

@ -9,19 +9,19 @@
"properties": {
"id": {
"id": true,
"type": "Number"
"type": "number"
},
"model": {
"type": "String"
"type": "string"
},
"property":{
"type": "String"
"type": "string"
},
"actionType":{
"type": "String"
"type": "string"
},
"role":{
"type": "String"
"type": "string"
}
}
}

2
modules/account/back/models/samba-config.json
View File

@ -29,7 +29,7 @@
"type": "string"
},
"verifyCert": {
"type": "Boolean"
"type": "boolean"
}
}
}

2
modules/account/back/models/sip-config.json
View File

@ -11,7 +11,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true
}
}

4
modules/account/back/models/sip.json
View File

@ -8,7 +8,7 @@
},
"properties": {
"userFk": {
"type": "Number",
"type": "number",
"id": true,
"description": "The user id",
"mysql": {
@ -16,7 +16,7 @@
}
},
"extension": {
"type": "String",
"type": "string",
"required": true
}
},

4
modules/claim/back/models/claim-beginning.json
View File

@ -13,12 +13,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"quantity": {
"type": "Number",
"type": "number",
"required": true
}
},

4
modules/claim/back/models/claim-destination.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"description": {
"type": "String",
"type": "string",
"required": true
}
},

2
modules/claim/back/models/claim-development.json
View File

@ -12,7 +12,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},

2
modules/claim/back/models/claim-dms.json
View File

@ -17,7 +17,7 @@
],
"properties": {
"dmsFk": {
"type": "Number",
"type": "number",
"id": true,
"required": true
}

2
modules/claim/back/models/claim-end.json
View File

@ -12,7 +12,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
}

22
modules/claim/back/models/claim-log.json
View File

@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"forceId": false
},
"originFk": {
"type": "Number",
"type": "number",
"required": true
},
"userFk": {
"type": "Number"
"type": "number"
},
"action": {
"type": "String",
"type": "string",
"required": true
},
"changedModel": {
"type": "String"
"type": "string"
},
"oldInstance": {
"type": "Object"
"type": "object"
},
"newInstance": {
"type": "Object"
"type": "object"
},
"creationDate": {
"type": "Date"
"type": "date"
},
"changedModelId": {
"type": "Number"
"type": "number"
},
"changedModelValue": {
"type": "String"
"type": "string"
},
"description": {
"type": "String"
"type": "string"
}
},
"relations": {

12
modules/claim/back/models/claim-ratio.json
View File

@ -9,23 +9,23 @@
"validateUpsert": true,
"properties": {
"clientFk": {
"type": "Number",
"type": "number",
"id": true
},
"yearSale": {
"type": "Number"
"type": "number"
},
"claimAmount": {
"type": "Number"
"type": "number"
},
"claimingRate": {
"type": "Number"
"type": "number"
},
"priceIncreasing": {
"type": "Number"
"type": "number"
},
"packingRate": {
"type": "Number"
"type": "number"
}
},
"relations": {

4
modules/claim/back/models/claim-reason.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"description": {
"type": "String"
"type": "string"
}
},
"acls": [

4
modules/claim/back/models/claim-redelivery.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"description": {
"type": "String",
"type": "string",
"required": true
}
},

6
modules/claim/back/models/claim-responsible.json
View File

@ -8,16 +8,16 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"description": {
"type": "String",
"type": "string",
"required": true
},
"responsability": {
"type": "Number",
"type": "number",
"required": true
}
},

4
modules/claim/back/models/claim-result.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"description": {
"type": "String"
"type": "string"
}
},
"acls": [

2
modules/claim/back/models/claim.json
View File

@ -12,7 +12,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},

3
modules/client/back/model-config.json
View File

@ -14,6 +14,9 @@
"Client": {
"dataSource": "vn"
},
"ClientConfig": {
"dataSource": "vn"
},
"ClientContact": {
"dataSource": "vn"
},

2
modules/client/back/models/address-observation.json
View File

@ -8,7 +8,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},

6
modules/client/back/models/address.json
View File

@ -14,7 +14,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
@ -43,10 +43,10 @@
"type": "boolean"
},
"longitude": {
"type": "Number"
"type": "number"
},
"latitude": {
"type": "Number"
"type": "number"
},
"isEqualizated": {
"type": "boolean"

22
modules/client/back/models/client-config.json Normal file
View File

@ -0,0 +1,22 @@
{
"name": "ClientConfig",
"base": "VnModel",
"options": {
"mysql": {
"table": "clientConfig"
}
},
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Identifier"
},
"riskTolerance": {
"type": "number"
},
"maxCreditRows": {
"type": "number"
}
}
}

46
modules/client/back/models/client-contact.json
View File

@ -3,34 +3,34 @@
"description": "Client phone contacts",
"base": "Loggable",
"log": {
"model": "ClientLog",
"relation": "client",
"showField": "name"
"model": "ClientLog",
"relation": "client",
"showField": "name"
},
"options": {
"mysql": {
"table": "clientContact"
}
"mysql": {
"table": "clientContact"
}
},
"validateUpsert": true,
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "string"
},
"phone": {
"type": "string"
}
"id": {
"type": "number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "string"
},
"phone": {
"type": "string"
}
},
"relations": {
"client": {
"type": "belongsTo",
"model": "Client",
"foreignKey": "clientFk"
}
"client": {
"type": "belongsTo",
"model": "Client",
"foreignKey": "clientFk"
}
}
}
}

44
modules/client/back/models/client-credit-limit.json
View File

@ -1,26 +1,26 @@
{
"name": "ClientCreditLimit",
"base": "VnModel",
"options": {
"mysql": {
"table": "clientCreditLimit"
}
},
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
"name": "ClientCreditLimit",
"base": "VnModel",
"options": {
"mysql": {
"table": "clientCreditLimit"
}
},
"maxAmount": {
"type": "Number"
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Identifier"
},
"maxAmount": {
"type": "number"
}
},
"relations": {
"role": {
"type": "belongsTo",
"model": "Role",
"foreignKey": "roleFk"
}
}
},
"relations": {
"role": {
"type": "belongsTo",
"model": "Role",
"foreignKey": "roleFk"
}
}
}

23
modules/client/back/models/client-credit.js Normal file
View File

@ -0,0 +1,23 @@
module.exports = Self => {
Self.observe('after save', async ctx => {
const instance = ctx.instance;
const models = Self.app.models;
const clientConfig = await models.ClientConfig.findOne();
const maxCreditRows = clientConfig.maxCreditRows;
const clientCredit = await models.ClientCredit.find({
where: {clientFk: instance.clientFk},
order: 'created DESC',
limit: maxCreditRows
}, ctx.options);
const lastCredit = clientCredit[maxCreditRows - 1];
if (lastCredit) {
await models.ClientCredit.destroyAll({
clientFk: instance.clientFk,
created: {lt: lastCredit.created}
}, ctx.options);
}
});
};

62
modules/client/back/models/client-credit.json
View File

@ -1,36 +1,36 @@
{
"name": "ClientCredit",
"description": "Log of credit changes",
"base": "VnModel",
"options": {
"mysql": {
"table": "clientCredit"
}
},
"validateUpsert": true,
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
"name": "ClientCredit",
"description": "Log of credit changes",
"base": "VnModel",
"options": {
"mysql": {
"table": "clientCredit"
}
},
"amount": {
"type": "Number"
"validateUpsert": true,
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Identifier"
},
"amount": {
"type": "number"
},
"created": {
"type": "date"
}
},
"created": {
"type": "date"
"relations": {
"client": {
"type": "belongsTo",
"model": "Client",
"foreignKey": "clientFk"
},
"worker": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "workerFk"
}
}
},
"relations": {
"client": {
"type": "belongsTo",
"model": "Client",
"foreignKey": "clientFk"
},
"worker": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "workerFk"
}
}
}

4
modules/client/back/models/client-dms.json
View File

@ -13,12 +13,12 @@
},
"properties": {
"dmsFk": {
"type": "Number",
"type": "number",
"id": true,
"required": true
},
"clientFk": {
"type": "Number",
"type": "number",
"required": true
}
},

22
modules/client/back/models/client-log.json
View File

@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"forceId": false
},
"originFk": {
"type": "Number",
"type": "number",
"required": true
},
"userFk": {
"type": "Number"
"type": "number"
},
"action": {
"type": "String",
"type": "string",
"required": true
},
"changedModel": {
"type": "String"
"type": "string"
},
"oldInstance": {
"type": "Object"
"type": "object"
},
"newInstance": {
"type": "Object"
"type": "object"
},
"creationDate": {
"type": "Date"
"type": "date"
},
"changedModelId": {
"type": "Number"
"type": "number"
},
"changedModelValue": {
"type": "String"
"type": "string"
},
"description": {
"type": "String"
"type": "string"
}
},
"relations": {

4
modules/client/back/models/client-observation.json
View File

@ -13,12 +13,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"clientFk": {
"type": "Number"
"type": "number"
},
"text": {
"type": "string",

30
modules/client/back/models/client-risk.json
View File

@ -2,22 +2,22 @@
"name": "ClientRisk",
"base": "VnModel",
"options": {
"mysql": {
"table": "clientRisk"
}
"mysql": {
"table": "clientRisk"
}
},
"properties": {
"clientFk": {
"type": "Number",
"id": true
},
"companyFk": {
"type": "Number",
"id": true
},
"amount": {
"type": "Number"
}
"clientFk": {
"type": "number",
"id": true
},
"companyFk": {
"type": "number",
"id": true
},
"amount": {
"type": "number"
}
},
"relations": {
"client": {
@ -31,4 +31,4 @@
"foreignKey": "companyFk"
}
}
}
}

2
modules/client/back/models/client-sample.json
View File

@ -14,7 +14,7 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"created": {

8
modules/client/back/models/client-type.json
View File

@ -8,17 +8,17 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true
},
"code": {
"type": "String"
"type": "string"
},
"type": {
"type": "String"
"type": "string"
},
"isCreatedAsServed": {
"type": "Number"
"type": "number"
}
}
}

26
modules/client/back/models/client-unpaid.json
View File

@ -2,21 +2,21 @@
"name": "ClientUnpaid",
"base": "VnModel",
"options": {
"mysql": {
"table": "clientUnpaid"
}
"mysql": {
"table": "clientUnpaid"
}
},
"properties": {
"clientFk": {
"type": "number",
"id": true
},
"dated": {
"type": "date"
},
"amount": {
"type": "Number"
}
"clientFk": {
"type": "number",
"id": true
},
"dated": {
"type": "date"
},
"amount": {
"type": "number"
}
},
"relations": {
"client": {

12
modules/client/back/models/client.json
View File

@ -12,7 +12,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
@ -55,16 +55,16 @@
"type": "boolean"
},
"credit": {
"type": "Number"
"type": "number"
},
"creditInsurance": {
"type": "Number"
"type": "number"
},
"iban": {
"type": "string"
},
"dueDay": {
"type": "Number"
"type": "number"
},
"isEqualizated": {
"type": "boolean",
@ -105,7 +105,7 @@
"type": "boolean"
},
"quality": {
"type": "Number"
"type": "number"
},
"isVies": {
"type": "boolean"
@ -117,7 +117,7 @@
"type": "string"
},
"created": {
"type": "Date"
"type": "date"
},
"sageTaxTypeFk": {
"type": "number",

32
modules/client/back/models/contact-channel.json
View File

@ -1,20 +1,20 @@
{
"name": "ContactChannel",
"base": "VnModel",
"options": {
"mysql": {
"table": "contactChannel"
}
},
"properties": {
"id": {
"type": "Number",
"id": true,
"description": "Identifier"
"name": "ContactChannel",
"base": "VnModel",
"options": {
"mysql": {
"table": "contactChannel"
}
},
"name": {
"type": "string",
"required": true
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "string",
"required": true
}
}
}
}

76
modules/client/back/models/credit-classification.json
View File

@ -1,42 +1,42 @@
{
"name": "CreditClassification",
"description": "Clasified clients",
"base": "VnModel",
"options": {
"mysql": {
"table": "creditClassification"
}
},
"properties": {
"id": {
"id": true,
"type": "Number",
"description": "Identifier"
"name": "CreditClassification",
"description": "Clasified clients",
"base": "VnModel",
"options": {
"mysql": {
"table": "creditClassification"
}
},
"started": {
"type": "date",
"required": true,
"mysql": {
"columnName": "dateStart"
}
"properties": {
"id": {
"id": true,
"type": "number",
"description": "Identifier"
},
"started": {
"type": "date",
"required": true,
"mysql": {
"columnName": "dateStart"
}
},
"finished": {
"type": "date",
"mysql": {
"columnName": "dateEnd"
}
}
},
"finished": {
"type": "date",
"mysql": {
"columnName": "dateEnd"
}
"relations": {
"customer": {
"type": "belongsTo",
"model": "Client",
"foreignKey": "client"
},
"insurances": {
"type": "hasMany",
"model": "CreditInsurance",
"foreignKey": "creditClassification"
}
}
},
"relations": {
"customer": {
"type": "belongsTo",
"model": "Client",
"foreignKey": "client"
},
"insurances": {
"type": "hasMany",
"model": "CreditInsurance",
"foreignKey": "creditClassification"
}
}
}
}

6
modules/client/back/models/credit-insurance.json
View File

@ -10,11 +10,11 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"credit": {
"type": "Number"
"type": "number"
},
"created": {
"type": "date",
@ -23,7 +23,7 @@
}
},
"grade": {
"type": "Number"
"type": "number"
}
},
"relations": {

12
modules/client/back/models/customs-agent.json
View File

@ -8,26 +8,26 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"description": "Identifier",
"id": true
},
"fiscalName": {
"type": "String",
"type": "string",
"required": true
},
"street": {
"type": "String"
"type": "string"
},
"nif": {
"type": "String",
"type": "string",
"required": true
},
"phone": {
"type": "String"
"type": "string"
},
"email": {
"type": "String"
"type": "string"
}
}
}

10
modules/client/back/models/defaulter.json
View File

@ -9,19 +9,19 @@
},
"properties": {
"id": {
"type": "Number"
"type": "number"
},
"created": {
"type": "Date"
"type": "date"
},
"amount": {
"type": "Number"
"type": "number"
},
"defaulterSinced": {
"type": "Number"
"type": "number"
},
"hasChanged": {
"type": "Number"
"type": "number"
}
},
"relations": {

2
modules/client/back/models/greuge-config.json
View File

@ -8,7 +8,7 @@
},
"properties": {
"freightPickUpPrice": {
"type": "Number"
"type": "number"
}
},
"acls": [{

6
modules/client/back/models/greuge-type.json
View File

@ -9,14 +9,14 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"name": {
"type": "String"
"type": "string"
},
"code": {
"type": "String"
"type": "string"
}
},
"acls": [

8
modules/client/back/models/greuge.json
View File

@ -14,15 +14,15 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"description": {
"type": "String",
"type": "string",
"required": true
},
"amount": {
"type": "Number",
"type": "number",
"required": true
},
"shipped": {
@ -32,7 +32,7 @@
"type": "date"
},
"greugeTypeFk": {
"type": "Number",
"type": "number",
"required": true
}

4
modules/client/back/models/incoterms.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"code": {
"type": "String",
"type": "string",
"description": "Identifier",
"id": true
},
"name": {
"type": "String"
"type": "string"
}
},
"acls": [

4
modules/client/back/models/mandate-type.json
View File

@ -9,11 +9,11 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"name": {
"type": "String"
"type": "string"
}
}
}

4
modules/client/back/models/mandate.json
View File

@ -9,11 +9,11 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"code": {
"type": "String"
"type": "string"
},
"created": {
"type": "date"

6
modules/client/back/models/observation-type.json
View File

@ -9,15 +9,15 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"description": {
"type": "String",
"type": "string",
"required": true
},
"code": {
"type": "String",
"type": "string",
"required": true
}
},

4
modules/client/back/models/pay-method.json
View File

@ -8,7 +8,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
@ -23,7 +23,7 @@
"type": "string"
},
"outstandingDebt": {
"type": "Number"
"type": "number"
},
"isIbanRequiredForClients": {
"type": "boolean"

60
modules/client/back/models/recovery.json
View File

@ -2,40 +2,40 @@
"name": "Recovery",
"base": "Loggable",
"log": {
"model": "ClientLog",
"relation": "client"
"model": "ClientLog",
"relation": "client"
},
"options": {
"mysql": {
"table": "recovery"
}
"mysql": {
"table": "recovery"
}
},
"properties": {
"id": {
"id": true,
"type": "Number",
"description": "Identifier"
},
"started": {
"type": "date",
"required": true
},
"finished": {
"type": "date"
},
"amount": {
"type": "Number",
"required": true
},
"period": {
"type": "Number"
}
"id": {
"id": true,
"type": "number",
"description": "Identifier"
},
"started": {
"type": "date",
"required": true
},
"finished": {
"type": "date"
},
"amount": {
"type": "number",
"required": true
},
"period": {
"type": "number"
}
},
"relations": {
"client": {
"type": "belongsTo",
"model": "Client",
"foreignKey": "clientFk"
}
"client": {
"type": "belongsTo",
"model": "Client",
"foreignKey": "clientFk"
}
}
}
}

2
modules/client/back/models/sage-tax-type.json
View File

@ -8,7 +8,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier",
"mysql": {

2
modules/client/back/models/sage-transaction-type.json
View File

@ -8,7 +8,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier",
"mysql": {

8
modules/client/back/models/sms-config.json
View File

@ -9,18 +9,18 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"uri": {
"type": "String"
"type": "string"
},
"apiKey": {
"type": "String"
"type": "string"
},
"title": {
"type": "String"
"type": "string"
}
}
}

14
modules/client/back/models/sms.json
View File

@ -9,30 +9,30 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"sender": {
"type": "String",
"type": "string",
"required": true
},
"destination": {
"type": "String",
"type": "string",
"required": true
},
"message": {
"type": "String",
"type": "string",
"required": true
},
"statusCode": {
"type": "Number"
"type": "number"
},
"status": {
"type": "String"
"type": "string"
},
"created": {
"type": "Date"
"type": "date"
}
},
"relations": {

53
modules/client/back/models/specs/clientCredit.spec.js Normal file
View File

@ -0,0 +1,53 @@
const models = require('vn-loopback/server/server').models;
describe('Client Credit', () => {
const instance = {id: 1101, name: 'Bruce Banner'};
describe('after save', () => {
it('should delete old rows of clientCredit', async() => {
const tx = await models.ClientCredit.beginTransaction({});
const clientConfig = await models.ClientConfig.findOne({
where: {id: 1}
});
let rowsBefore;
let rowsAfter;
try {
const options = {transaction: tx};
const salesAssistant = await models.Account.findOne({
where: {name: 'salesAssistant'}
}, options);
rowsBefore = await models.ClientCredit.find({
where: {clientFk: instance.id},
order: 'created DESC',
}, options);
await models.ClientCredit.create({
amount: 355,
clientFk: instance.id,
workerFk: salesAssistant.id
}, options);
rowsAfter = await models.ClientCredit.find({
where: {clientFk: instance.id},
order: 'created DESC',
}, options);
await tx.rollback();
} catch (e) {
await tx.rollback();
throw e;
}
const FirstRowsBefore = rowsBefore[0];
const FirstRowsAfter = rowsAfter[0];
expect(FirstRowsAfter.id).toBeGreaterThan(FirstRowsBefore.id);
expect(rowsBefore.length).toBeGreaterThanOrEqual(clientConfig.maxCreditRows);
expect(rowsAfter.length).toEqual(clientConfig.maxCreditRows);
});
});
});

2
modules/client/back/models/tpv-error.json
View File

@ -8,7 +8,7 @@
},
"properties": {
"code": {
"type": "String",
"type": "string",
"id": true,
"description": "Identifier"
},

2
modules/client/back/models/tpv-merchant.json
View File

@ -8,7 +8,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},

2
modules/client/back/models/tpv-response.json
View File

@ -8,7 +8,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},

18
modules/client/back/models/tpv-transaction.json
View File

@ -8,33 +8,33 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"merchantFk": {
"type": "Number"
"type": "number"
},
"clientFk": {
"type": "Number"
"type": "number"
},
"receiptFk": {
"type": "Number"
"type": "number"
},
"amount": {
"type": "Number"
"type": "number"
},
"response": {
"type": "Number"
"type": "number"
},
"errorCode": {
"type": "String"
"type": "string"
},
"status": {
"type": "String"
"type": "string"
},
"created": {
"type": "Date"
"type": "date"
}
},
"relations": {

22
modules/entry/back/models/entry-log.json
View File

@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"forceId": false
},
"originFk": {
"type": "Number",
"type": "number",
"required": true
},
"userFk": {
"type": "Number"
"type": "number"
},
"action": {
"type": "String",
"type": "string",
"required": true
},
"changedModel": {
"type": "String"
"type": "string"
},
"oldInstance": {
"type": "Object"
"type": "object"
},
"newInstance": {
"type": "Object"
"type": "object"
},
"creationDate": {
"type": "Date"
"type": "date"
},
"changedModelId": {
"type": "String"
"type": "string"
},
"changedModelValue": {
"type": "String"
"type": "string"
},
"description": {
"type": "String"
"type": "string"
}
},
"relations": {

4
modules/entry/back/models/entry-observation.json
View File

@ -13,11 +13,11 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"description": {
"type": "String",
"type": "string",
"required": true
}
},

10
modules/invoiceOut/back/models/invoice-out.json
View File

@ -9,21 +9,21 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"description": "Identifier"
},
"ref": {
"type": "String",
"type": "string",
"required": true
},
"serial": {
"type": "String"
"type": "string"
},
"issued": {
"type": "date"
},
"amount": {
"type": "Number"
"type": "number"
},
"created": {
"type": "date"
@ -35,7 +35,7 @@
"type": "date"
},
"hasPdf": {
"type": "Boolean"
"type": "boolean"
}
},
"relations": {

6
modules/invoiceOut/back/models/tax-class.json
View File

@ -8,16 +8,16 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"description": "Identifier",
"id": true
},
"description": {
"type": "String",
"type": "string",
"required": true
},
"code": {
"type": "String",
"type": "string",
"required": true
}
},

8
modules/invoiceOut/back/models/tax-code.json
View File

@ -8,7 +8,7 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
@ -16,7 +16,7 @@
"type": "date"
},
"code": {
"type": "String"
"type": "string"
},
"rate": {
"type": "number"
@ -25,10 +25,10 @@
"type": "number"
},
"type": {
"type": "String"
"type": "string"
},
"isActive": {
"type": "Boolean"
"type": "boolean"
}
},
"relations": {

10
modules/invoiceOut/back/models/tax-type.json
View File

@ -8,21 +8,21 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"nickname": {
"type": "String"
"type": "string"
},
"serial": {
"type": "String"
"type": "string"
},
"TIPOOPE": {
"type": "String"
"type": "string"
},
"description": {
"type": "String"
"type": "string"
}
},
"relations": {

2
modules/item/back/models/expense.json
View File

@ -13,7 +13,7 @@
"description": "Identifier"
},
"name": {
"type": "String"
"type": "string"
},
"isWithheld": {
"type": "number"

4
modules/item/back/models/genus.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "String"
"type": "string"
}
},
"acls": [

4
modules/item/back/models/ink.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"id": {
"type": "String",
"type": "string",
"id": true,
"description": "Identifier"
},
"name": {
"type": "String"
"type": "string"
},
"showOrder": {
"type": "number"

4
modules/item/back/models/item-barcode.json
View File

@ -13,12 +13,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"code": {
"type": "String",
"type": "string",
"required": true
}
},

2
modules/item/back/models/item-botanical.json
View File

@ -12,7 +12,7 @@
},
"properties": {
"itemFk": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
}

22
modules/item/back/models/item-log.json
View File

@ -9,40 +9,40 @@
"properties": {
"id": {
"id": true,
"type": "Number",
"type": "number",
"forceId": false
},
"originFk": {
"type": "Number",
"type": "number",
"required": true
},
"userFk": {
"type": "Number"
"type": "number"
},
"action": {
"type": "String",
"type": "string",
"required": true
},
"changedModel": {
"type": "String"
"type": "string"
},
"oldInstance": {
"type": "Object"
"type": "object"
},
"newInstance": {
"type": "Object"
"type": "object"
},
"creationDate": {
"type": "Date"
"type": "date"
},
"changedModelId": {
"type": "Number"
"type": "number"
},
"changedModelValue": {
"type": "String"
"type": "string"
},
"description": {
"type": "String"
"type": "string"
}
},
"relations": {

8
modules/item/back/models/item-placement.json
View File

@ -8,17 +8,17 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true
},
"code": {
"type": "String"
"type": "string"
},
"itemFk": {
"type": "Number"
"type": "number"
},
"warehouseFk": {
"type": "Number"
"type": "number"
}
},
"relations": {

6
modules/item/back/models/item-shelving-sale.json
View File

@ -8,15 +8,15 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"quantity": {
"type": "Number"
"type": "number"
},
"created": {
"type": "Date"
"type": "date"
}
},
"relations": {

14
modules/item/back/models/item-shelving.json
View File

@ -8,27 +8,27 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"shelve": {
"type": "String"
"type": "string"
},
"shelvingFk": {
"type": "String"
"type": "string"
},
"itemFk": {
"type": "Number"
"type": "number"
},
"deep": {
"type": "Number"
"type": "number"
},
"quantity": {
"type": "Number"
"type": "number"
},
"created": {
"type": "Date"
"type": "date"
}
},
"relations": {

10
modules/item/back/models/item-tag.json
View File

@ -13,23 +13,23 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"value": {
"type": "String"
"type": "string"
},
"itemFk": {
"type": "Number",
"type": "number",
"required": true
},
"tagFk": {
"type": "Number",
"type": "number",
"required": true
},
"priority": {
"type": "Number",
"type": "number",
"required": true
}
},

10
modules/item/back/models/item-tax-country.json
View File

@ -13,21 +13,21 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"effectived": {
"type": "Boolean"
"type": "boolean"
},
"itemFk": {
"type": "Number"
"type": "number"
},
"countryFk": {
"type": "Number"
"type": "number"
},
"taxClassFk": {
"type": "Number"
"type": "number"
}
},
"relations": {

4
modules/item/back/models/item-type-tag.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"priority": {
"type": "Number"
"type": "number"
}
},
"relations": {

4
modules/item/back/models/producer.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "String"
"type": "string"
}
},
"acls": [

4
modules/item/back/models/specie.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "String"
"type": "string"
}
},
"acls": [

12
modules/item/back/models/tag.json
View File

@ -8,25 +8,25 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"name": {
"type": "String",
"type": "string",
"required": true
},
"isFree": {
"type": "Boolean"
"type": "boolean"
},
"sourceTable": {
"type": "String"
"type": "string"
},
"unit": {
"type": "String"
"type": "string"
},
"isQuantitative": {
"type": "Boolean",
"type": "boolean",
"mysql": {
"columnName": "isQuantitatif"
}

12
modules/order/back/models/order-row.json
View File

@ -8,12 +8,12 @@
},
"properties": {
"id": {
"type": "Number",
"type": "number",
"id": true,
"description": "Identifier"
},
"warehouseFk": {
"type": "Number"
"type": "number"
},
"shipped": {
"type": "date",
@ -22,22 +22,22 @@
}
},
"quantity": {
"type": "Number",
"type": "number",
"mysql": {
"columnName": "amount"
}
},
"price": {
"type": "Number"
"type": "number"
},
"rate": {
"type": "Number"
"type": "number"
},
"created": {
"type": "date"
},
"saleFk": {
"type": "Number"
"type": "number"
}
},
"relations": {

4
modules/order/back/models/order-ticket.json
View File

@ -9,11 +9,11 @@
"properties": {
"orderFk": {
"id": true,
"type": "Number"
"type": "number"
},
"ticketFk": {
"id": true,
"type": "Number"
"type": "number"
}
},
"relations": {

Some files were not shown because too many files have changed in this diff Show More