diff --git a/services/db/02-dumpedFixtures.sql b/services/db/02-dumpedFixtures.sql index 59daa1962..44bd677c6 100644 --- a/services/db/02-dumpedFixtures.sql +++ b/services/db/02-dumpedFixtures.sql @@ -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-24 12:26:44 +-- Dump completed on 2018-04-24 13:57:42 USE `salix`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -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-24 12:26:44 +-- Dump completed on 2018-04-24 13:57:42 USE `vn`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -158,7 +158,7 @@ UNLOCK TABLES; LOCK TABLES `pgc` WRITE; /*!40000 ALTER TABLE `pgc` DISABLE KEYS */; -INSERT INTO `pgc` VALUES ('4770000001',8.00,'Reducido',1,1,1,1),('4770000002',0.00,'Extra-Community supply',3,1,0,2),('4770000010',10.00,'Reducido',1,1,1,1),('4770000020',0.00,'Exento',7,1,1,1),('4770000021',21.00,'General',1,1,1,1),('4770000101',10.00,'Reducido ',1,1,1,1),('4770000108',8.00,'Reducido',1,1,1,1),('4770000110',1.40,'Rec. Eq. Reducido',1,0,0,1),('4770000215',21.00,'General',1,1,1,1),('4770000521',5.20,'Rec. Eq. General',1,0,0,1),('4770000701',1.00,'Rec. Eq. Reducido',1,0,0,1),('4771000000',0.00,'Intra-Community supply',6,1,1,1),('4771000001',0.00,'Intra-Community services',7,1,1,1),('HolandaGEN',21.00,'General',1,0,0,1),('HolandaRED',6.00,'Reducido',1,0,0,1),('IGIC cero',0.00,'Cero',1,0,0,1),('IGIC gener',7.00,'General',1,0,0,1),('IGIC reduc',3.00,'Reducido',1,0,0,1); +INSERT INTO `pgc` VALUES ('4722000000',0.00,'Importación Exento ',1,0,0,1),('4722000010',10.00,'Importación Reducido ',1,0,0,1),('4722000021',21.00,'Importación General ',1,0,0,1),('4770000001',8.00,'Reducido',1,1,1,1),('4770000002',0.00,'Extra-Community supply',3,1,0,2),('4770000010',10.00,'Reducido',1,1,1,1),('4770000020',0.00,'Exento',7,1,1,1),('4770000021',21.00,'General',1,1,1,1),('4770000101',10.00,'Reducido ',1,1,1,1),('4770000108',8.00,'Reducido',1,1,1,1),('4770000110',1.40,'Rec. Eq. Reducido',1,0,0,1),('4770000215',21.00,'General',1,1,1,1),('4770000521',5.20,'Rec. Eq. General',1,0,0,1),('4770000701',1.00,'Rec. Eq. Reducido',1,0,0,1),('4771000000',0.00,'Intra-Community supply',6,1,1,1),('4771000001',0.00,'Intra-Community services',7,1,1,1),('HolandaGEN',21.00,'General',1,0,0,1),('HolandaRED',6.00,'Reducido',1,0,0,1),('IGIC cero',0.00,'Cero',1,0,0,1),('IGIC gener',7.00,'General',1,0,0,1),('IGIC reduc',3.00,'Reducido',1,0,0,1); /*!40000 ALTER TABLE `pgc` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -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-24 12:26:44 +-- Dump completed on 2018-04-24 13:57:42 USE `vn2008`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -229,6 +229,16 @@ LOCK TABLES `state` WRITE; INSERT INTO `state` VALUES (1,'Arreglar',2,0,'FIXING'),(2,'Libre',1,0,'FREE'),(3,'OK',3,0,'OK'),(4,'Impreso',4,1,'PRINTED'),(5,'Preparación',5,1,'ON_PREPARATION'),(6,'En Revisión',7,1,'ON_CHECKING'),(7,'Sin Acabar',2,0,'NOT_READY'),(8,'Revisado',8,1,'CHECKED'),(9,'Encajando',9,1,'PACKING'),(10,'Encajado',10,2,'PACKED'),(11,'Facturado',0,0,'INVOICED'),(12,'Bloqueado',0,0,'BLOCKED'),(13,'En Reparto',11,3,'ON_DELIVERY'),(14,'Preparado',6,1,'PREPARED'),(15,'Pte Recogida',12,3,'WAITING_FOR_PICKUP'),(16,'Entregado',13,3,'DELIVERED'),(17,'Eliminado',14,3,'ERASED'),(20,'Asignado',4,1,'PICKER_DESIGNED'),(21,'Retornado',4,1,'PRINTED_BACK'),(22,'¿Fecha?',2,0,'WRONG_DATE'); /*!40000 ALTER TABLE `state` ENABLE KEYS */; UNLOCK TABLES; + +-- +-- Dumping data for table `bionic_updating_options` +-- + +LOCK TABLES `bionic_updating_options` WRITE; +/*!40000 ALTER TABLE `bionic_updating_options` DISABLE KEYS */; +INSERT INTO `bionic_updating_options` VALUES (1,'Cambiar los precios en el ticket'),(2,'Cargar la diferencia al cliente (Greuges)'),(3,'Convertir en maná'),(4,'Repercutir el incremento al producto'),(5,'Repercutir el incremento a la cartera del com'),(6,'Paga el vendedor'),(7,'Paga el comprador'),(8,'No realizar modificaciones en precios'); +/*!40000 ALTER TABLE `bionic_updating_options` ENABLE KEYS */; +UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; @@ -239,7 +249,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-04-24 12:26:45 +-- Dump completed on 2018-04-24 13:57:42 USE `bi`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -287,7 +297,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-04-24 12:26:45 +-- Dump completed on 2018-04-24 13:57:43 USE `cache`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -325,4 +335,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-04-24 12:26:45 +-- Dump completed on 2018-04-24 13:57:43 diff --git a/services/db/04-fixtures.sql b/services/db/04-fixtures.sql index e54fda776..279c931c5 100644 --- a/services/db/04-fixtures.sql +++ b/services/db/04-fixtures.sql @@ -263,12 +263,6 @@ INSERT INTO `vn`.`route`(`id`, `created`) (6, CURDATE()), (7, CURDATE()); -/* INSERT INTO `vn`.`state`(`id`, `name`, `order`, `alertLevel`, `code`) - VALUES - (1, 'To check', 2, 0, 'FIXING'), - (2, 'Owes', 1, 0, 'FREE'), - (3, 'Ok', 3, 0, 'OK'); */ - INSERT INTO `vn2008`.`empresa_grupo`(`empresa_grupo_id`, `grupo`) VALUES (1, 'Wayne Industries'); diff --git a/services/db/changes/1.0.3/04-ticketUpdateAction.sql b/services/db/changes/1.0.3/04-ticketUpdateAction.sql new file mode 100644 index 000000000..4371a0715 --- /dev/null +++ b/services/db/changes/1.0.3/04-ticketUpdateAction.sql @@ -0,0 +1,10 @@ +USE `vn`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `vn`.`ticketUpdateAction` AS + SELECT + `b`.`buo_id` AS `id`, `b`.`description` AS `description` + FROM + `vn2008`.`bionic_updating_options` `b`; \ No newline at end of file diff --git a/services/db/export-data.cmd b/services/db/export-data.cmd index 58a1d357e..7b8cccf1a 100755 --- a/services/db/export-data.cmd +++ b/services/db/export-data.cmd @@ -6,7 +6,7 @@ mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> 02-dumpedFix 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 state>> 02-dumpedFixtures.sql +mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options >> 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 diff --git a/services/db/export-data.sh b/services/db/export-data.sh index da299ad5c..01db64544 100755 --- a/services/db/export-data.sh +++ b/services/db/export-data.sh @@ -7,7 +7,7 @@ mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> 02-dumpedFix 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 state>> 02-dumpedFixtures.sql +mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options >> 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 diff --git a/services/ticket/common/models/TicketUpdateAction.json b/services/ticket/common/models/TicketUpdateAction.json new file mode 100644 index 000000000..c4a4ce8df --- /dev/null +++ b/services/ticket/common/models/TicketUpdateAction.json @@ -0,0 +1,28 @@ +{ + "name": "TicketUpdateAction", + "base": "VnModel", + "options": { + "mysql": { + "table": "ticketUpdateAction" + } + }, + "properties": { + "id": { + "id": true, + "type": "Number", + "description": "Identifier" + }, + "description": { + "type": "String", + "required": true + } +}, +"acls": [ + { + "accessType": "READ", + "principalType": "ROLE", + "principalId": "$everyone", + "permission": "ALLOW" + } +] +} diff --git a/services/ticket/server/model-config.json b/services/ticket/server/model-config.json index eccd5dae5..637bd8963 100644 --- a/services/ticket/server/model-config.json +++ b/services/ticket/server/model-config.json @@ -1,37 +1,40 @@ { - "TicketObservation": { - "dataSource": "vn" - }, - "ObservationType": { - "dataSource": "vn" - }, - "TicketTracking": { - "dataSource": "vn" - }, - "TicketPackaging": { - "dataSource": "vn" - }, - "Packaging": { - "dataSource": "vn" - }, - "SaleChecked": { - "dataSource": "vn" - }, - "ComponentRate": { - "dataSource": "vn" - }, - "ComponentTypeRate": { - "dataSource": "vn" - }, - "SaleComponent": { - "dataSource": "vn" - }, - "Expedition": { - "dataSource": "vn" - }, - "AnnualAverageInvoiced": { - "dataSource": "vn" - } + "TicketObservation": { + "dataSource": "vn" + }, + "ObservationType": { + "dataSource": "vn" + }, + "TicketTracking": { + "dataSource": "vn" + }, + "TicketPackaging": { + "dataSource": "vn" + }, + "Packaging": { + "dataSource": "vn" + }, + "SaleChecked": { + "dataSource": "vn" + }, + "ComponentRate": { + "dataSource": "vn" + }, + "ComponentTypeRate": { + "dataSource": "vn" + }, + "SaleComponent": { + "dataSource": "vn" + }, + "Expedition": { + "dataSource": "vn" + }, + "AnnualAverageInvoiced": { + "dataSource": "vn" + }, + "TicketUpdateAction": { + "dataSource": "vn" + } }