changed isRaid to isVirtual, atenderFk to attenderFk

db/changes/10110-postCampaign/00-ticketRequest.sql

@@ -0,0 +1,86 @@
+USE `vn`;
+
+ALTER TABLE `vn`.`ticketRequest` 
+DROP FOREIGN KEY `fgnAtender`;
+ALTER TABLE `vn`.`ticketRequest` 
+CHANGE COLUMN `atenderFk` `attenderFk` INT(11) NULL DEFAULT NULL ;
+ALTER TABLE `vn`.`ticketRequest` 
+ADD CONSTRAINT `fgnAtender`
+  FOREIGN KEY (`attenderFk`)
+  REFERENCES `vn`.`worker` (`id`)
+  ON UPDATE CASCADE;
+
+USE `vn2008`;
+CREATE
+     OR REPLACE ALGORITHM = UNDEFINED
+    DEFINER = `root`@`%`
+    SQL SECURITY DEFINER
+VIEW `vn2008`.`Ordenes` AS
+    SELECT
+        `tr`.`id` AS `Id_ORDEN`,
+        `tr`.`description` AS `ORDEN`,
+        `tr`.`requesterFk` AS `requesterFk`,
+        `tr`.`attenderFk` AS `attenderFk`,
+        `tr`.`quantity` AS `CANTIDAD`,
+        `tr`.`itemFk` AS `Id_ARTICLE`,
+        `tr`.`price` AS `PRECIOMAX`,
+        `tr`.`isOk` AS `isOk`,
+        `tr`.`saleFk` AS `Id_Movimiento`,
+        `tr`.`ticketFk` AS `ticketFk`,
+        `tr`.`response` AS `COMENTARIO`,
+        `tr`.`created` AS `odbc_date`,
+        `tr`.`ordered` AS `datORDEN`,
+        `tr`.`shipped` AS `datTICKET`,
+        `tr`.`salesPersonCode` AS `CodVENDEDOR`,
+        `tr`.`buyerCode` AS `CodCOMPRADOR`,
+        `tr`.`price__` AS `PREU`,
+        `tr`.`clientFk` AS `Id_CLIENTE`,
+        `tr`.`ok__` AS `OK`,
+        `tr`.`total` AS `TOTAL`,
+        `tr`.`buyed` AS `datCOMPRA`,
+        `tr`.`ko__` AS `KO`
+    FROM
+        `vn`.`ticketRequest` `tr`;
+
+USE `vn`;
+
+DROP TRIGGER IF EXISTS `vn`.`ticketRequest_beforeInsert`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`ticketRequest_beforeInsert` BEFORE INSERT ON `ticketRequest` FOR EACH ROW
+BEGIN
+    IF NEW.ticketFk IS NULL THEN
+        SET NEW.ticketFk = (SELECT s.ticketFk FROM sale s WHERE s.id = NEW.saleFk);
+    END IF;
+
+    IF NEW.requesterFk IS NULL THEN
+        SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode);
+    END IF;
+
+    IF NEW.attenderFk IS NULL THEN
+        SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode);
+    END IF;
+END$$
+DELIMITER ; 
+
+
+DROP TRIGGER IF EXISTS `vn`.`ticketRequest_beforeUpdate`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`ticketRequest_beforeUpdate` BEFORE UPDATE ON `ticketRequest` FOR EACH ROW
+BEGIN
+    IF NEW.saleFk <> OLD.saleFk THEN
+        SET NEW.ticketFk = (SELECT s.ticketFk FROM sale s WHERE s.id = NEW.saleFk);
+    END IF;
+
+    IF NEW.salesPersonCode <> OLD.salesPersonCode THEN
+        SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode);
+    END IF;
+
+    IF NEW.buyerCode <> OLD.buyerCode THEN
+        SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode);
+    END IF;
+END$$
+DELIMITER ;

db/dump/fixtures.sql

@@ -1471,7 +1471,7 @@ INSERT INTO `vn2008`.`workerTeam`(`id`, `team`, `user`)
         (5, 3, 103),
         (6, 3, 104);
 
-INSERT INTO `vn`.`ticketRequest`(`id`, `description`, `requesterFk`, `atenderFk`, `quantity`, `itemFk`, `price`, `isOk`, `saleFk`, `ticketFk`, `created`)
+INSERT INTO `vn`.`ticketRequest`(`id`, `description`, `requesterFk`, `attenderFk`, `quantity`, `itemFk`, `price`, `isOk`, `saleFk`, `ticketFk`, `created`)
     VALUES
         (1, 'Ranged weapon longbow 2m',         18, 35, 5,  1,      9.10, 1,    1,      1,  DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
         (2, 'Melee weapon combat first 15cm',   18, 35, 10, 2,      1.07, 0,    NULL,   1,  DATE_ADD(CURDATE(), INTERVAL -15 DAY)),

modules/agency/front/location/index.html

@@ -15,7 +15,7 @@
         <vn-treeview vn-id="treeview" root-label="Locations"
             fetch-func="$ctrl.onFetch($item)"
             sort-func="$ctrl.onSort($a, $b)">
-            <vn-check
+            <vn-check acl-role="deliveryBoss"
                 ng-model="item.selected"
                 on-change="$ctrl.onSelection(value, item)" 
                 triple-state="true"

modules/ticket/back/methods/ticket-request/filter.js

@@ -76,7 +76,7 @@ module.exports = Self => {
             case 'ticketFk':
                 return {'t.id': value};
             case 'attenderFk':
-                return {'tr.atenderFk': value};
+                return {'tr.attenderFk': value};
             case 'isOk':
                 return {'tr.isOk': value};
             case 'clientFk':
@@ -106,7 +106,7 @@ module.exports = Self => {
                 tr.ticketFk,
                 tr.quantity,
                 tr.price,
-                tr.atenderFk attenderFk,
+                tr.attenderFk,
                 tr.description,
                 tr.response,
                 tr.saleFk,
@@ -131,7 +131,7 @@ module.exports = Self => {
                 LEFT JOIN sale s ON s.id = tr.saleFk
                 LEFT JOIN worker wk ON wk.id = c.salesPersonFk
                 LEFT JOIN account.user u ON u.id = wk.userFk
-                LEFT JOIN worker wka ON wka.id = tr.atenderFk
+                LEFT JOIN worker wka ON wka.id = tr.attenderFk
                 LEFT JOIN account.user ua ON ua.id = wka.userFk`);
         stmt.merge(conn.makeSuffix(filter));
 

modules/ticket/back/models/ticket-request.json

@@ -33,13 +33,6 @@
         "isOk": {
             "type": "Boolean"
         },
-        "attenderFk": {
-            "type": "Number",
-            "required": true,
-            "mysql": {
-                "columnName": "atenderFk"
-            }
-        },
         "response": {
             "type": "String"
         }

modules/travel/back/models/entry.json

@@ -30,8 +30,11 @@
         "isConfirmed": {
             "type": "Boolean"
         },
-        "isRaid": {
-            "type": "Boolean"
+        "isVirtual": {
+            "type": "Boolean",
+			"mysql": {
+				"columnName": "isRaid"
+			}
         },
         "commission": {
             "type": "Number"