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

services/db/04-fixtures.sql

@@ -24,8 +24,6 @@ INSERT INTO `account`.`user`(`id`,`name`,`password`,`role`,`active`,`email`)
         (109,     'BruceBanner',        'ac754a330530832ba1bf7687f577da91', 2,   1, 'BruceBanner@verdnatura.es'),
         (110,    'JessicaJones',       'ac754a330530832ba1bf7687f577da91', 2,    1, 'JessicaJones@verdnatura.es');
 
-
-
  INSERT INTO `vn`.`worker`(`workerCode`, `id`, `firstName`, `name`, `userFk`)
     VALUES
         ('LGN', 106, 'David Charles',  'Haller', 106),
@@ -273,6 +271,12 @@ INSERT INTO `vn2008`.`empresa`(`id`, `abbreviation`, `registro`, `gerente_id`, `
         (9,  5, 5, NULL, CURDATE(), 105, 'Hulk', 109),
         (10, 6, 5, NULL, CURDATE(), 105, 'Jessica Jones', 110);
 
+INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
+    VALUES
+        ( 1, 1 , 1, 'ready' ),
+        ( 2, 2 , 2, 'do it fast please'),
+        ( 3, 3 , 3, '');
+
 INSERT INTO `vn`.`ticketTracking`(`id`, `ticketFk`, `stateFk`, `workerFk`, `created`)
     VALUES
         (1,  1,  1, 5, CURDATE()),
@@ -393,6 +397,24 @@ INSERT INTO `vn`.`item`(`id`, `name`,`typeFk`,`size`,`inkFk`,`category`,`stems`,
         (4, 'Mark I',           1, 60, 'AMR', 'EXT', 1, 1, 'Iron Mans first armor',         1, 05080000, 1, 2, 0, NULL, 0, 66090, 2),
         (5, 'Mjolnir',          3, 30, 'AZR', 'EXT', 1, 2, 'Thors hammer!',                 2, 06021010, 1, 2, 0, NULL, 0, 67350, 2);
 
+INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPackageReturnable`, `created`, `itemFk`, `price`)
+    VALUES
+        (1, 0.00,    10, 10, 0, 0, CURDATE(), 1, 1.50),
+        (2, 100.00,  20, 20, 0, 0, CURDATE(), 2, 1.00),
+        ('a', 50.00, 30, 30, 0, 1, CURDATE(), 3, 0.00);
+
+INSERT INTO `vn`.`ticketPackaging`(`id`, `ticketFk`, `packagingFk`, `quantity`, `created`, `pvp`)
+    VALUES
+        ( 1, 1, 1,   2, CURDATE(), NULL),
+        ( 2, 2, 2,   1, CURDATE(), NULL),
+        ( 3, 3, 'a', 4, CURDATE(), NULL);
+
+INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `price`, `discount`, `reserved`, `isPicked`, `created`)
+    VALUES
+        ( 1, 1, 1, 'Gem of Time', 5 , 1.5, 0, 0, 0, CURDATE()),
+        ( 2, 1, 1, 'Gem of Time', 2 , 1.5, 0, 0, 0, CURDATE()),
+        ( 3, 2, 2, 'Mjolnir'    , 10, 4  , 0, 0, 0, CURDATE());
+
 INSERT INTO `vn`.`itemBarcode`(`id`, `itemFk`, `code`)
     VALUES
         (1, 1 ,1 ),

services/db/changes/1.0.2/01-ACLinserts.sql

@@ -0,0 +1,9 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Ticket', '*', '*', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('TicketObservation', '*', '*', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Route', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Sale', '*', '*', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('TicketTracking', '*', '*', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('TicketState', '*', '*', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('TicketPackaging', '*', '*', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Packaging', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Packaging', '*', 'WRITE', 'ALLOW', 'ROLE', 'logistic');

services/db/changes/1.0.2/02-packaging.sql

@@ -0,0 +1,18 @@
+USE `vn`;
+CREATE 
+     OR REPLACE ALGORITHM = UNDEFINED 
+    DEFINER = `root`@`%` 
+    SQL SECURITY DEFINER
+VIEW `vn`.`packaging` AS
+    SELECT 
+        `c`.`Id_Cubo` AS `id`,
+        `c`.`Volumen` AS `volume`,
+        `c`.`X` AS `width`,
+        `c`.`Y` AS `height`,
+        `c`.`Z` AS `depth`,
+        `c`.`Retornable` AS `isPackageReturnable`,
+        `c`.`odbc_date` AS `created`,
+        `c`.`item_id` AS `itemFk`,
+        `c`.`pvp` AS `price`
+    FROM
+        `vn2008`.`Cubos` `c`;

services/db/export-structure.cmd

@@ -1,2 +1,2 @@
 
-mysqldump --defaults-file=connect.ini --default-character-set=utf8 --no-data --triggers --routines --events --databases account util vn2008 vn edi bs bi pbx cache salix vncontrol hedera > 01-structure.sql
+mysqldump --defaults-file=connect.ini --default-character-set=utf8 --no-data --triggers --routines --events --databases account util vn2008 vn edi bs bi pbx cache salix vncontrol hedera stock > 01-structure.sql

