verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 66 Releases Wiki Activity

6745-2404_testToMaster #1950

Merged
alexm merged 191 commits from 6745-2404_testToMaster into master 2024-01-25 07:39:13 +00:00
Conversation 0 Commits 191 Files Changed 177 +12 -12
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dfee2b0ce4 - Show all commits

2
db/changes/240401/00-revokeItem.sql
View File

@ -1,4 +1,4 @@
REVOKE UPDATE ON TABLE `vn`.`item` FROM `employee`; REVOKE UPDATE ON TABLE `vn`.`item` FROM `employee`;
GRANT UPDATE(id, equivalent, stems, minPrice, isToPrint, family, box, category, doPhoto, image, inkFk, intrastatFk, hasMinPrice, created, comment, typeFk, generic, producerFk, description, density, relevancy, expenseFk, isActive, subName, tag5, value5, tag6, value6, tag7, value7, tag8, value8, tag9, value9, tag10, value10, minimum, upToDown, supplyResponseFk, hasKgPrice, isFloramondo, isFragile, numberOfItemsPerCask, embalageCode, quality, stemMultiplier, itemPackingTypeFk, packingOut, genericFk, packingShelve, isLaid, lastUsed, weightByPiece, weightByPiece, editorFk, recycledPlastic, nonRecycledPlastic, minQuantity) ON TABLE vn.item TO employee; GRANT UPDATE(id, equivalent, stems, minPrice, isToPrint, family, box, category, doPhoto, image, inkFk, intrastatFk, hasMinPrice, created, comment, typeFk, generic, producerFk, description, density, relevancy, expenseFk, isActive, subName, tag5, value5, tag6, value6, tag7, value7, tag8, value8, tag9, value9, tag10, value10, minimum, upToDown, supplyResponseFk, hasKgPrice, isFloramondo, isFragile, numberOfItemsPerCask, embalageCode, quality, stemMultiplier, itemPackingTypeFk, packingOut, genericFk, packingShelve, isLaid, lastUsed, weightByPiece, weightByPiece, editorFk, recycledPlastic, nonRecycledPlastic, minQuantity) ON TABLE `vn`.`item` TO `employee`;

0
db/changes/240201/00-ticketSmsToClientSms.sql → db/changes/240401/00-ticketSmsToClientSms.sql
View File

2
db/changes/235001/00-updateACL_Role_VnRole.sql → db/changes/240401/00-updateACL_Role_VnRole.sql
View File

@ -1,4 +1,4 @@
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId) VALUES INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId) VALUES
('VnRole','*','READ','ALLOW','ROLE','employee'), ('VnRole','*','READ','ALLOW','ROLE','employee'),
('VnRole','*','WRITE','ALLOW','ROLE','it'); ('VnRole','*','WRITE','ALLOW','ROLE','it');

4
db/changes/240401/01-saleGroupDetailDefaultSize.sql
View File

@ -1,2 +1,2 @@
ALTER TABLE vn.productionConfig ADD itemPreviousDefaultSize int NULL COMMENT 'Altura por defecto para los artículos de previa'; ALTER TABLE `vn`.`productionConfig` ADD itemPreviousDefaultSize int NULL COMMENT 'Altura por defecto para los artículos de previa';
UPDATE IGNORE vn.productionConfig SET itemPreviousDefaultSize = 40 WHERE id = 1; UPDATE IGNORE `vn`.`productionConfig` SET itemPreviousDefaultSize = 40 WHERE id = 1;

8
db/changes/240401/01-supplierAccount.sql
View File

@ -1,9 +1,9 @@
UPDATE vn.supplierAccount sa UPDATE `vn`.`supplierAccount` sa
JOIN vn.country c ON sa.countryFk = c.id AND c.code = 'FR' JOIN `vn`.`country` c ON sa.countryFk = c.id AND c.code = 'FR'
SET countryFk = c.id SET countryFk = c.id
WHERE iban = 'FR7630003012690002801121597'; WHERE iban = 'FR7630003012690002801121597';
UPDATE vn.supplierAccount sa UPDATE `vn`.`supplierAccount` sa
JOIN vn.country c ON sa.countryFk = c.id AND c.code = 'PT' JOIN `vn`.`country` c ON sa.countryFk = c.id AND c.code = 'PT'
SET countryFk = c.id SET countryFk = c.id
WHERE iban = 'PT50001000005813059150168'; WHERE iban = 'PT50001000005813059150168';

2
db/changes/240401/02-invoiceOutConfig_refLen.sql
View File

@ -1,2 +1,2 @@
ALTER TABLE vn.invoiceOutConfig ALTER TABLE `vn`.`invoiceOutConfig`
ADD IF NOT EXISTS refLen TINYINT UNSIGNED DEFAULT 5 NOT NULL COMMENT 'Invoice reference identifier length'; ADD IF NOT EXISTS refLen TINYINT UNSIGNED DEFAULT 5 NOT NULL COMMENT 'Invoice reference identifier length';

6
loopback/server/connectors/vn-mysql.js
View File

@ -270,8 +270,8 @@ class VnMySQL extends MySQL {
isLoggable(model) { isLoggable(model) {
const Model = this.getModelDefinition(model).model; const Model = this.getModelDefinition(model).model;
const settings = Model.definition.settings; const {settings} = Model.definition;
return settings.base && settings.base === 'Loggable'; return settings?.mixins?.Loggable;
} }
invokeMethod(method, args, model, ctx, opts, cb) { invokeMethod(method, args, model, ctx, opts, cb) {
@ -291,7 +291,7 @@ class VnMySQL extends MySQL {
} }
try { try {
const userId = opts.httpCtx && opts.httpCtx.active.accessToken.userId; const userId = opts.httpCtx && opts.httpCtx.active?.accessToken?.userId;
if (userId) { if (userId) {
const user = await Model.app.models.VnUser.findById(userId, {fields: ['name']}, opts); const user = await Model.app.models.VnUser.findById(userId, {fields: ['name']}, opts);
await this.executeP(`CALL account.myUser_loginWithName(?)`, [user.name], opts); await this.executeP(`CALL account.myUser_loginWithName(?)`, [user.name], opts);