verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Jorge Penadés 2023-09-29 06:18:20 +00:00
parent 4b213c1c9d 37227e79c8
commit 19fc2a4523
21 changed files with 38 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [2342.01] - 2023-10-19
### Added
### Changed
### Fixed
## [2340.01] - 2023-10-05

6
db/changes/233801/01-deviceLog_acl.sql
View File

@ -1,6 +1,6 @@
ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
-- ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId)
VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
-- INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId)
-- VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');

0
db/changes/233801/00-item_setVisibleDiscard.sql → db/changes/234001/00-item_setVisibleDiscard.sql
View File

0
db/changes/233801/00-ticketConfig.sql → db/changes/234001/00-ticketConfig.sql
View File

13
db/changes/234001/01-deliveryAssistantACL.sql
View File

@ -4,13 +4,18 @@ INSERT INTO `account`.`role` (name, description)
INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
SELECT (SELECT id FROM account.role r1 WHERE r1.name = 'deliveryAssistant'), ri.inheritsFrom
FROM account.roleInherit ri
FROM account.roleInherit ri
JOIN account.role r2 ON r2.id = ri.`role`
WHERE r2.name = 'deliveryBoss';
WHERE r2.name = 'deliveryBoss';
DELETE `account`.`roleInherit` FROM `account`.`roleInherit`
JOIN `account`.`role` r ON `account`.`roleInherit`.role = r.id
WHERE r.name = 'deliveryBoss';
INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
SELECT (SELECT id FROM account.role WHERE name = 'deliveryBoss') role,
(SELECT id FROM account.role WHERE name = 'deliveryAssistant') roleInherit;
CALL `account`.`role_syncPrivileges`();
UPDATE `salix`.`ACL`
SET principalId='deliveryAssistant'
WHERE principalId='deliveryBoss';

2
db/changes/234001/02-roleSync.sql Normal file
View File

@ -0,0 +1,2 @@
-- Locally it fails because it is executed before the fixtures and the roleConfig table is empty
CALL `account`.`role_syncPrivileges`();

0
modules/claim/front/development/style.scss → db/changes/234201/.gitkeep
View File

4
db/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

2
e2e/paths/06-claim/03_detail.spec.js → e2e/paths/06-claim/02_detail.spec.js
View File