services/loopback/common/methods/ticket/list.js

@@ -1,13 +1,6 @@
 module.exports = function(Ticket) {
     Ticket.remoteMethod('list', {
         description: 'List tickets for production',
-        /* accepts: {
-            arg: 'id',
-            type: 'number',
-            required: true,
-            description: 'Model id',
-            http: {source: 'path'}
-        },*/
         returns: {
             arg: 'tickets',
             type: 'object'
@@ -19,19 +12,8 @@ module.exports = function(Ticket) {
     });
 
     Ticket.list = function(cb) {
-        // list();
-    };
-
-    function list() {
         var params = [1, 0];
-
         var query = 'CALL production_control_source(?, ?)';
-
-        var cb = function(error, res) {
-            if (error) console.log(error);
-            else console.log(res);
-        };
-
         Ticket.rawSql(query, params, cb);
     };
 };

services/loopback/common/models/ticket.json

@@ -0,0 +1,76 @@
+{
+    "name": "Ticket",
+    "base": "VnModel",
+    "options": {
+      "mysql": {
+        "table": "ticket"
+      }
+    },
+    "properties": {
+      "id": {
+        "id": true,
+        "type": "Number",
+        "description": "Identifier"
+      },
+      "shipped": {
+        "type": "date",
+        "required": true
+      },
+      "landed": {
+        "type": "date"
+      },
+      "nickname": {
+        "type": "String"
+      },
+      "location": {
+        "type": "String"
+      },
+      "solution": {
+        "type": "String"
+      },
+      "packages": {
+        "type": "Number"
+      },
+      "created": {
+        "type": "date"
+      }
+    },
+    "relations": {
+      "client": {
+        "type": "belongsTo",
+        "model": "Client",
+        "foreignKey": "clientFk"
+      },
+      "warehouse": {
+        "type": "belongsTo",
+        "model": "Warehouse",
+        "foreignKey": "warehouseFk"
+      },
+      "invoiceOut": {
+        "type": "belongsTo",
+        "model": "InvoiceOut",
+        "foreignKey": "refFk"
+      },
+      "address": {
+        "type": "belongsTo",
+        "model": "Address",
+        "foreignKey": "addressFk"
+      },
+      "route": {
+        "type": "belongsTo",
+        "model": "Route",
+        "foreignKey": "routeFk"
+      },
+      "company": {
+        "type": "belongsTo",
+        "model": "Company",
+        "foreignKey": "companyFk"
+      },
+      "agencyMode": {
+        "type": "belongsTo",
+        "model": "AgencyMode",
+        "foreignKey": "agencyModeFk",
+        "required": true
+      }
+    }
+  }

services/loopback/server/model-config.json

@@ -56,5 +56,17 @@
   },
   "Worker": {
     "dataSource": "vn"
-  }
+  },
+  "Ticket": {
+    "dataSource": "vn"
+  },
+  "Route": {
+    "dataSource": "vn"
+  },
+  "State":{
+    "dataSource": "vn"
+  },
+  "TicketState":{
+    "dataSource": "vn"
+  } 
 }

services/production/common/models/ticket.json

@@ -1,19 +0,0 @@
-{
-    "name": "Ticket",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-          "table": "ticket"
-        }
-    },
-    "properties": {
-        "id": {
-            "id": true,
-            "type": "Number",
-            "forceId": false
-        },
-        "shipped": {
-            "type": "date"
-        }
-    }
-}

services/production/server/model-config.json

@@ -7,20 +7,5 @@
   },
   "MessageInbox": {
     "dataSource": "vn"
-  },
-  "Route": {
-    "dataSource": "vn"
-  },
-  "State":{
-    "dataSource": "vn"
-  },
-  "Ticket": {
-    "dataSource": "vn"
-  },
-  "TicketState":{
-    "dataSource": "vn"
-  },
-  "TicketTracking": {
-    "dataSource": "vn"
   }
 }

services/ticket/Dockerfile

@@ -0,0 +1,12 @@
+FROM node:8.9.4
+
+COPY ticket /app
+COPY loopback /loopback
+
+WORKDIR /app
+ 
+RUN npm install  
+RUN npm -g install pm2
+
+CMD ["pm2-docker", "./server/server.js"]
+

services/ticket/common/models/observationType.json

@@ -0,0 +1,28 @@
+{
+    "name": "ObservationType",
+    "base": "VnModel",
+    "options": {
+      "mysql": {
+        "table": "observationType"
+      }
+    },
+    "properties": {
+      "id": {
+        "id": true,
+        "type": "Number",
+        "description": "Identifier"
+      },
+      "description": {
+        "type": "String",
+        "required": true
+      }
+  },
+  "acls": [
+    {
+      "accessType": "READ",
+      "principalType": "ROLE",
+      "principalId": "$everyone",
+      "permission": "ALLOW"
+    }
+  ]
+}

