diff --git a/README.md b/README.md
index a3394cc84..b3cc9fdbe 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Salix is also the scientific name of a beautifull tree! :)
Required applications.
* Visual Studio Code
-* Node.js = 8.15.0
+* Node.js = 10.15.3 LTS
* Docker
In Visual Studio Code we use the ESLint extension. Open Visual Studio Code, press Ctrl+P and paste the following command.
diff --git a/db/install/changes/1-orderGetTotal.sql b/db/install/changes/1-orderGetTotal.sql
index dbbc990f2..9c47db108 100644
--- a/db/install/changes/1-orderGetTotal.sql
+++ b/db/install/changes/1-orderGetTotal.sql
@@ -1,10 +1,7 @@
-USE `hedera`;
-DROP procedure IF EXISTS `orderGetTotal`;
+DROP procedure IF EXISTS `hedera`.`orderGetTotal`;
DELIMITER $$
-USE `hedera`$$
-
-CREATE DEFINER=`root`@`%` PROCEDURE `orderGetTotal`()
+CREATE DEFINER=`root`@`%` PROCEDURE `hedera`.`orderGetTotal`()
BEGIN
/**
* Calcula el total con IVA para un conjunto de orders.
diff --git a/db/install/changes/12-ticketGetProblems.sql b/db/install/changes/12-ticketGetProblems.sql
index 29bd3e93a..9f937ba8d 100644
--- a/db/install/changes/12-ticketGetProblems.sql
+++ b/db/install/changes/12-ticketGetProblems.sql
@@ -5,12 +5,12 @@ DELIMITER $$
USE `vn`$$
CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetProblems`()
BEGIN
-/*
- * Obtiene los problemas de uno o varios tickets
- *
- * @table tmp.ticketGetProblems(ticketFk, clientFk, warehouseFk, shipped)
- * @return tmp.ticketProblems
- */
+/**
+ * Obtiene los problemas de uno o varios tickets
+ *
+ * @table tmp.ticketGetProblems(ticketFk, clientFk, warehouseFk, shipped)
+ * @return tmp.ticketProblems
+ */
DECLARE vWarehouse INT;
DECLARE vDate DATE;
DECLARE vAvailableCache INT;
diff --git a/db/install/changes/16-itemLog.sql b/db/install/changes/16-itemLog.sql
new file mode 100644
index 000000000..f6d028dab
--- /dev/null
+++ b/db/install/changes/16-itemLog.sql
@@ -0,0 +1,16 @@
+ALTER TABLE `vn`.`itemLog`
+CHANGE COLUMN `id` `id` INT(11) NOT NULL AUTO_INCREMENT ,
+ADD PRIMARY KEY (`id`);
+
+
+ALTER TABLE `vn`.`itemLog`
+DROP FOREIGN KEY `itemLogUserFk`;
+ALTER TABLE `vn`.`itemLog`
+CHANGE COLUMN `id` `id` INT(11) NOT NULL AUTO_INCREMENT ,
+CHANGE COLUMN `userFk` `userFk` INT(10) UNSIGNED NULL DEFAULT NULL ;
+ALTER TABLE `vn`.`itemLog`
+ADD CONSTRAINT `itemLogUserFk`
+ FOREIGN KEY (`userFk`)
+ REFERENCES `account`.`user` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE;
diff --git a/db/install/changes/7-clientAfterInsert.sql b/db/install/changes/7-clientAfterInsert.sql
index 2c9033b31..b8b51b5c5 100644
--- a/db/install/changes/7-clientAfterInsert.sql
+++ b/db/install/changes/7-clientAfterInsert.sql
@@ -1,3 +1,3 @@
/* Añadir a producción cuando se suba salix */
-DROP TRIGGER vn2008.ClientesAfterInsert;
+DROP TRIGGER IF EXISTS vn2008.ClientesAfterInsert;
diff --git a/modules/agency/back/models/zone.json b/modules/agency/back/models/zone.json
index 5c297f766..dae8a2925 100644
--- a/modules/agency/back/models/zone.json
+++ b/modules/agency/back/models/zone.json
@@ -30,6 +30,10 @@
"bonus": {
"type": "Number",
"required": true
+ },
+ "isVolumetric": {
+ "type": "Boolean",
+ "required": true
}
},
"relations": {
diff --git a/modules/agency/front/basic-data/index.html b/modules/agency/front/basic-data/index.html
index 28ec35377..434322d14 100644
--- a/modules/agency/front/basic-data/index.html
+++ b/modules/agency/front/basic-data/index.html
@@ -62,6 +62,9 @@
display-controls="false">
+
+
+
diff --git a/modules/agency/front/create/index.html b/modules/agency/front/create/index.html
index ac6b76efd..124c4e482 100644
--- a/modules/agency/front/create/index.html
+++ b/modules/agency/front/create/index.html
@@ -64,6 +64,9 @@
display-controls="false">
+
+
+
diff --git a/modules/agency/front/create/index.js b/modules/agency/front/create/index.js
index d10db3e3a..4aace46b7 100644
--- a/modules/agency/front/create/index.js
+++ b/modules/agency/front/create/index.js
@@ -6,8 +6,8 @@ export default class Controller {
this.$state = $state;
this.zone = {
travelingDays: 0,
- price: 0.50,
- bonus: 0.50,
+ price: 0.20,
+ bonus: 0.20,
hour: new Date()
};
}
diff --git a/modules/agency/front/locale/es.yml b/modules/agency/front/locale/es.yml
index 17ef3e09a..3e3efd03e 100644
--- a/modules/agency/front/locale/es.yml
+++ b/modules/agency/front/locale/es.yml
@@ -6,4 +6,5 @@ Locations: Localizaciones
Delete zone: Eliminar zona
Are you sure you want to delete this zone?: ¿Estás seguro de querer eliminar esta zona?
Zones: Zonas
-New zone: Nueva zona
\ No newline at end of file
+New zone: Nueva zona
+Volumetric: Volumétrico
\ No newline at end of file