@ -1,5 +1,5 @@
import selectors from '../../helpers/selectors.js';
import getBrowser from '../../helpers/puppeteer';
import getBrowser from '../../helpers/puppeteer.js';
// #1528 e2e claim/detail
xdescribe('Claim detail', () => {

97
e2e/paths/06-claim/02_development.spec.js
View File

@ -1,97 +0,0 @@
import selectors from '../../helpers/selectors.js';
import getBrowser from '../../helpers/puppeteer';
describe('Claim development', () => {
let browser;
let page;
beforeAll(async() => {
browser = await getBrowser();
page = browser.page;
await page.loginAndModule('claimManager', 'claim');
await page.accessToSearchResult('1');
await page.accessToSection('claim.card.development');
});
afterAll(async() => {
await browser.close();
});
it('should delete a development and create a new one', async() => {
await page.waitToClick(selectors.claimDevelopment.firstDeleteDevelopmentButton);
await page.waitToClick(selectors.claimDevelopment.addDevelopmentButton);
await page.autocompleteSearch(selectors.claimDevelopment.secondClaimReason, 'Baja calidad');
await page.autocompleteSearch(selectors.claimDevelopment.secondClaimResult, 'Deshidratacion');
await page.autocompleteSearch(selectors.claimDevelopment.secondClaimResponsible, 'Calidad general');
await page.autocompleteSearch(selectors.claimDevelopment.secondClaimWorker, 'deliveryNick');
await page.autocompleteSearch(selectors.claimDevelopment.secondClaimRedelivery, 'Reparto');
await page.waitToClick(selectors.claimDevelopment.saveDevelopmentButton);
const message = await page.waitForSnackbar();
expect(message.text).toContain('Data saved!');
});
it(`should redirect to the next section of claims as the role is claimManager`, async() => {
await page.waitForState('claim.card.action');
});
it('should edit a development', async() => {
await page.reloadSection('claim.card.development');
await page.autocompleteSearch(selectors.claimDevelopment.firstClaimReason, 'Calor');
await page.autocompleteSearch(selectors.claimDevelopment.firstClaimResult, 'Cocido');
await page.autocompleteSearch(selectors.claimDevelopment.firstClaimResponsible, 'Calidad general');
await page.autocompleteSearch(selectors.claimDevelopment.firstClaimWorker, 'adminAssistantNick');
await page.autocompleteSearch(selectors.claimDevelopment.firstClaimRedelivery, 'Cliente');
await page.waitToClick(selectors.claimDevelopment.saveDevelopmentButton);
const message = await page.waitForSnackbar();
expect(message.text).toContain('Data saved!');
});
it('should confirm the first development is the expected one', async() => {
await page.reloadSection('claim.card.development');
const reason = await page
.waitToGetProperty(selectors.claimDevelopment.firstClaimReason, 'value');
const result = await page
.waitToGetProperty(selectors.claimDevelopment.firstClaimResult, 'value');
const responsible = await page
.waitToGetProperty(selectors.claimDevelopment.firstClaimResponsible, 'value');
const worker = await page
.waitToGetProperty(selectors.claimDevelopment.firstClaimWorker, 'value');
const redelivery = await page
.waitToGetProperty(selectors.claimDevelopment.firstClaimRedelivery, 'value');
expect(reason).toEqual('Calor');
expect(result).toEqual('Baboso/Cocido');
expect(responsible).toEqual('Calidad general');
expect(worker).toEqual('adminAssistantNick');
expect(redelivery).toEqual('Cliente');
});
it('should confirm the second development is the expected one', async() => {
const reason = await page
.waitToGetProperty(selectors.claimDevelopment.secondClaimReason, 'value');
const result = await page
.waitToGetProperty(selectors.claimDevelopment.secondClaimResult, 'value');
const responsible = await page
.waitToGetProperty(selectors.claimDevelopment.secondClaimResponsible, 'value');
const worker = await page
.waitToGetProperty(selectors.claimDevelopment.secondClaimWorker, 'value');
const redelivery = await page
.waitToGetProperty(selectors.claimDevelopment.secondClaimRedelivery, 'value');
expect(reason).toEqual('Baja calidad');
expect(result).toEqual('Deshidratacion');
expect(responsible).toEqual('Calidad general');
expect(worker).toEqual('deliveryNick');
expect(redelivery).toEqual('Reparto');
});
});

2
e2e/paths/06-claim/04_claim_action.spec.js → e2e/paths/06-claim/03_claim_action.spec.js
View File

@ -1,5 +1,5 @@
import selectors from '../../helpers/selectors.js';
import getBrowser from '../../helpers/puppeteer';
import getBrowser from '../../helpers/puppeteer.js';
describe('Claim action path', () => {
let browser;

2
e2e/paths/06-claim/05_summary.spec.js → e2e/paths/06-claim/04_summary.spec.js
View File

@ -1,6 +1,6 @@
import selectors from '../../helpers/selectors.js';
import getBrowser from '../../helpers/puppeteer';
import getBrowser from '../../helpers/puppeteer.js';
describe('Claim summary path', () => {
let browser;

2
e2e/paths/06-claim/06_descriptor.spec.js → e2e/paths/06-claim/05_descriptor.spec.js
View File

@ -1,5 +1,5 @@
import selectors from '../../helpers/selectors.js';
import getBrowser from '../../helpers/puppeteer';
import getBrowser from '../../helpers/puppeteer.js';
describe('Claim descriptor path', () => {
let browser;

0
e2e/paths/06-claim/07_note.spec.js → e2e/paths/06-claim/06_note.spec.js
View File

118
modules/claim/front/development/index.html
View File

@ -1,116 +1,2 @@
<vn-crud-model
vn-id="model"
url="ClaimDevelopments"
fields="['id', 'claimFk', 'claimReasonFk', 'claimResultFk', 'claimResponsibleFk', 'workerFk', 'claimRedeliveryFk']"
link="{claimFk: $ctrl.$params.id}"
filter="$ctrl.filter"
data="claimDevelopments"
auto-load="true">
</vn-crud-model>
<vn-crud-model
url="ClaimReasons"
data="claimReasons"
order="description"
auto-load="true">
</vn-crud-model>
<vn-crud-model
url="ClaimResults"
data="claimResults"
order="description"
auto-load="true">
</vn-crud-model>
<vn-crud-model
url="ClaimResponsibles"
data="claimResponsibles"
order="description"
auto-load="true">
</vn-crud-model>
<vn-crud-model
url="ClaimRedeliveries"
data="claimRedeliveries"
order="description"
auto-load="true">
</vn-crud-model>
<vn-watcher
vn-id="watcher"
data="claimDevelopments"
form="form">
</vn-watcher>
<vn-vertical class="vn-w-lg">
<vn-card class="vn-pa-lg">
<vn-vertical>
<form name="form">
<vn-horizontal ng-repeat="claimDevelopment in claimDevelopments">
<vn-autocomplete
vn-focus
label="Reason"
ng-model="claimDevelopment.claimReasonFk"
data="claimReasons"
fields="['id', 'description']"
show-field="description"
rule>
</vn-autocomplete>
<vn-autocomplete
label="Result"
ng-model="claimDevelopment.claimResultFk"
data="claimResults"
fields="['id', 'description']"
show-field="description"
rule>
</vn-autocomplete>
<vn-autocomplete
label="Responsible"
ng-model="claimDevelopment.claimResponsibleFk"
data="claimResponsibles"
fields="['id', 'description']"
show-field="description"
rule>
</vn-autocomplete>
<vn-worker-autocomplete
ng-model="claimDevelopment.workerFk"
show-field="nickname"
rule>
</vn-worker-autocomplete>
<vn-autocomplete
label="Redelivery"
ng-model="claimDevelopment.claimRedeliveryFk"
data="claimRedeliveries"
fields="['id', 'description']"
show-field="description"
rule>
</vn-autocomplete>
<vn-icon-button
vn-none
class="vn-my-md"
vn-tooltip="Remove sale"
icon="delete"
ng-click="model.remove($index)"
tabindex="-1">
</vn-icon-button>
</vn-horizontal>
</form>
<vn-one class="vn-pt-md">
<vn-icon-button
vn-bind="+"
vn-tooltip="Add sale"
icon="add_circle"
ng-click="model.insert()">
</vn-icon-button>
</vn-one>
</vn-vertical>
</vn-card>
<vn-button-bar>
<vn-submit
disabled="!watcher.dataChanged()"
ng-click="$ctrl.onSubmit()"
label="Save">
</vn-submit>
<!-- # #2680 Undo changes button bugs -->
<!-- <vn-button
class="cancel"
label="Undo changes"
disabled="!watcher.dataChanged()"
ng-click="watcher.loadOriginalData()">
</vn-button> -->
</vn-button-bar>
</vn-vertical>
<vn-card>
</vn-card>

15
modules/claim/front/development/index.js
View File

@ -1,17 +1,14 @@
import ngModule from '../module';
import Section from 'salix/components/section';
import './style.scss';
class Controller extends Section {
onSubmit() {
this.$.watcher.check();
this.$.model.save().then(() => {
this.$.watcher.notifySaved();
this.$.watcher.updateOriginalData();
constructor($element, $) {
super($element, $);
}
if (this.aclService.hasAny(['claimManager']))
this.$state.go('claim.card.action');
});
async $onInit() {
this.$state.go('claim.card.summary', {id: this.$params.id});
window.location.href = await this.vnApp.getUrl(`claim/${this.$params.id}/development`);
}
}

31
modules/claim/front/development/index.spec.js
View File

@ -1,31 +0,0 @@
import './index.js';
import watcher from 'core/mocks/watcher';
import crudModel from 'core/mocks/crud-model';
describe('Claim', () => {
describe('Component vnClaimDevelopment', () => {
let controller;
let $scope;
beforeEach(ngModule('claim'));
beforeEach(inject(($componentController, $rootScope) => {
$scope = $rootScope.$new();
$scope.watcher = watcher;
$scope.model = crudModel;
const $element = angular.element('<vn-claim-development></vn-claim-development>');
controller = $componentController('vnClaimDevelopment', {$element, $scope});
}));
describe('onSubmit()', () => {
it(`should redirect to 'claim.card.action' state`, () => {
jest.spyOn(controller.aclService, 'hasAny').mockReturnValue(true);
jest.spyOn(controller.$state, 'go');
controller.onSubmit();
expect(controller.$state.go).toHaveBeenCalledWith('claim.card.action');
});
});
});
});

8
modules/claim/front/development/locale/es.yml
View File

@ -1,8 +0,0 @@
Destination: Destino
Development: Trazabilidad
Reason: Motivo
Result: Consecuencia
Responsible: Responsable
Worker: Trabajador
Redelivery: Devolución
Add line: Añadir Linea

2
modules/item/back/methods/item/setVisibleDiscard.js
View File

@ -32,6 +32,6 @@ module.exports = Self => {
Self.setVisibleDiscard = async(ctx, itemFk, warehouseFk, quantity, addressFk) => {
const query = `CALL vn.item_setVisibleDiscard(?, ?, ?, ?)`;
await Self.rawSql(query, [itemFk, warehouseFk, quantity, addressFk]);
await Self.rawSql(query, [itemFk, warehouseFk, quantity, addressFk], {userId: ctx.req.accessToken.userId});
};
};

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "salix-back",
"version": "23.32.02",
"version": "23.42.01",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "salix-back",
"version": "23.26.01",
"version": "23.42.01",
"license": "GPL-3.0",
"dependencies": {
"axios": "^1.2.2",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "salix-back",
"version": "23.40.01",
"version": "23.42.01",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",