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

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.

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 `hedera`.`orderGetTotal`()
-
-CREATE DEFINER=`root`@`%` PROCEDURE `orderGetTotal`()
 BEGIN
 /**
 * Calcula el total con IVA para un conjunto de orders.

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
+ * Obtiene los problemas de uno o varios tickets
-    *
+ *
-    * @table tmp.ticketGetProblems(ticketFk, clientFk, warehouseFk, shipped)
+ * @table tmp.ticketGetProblems(ticketFk, clientFk, warehouseFk, shipped)
-    * @return tmp.ticketProblems
+ * @return tmp.ticketProblems
-    */
+ */
     DECLARE vWarehouse INT;
     DECLARE vDate DATE;
     DECLARE vAvailableCache INT;

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;

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;

modules/agency/back/models/zone.json

@@ -30,6 +30,10 @@
 		"bonus": {
 			"type": "Number",
 			"required": true
+		},
+		"isVolumetric": {
+			"type": "Boolean",
+			"required": true
 		}
 	},
 	"relations": {

modules/agency/front/basic-data/index.html

@@ -62,6 +62,9 @@
                 display-controls="false">
             </vn-input-number> 
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-check field="$ctrl.zone.isVolumetric" label="Volumetric"></vn-check>
+        </vn-horizontal>
     </vn-card>
     <vn-button-bar>
         <vn-submit label="Save"></vn-submit>

modules/agency/front/create/index.html

@@ -64,6 +64,9 @@
                     display-controls="false">
                 </vn-input-number> 
             </vn-horizontal>
+            <vn-horizontal>
+                <vn-check field="$ctrl.zone.isVolumetric" label="Volumetric"></vn-check>
+            </vn-horizontal>
         </vn-card>
         <vn-button-bar>
             <vn-submit label="Create"></vn-submit>

modules/agency/front/create/index.js

@@ -6,8 +6,8 @@ export default class Controller {
         this.$state = $state;
         this.zone = {
             travelingDays: 0,
-            price: 0.50,
+            price: 0.20,
-            bonus: 0.50,
+            bonus: 0.20,
             hour: new Date()
         };
     }

modules/agency/front/locale/es.yml

@@ -7,3 +7,4 @@ 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
+Volumetric: Volumétrico