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

2018-03-12 19:38:12 +01:00 · 2018-03-12 19:38:12 +01:00 · 2b9d89ab20
parent 23e3e4bf36 6b1ad875cb
commit 2b9d89ab20
46 changed files with 1787 additions and 360 deletions
--- a/client/modules.yml
+++ b/client/modules.yml
@ -6,3 +6,4 @@ locator: []
 production: []
 salix: []
 route: []
+ticket: []
--- a/client/spliting.js
+++ b/client/spliting.js
@ -8,5 +8,7 @@ export default {
    locator:
        cb => require.ensure([], () => cb(require('locator'))),
    item:
-        cb => require.ensure([], () => cb(require('item')))
+        cb => require.ensure([], () => cb(require('item'))),
+    ticket:
+        cb => require.ensure([], () => cb(require('ticket')))
 };
--- a/client/ticket/index.js
+++ b/client/ticket/index.js
@ -0,0 +1 @@
+export * from './src/ticket';
--- a/client/ticket/routes.json
+++ b/client/ticket/routes.json
@ -0,0 +1,14 @@
+{
+    "module": "ticket",
+    "name": "Tickets",
+    "icon": "receipt",
+    "validations": false,
+    "routes": [
+        {
+            "url": "/tickets",
+            "state": "tickets",
+            "component": "vn-ticket-index",
+            "acl": ["developer"]
+        }
+    ]
+}
--- a/client/ticket/src/index/index.html
+++ b/client/ticket/src/index/index.html
@ -0,0 +1,24 @@
+<mg-ajax path="/client/api/Clients/filter" options="mgIndex"></mg-ajax>
+<div margin-medium>
+    <div class="vn-list">
+        <vn-card>
+            <vn-horizontal pad-medium>
+                <vn-searchbar vn-one
+                    index="index"
+                    on-search="$ctrl.search(index)"
+                    ignore-keys = "['page', 'size', 'search']">
+                </vn-searchbar>
+            </vn-horizontal>
+        </vn-card>
+        <vn-card margin-medium-top>
+            <vn-ticket-item
+                ng-repeat="ticket in index.model.instances"
+                ticket="ticket">
+            </vn-ticket-item>
+        </vn-card>
+        <vn-paging index="index" total="index.model.count"></vn-paging>
+    </div>
+</div>
+<a ui-sref="create" fixed-bottom-right>
+    <vn-float-button icon="person_add"></vn-float-button>
+</a>
--- a/client/ticket/src/index/index.js
+++ b/client/ticket/src/index/index.js
@ -0,0 +1,14 @@
+import ngModule from '../module';
+import './item';
+
+export default class Controller {
+    search(index) {
+        index.accept();
+    }
+}
+Controller.$inject = [];
+
+ngModule.component('vnTicketIndex', {
+    template: require('./index.html'),
+    controller: Controller
+});
--- a/client/ticket/src/index/item.html
+++ b/client/ticket/src/index/item.html
@ -0,0 +1,17 @@
+<a
+    ui-sref="clientCard.basicData({ id: {{::$ctrl.ticket.id}} })"
+    translate-attr="{title: 'View client'}"
+    class="vn-list-item">
+    <vn-horizontal ng-click="$ctrl.onClick($event)">
+        <vn-one>
+            <h6>{{::$ctrl.ticket.name}}</h6>
+            <div><vn-label translate>Id</vn-label> {{::$ctrl.ticket.id}}</div>
+        </vn-one>
+        <vn-horizontal class="buttons">
+            <vn-icon
+                vn-tooltip="Preview"
+                icon="icon-preview">
+            </vn-icon>
+        </vn-horizontal>
+    </vn-horizontal>
+</a>
--- a/client/ticket/src/index/item.js
+++ b/client/ticket/src/index/item.js
@ -0,0 +1,20 @@
+import ngModule from '../module';
+
+class Controller {
+    onClick(event) {
+        if (event.defaultPrevented)
+            event.stopImmediatePropagation();
+    }
+
+    preview(event) {
+        event.preventDefault();
+    }
+}
+
+ngModule.component('vnTicketItem', {
+    controller: Controller,
+    template: require('./item.html'),
+    bindings: {
+        ticket: '<'
+    }
+});
--- a/client/ticket/src/index/style.scss
+++ b/client/ticket/src/index/style.scss
@ -0,0 +1,3 @@
+vn-ticket-item {
+    display: block;
+}
--- a/client/ticket/src/locale/en.yml
+++ b/client/ticket/src/locale/en.yml
@ -0,0 +1 @@
+Tickets: Tickets
--- a/client/ticket/src/locale/es.yml
+++ b/client/ticket/src/locale/es.yml
@ -0,0 +1 @@
+Tickets: Tickets
--- a/client/ticket/src/module.js
+++ b/client/ticket/src/module.js
@ -0,0 +1,5 @@
+import {ng} from 'vendor';
+import 'core';
+
+const ngModule = ng.module('ticket', ['vnCore']);
+export default ngModule;
--- a/client/ticket/src/ticket.js
+++ b/client/ticket/src/ticket.js
@ -0,0 +1,4 @@
+export * from './module';
+
+import './index/index';
+
--- a/services/db/01-structure.sql
+++ b/services/db/01-structure.sql
--- a/services/db/04-fixtures.sql
+++ b/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 ),
--- a/services/db/changes/1.0.2/01-ACLinserts.sql
+++ b/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');
--- a/services/db/changes/1.0.2/02-packaging.sql
+++ b/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`;
--- a/services/db/export-structure.cmd
+++ b/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
--- a/services/production/common/methods/state/list.js
+++ b/services/production/common/methods/state/list.js
--- a/services/production/common/methods/ticket-state/change-state.js
+++ b/services/production/common/methods/ticket-state/change-state.js
--- a/services/production/common/methods/ticket/change-time.js
+++ b/services/production/common/methods/ticket/change-time.js
--- a/services/production/common/methods/ticket/change-worker.js
+++ b/services/production/common/methods/ticket/change-worker.js
--- a/services/production/common/methods/ticket/list.js
+++ b/services/production/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);
    };
 };
--- a/services/loopback/common/models/client.js
+++ b/services/loopback/common/models/client.js
@ -50,10 +50,22 @@ module.exports = function(Self) {
        allowBlank: true
    });

-    let validateDni = require('../validations/validateDni');
-    Self.validateBinded('fi', validateDni, {
+    Self.validateAsync('fi', fiIsValid, {
        message: 'DNI Incorrecto'
    });
+    let validateDni = require('../validations/validateDni');
+    async function fiIsValid(err, done) {
+        let filter = {
+            fields: ['code'],
+            where: {id: this.countryFk}
+        };
+        let country = await Self.app.models.Country.findOne(filter);
+        let code = country ? country.code.toLowerCase() : null;
+
+        if (!validateDni(this.fi, code))
+            err();
+        done();
+    }

    Self.validate('payMethod', hasSalesMan, {
        message: 'No se puede cambiar la forma de pago si no hay comercial asignado'
--- a/services/production/common/models/route.json
+++ b/services/production/common/models/route.json
--- a/services/production/common/models/state.js
+++ b/services/production/common/models/state.js
--- a/services/production/common/models/state.json
+++ b/services/production/common/models/state.json
--- a/services/production/common/models/ticket-state.js
+++ b/services/production/common/models/ticket-state.js
--- a/services/production/common/models/ticket-state.json
+++ b/services/production/common/models/ticket-state.json
--- a/services/production/common/models/ticket.js
+++ b/services/production/common/models/ticket.js
--- a/services/loopback/common/models/ticket.json
+++ b/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
+      }
+    }
+  }
--- a/services/loopback/common/validations/specs/validateDni.spec.js
+++ b/services/loopback/common/validations/specs/validateDni.spec.js
@ -14,7 +14,7 @@ describe('DNI validation', () => {
            expect(isValid).toBeTruthy();
        });

-        it('should return true for spanish DNI with exceeded digits', () => {
+        it('should return false for spanish DNI with exceeded digits', () => {
            let isValid = validateDni('208497563239A');

            expect(isValid).toBeFalsy();
@ -41,19 +41,19 @@ describe('DNI validation', () => {

    describe('French', () => {
        it('should return true for valid french DNI', () => {
-            let isValid = validateDni('FR1B123456789');
+            let isValid = validateDni('1B123456789', 'fr');

            expect(isValid).toBeTruthy();
        });

-        it('should return true for french DNI with exceeded digits', () => {
-            let isValid = validateDni('FR1B12345678910');
+        it('should return false for french DNI with exceeded digits', () => {
+            let isValid = validateDni('1B12345678910', 'fr');

            expect(isValid).toBeFalsy();
        });

-        it('should return true for french DNI with bad syntax', () => {
-            let isValid = validateDni('FR1B12345678A');
+        it('should return false for french DNI with bad syntax', () => {
+            let isValid = validateDni('1B12345678A', 'fr');

            expect(isValid).toBeFalsy();
        });
@ -61,19 +61,19 @@ describe('DNI validation', () => {

    describe('Italian', () => {
        it('should return true for valid italian DNI', () => {
-            let isValid = validateDni('IT12345678911');
+            let isValid = validateDni('12345678911', 'it');

            expect(isValid).toBeTruthy();
        });

-        it('should return true for italian DNI with exceeded digits', () => {
-            let isValid = validateDni('IT123456789112');
+        it('should return false for italian DNI with exceeded digits', () => {
+            let isValid = validateDni('123456789112', 'it');

            expect(isValid).toBeFalsy();
        });

-        it('should return true for italian DNI with bad syntax', () => {
-            let isValid = validateDni('IT1234567891A');
+        it('should return false for italian DNI with bad syntax', () => {
+            let isValid = validateDni('1234567891A', 'it');

            expect(isValid).toBeFalsy();
        });
@ -81,19 +81,19 @@ describe('DNI validation', () => {

    describe('Portuguese', () => {
        it('should return true for valid portuguese DNI', () => {
-            let isValid = validateDni('PT123456789');
+            let isValid = validateDni('123456789', 'pt');

            expect(isValid).toBeTruthy();
        });

-        it('should return true for portuguese DNI with exceeded digits', () => {
-            let isValid = validateDni('PT12345678910');
+        it('should return false for portuguese DNI with exceeded digits', () => {
+            let isValid = validateDni('12345678910', 'pt');

            expect(isValid).toBeFalsy();
        });

-        it('should return true for portuguese DNI with bad syntax', () => {
-            let isValid = validateDni('PT12345678A');
+        it('should return false for portuguese DNI with bad syntax', () => {
+            let isValid = validateDni('12345678A', 'pt');

            expect(isValid).toBeFalsy();
        });
--- a/services/loopback/common/validations/validateDni.js
+++ b/services/loopback/common/validations/validateDni.js
@ -1,14 +1,10 @@
-module.exports = function(fiWithCountry) {
-    if (fiWithCountry == null) return true;
-    if (typeof fiWithCountry != 'string') return false;
+module.exports = function(fi, country) {
+    if (fi == null) return true;
+    if (typeof fi != 'string') return false;

-    fiWithCountry = fiWithCountry.toUpperCase();
+    fi = fi.toUpperCase();
+    country = country ? country.toLowerCase() : 'es';

-    if (!/^[A-Z]{2}/.test(fiWithCountry))
-        fiWithCountry = `ES${fiWithCountry}`;
-
-    let country = fiWithCountry.substring(0, 2).toLowerCase();
-    let fi = fiWithCountry.substring(2);
    let len = fi.length;

    let validators = {
@ -38,7 +34,7 @@ module.exports = function(fiWithCountry) {

                    let sum = (pairSum + oddSum).toString();
                    let units = parseInt(sum.charAt(sum.length - 1));
-                    let control = units != 0 ? 10 - units : 0;
+                    let control = units == 0 ? 0 : 10 - units;
                    let index = 'JABCDEFGHI'.indexOf(lastDigit);
                    computedDigit = index == -1 ? control.toString() : index;
                } else {
@ -67,7 +63,7 @@ module.exports = function(fiWithCountry) {
    let validator = validators[country];

    if (!validator)
-        return false;
+        return true;

    return validator.regExp.test(fi)
        && (!validator.validate || validator.validate());
--- a/services/loopback/server/model-config.json
+++ b/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"
+  } 
 }
--- a/services/production/common/models/ticket.json
+++ b/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"
-        }
-    }
-}
--- a/services/production/server/model-config.json
+++ b/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"
  }
 }
--- a/services/ticket/Dockerfile
+++ b/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"]
+
--- a/services/ticket/common/models/observationType.json
+++ b/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"
+    }
+  ]
+}
--- a/services/ticket/common/models/packaging.json
+++ b/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"
+      }
+    }
+  }
+  
--- a/services/ticket/common/models/sale.json
+++ b/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
+    }
+  }
+}
--- a/services/ticket/common/models/ticketObservation.json
+++ b/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
+      }
+    }
+  }
--- a/services/ticket/common/models/ticketPackaging.json
+++ b/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"
+      }
+    }
+  }
+  
--- a/services/production/common/models/ticket-tracking.json
+++ b/services/production/common/models/ticket-tracking.json
@ -30,7 +30,7 @@
      },
      "worker": {
        "type": "belongsTo",
-        "model": "worker",
+        "model": "Worker",
        "foreignKey": "workerFk"
      }
    }
--- a/services/ticket/package.json
+++ b/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"
+}
--- a/services/ticket/server/model-config.json
+++ b/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"
+  }
+} 
--- a/services/ticket/server/server.js
+++ b/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);