From 54ee27dcef7d3463cf8b4d48094a821677e619e0 Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:17:50 +0200 Subject: [PATCH 01/16] Tarea #355, Tarea #354, Tarea #352 SALE --- client/ticket/src/sale/index.html | 122 ++++++++++++++++++--------- client/ticket/src/sale/index.js | 111 +++++++++++++++++------- client/ticket/src/sale/locale/es.yml | 5 ++ client/ticket/src/sale/style.scss | 51 ++++++++++- 4 files changed, 213 insertions(+), 76 deletions(-) diff --git a/client/ticket/src/sale/index.html b/client/ticket/src/sale/index.html index 9e7c48f49..74d8e7782 100644 --- a/client/ticket/src/sale/index.html +++ b/client/ticket/src/sale/index.html @@ -73,27 +73,36 @@ {{::sale.itemFk}} - {{sale.quantity}} - - {{sale.price | currency:'€':2}} - {{sale.discount}} % - {{sale.quantity * sale.price | currency:'€':2}} - + + + {{sale.price | currency:'€':2}} + + + {{sale.price | currency:'€':2}} + + + {{sale.discount}} % + + + {{sale.discount}} % + + {{(sale.quantity * sale.price) - ((sale.discount * (sale.quantity * sale.price))/100) | currency:' €':2}} No results @@ -166,35 +175,66 @@ - - + + -
MANÁ: {{$ctrl.workerMana}}
+
MANÁ: {{$ctrl.mana | currency:' €':0}}
-
{{$ctrl.client.name}}
- - + model="$ctrl.editedPrice" + type="number" + on-change="$ctrl.updatePrice()"> + + € + - - - - +
+

New price

+

{{($ctrl.sale.quantity * $ctrl.sale.price) + - (($ctrl.sale.discount * ($ctrl.sale.quantity * $ctrl.editedPrice))/100) + | currency:' €':2}}

