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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

This commit is contained in:
Juan Ferrer 2019-02-01 13:01:20 +01:00
parent 1752ffbcaa 69cc821f6f
commit 9023601396
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js
View File

@ -1,13 +1,12 @@
import selectors from '../../helpers/selectors.js'; import selectors from '../../helpers/selectors.js';
import createNightmare from '../../helpers/nightmare'; import createNightmare from '../../helpers/nightmare';
// #776 describe('Ticket expeditions and log path', () => {
xdescribe('Ticket expeditions and log path', () => {
const nightmare = createNightmare(); const nightmare = createNightmare();
beforeAll(() => { beforeAll(() => {
return nightmare return nightmare
.loginAndModule('developer', 'ticket') .loginAndModule('production', 'ticket')
.accessToSearchResult('id:1') .accessToSearchResult('id:1')
.accessToSection('ticket.card.expedition'); .accessToSection('ticket.card.expedition');
}); });

13
services/db/install/changes/1.2-CHECK/03-vn2008expeditions.sql
View File

@ -1,13 +0,0 @@
DROP TRIGGER IF EXISTS vn2008.expeditionsBeforeDelete;
USE vn2008;
DELIMITER $$
$$
CREATE DEFINER=`root`@`%` TRIGGER `vn2008`.`expeditionsBeforeDelete`
BEFORE DELETE ON `expeditions` FOR EACH ROW
BEGIN
UPDATE Tickets SET Bultos = (SELECT COUNT(counter)-1
FROM expeditions WHERE ticket_id = OLD.ticket_id and EsBulto)
WHERE Id_Ticket = OLD.ticket_id;
END$$
DELIMITER ;