services/ticket/common/models/packaging.json

@@ -0,0 +1,45 @@
+{
+    "name": "Packaging",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "packaging"
+        }
+    },
+    "properties": {
+      "id": {
+        "id": true,
+        "type": "Number",
+        "description": "Identifier"
+      },
+      "volume": {
+        "type": "Number"
+      },
+      "X": {
+        "type": "Date"
+      },
+      "Y": {
+        "type": "Number"
+      },
+      "Z": {
+        "type": "Number"
+      },
+      "isPackageReturnable": {
+        "type": "Number"
+      },
+      "created": {
+        "type": "Date"
+      },
+      "price": {
+        "type": "Number"
+      }
+    },
+    "relations": {
+      "item": {
+        "type": "belongsTo",
+        "model": "Iicket",
+        "foreignKey": "itemFk"
+      }
+    }
+  }
+  

services/ticket/common/models/sale.json

@@ -0,0 +1,51 @@
+{
+    "name": "Sale",
+    "base": "VnModel",
+    "options": {
+      "mysql": {
+        "table": "sale"
+      }
+    },
+    "properties": {
+      "id": {
+        "id": true,
+        "type": "Number",
+        "description": "Identifier"
+      },
+      "concept": {
+        "type": "String"
+      },
+      "quantity": {
+        "type": "Number"
+      },
+      "price": {
+        "type": "Number"
+      },
+      "discount": {
+        "type": "Number"
+      },
+      "reserved": {
+        "type": "Number"
+      },
+      "isPicked": {
+        "type": "Number"
+      },
+      "created": {
+        "type": "date"
+      }
+  },
+  "relations": {
+    "item": {
+      "type": "belongsTo",
+      "model": "Item",
+      "foreignKey": "itemFk",
+      "required": true
+    },
+    "ticket": {
+      "type": "belongsTo",
+      "model": "Ticket",
+      "foreignKey": "ticketFk",
+      "required": true
+    }
+  }
+}

services/ticket/common/models/ticketObservation.json

@@ -0,0 +1,34 @@
+{
+    "name": "TicketObservation",
+    "base": "VnModel",
+    "options": {
+      "mysql": {
+        "table": "ticketObservation"
+      }
+    },
+    "properties": {
+      "id": {
+        "id": true,
+        "type": "Number",
+        "description": "Identifier"
+      },
+      "description": {
+        "type": "String",
+        "required": true
+      }
+    },
+    "relations": {
+      "ticket": {
+        "type": "belongsTo",
+        "model": "Ticket",
+        "foreignKey": "ticketFk",
+        "required": true
+      },
+      "observationType": {
+        "type": "belongsTo",
+        "model": "ObservationType",
+        "foreignKey": "observationTypeFk",
+        "required": true
+      }
+    }
+  }

services/ticket/common/models/ticketPackaging.json

@@ -0,0 +1,38 @@
+{
+    "name": "TicketPackaging",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "ticketPackaging"
+        }
+    },
+    "properties": {
+      "id": {
+        "id": true,
+        "type": "Number",
+        "description": "Identifier"
+      },
+      "quantity": {
+        "type": "Number"
+      },
+      "created": {
+        "type": "Date"
+      },
+      "pvp": {
+        "type": "Number"
+      }
+    },
+    "relations": {
+      "ticket": {
+        "type": "belongsTo",
+        "model": "Ticket",
+        "foreignKey": "ticketFk"
+      },
+      "packaging": {
+        "type": "belongsTo",
+        "model": "Packaging",
+        "foreignKey": "packagingFk"
+      }
+    }
+  }
+  

services/ticket/common/models/ticketTracking.json

@@ -30,7 +30,7 @@
       },
       "worker": {
         "type": "belongsTo",
-        "model": "worker",
+        "model": "Worker",
         "foreignKey": "workerFk"
       }
     }

services/ticket/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "vn-ticket",
+  "version": "1.0.0",
+  "main": "server/server.js",
+  "scripts": {
+    "lint": "eslint .",
+    "start": "node .",
+    "posttest": "npm run lint && nsp check"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://git.verdnatura.es/salix"
+  },
+  "license": "GPL-3.0",
+  "description": "vn-ticket"
+}

services/ticket/server/model-config.json

@@ -0,0 +1,20 @@
+{
+  "TicketObservation": {
+    "dataSource": "vn"
+  },
+  "ObservationType": {
+    "dataSource": "vn"
+  },
+  "Sale": {
+    "dataSource": "vn"
+  },
+  "TicketTracking": {
+    "dataSource": "vn"
+  },
+  "TicketPackaging": {
+    "dataSource": "vn"
+  },
+  "Packaging": {
+    "dataSource": "vn"
+  }
+} 

services/ticket/server/server.js

@@ -0,0 +1,5 @@
+
+var vnLoopback = require('../../loopback/server/server.js');
+
+var app = module.exports = vnLoopback.loopback();
+vnLoopback.boot(app, __dirname, module);