+ + +
+ + + + + + + + + + + + + +
@@ -232,11 +272,11 @@ ng-click="$ctrl.moveLines($ctrl.moveToTicketFk)"> - + ng-click="$ctrl.linesToNewTicket()"> +
diff --git a/client/ticket/src/sale/index.js b/client/ticket/src/sale/index.js index 29532e771..2369ca25e 100644 --- a/client/ticket/src/sale/index.js +++ b/client/ticket/src/sale/index.js @@ -3,15 +3,17 @@ import FilterTicketList from '../filter-ticket-list'; import './style.scss'; class Controller extends FilterTicketList { - constructor($scope, $timeout, $stateParams, $http, $state, vnApp) { + constructor($scope, $timeout, $stateParams, $http, vnApp, $translate) { super($scope, $timeout, $stateParams); this.$ = $scope; this.vnApp = vnApp; + this.translate = $translate; this.$timeout = $timeout; this.onOrder('itemFk', 'ASC'); this.$state = $stateParams; this.$http = $http; this.deletable = false; + this.edit = {}; this.moreOptions = [ {callback: this.showAddTurnDialog, name: "Add turn"}, {callback: this.showDeleteTicketDialog, name: "Delete ticket"} @@ -28,7 +30,7 @@ class Controller extends FilterTicketList { this.subTotal = 0.00; sales.forEach(sale => { - this.subTotal += sale.quantity * sale.price; + this.subTotal += (sale.quantity * sale.price) - ((sale.discount * (sale.quantity * sale.price)) / 100); }); } @@ -87,7 +89,7 @@ class Controller extends FilterTicketList { let params = {ticketFk: this.$state.params.id, stateFk: value}; this.$http.post(`/ticket/api/TicketTrackings/changeState`, params).then(() => { this.card.reload(); - this.vnApp.showMessage(this.translate.instant('Data saved')); + this.vnApp.showSuccess(this.translate.instant('Data saved!')); }); } @@ -150,12 +152,22 @@ class Controller extends FilterTicketList { }); } - /* newTicket() { - let params = [this.ticket.clientFk, this.ticket.warehouseFk, this.ticket.companyFk, this.ticket.addressFk, this.ticket.agencyModeFk, null]; - this.$http.post(`/ticket/api/Tickets/create`, params).then(res => { - console.log(res); + // In Progress + linesToNewTicket() { + let ticket = { + oldTicketFk: this.ticket.id, + clientFk: this.ticket.clientFk, + addressFk: this.ticket.addressFk, + agencyModeFk: this.ticket.agencyModeFk, + warehouseFk: this.ticket.warehouseFk + }; + + let sales = this.getCheckedLines(); + + this.$http.post(`/api/Sales/MoveToNewTicket`, {ticket: ticket, sales: sales}).then(res => { + this.goToTicket(res.data.id); }); - }*/ + } goToTicket(ticketID) { this.$state.go("ticket.card.sale", {id: ticketID}); @@ -166,6 +178,12 @@ class Controller extends FilterTicketList { this.$.index.model.instances.splice(instances[i].instance, 1); } } + // Slesperson Mana + getManaSalespersonMana() { + this.$http.get(`/api/Tickets/${this.$state.params.id}/getSalesPersonMana`).then(res => { + this.mana = res.data; + }); + } // Item Descriptor showDescriptor(event, itemFk) { this.$.descriptor.itemFk = itemFk; @@ -177,39 +195,65 @@ class Controller extends FilterTicketList { this.$.popover.relocate(); } - // Ticket Create - showticketCreate() { - console.log(this); - this.$.newTicket.show(); + // Edit Line + showEditPricePopover(event, sale) { + this.sale = sale; + this.editedPrice = this.sale.price; + this.edit = { + ticketFk: this.ticket.id, + id: sale.id, + quantity: sale.quantity + }; + this.$.editPricePopover.parent = event.target; + this.$.editPricePopover.show(); } - onResponse(response) { - if (response === 'ACCEPT') { - let newTicketID = this.$.newTicket.dialog.createTicket(); - console.log(newTicketID); + updatePrice() { + if (this.editedPrice != this.sale.price) { + this.$http.post(`/ticket/api/Sales/updatePrice`, {id: this.edit.id, price: this.editedPrice, ticketFk: this.ticket.id}).then(() => { + this.sale.price = this.edit.price; + this.$.index.accept(); + }); } - } - // Edit Line - _getworkerMana() { - this.$http.get(`/api/WorkerManas/getCurrentWorkerMana`).then(res => { - this.workerMana = res.data[0].mana; - }); + this.$.editPricePopover.hide(); } showEditPopover(event, sale) { this.sale = sale; - this.edit = { + this.edit = [{ + ticketFk: this.ticket.id, id: sale.id, quantity: sale.quantity, price: sale.price, discount: sale.discount - }; - this.$.edit.parent = event.target; - this._getworkerMana(); - this.$.edit.show(); + }]; + this.$.editPopover.parent = event.target; + this.$.editPopover.show(); } - updateLine() { + async showEditDialog() { + this.edit = this.getCheckedLines(); + this.$.editDialog.show(); + } + + hideEditDialog() { + this.$.index.accept(); + this.$.editDialog.hide(); + } + + hideEditPopover() { + this.$.index.accept(); + this.$.editPopover.hide(); + } + + updateQuantity(id, quantity) { + this.$http.post(`/ticket/api/Sales/${id}/updateQuantity`, {quantity: parseInt(quantity)}).then(() => { + this.vnApp.showSuccess(this.translate.instant('Data saved!')); + this.$.index.accept(); + }); + } + + /* updateLine() { if (this.edit.quantity != this.sale.quantity) { this.$http.post(`/ticket/api/Sales/updateQuantity`, {id: this.edit.id, quantity: this.edit.quantity}).then(() => { this.sale.quantity = this.edit.quantity; @@ -228,12 +272,12 @@ class Controller extends FilterTicketList { }); } this.$.edit.hide(); - } + }*/ onMoreClick() { this.removeOptionByName('Mark as reserved'); this.removeOptionByName('Unmark as reserved'); - + this.removeOptionByName('Update discount'); if (!this.isChecked) return; this.moreOptions.push({ @@ -245,6 +289,11 @@ class Controller extends FilterTicketList { callback: this.unmarkAsReserved, name: 'Unmark as reserved'} ); + + this.moreOptions.push({ + callback: this.showEditDialog, + name: 'Update discount'} + ); } /** @@ -294,7 +343,7 @@ class Controller extends FilterTicketList { } } -Controller.$inject = ['$scope', '$timeout', '$state', '$http', 'vnApp']; +Controller.$inject = ['$scope', '$timeout', '$state', '$http', 'vnApp', '$translate']; ngModule.component('vnTicketSale', { template: require('./index.html'), diff --git a/client/ticket/src/sale/locale/es.yml b/client/ticket/src/sale/locale/es.yml index 6860c643b..727be3a78 100644 --- a/client/ticket/src/sale/locale/es.yml +++ b/client/ticket/src/sale/locale/es.yml @@ -4,3 +4,8 @@ Delete ticket: Borrar ticket Mark as reserved: Marcar como reservado Unmark as reserved: Desmarcar como reservado Update discount: Actualizar descuento +There is no changes to save: No hay cambios que guardar +Edit discount: Editar descuento +Move to ticket: Mover a ticket +New ticket: Nuevo ticket +Edit price: Editar precio \ No newline at end of file diff --git a/client/ticket/src/sale/style.scss b/client/ticket/src/sale/style.scss index 83d73bb2a..24cce9966 100644 --- a/client/ticket/src/sale/style.scss +++ b/client/ticket/src/sale/style.scss @@ -1,19 +1,47 @@ @import "colors"; vn-popover.edit { - & div.popover{ width: 200px; } & vn-horizontal.header{ background-color: $main-01; - text-align: center; - & h5{ color: white; + margin: 0 auto; } } + + & p.simulatorTitle{ + margin-bottom: 0px; + font-size: 12px; + color: $main-01; + } + + & vn-label-value{ + padding-bottom: 20px; + } + + div.simulator{ + text-align: center; + } +} + +vn-dialog.edit { + @extend vn-popover.edit; + + .buttons{ + margin-top: 0!important; + } + + p{ + display: none; + } + + vn-ticket-sale-edit-discount > div { + padding-bottom: 0!important; + } } vn-ticket-sale{ @@ -28,7 +56,7 @@ vn-popover.transfer{ min-width: 650px; margin-bottom: 10px; } - & i { + & i { padding-top: 0.2em; font-size: 1.8em; } @@ -41,4 +69,19 @@ vn-dialog.ticket-create{ & vn-card.vn-ticket-create{ padding: 0!important; } +} + +table { + & vn-textfield { + max-width: 100px; + float: right; + } +} + +vn-textfield { + & span.filter { + padding-top: 3px; + padding-right: 3px; + color: $main-font-color + } } \ No newline at end of file From accd66f63af145c6ed0b95395a360d86bf20c5dc Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:21:04 +0200 Subject: [PATCH 02/16] Tarea #352 ticket.lines Modificar descuento --- client/ticket/src/sale/editDiscount.html | 24 +++++ client/ticket/src/sale/editDiscount.js | 71 +++++++++++++++ client/ticket/src/sale/editDiscount.spec.js | 89 +++++++++++++++++++ .../common/methods/sale/updateDiscount.js | 62 +++++++++++++ services/loopback/common/models/sale.js | 7 +- 5 files changed, 250 insertions(+), 3 deletions(-) create mode 100644 client/ticket/src/sale/editDiscount.html create mode 100644 client/ticket/src/sale/editDiscount.js create mode 100644 client/ticket/src/sale/editDiscount.spec.js create mode 100644 services/loopback/common/methods/sale/updateDiscount.js diff --git a/client/ticket/src/sale/editDiscount.html b/client/ticket/src/sale/editDiscount.html new file mode 100644 index 000000000..c6d7e34cd --- /dev/null +++ b/client/ticket/src/sale/editDiscount.html @@ -0,0 +1,24 @@ + +
MANÁ: {{$ctrl.mana | currency:' €':0}}
+ +
+ + + % + + +
+

New price

+

{{($ctrl.edit[0].quantity * $ctrl.edit[0].price) + - (($ctrl.newDiscount * ($ctrl.edit[0].quantity * $ctrl.edit[0].price))/100) + | currency:' €':2}}

+ + +
+
\ No newline at end of file diff --git a/client/ticket/src/sale/editDiscount.js b/client/ticket/src/sale/editDiscount.js new file mode 100644 index 000000000..2ec694c56 --- /dev/null +++ b/client/ticket/src/sale/editDiscount.js @@ -0,0 +1,71 @@ +import ngModule from '../module'; + +class Controller { + constructor($scope, $http, $state, vnApp, $translate) { + this.$scope = $scope; + this.$http = $http; + this.$state = $state; + this.vnApp = vnApp; + this.translate = $translate; + } + + set edit(value) { + this._edit = value; + this.clear(); + this.setNewDiscount(); + } + + get edit() { + return this._edit; + } + + set bulk(value) { + this._bulk = value; + this.setNewDiscount(); + } + + get bulk() { + return this._bulk; + } + + setNewDiscount() { + if (!this.newDiscount && this.edit[0]) + this.newDiscount = this.edit[0].discount; + } + + updateDiscount() { + let editLines = []; + let modified = false; + for (let i = 0; i < this.edit.length; i++) { + if (this.newDiscount != this.edit[0].discount || this.bulk) { + editLines.push({id: this.edit[i].id, discount: this.newDiscount, ticketFk: this.$state.params.id}); + modified = true; + } + } + if (modified) { + this.$http.post(`/ticket/api/Sales/updateDiscount`, {editLines}).then(() => { + this.hide(); + }); + } else { + this.vnApp.showError(this.translate.instant('There is no changes to save')); + } + this.clear(); + } + + clear() { + this.newDiscount = null; + } +} + +Controller.$inject = ['$scope', '$http', '$state', 'vnApp', '$translate']; + +ngModule.component('vnTicketSaleEditDiscount', { + template: require('./editDiscount.html'), + controller: Controller, + bindings: { + edit: ' { + describe('Component vnTicketSaleEditDiscount', () => { + let $componentController; + let controller; + let $httpBackend; + let $state; + let $scope; + + beforeEach(() => { + angular.mock.module('ticket'); + }); + + beforeEach(angular.mock.inject((_$componentController_, _$state_, _$httpBackend_, $rootScope) => { + $componentController = _$componentController_; + $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); + $scope = $rootScope.$new(); + $scope.index = {model: {instances: [{id: 1}, {id: 2}]}, accept: () => { + return { + then: () => {} + }; + }}; + $state = _$state_; + $state.params.id = 1; + controller = $componentController('vnTicketSaleEditDiscount', {$scope: $scope, $state: $state}); + controller._edit = [{id: 3, discount: 15}]; + controller.hide = () => {}; + })); + + describe('edit() setter', () => { + it('should set _edit value and call setNewDiscount', () => { + spyOn(controller, 'setNewDiscount'); + controller.edit = {id: 1}; + + expect(controller.edit).toEqual({id: 1}); + expect(controller.setNewDiscount).toHaveBeenCalledWith(); + }); + }); + + describe('bulk() setter', () => { + it('should set _bulk value and call setNewDiscount', () => { + spyOn(controller, 'setNewDiscount'); + controller.bulk = true; + + expect(controller.bulk).toEqual(true); + expect(controller.setNewDiscount).toHaveBeenCalledWith(); + }); + }); + + describe('setNewDiscount()', () => { + it('should set NewDiscount to edit[0].discount value if it doesnt exists', () => { + controller.edit = [{discount: 1}]; + controller.setNewDiscount(); + + expect(controller.newDiscount).toEqual(1); + }); + }); + + describe('updateDiscount()', () => { + it('should make a query if the discount value has been modified or the bulk value is true', () => { + controller.bulk = true; + controller.newDiscount = 15; + + $httpBackend.expectPOST(`/ticket/api/Sales/updateDiscount`).respond(); + controller.updateDiscount(); + + $httpBackend.flush(); + }); + + it('should call vnApp.showError if the discount value hasnt has been modified and the bulk value is false', () => { + controller.bulk = false; + spyOn(controller.vnApp, "showError"); + controller.updateDiscount(); + + expect(controller.vnApp.showError).toHaveBeenCalledWith('There is no changes to save'); + }); + }); + + describe('clear()', () => { + it('should set newDiscount to null', () => { + controller.clear(); + + expect(controller.newDiscount).toEqual(null); + }); + }); + }); +}); diff --git a/services/loopback/common/methods/sale/updateDiscount.js b/services/loopback/common/methods/sale/updateDiscount.js new file mode 100644 index 000000000..5d393c9a6 --- /dev/null +++ b/services/loopback/common/methods/sale/updateDiscount.js @@ -0,0 +1,62 @@ +module.exports = Self => { + Self.remoteMethod('updateDiscount', { + description: 'Changes the discount of a sale', + accessType: '', + accepts: [{ + arg: 'params', + type: 'object', + required: true, + description: 'sale ID, newDiscount, price', + http: {source: 'body'} + }], + returns: { + type: 'string', + root: true + }, + http: { + path: `/updateDiscount`, + verb: 'post' + } + }); + + Self.updateDiscount = async params => { + let model = Self.app.models; + let thisTicketIsEditable = await model.Ticket.isEditable(params.editLines[0].ticketFk); + + if (!thisTicketIsEditable) + throw new Error(`The sales of this ticket can't be modified`); + + let ticket = await model.Ticket.find({ + where: { + id: params.editLines[0].ticketFk + }, + include: [{ + relation: 'client', + scope: { + fields: ['salesPersonFk'] + } + }], + fields: ['id', 'clientFk'] + }); + + let componentToUse; + let usesMana = await model.WorkerMana.findOne({where: {workerFk: ticket[0].client().salesPersonFk}, fields: 'amount'}); + + if (usesMana) + componentToUse = 37; + else + componentToUse = 34; + + for (let i = 0; i < params.editLines.length; i++) { + let currentLine = await model.Sale.findOne({where: {id: params.editLines[i].id}, fields: 'price'}); + let value = (-currentLine.price * params.editLines[i].discount / 100); + await model.SaleComponent.upsert({saleFk: params.editLines[i].id, value: value, componentFk: componentToUse}); + + await model.Sale.update({id: params.editLines[i].id}, {discount: params.editLines[i].discount}); + } + + query = ` + call vn.manaSpellersRequery(?)`; + await Self.rawSql(query, [ticket[0].client().salesPersonFk]); + }; +}; diff --git a/services/loopback/common/models/sale.js b/services/loopback/common/models/sale.js index 2d2aa22f5..9bd300860 100644 --- a/services/loopback/common/models/sale.js +++ b/services/loopback/common/models/sale.js @@ -4,8 +4,9 @@ module.exports = Self => { require('../methods/sale/priceDifference')(Self); require('../methods/sale/crudSale')(Self); require('../methods/sale/moveToTicket')(Self); + require('../methods/sale/moveToNewTicket')(Self); require('../methods/sale/removes')(Self); -// require('../methods/sale/updateDiscount')(Self); -// require('../methods/sale/updatePrice')(Self); -// require('../methods/sale/updateQuantity')(Self); + require('../methods/sale/updateDiscount')(Self); + require('../methods/sale/updatePrice')(Self); + require('../methods/sale/updateQuantity')(Self); }; From 4bc391e083441b983c876d7c886bdbac47fbae25 Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:24:27 +0200 Subject: [PATCH 03/16] Tarea #354 seccion ticket.line menu de mover lineas --- .../common/methods/agency/getFirstShipped.js | 27 ++++++++++ .../common/methods/sale/moveToNewTicket.js | 52 +++++++++++++++++++ .../common/methods/sale/moveToTicket.js | 2 +- .../loopback/common/methods/ticket/create.js | 40 ++++++++++++++ services/loopback/common/models/agency.js | 2 + services/loopback/common/models/ticket.js | 3 +- 6 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 services/loopback/common/methods/agency/getFirstShipped.js create mode 100644 services/loopback/common/methods/sale/moveToNewTicket.js create mode 100644 services/loopback/common/methods/ticket/create.js diff --git a/services/loopback/common/methods/agency/getFirstShipped.js b/services/loopback/common/methods/agency/getFirstShipped.js new file mode 100644 index 000000000..15d831209 --- /dev/null +++ b/services/loopback/common/methods/agency/getFirstShipped.js @@ -0,0 +1,27 @@ +module.exports = Self => { + Self.remoteMethod('getFirstShipped', { + description: 'Returns the first shipped and landed possible for params', + accessType: '', + accepts: [{ + arg: 'params', + type: 'object', + required: true, + description: 'agencyModeFk, addressFk, warehouseFk' + }], + returns: { + type: 'object', + root: true + }, + http: { + path: `/getFirstShipped`, + verb: 'get' + } + }); + + Self.getFirstShipped = async params => { + let query = `CALL vn.agencyHourGetFirstShipped(?, ?, ?)`; + let [result] = await Self.rawSql(query, [params.agencyModeFk, params.addressFk, params.warehouseFk]); + + return result[0]; + }; +}; diff --git a/services/loopback/common/methods/sale/moveToNewTicket.js b/services/loopback/common/methods/sale/moveToNewTicket.js new file mode 100644 index 000000000..7f9854c56 --- /dev/null +++ b/services/loopback/common/methods/sale/moveToNewTicket.js @@ -0,0 +1,52 @@ +module.exports = Self => { + Self.remoteMethod('moveToNewTicket', { + description: 'Change the state of a ticket', + accessType: '', + accepts: [{ + arg: 'ticketParams', + type: 'object', + required: true, + description: '[sales IDs], newTicketFk, actualTicketFk', + http: {source: 'body'} + }, { + arg: 'sales', + type: 'object', + required: true, + description: '[sales IDs]', + http: {source: 'body'} + }], + returns: { + type: 'string', + root: true + }, + http: { + path: `/moveToNewTicket`, + verb: 'post' + } + }); + + Self.moveToNewTicket = async params => { + let model = Self.app.models; + let thisTicketIsEditable = await model.Ticket.isEditable(params.ticket.oldTicketFk); + if (!thisTicketIsEditable) + throw new Error(`The sales of this ticket can't be modified`); + + let travelDates = await model.Agency.getFirstShipped(params.ticket); + console.log(travelDates); + let newTicketParams = { + clientFk: params.ticket.clientFk, + addressFk: params.ticket.addressFk, + agencyModeFk: params.ticket.agencyModeFk, + warehouseFk: params.ticket.warehouseFk, + shipped: travelDates.vShipped, + landed: travelDates.vLanded + }; + + let newTicket = await model.Ticket.create(newTicketParams); + + for (let i = 0; i < params.sales.length; i++) { + await model.Sale.update({id: params.sales[i].id}, {ticketFk: newTicket.id}); + } + return newTicket; + }; +}; diff --git a/services/loopback/common/methods/sale/moveToTicket.js b/services/loopback/common/methods/sale/moveToTicket.js index 45b7f49df..4ecc72d19 100644 --- a/services/loopback/common/methods/sale/moveToTicket.js +++ b/services/loopback/common/methods/sale/moveToTicket.js @@ -26,7 +26,7 @@ module.exports = Self => { let newTicketIsEditable = await Self.app.models.Ticket.isEditable(params.newTicketFk); if (!newTicketIsEditable) - throw new Error(`The sales of this ticket can't be modified`); + throw new Error(`The sales of that ticket can't be modified`); for (let i = 0; i < params.sales.length; i++) { await Self.app.models.Sale.update({id: params.sales[i].id}, {ticketFk: params.newTicketFk}); diff --git a/services/loopback/common/methods/ticket/create.js b/services/loopback/common/methods/ticket/create.js new file mode 100644 index 000000000..db7c100cb --- /dev/null +++ b/services/loopback/common/methods/ticket/create.js @@ -0,0 +1,40 @@ +module.exports = Self => { + Self.remoteMethod('create', { + description: 'Create a newticket and returns the new ID', + accessType: 'WRITE', + accepts: [{ + arg: 'params', + type: 'object', + required: true, + description: 'ClientFk, Shipped, WharehouseFk, CompanyFk, AddressFk, AgencyModeFk, RouteFk, Landed', + http: {source: 'body'} + }], + returns: { + type: 'number', + root: true + }, + http: { + path: `/create`, + verb: 'post' + } + }); + + Self.create = async params => { + let existsAddress = await Self.app.models.Address.findOne({where: {id: params.addressFk, clientFk: params.clientFk}}); + if (!existsAddress) + throw new Error(`This address doesn't exist`); + + let query = `CALL vn.ticketListCreate(?, ?, ?, ?, ?, ?, ?, ?);`; + let result = await Self.rawSql(query, [ + params.clientFk, + params.shipped, + params.wharehouseFk, + params.companyFk, + params.addressFk, + params.agencyModeFk, + params.routeFk, + params.landed + ]); + return result; + }; +}; diff --git a/services/loopback/common/models/agency.js b/services/loopback/common/models/agency.js index ac6c4d03a..251ba183a 100644 --- a/services/loopback/common/models/agency.js +++ b/services/loopback/common/models/agency.js @@ -1,3 +1,5 @@ module.exports = Self => { Self.defineScope({where: {isManaged: {neq: 0}}}); + //require('../methods/agency/sendsThatDay')(Self); + require('../methods/agency/getFirstShipped')(Self); }; diff --git a/services/loopback/common/models/ticket.js b/services/loopback/common/models/ticket.js index 0d74b4eb1..2c26b92f8 100644 --- a/services/loopback/common/models/ticket.js +++ b/services/loopback/common/models/ticket.js @@ -7,9 +7,10 @@ module.exports = Self => { require('../methods/ticket/getTotal')(Self); require('../methods/ticket/getTaxes')(Self); require('../methods/ticket/componentUpdate')(Self); -// require('../methods/ticket/create')(Self); + require('../methods/ticket/create')(Self); require('../methods/ticket/isEditable')(Self); require('../methods/ticket/threeLastActive')(Self); require('../methods/ticket/deleted')(Self); require('../methods/ticket/getVAT')(Self); + require('../methods/ticket/getSalesPersonMana')(Self); }; From ffc8c54899ac87c1235f82128c1bcc0c1d07c623 Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:25:09 +0200 Subject: [PATCH 04/16] Tarea #355 ticket.lineas Modificar cantidad --- .../common/methods/sale/updateQuantity.js | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 services/loopback/common/methods/sale/updateQuantity.js diff --git a/services/loopback/common/methods/sale/updateQuantity.js b/services/loopback/common/methods/sale/updateQuantity.js new file mode 100644 index 000000000..eac9ac309 --- /dev/null +++ b/services/loopback/common/methods/sale/updateQuantity.js @@ -0,0 +1,34 @@ +module.exports = Self => { + Self.remoteMethod('updateQuantity', { + description: 'Changes the quantity of a sale', + accessType: '', + accepts: [{ + arg: 'id', + type: 'number', + required: true, + description: 'sale ID', + http: {source: 'path'} + }, { + arg: 'quantity', + type: 'number', + required: true, + description: 'newQuantity' + }], + returns: { + type: 'string', + root: true + }, + http: { + path: `/:id/updateQuantity`, + verb: 'post' + } + }); + + Self.updateQuantity = async(id, quantity) => { + let currentLine = await Self.app.models.Sale.findOne({where: {id: id}, fields: ['quantity']}); + if (quantity > currentLine.quantity) + throw new Error('The new quantity should be smaller than the old one'); + + return await Self.app.models.Sale.update({id: id}, {quantity: quantity}); + }; +}; From cebb7030c591d59c6d434d02f9cee14bd535c01b Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:27:29 +0200 Subject: [PATCH 05/16] Tarea #373 ticket.sale Modificar precio --- .../common/methods/sale/updatePrice.js | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 services/loopback/common/methods/sale/updatePrice.js diff --git a/services/loopback/common/methods/sale/updatePrice.js b/services/loopback/common/methods/sale/updatePrice.js new file mode 100644 index 000000000..be0b5af31 --- /dev/null +++ b/services/loopback/common/methods/sale/updatePrice.js @@ -0,0 +1,64 @@ +module.exports = Self => { + Self.remoteMethod('updatePrice', { + description: 'Changes the discount of a sale', + accessType: '', + accepts: [{ + arg: 'params', + type: 'object', + required: true, + description: 'sale ID, newPrice', + http: {source: 'body'} + }], + returns: { + type: 'string', + root: true + }, + http: { + path: `/updatePrice`, + verb: 'post' + } + }); + + Self.updatePrice = async params => { + if (!params.price) params.price = 0; + let model = Self.app.models; + let thisTicketIsEditable = await model.Ticket.isEditable(params.ticketFk); + + if (!thisTicketIsEditable) + throw new Error(`The sales of this ticket can't be modified`); + + let ticket = await model.Ticket.find({ + where: { + id: params.ticketFk + }, + include: [{ + relation: 'client', + scope: { + fields: ['salesPersonFk'] + } + }], + fields: ['id', 'clientFk'] + }); + + let usesMana = await model.WorkerMana.findOne({where: {workerFk: ticket[0].client().salesPersonFk}, fields: 'amount'}); + let currentLine = await Self.app.models.Sale.findOne({where: {id: params.id}, fields: 'price'}); + let componentToUse; + + if (usesMana) + componentToUse = 37; + else + componentToUse = 34; + + let value = (params.price - currentLine.price); + + let query = `INSERT INTO vn.saleComponent(saleFk, componentFk, value) + VALUES(?, ?, ?) ON DUPLICATE KEY UPDATE value = value + ?`; + + await Self.rawSql(query, [params.id, componentToUse, value, value]); + + await Self.app.models.Sale.update({id: params.id}, {price: params.price}); + query = ` + call vn.manaSpellersRequery(?)`; + await Self.rawSql(query, [ticket[0].client().salesPersonFk]); + }; +}; From 88033a7539ffdc459400ec018729d9eec8a5069a Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:29:00 +0200 Subject: [PATCH 06/16] Tarea #373, Tarea #355,Tarea #352 getSalesPersonMana --- .../methods/ticket/getSalesPersonMana.js | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 services/loopback/common/methods/ticket/getSalesPersonMana.js diff --git a/services/loopback/common/methods/ticket/getSalesPersonMana.js b/services/loopback/common/methods/ticket/getSalesPersonMana.js new file mode 100644 index 000000000..9b252852a --- /dev/null +++ b/services/loopback/common/methods/ticket/getSalesPersonMana.js @@ -0,0 +1,38 @@ +module.exports = Self => { + Self.remoteMethod('getSalesPersonMana', { + description: 'Returns mana of a salesperson of a ticket', + accessType: 'READ', + accepts: [{ + arg: 'id', + type: 'number', + required: true, + description: 'ticket id', + http: {source: 'path'} + }], + returns: { + root: true + }, + http: { + path: `/:id/getSalesPersonMana`, + verb: 'GET' + } + }); + + Self.getSalesPersonMana = async ticketFk => { + let ticket = await Self.app.models.Ticket.find({ + where: { + id: ticketFk + }, + include: [{ + relation: 'client', + scope: { + fields: ['salesPersonFk'] + } + }], + fields: ['id', 'clientFk'] + }); + let mana = await Self.app.models.WorkerMana.findOne({where: {workerFk: ticket[0].client().salesPersonFk}, fields: 'amount'}); + + return mana.amount | 0; + }; +}; From 5cfb11641c67fc18cc14a5aa84c486d05526fee0 Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:30:11 +0200 Subject: [PATCH 07/16] Tarea #373, Tarea #352 focus on first input popover --- client/core/src/components/popover/popover.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/client/core/src/components/popover/popover.js b/client/core/src/components/popover/popover.js index afc1f7c4e..bfdaaaed6 100644 --- a/client/core/src/components/popover/popover.js +++ b/client/core/src/components/popover/popover.js @@ -75,6 +75,15 @@ export default class Popover extends Component { this.document.addEventListener('keydown', this.docKeyDownHandler); this.document.addEventListener('focusin', this.docFocusInHandler); + let firstFocusable = this.element.querySelector('input, textarea'); + if (firstFocusable) { + firstFocusable.addEventListener('focus', () => { + firstFocusable.select(); + }); + setTimeout(() => { + firstFocusable.focus(); + }, 200); + } this.deregisterCallback = this.$transitions.onStart({}, () => this.hide()); this.relocate(); From da69165fb3506a1d09adf27479c49fead669db89 Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:30:48 +0200 Subject: [PATCH 08/16] Tarea #352 ticket.lines Modificar descuento --- client/ticket/src/ticket.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/ticket/src/ticket.js b/client/ticket/src/ticket.js index aae0d2005..d07caa7cd 100644 --- a/client/ticket/src/ticket.js +++ b/client/ticket/src/ticket.js @@ -15,6 +15,7 @@ import './expedition'; import './volume'; import './package/index'; import './sale'; +import './sale/editDiscount'; import './tracking/index'; import './tracking/edit'; import './fetched-tags'; From 526929cd56de979e6e858f969f9ab29de6984526 Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:47:14 +0200 Subject: [PATCH 09/16] fdescribe deleted --- client/core/src/components/th/th.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/core/src/components/th/th.spec.js b/client/core/src/components/th/th.spec.js index 9d1c9e95a..fd863b46e 100644 --- a/client/core/src/components/th/th.spec.js +++ b/client/core/src/components/th/th.spec.js @@ -1,7 +1,7 @@ import './index.js'; import template from './index.html'; -fdescribe('Component vnTh', () => { +describe('Component vnTh', () => { let $componentController; let controller; let $element; From 2594f170cf11cd359a71e8fa0124b90988d2bab5 Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:54:54 +0200 Subject: [PATCH 10/16] =?UTF-8?q?Bug=20#137=20Refactorizaci=C3=B3n=20Textf?= =?UTF-8?q?ield?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/src/components/textfield/style.scss | 157 +++++++++++++----- .../src/components/textfield/textfield.html | 69 +++++--- .../src/components/textfield/textfield.js | 60 +++++-- .../components/textfield/textfield.spec.js | 28 +++- 4 files changed, 227 insertions(+), 87 deletions(-) diff --git a/client/core/src/components/textfield/style.scss b/client/core/src/components/textfield/style.scss index 181ad8d8b..10609c55c 100644 --- a/client/core/src/components/textfield/style.scss +++ b/client/core/src/components/textfield/style.scss @@ -1,45 +1,124 @@ +@import "colors"; vn-textfield { - .mdl-chip__action { - position: absolute; - width: auto; - top: 0px; - right: -6px; - margin: 21px 0px; - background: white; - opacity: 1; - z-index: 1; - color: #aaa; - } - .mdl-textfield { - width: 100%; - } - .mdl-textfield__error { - visibility: visible; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - width: 100%; - } - .mdl-textfield.invalid { - .mdl-textfield__input { - border-color: #d50000; - box-shadow: none; + margin: 20px 0!important; + display: block; + + .leftIcons, .rightIcons, .suffix{ + display: inline-flex; + color: $secondary-font-color; + & .material-icons{ + font-size: 20px!important } - .mdl-textfield__label::after { + } + .leftIcons{ + margin-right: 3px; + } + .container{ + width: 100%; + position: relative; + padding-bottom: 2px; + } + .textField{ + width: 100%; + display: inline-flex; + position: relative; + padding: 4px 0; + } + .infix { + position: relative; + display: block; + flex: auto; + width: 100%; + min-width: 0; + } + i.pointer { + visibility: hidden; + } + i.visible { + visibility: visible; + } + label { + position: absolute; + bottom: 2px; + pointer-events: none; + color: $secondary-font-color; + transition-duration: .2s; + transition-timing-function: cubic-bezier(.4,0,.2,1); + } + input { + outline: none; + border: none; + font-family: "Helvetica","Arial",sans-serif; + display: block; + font-size: 16px; + width: 100%; + background: 0 0; + color: inherit; + + &[type=number] { + -moz-appearance: textfield; + &::-webkit-outer-spin-button, + &::-webkit-inner-spin-button{ + -webkit-appearance: none; + margin: 0; + } + } + &:invalid { + box-shadow:none; + } + } + .underline{ + position: absolute; + bottom: 0; + height: 1px; + content: ' '; + pointer-events: none; + width: 100%; + background-color: rgba(0,0,0,.12); + } + .selected.underline{ + background-color: rgb(255,152,0); + height: 2px; + left: 50%; + width: 0px!important; + transition-duration: 0.2s; + transition-timing-function: cubic-bezier(.4,0,.2,1); + } + &.not-empty { + & label { + bottom: 24px; + color: $main-01; + font-size: 12px; + } + } + div.selected{ + &.container{ + border-bottom: 0px; + } + & label { + bottom: 24px; + color: $main-01; + font-size: 12px; + } + & .selected.underline{ + left: 0; + width: 100%!important; + } + } + & > div.container > div.textField > div.infix.invalid{ + @extend div.selected; + + & > span.mdl-textfield__error{ + visibility: visible; + margin-top: 9px; + } + & > label{ + color: #d50000; + } + } + .infix.invalid + .underline { + &{ background-color: #d50000; } } - .mdl-textfield--floating-label.invalid .mdl-textfield__label { - color: #d50000; - font-size: 12px; - top: 4px; - } - .material-icons { - font-size: 18px; - float: right; - margin-right: 5px; - } - .material-icons:hover { - color: rgba(0,0,0, .87); - } } \ No newline at end of file diff --git a/client/core/src/components/textfield/textfield.html b/client/core/src/components/textfield/textfield.html index fe69149a3..edd341b9c 100644 --- a/client/core/src/components/textfield/textfield.html +++ b/client/core/src/components/textfield/textfield.html @@ -1,29 +1,46 @@ -
- -
- - info_outline - - - clear - + ng-mouseleave="$ctrl.hasMouseIn = false" + style="display: inline-flex" +> +
+
+
+ +
+ + + +
+
+
+
+ + clear + + + info_outline + +
+
-
diff --git a/client/core/src/components/textfield/textfield.js b/client/core/src/components/textfield/textfield.js index 56fc23955..fb86e2309 100644 --- a/client/core/src/components/textfield/textfield.js +++ b/client/core/src/components/textfield/textfield.js @@ -3,45 +3,73 @@ import Input from '../../lib/input'; import './style.scss'; export default class Textfield extends Input { - constructor($element, $scope, $attrs, vnTemplate) { + constructor($element, $scope, $attrs, vnTemplate, $transclude) { super($element, $scope); vnTemplate.normalizeInputAttrs($attrs); this._value = null; - this.type = $attrs.type || 'text'; + this.type = $attrs.type; this.showActions = false; this.hasInfo = Boolean($attrs.info); this.info = $attrs.info || null; this.hasFocus = false; this.hasMouseIn = false; - componentHandler.upgradeElement($element[0].firstChild); + + if ($transclude) { + $transclude($scope.$parent, tClone => { + this.leftIcons = tClone[0]; + }, null, 'leftIcons'); + $transclude($scope.$parent, tClone => { + this.rightIcons = tClone[0]; + }, null, 'rightIcons'); + } } - get value() { - return this._value; + set onChange(value) { + this.input.addEventListener('change', value); + } + + set leftIcons(value) { + for (let i = 0; i < value.children.length; i++) { + this.element.querySelector('.leftIcons').appendChild(value.children[i]); + } + } + set rightIcons(value) { + for (let i = 0; i < value.children.length; i++) { + this.element.querySelector('.rightIcons').appendChild(value.children[i]); + } } set value(value) { this._value = (value === undefined || value === '') ? null : value; this.input.value = this._value; - this.hasValue = Boolean(this._value); - this.mdlUpdate(); - } + this.hasValue = this._value !== null; + if (this.hasValue) this.element.classList.add('not-empty'); + else this.element.classList.remove('not-empty'); + } + get value() { + return this._value; + } + set type(value) { + this._type = value || 'text'; + } + get type() { + return this._type; + } set vnTabIndex(value) { this.input.tabindex = value; } - clear() { this.value = null; this.input.focus(); } - mdlUpdate() { - let mdlElement = this.element.firstChild.MaterialTextfield; - if (mdlElement) mdlElement.updateClasses_(); - } } -Textfield.$inject = ['$element', '$scope', '$attrs', 'vnTemplate']; +Textfield.$inject = ['$element', '$scope', '$attrs', 'vnTemplate', '$transclude']; ngModule.component('vnTextfield', { template: require('./textfield.html'), + transclude: { + leftIcons: '?tLeftIcons', + rightIcons: '?tRightIcons' + }, controller: Textfield, bindings: { value: '=model', @@ -51,6 +79,8 @@ ngModule.component('vnTextfield', { readonly: ' { $attrs = {}; $timeout = _$timeout_; $element = angular.element('
'); - controller = $componentController('vnTextfield', {$scope, $element, $attrs, $timeout}); + controller = $componentController('vnTextfield', {$scope, $element, $attrs, $timeout, $transclude: null}); })); describe('value() setter', () => { - it(`should set _value, input.value and hasValue properties to null, '' and false then call mdlUpdate()`, () => { - spyOn(controller, 'mdlUpdate'); + it(`should set _value, input.value and hasValue properties to null, '' and false`, () => { let testValue = ''; controller.value = testValue; expect(controller._value).toEqual(null); expect(controller.input.value).toEqual(testValue); expect(controller.hasValue).toEqual(Boolean(testValue)); - expect(controller.mdlUpdate).toHaveBeenCalledWith(); }); - it(`should set _value, input.value and hasValue propertiest to test, test and true then call mdlUpdate()`, () => { - spyOn(controller, 'mdlUpdate'); + it(`should set _value, input.value and hasValue propertiest to test, test and true`, () => { let testValue = 'test'; controller.value = testValue; expect(controller._value).toEqual(testValue); expect(controller.input.value).toEqual(testValue); expect(controller.hasValue).toEqual(Boolean(testValue)); - expect(controller.mdlUpdate).toHaveBeenCalledWith(); + }); + }); + + describe('type() setter', () => { + it(`should set _type to 'text' if theres not given value`, () => { + controller.type = null; + + expect(controller._type).toEqual('text'); + }); + }); + + describe('clear()', () => { + it(`should set value property to null and call focus`, () => { + spyOn(controller.input, 'focus'); + controller.clear(); + + expect(controller.value).toEqual(null); + expect(controller.input.focus).toHaveBeenCalledWith(); }); }); }); From a01fa0e9ad688db16ec5dc605e341bf38a55dc59 Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:56:09 +0200 Subject: [PATCH 11/16] =?UTF-8?q?Bug=20#136=20Refactorizaci=C3=B3n=20DropD?= =?UTF-8?q?own?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/drop-down/drop-down.html | 18 ++++++------------ .../core/src/components/drop-down/drop-down.js | 2 +- .../core/src/components/drop-down/style.scss | 11 ++++++++++- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/client/core/src/components/drop-down/drop-down.html b/client/core/src/components/drop-down/drop-down.html index 9c216be38..c21498e8d 100755 --- a/client/core/src/components/drop-down/drop-down.html +++ b/client/core/src/components/drop-down/drop-down.html @@ -8,18 +8,12 @@ on-close="$ctrl.onClose()">
- - - + +
    this.onScroll(e)); diff --git a/client/core/src/components/drop-down/style.scss b/client/core/src/components/drop-down/style.scss index 89c274e7a..c668af096 100755 --- a/client/core/src/components/drop-down/style.scss +++ b/client/core/src/components/drop-down/style.scss @@ -1,4 +1,5 @@ @import "effects"; +@import "colors"; vn-drop-down { .dropdown { @@ -13,9 +14,17 @@ vn-drop-down { width: 100%; box-sizing: border-box; border: none; - border-bottom: 1px solid #ccc; font-size: inherit; padding: .6em; + margin: 0!important; + &.not-empty label{ + display: none; + } + & .selected label { + font-size: inherit; + bottom: 2px; + color: $secondary-font-color; + } } & > vn-icon[icon=clear] { display: none; From 88a2569054a64be16ce3220611d665bc51fafe6f Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:56:45 +0200 Subject: [PATCH 12/16] removed console logs (my fault) --- services/loopback/common/methods/sale/moveToNewTicket.js | 2 +- services/loopback/common/methods/ticket/threeLastActive.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/services/loopback/common/methods/sale/moveToNewTicket.js b/services/loopback/common/methods/sale/moveToNewTicket.js index 7f9854c56..348e1e51e 100644 --- a/services/loopback/common/methods/sale/moveToNewTicket.js +++ b/services/loopback/common/methods/sale/moveToNewTicket.js @@ -32,7 +32,7 @@ module.exports = Self => { throw new Error(`The sales of this ticket can't be modified`); let travelDates = await model.Agency.getFirstShipped(params.ticket); - console.log(travelDates); + let newTicketParams = { clientFk: params.ticket.clientFk, addressFk: params.ticket.addressFk, diff --git a/services/loopback/common/methods/ticket/threeLastActive.js b/services/loopback/common/methods/ticket/threeLastActive.js index 9ec1390ca..d57f5824a 100644 --- a/services/loopback/common/methods/ticket/threeLastActive.js +++ b/services/loopback/common/methods/ticket/threeLastActive.js @@ -19,7 +19,6 @@ module.exports = Self => { }); Self.threeLastActive = async filter => { - console.log(filter); let query = ` SELECT t.id,t.shipped,a.name AS agencyName,w.name AS warehouseName FROM vn.ticket t From 0b7937cb735178a8c84f5abdf4be137c2c67407d Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 15:58:04 +0200 Subject: [PATCH 13/16] =?UTF-8?q?Bug=20#137=20Refactorizaci=C3=B3n=20Textf?= =?UTF-8?q?ield?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- e2e/helpers/components_selectors.js | 2 +- e2e/helpers/selectors.js | 38 +++++++++---------- .../12_lock_of_verified_data.spec.js | 30 +++++++-------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/e2e/helpers/components_selectors.js b/e2e/helpers/components_selectors.js index 89fcd18b9..19d013e52 100644 --- a/e2e/helpers/components_selectors.js +++ b/e2e/helpers/components_selectors.js @@ -3,7 +3,7 @@ // delete me, this comment is to add a commit export default { - vnTextfield: 'vn-textfield > div > input', + vnTextfield: 'vn-textfield > div > div > div > input', vnSubmit: 'vn-submit > input', vnFloatButton: 'vn-float-button > button' }; diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index ffbf88db2..adc615809 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -62,7 +62,7 @@ export default { activeCheckboxLabel: `vn-check[label="Active"] > label`, frozenCheckboxLabel: `vn-check[label="Frozen"] > label`, invoiceByAddressCheckboxInput: `vn-check[label='Invoice by address'] > label > input`, - verifiedDataCheckbox: `vn-check[label="Verified data"] > label`, + verifiedDataCheckbox: `vn-check[label="Verified data"] input`, verifiedDataCheckboxInput: `vn-check[label="Verified data"] > label > input`, hasToInvoiceCheckboxLabel: `vn-check[label='Has to invoice'] > label`, invoiceByMailCheckboxLabel: `vn-check[label='Invoice by mail'] > label`, @@ -196,28 +196,28 @@ export default { firstTagSelect: `vn-item-tags vn-horizontal:nth-child(2) > vn-autocomplete[field="itemTag.tagFk"] input`, firstTagDisabled: `vn-item-tags vn-horizontal:nth-child(2) > vn-autocomplete > div > div > input`, firstTagSelectOptionOne: `vn-item-tags vn-horizontal:nth-child(2) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`, - firstValueInput: `vn-item-tags vn-horizontal:nth-child(2) > vn-textfield[label="Value"] > div > input`, - firstRelevancyInput: `vn-horizontal:nth-child(2) > vn-textfield[label="Relevancy"] > div > input`, + firstValueInput: `vn-item-tags vn-horizontal:nth-child(2) > vn-textfield[label="Value"] input`, + firstRelevancyInput: `vn-horizontal:nth-child(2) > vn-textfield[label="Relevancy"] input`, secondTagSelect: `vn-item-tags vn-horizontal:nth-child(3) > vn-autocomplete[field="itemTag.tagFk"] input`, secondTagDisabled: `vn-item-tags vn-horizontal:nth-child(3) > vn-autocomplete > div > div > input`, secondTagSelectOptionOne: `vn-item-tags vn-horizontal:nth-child(3) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`, - secondValueInput: `vn-item-tags vn-horizontal:nth-child(3) > vn-textfield[label="Value"] > div > input`, - secondRelevancyInput: `vn-horizontal:nth-child(3) > vn-textfield[label="Relevancy"] > div > input`, + secondValueInput: `vn-item-tags vn-horizontal:nth-child(3) > vn-textfield[label="Value"] input`, + secondRelevancyInput: `vn-horizontal:nth-child(3) > vn-textfield[label="Relevancy"] input`, thirdTagSelect: `vn-item-tags vn-horizontal:nth-child(4) > vn-autocomplete[field="itemTag.tagFk"] input`, thirdTagDisabled: `vn-item-tags vn-horizontal:nth-child(4) > vn-autocomplete > div > div > input`, thirdTagSelectOptionOne: `vn-item-tags vn-horizontal:nth-child(4) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`, - thirdValueInput: `vn-item-tags vn-horizontal:nth-child(4) > vn-textfield[label="Value"] > div > input`, - thirdRelevancyInput: `vn-horizontal:nth-child(4) > vn-textfield[label="Relevancy"] > div > input`, + thirdValueInput: `vn-item-tags vn-horizontal:nth-child(4) > vn-textfield[label="Value"] input`, + thirdRelevancyInput: `vn-horizontal:nth-child(4) > vn-textfield[label="Relevancy"] input`, fourthTagSelect: `vn-item-tags vn-horizontal:nth-child(5) > vn-autocomplete[field="itemTag.tagFk"] input`, fourthTagDisabled: `vn-item-tags vn-horizontal:nth-child(5) > vn-autocomplete > div > div > input`, fourthTagSelectOptionOne: `vn-item-tags vn-horizontal:nth-child(5) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`, - fourthValueInput: `vn-item-tags vn-horizontal:nth-child(5) > vn-textfield[label="Value"] > div > input`, - fourthRelevancyInput: `vn-horizontal:nth-child(5) > vn-textfield[label="Relevancy"] > div > input`, + fourthValueInput: `vn-item-tags vn-horizontal:nth-child(5) > vn-textfield[label="Value"] input`, + fourthRelevancyInput: `vn-horizontal:nth-child(5) > vn-textfield[label="Relevancy"] input`, fifthTagSelect: `vn-item-tags vn-horizontal:nth-child(6) > vn-autocomplete[field="itemTag.tagFk"] input`, fifthTagDisabled: `vn-item-tags vn-horizontal:nth-child(6) > vn-autocomplete > div > div > input`, fifthTagSelectOptionFive: `vn-item-tags vn-horizontal:nth-child(6) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(5)`, - fifthValueInput: `vn-item-tags vn-horizontal:nth-child(6) > vn-textfield[label="Value"] > div > input`, - fifthRelevancyInput: `vn-horizontal:nth-child(6) > vn-textfield[label="Relevancy"] > div > input`, + fifthValueInput: `vn-item-tags vn-horizontal:nth-child(6) > vn-textfield[label="Value"] input`, + fifthRelevancyInput: `vn-horizontal:nth-child(6) > vn-textfield[label="Relevancy"] input`, addItemTagButton: `vn-icon-button[icon="add_circle"]`, submitItemTagsButton: `${components.vnSubmit}` }, @@ -242,17 +242,17 @@ export default { nicheButton: `vn-menu-item a[ui-sref="item.card.niche"]`, addNicheButton: `vn-icon[icon="add_circle"]`, firstWarehouseSelect: `vn-autocomplete[field="itemNiche.warehouseFk"] input`, - firstWarehouseDisabled: `vn-horizontal:nth-child(2) > vn-textfield[label="Warehouse"] > div > input`, + firstWarehouseDisabled: `vn-horizontal:nth-child(2) > vn-textfield[label="Warehouse"] input`, firstWarehouseSelectSecondOption: `vn-autocomplete[field="itemNiche.warehouseFk"] vn-drop-down ul > li:nth-child(2)`, - firstCodeInput: `vn-horizontal:nth-child(2) > vn-textfield[label="Code"] > div > input`, + firstCodeInput: `vn-horizontal:nth-child(2) > vn-textfield[label="Code"] input`, secondWarehouseSelect: `vn-horizontal:nth-child(3) > vn-autocomplete[field="itemNiche.warehouseFk"] input`, - secondWarehouseDisabled: `vn-horizontal:nth-child(3) > vn-textfield[label="Warehouse"] > div > input`, - secondCodeInput: `vn-horizontal:nth-child(3) > vn-textfield[label="Code"] > div > input`, + secondWarehouseDisabled: `vn-horizontal:nth-child(3) > vn-textfield[label="Warehouse"] input`, + secondCodeInput: `vn-horizontal:nth-child(3) > vn-textfield[label="Code"] input`, secondNicheRemoveButton: `vn-horizontal:nth-child(3) > vn-icon[icon="remove_circle_outline"]`, thirdWarehouseSelect: `vn-horizontal:nth-child(4) > vn-autocomplete[field="itemNiche.warehouseFk"] input`, - thirdWarehouseDisabled: `vn-horizontal:nth-child(4) > vn-textfield[label="Warehouse"] > div > input`, + thirdWarehouseDisabled: `vn-horizontal:nth-child(4) > vn-textfield[label="Warehouse"] input`, thirdWarehouseSelectFourthOption: `vn-horizontal:nth-child(4) > vn-autocomplete[field="itemNiche.warehouseFk"] vn-drop-down ul > li:nth-child(4)`, - thirdCodeInput: `vn-horizontal:nth-child(4) > vn-textfield[label="Code"] > div > input`, + thirdCodeInput: `vn-horizontal:nth-child(4) > vn-textfield[label="Code"] input`, submitNichesButton: `${components.vnSubmit}` }, itemBotanical: { @@ -286,8 +286,8 @@ export default { addNoteButton: `vn-icon[icon="add_circle"]`, firstNoteSelect: `vn-autocomplete[field="ticketObservation.observationTypeFk"] input`, firstNoteSelectSecondOption: `vn-autocomplete[field="ticketObservation.observationTypeFk"] vn-drop-down ul > li:nth-child(2)`, - firstNoteDisabled: `vn-textfield[label="Observation type"] > div > input`, - firstDescriptionInput: `vn-textfield[label="Description"] > div > input`, + firstNoteDisabled: `vn-textfield[label="Observation type"] input`, + firstDescriptionInput: `vn-textfield[label="Description"] input`, submitNotesButton: `${components.vnSubmit}` }, ticketExpedition: { diff --git a/e2e/paths/client-module/12_lock_of_verified_data.spec.js b/e2e/paths/client-module/12_lock_of_verified_data.spec.js index f4bb17395..0e9ee4ecb 100644 --- a/e2e/paths/client-module/12_lock_of_verified_data.spec.js +++ b/e2e/paths/client-module/12_lock_of_verified_data.spec.js @@ -62,10 +62,10 @@ describe('Client', () => { .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) .evaluate(selector => { console.log(document.querySelector(selector)); - return document.querySelector(selector).className; + return document.querySelector(selector).disabled; }, selectors.clientFiscalData.verifiedDataCheckbox) .then(result => { - expect(result).toContain('is-disabled'); + expect(result).toBe(true); }); }); @@ -151,10 +151,10 @@ describe('Client', () => { return nightmare .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) .evaluate(selector => { - return document.querySelector(selector).className; + return document.querySelector(selector).disabled; }, selectors.clientFiscalData.verifiedDataCheckbox) .then(result => { - expect(result).not.toContain('is-disabled'); + expect(result).not.toBe(true); }); }); @@ -264,10 +264,10 @@ describe('Client', () => { return nightmare .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) .evaluate(selector => { - return document.querySelector(selector).className; + return document.querySelector(selector).disabled; }, selectors.clientFiscalData.verifiedDataCheckbox) .then(result => { - expect(result).toContain('is-disabled'); + expect(result).toBe(true); }); }); @@ -275,10 +275,10 @@ describe('Client', () => { return nightmare .wait(selectors.clientFiscalData.socialNameInput) .evaluate(selector => { - return document.querySelector(selector).className; - }, 'vn-textfield[field="$ctrl.client.socialName"] > div') + return document.querySelector(selector).disabled; + }, 'vn-textfield[field="$ctrl.client.socialName"] input') .then(result => { - expect(result).toContain('is-disabled'); + expect(result).toEqual(true); }); }); }); @@ -340,10 +340,10 @@ describe('Client', () => { return nightmare .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) .evaluate(selector => { - return document.querySelector(selector).className; + return document.querySelector(selector).disabled; }, selectors.clientFiscalData.verifiedDataCheckbox) .then(result => { - expect(result).not.toContain('is-disabled'); + expect(result).not.toBe(true); }); }); @@ -453,10 +453,10 @@ describe('Client', () => { return nightmare .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) .evaluate(selector => { - return document.querySelector(selector).className; + return document.querySelector(selector).disabled; }, selectors.clientFiscalData.verifiedDataCheckbox) .then(result => { - expect(result).toContain('is-disabled'); + expect(result).toBe(true); }); }); @@ -464,10 +464,10 @@ describe('Client', () => { return nightmare .wait(selectors.clientFiscalData.socialNameInput) .evaluate(selector => { - return document.querySelector(selector).className; + return document.querySelector(selector).disabled; }, 'vn-textfield[field="$ctrl.client.socialName"] > div') .then(result => { - expect(result).not.toContain('is-disabled'); + expect(result).not.toBe(true); }); }); }); From 19c89ec7d3e4f0425428b7aa8ea82ce812bdd8d3 Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 28 Jun 2018 16:00:28 +0200 Subject: [PATCH 14/16] changed duplicated scope --- services/loopback/common/models/warehouse.js | 3 --- services/loopback/common/models/warehouse.json | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 services/loopback/common/models/warehouse.js diff --git a/services/loopback/common/models/warehouse.js b/services/loopback/common/models/warehouse.js deleted file mode 100644 index ac6c4d03a..000000000 --- a/services/loopback/common/models/warehouse.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = Self => { - Self.defineScope({where: {isManaged: {neq: 0}}}); -}; diff --git a/services/loopback/common/models/warehouse.json b/services/loopback/common/models/warehouse.json index 789d5c7f8..2285caf92 100644 --- a/services/loopback/common/models/warehouse.json +++ b/services/loopback/common/models/warehouse.json @@ -31,7 +31,5 @@ "permission": "ALLOW" } ], - "scopes" : { - "production" : {"where": {"isManaged": {"neq": 0}}} - } + "scope" : {"where": {"isManaged": {"neq": 0}}} } From 81988e075369f4e267606db3662bd15d7ec1a40e Mon Sep 17 00:00:00 2001 From: gerard Date: Fri, 29 Jun 2018 08:07:40 +0200 Subject: [PATCH 15/16] bug fixed --- services/loopback/common/methods/ticket/getSalesPersonMana.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/loopback/common/methods/ticket/getSalesPersonMana.js b/services/loopback/common/methods/ticket/getSalesPersonMana.js index 9b252852a..1289374cd 100644 --- a/services/loopback/common/methods/ticket/getSalesPersonMana.js +++ b/services/loopback/common/methods/ticket/getSalesPersonMana.js @@ -33,6 +33,6 @@ module.exports = Self => { }); let mana = await Self.app.models.WorkerMana.findOne({where: {workerFk: ticket[0].client().salesPersonFk}, fields: 'amount'}); - return mana.amount | 0; + return mana ? mana.amount : 0; }; }; From dfff3174147bd39bb8828c836d4bed4d4101fbdb Mon Sep 17 00:00:00 2001 From: Bernat Date: Fri, 29 Jun 2018 08:32:22 +0200 Subject: [PATCH 16/16] update structure DB --- services/db/install/changes/1.0.7/acl.sql | 1 - .../1.0.7/agencyHourGetFirstShipped.sql | 40 --- services/db/install/changes/1.0.7/tipos.sql | 4 - services/db/install/dump/01-structure.sql | 239 ++++++++++-------- services/db/install/dump/fixtures.sql | 6 +- 5 files changed, 135 insertions(+), 155 deletions(-) delete mode 100644 services/db/install/changes/1.0.7/acl.sql delete mode 100644 services/db/install/changes/1.0.7/agencyHourGetFirstShipped.sql delete mode 100644 services/db/install/changes/1.0.7/tipos.sql diff --git a/services/db/install/changes/1.0.7/acl.sql b/services/db/install/changes/1.0.7/acl.sql deleted file mode 100644 index fd90e9699..000000000 --- a/services/db/install/changes/1.0.7/acl.sql +++ /dev/null @@ -1 +0,0 @@ -INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (88, 'ClientContact', '*', '*', 'ALLOW', 'ROLE', 'employee'); \ No newline at end of file diff --git a/services/db/install/changes/1.0.7/agencyHourGetFirstShipped.sql b/services/db/install/changes/1.0.7/agencyHourGetFirstShipped.sql deleted file mode 100644 index 50bb2a1e8..000000000 --- a/services/db/install/changes/1.0.7/agencyHourGetFirstShipped.sql +++ /dev/null @@ -1,40 +0,0 @@ -USE `vn`; -DROP procedure IF EXISTS `agencyHourGetFirstShipped`; - -DELIMITER $$ -USE `vn`$$ -CREATE DEFINER=`root`@`%` PROCEDURE `agencyHourGetFirstShipped`(vAgencyMode INT, vAddress INT, vWarehouse INT) -BEGIN -/** -* Devuelve la primera fecha de envio disponible para una agencia en una direccion y un warehouse -* -* @param vAgencyMode id de la agencia en vn.agencyMode -* @param vAddress id de la direccion -* @param vWarehouse id del warehouse -* @return vShipped la primera fecha disponible y vLanded la fecha de llegada/recojida -*/ -DECLARE vAgency INT; -DECLARE vShipped DATE; -DECLARE vLanded DATE DEFAULT CURDATE(); - SELECT agencyFk INTO vAgency FROM agencyMode WHERE id= vAgencyMode; - - l: LOOP - - CALL agencyHourGetShipped(vLanded,vAddress,vAgency); - SELECT shipped INTO vShipped - FROM tmp.agencyHourGetShipped - WHERE warehouseFk = vWarehouse LIMIT 1; - - IF vShipped THEN - LEAVE l; - END IF; - - SET vLanded = DATE_ADD(vLanded, INTERVAL +1 DAY); - - END LOOP; - - SELECT vShipped,vLanded; -END$$ - -DELIMITER ; - diff --git a/services/db/install/changes/1.0.7/tipos.sql b/services/db/install/changes/1.0.7/tipos.sql deleted file mode 100644 index 914bfb4c6..000000000 --- a/services/db/install/changes/1.0.7/tipos.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE `vn2008`.`Tipos` -ADD COLUMN `warehouseFk` VARCHAR(45) NULL DEFAULT '1' AFTER `roleCodeFk`; - -update vn2008.Tipos set warehouseFk= 44 where FV=0 \ No newline at end of file diff --git a/services/db/install/dump/01-structure.sql b/services/db/install/dump/01-structure.sql index 9e005bd5f..2ba6cae87 100644 --- a/services/db/install/dump/01-structure.sql +++ b/services/db/install/dump/01-structure.sql @@ -363,7 +363,7 @@ CREATE TABLE `user` ( KEY `nickname` (`nickname`), KEY `lang` (`lang`), CONSTRAINT `user_ibfk_2` FOREIGN KEY (`role`) REFERENCES `role` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=14345 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Global users'; +) ENGINE=InnoDB AUTO_INCREMENT=14349 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Global users'; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -2534,7 +2534,7 @@ CREATE TABLE `Articles` ( CONSTRAINT `Articles_ibfk_5` FOREIGN KEY (`tipo_id`) REFERENCES `Tipos` (`tipo_id`) ON UPDATE CASCADE, CONSTRAINT `expenceFk` FOREIGN KEY (`expenceFk`) REFERENCES `Gastos` (`Id_Gasto`) ON UPDATE CASCADE, CONSTRAINT `producer_id` FOREIGN KEY (`producer_id`) REFERENCES `producer` (`producer_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=315720 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=315762 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -2724,7 +2724,7 @@ CREATE TABLE `Articles_dits` ( KEY `fgkey1_idx` (`idaccion_dits`), KEY `fgkey2_idx` (`Id_Ticket`), KEY `fgkey3_idx` (`Id_Trabajador`) -) ENGINE=InnoDB AUTO_INCREMENT=20256 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=20260 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2746,7 +2746,7 @@ CREATE TABLE `Articles_nicho` ( KEY `Articles_nicho_wh_fk` (`warehouse_id`), CONSTRAINT `Articles_nicho_wh_fk` FOREIGN KEY (`warehouse_id`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Articles_nichos_fk` FOREIGN KEY (`Id_Article`) REFERENCES `Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=487884 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=488255 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2910,7 +2910,7 @@ CREATE TABLE `Cajas` ( KEY `warehouse_id` (`warehouse_id`), KEY `fk_Cajas_Proveedores_account1_idx` (`Proveedores_account_Id`), CONSTRAINT `Cajas_ibfk_2` FOREIGN KEY (`Id_Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=594973 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=595126 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -3057,7 +3057,7 @@ CREATE TABLE `Clientes` ( CONSTRAINT `Clientes_ibfk_5` FOREIGN KEY (`province_id`) REFERENCES `province` (`province_id`) ON UPDATE CASCADE, CONSTRAINT `canal_nuevo_cliente` FOREIGN KEY (`chanel_id`) REFERENCES `chanel` (`chanel_id`) ON UPDATE CASCADE, CONSTRAINT `tipos_de_cliente` FOREIGN KEY (`clientes_tipo_id`) REFERENCES `clientes_tipo` (`clientes_tipo_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=14345 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=14349 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -3340,7 +3340,7 @@ CREATE TABLE `Colas` ( CONSTRAINT `Colas_ibfk_3` FOREIGN KEY (`Id_Prioridad`) REFERENCES `Prioridades` (`Id_Prioridad`) ON UPDATE CASCADE, CONSTRAINT `Colas_ibfk_4` FOREIGN KEY (`Id_Impresora`) REFERENCES `Impresoras` (`Id_Impresora`) ON UPDATE CASCADE, CONSTRAINT `Colas_ibfk_5` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=272264 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=274425 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -3422,7 +3422,7 @@ CREATE TABLE `Compres` ( CONSTRAINT `Compres_ibfk_2` FOREIGN KEY (`Id_Cubo`) REFERENCES `Cubos` (`Id_Cubo`) ON UPDATE CASCADE, CONSTRAINT `Compres_ibfk_3` FOREIGN KEY (`container_id`) REFERENCES `container` (`container_id`) ON UPDATE CASCADE, CONSTRAINT `buy_id` FOREIGN KEY (`Id_Entrada`) REFERENCES `Entradas` (`Id_Entrada`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=259114495 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=259298031 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -3718,7 +3718,7 @@ CREATE TABLE `Consignatarios` ( CONSTRAINT `Consignatarios_ibfk_3` FOREIGN KEY (`province_id`) REFERENCES `province` (`province_id`) ON UPDATE CASCADE, CONSTRAINT `Consignatarios_ibfk_4` FOREIGN KEY (`Id_Agencia`) REFERENCES `Agencias` (`Id_Agencia`) ON UPDATE CASCADE, CONSTRAINT `address_customer_id` FOREIGN KEY (`Id_cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=25329 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=25335 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -4099,7 +4099,7 @@ CREATE TABLE `Entradas` ( CONSTRAINT `Entradas_ibfk_1` FOREIGN KEY (`Id_Proveedor`) REFERENCES `Proveedores` (`Id_Proveedor`) ON UPDATE CASCADE, CONSTRAINT `Entradas_ibfk_6` FOREIGN KEY (`travel_id`) REFERENCES `travel` (`id`) ON UPDATE CASCADE, CONSTRAINT `Entradas_ibfk_7` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=144764 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='InnoDB free: 88064 kB; (`Id_Proveedor`) REFER `vn2008/Provee'; +) ENGINE=InnoDB AUTO_INCREMENT=144836 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='InnoDB free: 88064 kB; (`Id_Proveedor`) REFER `vn2008/Provee'; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -4263,7 +4263,7 @@ CREATE TABLE `Entradas_dits` ( CONSTRAINT `Entradas_dits_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `Entradas` (`Id_Entrada`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `fgkey_entradas_1` FOREIGN KEY (`idaccion_dits`) REFERENCES `accion_dits` (`idaccion_dits`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `fgkey_entradas_3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2865811 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2867272 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -4281,7 +4281,7 @@ CREATE TABLE `Entradas_kop` ( PRIMARY KEY (`Id_Entradas_kop`), KEY `entradas_entradas_kop_idx` (`Id_Entrada`), CONSTRAINT `entradas_entradas_kop` FOREIGN KEY (`Id_Entrada`) REFERENCES `Entradas` (`Id_Entrada`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=588 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona las entradas con los origenes de compra'; +) ENGINE=InnoDB AUTO_INCREMENT=591 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona las entradas con los origenes de compra'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -4524,7 +4524,7 @@ CREATE TABLE `Facturas` ( CONSTRAINT `Facturas_ibfk_4` FOREIGN KEY (`cplusTaxBreakFk`) REFERENCES `vn`.`cplusTaxBreak` (`id`) ON UPDATE CASCADE, CONSTRAINT `invoice_bank_id` FOREIGN KEY (`Id_Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE, CONSTRAINT `invoice_customer_id` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=457742 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=457753 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -4742,7 +4742,7 @@ CREATE TABLE `Greuges` ( KEY `Id_Ticket_Greuge_Ticket_idx` (`Id_Ticket`), CONSTRAINT `Id_Ticket_Greuge_Ticket` FOREIGN KEY (`Id_Ticket`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `greuges_type_fk` FOREIGN KEY (`Greuges_type_id`) REFERENCES `Greuges_type` (`Greuges_type_id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2289670 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=FIXED; +) ENGINE=InnoDB AUTO_INCREMENT=2291846 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=FIXED; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -4943,7 +4943,7 @@ CREATE TABLE `Movimientos` ( KEY `itemFk_ticketFk` (`Id_Article`,`Id_Ticket`), CONSTRAINT `Movimientos_ibfk_1` FOREIGN KEY (`Id_Article`) REFERENCES `Articles` (`Id_Article`) ON UPDATE CASCADE, CONSTRAINT `movement_ticket_id` FOREIGN KEY (`Id_Ticket`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=21242548 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=21247590 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -5092,7 +5092,7 @@ CREATE TABLE `Movimientos_mark` ( `Id_Movimiento_mark` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`Id_Movimiento_mark`), KEY `Id_Movimiento` (`Id_Movimiento`) -) ENGINE=InnoDB AUTO_INCREMENT=11078991 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=11090985 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5162,7 +5162,7 @@ CREATE TABLE `Ordenes` ( KEY `Id_Comprador` (`CodCOMPRADOR`), KEY `Id_Movimiento` (`Id_Movimiento`), KEY `Id_Vendedor` (`CodVENDEDOR`) -) ENGINE=InnoDB AUTO_INCREMENT=32023 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=32089 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5451,7 +5451,7 @@ CREATE TABLE `Recibos` ( CONSTRAINT `Recibos_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE, CONSTRAINT `Recibos_ibfk_2` FOREIGN KEY (`Id_Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE, CONSTRAINT `recibo_customer_id` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=470195 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=470332 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -5587,7 +5587,7 @@ CREATE TABLE `Reservas` ( PRIMARY KEY (`Id_Reserva`), KEY `Id_1` (`Id_Ticket`), KEY `Id_Article` (`Id_Article`) -) ENGINE=InnoDB AUTO_INCREMENT=2017 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2056 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5618,7 +5618,7 @@ CREATE TABLE `Rutas` ( KEY `Fecha` (`Fecha`), KEY `gestdoc_id` (`gestdoc_id`), CONSTRAINT `Rutas_ibfk_1` FOREIGN KEY (`gestdoc_id`) REFERENCES `gestdoc` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=39909 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=39939 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -5806,7 +5806,7 @@ CREATE TABLE `Split_lines` ( KEY `Id_Compra` (`Id_Compra`), CONSTRAINT `Id_Compra` FOREIGN KEY (`Id_Compra`) REFERENCES `Compres` (`Id_Compra`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Split_lines_ibfk_1` FOREIGN KEY (`Id_Split`) REFERENCES `Splits` (`Id_Split`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=324765 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=324846 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5824,7 +5824,7 @@ CREATE TABLE `Splits` ( `Notas` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`Id_Split`), KEY `Id_Entrada` (`Id_Entrada`) -) ENGINE=InnoDB AUTO_INCREMENT=36275 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=36276 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5910,7 +5910,7 @@ CREATE TABLE `Tickets` ( CONSTRAINT `Tickets_ibfk_9` FOREIGN KEY (`Id_Ruta`) REFERENCES `Rutas` (`Id_Ruta`) ON UPDATE CASCADE, CONSTRAINT `ticket_customer_id` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE, CONSTRAINT `tickets_fk10` FOREIGN KEY (`Factura`) REFERENCES `Facturas` (`Id_Factura`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1907666 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1908471 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -6119,7 +6119,7 @@ CREATE TABLE `Tickets_dits` ( CONSTRAINT `Tickets_dits_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `fgkey1` FOREIGN KEY (`idaccion_dits`) REFERENCES `accion_dits` (`idaccion_dits`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `fgkey3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=59479005 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=59491792 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6325,7 +6325,7 @@ CREATE TABLE `Trabajadores` ( KEY `sub` (`sub`), CONSTRAINT `Clientes` FOREIGN KEY (`Id_Cliente_Interno`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE, CONSTRAINT `Trabajadores_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1139 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1141 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -6478,7 +6478,7 @@ CREATE TABLE `Vehiculos_consumo` ( PRIMARY KEY (`Vehiculos_consumo_id`,`Id_Vehiculo`), KEY `fk_Vehiculos_consumo_Vehiculos_idx` (`Id_Vehiculo`), CONSTRAINT `fk_Vehiculos_consumo_Vehiculos` FOREIGN KEY (`Id_Vehiculo`) REFERENCES `Vehiculos` (`Id_Vehiculo`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=8457 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='En esta tabla apuntan el importe de los tickets de la gasolinera solred, con quien tenemos un contrato y nos facturan mensualmente'; +) ENGINE=InnoDB AUTO_INCREMENT=8475 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='En esta tabla apuntan el importe de los tickets de la gasolinera solred, con quien tenemos un contrato y nos facturan mensualmente'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6592,7 +6592,7 @@ CREATE TABLE `XDiario` ( PRIMARY KEY (`id`), KEY `empresa_id` (`empresa_id`), CONSTRAINT `XDiario_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=3364676 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=3365117 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -7033,7 +7033,7 @@ CREATE TABLE `albaran` ( CONSTRAINT `fk_albaran_empresa1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE, CONSTRAINT `fk_albaran_recibida` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `fk_albaran_warehouse1` FOREIGN KEY (`warehouse_id`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2365 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2381 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7110,7 +7110,7 @@ CREATE TABLE `awb` ( CONSTRAINT `awbInvoiceIn` FOREIGN KEY (`invoiceInFk`) REFERENCES `recibida` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `awbTransitoryFk` FOREIGN KEY (`transitario_id`) REFERENCES `Proveedores` (`Id_Proveedor`) ON UPDATE CASCADE, CONSTRAINT `awb_ibfk_1` FOREIGN KEY (`iva_id`) REFERENCES `iva_codigo` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2589 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2594 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -7368,7 +7368,7 @@ CREATE TABLE `awb_gestdoc` ( KEY `awb_gestdoc_gestdoc_fk` (`gestdoc_id`), CONSTRAINT `awb_gestdoc_awb_fk` FOREIGN KEY (`awb_id`) REFERENCES `awb` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `awb_gestdoc_gestdoc_fk` FOREIGN KEY (`gestdoc_id`) REFERENCES `gestdoc` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2252 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2257 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7486,7 +7486,7 @@ CREATE TABLE `barcodes` ( UNIQUE KEY `Id_Article_2` (`Id_Article`,`code`), KEY `Id_Article` (`Id_Article`), CONSTRAINT `barcodes_ibfk_1` FOREIGN KEY (`Id_Article`) REFERENCES `Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=36152 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=36155 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7627,7 +7627,7 @@ CREATE TABLE `buy_edi` ( KEY `kop` (`kop`), KEY `barcode` (`barcode`), KEY `fec` (`fec`) -) ENGINE=InnoDB AUTO_INCREMENT=716087 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=716798 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7881,7 +7881,7 @@ CREATE TABLE `cl_act` ( CONSTRAINT `cl_act_ibfk_1` FOREIGN KEY (`Id_Movimiento`) REFERENCES `Movimientos` (`Id_Movimiento`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `cl_act_ibfk_3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE, CONSTRAINT `cl_act_ibfk_4` FOREIGN KEY (`cl_main_id`) REFERENCES `cl_main` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=85767 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Acciones en respuesta a las reclamaciones'; +) ENGINE=InnoDB AUTO_INCREMENT=85829 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Acciones en respuesta a las reclamaciones'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7915,7 +7915,7 @@ CREATE TABLE `cl_cau` ( CONSTRAINT `cl_cau_ibfk_7` FOREIGN KEY (`cl_mot_id`) REFERENCES `cl_mot` (`id`) ON UPDATE CASCADE, CONSTRAINT `cl_cau_ibfk_8` FOREIGN KEY (`cl_con_id`) REFERENCES `cl_con` (`id`) ON UPDATE CASCADE, CONSTRAINT `cl_cau_ibfk_9` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=46080 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Causas de las reclamaciones'; +) ENGINE=InnoDB AUTO_INCREMENT=46110 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Causas de las reclamaciones'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7969,7 +7969,7 @@ CREATE TABLE `cl_det` ( CONSTRAINT `cl_det_ibfk_6` FOREIGN KEY (`cl_pet_id`) REFERENCES `cl_pet` (`id`) ON UPDATE CASCADE, CONSTRAINT `cl_det_ibfk_7` FOREIGN KEY (`Id_Movimiento`) REFERENCES `Movimientos` (`Id_Movimiento`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `cl_det_ibfk_8` FOREIGN KEY (`cl_main_id`) REFERENCES `cl_main` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=118110 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle de las reclamaciones'; +) ENGINE=InnoDB AUTO_INCREMENT=118173 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle de las reclamaciones'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8026,7 +8026,7 @@ CREATE TABLE `cl_main` ( CONSTRAINT `cl_main_ibfk_3` FOREIGN KEY (`cl_est_id`) REFERENCES `cl_est` (`id`) ON UPDATE CASCADE, CONSTRAINT `cl_main_ibfk_4` FOREIGN KEY (`cl_dep_id`) REFERENCES `cl_dep` (`id`) ON UPDATE CASCADE, CONSTRAINT `cl_main_ibfk_5` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=51127 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Reclamaciones, tabla principal'; +) ENGINE=InnoDB AUTO_INCREMENT=51164 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Reclamaciones, tabla principal'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8139,7 +8139,7 @@ CREATE TABLE `client_observation` ( KEY `Id_Cliente` (`Id_Cliente`), CONSTRAINT `client_observation_ibfk_1` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `client_observation_ibfk_2` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=64601 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; +) ENGINE=InnoDB AUTO_INCREMENT=64633 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8387,7 +8387,7 @@ CREATE TABLE `credit` ( KEY `credit_ClienteFk` (`Id_Cliente`), CONSTRAINT `credit_ClienteFk` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `workers_fk` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=64173 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=64190 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8512,7 +8512,7 @@ CREATE TABLE `device` ( PRIMARY KEY (`device_id`), UNIQUE KEY `device_id_UNIQUE` (`device_id`), UNIQUE KEY `sn_UNIQUE` (`sn`) -) ENGINE=InnoDB AUTO_INCREMENT=223 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=225 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8901,7 +8901,7 @@ CREATE TABLE `escritos_det` ( PRIMARY KEY (`id`), KEY `empresa_id` (`empresa_id`), CONSTRAINT `escritos_det_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=15625 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=15627 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8930,7 +8930,7 @@ CREATE TABLE `expeditions` ( KEY `index4` (`ticket_id`), CONSTRAINT `Id_Agencia` FOREIGN KEY (`agency_id`) REFERENCES `Agencias` (`Id_Agencia`) ON UPDATE CASCADE, CONSTRAINT `ticket_id` FOREIGN KEY (`ticket_id`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2468224 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2469933 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -9190,7 +9190,7 @@ CREATE TABLE `gestdoc` ( UNIQUE KEY `emp_id` (`emp_id`,`orden`,`warehouse_id`), KEY `trabajador_id` (`trabajador_id`), KEY `warehouse_id` (`warehouse_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1021349 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='document managment system'; +) ENGINE=InnoDB AUTO_INCREMENT=1022035 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='document managment system'; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -9389,7 +9389,7 @@ CREATE TABLE `intrastat_data` ( KEY `recibida` (`recibida_id`), CONSTRAINT `intrastat_data_ibfk_1` FOREIGN KEY (`intrastat_id`) REFERENCES `Intrastat` (`Codintrastat`) ON UPDATE CASCADE, CONSTRAINT `intrastat_data_ibfk_2` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=66757 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=66795 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -9727,7 +9727,7 @@ CREATE TABLE `mail` ( `recipientFk` int(11) DEFAULT NULL, `plainTextBody` text COLLATE utf8_unicode_ci, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=1373996 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=MyISAM AUTO_INCREMENT=1375159 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -9785,7 +9785,7 @@ CREATE TABLE `mandato` ( CONSTRAINT `mandato_fgkey1` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `mandato_fgkey2` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `mandato_fgkey3` FOREIGN KEY (`idmandato_tipo`) REFERENCES `mandato_tipo` (`idmandato_tipo`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=15281 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=15285 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -9994,7 +9994,7 @@ CREATE TABLE `pago` ( CONSTRAINT `pago_moneda` FOREIGN KEY (`id_moneda`) REFERENCES `Monedas` (`Id_Moneda`) ON UPDATE CASCADE, CONSTRAINT `pago_pay_met` FOREIGN KEY (`pay_met_id`) REFERENCES `pay_met` (`id`) ON UPDATE CASCADE, CONSTRAINT `proveedor_pago` FOREIGN KEY (`id_proveedor`) REFERENCES `Proveedores` (`Id_Proveedor`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=42213 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=42218 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -10489,7 +10489,7 @@ CREATE TABLE `price_fixed` ( KEY `date_end` (`date_end`), KEY `warehouse_id` (`warehouse_id`), CONSTRAINT `price_fixed_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=54116 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=54118 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -10551,7 +10551,7 @@ CREATE TABLE `producer` ( `visible` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (`producer_id`), UNIQUE KEY `name_UNIQUE` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=4751 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4755 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -10720,7 +10720,7 @@ CREATE TABLE `recibida` ( CONSTRAINT `recibida_ibfk_5` FOREIGN KEY (`cplusInvoiceType472Fk`) REFERENCES `vn`.`cplusInvoiceType472` (`id`) ON UPDATE CASCADE, CONSTRAINT `recibida_ibfk_6` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `vn`.`cplusRectificationType` (`id`) ON UPDATE CASCADE, CONSTRAINT `recibida_ibfk_7` FOREIGN KEY (`cplusTrascendency472Fk`) REFERENCES `vn`.`cplusTrascendency472` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=69209 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=69261 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -11309,7 +11309,7 @@ CREATE TABLE `recibida_iva` ( CONSTRAINT `recibida_iva_ibfk_2` FOREIGN KEY (`iva_id`) REFERENCES `iva_codigo` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `recibida_iva_ibfk_5` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `recibida_iva_ibfk_6` FOREIGN KEY (`gastos_id`) REFERENCES `Gastos` (`Id_Gasto`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB AUTO_INCREMENT=93607 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=93766 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11332,7 +11332,7 @@ CREATE TABLE `recibida_vencimiento` ( KEY `banco_id` (`banco_id`), CONSTRAINT `recibida_vencimiento_ibfk_6` FOREIGN KEY (`banco_id`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE, CONSTRAINT `recibida_vencimiento_ibfk_7` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=90880 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=91038 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -11569,7 +11569,7 @@ CREATE TABLE `scan` ( `name` varchar(45) CHARACTER SET utf8 DEFAULT NULL, `odbc_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=60396 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Se borra automaticamente 8 dias en el pasado desde vn2008.clean'; +) ENGINE=InnoDB AUTO_INCREMENT=60520 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Se borra automaticamente 8 dias en el pasado desde vn2008.clean'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11609,7 +11609,7 @@ CREATE TABLE `scan_line` ( PRIMARY KEY (`scan_line_id`), KEY `id_scan_id_idx` (`scan_id`), CONSTRAINT `id_scan_id` FOREIGN KEY (`scan_id`) REFERENCES `scan` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=764206 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=765612 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11807,21 +11807,6 @@ CREATE TABLE `state` ( ) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `subordinate` --- - -DROP TABLE IF EXISTS `subordinate`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `subordinate` ( - `Id_Trabajador` bigint(11) DEFAULT NULL, - `visited` int(1) NOT NULL DEFAULT '0', - `boss` int(1) NOT NULL DEFAULT '0', - KEY `Id_Trabajador` (`Id_Trabajador`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Temporary table structure for view `tag` -- @@ -12101,7 +12086,7 @@ CREATE TABLE `ticket_observation` ( KEY `observation_type_id` (`observation_type_id`), CONSTRAINT `ticket_observation_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ticket_observation_ibfk_2` FOREIGN KEY (`observation_type_id`) REFERENCES `observation_type` (`observation_type_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1095466 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; +) ENGINE=InnoDB AUTO_INCREMENT=1096044 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -12224,7 +12209,7 @@ CREATE TABLE `travel` ( CONSTRAINT `travel_ibfk_2` FOREIGN KEY (`warehouse_id_out`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE, CONSTRAINT `travel_ibfk_3` FOREIGN KEY (`agency_id`) REFERENCES `Agencias` (`Id_Agencia`) ON UPDATE CASCADE, CONSTRAINT `travel_ibfk_4` FOREIGN KEY (`cargoSupplierFk`) REFERENCES `Proveedores` (`Id_Proveedor`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=108476 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=108753 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -12361,7 +12346,7 @@ CREATE TABLE `travel_dits` ( KEY `fgkey2_idx` (`Id_Ticket`), KEY `fgkey3_idx` (`Id_Trabajador`), CONSTRAINT `travel_dits_ibfk_1` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=171784 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=171843 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -13735,7 +13720,7 @@ CREATE TABLE `workerTeam` ( PRIMARY KEY (`id`), KEY `user_team_idx` (`user`), CONSTRAINT `user_team` FOREIGN KEY (`user`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=152 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=153 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43316,7 +43301,7 @@ CREATE TABLE `clientLog` ( KEY `userFk` (`userFk`), CONSTRAINT `clientLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `vn2008`.`Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `clientLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=166185 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=166285 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43735,7 +43720,7 @@ CREATE TABLE `creditClassification` ( KEY `creditClassifClientFk_idx` (`client`), KEY `creditClassifdateEnd_idx` (`dateEnd`), CONSTRAINT `creditClassifClientFk` FOREIGN KEY (`client`) REFERENCES `vn2008`.`Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2767 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2768 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -43780,7 +43765,7 @@ CREATE TABLE `creditInsurance` ( PRIMARY KEY (`id`), KEY `CreditInsurance_Fk1_idx` (`creditClassification`), CONSTRAINT `CreditInsurance_Fk1` FOREIGN KEY (`creditClassification`) REFERENCES `creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1928 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalla los clientes que tienen seguro de credito'; +) ENGINE=InnoDB AUTO_INCREMENT=1930 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalla los clientes que tienen seguro de credito'; /*!40101 SET character_set_client = @saved_cs_client */; ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -43935,7 +43920,7 @@ CREATE TABLE `dua` ( CONSTRAINT `dua_fk1` FOREIGN KEY (`gestdocFk`) REFERENCES `vn2008`.`gestdoc` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `dua_fk2` FOREIGN KEY (`awbFk`) REFERENCES `vn2008`.`awb` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `dua_fk4` FOREIGN KEY (`companyFk`) REFERENCES `vn2008`.`empresa` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=3208 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=3213 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43976,7 +43961,7 @@ CREATE TABLE `duaIntrastat` ( KEY `duaIntrastat_fk2_idx` (`duaFk`), CONSTRAINT `duaIntrastat_fk1` FOREIGN KEY (`intrastatFk`) REFERENCES `vn2008`.`Intrastat` (`Codintrastat`) ON UPDATE CASCADE, CONSTRAINT `duaIntrastat_fk2` FOREIGN KEY (`duaFk`) REFERENCES `dua` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=4449 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4453 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43996,7 +43981,7 @@ CREATE TABLE `duaInvoiceIn` ( KEY `duaInvoiceIn_fk2_idx` (`invoiceInFk`), CONSTRAINT `duaInvoiceIn_fk1` FOREIGN KEY (`duaFk`) REFERENCES `dua` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `duaInvoiceIn_fk2` FOREIGN KEY (`invoiceInFk`) REFERENCES `vn2008`.`recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=4158 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Facturas asociadas a la declaración aduanera, básicamente la del agente transitario'; +) ENGINE=InnoDB AUTO_INCREMENT=4162 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Facturas asociadas a la declaración aduanera, básicamente la del agente transitario'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44021,7 +44006,7 @@ CREATE TABLE `duaTax` ( CONSTRAINT `duaTax_fk1` FOREIGN KEY (`duaFk`) REFERENCES `dua` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `duaTax_fk2` FOREIGN KEY (`supplierFk`) REFERENCES `vn2008`.`Proveedores` (`Id_Proveedor`) ON UPDATE CASCADE, CONSTRAINT `duaTax_fk3` FOREIGN KEY (`taxClassFk`) REFERENCES `vn2008`.`iva_group` (`iva_group_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1155 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1184 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44117,7 +44102,7 @@ CREATE TABLE `entryLog` ( KEY `entryLog_ibfk_2` (`userFk`), CONSTRAINT `entryLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `vn2008`.`Entradas` (`Id_Entrada`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `entryLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=52194 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=52485 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44701,7 +44686,7 @@ CREATE TABLE `invoiceOutExpence` ( KEY `invoiceOutExpence_FK_2_idx` (`expenceFk`), CONSTRAINT `invoiceOutExpence_FK_1` FOREIGN KEY (`invoiceOutFk`) REFERENCES `vn2008`.`Facturas` (`factura_id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `invoiceOutExpence_FK_2` FOREIGN KEY (`expenceFk`) REFERENCES `vn2008`.`Gastos` (`Id_Gasto`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=66881 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Desglosa la base imponible de una factura en funcion del tipo de gasto/venta'; +) ENGINE=InnoDB AUTO_INCREMENT=66896 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Desglosa la base imponible de una factura en funcion del tipo de gasto/venta'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44744,7 +44729,7 @@ CREATE TABLE `invoiceOutTax` ( KEY `pgcFk` (`pgcFk`), CONSTRAINT `invoiceOutFk` FOREIGN KEY (`invoiceOutFk`) REFERENCES `vn2008`.`Facturas` (`factura_id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `invoiceOutTax_ibfk_1` FOREIGN KEY (`pgcFk`) REFERENCES `pgc` (`code`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=928006 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=928021 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44957,7 +44942,7 @@ CREATE TABLE `itemTag` ( KEY `priorityItem` (`itemFk`,`priority`), KEY `tagFk` (`tagFk`,`value`), CONSTRAINT `itemFK` FOREIGN KEY (`itemFk`) REFERENCES `vn2008`.`Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=327171 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=327306 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45019,7 +45004,7 @@ CREATE TABLE `itemTaxCountry` ( CONSTRAINT `countryFK_paises` FOREIGN KEY (`countryFk`) REFERENCES `vn2008`.`Paises` (`Id`) ON UPDATE CASCADE, CONSTRAINT `itemFK_Article` FOREIGN KEY (`itemFk`) REFERENCES `vn2008`.`Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `taxClassFK_Iva_Group` FOREIGN KEY (`taxClassFk`) REFERENCES `vn2008`.`iva_group` (`iva_group_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=500528 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Define la clase de iva por artículo y pais'; +) ENGINE=InnoDB AUTO_INCREMENT=500774 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Define la clase de iva por artículo y pais'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45251,7 +45236,7 @@ CREATE TABLE `message` ( KEY `sender` (`sender`), KEY `recipient` (`recipient`), KEY `uuid` (`uuid`(8)) -) ENGINE=InnoDB AUTO_INCREMENT=1514169 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1515048 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45273,7 +45258,7 @@ CREATE TABLE `messageInbox` ( PRIMARY KEY (`id`), KEY `uuid` (`uuid`(8)), KEY `finalRecipient` (`finalRecipient`) -) ENGINE=InnoDB AUTO_INCREMENT=1661002 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1661923 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -46174,7 +46159,7 @@ CREATE TABLE `routeLog` ( `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `description` text COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=509081 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=510104 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -46279,7 +46264,7 @@ CREATE TABLE `sms` ( `status` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=98231 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=98295 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -46443,7 +46428,7 @@ CREATE TABLE `stockBuyed` ( UNIQUE KEY `date_UNIQUE` (`date`,`user`), KEY `stockBuyed_user_idx` (`user`), CONSTRAINT `stockBuyedUserFk` FOREIGN KEY (`user`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=337782 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=338307 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -46666,7 +46651,7 @@ CREATE TABLE `ticketLog` ( KEY `logTicketuserFk` (`userFk`), CONSTRAINT `ticketLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `vn2008`.`Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ticketLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=987016 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=989581 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -46766,7 +46751,7 @@ CREATE TABLE `ticketPackaging` ( KEY `ticketPackaging_fk2_idx` (`packagingFk`), CONSTRAINT `ticketPackaging_fk1` FOREIGN KEY (`ticketFk`) REFERENCES `vn2008`.`Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ticketPackaging_fk2` FOREIGN KEY (`packagingFk`) REFERENCES `vn2008`.`Cubos` (`Id_Cubo`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=31714 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=31840 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47246,7 +47231,7 @@ CREATE TABLE `workerDocument` ( KEY `workerDocument_ibfk_2` (`document`), CONSTRAINT `workerDocument_ibfk_1` FOREIGN KEY (`worker`) REFERENCES `vn2008`.`Trabajadores` (`user_id`) ON UPDATE CASCADE, CONSTRAINT `workerDocument_ibfk_2` FOREIGN KEY (`document`) REFERENCES `vn2008`.`gestdoc` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=6145 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=6157 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47316,7 +47301,7 @@ CREATE TABLE `workerLog` ( KEY `userFk_idx` (`userFk`), CONSTRAINT `userFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `workerFk` FOREIGN KEY (`originFk`) REFERENCES `vn2008`.`Trabajadores` (`Id_Trabajador`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB AUTO_INCREMENT=4404 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4413 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -53849,6 +53834,46 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `orderCreate` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `orderCreate`( + vLanded DATE, + vAgencyMode INT, + vAddress INT, + vSourceApp VARCHAR(10), + OUT vOrderId INT) +BEGIN + + DECLARE vDeliveryMethod INT; + DECLARE vClient INT; + + SELECT deliveryMethodFk INTO vDeliveryMethod + FROM vn.agencyMode + WHERE id = vAgencyMode; + + SELECT clientFk INTO vClient + FROM vn.address + WHERE id = vAddress; + + INSERT INTO hedera.order(date_send,customer_id,delivery_method_id,agency_id,address_id,source_app) + VALUES( vLanded,vClient ,vDeliveryMethod,vAgencyMode ,vAddress ,vSourceApp); + + SET vOrderId = LAST_INSERT_ID(); + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `packageInvoicing` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -57597,7 +57622,7 @@ CREATE TABLE `batch` ( KEY `buy_edi_id` (`buy_edi_id`), CONSTRAINT `batch_ibfk_1` FOREIGN KEY (`message_id`) REFERENCES `message` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `batch_ibfk_2` FOREIGN KEY (`buy_edi_id`) REFERENCES `vn2008`.`buy_edi` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=336351 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=336849 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -57984,7 +58009,7 @@ CREATE TABLE `message` ( UNIQUE KEY `mail_id` (`mail_id`), KEY `sender_id` (`sender_id`), CONSTRAINT `message_ibfk_2` FOREIGN KEY (`sender_id`) REFERENCES `mail` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=357911 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=358443 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -64067,7 +64092,7 @@ CREATE TABLE `cdr` ( KEY `dstchannel` (`dst_channel`), KEY `disposition` (`disposition`), KEY `src` (`src`) -) ENGINE=MyISAM AUTO_INCREMENT=204735 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=MyISAM AUTO_INCREMENT=204909 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -64859,7 +64884,7 @@ CREATE TABLE `cache_calc` ( KEY `cache_id` (`cache_id`), KEY `cacheName` (`cacheName`), KEY `expires` (`expires`) -) ENGINE=InnoDB AUTO_INCREMENT=138098 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=138447 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -66628,7 +66653,7 @@ CREATE TABLE `inter` ( CONSTRAINT `inter_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `vn2008`.`Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `inter_state` FOREIGN KEY (`state_id`) REFERENCES `vn2008`.`state` (`id`) ON UPDATE CASCADE, CONSTRAINT `responsable` FOREIGN KEY (`Id_Supervisor`) REFERENCES `vn2008`.`Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=11311816 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=11328429 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -67397,7 +67422,7 @@ CREATE TABLE `order` ( `address_id` int(11) DEFAULT NULL, `company_id` smallint(5) unsigned NOT NULL DEFAULT '442', `note` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `source_app` set('WEB','ANDROID','IOS','TPV','TABLET_VN','') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'TPV', + `source_app` set('WEB','ANDROID','IOS','SALIX','TPV','TABLET_VN','') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'TPV', `is_bionic` tinyint(1) NOT NULL DEFAULT '1', `confirmed` tinyint(1) NOT NULL DEFAULT '0', `date_make` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, @@ -67415,7 +67440,7 @@ CREATE TABLE `order` ( CONSTRAINT `order_ibfk_5` FOREIGN KEY (`address_id`) REFERENCES `vn2008`.`Consignatarios` (`id_consigna`) ON UPDATE CASCADE, CONSTRAINT `order_ibfk_8` FOREIGN KEY (`delivery_method_id`) REFERENCES `vn2008`.`Vistas` (`vista_id`) ON UPDATE CASCADE, CONSTRAINT `order_ibfk_9` FOREIGN KEY (`agency_id`) REFERENCES `vn2008`.`Agencias` (`Id_Agencia`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1446456 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1447495 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -67514,7 +67539,7 @@ CREATE TABLE `orderRow` ( KEY `warehouse_shipment` (`warehouseFk`,`shipment`), CONSTRAINT `orderRow_ibfk_2` FOREIGN KEY (`itemFk`) REFERENCES `vn2008`.`Articles` (`Id_Article`) ON UPDATE CASCADE, CONSTRAINT `orderRow_ibfk_3` FOREIGN KEY (`orderFk`) REFERENCES `order` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=8892334 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=8897233 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -67861,7 +67886,7 @@ CREATE TABLE `tpvTransaction` ( CONSTRAINT `receipt_id` FOREIGN KEY (`receiptFk`) REFERENCES `vn2008`.`Recibos` (`Id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `tpvTransaction_ibfk_1` FOREIGN KEY (`clientFk`) REFERENCES `vn2008`.`Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `tpvTransaction_ibfk_2` FOREIGN KEY (`merchantFk`) REFERENCES `tpvMerchant` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=226418 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Transactions realized through the virtual TPV'; +) ENGINE=InnoDB AUTO_INCREMENT=226602 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Transactions realized through the virtual TPV'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -67896,7 +67921,7 @@ CREATE TABLE `visit` ( PRIMARY KEY (`id`), KEY `firstAgent` (`firstAgent`), CONSTRAINT `visit_ibfk_1` FOREIGN KEY (`firstAgent`) REFERENCES `visitAgent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1299458 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1300195 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -67916,7 +67941,7 @@ CREATE TABLE `visitAccess` ( KEY `visit_access_idx_agent` (`agent`), KEY `stamp` (`stamp`), CONSTRAINT `visitAccess_ibfk_1` FOREIGN KEY (`agent`) REFERENCES `visitAgent` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2841499 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2843373 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -67941,7 +67966,7 @@ CREATE TABLE `visitAgent` ( KEY `firstAccess` (`firstAccess`), CONSTRAINT `visitAgent_ibfk_1` FOREIGN KEY (`visit`) REFERENCES `visit` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `visitAgent_ibfk_2` FOREIGN KEY (`firstAccess`) REFERENCES `visitAccess` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1844655 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1845585 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -67961,7 +67986,7 @@ CREATE TABLE `visitUser` ( KEY `date_time` (`stamp`), KEY `user_id` (`user`), CONSTRAINT `visitUser_ibfk_1` FOREIGN KEY (`access`) REFERENCES `visitAccess` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2704371 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2705822 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -76037,4 +76062,4 @@ USE `stock`; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-06-28 12:20:48 +-- Dump completed on 2018-06-29 8:06:40 diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index bfdf6b540..06bb2698e 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -81,9 +81,9 @@ UPDATE `vn`.`agencyMode` SET `id` = 4 WHERE `name` = 'Entanglement'; UPDATE `vn`.`agencyMode` SET `id` = 5 WHERE `name` = 'Quantum break device'; UPDATE `vn`.`agencyMode` SET `id` = 6 WHERE `name` = 'Walking'; -UPDATE `vn`.`agencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup'; -UPDATE `vn`.`agencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery'; -UPDATE `vn`.`agencyMode` SET `id` = 3 WHERE `name` = 'Teleportation device'; +UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 1; +UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 2; +UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 2 WHERE `id` = 3; UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 4; UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 5; UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 2 WHERE `id` = 6;