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

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

This commit is contained in:
Joan Sanchez 2018-04-17 12:19:51 +02:00
parent 136a5e26a3 7426bc9e04
commit 808ff40794
7 changed files with 194 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/ticket/src/component/component.html
View File

@ -39,7 +39,7 @@
}}" number>{{::sale.itemFk}}</td>
<td rowspan="{{
::sale.components.length + 1
}}">{{::sale.item.name}}</td>
}}"><vn-fetched-tags sale="sale"/></td>
<td rowspan="{{
::sale.components.length + 1
}}" number>{{::sale.quantity}}</td>

1
client/ticket/src/volume/ticket-volume.spec.js
View File

@ -35,4 +35,3 @@ describe('ticket', () => {
});
});
});

232
e2e/paths/ticket-module/04_create_ticket_packages.spec.js
View File

@ -1,128 +1,128 @@
import selectors from '../../helpers/selectors.js';
import createNightmare from '../../helpers/helpers';
// import selectors from '../../helpers/selectors.js';
// import createNightmare from '../../helpers/helpers';
describe('Ticket', () => {
describe('Create packages path', () => {
const nightmare = createNightmare();
// describe('Ticket', () => {
// describe('Create packages path', () => {
// const nightmare = createNightmare();
beforeAll(() => {
return nightmare
.waitForLogin('developer');
});
// beforeAll(() => {
// return nightmare
// .waitForLogin('developer');
// });
it('should click on the Tickets button of the top bar menu', () => {
return nightmare
.waitToClick(selectors.globalItems.applicationsMenuButton)
.wait(selectors.globalItems.applicationsMenuVisible)
.waitToClick(selectors.globalItems.ticketsButton)
.wait(selectors.ticketsIndex.createTicketButton)
.parsedUrl()
.then(url => {
expect(url.hash).toEqual('#!/ticket/list');
});
});
// it('should click on the Tickets button of the top bar menu', () => {
// return nightmare
// .waitToClick(selectors.globalItems.applicationsMenuButton)
// .wait(selectors.globalItems.applicationsMenuVisible)
// .waitToClick(selectors.globalItems.ticketsButton)
// .wait(selectors.ticketsIndex.createTicketButton)
// .parsedUrl()
// .then(url => {
// expect(url.hash).toEqual('#!/ticket/list');
// });
// });
it('should search for the ticket 1', () => {
return nightmare
.wait(selectors.ticketsIndex.searchResult)
.type(selectors.ticketsIndex.searchTicketInput, 1)
.click(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countSearchResults(selectors.ticketsIndex.searchResult)
.then(result => {
expect(result).toEqual(1);
});
});
// it('should search for the ticket 1', () => {
// return nightmare
// .wait(selectors.ticketsIndex.searchResult)
// .type(selectors.ticketsIndex.searchTicketInput, 1)
// .click(selectors.ticketsIndex.searchButton)
// .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
// .countSearchResults(selectors.ticketsIndex.searchResult)
// .then(result => {
// expect(result).toEqual(1);
// });
// });
it(`should click on the search result to access to the ticket packages`, () => {
return nightmare
.waitForTextInElement(selectors.ticketsIndex.searchResult, 'Batman')
.waitToClick(selectors.ticketsIndex.searchResult)
.waitToClick(selectors.ticketPackages.packagesButton)
.waitForURL('package/index')
.url()
.then(url => {
expect(url).toContain('package/index');
});
});
// it(`should click on the search result to access to the ticket packages`, () => {
// return nightmare
// .waitForTextInElement(selectors.ticketsIndex.searchResult, 'Batman')
// .waitToClick(selectors.ticketsIndex.searchResult)
// .waitToClick(selectors.ticketPackages.packagesButton)
// .waitForURL('package/index')
// .url()
// .then(url => {
// expect(url).toContain('package/index');
// });
// });
it(`should delete the first package and receive and error to save a new one with blank quantity`, () => {
return nightmare
.waitToClick(selectors.ticketPackages.firstRemovePackageButton)
.waitToClick(selectors.ticketPackages.addPackageButton)
.waitToClick(selectors.ticketPackages.firstPackageSelect)
.waitToClick(selectors.ticketPackages.firstPackageSelectOptionThree)
.click(selectors.ticketPackages.savePackagesButton)
.waitForSnackbar()
.then(result => {
expect(result).toContain('Some fields are invalid');
});
});
// it(`should delete the first package and receive and error to save a new one with blank quantity`, () => {
// return nightmare
// .waitToClick(selectors.ticketPackages.firstRemovePackageButton)
// .waitToClick(selectors.ticketPackages.addPackageButton)
// .waitToClick(selectors.ticketPackages.firstPackageSelect)
// .waitToClick(selectors.ticketPackages.firstPackageSelectOptionThree)
// .click(selectors.ticketPackages.savePackagesButton)
// .waitForSnackbar()
// .then(result => {
// expect(result).toContain('Some fields are invalid');
// });
// });
it(`should attempt create a new package but receive an error if quantity is a string`, () => {
return nightmare
.type(selectors.ticketPackages.firstQuantityInput, 'ninety 9')
.click(selectors.ticketPackages.savePackagesButton)
.waitForSnackbar()
.then(result => {
expect(result).toContain('Some fields are invalid');
});
});
// it(`should attempt create a new package but receive an error if quantity is a string`, () => {
// return nightmare
// .type(selectors.ticketPackages.firstQuantityInput, 'ninety 9')
// .click(selectors.ticketPackages.savePackagesButton)
// .waitForSnackbar()
// .then(result => {
// expect(result).toContain('Some fields are invalid');
// });
// });
it(`should attempt create a new package but receive an error if quantity is 0`, () => {
return nightmare
.clearInput(selectors.ticketPackages.firstQuantityInput)
.type(selectors.ticketPackages.firstQuantityInput, '0')
.click(selectors.ticketPackages.savePackagesButton)
.waitForSnackbar()
.then(result => {
expect(result).toContain('Some fields are invalid');
});
});
// it(`should attempt create a new package but receive an error if quantity is 0`, () => {
// return nightmare
// .clearInput(selectors.ticketPackages.firstQuantityInput)
// .type(selectors.ticketPackages.firstQuantityInput, '0')
// .click(selectors.ticketPackages.savePackagesButton)
// .waitForSnackbar()
// .then(result => {
// expect(result).toContain('Some fields are invalid');
// });
// });
it(`should attempt create a new package but receive an error if package is blank`, () => {
return nightmare
.clearInput(selectors.ticketPackages.firstQuantityInput)
.type(selectors.ticketPackages.firstQuantityInput, '99')
.click(selectors.ticketPackages.clearPackageSelectButton)
.click(selectors.ticketPackages.savePackagesButton)
.waitForSnackbar()
.then(result => {
expect(result).toContain('Package cannot be blank');
});
});
// it(`should attempt create a new package but receive an error if package is blank`, () => {
// return nightmare
// .clearInput(selectors.ticketPackages.firstQuantityInput)
// .type(selectors.ticketPackages.firstQuantityInput, '99')
// .click(selectors.ticketPackages.clearPackageSelectButton)
// .click(selectors.ticketPackages.savePackagesButton)
// .waitForSnackbar()
// .then(result => {
// expect(result).toContain('Package cannot be blank');
// });
// });
it(`should create a new package with correct data`, () => {
return nightmare
.waitToClick(selectors.ticketPackages.firstPackageSelect)
.waitToClick(selectors.ticketPackages.firstPackageSelectOptionThree)
.waitForTextInInput(selectors.ticketPackages.firstPackageSelect, 'Iron Patriot')
.click(selectors.ticketPackages.savePackagesButton)
.waitForSnackbar()
.then(result => {
expect(result).toContain('Data saved!');
});
});
// it(`should create a new package with correct data`, () => {
// return nightmare
// .waitToClick(selectors.ticketPackages.firstPackageSelect)
// .waitToClick(selectors.ticketPackages.firstPackageSelectOptionThree)
// .waitForTextInInput(selectors.ticketPackages.firstPackageSelect, 'Iron Patriot')
// .click(selectors.ticketPackages.savePackagesButton)
// .waitForSnackbar()
// .then(result => {
// expect(result).toContain('Data saved!');
// });
// });
it(`should confirm the first select is the expected one`, () => {
return nightmare
.click(selectors.ticketSales.saleButton)
.wait(selectors.ticketSales.firstPackageSelect)
.click(selectors.ticketPackages.packagesButton)
.waitForTextInInput(selectors.ticketPackages.firstPackageSelect, 'Iron Patriot')
.getInputValue(selectors.ticketPackages.firstPackageSelect)
.then(result => {
expect(result).toEqual('Iron Patriot');
});
});
// it(`should confirm the first select is the expected one`, () => {
// return nightmare
// .click(selectors.ticketSales.saleButton)
// .wait(selectors.ticketSales.firstPackageSelect)
// .click(selectors.ticketPackages.packagesButton)
// .waitForTextInInput(selectors.ticketPackages.firstPackageSelect, 'Iron Patriot')
// .getInputValue(selectors.ticketPackages.firstPackageSelect)
// .then(result => {
// expect(result).toEqual('Iron Patriot');
// });
// });
it(`should confirm the first quantity is the expected one`, () => {
return nightmare
.waitForTextInInput(selectors.ticketPackages.firstQuantityInput, '99')
.getInputValue(selectors.ticketPackages.firstQuantityInput)
.then(result => {
expect(result).toEqual('99');
});
});
});
});
// it(`should confirm the first quantity is the expected one`, () => {
// return nightmare
// .waitForTextInInput(selectors.ticketPackages.firstQuantityInput, '99')
// .getInputValue(selectors.ticketPackages.firstQuantityInput)
// .then(result => {
// expect(result).toEqual('99');
// });
// });
// });
// });

50
services/db/02-dumpedFixtures.sql
View File

@ -55,7 +55,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2018-04-13 12:57:05
-- Dump completed on 2018-04-17 10:04:13
USE `salix`;
-- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64)
--
@ -80,7 +80,7 @@ USE `salix`;
LOCK TABLES `ACL` WRITE;
/*!40000 ALTER TABLE `ACL` DISABLE KEYS */;
INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','employee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','employee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','employee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','employee'),(28,'ClientObservation','*','READ','ALLOW','ROLE','employee'),(30,'GreugeType','*','READ','ALLOW','ROLE','employee'),(31,'Mandate','*','READ','ALLOW','ROLE','employee'),(32,'MandateType','*','READ','ALLOW','ROLE','employee'),(33,'Company','*','READ','ALLOW','ROLE','employee'),(34,'Greuge','*','READ','ALLOW','ROLE','employee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(52,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','employee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(57,'CreditClassification','*','READ','ALLOW','ROLE','employee'),(58,'CreditClassification','*','WRITE','ALLOW','ROLE','creditInsurance'),(59,'CreditInsurance','*','READ','ALLOW','ROLE','employee'),(60,'CreditInsurance','*','WRITE','ALLOW','ROLE','creditInsurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee');
INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','employee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','employee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','employee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','employee'),(28,'ClientObservation','*','READ','ALLOW','ROLE','employee'),(30,'GreugeType','*','READ','ALLOW','ROLE','employee'),(31,'Mandate','*','READ','ALLOW','ROLE','employee'),(32,'MandateType','*','READ','ALLOW','ROLE','employee'),(33,'Company','*','READ','ALLOW','ROLE','employee'),(34,'Greuge','*','READ','ALLOW','ROLE','employee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(52,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','employee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(57,'CreditClassification','*','READ','ALLOW','ROLE','employee'),(58,'CreditClassification','*','WRITE','ALLOW','ROLE','creditInsurance'),(59,'CreditInsurance','*','READ','ALLOW','ROLE','employee'),(60,'CreditInsurance','*','WRITE','ALLOW','ROLE','creditInsurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','*','ALLOW','ROLE','employee'),(66,'TicketTracking','*','*','ALLOW','ROLE','employee'),(67,'TicketState','*','*','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','READ','ALLOW','ROLE','employee'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee');
/*!40000 ALTER TABLE `ACL` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@ -93,7 +93,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2018-04-13 12:57:05
-- Dump completed on 2018-04-17 10:04:13
USE `vn`;
-- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64)
--
@ -171,7 +171,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2018-04-13 12:57:06
-- Dump completed on 2018-04-17 10:04:13
USE `vn2008`;
-- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64)
--
@ -229,7 +229,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2018-04-13 12:57:06
-- Dump completed on 2018-04-17 10:04:14
USE `bi`;
-- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64)
--
@ -277,4 +277,42 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2018-04-13 12:57:06
-- Dump completed on 2018-04-17 10:04:14
USE `cache`;
-- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64)
--
-- Host: db.verdnatura.es Database: cache
-- ------------------------------------------------------
-- Server version 5.6.25-4-log
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--
-- Dumping data for table `cache`
--
LOCK TABLES `cache` WRITE;
/*!40000 ALTER TABLE `cache` DISABLE KEYS */;
INSERT INTO `cache` VALUES (1,'equalizator','00:15:00'),(2,'available','00:06:00'),(3,'stock','00:10:00'),(4,'last_buy','08:30:00'),(5,'weekly_sales','12:00:00'),(6,'bionic','00:05:00'),(7,'sales','00:03:00'),(8,'visible','00:03:00'),(9,'item_range','00:03:00'),(10,'barcodes','01:00:00'),(11,'prod_graphic','00:15:00');
/*!40000 ALTER TABLE `cache` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2018-04-17 10:04:14

50
services/db/04-fixtures.sql
View File

@ -282,27 +282,27 @@ INSERT INTO `vn`.`invoiceOut`(`id`, `ref`, `serial`, `amount`, `clientFk`, `crea
INSERT INTO `vn`.`ticket`(`id`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `clientFk`,`nickname`, `addressFk`, `refFk`)
VALUES
(1, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL -15 DAY), 101, 'Batman', 101, NULL),
(2, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL -10 DAY), 101, 'Spider-Man', 102, NULL),
(3, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL -5 DAY), 102, 'Super-Man', 103, NULL),
(4, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL -4 DAY), 102, 'Iron-Man', 104, NULL),
(5, 3, 3, 3, DATE_ADD(CURDATE(), INTERVAL -3 DAY), 103, 'Magneto', 105, NULL),
(6, 3, 3, 4, DATE_ADD(CURDATE(), INTERVAL -2 DAY), 103, 'Legion', 106, NULL),
(7, 4, 4, 4, DATE_ADD(CURDATE(), INTERVAL -1 DAY), 104, 'Ant-Man', 107, NULL),
(8, 4, 4, 4, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 104, 'Professor X', 108, NULL),
(9, 5, 5, 4, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), 105, 'Hulk', 109, NULL),
(10, 6, 5, 5, DATE_ADD(CURDATE(), INTERVAL -3 MONTH), 105, 'Jessica Jones', 110, NULL),
(11, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL +1 DAY), 101, 'Batman', 101, NULL),
(12, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL +1 DAY), 101, 'Spider-Man', 102, NULL),
(13, 2, 2, 2, CURDATE(), 102, 'Super-Man', 103, NULL),
(14, 2, 2, 2, CURDATE(), 102, 'Iron-Man', 104, NULL),
(15, 3, 3, 3, CURDATE(), 103, 'Magneto', 105, NULL),
(16, 3, 3, 4, CURDATE(), 103, 'Legion', 106, NULL),
(17, 4, 4, 4, CURDATE(), 104, 'Ant-Man', 107, NULL),
(18, 4, 4, 4, CURDATE(), 104, 'Professor X', 108, NULL),
(19, 5, 5, 4, CURDATE(), 105, 'Hulk', 109, NULL),
(20, 5, 5, 4, CURDATE(), 105, 'Hulk', 109, NULL),
(21, 5, 5, 4, CURDATE(), 105, 'Hulk', 109, NULL);
(1, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL -15 DAY), 101, 'Batman', 121, NULL),
(2, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL -10 DAY), 101, 'Spider-Man', 121, NULL),
(3, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL -5 DAY), 102, 'Super-Man', 122, NULL),
(4, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL -4 DAY), 102, 'Iron-Man', 122, NULL),
(5, 3, 3, 3, DATE_ADD(CURDATE(), INTERVAL -3 DAY), 103, 'Magneto', 123, NULL),
(6, 3, 3, 4, DATE_ADD(CURDATE(), INTERVAL -2 DAY), 103, 'Legion', 123, NULL),
(7, 4, 4, 4, DATE_ADD(CURDATE(), INTERVAL -1 DAY), 104, 'Ant-Man', 124, NULL),
(8, 4, 4, 4, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 104, 'Professor X', 124, NULL),
(9, 5, 5, 4, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), 105, 'Hulk', 125, NULL),
(10, 6, 5, 5, DATE_ADD(CURDATE(), INTERVAL -3 MONTH), 105, 'Jessica Jones', 125, NULL),
(11, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL +1 DAY), 101, 'ticket 1', 121, NULL),
(12, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL +1 DAY), 101, 'ticket 2', 121, NULL),
(13, 2, 2, 2, CURDATE(), 101, 'ticket 3', 121, NULL),
(14, 2, 2, 2, CURDATE(), 101, 'ticket 4', 121, NULL),
(15, 3, 3, 3, CURDATE(), 101, 'ticket 5', 121, NULL),
(16, 3, 3, 4, CURDATE(), 101, 'ticket 6', 121, NULL),
(17, 4, 4, 4, CURDATE(), 106, 'ticket 7', 126, NULL),
(18, 4, 4, 4, CURDATE(), 107, 'ticket 8', 127, NULL),
(19, 5, 5, 4, CURDATE(), 108, 'ticket 9', 128, NULL),
(20, 5, 5, 4, CURDATE(), 109, 'ticket 10', 119, NULL),
(21, 5, 5, 4, CURDATE(), 110, 'ticket 11', 129, NULL);
INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
VALUES
@ -547,4 +547,10 @@ INSERT INTO `vn`.`supplier`(`id`, `name`,`account`,`countryFk`,`nif`,`isFarmer`,
VALUES
( 1, 'Plants SL', 4000000001, 1, 'A11111111', 0, NULL, 0, CURDATE(), 1111, 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1),
( 2, 'Flower King', 4000000002, 1, 'B22222222', 0, NULL, 0, CURDATE(), 2222, 1, 'supplier address 2', 'LONDON', 2, 45671, 1, 2),
( 442, 'Verdnatura Levante SL', 4000000442, 1, 'C33333333', 0, NULL, 0, CURDATE(), 3333, 1, 'supplier address 3', 'SILLA', 1, 43022, 1, 2);
( 442, 'Verdnatura Levante SL', 4000000442, 1, 'C33333333', 0, NULL, 0, CURDATE(), 3333, 1, 'supplier address 3', 'SILLA', 1, 43022, 1, 2);
INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_refresh`, `expires`, `created`, `connection_id`)
VALUES
( 1, 2, 'available', CONCAT_WS('/',1,CURDATE()), CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(),INTERVAL 15 MINUTE), CURDATE(), NULL),
( 2, 4, 'last_buy', CONCAT_WS('/',1,CURDATE()), CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(),INTERVAL 15 MINUTE), CURDATE(), NULL),
( 3, 8, 'visible', CONCAT_WS('/',1,CURDATE()), CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(),INTERVAL 15 MINUTE), CURDATE(), NULL);

4
services/db/export-data.cmd
View File

@ -7,8 +7,10 @@ echo USE `vn`; >> 02-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc >> 02-dumpedFixtures.sql
echo USE `vn2008`; >> 02-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series >> 02-dumpedFixtures.sql
echo "USE \`bi\`;" >> 02-dumpedFixtures.sql
echo USE `bi`; >> 02-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info bi tarifa_componentes tarifa_componentes_series >> 02-dumpedFixtures.sql
echo USE `cache`; >> 02-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info cache cache >> 02-dumpedFixtures.sql

2
services/db/export-data.sh
View File

@ -10,6 +10,8 @@ echo "USE \`vn2008\`;" >> 02-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series >> 02-dumpedFixtures.sql
echo "USE \`bi\`;" >> 02-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info bi tarifa_componentes tarifa_componentes_series >> 02-dumpedFixtures.sql
echo "USE \`cache\`;" >> 02-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info cache cache >> 02-dumpedFixtures.sql