diff --git a/client/auth/src/login/style.scss b/client/auth/src/login/style.scss index e959e15b2..61e5a3e02 100644 --- a/client/auth/src/login/style.scss +++ b/client/auth/src/login/style.scss @@ -45,7 +45,7 @@ vn-login > div { position: absolute; width: 0; top: .3em; - right: 4em; + right: 3em; overflow: visible; } } diff --git a/client/client/src/address/create/index.html b/client/client/src/address/create/index.html index 3af24d2d5..c3d1077dc 100644 --- a/client/client/src/address/create/index.html +++ b/client/client/src/address/create/index.html @@ -9,7 +9,7 @@
Address - + diff --git a/client/client/src/address/edit/address-edit.spec.js b/client/client/src/address/edit/address-edit.spec.js index c48108b99..3b9ae5385 100644 --- a/client/client/src/address/edit/address-edit.spec.js +++ b/client/client/src/address/edit/address-edit.spec.js @@ -15,41 +15,9 @@ describe('Client', () => { $componentController = _$componentController_; $state = _$state_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); $state.params.addressId = '1'; controller = $componentController('vnClientAddressEdit', {$state: $state}); })); - - it('should define and set address property', () => { - expect(controller.address.id).toEqual(1); - }); - - describe('_observationsEquals', () => { - it('should return true if two observations are equals independent of control attributes', () => { - let ob1 = {id: 1, observationTypeFk: 1, description: 'Spiderman rocks', showAddIcon: true}; - let ob2 = {id: 1, observationTypeFk: 1, description: 'Spiderman rocks', showAddIcon: false}; - let equals = controller.equalObservations(ob2, ob1); - - expect(equals).toBeTruthy(); - }); - - it('should return false if two observations are not equals independent of control attributes', () => { - let ob1 = {id: 1, observationTypeFk: 1, description: 'Spiderman rocks', showAddIcon: true}; - let ob2 = {id: 1, observationTypeFk: 1, description: 'Spiderman sucks', showAddIcon: true}; - let equals = controller.equalObservations(ob2, ob1); - - expect(equals).toBeFalsy(); - }); - }); - - describe('$onInit()', () => { - it('should perform a GET query to receive the address observations', () => { - let filter = {where: {addressFk: 1}, include: {relation: 'observationType'}}; - let res = ['some notes']; - $httpBackend.whenGET(`/client/api/AddressObservations?filter=${JSON.stringify(filter)}`).respond(res); - $httpBackend.expectGET(`/client/api/AddressObservations?filter=${JSON.stringify(filter)}`); - controller.$onInit(); - $httpBackend.flush(); - }); - }); }); }); diff --git a/client/client/src/address/edit/index.html b/client/client/src/address/edit/index.html index dc7218e8e..40a932dc4 100644 --- a/client/client/src/address/edit/index.html +++ b/client/client/src/address/edit/index.html @@ -1,19 +1,32 @@ + + form="form"> - + + + + + Address - + - - - - -
- - Notes - - + Notes +
+ - - - - + - - + ng-click="$ctrl.removeObservation($index)" + tabindex="-1"> + + - - - - - +
+ + diff --git a/client/client/src/address/edit/index.js b/client/client/src/address/edit/index.js index 117560e06..5a55d78d8 100644 --- a/client/client/src/address/edit/index.js +++ b/client/client/src/address/edit/index.js @@ -1,151 +1,30 @@ import ngModule from '../../module'; export default class Controller { - constructor($state, $scope, $http, $q, $translate, vnApp) { + constructor($scope, $state) { + this.$ = $scope; this.$state = $state; - this.$scope = $scope; - this.$http = $http; - this.$q = $q; - this.$translate = $translate; - this.vnApp = vnApp; - - this.address = { - id: parseInt($state.params.addressId) - }; - this.observations = []; - this.oldObservations = {}; - this.removedObservations = []; - } - - _setDirtyForm() { - if (this.$scope.form) { - this.$scope.form.$setDirty(); - } - } - - _unsetDirtyForm() { - if (this.$scope.form) { - this.$scope.form.$setPristine(); - } - } - - addObservation() { - this.observations.push({observationTypeFk: null, addressFk: this.address.id, description: null}); + this.$stateParams = $state.params; } removeObservation(index) { - let item = this.observations[index]; - if (item) { - this.observations.splice(index, 1); - if (item.id) { - this.removedObservations.push(item.id); - this._setDirtyForm(); - } - } - if (this.observations.length === 0 && Object.keys(this.oldObservations).length === 0) { - this._unsetDirtyForm(); - } - } - - _submitObservations(observationsObject) { - return this.$http.post(`/client/api/AddressObservations/crudAddressObservations`, observationsObject); - } - - equalObservations(oldObj, newObj) { - return oldObj.id === newObj.id && oldObj.observationTypeFk === newObj.observationTypeFk && oldObj.description === newObj.description; + this.$.watcher.setDirty(); + this.$.model.remove(index); } submit() { - if (this.$scope.addressForm.$invalid || this.$scope.notesForm.$invalid) { - this.vnApp.showMessage( - this.$translate.instant('Some fields are invalid') - ); - return false; - } - - let canSubmitWatcher = this.$scope.watcher.dataChanged(); - let canSubmitObservations; - let repeatedTypes = false; - let emptyFields = false; - let types = []; - let observationsObj = { - delete: this.removedObservations, - create: [], - update: [] - }; - - this.observations.forEach(observation => { - let isNewObservation = observation.id === undefined; - - if (observation.observationTypeFk && types.indexOf(observation.observationTypeFk) !== -1) { - repeatedTypes = true; - return; - } - - if (observation.observationTypeFk === null || observation.description === null) { - emptyFields = true; - return; - } - - if (observation.observationTypeFk) - types.push(observation.observationTypeFk); - - if (isNewObservation && observation.observationTypeFk && observation.description) { - observationsObj.create.push(observation); - } else if (!isNewObservation && !this.equalObservations(this.oldObservations[observation.id], observation)) { - observationsObj.update.push(observation); - } - }); - - canSubmitObservations = observationsObj.update.length > 0 || observationsObj.create.length > 0 || observationsObj.delete.length > 0; - - if (repeatedTypes) { - this.vnApp.showMessage( - this.$translate.instant('The observation type must be unique') - ); - } else if (emptyFields) { - this.vnApp.showMessage( - this.$translate.instant('No field can be blank') - ); - } else if (canSubmitWatcher && !canSubmitObservations) { - this.$scope.watcher.submit().then(() => { - this.$state.go('client.card.address.index', {id: this.$state.params.id}); + this.$.watcher.check(); + this.$.watcher.realSubmit() + .then(() => this.$.model.save(true)) + .then(() => { + this.$.watcher.setPristine(); + this.$.watcher.notifySaved(); this.card.reload(); + this.$state.go('client.card.address.index', {id: this.$stateParams.id}); }); - } else if (!canSubmitWatcher && canSubmitObservations) { - this._submitObservations(observationsObj).then(() => { - this.$state.go('client.card.address.index', {id: this.$state.params.id}); - }); - } else if (canSubmitWatcher && canSubmitObservations) { - this.$q.all([this.$scope.watcher.submit(), this._submitObservations(observationsObj)]).then(() => { - this.$state.go('client.card.address.index', {id: this.$state.params.id}); - }); - } else { - this.vnApp.showMessage( - this.$translate.instant('No changes to save') - ); - } - this._unsetDirtyForm(); - } - - _getAddressNotes() { - let filter = { - where: {addressFk: this.address.id}, - include: {relation: 'observationType'} - }; - this.$http.get(`/client/api/AddressObservations?filter=${JSON.stringify(filter)}`).then(res => { - this.observations = res.data; - res.data.forEach(item => { - this.oldObservations[item.id] = Object.assign({}, item); - }); - }); - } - - $onInit() { - this._getAddressNotes(); } } -Controller.$inject = ['$state', '$scope', '$http', '$q', '$translate', 'vnApp']; +Controller.$inject = ['$scope', '$state']; ngModule.component('vnClientAddressEdit', { template: require('./index.html'), diff --git a/client/client/src/address/index/index.html b/client/client/src/address/index/index.html index 5df34ac32..c175f42ff 100644 --- a/client/client/src/address/index/index.html +++ b/client/client/src/address/index/index.html @@ -4,7 +4,7 @@ Addresses + ng-class="{'bg-main': address.isDefaultAddress,'bg-opacity-item': !address.isActive && !address.isDefaultAddress}"> -
{{::address.nickname}}
-
{{::address.street}}
-
{{::address.city}}, {{::address.province}}
-
{{::address.phone}}, {{::address.mobile}}
+ + +
{{::address.nickname}}
+
{{::address.street}}
+
{{::address.city}}, {{::address.province}}
+
{{::address.phone}}, {{::address.mobile}}
+ + + + + + diff --git a/client/client/src/basic-data/index.html b/client/client/src/basic-data/index.html index 17ac4cf99..0b42536e6 100644 --- a/client/client/src/basic-data/index.html +++ b/client/client/src/basic-data/index.html @@ -10,17 +10,19 @@ Basic data - - - + + + + + Pay method - + initial-data="$ctrl.client.payMethod"> - - - + + + + + -
+
Create client - - - - - - - - {{firstName}} {{name}} + + + + + + + + - - + + + + + + + + + + + + + + - +
diff --git a/client/client/src/credit-insurance/create/index.html b/client/client/src/credit-insurance/create/index.html index 2a83a2775..b37ed2c9a 100644 --- a/client/client/src/credit-insurance/create/index.html +++ b/client/client/src/credit-insurance/create/index.html @@ -4,7 +4,6 @@ diff --git a/client/client/src/credit-insurance/index/credit-insurance-index.spec.js b/client/client/src/credit-insurance/index/credit-insurance-index.spec.js index 2a87132be..74cf9f789 100644 --- a/client/client/src/credit-insurance/index/credit-insurance-index.spec.js +++ b/client/client/src/credit-insurance/index/credit-insurance-index.spec.js @@ -13,6 +13,7 @@ describe('Client', () => { beforeEach(angular.mock.inject((_$componentController_, _$httpBackend_) => { $componentController = _$componentController_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); controller = $componentController('vnClientCreditInsuranceIndex'); })); @@ -64,12 +65,13 @@ describe('Client', () => { it('should define the classificationId property of the controller and then call the show method()', () => { controller.$scope.closeContract = {show: () => {}}; spyOn(controller.$scope.closeContract, 'show'); + expect(controller.classificationId).toBeFalsy(); controller.closeContract({id: 1}); expect(controller.classificationId).toEqual(1); expect(controller.$scope.closeContract.show).toHaveBeenCalledWith(); - }); + }); }); }); }); diff --git a/client/client/src/credit-insurance/index/index.html b/client/client/src/credit-insurance/index/index.html index b285d3629..69ee6cb74 100644 --- a/client/client/src/credit-insurance/index/index.html +++ b/client/client/src/credit-insurance/index/index.html @@ -2,9 +2,9 @@ Contract credit insurance - + - + - + diff --git a/client/client/src/credit-insurance/index/locale/es.yml b/client/client/src/credit-insurance/index/locale/es.yml index 731fe3c2a..1262a5dd4 100644 --- a/client/client/src/credit-insurance/index/locale/es.yml +++ b/client/client/src/credit-insurance/index/locale/es.yml @@ -2,5 +2,6 @@ Contract credit insurance: Contratos de seguro de crédito New contract: Nuevo contrato Close contract: Cerrar contrato Edit contract: Modificar contrato -List classifications: Ver clasificaciones -Are you sure you want to close this contract?: ¿Seguro que quieres cerrar este contrato? \ No newline at end of file +View credits: Ver créditos +Are you sure you want to close this contract?: ¿Seguro que quieres cerrar este contrato? +Grade: Grado \ No newline at end of file diff --git a/client/client/src/credit-insurance/insurance/create/index.html b/client/client/src/credit-insurance/insurance/create/index.html index 49aae53ae..77465eb91 100644 --- a/client/client/src/credit-insurance/insurance/create/index.html +++ b/client/client/src/credit-insurance/insurance/create/index.html @@ -8,7 +8,7 @@
- New classification + New credit + \ No newline at end of file diff --git a/client/client/src/credit-insurance/insurance/create/index.js b/client/client/src/credit-insurance/insurance/create/index.js index 43cb1ccce..51feab0f5 100644 --- a/client/client/src/credit-insurance/insurance/create/index.js +++ b/client/client/src/credit-insurance/insurance/create/index.js @@ -1,15 +1,14 @@ import ngModule from '../../../module'; class Controller { - constructor($state, $filter) { + constructor($filter) { this.insurance = { created: $filter('date')(new Date(), 'yyyy-MM-dd HH:mm') }; - this.classificationId = $state.params.classificationId; } } -Controller.$inject = ['$state', '$filter']; +Controller.$inject = ['$filter']; ngModule.component('vnClientCreditInsuranceInsuranceCreate', { template: require('./index.html'), diff --git a/client/client/src/credit-insurance/insurance/create/locale/es.yml b/client/client/src/credit-insurance/insurance/create/locale/es.yml index be5810643..4c9b75dea 100644 --- a/client/client/src/credit-insurance/insurance/create/locale/es.yml +++ b/client/client/src/credit-insurance/insurance/create/locale/es.yml @@ -1 +1 @@ -New classification: Nueva clasificación \ No newline at end of file +New credit: Nuevo crédito \ No newline at end of file diff --git a/client/client/src/credit-insurance/insurance/index/credit-insurance-list.spec.js b/client/client/src/credit-insurance/insurance/index/credit-insurance-list.spec.js index a6723d3b6..f994829a8 100644 --- a/client/client/src/credit-insurance/insurance/index/credit-insurance-list.spec.js +++ b/client/client/src/credit-insurance/insurance/index/credit-insurance-list.spec.js @@ -14,6 +14,7 @@ describe('Client', () => { $componentController = _$componentController_; let $state = {params: {classificationId: 1}}; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); controller = $componentController('vnClientCreditInsuranceInsuranceIndex', {$state: $state}); })); diff --git a/client/client/src/credit-insurance/insurance/index/index.html b/client/client/src/credit-insurance/insurance/index/index.html index 9380b4303..b5c42326a 100644 --- a/client/client/src/credit-insurance/insurance/index/index.html +++ b/client/client/src/credit-insurance/insurance/index/index.html @@ -1,31 +1,38 @@ - + Requested credits - - - - - - - - {{::insurance.credit}} - {{::insurance.grade}} - {{::insurance.created | date: 'dd/MM/yyyy'}} - - - No results - + + + + + + + + + + + + + + + + + + +
CreditGradeCreated
{{::insurance.credit | currency: '€': 2}}{{::insurance.grade}}{{::insurance.created | date: 'dd/MM/yyyy'}}
No results
 + + + - + fixed-bottom-right vn-tooltip="New credit" vn-bind="+" ng-if="!$ctrl.isClosed"> \ No newline at end of file diff --git a/client/client/src/credit/create/credit-create.spec.js b/client/client/src/credit/create/credit-create.spec.js index cff48be7d..7dea16d10 100644 --- a/client/client/src/credit/create/credit-create.spec.js +++ b/client/client/src/credit/create/credit-create.spec.js @@ -34,6 +34,7 @@ describe('Client', () => { $state = _$state_; $state.params.id = 101; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); controller = $componentController('vnClientCreditCreate', {$scope: $scope}, {$state: $state}); })); describe('onSubmit()', () => { diff --git a/client/client/src/descriptor/descriptor.spec.js b/client/client/src/descriptor/descriptor.spec.js index f59ff9bb2..58d348f43 100644 --- a/client/client/src/descriptor/descriptor.spec.js +++ b/client/client/src/descriptor/descriptor.spec.js @@ -13,6 +13,7 @@ describe('Descriptor', () => { beforeEach(angular.mock.inject((_$componentController_, _$httpBackend_) => { $componentController = _$componentController_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); controller = $componentController('vnClientDescriptor'); })); diff --git a/client/client/src/descriptor/index.js b/client/client/src/descriptor/index.js index d71a336d6..7dfb44347 100644 --- a/client/client/src/descriptor/index.js +++ b/client/client/src/descriptor/index.js @@ -25,6 +25,7 @@ class Controller { } } } + Controller.$inject = ['$http']; ngModule.component('vnClientDescriptor', { diff --git a/client/client/src/fiscal-data/fiscal-data.spec.js b/client/client/src/fiscal-data/fiscal-data.spec.js index a16593ddb..f6dbd4b6a 100644 --- a/client/client/src/fiscal-data/fiscal-data.spec.js +++ b/client/client/src/fiscal-data/fiscal-data.spec.js @@ -14,6 +14,7 @@ describe('Client', () => { beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_) => { $componentController = _$componentController_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); $scope = $rootScope.$new(); controller = $componentController('vnClientFiscalData', {$scope: $scope}); })); diff --git a/client/client/src/fiscal-data/index.html b/client/client/src/fiscal-data/index.html index 445939624..86c612ebb 100644 --- a/client/client/src/fiscal-data/index.html +++ b/client/client/src/fiscal-data/index.html @@ -24,13 +24,6 @@ vn-acl="administrative, salesAssistant, salesPerson" acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}"> - - - - - - +
+ + + + - + - - - - - + + + + + + + + + + + + +
- - - - - + + + - + + ng-repeat="client in clients track by client.id" + client="::client"> - - + +
@@ -30,4 +35,4 @@ - + \ No newline at end of file diff --git a/client/client/src/index/index.js b/client/client/src/index/index.js index 57a109c03..175ddb7d2 100644 --- a/client/client/src/index/index.js +++ b/client/client/src/index/index.js @@ -2,23 +2,42 @@ import ngModule from '../module'; import './item-client'; export default class Controller { - constructor($scope) { - this.$scope = $scope; + this.$ = $scope; this.clientSelected = null; } - search(index) { - index.accept(); - /* this.clients = []; - index.accept().then(res => { - this.clients = res.instances; - }); */ + exprBuilder(param, value) { + switch (param) { + case 'search': + return { + or: [ + {id: value}, + {name: {regexp: value}} + ] + }; + case 'phone': + return { + or: [ + {phone: value}, + {mobile: value} + ] + }; + case 'name': + case 'socialName': + case 'city': + return {[param]: {regexp: value}}; + case 'id': + case 'fi': + case 'postcode': + case 'email': + return {[param]: value}; + } } openSummary(client) { this.clientSelected = client; - this.$scope.dialogSummaryClient.show(); + this.$.dialogSummaryClient.show(); } } Controller.$inject = ['$scope']; diff --git a/client/client/src/index/locale/es.yml b/client/client/src/index/locale/es.yml index c221de7f6..97ad69ac3 100644 --- a/client/client/src/index/locale/es.yml +++ b/client/client/src/index/locale/es.yml @@ -2,4 +2,5 @@ Client id: Id cliente Phone: Teléfono Town/City: Ciudad Email: Correo electrónico -Create client: Crear cliente \ No newline at end of file +Create client: Crear cliente +View client: Ver cliente \ No newline at end of file diff --git a/client/client/src/locale/es.yml b/client/client/src/locale/es.yml index 881880e63..8908f3ec4 100644 --- a/client/client/src/locale/es.yml +++ b/client/client/src/locale/es.yml @@ -22,3 +22,4 @@ Credit contracts: Contratos de crédito Verified data: Datos comprobados Mandate: Mandato Amount: Importe +Back: Volver \ No newline at end of file diff --git a/client/client/src/search-panel/index.html b/client/client/src/search-panel/index.html index 2cb6a5aeb..de772afe3 100644 --- a/client/client/src/search-panel/index.html +++ b/client/client/src/search-panel/index.html @@ -1,22 +1,22 @@
- - + + - + - + - - + + - - + + diff --git a/client/client/src/search-panel/index.js b/client/client/src/search-panel/index.js index 5033dcb65..2ed83601a 100644 --- a/client/client/src/search-panel/index.js +++ b/client/client/src/search-panel/index.js @@ -1,18 +1,7 @@ import ngModule from '../module'; - -export default class Controller { - constructor() { - // onSubmit() is defined by @vnSearchbar - this.onSubmit = () => {}; - } - - onSearch() { - this.onSubmit(this.filter); - } -} -Controller.$inject = []; +import SearchPanel from 'core/src/components/searchbar/search-panel'; ngModule.component('vnClientSearchPanel', { template: require('./index.html'), - controller: Controller + controller: SearchPanel }); diff --git a/client/client/src/web-access/index.html b/client/client/src/web-access/index.html index 1c9070235..4948be34b 100644 --- a/client/client/src/web-access/index.html +++ b/client/client/src/web-access/index.html @@ -8,7 +8,7 @@ Web access - + diff --git a/client/core/src/components/autocomplete/autocomplete.js b/client/core/src/components/autocomplete/autocomplete.js index 6162faee4..e8dfe906f 100755 --- a/client/core/src/components/autocomplete/autocomplete.js +++ b/client/core/src/components/autocomplete/autocomplete.js @@ -62,6 +62,15 @@ export default class Autocomplete extends Input { this.refreshDisplayed(); } + set data(value) { + this._data = value; + this.refreshSelection(); + } + + get data() { + return this._data; + } + selectionIsValid(selection) { return selection && selection[this.valueField] == this._field @@ -212,7 +221,7 @@ export default class Autocomplete extends Input { showDropDown(search) { Object.assign(this.$.dropDown.$.model, { url: this.url, - staticData: this.data + staticData: this._data }); asignProps(this, this.$.dropDown, [ @@ -220,9 +229,9 @@ export default class Autocomplete extends Input { 'showField', 'where', 'order', + 'limit', 'showFilter', 'multiple', - 'limit', '$transclude' ]); diff --git a/client/core/src/components/autocomplete/autocomplete.spec.js b/client/core/src/components/autocomplete/autocomplete.spec.js index 602112b68..6ed409af2 100644 --- a/client/core/src/components/autocomplete/autocomplete.spec.js +++ b/client/core/src/components/autocomplete/autocomplete.spec.js @@ -66,6 +66,7 @@ describe('Component vnAutocomplete', () => { }; let json = encodeURIComponent(JSON.stringify(filter)); + $httpBackend.whenGET(`localhost?filter=${json}`).respond({}); $httpBackend.expectGET(`localhost?filter=${json}`); controller.field = data.id; $httpBackend.flush(); diff --git a/client/core/src/components/autocomplete/style.scss b/client/core/src/components/autocomplete/style.scss index d18503402..83b656ce5 100755 --- a/client/core/src/components/autocomplete/style.scss +++ b/client/core/src/components/autocomplete/style.scss @@ -1,4 +1,4 @@ -@import "colors"; +@import "effects"; vn-autocomplete > div > .mdl-textfield { position: relative; @@ -44,13 +44,12 @@ ul.vn-autocomplete { max-height: 300px; li { + @extend %clickable; display: block; padding: .8em; margin: 0; - cursor: pointer; - &.active, - &:hover { + &.active { background-color: $hover; } &.load-more { diff --git a/client/core/src/components/card/card.html b/client/core/src/components/card/card.html index e608d6fa9..7c89b545c 100644 --- a/client/core/src/components/card/card.html +++ b/client/core/src/components/card/card.html @@ -1 +1 @@ -
+
diff --git a/client/core/src/components/card/card.js b/client/core/src/components/card/card.js index 12df8da7d..405a67694 100644 --- a/client/core/src/components/card/card.js +++ b/client/core/src/components/card/card.js @@ -7,8 +7,12 @@ export default function directive(vnTemplate) { restrict: 'E', transclude: true, template: require('./card.html'), - link: function(_, $element) { + link: function($scope, $element, $attrs, $ctrl, $transclude) { $element.addClass('demo-card-wide mdl-shadow--2dp bg-panel'); + + $transclude($scope, function(clone) { + angular.element($element[0].querySelector('div')).append(clone); + }); } }; } diff --git a/client/core/src/components/dialog/dialog.js b/client/core/src/components/dialog/dialog.js index 401a13e11..c2e208509 100644 --- a/client/core/src/components/dialog/dialog.js +++ b/client/core/src/components/dialog/dialog.js @@ -9,18 +9,18 @@ import './style.scss'; * @property {HTMLElement} buttons The dialog HTML buttons */ export default class Dialog extends Component { - constructor($element, $transclude) { - super($element); + constructor($element, $scope, $transclude) { + super($element, $scope); this.shown = false; this.$element.addClass('vn-dialog'); this.element.addEventListener('mousedown', e => this.onBackgroundMouseDown(e)); if ($transclude) { - $transclude(tClone => { + $transclude($scope.$parent, tClone => { this.body = tClone[0]; }, null, 'body'); - $transclude(tClone => { + $transclude($scope.$parent, tClone => { this.buttons = tClone[0]; }, null, 'buttons'); } @@ -104,7 +104,7 @@ export default class Dialog extends Component { clearTimeout(this.transitionTimeout); } } -Dialog.$inject = ['$element', '$transclude']; +Dialog.$inject = ['$element', '$scope', '$transclude']; ngModule.component('vnDialog', { template: require('./dialog.html'), diff --git a/client/core/src/components/dialog/style.scss b/client/core/src/components/dialog/style.scss index 8aa2ed7a1..1a7404546 100644 --- a/client/core/src/components/dialog/style.scss +++ b/client/core/src/components/dialog/style.scss @@ -1,4 +1,4 @@ -@import "colors"; +@import "effects"; .vn-dialog { display: none; @@ -10,7 +10,7 @@ top: 0; height: 100%; width: 100%; - background-color: rgba(1, 1, 1, .6); + background-color: rgba(0, 0, 0, .6); opacity: 0; transition: opacity 300ms ease-in-out; @@ -19,7 +19,7 @@ } & > div { position: relative; - box-shadow: 0 0 .4em rgba(1,1,1,.4); + box-shadow: 0 0 .4em rgba(0, 0, 0, .4); background-color: white; border-radius: .2em; overflow: auto; @@ -34,16 +34,11 @@ input[type="button"], input[type="submit"], input[type="reset"] { + @extend %clickable; text-transform: uppercase; background-color: transparent; border: none; - cursor: pointer; - transition: background-color 250ms; border-radius: .1em; - - &:hover { - background-color: rgba(1,1,1,.1); - } } & > button.close { position: absolute; diff --git a/client/core/src/components/drop-down/drop-down.html b/client/core/src/components/drop-down/drop-down.html index 560ef77fa..9c216be38 100755 --- a/client/core/src/components/drop-down/drop-down.html +++ b/client/core/src/components/drop-down/drop-down.html @@ -1,7 +1,7 @@ - - + { $scope.popover = $componentController('vnPopover', {$element: $popover, $scope, $timeout, $transitions}); $scope.popover.$postLink(); - $scope.model = $componentController('vnModel', {$httpBackend, $q, $filter}); + $scope.model = $componentController('vnRestModel', {$httpBackend, $q, $filter}); controller = $componentController('vnDropDown', {$element, $scope, $transclude: null, $timeout, $httpBackend, $translate: null}); controller.$postLink(); controller.parent = angular.element('')[0]; diff --git a/client/core/src/components/drop-down/style.scss b/client/core/src/components/drop-down/style.scss index d0ab93745..89c274e7a 100755 --- a/client/core/src/components/drop-down/style.scss +++ b/client/core/src/components/drop-down/style.scss @@ -1,4 +1,4 @@ -@import "colors"; +@import "effects"; vn-drop-down { .dropdown { @@ -47,19 +47,15 @@ vn-drop-down { list-style-type: none; } li, .status { + @extend %clickable; padding: .6em; - cursor: pointer; white-space: nowrap; - transition: background-color 250ms ease-out; display: flex; & > input[type=checkbox] { margin: 0; margin-right: .6em; } - &:hover { - background-color: rgba(0, 0, 0, .1); - } &.active { background-color: #3D3A3B; color: white; diff --git a/client/core/src/components/grid-header/style.scss b/client/core/src/components/grid-header/style.scss index 2018b192f..9e8fccfab 100644 --- a/client/core/src/components/grid-header/style.scss +++ b/client/core/src/components/grid-header/style.scss @@ -1,7 +1,7 @@ @import "colors"; vn-grid-header { - border-bottom: 3px solid $main-header; + border-bottom: 3px solid $lines; font-weight: bold; .orderly{ text-align: center; diff --git a/client/core/src/components/grid/style.scss b/client/core/src/components/grid/style.scss index 197ce71f4..e2002a894 100644 --- a/client/core/src/components/grid/style.scss +++ b/client/core/src/components/grid/style.scss @@ -1,4 +1,4 @@ -@import "colors"; +@import "effects"; .vn-grid { border-collapse: collapse; @@ -19,20 +19,15 @@ } } & > thead, & > tbody { - border-bottom: 3px solid $main-header; + border-bottom: 3px solid $lines; } & > tbody > tr { - border-bottom: 1px solid $main-header; + border-bottom: 1px solid $lines; transition: background-color 200ms ease-in-out; &.clickable { - cursor: pointer; - - &:hover { - background-color: $hover; - } + @extend %clickable; } - &.success { background-color: rgba(163, 209, 49, 0.3); diff --git a/client/core/src/components/icon-button/icon-button.js b/client/core/src/components/icon-button/icon-button.js index 2da16cf1e..eb0e3dd49 100644 --- a/client/core/src/components/icon-button/icon-button.js +++ b/client/core/src/components/icon-button/icon-button.js @@ -3,7 +3,8 @@ import './style.scss'; export default class IconButton { constructor($element) { - $element[0].tabIndex = 0; + if ($element[0].getAttribute('tabindex') == null) + $element[0].tabIndex = 0; $element.on("keyup", event => this.onKeyDown(event, $element)); } diff --git a/client/core/src/components/icon-button/style.scss b/client/core/src/components/icon-button/style.scss index 5aeef63af..bd1f3f142 100644 --- a/client/core/src/components/icon-button/style.scss +++ b/client/core/src/components/icon-button/style.scss @@ -2,31 +2,16 @@ vn-icon-button { display: inline-block; - text-align: center; color: rgba($main-01, 0.7); + font-size: 18pt; transition: color 200ms ease-in-out; cursor: pointer; - &.button { - background-color: $main-01; - color: white; - width: 64px; - height: 36px; - box-shadow: rgba(0, 0, 0, 0.14) 0px 2px 2px 0px, rgba(0, 0, 0, 0.2) 0px 3px 1px -2px, rgba(0, 0, 0, 0.12) 0px 1px 5px 0px; - border-radius: 2px; - } - &.button:focus { - will-change: box-shadow; - box-shadow: 0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36); - transition: box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1); - } - &.button i { - margin-top: 6px; - } - & > i, - & > i.material-icons { + + & > vn-icon { display: block; font-size: inherit; color: inherit; + margin: 0 auto; } &:not(.button):hover { color: $main-01; diff --git a/client/core/src/components/icon-menu/icon-menu.spec.js b/client/core/src/components/icon-menu/icon-menu.spec.js deleted file mode 100644 index 11be1ff62..000000000 --- a/client/core/src/components/icon-menu/icon-menu.spec.js +++ /dev/null @@ -1,85 +0,0 @@ -import './icon-menu.js'; - -describe('Component vnIconMenu', () => { - let $componentController; - let $element; - let $httpBackend; - let $timeout; - let $scope; - let controller; - - beforeEach(() => { - angular.mock.module('client'); - }); - - beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_, _$timeout_) => { - $componentController = _$componentController_; - $httpBackend = _$httpBackend_; - $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); - $timeout = _$timeout_; - $scope = $rootScope.$new(); - $element = angular.element('
'); - controller = $componentController('vnIconMenu', {$scope, $element, $httpBackend, $timeout}, {url: 'test.com'}); - })); - - describe('component vnIconMenu', () => { - describe('findItem()', () => { - it(`should return items empty array if the controller does not provide a url and have no items defined`, () => { - controller.url = undefined; - controller.items = undefined; - let result = controller.findItems('some search value'); - - expect(result).toEqual([]); - }); - - it(`should return items array if the controller does not provide a url`, () => { - controller.url = undefined; - controller.items = ['Batman', 'Bruce Wayne']; - controller.findItems('some search value'); - - expect(controller.items.length).toEqual(2); - }); - - it(`should perform a search and store the result in controller items`, () => { - let search = 'The Joker'; - let json = JSON.stringify({where: {name: {regexp: search}}}); - $httpBackend.whenGET(`${controller.url}?filter=${json}`).respond([{id: 3, name: 'The Joker'}]); - $httpBackend.expectGET(`${controller.url}?filter=${json}`); - controller.findItems(search); - $httpBackend.flush(); - - expect(controller.items[0]).toEqual({id: 3, name: 'The Joker'}); - }); - - it(`should call getItems function if there's no search value`, () => { - spyOn(controller, 'getItems'); - controller.findItems(); - - expect(controller.getItems).toHaveBeenCalledWith(); - }); - }); - - describe('getItems()', () => { - it(`should perform a query and then push elements found into controller.items`, () => { - controller.items = []; - $httpBackend.whenGET(`${controller.url}?filter={}`).respond([{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce Wayne'}]); - $httpBackend.expectGET(`${controller.url}?filter={}`); - controller.getItems(); - $httpBackend.flush(); - - expect(controller.items).toEqual([{id: 1, name: 'Batman'}, {id: 2, name: 'Bruce Wayne'}]); - }); - - it(`should perform a query and then set controller.maxRow to false if there are no items in the controller`, () => { - controller.items = []; - controller.maxRow = true; - $httpBackend.whenGET(`${controller.url}?filter={"skip":0,"limit":true,"order":"name ASC"}`).respond(controller.items); - $httpBackend.expectGET(`${controller.url}?filter={"skip":0,"limit":true,"order":"name ASC"}`); - controller.getItems(); - $httpBackend.flush(); - - expect(controller.maxRow).toBeFalsy(); - }); - }); - }); -}); diff --git a/client/core/src/components/index.js b/client/core/src/components/index.js index 44a41911c..84ced2ea1 100644 --- a/client/core/src/components/index.js +++ b/client/core/src/components/index.js @@ -1,6 +1,8 @@ -import './textfield/textfield'; +import './model-proxy/model-proxy'; +import './rest-model/crud-model'; +import './rest-model/rest-model'; import './watcher/watcher'; -import './paging/paging'; +import './textfield/textfield'; import './icon/icon'; import './dialog/dialog'; import './confirm/confirm'; @@ -31,4 +33,7 @@ import './switch/switch'; import './float-button/float-button'; import './step-control/step-control'; import './label-value/label-value'; +import './paging/paging'; import './auto-paging/auto-paging'; +import './pagination/pagination'; +import './searchbar/searchbar'; diff --git a/client/core/src/components/label-value/label-value.js b/client/core/src/components/label-value/label-value.js index 09a6b28d6..60fcb4548 100644 --- a/client/core/src/components/label-value/label-value.js +++ b/client/core/src/components/label-value/label-value.js @@ -2,7 +2,7 @@ import ngModule from '../../module'; import './style.scss'; ngModule.component('vnLabelValue', { - template: require('../label-value/label-value.html'), + template: require('./label-value.html'), replace: true, transclude: true, bindings: { diff --git a/client/core/src/components/model-proxy/model-proxy.js b/client/core/src/components/model-proxy/model-proxy.js new file mode 100644 index 000000000..d0fdff939 --- /dev/null +++ b/client/core/src/components/model-proxy/model-proxy.js @@ -0,0 +1,135 @@ +import ngModule from '../../module'; + +export default class ModelProxy { + constructor() { + this._data = []; + this.resetChanges(); + } + + get orgData() { + return this._orgData; + } + + set orgData(value) { + this._orgData = value; + // this._data.splice(0, this._data.length); + + if (this.Row) { + this._data = []; + + for (let i = 0; i < value.length; i++) { + let row = new this.Row(value[i], i); + this._data.push(row); + } + } else + this._data = value; + + this.resetChanges(); + } + + get data() { + return this._data; + } + + set data(value) {} + + get fields() { + return this._fields; + } + + set fields(value) { + this._fields = value; + + let Row = function(data, index) { + this.$data = data; + this.$index = index; + this.$oldData = null; + this.$isNew = false; + }; + + for (let prop of value) { + Object.defineProperty(Row.prototype, prop, { + enumerable: true, + configurable: false, + set: function(value) { + if (!this.$isNew) { + if (!this.$oldData) + this.$oldData = {}; + if (!this.$oldData[prop]) + this.$oldData[prop] = this.$data[prop]; + } + + this.$data[prop] = value; + }, + get: function() { + return this.$data[prop]; + } + }); + } + + this.Row = Row; + } + + remove(index) { + let data = this._data; + + let item; + [item] = data.splice(index, 1); + + for (let i = index; i < data.length; i++) + data[i].$index = i; + + if (!item.$isNew) + this.removed.push(item); + } + + insert(data) { + data = Object.assign(data || {}, this.link); + let newRow = new this.Row(data, this._data.length); + newRow.$isNew = true; + return this._data.push(newRow); + } + + resetChanges() { + this.removed = []; + + for (let row of this._data) { + row.$oldData = null; + row.$isNew = false; + } + } + + undoChanges() { + let data = this._data; + + for (let i = 0; i < data.length; i++) { + let row = data[i]; + + if (row.$oldData) + Object.assign(row.$data, row.$oldData); + if (row.$isNew) + data.splice(i--, 1); + } + + for (let row of this.removed) + data.splice(row.$index, 0, row); + + this.resetChanges(); + } + + dataChanged() { + if (this.onDataChange) + this.onDataChange(); + } +} + +ngModule.component('vnModelProxy', { + controller: ModelProxy, + bindings: { + orgData: ' + + + + +
\ No newline at end of file diff --git a/client/core/src/components/pagination/pagination.js b/client/core/src/components/pagination/pagination.js new file mode 100644 index 000000000..604e37b01 --- /dev/null +++ b/client/core/src/components/pagination/pagination.js @@ -0,0 +1,75 @@ +import ngModule from '../../module'; +import Component from '../../lib/component'; +import './style.scss'; + +/** + * Pagination component that automatically loads more rows when + * the user scrolls down an element. + * + * @property {CrudModel} model The model used for pagination + * @property {String} scrollSelector The the scrollable element selector + * @property {HTMLElement} scrollElement The scrollable element + * @property {Number} scrollOffset The distance, in pixels, until the end that activates the loading of the next rows + */ +class Pagination extends Component { + constructor($element, $scope) { + super($element, $scope); + this.scrollOffset = 20; + this.scrollHandler = e => this.onScroll(e); + } + + $onInit() { + if (!this._scrollElement) + this.scrollElement = document.body; + } + + set scrollSelector(value) { + this._scrollSelector = value; + this.scrollElement = document.querySelector(value); + } + + get scrollSelector() { + return this._scrollSelector; + } + + set scrollElement(value) { + if (this._scrollElement) + this._scrollElement.removeEventListener('scroll', this.scrollHandler); + + this._scrollElement = value; + + if (value) + this._scrollElement.addEventListener('scroll', this.scrollHandler); + } + + get scrollElement() { + return this._scrollElement; + } + + onScroll() { + let scrollElement = this.scrollElement; + let shouldLoad = + scrollElement.scrollTop + scrollElement.clientHeight >= (scrollElement.scrollHeight - this.scrollOffset) + && !this.model.isLoading; + + if (shouldLoad) { + this.model.loadMore(); + this.$.$apply(); + } + } + + $onDestroy() { + this.scrollElement = null; + } +} + +ngModule.component('vnPagination', { + template: require('./pagination.html'), + bindings: { + model: '<', + scrollSelector: '@?', + scrollElement: ' div > vn-icon-button { + font-size: 2em; + } +} \ No newline at end of file diff --git a/client/core/src/components/rest-model/crud-model.js b/client/core/src/components/rest-model/crud-model.js new file mode 100644 index 000000000..3bdac37c8 --- /dev/null +++ b/client/core/src/components/rest-model/crud-model.js @@ -0,0 +1,231 @@ +import ngModule from '../../module'; +import ModelProxy from '../model-proxy/model-proxy'; + +export default class CrudModel extends ModelProxy { + constructor($http, $q) { + super(); + this.$http = $http; + this.$q = $q; + this.primaryKey = 'id'; + this.autoLoad = true; + } + + get isLoading() { + return this.canceler != null; + } + + $onInit() { + if (this.autoLoad) + this.refresh(); + } + + refresh(usFilter, usData) { + if (!this.url) return; + + let myFilter = { + fields: this.fields, + where: mergeWhere(this.link, this.where), + include: this.include, + order: this.order, + limit: this.limit, + userData: this.userData + }; + + let filter = this.filter; + filter = mergeFilters(myFilter, filter); + filter = mergeFilters(usFilter, filter); + return this.sendRequest(filter); + } + + cancelRequest() { + if (this.canceler) { + this.canceler.resolve(); + this.canceler = null; + } + } + + sendRequest(filter, append) { + this.cancelRequest(); + this.canceler = this.$q.defer(); + let options = {timeout: this.canceler.promise}; + let json = encodeURIComponent(JSON.stringify(filter)); + return this.$http.get(`${this.url}?filter=${json}`, options).then( + json => this.onRemoteDone(json, filter, append), + json => this.onRemoteError(json) + ); + } + + onRemoteDone(json, filter, append) { + let data = json.data; + + if (append) + this.orgData = this.orgData.concat(data); + else + this.orgData = data; + + this.currentFilter = filter; + this.moreRows = filter.limit && data.length == filter.limit; + this.onRequestEnd(); + this.dataChanged(); + } + + onRemoteError(err) { + this.onRequestEnd(); + throw err; + } + + onRequestEnd() { + this.canceler = null; + } + + loadMore() { + if (this.moreRows) { + let filter = Object.assign({}, this.currentFilter); + filter.skip = (filter.skip || 0) + filter.limit; + this.sendRequest(filter, true); + } + } + + getChanges() { + let create = []; + let update = []; + let remove = []; + + for (let row of this.removed) + remove.push(row.$data[this.primaryKey]); + + for (let row of this._data) { + if (row.$isNew) + create.push(row.$data); + else if (row.$oldData) + update.push(row.$data); + } + + let isChanged = + create.length > 0 || + update.length > 0 || + remove.length > 0; + + if (!isChanged) + return null; + + let changes = { + create: create, + update: update, + delete: remove + }; + + return changes; + } + + save(ignoreChanges) { + let changes = this.getChanges(); + + if (!changes) + return this.$q.resolve(); + + let url = this.saveUrl ? this.saveUrl : `${this.url}/crud`; + return this.$http.post(url, changes) + .then(() => this.resetChanges); + } +} +CrudModel.$inject = ['$http', '$q']; + +ngModule.component('vnCrudModel', { + controller: CrudModel, + bindings: { + orgData: ' 1 ? {and} : and[0]; +} + +/** + * Merges two loopback filters returning the merged filter. + * + * @param {Object} src The source filter + * @param {Object} dst The destination filter + * @return {Object} The result filter + */ +function mergeFilters(src, dst) { + let res = Object.assign({}, dst); + + if (!src) + return res; + + if (src.fields) + res.fields = mergeFields(src.fields, res.fields); + if (src.where) + res.where = mergeWhere(res.where, src.where); + if (src.include) + res.include = src.include; + if (src.order) + res.order = src.order; + if (src.limit) + res.limit = src.limit; + if (src.userData) + res.userData = src.userData; + + return res; +} diff --git a/client/core/src/components/drop-down/model.js b/client/core/src/components/rest-model/rest-model.js similarity index 94% rename from client/core/src/components/drop-down/model.js rename to client/core/src/components/rest-model/rest-model.js index b8237bad7..3485e3621 100644 --- a/client/core/src/components/drop-down/model.js +++ b/client/core/src/components/rest-model/rest-model.js @@ -1,6 +1,6 @@ import ngModule from '../../module'; -export default class Model { +export default class RestModel { constructor($http, $q, $filter) { this.$http = $http; this.$q = $q; @@ -104,10 +104,10 @@ export default class Model { this.onDataChange(); } } -Model.$inject = ['$http', '$q', '$filter']; +RestModel.$inject = ['$http', '$q', '$filter']; -ngModule.component('vnModel', { - controller: Model, +ngModule.component('vnRestModel', { + controller: RestModel, bindings: { url: '@?', staticData: ' { +describe('Component vnRestModel', () => { let $componentController; let $httpBackend; let controller; @@ -11,7 +11,7 @@ describe('Component vnModel', () => { beforeEach(angular.mock.inject((_$componentController_, _$httpBackend_) => { $componentController = _$componentController_; - controller = $componentController('vnModel', {$httpBackend}); + controller = $componentController('vnRestModel', {$httpBackend}); })); describe('set url', () => { diff --git a/client/core/src/components/searchbar/search-panel.js b/client/core/src/components/searchbar/search-panel.js new file mode 100644 index 000000000..96dc67ed5 --- /dev/null +++ b/client/core/src/components/searchbar/search-panel.js @@ -0,0 +1,18 @@ +import Component from '../../lib/component'; + +export default class extends Component { + set filter(value) { + this.$.filter = value; + } + + get filter() { + return this.$.filter; + } + + onSearch() { + if (!this.onSubmit) + throw new Error('SearchPanel::onSubmit() method not defined'); + + this.onSubmit(this.filter); + } +} diff --git a/client/salix/src/components/searchbar/searchbar.html b/client/core/src/components/searchbar/searchbar.html similarity index 73% rename from client/salix/src/components/searchbar/searchbar.html rename to client/core/src/components/searchbar/searchbar.html index 72d5dad90..9bc053f1b 100644 --- a/client/salix/src/components/searchbar/searchbar.html +++ b/client/core/src/components/searchbar/searchbar.html @@ -5,11 +5,11 @@ ng-click="$ctrl.clearFilter(); $ctrl.onSubmit()" style="cursor: pointer; padding-top: 23px"> - + diff --git a/client/core/src/components/searchbar/searchbar.js b/client/core/src/components/searchbar/searchbar.js new file mode 100644 index 000000000..8db621933 --- /dev/null +++ b/client/core/src/components/searchbar/searchbar.js @@ -0,0 +1,200 @@ +import ngModule from '../../module'; +import Component from '../../lib/component'; +import './style.scss'; + +/** + * An input specialized to perform searches, it allows to use a panel + * for advanced searches when the panel property is defined. + * When model and exprBuilder properties are used, the model is updated + * automatically with an and-filter exprexion in which each operand is built + * by calling the exprBuilder function for each non-null parameter. + * + * @property {Object} filter A key-value object with filter parameters + * @property {Function} onSearch Function to call when search is submited + * @property {SearchPanel} panel The panel used for advanced searches + * @property {CrudModel} model The model used for searching + * @property {Function} exprBuilder If defined, is used to build each non-null param expresion + */ +export default class Controller extends Component { + constructor($element, $scope, $compile, $state, $transitions) { + super($element, $scope); + this.$compile = $compile; + this.$state = $state; + this.deregisterCallback = $transitions.onStart({}, + transition => this.changeState(transition)); + + this.filter = {}; + this.searchString = ''; + } + + $onInit() { + if (this.$state.params.q) + this.filter = JSON.parse(decodeURIComponent(this.$state.params.q)); + + this.refreshString(); + this.doSearch(); + } + + changeState(transition) { + return transition._targetState._identifier.name !== this.$state.current.name; + } + + openPanel(event) { + if (event.defaultPrevented) return; + event.preventDefault(); + + this.$panel = this.$compile(`<${this.panel}/>`)(this.$.$new()); + let panel = this.$panel.isolateScope().$ctrl; + panel.filter = this.filter; + panel.onSubmit = filter => this.onPanelSubmit(filter); + + this.$.popover.parent = this.element; + this.$.popover.child = this.$panel[0]; + this.$.popover.show(); + } + + onPopoverClose() { + this.$panel.scope().$destroy(); + this.$panel.remove(); + this.$panel = null; + } + + onPanelSubmit(filter) { + this.$.popover.hide(); + + for (let param in filter) + if (filter[param] == null) + delete filter[param]; + + this.filter = filter; + this.refreshString(); + this.doSearch(); + } + + refreshString() { + this.searchString = this.getStringFromObject(this.filter); + } + + onSubmit() { + this.filter = this.getObjectFromString(this.searchString); + this.doSearch(); + } + + doSearch() { + this.pushFilterToState(this.filter); + + if (this.onSearch) + this.onSearch({filter: this.filter}); + + if (this.model) { + if (!this.exprBuilder) + throw new Error('exprBuilder property should be defined when model is assigned'); + + let and = []; + + for (let param in this.filter) { + let value = this.filter[param]; + if (value == null) continue; + let expr = this.exprBuilder({param, value}); + if (expr) and.push(expr); + } + + let lbFilter = and.length > 0 ? {where: {and}} : null; + this.model.refresh(lbFilter); + } + } + + pushFilterToState(filter) { + let history = window.history || {pushState: () => { + console.error('Error in history.pushState(): Browser incompatibility error'); + }}; + let aux = window.location.hash.split('?q='); + if (Object.keys(filter).length) + history.pushState({}, null, `${aux[0]}?q=${encodeURIComponent(JSON.stringify(filter))}`); + else + history.pushState({}, null, aux[0]); + } + + /** + * Finds pattern key:value or key:(extra value) and passes it to object. + * + * @param {String} searchString The search string + * @return {Object} The parsed object + */ + getObjectFromString(searchString) { + let result = {}; + if (searchString) { + let regex = /((([\w_]+):([\w_]+))|([\w_]+):\(([\w_ ]+)\))/gi; + let findPattern = searchString.match(regex); + let remnantString = searchString.replace(regex, '').trim(); + if (findPattern) { + for (let i = 0; i < findPattern.length; i++) { + let aux = findPattern[i].split(':'); + let property = aux[0]; + let value = aux[1].replace(/\(|\)/g, ''); + result[property] = value.trim(); + } + } + if (remnantString) + result.search = remnantString; + } + return result; + } + + /** + * Passes an object to pattern key:value or key:(extra value). + * + * @param {Object} searchObject The search object + * @return {String} The passed string + */ + getStringFromObject(searchObject) { + let search = []; + + if (searchObject) { + let keys = Object.keys(searchObject); + keys.forEach(key => { + if (key == 'search') return; + + let value = searchObject[key]; + let valueString; + + if (typeof value === 'string' && value.indexOf(' ') !== -1) + valueString = `(${value})`; + else if (value instanceof Date) + valueString = value.toJSON(); + else + switch (typeof value) { + case 'number': + case 'string': + case 'boolean': + valueString = `${value}`; + } + + if (valueString) + search.push(`${key}:${valueString}`); + }); + + if (searchObject.search) + search.unshift(searchObject.search); + } + + return search.length ? search.join(' ') : ''; + } + + $onDestroy() { + this.deregisterCallback(); + } +} +Controller.$inject = ['$element', '$scope', '$compile', '$state', '$transitions']; + +ngModule.component('vnSearchbar', { + template: require('./searchbar.html'), + bindings: { + filter: ' form > vn-horizontal > vn-icon-button { color: black; diff --git a/client/core/src/components/snackbar/snackbar.js b/client/core/src/components/snackbar/snackbar.js index 204482950..aeec1f12f 100644 --- a/client/core/src/components/snackbar/snackbar.js +++ b/client/core/src/components/snackbar/snackbar.js @@ -26,7 +26,7 @@ export default class Controller extends Component { this.hide(); this.onTransitionEnd(); } - + this.clearTimeouts(); this.shown = true; this.textNode.textContent = data.message; diff --git a/client/core/src/components/snackbar/style.scss b/client/core/src/components/snackbar/style.scss index c3de5d50d..f3617fe5e 100644 --- a/client/core/src/components/snackbar/style.scss +++ b/client/core/src/components/snackbar/style.scss @@ -41,9 +41,8 @@ vn-snackbar > div { background-color: transparent; font-weight: bold; color: $main-01; - padding: 1em; - margin: -1em; - padding-left: 1.5em; - margin-left: 0; + padding: .5em; + margin: -.5em; + margin-left: .5em; } } \ No newline at end of file diff --git a/client/core/src/components/tooltip/tooltip.js b/client/core/src/components/tooltip/tooltip.js index a907f03e7..3f221c107 100644 --- a/client/core/src/components/tooltip/tooltip.js +++ b/client/core/src/components/tooltip/tooltip.js @@ -26,7 +26,8 @@ export default class Tooltip extends Component { this.parent = parent; this.$element.addClass('show'); this.relocate(); - this.relocateTimeout = this.$timeout(() => this.relocate(), 200); + this.cancelTimeout(); + this.relocateTimeout = this.$timeout(() => this.relocate(), 50); } /** @@ -34,7 +35,10 @@ export default class Tooltip extends Component { */ hide() { this.$element.removeClass('show'); + this.cancelTimeout(); + } + cancelTimeout() { if (this.relocateTimeout) { this.$timeout.cancel(this.relocateTimeout); this.relocateTimeout = null; @@ -102,6 +106,8 @@ export default class Tooltip extends Component { } calcCoords(); + // Overflow + let axisOverflow = axis == 'x' && (left < min || left > maxLeft) || axis == 'y' && (top < min || top > maxTop); @@ -124,8 +130,6 @@ export default class Tooltip extends Component { calcCoords(); } - // Overflow - function range(coord, min, max) { return Math.min(Math.max(coord, min), max); } @@ -186,7 +190,7 @@ export default class Tooltip extends Component { this.arrow = arrow; } - $destroy() { + $onDestroy() { this.hide(); } } diff --git a/client/core/src/components/watcher/watcher.js b/client/core/src/components/watcher/watcher.js index c48d0ab16..790f76870 100644 --- a/client/core/src/components/watcher/watcher.js +++ b/client/core/src/components/watcher/watcher.js @@ -4,6 +4,7 @@ import getModifiedData from '../../lib/modified'; import copyObject from '../../lib/copy'; import isEqual from '../../lib/equals'; import isFullEmpty from '../../lib/full-empty'; +import UserError from '../../lib/user-error'; /** * Component that checks for changes on a specific model property and @@ -12,14 +13,15 @@ import isFullEmpty from '../../lib/full-empty'; * properties are provided. */ export default class Watcher extends Component { - constructor($element, $scope, $state, $transitions, $http, vnApp, $translate, $attrs) { + constructor($element, $scope, $state, $transitions, $http, vnApp, $translate, $attrs, $q) { super($element); - this.$scope = $scope; + this.$ = $scope; this.$state = $state; this.$http = $http; - this.$translate = $translate; + this._ = $translate; this.$attrs = $attrs; this.vnApp = vnApp; + this.$q = $q; this.state = null; this.deregisterCallback = $transitions.onStart({}, @@ -28,34 +30,38 @@ export default class Watcher extends Component { } $onInit() { - if (this.get && this.url) { + if (this.get && this.url) this.fetchData(); - } else if (this.get && !this.url) { - throw new Error('Error: Parameter url ommitted'); - } + else if (this.get && !this.url) + throw new Error('URL parameter ommitted'); } $onChanges(changes) { - if (this.data) { + if (this.data) this.updateOriginalData(); - } } $onDestroy() { this.deregisterCallback(); } + get dirty() { + return this.form && this.form.$dirty || this.dataChanged(); + } + + dataChanged() { + let data = this.copyInNewObject(this.data); + return !isEqual(data, this.orgData); + } + fetchData() { let id = this.data[this.idField]; - // return new Promise((resolve, reject) => { - this.$http.get(`${this.url}/${id}`).then( + return this.$http.get(`${this.url}/${id}`).then( json => { this.data = copyObject(json.data); this.updateOriginalData(); } - // json => reject(json) ); - // }); } /** @@ -64,9 +70,10 @@ export default class Watcher extends Component { * @return {Promise} The request promise */ submitBack() { - return this.submit().then( - () => this.window.history.back() - ); + return this.submit().then(res => { + this.window.history.back(); + return res; + }); } /** @@ -77,9 +84,10 @@ export default class Watcher extends Component { * @return {Promise} The request promise */ submitGo(state, params) { - return this.submit().then( - () => this.$state.go(state, params || {}) - ); + return this.submit().then(res => { + this.$state.go(state, params || {}); + return res; + }); } /** @@ -88,89 +96,107 @@ export default class Watcher extends Component { * @return {Promise} The http request promise */ submit() { - if (this.form) { + try { + this.check(); + } catch (err) { + return this.$q.reject(err); + } + + return this.realSubmit().then(res => { + this.notifySaved(); + return res; + }); + } + + /** + * Submits the data without checking data validity or changes. + * + * @return {Promise} The http request promise + */ + realSubmit() { + if (this.form) this.form.$setSubmitted(); - if (!this.form.$valid) - return new Promise( - (resolve, reject) => this.invalidForm(reject) - ); - } if (!this.dataChanged()) { - return new Promise( - (resolve, reject) => this.noChanges(reject) - ); + this.updateOriginalData(); + return this.$q.resolve(); } + let isPost = (this.$attrs.save && this.$attrs.save.toLowerCase() === 'post'); let changedData = isPost ? this.data : getModifiedData(this.data, this.orgData); - if (this.requiredField && !changedData[this.requiredField]) { - let required = this.data[this.requiredField] || this.orgData[this.requiredField]; - if (required === undefined) { - return new Promise( - (resolve, reject) => this.invalidForm(reject) - ); - } - changedData[this.requiredField] = required; - } - - if (this.save && this.save.accept) { - this.save.model = changedData; // this.copyInNewObject(changedData); - return new Promise((resolve, reject) => { - this.save.accept().then( - json => this.writeData({data: json}, resolve), - json => reject(json) - ); - }); - } - - // XXX: Alternative when mgCrud is not used - let id = this.idField ? this.orgData[this.idField] : null; - if (id) { - return new Promise((resolve, reject) => { - this.$http.patch(`${this.url}/${id}`, changedData).then( - json => this.writeData(json, resolve), - json => reject(json) + // If watcher is associated to mgCrud + + if (this.save && this.save.accept) { + if (id) + changedData[this.idField] = id; + + this.save.model = changedData; + return this.$q((resolve, reject) => { + this.save.accept().then( + json => this.writeData({data: json}, resolve), + reject ); }); } - return new Promise((resolve, reject) => { + // When mgCrud is not used + + if (id) { + return this.$q((resolve, reject) => { + this.$http.patch(`${this.url}/${id}`, changedData).then( + json => this.writeData(json, resolve), + reject + ); + }); + } + + return this.$q((resolve, reject) => { this.$http.post(this.url, changedData).then( json => this.writeData(json, resolve), - json => reject(json) + reject ); }); } + /** + * Checks if data is ready to send. + */ + check() { + if (this.form && this.form.$invalid) + throw new UserError(this._.instant('Some fields are invalid')); + if (!this.dirty) + throw new UserError(this._.instant('No changes to save')); + } + + /** + * Notifies the user that the data has been saved. + */ + notifySaved() { + this.vnApp.showMessage(this._.instant('Data saved!')); + } + writeData(json, resolve) { Object.assign(this.data, json.data); this.updateOriginalData(); resolve(json); } - noChanges(reject) { - this.vnApp.showMessage( - this.$translate.instant('No changes to save') - ); - reject(new Error('No changes to save')); - } - - invalidForm(reject) { - this.vnApp.showMessage( - this.$translate.instant('Some fields are invalid') - ); - reject(new Error('Some fields are invalid')); - } - updateOriginalData() { this.orgData = this.copyInNewObject(this.data); - if (this.form && this.form.$dirty) - this.form.$setPristine(); + this.setPristine(); + } + + setPristine() { + if (this.form) this.form.$setPristine(); + } + + setDirty() { + if (this.form) this.form.$setDirty(); } copyInNewObject(data) { @@ -192,22 +218,15 @@ export default class Watcher extends Component { } callback(transition) { - let dataChanged = this.dataChanged(); - if (!this.state && dataChanged) { + if (!this.state && this.dirty) { this.state = transition.to().name; - this.$scope.confirm.show(); + this.$.confirm.show(); return false; } return true; } - dataChanged() { - let newData = this.copyInNewObject(this.data); - if (this.form && this.form.$dirty) return !isEqual(newData, this.orgData); - return !isEqual(newData, this.orgData); - } - onConfirmResponse(response) { if (response === 'ACCEPT') { if (this.data) @@ -218,18 +237,17 @@ export default class Watcher extends Component { } } } -Watcher.$inject = ['$element', '$scope', '$state', '$transitions', '$http', 'vnApp', '$translate', '$attrs']; +Watcher.$inject = ['$element', '$scope', '$state', '$transitions', '$http', 'vnApp', '$translate', '$attrs', '$q']; ngModule.component('vnWatcher', { template: require('./watcher.html'), bindings: { url: '@?', idField: '@?', - requiredField: '@?', data: '<', form: '<', save: '<', - get: '=?' + get: ' { let $componentController; + let $rootScope; let $scope; let $element; let $state; @@ -12,25 +13,28 @@ describe('Component vnWatcher', () => { let $translate; let controller; let $attrs; + let $q; beforeEach(() => { angular.mock.module('client'); }); - beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$state_, _$transitions_, _$httpBackend_, _vnApp_, _$translate_) => { + beforeEach(angular.mock.inject((_$componentController_, _$rootScope_, _$state_, _$transitions_, _$httpBackend_, _vnApp_, _$translate_, _$q_) => { $componentController = _$componentController_; + $rootScope = _$rootScope_; $scope = $rootScope.$new(); $element = angular.element('
'); $state = _$state_; vnApp = _vnApp_; $transitions = _$transitions_; $httpBackend = _$httpBackend_; - $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); $translate = _$translate_; + $q = _$q_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); $attrs = { save: "patch" }; - controller = $componentController('vnWatcher', {$scope, $element, $state, vnApp, $transitions, $httpBackend, $translate, $attrs}); + controller = $componentController('vnWatcher', {$scope, $element, $state, vnApp, $transitions, $httpBackend, $translate, $attrs, $q}); })); describe('$onInit()', () => { @@ -48,26 +52,7 @@ describe('Component vnWatcher', () => { expect(function() { controller.$onInit(); - }).toThrow(new Error('Error: Parameter url ommitted')); - }); - }); - - describe('$onChanges()', () => { - it(`should call updateOriginalData() if controllers data is defined`, () => { - controller.data = []; - spyOn(controller, 'updateOriginalData'); - controller.$onChanges(); - - expect(controller.updateOriginalData).toHaveBeenCalledWith(); - }); - }); - - describe('$onDestroy()', () => { - it(`should call deregisterCallback()`, () => { - spyOn(controller, 'deregisterCallback'); - controller.$onDestroy(); - - expect(controller.deregisterCallback).toHaveBeenCalledWith(); + }).toThrowError(/parameter/); }); }); @@ -115,61 +100,51 @@ describe('Component vnWatcher', () => { }); }); - describe('submit()', () => { - describe('when controller.form', () => { - it(`should call controller.form.setSubminted if controller.form is defined`, () => { - controller.form = {$setSubmitted: () => {}}; - spyOn(controller.form, '$setSubmitted'); - controller.submit(); + describe('check()', () => { + it(`should throw error if controller.form is invalid`, () => { + controller.form = {$invalid: true}; - expect(controller.form.$setSubmitted).toHaveBeenCalledWith(); - }); - - it(`should call controller.invalidForm if controller.form.$valid is not defined`, () => { - controller.form = {$setSubmitted: () => {}}; - spyOn(controller, 'invalidForm'); - controller.submit(); - - expect(controller.invalidForm).toHaveBeenCalledWith(jasmine.any(Function)); - }); + expect(function() { + controller.check(); + }).toThrowError(); }); - describe('when !controller.dataChanged()', () => { - it(`should call controller.noChanges()`, () => { - spyOn(controller, 'noChanges'); - controller.submit(); + it(`should throw error if controller.dirty is true`, () => { + controller.form = {$invalid: true}; - expect(controller.noChanges).toHaveBeenCalledWith(jasmine.any(Function)); + expect(function() { + controller.check(); + }).toThrowError(); + }); + }); + + describe('realSubmit()', () => { + describe('when controller.form', () => { + it(`should call controller.form.setSubmited if controller.form is defined`, () => { + controller.form = { + $setSubmitted: () => {}, + $setPristine: () => {} + }; + spyOn(controller.form, '$setSubmitted'); + controller.realSubmit(); + + expect(controller.form.$setSubmitted).toHaveBeenCalledWith(); }); }); describe('when controller.save()', () => { it(`should set controller.save.model property`, () => { - controller.save = {accept: () => {}}; + controller.save = {accept: () => $q.resolve()}; controller.data = {originalInfo: 'original data', info: 'new data'}; controller.orgData = {originalInfo: 'original data'}; - controller.submit(); + controller.realSubmit(); expect(controller.save.model).toEqual({info: 'new data'}); }); - - it(`should call controller.save.accept() then controller.writeData`, done => { - controller.save = {accept: () => {}}; - controller.data = {originalInfo: 'original data', info: 'new data'}; - controller.orgData = {originalInfo: 'original data'}; - spyOn(controller.save, 'accept').and.returnValue(Promise.resolve()); - spyOn(controller, 'writeData').and.callThrough(); - controller.submit() - .then(() => { - expect(controller.save.accept).toHaveBeenCalledWith(); - expect(controller.writeData).toHaveBeenCalledWith(jasmine.any(Object), jasmine.any(Function)); - done(); - }); - }); }); describe('when id is defined', () => { - it(`should perform a query then call controller.writeData()`, () => { + it(`should perform a query then call controller.writeData()`, done => { controller.dataChanged = () => { return true; }; @@ -182,7 +157,7 @@ describe('Component vnWatcher', () => { spyOn(controller, 'writeData').and.callThrough(); $httpBackend.whenPATCH(`${controller.url}/1`, changedData).respond(json); $httpBackend.expectPATCH(`${controller.url}/1`); - controller.submit() + controller.realSubmit() .then(() => { expect(controller.writeData).toHaveBeenCalledWith(jasmine.any(Object), jasmine.any(Function)); done(); @@ -191,7 +166,7 @@ describe('Component vnWatcher', () => { }); }); - it(`should perform a POST query then call controller.writeData()`, () => { + it(`should perform a POST query then call controller.writeData()`, done => { controller.dataChanged = () => { return true; }; @@ -202,7 +177,7 @@ describe('Component vnWatcher', () => { spyOn(controller, 'writeData').and.callThrough(); $httpBackend.whenPOST(`${controller.url}`, controller.data).respond(json); $httpBackend.expectPOST(`${controller.url}`, controller.data); - controller.submit() + controller.realSubmit() .then(() => { expect(controller.writeData).toHaveBeenCalledWith(jasmine.any(Object), jasmine.any(Function)); done(); @@ -224,18 +199,9 @@ describe('Component vnWatcher', () => { }); }); - describe('copyInNewObject()', () => { - it(`should return newCopy object if data was an object`, () => { - let data = {id: 1, Heroname: 'Batman', name: 'Bruce Wayne'}; - let result = controller.copyInNewObject(data); - - expect(result).toEqual(data); - }); - }); - describe('callback()', () => { describe(`when dataChanged() returns true and there's no state in the controller`, () => { - it(`should define controller.state, call controller.$scope.confirm.show() and return false`, () => { + it(`should define controller.state, call controller.$.confirm.show() and return false`, () => { $scope.confirm = {show: jasmine.createSpy('show')}; controller.dataChanged = () => { return true; @@ -247,7 +213,7 @@ describe('Component vnWatcher', () => { let result = controller.callback(transition); expect(controller.state).toEqual('Batman'); - expect(controller.$scope.confirm.show).toHaveBeenCalledWith(); + expect(controller.$.confirm.show).toHaveBeenCalledWith(); expect(result).toBeFalsy(); }); }); diff --git a/client/core/src/directives/specs/zoom-image.spec.js b/client/core/src/directives/specs/zoom-image.spec.js index 1891f738a..bf1bc252e 100644 --- a/client/core/src/directives/specs/zoom-image.spec.js +++ b/client/core/src/directives/specs/zoom-image.spec.js @@ -9,9 +9,10 @@ describe('Directive zoomImage', () => { angular.mock.module('client'); }); - beforeEach(angular.mock.inject(($compile, $rootScope) => { + beforeEach(angular.mock.inject(($compile, $rootScope, $httpBackend) => { compile = $compile; scope = $rootScope.$new(); + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); })); afterEach(() => { diff --git a/client/core/src/lib/app.js b/client/core/src/lib/app.js index 5a41d209c..07822682a 100644 --- a/client/core/src/lib/app.js +++ b/client/core/src/lib/app.js @@ -7,9 +7,9 @@ import ngModule from '../module'; * @property {Snackbar} snackbar The main object to show messages. */ export default class App { - constructor($rootScope) { + constructor() { this.loaderStatus = 0; - this.$rootScope = $rootScope; + this.loading = false; } showMessage(message) { if (this.snackbar) @@ -17,19 +17,18 @@ export default class App { } showError(message) { if (this.snackbar) - this.snackbar.showError({message: `Error: ${message}`}); + this.snackbar.showError({message: message}); } pushLoader() { this.loaderStatus++; if (this.loaderStatus === 1) - this.$rootScope.loading = true; + this.loading = true; } popLoader() { this.loaderStatus--; if (this.loaderStatus === 0) - this.$rootScope.loading = false; + this.loading = false; } } -App.$inject = ['$rootScope']; ngModule.service('vnApp', App); diff --git a/client/core/src/lib/date.js b/client/core/src/lib/date.js index 1fd9847ca..2acfd6e55 100644 --- a/client/core/src/lib/date.js +++ b/client/core/src/lib/date.js @@ -1,6 +1,6 @@ /** * Transforms a UTC date to JSON date without datetime. - * + * * @param {date} date Date to format * @return {String} Formatted date string */ @@ -12,10 +12,10 @@ export function toJsonDate(date) { let year = date.getFullYear(); if (day < 10) - day = `0${day}` + day = `0${day}`; - if (month < 10) - month = `0${month}` + if (month < 10) + month = `0${month}`; return new Date(`${year}-${month}-${day}`); -} \ No newline at end of file +} diff --git a/client/core/src/lib/http-error.js b/client/core/src/lib/http-error.js new file mode 100644 index 000000000..91ccc8905 --- /dev/null +++ b/client/core/src/lib/http-error.js @@ -0,0 +1,12 @@ +/** + * Wraps $http error responses. This class is mainly used to + * avoid the default AngularJS behaviour, that is, stringifying all + * unhandled rejections that aren't @Error objects. More info at: + * - https://github.com/angular/angular.js/issues/14631 + */ +export default class HttpError extends Error { + constructor(message, fileName, lineNumber) { + super(message, fileName, lineNumber); + this.name = 'HttpError'; + } +} diff --git a/client/core/src/lib/index.js b/client/core/src/lib/index.js index 77904844c..5a43a6988 100644 --- a/client/core/src/lib/index.js +++ b/client/core/src/lib/index.js @@ -13,3 +13,5 @@ import './equals'; import './modified'; import './key-codes'; import './get-watchers'; +import './http-error'; +import './user-error'; diff --git a/client/core/src/lib/interceptor.js b/client/core/src/lib/interceptor.js index 5eac56e69..8d8cd46c0 100644 --- a/client/core/src/lib/interceptor.js +++ b/client/core/src/lib/interceptor.js @@ -1,7 +1,8 @@ import ngModule from '../module'; +import HttpError from './http-error'; -interceptor.$inject = ['$q', '$window', 'vnApp', '$translate', '$cookies']; -function interceptor($q, $window, vnApp, $translate, $cookies) { +interceptor.$inject = ['$q', 'vnApp', '$cookies']; +function interceptor($q, vnApp, $cookies) { return { request: function(config) { vnApp.pushLoader(); @@ -16,42 +17,14 @@ function interceptor($q, $window, vnApp, $translate, $cookies) { return $q.reject(rejection); }, response: function(response) { - switch (response.config.method) { - case 'PUT': - case 'POST': - case 'PATCH': - vnApp.showMessage($translate.instant('Data saved!')); - } vnApp.popLoader(); return response; }, responseError: function(rejection) { vnApp.popLoader(); - let data = rejection.data; - let error; - - switch (rejection.xhrStatus) { - case 'timeout': - case 'abort': - return $q.reject(rejection); - } - - if (data && data.error instanceof Object) - error = data.error.message; - else if (rejection.status === -1) - error = $translate.instant(`Can't contact with server`); - else - error = `${rejection.status}: ${rejection.statusText}`; - - if (rejection.status === 401) { - let location = $window.location; - let continueUrl = location.pathname + location.search + location.hash; - continueUrl = encodeURIComponent(continueUrl); - $window.location = `/auth/?apiKey=${vnApp.name}&continue=${continueUrl}`; - } - - vnApp.showError(error); - return $q.reject(rejection); + let err = new HttpError(rejection.statusText); + Object.assign(err, rejection); + return $q.reject(err); } }; } diff --git a/client/core/src/lib/user-error.js b/client/core/src/lib/user-error.js new file mode 100644 index 000000000..597656c74 --- /dev/null +++ b/client/core/src/lib/user-error.js @@ -0,0 +1,10 @@ +/** + * Errors that can be visible and understood by the end user. + * Used mainly in the global error handler. + */ +export default class UserError extends Error { + constructor(message, fileName, lineNumber) { + super(message, fileName, lineNumber); + this.name = 'UserError'; + } +} diff --git a/client/core/src/locale/en.yml b/client/core/src/locale/en.yml index 3a06f2bd0..613eda985 100644 --- a/client/core/src/locale/en.yml +++ b/client/core/src/locale/en.yml @@ -11,4 +11,5 @@ Hide: Hide Next: Next Finalize: Finalize Previous: Back +Load more: Load more Auto-scroll interrupted, please adjust the search: Auto-scroll interrupted, please adjust the search \ No newline at end of file diff --git a/client/core/src/locale/es.yml b/client/core/src/locale/es.yml index 4e826330b..47a10ab21 100644 --- a/client/core/src/locale/es.yml +++ b/client/core/src/locale/es.yml @@ -11,4 +11,5 @@ Hide: Ocultar Next: Siguiente Finalize: Finalizar Previous: Anterior +Load more: Cargar más Auto-scroll interrupted, please adjust the search: Auto-scroll interrumpido, por favor ajusta la búsqueda \ No newline at end of file diff --git a/client/core/src/styles/fontello-icons.css b/client/core/src/styles/fontello-codes.css similarity index 90% rename from client/core/src/styles/fontello-icons.css rename to client/core/src/styles/fontello-codes.css index 6f448acf0..d90a5615a 100644 --- a/client/core/src/styles/fontello-icons.css +++ b/client/core/src/styles/fontello-codes.css @@ -20,5 +20,5 @@ .icon-ticket:before { content: '\e821'; } /* '' */ .icon-tax:before { content: '\e822'; } /* '' */ .icon-no036:before { content: '\e823'; } /* '' */ -.icon-mana:before { content: '\e824'; } /* '' */ +.icon-transaction:before { content: '\e826'; } /* '' */ .icon-solunion:before { content: '\e827'; } /* '' */ \ No newline at end of file diff --git a/client/core/src/styles/fontello.woff2 b/client/core/src/styles/fontello.woff2 index 8424baf8a..50b83f934 100644 Binary files a/client/core/src/styles/fontello.woff2 and b/client/core/src/styles/fontello.woff2 differ diff --git a/client/core/src/styles/index.js b/client/core/src/styles/index.js index fea272aed..f5ed1e400 100644 --- a/client/core/src/styles/index.js +++ b/client/core/src/styles/index.js @@ -2,4 +2,4 @@ import './mdl-override.scss'; import './mdi-override.css'; import './zoom-image.scss'; import './fontello-head.css'; -import './fontello-icons.css'; +import './fontello-codes.css'; diff --git a/client/item/routes.json b/client/item/routes.json index 9a3d35176..9d0dd3dd6 100644 --- a/client/item/routes.json +++ b/client/item/routes.json @@ -109,6 +109,18 @@ "params": { "item": "$ctrl.item" } + }, { + "url" : "/diary", + "state": "item.card.diary", + "component": "vn-item-diary", + "params": { + "item": "$ctrl.item" + }, + "menu": { + "description": "Diary", + "icon": "icon-transaction" + }, + "acl": ["employee"] } ] } \ No newline at end of file diff --git a/client/item/src/barcode/barcode.spec.js b/client/item/src/barcode/barcode.spec.js index b000caec0..585af2d71 100644 --- a/client/item/src/barcode/barcode.spec.js +++ b/client/item/src/barcode/barcode.spec.js @@ -15,8 +15,12 @@ describe('Item', () => { $componentController = _$componentController_; $state = _$state_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); $state.params.id = '1'; controller = $componentController('vnItemBarcode', {$state: $state}); + controller.$scope.watcher = { + notifySaved: () => {} + }; })); describe('add / remove barcode()', () => { diff --git a/client/item/src/barcode/index.html b/client/item/src/barcode/index.html index ad9ec7f4c..b7187a808 100644 --- a/client/item/src/barcode/index.html +++ b/client/item/src/barcode/index.html @@ -1,3 +1,7 @@ + + Item barcode diff --git a/client/item/src/barcode/index.js b/client/item/src/barcode/index.js index 2b1309fcd..3e31cab81 100644 --- a/client/item/src/barcode/index.js +++ b/client/item/src/barcode/index.js @@ -95,6 +95,7 @@ export default class Controller { return this.$http.post(`/item/api/ItemBarcodes/crudItemBarcodes`, barcodesObj).then(() => { this.getBarcodes(); this._unsetDirtyForm(); + this.$scope.watcher.notifySaved(); }); } this.vnApp.showMessage(this.$translate.instant('No changes to save')); diff --git a/client/item/src/botanical/botanical.spec.js b/client/item/src/botanical/botanical.spec.js index 000f12164..ae111f52a 100644 --- a/client/item/src/botanical/botanical.spec.js +++ b/client/item/src/botanical/botanical.spec.js @@ -14,6 +14,7 @@ describe('ItemBotanical', () => { beforeEach(angular.mock.inject((_$componentController_, _$state_, _$httpBackend_) => { $componentController = _$componentController_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); $state = { params: { id: 123 diff --git a/client/item/src/botanical/index.html b/client/item/src/botanical/index.html index c95511be8..57352c7ca 100644 --- a/client/item/src/botanical/index.html +++ b/client/item/src/botanical/index.html @@ -6,7 +6,6 @@ vn-id="watcher" data="$ctrl.botanical" id-field="itemFk" - required-field="itemFk" form="form" save="patch"> diff --git a/client/item/src/botanical/index.js b/client/item/src/botanical/index.js index 2c1ec61b2..92cea41aa 100644 --- a/client/item/src/botanical/index.js +++ b/client/item/src/botanical/index.js @@ -4,8 +4,11 @@ class Controller { constructor($http, $state) { this.$http = $http; this.$state = $state; + this.botanical = { + itemFk: this.$state.params.id + }; } - + _getBotanical() { let filter = { where: {itemFk: this.$state.params.id}, @@ -13,16 +16,8 @@ class Controller { }; this.$http.get(`/item/api/ItemBotanicals?filter=${JSON.stringify(filter)}`) .then(res => { - if (res.data.length) { + if (res.data.length) this.botanical = res.data[0]; - } else { - this.botanical = { - itemFk: this.$state.params.id, - botanical: null, - genusFk: null, - specieFk: null - }; - } }); } diff --git a/client/item/src/card/card.spec.js b/client/item/src/card/card.spec.js index f441b27d3..acb6d39df 100644 --- a/client/item/src/card/card.spec.js +++ b/client/item/src/card/card.spec.js @@ -14,6 +14,7 @@ describe('Item', () => { beforeEach(angular.mock.inject((_$componentController_, _$state_, _$httpBackend_) => { $componentController = _$componentController_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); $state = { params: { id: 123 diff --git a/client/item/src/create/index.html b/client/item/src/create/index.html index 2fbf02f29..895d120ee 100644 --- a/client/item/src/create/index.html +++ b/client/item/src/create/index.html @@ -6,7 +6,7 @@ save="post"> -
+
New item @@ -20,7 +20,10 @@ value-field="id" field="$ctrl.item.typeFk" where="{or: [{code: {regexp: 'search'}}, {name: {regexp: 'search'}}]}"> - {{code}} : {{name}} + +
{{::code}}
+
{{::name}}
+ - {{id}} : {{description}} + +
{{::id}}
+
{{::description}}
+ diff --git a/client/item/src/data/index.html b/client/item/src/data/index.html index d37fc0af1..1489cedae 100644 --- a/client/item/src/data/index.html +++ b/client/item/src/data/index.html @@ -32,7 +32,10 @@ field="$ctrl.item.intrastatFk" where="{or: [{id: {regexp: 'search'}}, {description: {regexp: 'search'}}]}" initial-data="$ctrl.item.intrastat"> - {{id}} : {{description}} + +
{{::id}}
+
{{::description}}
+ @@ -45,13 +48,19 @@ field="$ctrl.item.originFk" initial-data="$ctrl.item.origin"> + + + + - diff --git a/client/item/src/descriptor/index.html b/client/item/src/descriptor/index.html index 67a8bca44..140798989 100644 --- a/client/item/src/descriptor/index.html +++ b/client/item/src/descriptor/index.html @@ -25,8 +25,8 @@
{{$ctrl.item.id}}
- + value="{{$ctrl.item.name}}"> + diff --git a/client/item/src/diary/index.html b/client/item/src/diary/index.html new file mode 100644 index 000000000..321082d40 --- /dev/null +++ b/client/item/src/diary/index.html @@ -0,0 +1,49 @@ + + + + Item diary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateStateOriginReferenceNameInOutBalance
{{diary.date | date:'dd/MM/yyyy HH:mm' }}{{diary.alertLevel | dashIfEmpty}}{{diary.origin | dashIfEmpty}}{{diary.reference | dashIfEmpty}}{{diary.name | dashIfEmpty}}{{diary.in | dashIfEmpty}}{{diary.out | dashIfEmpty}}{{diary.balance | dashIfEmpty}}
No results
+ + + + + diff --git a/client/item/src/diary/index.js b/client/item/src/diary/index.js new file mode 100644 index 000000000..67c6bcd34 --- /dev/null +++ b/client/item/src/diary/index.js @@ -0,0 +1,38 @@ +import ngModule from '../module'; +import './style.scss'; + +class Controller { + constructor($scope, $http) { + this.$ = $scope; + this.$http = $http; + this.diary = []; + } + + set warehouseFk(value) { + this._getItemDiary(value); + this._warehouseFk = value; + } + + get warehouseFk() { + return this._warehouseFk; + } + + _getItemDiary(warehouse) { + if (warehouse == null) + return; + let params = {itemFk: this.item.id, warehouseFk: warehouse}; + this.$http.get(`/item/api/Items/getDiary?params=${JSON.stringify(params)}`).then(res => { + this.diary = res.data; + }); + } +} + +Controller.$inject = ['$scope', '$http']; + +ngModule.component('vnItemDiary', { + template: require('./index.html'), + controller: Controller, + bindings: { + item: '<' + } +}); diff --git a/client/item/src/diary/index.spec.js b/client/item/src/diary/index.spec.js new file mode 100644 index 000000000..6cad8fc81 --- /dev/null +++ b/client/item/src/diary/index.spec.js @@ -0,0 +1,43 @@ +import './index.js'; + +describe('Item', () => { + describe('Component vnItemDiary', () => { + let $componentController; + let $scope; + let controller; + let $httpBackend; + + beforeEach(() => { + angular.mock.module('item'); + }); + + beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_) => { + $componentController = _$componentController_; + $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); + $scope = $rootScope.$new(); + controller = $componentController('vnItemDiary', {$scope: $scope}); + controller.item = {id: 3}; + })); + + describe('set warehouseFk()', () => { + it(`should call _getItemDiary() with 2 and set warehouseFk`, () => { + spyOn(controller, '_getItemDiary'); + controller.warehouseFk = 2; + + expect(controller._getItemDiary).toHaveBeenCalledWith(2); + expect(controller.warehouseFk).toEqual(2); + }); + }); + + describe('_getItemDiary()', () => { + it(`should make a request to get the diary hwen is called with a number`, () => { + $httpBackend.whenGET('/item/api/Items/getDiary?params={"itemFk":3,"warehouseFk":2}').respond({data: 'item'}); + $httpBackend.expectGET('/item/api/Items/getDiary?params={"itemFk":3,"warehouseFk":2}'); + controller._getItemDiary(2); + $httpBackend.flush(); + }); + }); + }); +}); + diff --git a/client/item/src/diary/style.scss b/client/item/src/diary/style.scss new file mode 100644 index 000000000..9e16a6d09 --- /dev/null +++ b/client/item/src/diary/style.scss @@ -0,0 +1,8 @@ +vn-item-diary { + & vn-horizontal { + justify-content: center; + } + & vn-autocomplete > div{ + width: 400px; + } +} \ No newline at end of file diff --git a/client/item/src/filter-panel/index.html b/client/item/src/filter-panel/index.html deleted file mode 100644 index 5dd64bb28..000000000 --- a/client/item/src/filter-panel/index.html +++ /dev/null @@ -1,77 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/client/item/src/filter-panel/index.js b/client/item/src/filter-panel/index.js deleted file mode 100644 index 695a4710f..000000000 --- a/client/item/src/filter-panel/index.js +++ /dev/null @@ -1,16 +0,0 @@ -import ngModule from '../module'; - -class Controller { - constructor() { - this.onSubmit = () => {}; - } - - onSearch() { - this.onSubmit(this.filter); - } -} - -ngModule.component('vnItemFilterPanel', { - template: require('./index.html'), - controller: Controller -}); diff --git a/client/item/src/index/index.html b/client/item/src/index/index.html index 0879b5627..a0b0f5101 100644 --- a/client/item/src/index/index.html +++ b/client/item/src/index/index.html @@ -1,26 +1,30 @@ - + +
- - - - - + + + - + + ng-repeat="item in items track by item.id" + item="::item"> - - + +
diff --git a/client/item/src/index/index.js b/client/item/src/index/index.js index 8ddc7ada4..d772e810c 100644 --- a/client/item/src/index/index.js +++ b/client/item/src/index/index.js @@ -3,46 +3,68 @@ import './product'; import './style.scss'; class Controller { - constructor($http, $state, $scope) { this.$http = $http; this.$state = $state; - this.$scope = $scope; - this.model = {}; + this.$ = $scope; this.itemSelected = null; - this.items = []; + + this.filter = { + include: [ + {relation: 'itemType', + scope: { + fields: ['name', 'workerFk'], + include: { + relation: 'worker', + fields: ['firstName', 'name'] + } + } + } + ], + order: 'name ASC' + }; } - search(index) { - index.accept(); - /* this.items = []; - index.accept().then(res => { - this.items = res.instances; - }); */ + exprBuilder(param, value) { + switch (param) { + case 'search': + return { + or: [ + {id: value}, + {name: {regexp: value}} + ] + }; + case 'name': + case 'description': + return {[param]: {regexp: value}}; + case 'id': + case 'typeFk': + return {[param]: value}; + } } cloneItem(item) { this.itemSelected = item; - this.$scope.clone.show(); + this.$.clone.show(); } onCloneAccept(response) { - if (response == 'ACCEPT' && this.itemSelected) { - this.$http.post(`/item/api/Items/${this.itemSelected.id}/clone`).then(res => { - if (res && res.data && res.data.id) { - this.$state.go('item.card.tags', {id: res.data.id}); - } - }); - } + if (!(response == 'ACCEPT' && this.itemSelected)) + return; + + this.$http.post(`/item/api/Items/${this.itemSelected.id}/clone`).then(res => { + if (res && res.data && res.data.id) + this.$state.go('item.card.tags', {id: res.data.id}); + }); + this.itemSelected = null; } - + showItemPreview(item) { this.itemSelected = item; - this.$scope.preview.show(); + this.$.preview.show(); } } - Controller.$inject = ['$http', '$state', '$scope']; ngModule.component('vnItemIndex', { diff --git a/client/item/src/index/style.scss b/client/item/src/index/style.scss index 86f7f3ea1..9c6e97761 100644 --- a/client/item/src/index/style.scss +++ b/client/item/src/index/style.scss @@ -1,3 +1,4 @@ +@import "./colors"; vn-item-product { display: block; @@ -12,4 +13,4 @@ vn-item-product { border-radius: .2em; } } -} \ No newline at end of file +} diff --git a/client/item/src/item.js b/client/item/src/item.js index 384e91661..fd896c724 100644 --- a/client/item/src/item.js +++ b/client/item/src/item.js @@ -2,7 +2,8 @@ export * from './module'; import './index'; import './filter-item-list'; -import './filter-panel'; +import './search-panel'; +import './diary'; import './create'; import './card'; import './descriptor'; diff --git a/client/item/src/locale/es.yml b/client/item/src/locale/es.yml index b6a3eca94..424300b3b 100644 --- a/client/item/src/locale/es.yml +++ b/client/item/src/locale/es.yml @@ -29,10 +29,16 @@ Value: Valor Priority: Prioridad Item tax: Tasas del artículo Country: País +Select warehouse: Selecione almacén Class: Clase Item niches: Nichos del artículo +Item diary: Registro de compra-venta +Diary: Registro Warehouse: Almacén Code: Código +State: Estado +In: Entrada +Out: Salida Botanical: Botánico Species: Especie Add tag: Añadir etiqueta @@ -42,4 +48,5 @@ Remove niche: Quitar nicho Add barcode: Añadir código de barras Remove barcode: Quitar código de barras Buyer: Comprador -No results: Sin resultados \ No newline at end of file +No results: Sin resultados +Tag: Etiqueta \ No newline at end of file diff --git a/client/item/src/niche/index.js b/client/item/src/niche/index.js index a01d3e139..9fec4ba91 100644 --- a/client/item/src/niche/index.js +++ b/client/item/src/niche/index.js @@ -14,6 +14,11 @@ export default class Controller { this.oldNiches = {}; } + $onInit() { + this.getNiches(); + this.getWarehouses(); + } + _setIconAdd() { if (this.niches.length) { this.niches.map(element => { @@ -130,15 +135,11 @@ export default class Controller { return this.$http.post(`/item/api/ItemNiches/crudItemNiches`, nichesObj).then(() => { this.getNiches(); this._unsetDirtyForm(); + this.$scope.watcher.notifySaved(); }); } this.vnApp.showMessage(this.$translate.instant('No changes to save')); } - - $onInit() { - this.getNiches(); - this.getWarehouses(); - } } Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnApp']; diff --git a/client/item/src/niche/niche.spec.js b/client/item/src/niche/niche.spec.js index c42fb781c..d3b91be9e 100644 --- a/client/item/src/niche/niche.spec.js +++ b/client/item/src/niche/niche.spec.js @@ -15,7 +15,11 @@ describe('Item', () => { $componentController = _$componentController_; $state = _$state_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); controller = $componentController('vnItemNiche', {$state: $state}); + controller.$scope.watcher = { + notifySaved: () => {} + }; })); describe('add / remove niche', () => { diff --git a/client/item/src/search-panel/index.html b/client/item/src/search-panel/index.html new file mode 100644 index 000000000..5b545d8bc --- /dev/null +++ b/client/item/src/search-panel/index.html @@ -0,0 +1,84 @@ + +
+
+ + + + + + + + + + + + + + + + +
+
diff --git a/client/item/src/search-panel/index.js b/client/item/src/search-panel/index.js new file mode 100644 index 000000000..b752e34e7 --- /dev/null +++ b/client/item/src/search-panel/index.js @@ -0,0 +1,32 @@ +import ngModule from '../module'; +import SearchPanel from 'core/src/components/searchbar/search-panel'; + +class Controller extends SearchPanel { + set filter(value) { + if (!value.tags) + value.tags = [{}]; + + this.$.filter = value; + } + + get filter() { + return this.$.filter; + } + + getSourceTable(selection) { + if (!selection || selection.isFree === true) + return null; + + if (selection.sourceTable) + return '/api/' + + selection.sourceTable.charAt(0).toUpperCase() + + selection.sourceTable.substring(1) + 's'; + else if (selection.sourceTable == null) + return `/api/ItemTags/filterItemTags/${selection.id}`; + } +} + +ngModule.component('vnItemSearchPanel', { + template: require('./index.html'), + controller: Controller +}); diff --git a/client/item/src/filter-panel/locale/es.yml b/client/item/src/search-panel/locale/es.yml similarity index 100% rename from client/item/src/filter-panel/locale/es.yml rename to client/item/src/search-panel/locale/es.yml diff --git a/client/item/src/tags/index.html b/client/item/src/tags/index.html index f8fe5fa50..e20093813 100644 --- a/client/item/src/tags/index.html +++ b/client/item/src/tags/index.html @@ -6,7 +6,7 @@
Item tags - + @@ -48,21 +48,23 @@ rule="itemTag.priority" vn-acl="buyer"> - + - + ng-click="$ctrl.removeTag($index)" + tabindex="-1"> + + + ng-click="$ctrl.addTag()"> diff --git a/client/item/src/tags/index.js b/client/item/src/tags/index.js index 66997ae5e..20430516e 100644 --- a/client/item/src/tags/index.js +++ b/client/item/src/tags/index.js @@ -1,169 +1,112 @@ import ngModule from '../module'; class Controller { - constructor($stateParams, $scope, $http, $translate, vnApp) { + constructor($stateParams, $scope, $http) { this.params = $stateParams; - this.$scope = $scope; + this.$ = $scope; this.$http = $http; - this.$translate = $translate; - this.vnApp = vnApp; - - this.itemTagTypes = []; - this.removedItemTags = []; - this.oldItemTags = {}; + this.tags = []; + this.removedTags = []; } - _setIconAdd() { - if (this.instancedItemTags && this.instancedItemTags.length) { - this.instancedItemTags.map(element => { - element.showAddIcon = false; - return true; + $onInit() { + this.getTags(); + } + + getTags() { + let filter = { + where: {itemFk: this.params.id}, + order: 'priority ASC', + include: {relation: 'tag'} + }; + this.$http.get(`/item/api/ItemTags?filter=${JSON.stringify(filter)}`).then(response => { + this.removedTags = []; + + this.tags = response.data; + this.itemTags = JSON.parse(JSON.stringify(this.tags)); + this.orgTags = {}; + this.tags.forEach(tag => { + this.orgTags[tag.id] = Object.assign({}, tag); }); - this.instancedItemTags[this.instancedItemTags.length - 1].showAddIcon = true; - } + + this.$.form.$setPristine(); + }); } - _setDirtyForm() { - if (this.$scope.form) { - this.$scope.form.$setDirty(); - } - } - _unsetDirtyForm() { - if (this.$scope.form) { - this.$scope.form.$setPristine(); - } + addTag() { + this.tags.push({ + itemFk: this.params.id, + priority: this.getHighestPriority(this.tags) + }); } - checkAutocompleteChanges(itemTag) { - itemTag.value = null; - } - - addItemTag() { - if (this.instancedItemTags) { - this.instancedItemTags.push({value: null, itemFk: this.params.id, tagFk: null, priority: this.getHighestPriority(this.instancedItemTags), showAddIcon: true}); - this._setIconAdd(); - } - } - - removeItemTag(index) { - let item = this.instancedItemTags[index]; - if (item) { - this.instancedItemTags.splice(index, 1); - this._setIconAdd(); - if (item.id) { - this.removedItemTags.push(item.id); - this._setDirtyForm(); - } - } - } - - getHighestPriority(instancedItemTags) { + getHighestPriority(tags) { let max = 0; - instancedItemTags.forEach(tag => { + tags.forEach(tag => { if (tag.priority > max) max = tag.priority; }); return max + 1; } + removeTag(index) { + let item = this.tags[index]; + this.tags.splice(index, 1); + if (item.id) { + this.removedTags.push(item.id); + this.$.form.$setDirty(); + } + } + getSourceTable(selection) { if (!selection || selection.isFree === true) return null; if (selection.sourceTable) { - return "/api/" + selection.sourceTable.charAt(0).toUpperCase() + + return '/api/' + selection.sourceTable.charAt(0).toUpperCase() + selection.sourceTable.substring(1) + 's'; } else if (selection.sourceTable == null) { return `/api/ItemTags/filterItemTags/${selection.id}`; } } - _equalItemTags(oldTag, newTag) { - return oldTag.tagFk === newTag.tagFk && oldTag.value === newTag.value && oldTag.priority === newTag.priority; - } - - _setOlTags(instancedItemTags) { - this._setIconAdd(); - instancedItemTags.forEach(tag => { - this.oldItemTags[tag.id] = Object.assign({}, tag); - }); - } - - _getItemTags() { - let filter = { - where: {itemFk: this.params.id}, - order: "priority ASC", - include: {relation: "tag"} - }; - this.$http.get(`/item/api/ItemTags?filter=${JSON.stringify(filter)}`).then(response => { - this.instancedItemTags = response.data; - this.itemTags = JSON.parse(JSON.stringify(this.instancedItemTags)); - this._setOlTags(response.data); - }); + tagIsEqual(oldTag, newTag) { + return oldTag.tagFk === newTag.tagFk && + oldTag.value === newTag.value && + oldTag.priority === newTag.priority; } submit() { - let itemTagsDefined = []; - let repeatedItemTags = false; - let canSubmit; - let tagsObj = { - delete: this.removedItemTags, + this.$.watcher.check(); + + let changes = { + delete: this.removedTags, create: [], update: [] }; - this.instancedItemTags.forEach(tag => { - let isNewTag = !tag.id; - - if (itemTagsDefined.indexOf(tag.tagFk) !== -1) { - repeatedItemTags = true; - return; - } - itemTagsDefined.push(tag.tagFk); - - if (isNewTag) { - tagsObj.create.push(tag); - } - - if (!isNewTag && !this._equalItemTags(this.oldItemTags[tag.id], tag)) { + this.tags.forEach(tag => { + if (!tag.id) + changes.create.push(tag); + else if (!this.tagIsEqual(this.orgTags[tag.id], tag)) { let tagToUpdate = Object.assign({}, tag); delete tagToUpdate.tag; - delete tagToUpdate.showAddIcon; - tagsObj.update.push(tagToUpdate); + changes.update.push(tagToUpdate); } }); - if (this.$scope.form.$invalid) { - return this.vnApp.showMessage(this.$translate.instant('Some fields are invalid')); - } - - if (repeatedItemTags) { - return this.vnApp.showMessage(this.$translate.instant('The tag must be unique')); - } - - canSubmit = tagsObj.update.length > 0 || tagsObj.create.length > 0 || tagsObj.delete.length > 0; - - if (canSubmit) { - return this.$http.post(`/item/api/ItemTags/crudItemTags`, tagsObj).then(() => { - // this.itemTags = JSON.parse(JSON.stringify(this.instancedItemTags)); - this._getItemTags(); - this._unsetDirtyForm(); - }); - } - this.vnApp.showMessage(this.$translate.instant('No changes to save')); - } - - $onInit() { - this._getItemTags(); + this.$http.post(`/item/api/ItemTags/crud`, changes).then(() => { + this.getTags(); + this.$.watcher.notifySaved(); + }); } } -Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnApp']; +Controller.$inject = ['$stateParams', '$scope', '$http']; ngModule.component('vnItemTags', { template: require('./index.html'), controller: Controller, bindings: { - itemTags: '=', - selection: ' { $componentController = _$componentController_; $state = _$state_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); controller = $componentController('vnItemTags', {$state: $state}); + controller.$.form = { + $setPristine: () => {}, + $dirty: true + }; + controller.$.watcher = { + notifySaved: () => {}, + check: () => {} + }; })); describe('add / remove tags', () => { - it('should add one empty tag into controller tags collection and call _setIconAdd()', () => { - controller.instancedItemTags = []; - spyOn(controller, '_setIconAdd').and.callThrough(); - controller.addItemTag(); + it('should add one empty tag into controller tags collection', () => { + controller.tags = []; + controller.addTag(); - expect(controller._setIconAdd).toHaveBeenCalledWith(); - expect(controller.instancedItemTags.length).toEqual(1); - expect(controller.instancedItemTags[0].id).toBe(undefined); - expect(controller.instancedItemTags[0].showAddIcon).toBeTruthy(); + expect(controller.tags.length).toEqual(1); + expect(controller.tags[0].id).toBe(undefined); }); - it('should remove a tag that occupies the position in the index given and call _setIconAdd()', () => { + it('should remove a tag that occupies the position in the index', () => { + controller.$.form = {$setDirty: () => {}}; + spyOn(controller.$.form, '$setDirty'); + let index = 2; - controller.instancedItemTags = [ + controller.tags = [ {id: 1, typeFk: 1, value: '1111', showAddIcon: false}, {id: 2, typeFk: 2, value: '2222', showAddIcon: false}, {id: 3, typeFk: 3, value: '3333', showAddIcon: true} ]; - spyOn(controller, '_setIconAdd').and.callThrough(); + controller.removeTag(index); - controller.removeItemTag(index); - - expect(controller._setIconAdd).toHaveBeenCalledWith(); - expect(controller.instancedItemTags.length).toEqual(2); - expect(controller.instancedItemTags[0].showAddIcon).toBeFalsy(); - expect(controller.instancedItemTags[1].showAddIcon).toBeTruthy(); - expect(controller.instancedItemTags[index]).toBe(undefined); + expect(controller.tags.length).toEqual(2); + expect(controller.tags[index]).toBe(undefined); + expect(controller.$.form.$setDirty).toHaveBeenCalledWith(); }); }); @@ -89,11 +94,11 @@ describe('Item', () => { }); }); - describe('_equalItemTags()', () => { + describe('tagIsEqual()', () => { it('should return true if two tags are equals independent of control attributes', () => { let tag1 = {id: 1, typeFk: 1, value: '1111', showAddIcon: true}; let tag2 = {id: 1, typeFk: 1, value: '1111', showAddIcon: false}; - let equals = controller._equalItemTags(tag2, tag1); + let equals = controller.tagIsEqual(tag2, tag1); expect(equals).toBeTruthy(); }); @@ -101,7 +106,7 @@ describe('Item', () => { it('should return false if two tags aint equal independent of control attributes', () => { let tag1 = {id: 1, typeFk: 1, value: '1111', showAddIcon: true}; let tag2 = {id: 1, typeFk: 1, value: '2222', showAddIcon: true}; - let equals = controller._equalItemTags(tag2, tag1); + let equals = controller.tagIsEqual(tag2, tag1); expect(equals).toBeFalsy(); }); @@ -109,73 +114,78 @@ describe('Item', () => { describe('get itemTags', () => { it('should perform a GET query to receive the item tags', () => { + controller.$.form = {$setPristine: () => {}}; + spyOn(controller.$.form, '$setPristine'); + let res = [{id: 1, typeFk: 1, value: '1111'}]; $httpBackend.whenGET(`/item/api/ItemTags?filter={"where":{},"order":"priority ASC","include":{"relation":"tag"}}`).respond(res); $httpBackend.expectGET(`/item/api/ItemTags?filter={"where":{},"order":"priority ASC","include":{"relation":"tag"}}`); - controller._getItemTags(); + controller.getTags(); $httpBackend.flush(); + + expect(controller.$.form.$setPristine).toHaveBeenCalledWith(); }); }); describe('submit()', () => { - it("should return an error message 'The tag must be unique' when the tag value isnt unique", () => { - controller.$scope.form = []; + // TODO: Server validation should be implemented + xit("should return an error message 'The tag must be unique' when the tag value isnt unique", () => { + controller.$.form = []; spyOn(controller.vnApp, 'showMessage').and.callThrough(); - controller.instancedItemTags = [ + controller.tags = [ {typeFk: 1, value: 123454, itemFk: 1, id: 1}, {typeFk: 1, value: 123454, itemFk: 1} ]; - controller.oldItemTags = {1: {typeFk: 1, id: 1, value: 123454, itemFk: 1}}; + controller.orgTags = {1: {typeFk: 1, id: 1, value: 123454, itemFk: 1}}; controller.submit(); expect(controller.vnApp.showMessage).toHaveBeenCalledWith('The tag must be unique'); }); it("should perfom a query to delete tags", () => { - controller.$scope.form = {$setPristine: () => {}}; - controller.oldItemTags = {1: {id: 1, typeFk: 1, value: '1111'}}; - controller.instancedItemTags = []; - controller.removedItemTags = [1]; + controller.orgTags = {1: {id: 1, typeFk: 1, value: '1111'}}; + controller.tags = []; + controller.removedTags = [1]; $httpBackend.whenGET(`/item/api/ItemTags?filter={"where":{},"order":"priority ASC","include":{"relation":"tag"}}`).respond([]); - $httpBackend.expectPOST(`/item/api/ItemTags/crudItemTags`).respond('ok!'); + $httpBackend.expectPOST(`/item/api/ItemTags/crud`).respond('ok!'); controller.submit(); $httpBackend.flush(); }); it("should perfom a query to update tags", () => { - controller.$scope.form = {$setPristine: () => {}}; - controller.instancedItemTags = [{id: 1, typeFk: 1, value: '2222'}]; - controller.oldItemTags = {1: {id: 1, typeFk: 1, value: '1111'}}; + controller.tags = [{id: 1, typeFk: 1, value: '2222'}]; + controller.orgTags = {1: {id: 1, typeFk: 1, value: '1111'}}; $httpBackend.whenGET(`/item/api/ItemTags?filter={"where":{},"order":"priority ASC","include":{"relation":"tag"}}`).respond([]); - $httpBackend.expectPOST(`/item/api/ItemTags/crudItemTags`).respond('ok!'); + $httpBackend.expectPOST(`/item/api/ItemTags/crud`).respond('ok!'); controller.submit(); $httpBackend.flush(); }); it("should perfom a query to create new tag", () => { - controller.$scope.form = {$setPristine: () => {}}; - controller.instancedItemTags = [{typeFk: 1, value: 1111, itemFk: 1}]; + controller.tags = [{typeFk: 1, value: 1111, itemFk: 1}]; $httpBackend.whenGET(`/item/api/ItemTags?filter={"where":{},"order":"priority ASC","include":{"relation":"tag"}}`).respond([]); - $httpBackend.expectPOST(`/item/api/ItemTags/crudItemTags`).respond('ok!'); + $httpBackend.expectPOST(`/item/api/ItemTags/crud`).respond('ok!'); controller.submit(); $httpBackend.flush(); }); - it("should return a message 'No changes to save' when there are no changes to apply", () => { - controller.$scope.form = {$setPristine: () => {}}; - spyOn(controller.vnApp, 'showMessage').and.callThrough(); - controller.oldItemTags = [ - {typeFk: 1, value: 1, itemFk: 1, id: 1}, - {typeFk: 2, value: 2, itemFk: 1, id: 2} - ]; - controller.instancedItemTags = []; - controller.submit(); + it("should throw 'No changes to save' error when there are no changes to apply", () => { + controller.$.watcher = { + check: () => { + throw new Error('No changes to save'); + } + }; - expect(controller.vnApp.showMessage).toHaveBeenCalledWith('No changes to save'); + controller.orgTags = []; + controller.tags = []; + + expect(function() { + controller.submit(); + }).toThrowError(); }); }); }); diff --git a/client/item/src/tax/index.html b/client/item/src/tax/index.html index aa111756b..c6b61ca90 100644 --- a/client/item/src/tax/index.html +++ b/client/item/src/tax/index.html @@ -1,3 +1,8 @@ + + Item tax @@ -10,8 +15,7 @@ diff --git a/client/item/src/tax/index.js b/client/item/src/tax/index.js index 7f45df878..9ad2ad592 100644 --- a/client/item/src/tax/index.js +++ b/client/item/src/tax/index.js @@ -1,18 +1,17 @@ import ngModule from '../module'; export default class Controller { - constructor($stateParams, $http) { + constructor($stateParams, $http, $translate, vnApp) { this.$http = $http; this.$stateParams = $stateParams; + this._ = $translate; + this.vnApp = vnApp; let filter = { fields: ['id', 'countryFk', 'taxClassFk'], include: [{ relation: 'country', scope: {fields: ['country']} - }, { - relation: 'taxClass', - scope: {fields: ['id', 'description']} }] }; @@ -21,23 +20,21 @@ export default class Controller { $http.get(url).then(json => { this.taxes = json.data; }); - - $http.get(`/item/api/TaxClasses`).then(json => { - this.classes = json.data; - }); } - + submit() { let data = []; for (let tax of this.taxes) data.push({id: tax.id, taxClassFk: tax.taxClassFk}); let url = `/item/api/Items/${this.$stateParams.id}/updateTaxes`; - this.$http.post(url, data); + this.$http.post(url, data).then( + () => this.vnApp.showMessage(this._.instant('Data saved!')) + ); } } -Controller.$inject = ['$stateParams', '$http']; +Controller.$inject = ['$stateParams', '$http', '$translate', 'vnApp']; ngModule.component('vnItemTax', { template: require('./index.html'), diff --git a/client/locator/src/index/index.html b/client/locator/src/index/index.html index 4194c9db8..8a27afa7d 100644 --- a/client/locator/src/index/index.html +++ b/client/locator/src/index/index.html @@ -21,7 +21,7 @@ show-field="name" value-field="id" field="$ctrl.filter.warehouseFk" - url="/production/api/Warehouses/production" + url="/production/api/Warehouses" on-change = "$ctrl.onChangeWareHouse(item)" label="Store"> diff --git a/client/order/routes.json b/client/order/routes.json index a7d199e2a..a57904950 100644 --- a/client/order/routes.json +++ b/client/order/routes.json @@ -11,9 +11,9 @@ "component": "ui-view" }, { - "url": "/list?q", - "state": "order.list", - "component": "vn-order-list" + "url": "/index?q", + "state": "order.index", + "component": "vn-order-index" }, { "url": "/create", diff --git a/client/production/src/index/index.html b/client/production/src/index/index.html index be21fd321..4e995dc54 100644 --- a/client/production/src/index/index.html +++ b/client/production/src/index/index.html @@ -21,7 +21,7 @@ show-field="name" value-field="id" field="$ctrl.filter.warehouseFk" - url="/production/api/Warehouses/production" + url="/production/api/Warehouses" on-change = "$ctrl.onChangeWareHouse(item)" label="Store"> diff --git a/client/salix/src/components/app/app.html b/client/salix/src/components/app/app.html index adbc23575..b021b4987 100644 --- a/client/salix/src/components/app/app.html +++ b/client/salix/src/components/app/app.html @@ -3,7 +3,7 @@ - + diff --git a/client/salix/src/components/app/style.scss b/client/salix/src/components/app/style.scss index fabe3dcca..6c0600691 100644 --- a/client/salix/src/components/app/style.scss +++ b/client/salix/src/components/app/style.scss @@ -14,7 +14,7 @@ vn-app { } vn-spinner { float: left; - padding: .4em; + padding: 1em .4em; } } .main-view { diff --git a/client/salix/src/components/home/style.scss b/client/salix/src/components/home/style.scss index b44afdab8..6d8d3fa4a 100644 --- a/client/salix/src/components/home/style.scss +++ b/client/salix/src/components/home/style.scss @@ -1,4 +1,4 @@ -@import "colors"; +@import "effects"; vn-home { padding: 2em; @@ -17,6 +17,7 @@ vn-home { flex-wrap: wrap; & > a { + @extend %clickable-light; overflow:hidden; border-radius: 6px; background-color: $main-01; @@ -29,11 +30,6 @@ vn-home { padding: 1em; justify-content: center; - transition: opacity 250ms ease-out; - - &:hover { - background-color: $hover; - } & > vn-icon { font-size: 4em; } diff --git a/client/salix/src/components/index.js b/client/salix/src/components/index.js index ab105ffff..afd469e89 100644 --- a/client/salix/src/components/index.js +++ b/client/salix/src/components/index.js @@ -4,4 +4,3 @@ import './main-menu/main-menu'; import './left-menu/left-menu'; import './left-menu/menu-item'; import './topbar/topbar'; -import './searchbar/searchbar'; diff --git a/client/salix/src/components/left-menu/style.scss b/client/salix/src/components/left-menu/style.scss index a029594e6..311d94fcc 100644 --- a/client/salix/src/components/left-menu/style.scss +++ b/client/salix/src/components/left-menu/style.scss @@ -1,8 +1,12 @@ -@import "colors"; +@import "effects"; vn-menu-item { - & > li.active { - background-color: $main-header; - color: white; + & > li { + @extend %clickable; + + &.active { + background-color: $main-header; + color: white; + } } } diff --git a/client/salix/src/components/main-menu/main-menu.html b/client/salix/src/components/main-menu/main-menu.html index 0a7947705..f7eb343ba 100644 --- a/client/salix/src/components/main-menu/main-menu.html +++ b/client/salix/src/components/main-menu/main-menu.html @@ -35,9 +35,9 @@
  • - {{::lang}} + name="{{::lang.code}}" + ng-click="$ctrl.onChangeLangClick(lang.code)"> + {{::lang.name}}
diff --git a/client/salix/src/components/main-menu/main-menu.js b/client/salix/src/components/main-menu/main-menu.js index 33992ce1b..ee2727f39 100644 --- a/client/salix/src/components/main-menu/main-menu.js +++ b/client/salix/src/components/main-menu/main-menu.js @@ -1,6 +1,16 @@ import ngModule from '../../module'; import './style.scss'; +let languages = { + es: 'Español', + en: 'English', + ca: 'Català', + pt: 'Português', + fr: 'Français', + nl: 'Nederlands', + mn: 'Монгол хэл' +}; + export default class MainMenu { constructor($translate, $scope, $http, $window, modulesFactory) { this.$ = $scope; @@ -8,8 +18,15 @@ export default class MainMenu { this.$translate = $translate; this.$window = $window; this.modules = modulesFactory.getModules(); - this.langs = $translate.getAvailableLanguageKeys(); + this.langs = []; + + for (var code of $translate.getAvailableLanguageKeys()) + this.langs.push({ + code: code, + name: languages[code] ? languages[code] : code + }); } + getCurrentUserName() { this.$http.get('/auth/api/Accounts/getCurrentUserName') .then(json => { @@ -20,9 +37,11 @@ export default class MainMenu { onLogoutClick() { this.$window.location = '/logout'; } + onChangeLangClick(lang) { this.$translate.use(lang); } + $onInit() { this.getCurrentUserName(); } diff --git a/client/salix/src/components/main-menu/style.scss b/client/salix/src/components/main-menu/style.scss index eddeb2677..88eaf3105 100644 --- a/client/salix/src/components/main-menu/style.scss +++ b/client/salix/src/components/main-menu/style.scss @@ -1,4 +1,4 @@ -@import "colors"; +@import "effects"; vn-main-menu { #user { @@ -25,9 +25,9 @@ vn-main-menu { color: white; li { + @extend %clickable-light; background-color: $main-01; margin-bottom: .6em; - cursor: pointer; padding: .8em; border-radius: .1em; min-width: 8em; @@ -36,9 +36,6 @@ vn-main-menu { padding-right: .3em; vertical-align: middle; } - &:hover { - background-color: $hover; - } &:last-child { margin-bottom: 0; } diff --git a/client/salix/src/components/searchbar/searchbar.js b/client/salix/src/components/searchbar/searchbar.js deleted file mode 100644 index 6ff9a8072..000000000 --- a/client/salix/src/components/searchbar/searchbar.js +++ /dev/null @@ -1,160 +0,0 @@ -import ngModule from '../../module'; -import './style.scss'; - -export default class Controller { - constructor($element, $scope, $compile, $timeout, $state, $transitions) { - this.element = $element[0]; - this.$ = $scope; - this.$compile = $compile; - this.$timeout = $timeout; - this.stringSearch = ''; - this.$state = $state; - this.deregisterCallback = $transitions.onStart({}, - transition => this.changeState(transition)); - } - - clearFilter() { - this.index.filter = { - page: 1, - size: 20 - }; - } - - setFilter(filterObject) { - this.clearFilter(); - Object.assign(this.index.filter, filterObject); - } - - getFiltersFromString(stringSearch) { - let result = {}; - if (stringSearch) { - // find pattern key:value or key:(extra value) and returns array - let findPattern = stringSearch.match(/((([\w_]+):([\w_]+))|([\w_]+):\(([\w_ ]+)\))/gi); - let remnantString = (stringSearch.replace(/((([\w_]+):([\w_]+))|([\w_]+):\(([\w_ ]+)\))/gi, '')).trim(); - if (findPattern) { - for (let i = 0; i < findPattern.length; i++) { - let aux = findPattern[i].split(':'); - let property = aux[0]; - let value = aux[1].replace(/\(|\)/g, ''); - result[property] = value.trim(); - } - } - if (remnantString) { - result.search = remnantString; - } - } - return result; - } - - createStringFromObject(filterObject) { - let search = []; - let keys = Object.keys(filterObject); - if (keys.length) { - keys.forEach(k => { - let ignore = (this.ignoreKeys && this.ignoreKeys instanceof Array && this.ignoreKeys.indexOf(k) !== -1); - if (!ignore) { - let value = filterObject[k]; - - if (typeof value === 'string' && value.indexOf(' ') !== -1) { - search.push(`${k}:(${value})`); - } else if (typeof value !== 'object') { - search.push(`${k}:${value}`); - } - } - }); - - if (filterObject.search) - search.unshift(filterObject.search); - } - return (search.length) ? search.join(' ') : ''; - } - - changeState(transition) { - return !(transition._targetState._identifier.name === this.$state.current.name); - } - - pushFiltersToState(filters) { - let history = window.history || {pushState: () => { - console.error('Error in history.pushState(): Browser incompatibility error'); - }}; - let aux = window.location.hash.split('?q='); - if (Object.keys(filters).length) - history.pushState({}, null, `${aux[0]}?q=${encodeURIComponent(JSON.stringify(filters))}`); - else - history.pushState({}, null, aux[0]); - } - - onpenFilters(event) { - let filter = {}; - if (this.stringSearch) { - filter = this.getFiltersFromString(this.stringSearch); - } - - this.$child = this.$compile(`<${this.popover}/>`)(this.$.$new()); - - var childCtrl = this.$child.isolateScope().$ctrl; - childCtrl.filter = Object.assign({}, filter); - childCtrl.onSubmit = filter => this.onChildSubmit(filter); - if (this.data) - childCtrl.data = Object.assign({}, this.data); - - event.preventDefault(); - - this.$.popover.parent = this.element; - this.$.popover.child = this.$child[0]; - this.$.popover.show(); - } - - onPopoverClose() { - this.$child.scope().$destroy(); - this.$child.remove(); - this.$child = null; - } - - onChildSubmit(filter) { - this.$.popover.hide(); - this.stringSearch = this.createStringFromObject(filter); - this.clearFilter(); - this.$timeout(() => this.onSubmit()); - } - - onSubmit() { - let filter = {}; - if (this.stringSearch) { - filter = this.getFiltersFromString(this.stringSearch); - } - this.setFilter(filter); - - if (this.onSearch) - this.onSearch(); - - this.pushFiltersToState(filter); - } - - $onDestroy() { - this.clearFilter(); - this.deregisterCallback(); - } - - $onInit() { - if (this.$state.params.q) { - let filter = JSON.parse(decodeURIComponent(this.$state.params.q)); - this.stringSearch = this.createStringFromObject(filter); - } - this.$timeout(() => this.onSubmit()); - } -} -Controller.$inject = ['$element', '$scope', '$compile', '$timeout', '$state', '$transitions']; - -ngModule.component('vnSearchbar', { - template: require('./searchbar.html'), - bindings: { - index: '<', - onSearch: '&', - advanced: '=', - popover: '@', - ignoreKeys: ' {}); window.myAppErrorLog = []; $state.defaultErrorHandler(function(error) { - if (error.type === HOOK_ABORTED_TRANSITION) + if (error.type === 3) // ABORTED_TRANSITION window.myAppErrorLog.push(error); }); } ngModule.run(run); + +config.$inject = ['$translatePartialLoaderProvider', '$httpProvider']; +export function config($translatePartialLoaderProvider, $httpProvider) { + $translatePartialLoaderProvider.addPart(appName); + $httpProvider.interceptors.push('vnInterceptor'); +} +ngModule.config(config); + +// Unhandled exceptions + +$exceptionHandler.$inject = ['vnApp', '$window']; +function $exceptionHandler(vnApp, $window) { + return function(exception, cause) { + let message; + + if (exception.name == 'HttpError') { + switch (exception.xhrStatus) { + case 'timeout': + case 'abort': + return; + } + + let data = exception.data; + + if (data && data.error instanceof Object) + message = data.error.message; + else if (exception.status === -1) + message = `Can't contact with server`; + else + message = `${exception.status}: ${exception.statusText}`; + + if (exception.status === 401) { + let location = $window.location; + let continueUrl = location.pathname + location.search + location.hash; + continueUrl = encodeURIComponent(continueUrl); + $window.location = `/auth/?apiKey=${vnApp.name}&continue=${continueUrl}`; + } + } else if (exception.name == 'UserError') { + message = exception.message; + } else { + message = 'Ups! Something went wrong'; + console.error(exception); + } + + vnApp.showError(message); + }; +} +ngModule.factory('$exceptionHandler', $exceptionHandler); diff --git a/client/salix/src/styles/colors.scss b/client/salix/src/styles/colors.scss index 3a9cea1c6..daedb7100 100644 --- a/client/salix/src/styles/colors.scss +++ b/client/salix/src/styles/colors.scss @@ -1,7 +1,8 @@ $main-font-color :#222222; $secondary-font-color: #9b9b9b; $main-header: #3d3d3d; -$hover: #c4c4c4; +$hover: rgba(0, 0, 0, 0.1); +$hover-opacity: .7; $main-bg: #e5e5e5; $main-01: #f7931e; $main-01-05: rgba($main-01, 0.5); @@ -9,6 +10,7 @@ $main-01-03: rgba($main-01, 0.3); $main-02: #a3d131; $main-02-05: rgba($main-02, 0.5); $main-02-03: rgba($main-02, 0.3); +$lines: #9b9b9b; $color-green: #a3d131; $color-orange: #f7931e; diff --git a/client/salix/src/styles/effects.scss b/client/salix/src/styles/effects.scss new file mode 100644 index 000000000..6c1b6ffa3 --- /dev/null +++ b/client/salix/src/styles/effects.scss @@ -0,0 +1,20 @@ + +@import "./colors"; + +%clickable { + cursor: pointer; + transition: background-color 250ms ease-out; + + &:hover { + background-color: $hover; + } +} + +%clickable-light { + cursor: pointer; + transition: opacity 250ms ease-out; + + &:hover { + opacity: $hover-opacity; + } +} \ No newline at end of file diff --git a/client/salix/src/styles/font-style.scss b/client/salix/src/styles/font-style.scss index a33df7a6a..462023eca 100644 --- a/client/salix/src/styles/font-style.scss +++ b/client/salix/src/styles/font-style.scss @@ -1,7 +1,6 @@ @import "colors"; @import "font-family"; - body { color: $main-font-color; font-family: vn-font; diff --git a/client/salix/src/styles/index.js b/client/salix/src/styles/index.js index 31ef9c863..eaa0463b8 100644 --- a/client/salix/src/styles/index.js +++ b/client/salix/src/styles/index.js @@ -9,3 +9,4 @@ import './font-style.scss'; import './misc.scss'; import './summary.scss'; import './colors.scss'; +import './effects.scss'; diff --git a/client/salix/src/styles/layout.scss b/client/salix/src/styles/layout.scss index c952abe37..75a7d603c 100644 --- a/client/salix/src/styles/layout.scss +++ b/client/salix/src/styles/layout.scss @@ -64,7 +64,6 @@ html [vn-auto], vn-auto, .vn-auto { flex-basis: auto; } html [vn-none], vn-none, .vn-none { - flex: 1; flex: none; } html [vn-one], vn-one, .vn-one { diff --git a/client/salix/src/styles/misc.scss b/client/salix/src/styles/misc.scss index 2f23a655b..cd285bd0e 100644 --- a/client/salix/src/styles/misc.scss +++ b/client/salix/src/styles/misc.scss @@ -1,8 +1,8 @@ -@import "padding"; -@import "margin"; -@import "colors"; -@import "border"; - +@import "./padding"; +@import "./margin"; +@import "./colors"; +@import "./border"; +@import "./effects"; a:focus, input:focus, @@ -64,7 +64,7 @@ html [vn-center], .vn-center{ .list-element{ padding: 8px 0 0 0; - border-bottom: 1px solid $main-header; + border-bottom: 1px solid $lines; i { color: $main-01; } @@ -81,7 +81,7 @@ html [vn-center], .vn-center{ } .list-footer{ font-family: vn-font-bold; - border-top: 3px solid $main-header; + border-top: 3px solid $lines; } .list-element.warning{ background-color: $color-medium-orange; @@ -116,17 +116,8 @@ a { } } -.vn-clickable { - cursor: pointer; - transition: background-color 250ms ease-out; - - &:hover { - background-color: $hover; - } -} - button { - @extend .vn-clickable; + @extend %clickable; } vn-button-bar { @@ -168,14 +159,12 @@ vn-main-block { font-size: 2.5em; } & > a { - @extend .vn-clickable; - + @extend %clickable; display: flex; align-items: center; padding: .5em; color: white; text-decoration: none; - transition: background-color 250ms ease-out; & > vn-icon { font-size: 1.8em; @@ -205,7 +194,7 @@ vn-main-block { .vn-list-item { @extend .pad-medium; @extend .border-solid-bottom; - @extend .vn-clickable; + @extend %clickable; display: block; text-decoration: none; @@ -220,21 +209,28 @@ vn-main-block { margin-left: .5em; transition: opacity 250ms ease-out; font-size: 2em; + &:hover { opacity: 1; } } } } + /** START - FORM ELEMENTS DISABLED **/ -fieldset[disabled] .mdl-textfield .mdl-textfield__input, .mdl-textfield.is-disabled .mdl-textfield__input, -fieldset[disabled] .mdl-checkbox .mdl-checkbox__label, .mdl-checkbox.is-disabled .mdl-checkbox__label { + +fieldset[disabled] .mdl-textfield .mdl-textfield__input, +fieldset[disabled] .mdl-checkbox .mdl-checkbox__label, +.mdl-textfield.is-disabled .mdl-textfield__input, +.mdl-checkbox.is-disabled .mdl-checkbox__label { border: none !important; color: inherit !important; } -fieldset[disabled] .mdl-textfield .mdl-textfield__label, .mdl-textfield.is-disabled.is-disabled .mdl-textfield__label { +fieldset[disabled] .mdl-textfield .mdl-textfield__label, +.mdl-textfield.is-disabled.is-disabled .mdl-textfield__label { color: $main-01 !important; } + /** END - FORM ELEMENTS DISABLED **/ .ellipsize { diff --git a/client/ticket/src/card/index.js b/client/ticket/src/card/index.js index 22c126960..5bfb31b7b 100644 --- a/client/ticket/src/card/index.js +++ b/client/ticket/src/card/index.js @@ -4,11 +4,9 @@ class Controller { constructor($http, $state) { this.$http = $http; this.$state = $state; - - this.ticket = null; } - _getTicket() { + getTicket() { let filter = { include: [ {relation: 'warehouse', scope: {fields: ['name']}}, @@ -16,7 +14,7 @@ class Controller { { relation: 'client', scope: { - fields: ['salesPersonFk', 'name'], + fields: ['salesPersonFk', 'name', 'isActive', 'isFreezed', 'isTaxDataChecked'], include: { relation: 'salesPerson', fields: ['firstName', 'name'] @@ -35,21 +33,21 @@ class Controller { } ] }; + let json = encodeURIComponent(JSON.stringify(filter)); - this.$http.get(`/ticket/api/Tickets/${this.$state.params.id}?filter=${json}`) - .then(res => { - if (res.data) - this.ticket = res.data; - } - ); + let query = `/ticket/api/Tickets/${this.$state.params.id}?filter=${json}`; + this.$http.get(query).then(res => { + if (res.data) + this.ticket = res.data; + }); } $onInit() { - this._getTicket(); + this.getTicket(); } - + reload() { - this._getTicket(); + this.getTicket(); } } diff --git a/client/ticket/src/component/index.html b/client/ticket/src/component/index.html index 15aa71f43..11d600bb7 100644 --- a/client/ticket/src/component/index.html +++ b/client/ticket/src/component/index.html @@ -36,7 +36,8 @@ {{::sale.itemFk}} + }}" number pointer + ng-click="$ctrl.showDescriptor($event, sale.itemFk)">{{::sale.itemFk}} @@ -69,3 +70,4 @@ + diff --git a/client/ticket/src/component/index.js b/client/ticket/src/component/index.js index 4eb51fe70..2c912c33c 100644 --- a/client/ticket/src/component/index.js +++ b/client/ticket/src/component/index.js @@ -43,6 +43,16 @@ class Controller extends FilterTicketList { } return sum; } + + showDescriptor(event, itemFk) { + this.$scope.descriptor.itemFk = itemFk; + this.$scope.descriptor.parent = event.target; + this.$scope.descriptor.show(); + } + + onDescriptorLoad() { + this.$scope.popover.relocate(); + } } Controller.$inject = ['$scope', '$timeout', '$state']; diff --git a/client/ticket/src/component/style.scss b/client/ticket/src/component/style.scss index a08ba23a5..08a16c8f0 100644 --- a/client/ticket/src/component/style.scss +++ b/client/ticket/src/component/style.scss @@ -1,27 +1,41 @@ -vn-ticket-components .vn-grid { - tbody:not(:last-child) { - border-bottom: none; - } +vn-ticket-components { + vn-fetched-tags { + & vn-horizontal { + flex-direction: column; + text-align: center; - tfoot tr:first-child td { - padding-top: 10px !important; + & .inline-tag { + display: inline-block; + float: none + } + } } - tr { - td { - padding-top: .1em !important; - padding-bottom: .1em !important; + .vn-grid { + tbody:not(:last-child) { + border-bottom: none; } - td.first { + tfoot tr:first-child td { padding-top: 10px !important; } + + tr { + td { + padding-top: .1em !important; + padding-bottom: .1em !important; + } - td.last { - padding-bottom: 10px !important; + td.first { + padding-top: 10px !important; + } + + td.last { + padding-bottom: 10px !important; + } + } + tr:not(:first-child):not(:last-child), { + border-bottom: none; } } - tr:not(:first-child):not(:last-child), { - border-bottom: none; - } } \ No newline at end of file diff --git a/client/ticket/src/data/step-one/index.js b/client/ticket/src/data/step-one/index.js index f74a64c54..7e96eb40a 100644 --- a/client/ticket/src/data/step-one/index.js +++ b/client/ticket/src/data/step-one/index.js @@ -33,16 +33,16 @@ class Controller { let data = { landed: toJsonDate(this.ticket.landed), addressFk: this.ticket.addressFk, - agencyModeFk: this.ticket.agencyModeFk + agencyModeFk: this.ticket.agencyModeFk, + warehouseFk: this.ticket.warehouseFk }; - + return this.$http.post(query, data).then(res => { if (res.data) this.ticket.sale = res.data; return true; }, res => { - console.log(res); if (res.data.error.message === 'NO_AGENCY_AVAILABLE') this.vnApp.showError( this.$translate.instant(`There's no available agency for this landing date`) diff --git a/client/ticket/src/data/step-one/step-one.spec.js b/client/ticket/src/data/step-one/step-one.spec.js index f00198308..625c90e90 100644 --- a/client/ticket/src/data/step-one/step-one.spec.js +++ b/client/ticket/src/data/step-one/step-one.spec.js @@ -15,6 +15,7 @@ describe('ticket', () => { $componentController = _$componentController_; $state = _$state_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); controller = $componentController('vnTicketDataStepOne', {$state: $state}); })); @@ -25,6 +26,7 @@ describe('ticket', () => { addressFk: 121, agencyModeFk: 1, companyFk: 442, + warehouseFk: 1, shipped: new Date(), landed: new Date() }; @@ -36,28 +38,27 @@ describe('ticket', () => { describe('onStepChange()', () => { it('should call onStepChange method and return a NO_AGENCY_AVAILABLE signal error', async () => { + let landed = new Date(); + landed.setHours(0, 0, 0, 0); + controller.ticket = { id: 1, clientFk: 1, addressFk: 121, agencyModeFk: 1, companyFk: 442, + warehouseFk: 1, shipped: new Date(), - landed: new Date() + landed: landed }; - let data = { - addressFk: 121, - agencyModeFk: 1, - landed: new Date() - }; - let response = {data: {error: new Error('NO_AGENCY_AVAILABLE')}}; + let response = {error: new Error('NO_AGENCY_AVAILABLE')}; - $httpBackend.whenPOST(`/ticket/api/sales/1/priceDifference`, data).respond(400, response); - $httpBackend.expectPOST(`/ticket/api/sales/1/priceDifference`, data); - await controller.onStepChange(); + $httpBackend.whenPOST(`/ticket/api/sales/1/priceDifference`).respond(400, response); + $httpBackend.expectPOST(`/ticket/api/sales/1/priceDifference`); + controller.onStepChange(); $httpBackend.flush(); }); }); }); -}); \ No newline at end of file +}); diff --git a/client/ticket/src/data/step-three/index.html b/client/ticket/src/data/step-three/index.html index e3d762ded..bcd26b357 100644 --- a/client/ticket/src/data/step-three/index.html +++ b/client/ticket/src/data/step-three/index.html @@ -11,5 +11,12 @@ initial-data="$ctrl.ticket.option"> + + + +
diff --git a/client/ticket/src/data/step-three/index.js b/client/ticket/src/data/step-three/index.js index f98aaa5bf..dcde1e838 100644 --- a/client/ticket/src/data/step-three/index.js +++ b/client/ticket/src/data/step-three/index.js @@ -15,6 +15,7 @@ class Controller { $onChanges() { this.ticket.option = 1; + this.ticket.hasToBeUnrouted = true; } onStepChange(state) { @@ -29,12 +30,14 @@ class Controller { let query = `/ticket/api/tickets/${this.ticket.id}/componentUpdate`; let data = { + clientFk: this.ticket.clientFk, agencyModeFk: this.ticket.agencyModeFk, addressFk: this.ticket.addressFk, warehouseFk: this.ticket.warehouseFk, shipped: this.ticket.shipped, landed: this.ticket.landed, isDeleted: this.ticket.isDeleted, + hasToBeUnrouted: this.ticket.hasToBeUnrouted, option: this.ticket.option }; diff --git a/client/ticket/src/data/step-three/locale/es.yml b/client/ticket/src/data/step-three/locale/es.yml index d2c21e5ef..f2b78c77f 100644 --- a/client/ticket/src/data/step-three/locale/es.yml +++ b/client/ticket/src/data/step-three/locale/es.yml @@ -1,3 +1,4 @@ Charge: Cargo Choose an option: Selecciona una opción -Charge difference to: Diferencia a cargo de \ No newline at end of file +Charge difference to: Diferencia a cargo de +Remove from route: Sacar de la ruta \ No newline at end of file diff --git a/client/ticket/src/descriptor/index.html b/client/ticket/src/descriptor/index.html index 2f00e811a..2b09180fc 100644 --- a/client/ticket/src/descriptor/index.html +++ b/client/ticket/src/descriptor/index.html @@ -8,31 +8,53 @@ -
-
{{$ctrl.client.name}}
- - - - - - - - - - - - - - - - -
+
+
{{$ctrl.client.name}}
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + diff --git a/client/ticket/src/descriptor/index.js b/client/ticket/src/descriptor/index.js index ee40fdd94..a1364bda8 100644 --- a/client/ticket/src/descriptor/index.js +++ b/client/ticket/src/descriptor/index.js @@ -1,8 +1,29 @@ import ngModule from '../module'; +class Controller { + + constructor($http) { + this.$http = $http; + } + + getClientDebt(clientFk) { + this.$http.get(`/client/api/Clients/${clientFk}/getDebt`).then(response => { + this.clientDebt = response.data.debt; + }); + } + + $onChanges() { + if (this.ticket) + this.getClientDebt(this.ticket.clientFk); + } +} + +Controller.$inject = ['$http']; + ngModule.component('vnTicketDescriptor', { template: require('./index.html'), bindings: { ticket: '<' - } + }, + controller: Controller }); diff --git a/client/ticket/src/expedition/index.html b/client/ticket/src/expedition/index.html index cc4e3ebb4..8da3bbfb5 100644 --- a/client/ticket/src/expedition/index.html +++ b/client/ticket/src/expedition/index.html @@ -25,7 +25,8 @@ vn-tooltip="delete expedition" ng-click="$ctrl.deleteExpedition(expedition)">delete - {{::expedition.itemFk}} + {{::expedition.itemFk}} {{::expedition.item.name}} {{::expedition.package.name}} {{::expedition.counter}} @@ -41,3 +42,4 @@ + diff --git a/client/ticket/src/expedition/index.js b/client/ticket/src/expedition/index.js index 4eb91af50..e4f980306 100644 --- a/client/ticket/src/expedition/index.js +++ b/client/ticket/src/expedition/index.js @@ -4,6 +4,7 @@ import FilterTicketList from '../filter-ticket-list'; class Controller extends FilterTicketList { constructor($scope, $timeout, $stateParams, $http) { super($scope, $timeout, $stateParams); + this.$scope = $scope; this.params = $stateParams; this.$http = $http; } @@ -13,6 +14,16 @@ class Controller extends FilterTicketList { () => this.$.index.accept() ); } + + showDescriptor(event, itemFk) { + this.$scope.descriptor.itemFk = itemFk; + this.$scope.descriptor.parent = event.target; + this.$scope.descriptor.show(); + } + + onDescriptorLoad() { + this.$scope.popover.relocate(); + } } Controller.$inject = ['$scope', '$timeout', '$state', '$http']; diff --git a/client/ticket/src/fetched-tags/index.html b/client/ticket/src/fetched-tags/index.html index d9b47107b..4a3c679a7 100644 --- a/client/ticket/src/fetched-tags/index.html +++ b/client/ticket/src/fetched-tags/index.html @@ -1,8 +1,11 @@ - + {{::$ctrl.sale.concept}} - - - {{::fetchedTag.tag.name}} {{::fetchedTag.value}} - + +
+ {{::fetchedTag.value}} +
- \ No newline at end of file + \ No newline at end of file diff --git a/client/ticket/src/fetched-tags/index.js b/client/ticket/src/fetched-tags/index.js index 1b8341bdc..7e9455060 100644 --- a/client/ticket/src/fetched-tags/index.js +++ b/client/ticket/src/fetched-tags/index.js @@ -1,4 +1,5 @@ import ngModule from '../module'; +import './style.scss'; ngModule.component('vnFetchedTags', { template: require('./index.html'), diff --git a/client/ticket/src/fetched-tags/style.scss b/client/ticket/src/fetched-tags/style.scss new file mode 100644 index 000000000..6abfd33d5 --- /dev/null +++ b/client/ticket/src/fetched-tags/style.scss @@ -0,0 +1,42 @@ +@import "colors"; + +vn-fetched-tags { + @media screen and (max-width: 1700px){ + & vn-horizontal { + flex-direction: column; + text-align: center; + + & .inline-tag { + display: inline-block; + float: none + } + } + } + + & vn-one:first-child { + padding-top: 0.36em + } + + & .inline-tag { + background-color: $secondary-font-color; + margin: 0.4em 0.4em 0 0; + color: $color-white; + text-align: center; + font-size: 0.8em; + height: 1.25em; + padding: 0.4em; + float: left; + width: 5em + } + + & .inline-tag.empty { + background-color: $main-bg + } + + & .inline-tag.empty:after { + overflow: hidden; + display: block; + content: ' '; + clear: both + } +} \ No newline at end of file diff --git a/client/ticket/src/index/index.html b/client/ticket/src/index/index.html index 405e4dfef..e04c85854 100644 --- a/client/ticket/src/index/index.html +++ b/client/ticket/src/index/index.html @@ -1,70 +1,69 @@ - -
-
- - TICKETS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID TicketComercialDateHoraAliasProvinciaEstadoAgenciaAlmacenFacturaRuta
- - {{::ticket.id}}{{::ticket.client.salesPerson.name | dashIfEmpty}}{{::ticket.shipped | date:'dd/MM/yyyy'}}{{::ticket.shipped | date:'HH:MM'}}{{::ticket.nickname}}{{::ticket.address.province.name}}{{::ticket.tracking.state.name}}{{::ticket.agencyMode.name}}{{::ticket.warehouse.name}}{{::ticket.refFk | dashIfEmpty}}{{::ticket.routeFk | dashIfEmpty}} - - -
- + + +
+
+ + + - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IdSalespersonDateHourAliasProvinceStateAgencyWarehouseInvoiceRoute
{{::ticket.id}}{{::ticket.client.salesPerson.name | dashIfEmpty}}{{::ticket.shipped | date:'dd/MM/yyyy'}}{{::ticket.shipped | date:'HH:MM'}}{{::ticket.nickname}}{{::ticket.address.province.name}}{{::ticket.tracking.state.name}}{{::ticket.agencyMode.name}}{{::ticket.warehouse.name}}{{::ticket.refFk | dashIfEmpty}}{{::ticket.routeFk | dashIfEmpty}} + + +
+ + +
diff --git a/client/ticket/src/index/index.js b/client/ticket/src/index/index.js index fe75368e3..813165403 100644 --- a/client/ticket/src/index/index.js +++ b/client/ticket/src/index/index.js @@ -1,11 +1,82 @@ import ngModule from '../module'; -import './ticket-item'; -import './style.scss'; export default class Controller { constructor($scope) { - this.$scope = $scope; + this.$ = $scope; this.ticketSelected = null; + + this.filter = { + include: [ + { + relation: 'address', + scope: { + fields: ['provinceFk'], + include: { + relation: 'province', + scope: { + fields: ['name'] + } + } + } + }, { + relation: 'warehouse', + scope: { + fields: ['name'] + } + }, { + relation: 'agencyMode', + scope: { + fields: ['name'] + } + }, { + relation: 'tracking', + scope: { + fields: ['stateFk'], + include: { + relation: 'state', + scope: { + fields: ['name'] + } + } + } + }, { + relation: 'client', + scope: { + fields: ['salesPersonFk'], + include: { + relation: 'salesPerson', + scope: { + fields: ['name'] + } + } + } + } + ], + order: 'shipped DESC' + }; + } + + exprBuilder(param, value) { + switch (param) { + case 'search': + return { + or: [ + {id: value}, + {nickname: {regexp: value}} + ] + }; + case 'from': + return {shipped: {gte: value}}; + case 'to': + return {shipped: {lte: value}}; + case 'nickname': + return {[param]: {regexp: value}}; + case 'id': + case 'clientFk': + case 'agencyModeFk': + case 'warehouseFk': + return {[param]: value}; + } } compareDate(date) { @@ -26,17 +97,9 @@ export default class Controller { preview(event, ticket) { event.preventDefault(); event.stopImmediatePropagation(); - this.$scope.dialogSummaryTicket.show(); + this.$.dialogSummaryTicket.show(); this.ticketSelected = ticket; } - - search(index) { - index.accept(); - /* this.tickets = []; - index.accept().then(res => { - this.tickets = res.instances; - }); */ - } } Controller.$inject = ['$scope']; diff --git a/client/ticket/src/index/ticket-index.spec.js b/client/ticket/src/index/index.spec.js similarity index 86% rename from client/ticket/src/index/ticket-index.spec.js rename to client/ticket/src/index/index.spec.js index f6a004948..a6cd7d18c 100644 --- a/client/ticket/src/index/ticket-index.spec.js +++ b/client/ticket/src/index/index.spec.js @@ -34,14 +34,14 @@ describe('ticket', () => { it('should call preventDefault and stopImmediatePropagation from event and show', () => { let event = jasmine.createSpyObj('event', ['preventDefault', 'stopImmediatePropagation']); - controller.$scope = {dialogSummaryTicket: {show: () => {}}}; - spyOn(controller.$scope.dialogSummaryTicket, 'show'); + controller.$ = {dialogSummaryTicket: {show: () => {}}}; + spyOn(controller.$.dialogSummaryTicket, 'show'); let ticket = {}; controller.preview(event, ticket); expect(event.preventDefault).toHaveBeenCalledWith(); expect(event.stopImmediatePropagation).toHaveBeenCalledWith(); - expect(controller.$scope.dialogSummaryTicket.show).toHaveBeenCalledWith(); + expect(controller.$.dialogSummaryTicket.show).toHaveBeenCalledWith(); }); }); }); diff --git a/client/ticket/src/index/style.scss b/client/ticket/src/index/style.scss deleted file mode 100644 index eb363a9a7..000000000 --- a/client/ticket/src/index/style.scss +++ /dev/null @@ -1,3 +0,0 @@ -vn-ticket-item { - display: block; -} \ No newline at end of file diff --git a/client/ticket/src/index/ticket-item.html b/client/ticket/src/index/ticket-item.html deleted file mode 100644 index 9b9d25440..000000000 --- a/client/ticket/src/index/ticket-item.html +++ /dev/null @@ -1,20 +0,0 @@ - - - -
{{::$ctrl.ticket.nickname}}
- - - - - - - - - diff --git a/client/ticket/src/index/ticket-item.js b/client/ticket/src/index/ticket-item.js deleted file mode 100644 index c62a989d9..000000000 --- a/client/ticket/src/index/ticket-item.js +++ /dev/null @@ -1,24 +0,0 @@ -import ngModule from '../module'; - -class Controller { - onClick(event) { - if (event.defaultPrevented) - event.stopImmediatePropagation(); - } - - preview(event) { - event.preventDefault(); - this.index.openSummary(this.ticket); - } -} - -ngModule.component('vnTicketItem', { - controller: Controller, - template: require('./ticket-item.html'), - bindings: { - ticket: '<' - }, - require: { - index: '^vnTicketIndex' - } -}); diff --git a/client/ticket/src/note/index.js b/client/ticket/src/note/index.js index e682b5514..8c2c602c9 100644 --- a/client/ticket/src/note/index.js +++ b/client/ticket/src/note/index.js @@ -119,6 +119,7 @@ class Controller { return this.$http.post(`/ticket/api/TicketObservations/crudTicketObservation`, observationsObj).then(() => { this.getObservations(); this._unsetDirtyForm(); + this.$scope.watcher.notifySaved(); }); } this.vnApp.showMessage(this.$translate.instant('No changes to save')); diff --git a/client/ticket/src/note/ticket-observation.spec.js b/client/ticket/src/note/ticket-observation.spec.js index 7d58abd81..f1bbbdd0b 100644 --- a/client/ticket/src/note/ticket-observation.spec.js +++ b/client/ticket/src/note/ticket-observation.spec.js @@ -15,7 +15,11 @@ describe('ticket', () => { $componentController = _$componentController_; $state = _$state_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); controller = $componentController('vnTicketObservation', {$state: $state}); + controller.$scope.watcher = { + notifySaved: () => {} + }; })); describe('add / remove observation', () => { diff --git a/client/ticket/src/package/package.spec.js b/client/ticket/src/package/package.spec.js index 81bddc9f6..f9d0ec606 100644 --- a/client/ticket/src/package/package.spec.js +++ b/client/ticket/src/package/package.spec.js @@ -14,6 +14,7 @@ describe('Ticket', () => { beforeEach(angular.mock.inject((_$componentController_, _$httpBackend_, $rootScope) => { $componentController = _$componentController_; $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); $scope = { index: { accept: function() {} @@ -35,11 +36,6 @@ describe('Ticket', () => { describe('submit()', () => { it('should perform a post', () => { spyOn(controller.$.index, 'accept'); - let packagesObj = { - delete: controller.removedPackages, - create: [], - update: [] - }; let query = '/ticket/api/TicketPackagings/crudTicketPackaging'; controller.removedPackages = []; controller.oldPackages = []; diff --git a/client/ticket/src/sale-checked/index.html b/client/ticket/src/sale-checked/index.html index 8337c22f1..00de7cec2 100644 --- a/client/ticket/src/sale-checked/index.html +++ b/client/ticket/src/sale-checked/index.html @@ -8,7 +8,7 @@ Is checked Item - Description + Description Quantity @@ -20,7 +20,8 @@ disabled="true"> - {{::sale.itemFk}} + {{::sale.itemFk}} {{::sale.quantity}} @@ -34,3 +35,4 @@ + diff --git a/client/ticket/src/sale-checked/index.js b/client/ticket/src/sale-checked/index.js index 5feb145c6..cdeccfa1c 100644 --- a/client/ticket/src/sale-checked/index.js +++ b/client/ticket/src/sale-checked/index.js @@ -4,9 +4,19 @@ import FilterTicketList from '../filter-ticket-list'; class Controller extends FilterTicketList { constructor($scope, $timeout, $state) { super($scope, $timeout, $state); - + this.$scope = $scope; this.onOrder('quantity', 'ASC'); } + + showDescriptor(event, itemFk) { + this.$scope.descriptor.itemFk = itemFk; + this.$scope.descriptor.parent = event.target; + this.$scope.descriptor.show(); + } + + onDescriptorLoad() { + this.$scope.popover.relocate(); + } } Controller.$inject = ['$scope', '$timeout', '$state']; diff --git a/client/ticket/src/sale/index.html b/client/ticket/src/sale/index.html index 548adb42f..537971b66 100644 --- a/client/ticket/src/sale/index.html +++ b/client/ticket/src/sale/index.html @@ -5,28 +5,47 @@ Sale + + + + @@ -39,7 +58,10 @@ - - - - + + + + + + @@ -61,8 +100,135 @@ - - - + + + + + + + + +
+
+ In which day you want to add the ticket? +
+ + + + + + + + + + + + + + + + +
+ + + + + + +
MANÁ: {{$ctrl.workerMana}}
+ +
+
{{$ctrl.client.name}}
+ + + + + + + + +
+ + + + +
+
- + + Item Description
- + + {{::sale.quantity}}{{::sale.price | currency:'€':2}}{{::sale.discount}} %{{::sale.quantity * sale.price | currency:'€':2}}{{sale.quantity}}{{sale.price | currency:'€':2}}{{sale.discount}} %{{sale.quantity * sale.price | currency:'€':2}}
No results
+ + + + + + + + + + + + + + + + + +
IDF. envioAgenciaAlmacen
No results
{{::ticket.id}}{{::ticket.shipped | date: 'dd/MM/yyyy HH:mm'}}{{::ticket.agencyName}}{{::ticket.warehouseName}}
+ + + + + + + +
+ + diff --git a/client/ticket/src/sale/index.js b/client/ticket/src/sale/index.js index d00f619b5..0b235948d 100644 --- a/client/ticket/src/sale/index.js +++ b/client/ticket/src/sale/index.js @@ -1,13 +1,29 @@ import ngModule from '../module'; import FilterTicketList from '../filter-ticket-list'; +import './style.scss'; class Controller extends FilterTicketList { - constructor($scope, $timeout, $stateParams, $http) { + constructor($scope, $timeout, $stateParams, $http, $state, vnApp) { super($scope, $timeout, $stateParams); this.$ = $scope; + this.vnApp = vnApp; this.$timeout = $timeout; this.onOrder('itemFk', 'ASC'); + this.$state = $stateParams; this.$http = $http; + this.deletable = false; + this.moreOptions = [ + {callback: this.showAddTurnDialog, name: "Add turn"}, + {callback: this.showDeleteTicketDialog, name: "Delete ticket"} + ]; + } + + get isEditable() { + try { + return !this.ticket.tracking.state.alertLevel; + } catch (e) {} + + return true; } get isChecked() { @@ -20,6 +36,22 @@ class Controller extends FilterTicketList { return false; } + getCheckedLines() { + let lines = []; + let data = this.$.index.model.instances; + if (data) + for (let i = 0; i < data.length; i++) + if (data[i].checked) + lines.push({id: data[i].id, instance: i}); + + return lines; + } + + onMoreChange(callback) { + callback.call(this); + } + + // Change State onStateOkClick() { let filter = {where: {code: "OK"}, fields: ["id"]}; let json = encodeURIComponent(JSON.stringify(filter)); @@ -30,41 +62,153 @@ class Controller extends FilterTicketList { onStateChange(value) { let params = {ticketFk: this.$state.params.id, stateFk: value}; - this.$http.post(`/ticket/api/TicketTrackings`, params).then(() => { + this.$http.post(`/ticket/api/TicketTrackings/changeState`, params).then(() => { this.card.reload(); + this.vnApp.showMessage(this.translate.instant('Data saved')); }); } - onRemoveLinesClick() { - let lines = { - delete: [] - }; - let data = this.$.index.model.instances; - if (data) - for (let i = 0; i < data.length;) { - if (data[i].checked) { - lines.delete.push(data[i].id); - data.splice(i, 1); - } else { - i++; - } - } - - let query = `/ticket/api/Sales/crudSale`; - this.$http.post(query, lines); + // Add Turn + showAddTurnDialog() { + this.$.addTurn.show(); } + addTurn(day) { + let params = {ticketFk: this.$state.params.id, weekDay: day}; + this.$http.patch(`/ticket/api/TicketWeeklies`, params).then(() => { + this.$.addTurn.hide(); + }); + } + + // Delete Ticket + showDeleteTicketDialog() { + this.$.deleteConfirmation.show(); + } + + returnDeleteTicketDialog(response) { + if (response === 'ACCEPT') + this.deleteTicket(); + } + + deleteTicket() { + let params = {id: this.$state.params.id}; + this.$http.post(`/ticket/api/Tickets/deleted`, params).then(() => { + this.$state.go('ticket.list'); + }); + } + + // Remove Lines + onRemoveLinesClick() { + let sales = this.getCheckedLines(); + let params = {sales: sales, actualTicketFk: this.ticket.id}; + let query = `/ticket/api/Sales/removes`; + this.$http.post(query, params).then(() => { + this.removeInstances(sales); + }); + } + + // Move Lines + showTransferPopover(event) { + let filter = {clientFk: this.ticket.clientFk, ticketFk: this.ticket.id}; + let json = encodeURIComponent(JSON.stringify(filter)); + this.$http.get(`/ticket/api/Tickets/threeLastActive?filter=${json}`).then(res => { + this.lastThreeTickets = res.data; + }); + this.$.transfer.parent = event.target; + this.$.transfer.show(); + } + + moveLines(ticketID) { + let sales = this.getCheckedLines(); + + let params = {sales: sales, newTicketFk: ticketID, actualTicketFk: this.ticket.id}; + this.$http.post(`/ticket/api/Sales/moveToTicket`, params).then(() => { + this.goToTicket(ticketID); + }); + } + + /* 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); + }); + }*/ + + goToTicket(ticketID) { + this.$state.go("ticket.card.sale", {id: ticketID}); + } + + removeInstances(instances) { + for (let i = instances.length - 1; i >= 0; i--) { + this.$.index.model.instances.splice(instances[i].instance, 1); + } + } + // Item Descriptor showDescriptor(event, itemFk) { this.$.descriptor.itemFk = itemFk; this.$.descriptor.parent = event.target; this.$.descriptor.show(); } + onDescriptorLoad() { this.$.popover.relocate(); } + + // Ticket Create + showticketCreate() { + console.log(this); + this.$.newTicket.show(); + } + + onResponse(response) { + if (response === 'ACCEPT') { + let newTicketID = this.$.newTicket.dialog.createTicket(); + console.log(newTicketID); + } + } + // Edit Line + _getworkerMana() { + this.$http.get(`/api/WorkerManas/getCurrentWorkerMana`).then(res => { + this.workerMana = res.data[0].mana; + }); + } + + showEditPopover(event, sale) { + this.sale = sale; + this.edit = { + id: sale.id, + quantity: sale.quantity, + price: sale.price, + discount: sale.discount + }; + this.$.edit.parent = event.target; + this._getworkerMana(); + this.$.edit.show(); + } + + 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; + }); + } + + if (this.edit.price != this.sale.price) { + this.$http.post(`/ticket/api/Sales/updatePrice`, {id: this.edit.id, price: this.edit.price}).then(() => { + this.sale.price = this.edit.price; + }); + } + + if (this.edit.discount != this.sale.discount) { + this.$http.post(`/ticket/api/Sales/updateDiscount`, {id: this.edit.id, discount: this.edit.discount}).then(() => { + this.sale.discount = this.edit.discount; + }); + } + this.$.edit.hide(); + } } -Controller.$inject = ['$scope', '$timeout', '$state', '$http']; +Controller.$inject = ['$scope', '$timeout', '$state', '$http', 'vnApp']; ngModule.component('vnTicketSale', { template: require('./index.html'), diff --git a/client/ticket/src/sale/sale.spec.js b/client/ticket/src/sale/sale.spec.js index 9ce3cef2e..94f84e73e 100644 --- a/client/ticket/src/sale/sale.spec.js +++ b/client/ticket/src/sale/sale.spec.js @@ -1,6 +1,6 @@ import './index.js'; -describe('Ticket', () => { +xdescribe('Ticket', () => { describe('Component vnTicketSale', () => { let $componentController; let controller; @@ -15,6 +15,7 @@ describe('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 { @@ -56,7 +57,7 @@ describe('Ticket', () => { describe('onStateChange()', () => { it('should perform a post and then call a function', () => { - $httpBackend.expectPOST(`/ticket/api/TicketTrackings`).respond(); + $httpBackend.expectPOST(`/ticket/api/TicketTrackings/changeState`).respond(); controller.card = {reload: () => {}}; controller.onStateChange(3); $httpBackend.flush(); diff --git a/client/ticket/src/sale/style.scss b/client/ticket/src/sale/style.scss new file mode 100644 index 000000000..83d73bb2a --- /dev/null +++ b/client/ticket/src/sale/style.scss @@ -0,0 +1,44 @@ +@import "colors"; + +vn-popover.edit { + + & div.popover{ + width: 200px; + } + + & vn-horizontal.header{ + background-color: $main-01; + text-align: center; + + & h5{ + color: white; + } + } +} + +vn-ticket-sale{ + & tr .mdl-textfield{ + width: inherit; + max-width: 100%; + } +} + +vn-popover.transfer{ + & table { + min-width: 650px; + margin-bottom: 10px; + } + & i { + padding-top: 0.2em; + font-size: 1.8em; + } +} + +vn-dialog.ticket-create{ + & vn-button[label=Cancel]{ + display: none; + } + & vn-card.vn-ticket-create{ + padding: 0!important; + } +} \ No newline at end of file diff --git a/client/ticket/src/search-panel/index.html b/client/ticket/src/search-panel/index.html new file mode 100644 index 000000000..e8ddd290e --- /dev/null +++ b/client/ticket/src/search-panel/index.html @@ -0,0 +1,58 @@ +
+
+ + + + + + + + + + + + + + + + + + + {{name}} + + + + + + + +
+
diff --git a/client/ticket/src/search-panel/index.js b/client/ticket/src/search-panel/index.js new file mode 100644 index 000000000..be63116ef --- /dev/null +++ b/client/ticket/src/search-panel/index.js @@ -0,0 +1,7 @@ +import ngModule from '../module'; +import SearchPanel from 'core/src/components/searchbar/search-panel'; + +ngModule.component('vnTicketSearchPanel', { + template: require('./index.html'), + controller: SearchPanel +}); diff --git a/client/ticket/src/search-panel/locale/es.yml b/client/ticket/src/search-panel/locale/es.yml new file mode 100644 index 000000000..1f892a742 --- /dev/null +++ b/client/ticket/src/search-panel/locale/es.yml @@ -0,0 +1,7 @@ +Ticket id: Id ticket +Client id: Id cliente +Nickname: Alias +From: Desde +To: Hasta +Agency: Agencia +Warehouse: Almacén \ No newline at end of file diff --git a/client/ticket/src/summary/index.html b/client/ticket/src/summary/index.html index dcb53df92..f8c39d2a2 100644 --- a/client/ticket/src/summary/index.html +++ b/client/ticket/src/summary/index.html @@ -58,7 +58,7 @@ Item - Description + Description Quantity Price Discount @@ -73,7 +73,10 @@ vn-tooltip="delete expedition" ng-click="$ctrl.deleteExpedition(expedition)">warning --> - {{("000000"+sale.itemFk).slice(-6)}} + + {{("000000"+sale.itemFk).slice(-6)}} + {{::sale.quantity}} {{::sale.price | currency:'€':2}} @@ -84,4 +87,5 @@ - \ No newline at end of file + + diff --git a/client/ticket/src/summary/index.js b/client/ticket/src/summary/index.js index cb17ba909..2e208b4dc 100644 --- a/client/ticket/src/summary/index.js +++ b/client/ticket/src/summary/index.js @@ -2,7 +2,8 @@ import ngModule from '../module'; import './style.scss'; class Controller { - constructor($http) { + constructor($scope, $http) { + this.$scope = $scope; this.$http = $http; } @@ -15,9 +16,19 @@ class Controller { this.summary = res.data; }); } + + showDescriptor(event, itemFk) { + this.$scope.descriptor.itemFk = itemFk; + this.$scope.descriptor.parent = event.target; + this.$scope.descriptor.show(); + } + + onDescriptorLoad() { + this.$scope.popover.relocate(); + } } -Controller.$inject = ['$http']; +Controller.$inject = ['$scope', '$http']; ngModule.component('vnTicketSummary', { template: require('./index.html'), diff --git a/client/ticket/src/ticket.js b/client/ticket/src/ticket.js index 6719d535f..aae0d2005 100644 --- a/client/ticket/src/ticket.js +++ b/client/ticket/src/ticket.js @@ -1,5 +1,6 @@ export * from './module'; +import './search-panel'; import './index'; import './create'; import './card'; diff --git a/client/ticket/src/tracking/edit/index.html b/client/ticket/src/tracking/edit/index.html index dd77d479c..a72633332 100644 --- a/client/ticket/src/tracking/edit/index.html +++ b/client/ticket/src/tracking/edit/index.html @@ -10,12 +10,12 @@ New state - + vn-one + field="$ctrl.ticket.stateFk" + url="/ticket/api/States" + label="State" + vn-focus> + diff --git a/client/ticket/src/tracking/edit/index.js b/client/ticket/src/tracking/edit/index.js index baf5e19a0..77bc7d12f 100644 --- a/client/ticket/src/tracking/edit/index.js +++ b/client/ticket/src/tracking/edit/index.js @@ -7,8 +7,7 @@ class Controller { this.vnApp = vnApp; this.$translate = $translate; this.ticket = { - ticketFk: $state.params.id, - text: null + ticketFk: $state.params.id }; } onSubmit() { diff --git a/client/ticket/src/volume/index.html b/client/ticket/src/volume/index.html index ebbc2a46d..9bab229d6 100644 --- a/client/ticket/src/volume/index.html +++ b/client/ticket/src/volume/index.html @@ -16,14 +16,15 @@ Item - Description + Description Quantity m³ per quantity - {{::sale.itemFk}} + {{::sale.itemFk}} {{::sale.quantity}} {{::sale.volume.m3 | number:3}} @@ -38,3 +39,5 @@ + + diff --git a/client/ticket/src/volume/index.js b/client/ticket/src/volume/index.js index 43ef6ba0c..d984d9a3b 100644 --- a/client/ticket/src/volume/index.js +++ b/client/ticket/src/volume/index.js @@ -28,6 +28,16 @@ class Controller extends FilterTicketList { } }); } + + showDescriptor(event, itemFk) { + this.$scope.descriptor.itemFk = itemFk; + this.$scope.descriptor.parent = event.target; + this.$scope.descriptor.show(); + } + + onDescriptorLoad() { + this.$scope.popover.relocate(); + } } Controller.$inject = ['$scope', '$http', '$translate', '$timeout', '$state']; diff --git a/client/ticket/src/volume/ticket-volume.spec.js b/client/ticket/src/volume/ticket-volume.spec.js index 20966142b..001abc6a7 100644 --- a/client/ticket/src/volume/ticket-volume.spec.js +++ b/client/ticket/src/volume/ticket-volume.spec.js @@ -15,6 +15,7 @@ describe('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 { diff --git a/e2e/helpers/components_selectors.js b/e2e/helpers/components_selectors.js index ae4b9a481..89fcd18b9 100644 --- a/e2e/helpers/components_selectors.js +++ b/e2e/helpers/components_selectors.js @@ -4,16 +4,6 @@ // delete me, this comment is to add a commit export default { vnTextfield: 'vn-textfield > div > input', - vnTextarea: 'vn-textarea', vnSubmit: 'vn-submit > input', - vnTopbar: 'vn-topbar > header', - vnIcon: 'vn-icon', - vnSearchBar: 'vn-searchbar > form > vn-horizontal', - vnFloatButton: 'vn-float-button > button', - vnMenuItem: 'vn-menu-item > li > a', - vnAutocomplete: 'vn-autocomplete', - vnCheck: 'vn-check', - vnIconButton: 'vn-icon-button', - vnItemSummary: 'vn-item-summary > vn-card > div > vn-vertical', - vnLabelValue: 'vn-label-value' + vnFloatButton: 'vn-float-button > button' }; diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 1b02658e2..ffbf88db2 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -17,7 +17,7 @@ export default { }, clientsIndex: { searchClientInput: `${components.vnTextfield}`, - searchButton: `${components.vnSearchBar} > vn-icon-button`, + searchButton: `vn-searchbar vn-icon-button[icon="search"]`, searchResult: `vn-item-client a`, createClientButton: `${components.vnFloatButton}` }, @@ -30,125 +30,126 @@ export default { salesPersonInput: `vn-autocomplete[field="$ctrl.client.salesPersonFk"] input`, salesBruceBannerOption: `vn-autocomplete[field="$ctrl.client.salesPersonFk"] vn-drop-down ul > li:nth-child(1)`, createButton: `${components.vnSubmit}`, - cancelButton: `button[href="#!/client/index"]` + cancelButton: `vn-button[href="#!/client/index"]` }, clientBasicData: { - basicDataButton: `${components.vnMenuItem}[ui-sref="client.card.basicData"]`, + basicDataButton: `vn-menu-item a[ui-sref="client.card.basicData"]`, nameInput: `${components.vnTextfield}[name="name"]`, contactInput: `${components.vnTextfield}[name="contact"]`, phoneInput: `${components.vnTextfield}[name="phone"]`, mobileInput: `${components.vnTextfield}[name="mobile"]`, faxInput: `${components.vnTextfield}[name="fax"]`, emailInput: `${components.vnTextfield}[name="email"]`, - salesPersonInput: `${components.vnAutocomplete}[field="$ctrl.client.salesPersonFk"] input`, - salesPersonOptionOne: `${components.vnAutocomplete}[field="$ctrl.client.salesPersonFk"] vn-drop-down ul > li:nth-child(1)`, - channelInput: `${components.vnAutocomplete}[field="$ctrl.client.contactChannelFk"] input`, - channelMetropolisOption: `${components.vnAutocomplete}[field="$ctrl.client.contactChannelFk"] vn-drop-down ul > li:nth-child(3)`, + salesPersonInput: `vn-autocomplete[field="$ctrl.client.salesPersonFk"] input`, + salesPersonOptionOne: `vn-autocomplete[field="$ctrl.client.salesPersonFk"] vn-drop-down ul > li:nth-child(1)`, + channelInput: `vn-autocomplete[field="$ctrl.client.contactChannelFk"] input`, + channelMetropolisOption: `vn-autocomplete[field="$ctrl.client.contactChannelFk"] vn-drop-down ul > li:nth-child(3)`, saveButton: `${components.vnSubmit}` }, clientFiscalData: { - fiscalDataButton: `${components.vnMenuItem}[ui-sref="client.card.fiscalData"]`, + fiscalDataButton: `vn-menu-item a[ui-sref="client.card.fiscalData"]`, socialNameInput: `${components.vnTextfield}[name="socialName"]`, fiscalIdInput: `${components.vnTextfield}[name="fi"]`, - equalizationTaxCheckboxLabel: `${components.vnCheck}[label='Is equalizated'] > label > input`, + equalizationTaxCheckboxLabel: `vn-check[label='Is equalizated'] > label > input`, acceptPropagationButton: `vn-client-fiscal-data > vn-confirm button[response=ACCEPT]`, addressInput: `${components.vnTextfield}[name="street"]`, cityInput: `${components.vnTextfield}[name="city"]`, postcodeInput: `${components.vnTextfield}[name="postcode"]`, - provinceInput: `${components.vnAutocomplete}[field="$ctrl.client.provinceFk"] input`, - provinceFifthOption: `${components.vnAutocomplete}[field="$ctrl.client.provinceFk"] vn-drop-down ul > li:nth-child(5)`, - countryInput: `${components.vnAutocomplete}[field="$ctrl.client.countryFk"] input`, - countryThirdOption: `${components.vnAutocomplete}[field="$ctrl.client.countryFk"] vn-drop-down ul > li:nth-child(3)`, - activeCheckboxLabel: `${components.vnCheck}[label="Active"] > label`, - frozenCheckboxLabel: `${components.vnCheck}[label="Frozen"] > label`, - invoiceByAddressCheckboxInput: `${components.vnCheck}[label='Invoice by address'] > label > input`, - verifiedDataCheckboxInput: `${components.vnCheck}[label="Verified data"] > label > input`, - hasToInvoiceCheckboxLabel: `${components.vnCheck}[label='Has to invoice'] > label`, - invoiceByMailCheckboxLabel: `${components.vnCheck}[label='Invoice by mail'] > label`, - viesCheckboxInput: `${components.vnCheck}[label='Vies'] > label > input`, + provinceInput: `vn-autocomplete[field="$ctrl.client.provinceFk"] input`, + provinceFifthOption: `vn-autocomplete[field="$ctrl.client.provinceFk"] vn-drop-down ul > li:nth-child(5)`, + countryInput: `vn-autocomplete[field="$ctrl.client.countryFk"] input`, + countryThirdOption: `vn-autocomplete[field="$ctrl.client.countryFk"] vn-drop-down ul > li:nth-child(3)`, + 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`, + verifiedDataCheckboxInput: `vn-check[label="Verified data"] > label > input`, + hasToInvoiceCheckboxLabel: `vn-check[label='Has to invoice'] > label`, + invoiceByMailCheckboxLabel: `vn-check[label='Invoice by mail'] > label`, + viesCheckboxInput: `vn-check[label='Vies'] > label > input`, saveButton: `${components.vnSubmit}` }, clientPayMethod: { - payMethodButton: `${components.vnMenuItem}[ui-sref="client.card.billingData"]`, - payMethodInput: `${components.vnAutocomplete}[field="$ctrl.client.payMethodFk"] input`, - payMethodIBANOption: `${components.vnAutocomplete}[field="$ctrl.client.payMethodFk"] vn-drop-down ul > li:nth-child(5)`, - payMethodOptionOne: `${components.vnAutocomplete}[field="$ctrl.client.payMethodFk"] vn-drop-down ul > li:nth-child(2)`, + payMethodButton: `vn-menu-item a[ui-sref="client.card.billingData"]`, + payMethodInput: `vn-autocomplete[field="$ctrl.client.payMethodFk"] input`, + payMethodIBANOption: `vn-autocomplete[field="$ctrl.client.payMethodFk"] vn-drop-down ul > li:nth-child(5)`, + payMethodOptionOne: `vn-autocomplete[field="$ctrl.client.payMethodFk"] vn-drop-down ul > li:nth-child(2)`, IBANInput: `${components.vnTextfield}[name="iban"]`, dueDayInput: `${components.vnTextfield}[name="dueDay"]`, - receivedCoreVNHCheckbox: `${components.vnCheck}[label='Received core VNH'] > label > input`, - receivedCoreVNLCheckbox: `${components.vnCheck}[label='Received core VNL'] > label > input`, - receivedB2BVNLCheckbox: `${components.vnCheck}[label='Received B2B VNL'] > label > input`, + receivedCoreVNHCheckbox: `vn-check[label='Received core VNH'] > label > input`, + receivedCoreVNLCheckbox: `vn-check[label='Received core VNL'] > label > input`, + receivedB2BVNLCheckbox: `vn-check[label='Received B2B VNL'] > label > input`, saveButton: `${components.vnSubmit}` }, clientAddresses: { - addressesButton: `${components.vnMenuItem}[ui-sref="client.card.address.index"]`, - createAddress: `${components.vnFloatButton}`, - defaultCheckboxInput: `${components.vnCheck}[label='Default'] > label > input`, + addressesButton: `vn-menu-item a[ui-sref="client.card.address.index"]`, + createAddress: `vn-client-address-index ${components.vnFloatButton}`, + defaultCheckboxInput: `vn-check[label='Default'] > label > input`, consigneeInput: `${components.vnTextfield}[name="nickname"]`, streetAddressInput: `${components.vnTextfield}[name="street"]`, postcodeInput: `${components.vnTextfield}[name="postalCode"]`, cityInput: `${components.vnTextfield}[name="city"]`, - provinceInput: `${components.vnAutocomplete}[field="$ctrl.address.provinceFk"] input`, - provinceSecondOption: `${components.vnAutocomplete}[field="$ctrl.address.provinceFk"] vn-drop-down ul > li:nth-child(2)`, - agencyInput: `${components.vnAutocomplete}[field="$ctrl.address.agencyModeFk"] input`, - agenctySecondOption: `${components.vnAutocomplete}[field="$ctrl.address.agencyModeFk"] vn-drop-down ul > li:nth-child(2)`, + provinceInput: `vn-autocomplete[field="$ctrl.address.provinceFk"] input`, + provinceSecondOption: `vn-autocomplete[field="$ctrl.address.provinceFk"] vn-drop-down ul > li:nth-child(2)`, + agencyInput: `vn-autocomplete[field="$ctrl.address.agencyModeFk"] input`, + agenctySecondOption: `vn-autocomplete[field="$ctrl.address.agencyModeFk"] vn-drop-down ul > li:nth-child(2)`, phoneInput: `${components.vnTextfield}[name="phone"]`, mobileInput: `${components.vnTextfield}[name="mobile"]`, - defaultAddress: 'vn-client-address-index > vn-vertical > vn-card > div > vn-horizontal:nth-child(2) > vn-one > vn-horizontal > vn-one > div:nth-child(2)', + defaultAddress: 'vn-client-address-index vn-horizontal:nth-child(2) div[name="street"]', secondMakeDefaultStar: 'vn-client-address-index > vn-vertical > vn-card > div > vn-horizontal:nth-child(3) > vn-one > vn-horizontal > vn-none > i', - firstEditButton: `${components.vnIconButton}[icon='edit']`, - secondEditButton: `vn-horizontal:nth-child(3) > vn-one > vn-horizontal > a > ${components.vnIconButton}[icon='edit']`, - activeCheckbox: `${components.vnCheck}[label='Enabled'] > label > input`, - equalizationTaxCheckboxLabel: `${components.vnCheck}[label='Is equalizated'] > label > input`, - firstObservationTypeSelect: `${components.vnAutocomplete}[field="observation.observationTypeFk"]:nth-child(1) input`, - firstObservationTypeSelectOptionOne: `${components.vnAutocomplete}[field="observation.observationTypeFk"] vn-drop-down ul > li:nth-child(1)`, - firstObservationDescriptionInput: `vn-horizontal:nth-child(3) > vn-textfield[label="Description"] > div > input`, - secondObservationTypeSelect: `vn-horizontal:nth-child(4) > ${components.vnAutocomplete}[field="observation.observationTypeFk"] input`, - secondObservationTypeSelectOptionTwo: `vn-horizontal:nth-child(4) > ${components.vnAutocomplete}[field="observation.observationTypeFk"] vn-drop-down ul > li:nth-child(2)`, - secondObservationDescriptionInput: `vn-horizontal:nth-child(4) > vn-textfield[label="Description"] > div > input`, - thirdObservationTypeSelect: `${components.vnAutocomplete}[field="observation.observationTypeFk"]:nth-child(3) input`, - thirdObservationTypeSelectOptionThree: `${components.vnAutocomplete}[field="observation.observationTypeFk"] vn-drop-down ul > li:nth-child(3)`, - thirdObservationDescriptionInput: `vn-horizontal:nth-child(5) > vn-textfield[label="Description"] > div > input`, - addObservationButton: `${components.vnIcon}[icon="add_circle"]`, + firstEditButton: `vn-client-address-index vn-icon-button[icon='edit']`, + secondEditButton: `vn-client-address-index vn-horizontal:nth-child(3) vn-icon-button[icon='edit']`, + activeCheckbox: `vn-check[label='Enabled'] > label > input`, + equalizationTaxCheckboxLabel: `vn-client-address-edit vn-check[label='Is equalizated'] > label > input`, + firstObservationTypeSelect: `vn-client-address-edit [name=observations] :nth-child(1) [field="observation.observationTypeFk"] input`, + firstObservationTypeSelectOptionOne: `vn-client-address-edit [name=observations] :nth-child(1) [field="observation.observationTypeFk"] vn-drop-down ul > li:nth-child(1)`, + firstObservationDescriptionInput: `vn-client-address-edit [name=observations] :nth-child(1) [model="observation.description"] input`, + secondObservationTypeSelect: `vn-client-address-edit [name=observations] :nth-child(2) [field="observation.observationTypeFk"] input`, + secondObservationTypeSelectOptionTwo: `vn-client-address-edit [name=observations] :nth-child(2) [field="observation.observationTypeFk"] vn-drop-down ul > li:nth-child(2)`, + secondObservationDescriptionInput: `vn-client-address-edit [name=observations] :nth-child(2) [model="observation.description"] input`, + thirdObservationTypeSelect: `vn-client-address-edit [name=observations] :nth-child(3) [field="observation.observationTypeFk"] input`, + thirdObservationTypeSelectOptionThree: `vn-client-address-edit [name=observations] :nth-child(3) [field="observation.observationTypeFk"] vn-drop-down ul > li:nth-child(3)`, + thirdObservationDescriptionInput: `vn-client-address-edit [name=observations] :nth-child(3) [model="observation.description"] input`, + addObservationButton: `vn-client-address-edit vn-icon-button[icon="add_circle"]`, saveButton: `${components.vnSubmit}`, cancelButton: `button[ui-sref="client.card.address.index"]` }, clientWebAccess: { - webAccessButton: `${components.vnMenuItem}[ui-sref="client.card.webAccess"]`, - enableWebAccessCheckbox: `${components.vnCheck}[label='Enable web access'] > label > input`, + webAccessButton: `vn-menu-item a[ui-sref="client.card.webAccess"]`, + enableWebAccessCheckbox: `vn-check[label='Enable web access'] > label > input`, userNameInput: `${components.vnTextfield}[name="name"]`, saveButton: `${components.vnSubmit}` }, clientNotes: { - notesButton: `${components.vnMenuItem}[ui-sref="client.card.note.index"]`, + notesButton: `vn-menu-item a[ui-sref="client.card.note.index"]`, addNoteFloatButton: `${components.vnFloatButton}`, - noteInput: `${components.vnTextarea}[label="Note"]`, + noteInput: `vn-textarea[label="Note"]`, saveButton: `${components.vnSubmit}`, firstNoteText: 'vn-client-note .text' }, clientCredit: { - creditButton: `${components.vnMenuItem}[ui-sref="client.card.credit.index"]`, + creditButton: `vn-menu-item a[ui-sref="client.card.credit.index"]`, addCreditFloatButton: `${components.vnFloatButton}`, creditInput: `${components.vnTextfield}[name="credit"]`, saveButton: `${components.vnSubmit}`, firstCreditText: 'vn-client-credit-index .list-element' }, clientGreuge: { - greugeButton: `${components.vnMenuItem}[ui-sref="client.card.greuge.index"]`, + greugeButton: `vn-menu-item a[ui-sref="client.card.greuge.index"]`, addGreugeFloatButton: `${components.vnFloatButton}`, amountInput: `${components.vnTextfield}[name="amount"]`, descriptionInput: `${components.vnTextfield}[name="description"]`, - typeInput: `${components.vnAutocomplete}[field="$ctrl.greuge.greugeTypeFk"] input`, - typeSecondOption: `${components.vnAutocomplete}[field="$ctrl.greuge.greugeTypeFk"] vn-drop-down ul > li`, + typeInput: `vn-autocomplete[field="$ctrl.greuge.greugeTypeFk"] input`, + typeSecondOption: `vn-autocomplete[field="$ctrl.greuge.greugeTypeFk"] vn-drop-down ul > li`, saveButton: `${components.vnSubmit}`, firstGreugeText: 'vn-client-greuge-index .list-element' }, clientMandate: { - mandateButton: `${components.vnMenuItem}[ui-sref="client.card.mandate"]`, + mandateButton: `vn-menu-item a[ui-sref="client.card.mandate"]`, firstMandateText: 'vn-client-mandate .list-element' }, clientInvoices: { - invoicesButton: `${components.vnMenuItem}[ui-sref="client.card.invoice"]`, + invoicesButton: `vn-menu-item a[ui-sref="client.card.invoice"]`, firstInvoiceText: 'vn-client-invoice .list-element' }, itemsIndex: { @@ -158,167 +159,167 @@ export default { searchResultCloneButton: `vn-item-product .buttons > [icon="icon-clone"]`, acceptClonationAlertButton: `vn-item-index [vn-id="clone"] [response="ACCEPT"]`, searchItemInput: `${components.vnTextfield}`, - searchButton: `${components.vnSearchBar} > vn-icon-button`, + searchButton: `vn-searchbar vn-icon-button[icon="search"]`, closeItemSummaryPreview: 'vn-item-index [vn-id="preview"] button.close' }, itemCreateView: { name: `${components.vnTextfield}[name="name"]`, - typeSelect: `${components.vnAutocomplete}[field="$ctrl.item.typeFk"] input`, - typeSelectOptionOne: `${components.vnAutocomplete}[field="$ctrl.item.typeFk"] vn-drop-down ul > li:nth-child(2)`, - intrastatSelect: `${components.vnAutocomplete}[field="$ctrl.item.intrastatFk"] input`, - intrastatSelectOptionOne: `${components.vnAutocomplete}[field="$ctrl.item.intrastatFk"] vn-drop-down ul > li:nth-child(2)`, - originSelect: `${components.vnAutocomplete}[field="$ctrl.item.originFk"] input`, - originSelectOptionOne: `${components.vnAutocomplete}[field="$ctrl.item.originFk"] vn-drop-down ul > li:nth-child(2)`, + typeSelect: `vn-autocomplete[field="$ctrl.item.typeFk"] input`, + typeSelectOptionOne: `vn-autocomplete[field="$ctrl.item.typeFk"] vn-drop-down ul > li:nth-child(2)`, + intrastatSelect: `vn-autocomplete[field="$ctrl.item.intrastatFk"] input`, + intrastatSelectOptionOne: `vn-autocomplete[field="$ctrl.item.intrastatFk"] vn-drop-down ul > li:nth-child(2)`, + originSelect: `vn-autocomplete[field="$ctrl.item.originFk"] input`, + originSelectOptionOne: `vn-autocomplete[field="$ctrl.item.originFk"] vn-drop-down ul > li:nth-child(2)`, createButton: `${components.vnSubmit}`, cancelButton: `button[ui-sref="item.index"]` }, itemBasicData: { goToItemIndexButton: 'vn-item-descriptor [ui-sref="item.index"]', - basicDataButton: `${components.vnMenuItem}[ui-sref="item.card.data"]`, - typeSelect: `${components.vnAutocomplete}[field="$ctrl.item.typeFk"] input`, - typeSelectOptionTwo: `${components.vnAutocomplete}[field="$ctrl.item.typeFk"] vn-drop-down ul > li:nth-child(2)`, - intrastatSelect: `${components.vnAutocomplete}[field="$ctrl.item.intrastatFk"] input`, - intrastatSelectOptionOne: `${components.vnAutocomplete}[field="$ctrl.item.intrastatFk"] vn-drop-down ul > li:nth-child(1)`, + basicDataButton: `vn-menu-item a[ui-sref="item.card.data"]`, + typeSelect: `vn-autocomplete[field="$ctrl.item.typeFk"] input`, + typeSelectOptionTwo: `vn-autocomplete[field="$ctrl.item.typeFk"] vn-drop-down ul > li:nth-child(2)`, + intrastatSelect: `vn-autocomplete[field="$ctrl.item.intrastatFk"] input`, + intrastatSelectOptionOne: `vn-autocomplete[field="$ctrl.item.intrastatFk"] vn-drop-down ul > li:nth-child(1)`, nameInput: `vn-horizontal:nth-child(2) > ${components.vnTextfield}`, relevancyInput: `vn-horizontal:nth-child(3) > ${components.vnTextfield}`, - originSelect: `${components.vnAutocomplete}[field="$ctrl.item.originFk"] input`, - originSelectOptionTwo: `${components.vnAutocomplete}[field="$ctrl.item.originFk"] vn-drop-down ul > li:nth-child(2)`, - expenceSelect: `${components.vnAutocomplete}[field="$ctrl.item.expenceFk"] input`, - expenceSelectOptionTwo: `${components.vnAutocomplete}[field="$ctrl.item.expenceFk"] vn-drop-down ul > li:nth-child(2)`, + originSelect: `vn-autocomplete[field="$ctrl.item.originFk"] input`, + originSelectOptionTwo: `vn-autocomplete[field="$ctrl.item.originFk"] vn-drop-down ul > li:nth-child(2)`, + expenceSelect: `vn-autocomplete[field="$ctrl.item.expenceFk"] input`, + expenceSelectOptionTwo: `vn-autocomplete[field="$ctrl.item.expenceFk"] vn-drop-down ul > li:nth-child(2)`, submitBasicDataButton: `${components.vnSubmit}` }, itemTags: { goToItemIndexButton: 'vn-item-descriptor [ui-sref="item.index"]', - tagsButton: `${components.vnMenuItem}[ui-sref="item.card.tags"]`, - firstRemoveTagButton: `vn-item-tags vn-horizontal:nth-child(2) > ${components.vnIcon}[icon="remove_circle_outline"]`, - firstTagSelect: `vn-item-tags vn-horizontal:nth-child(2) > ${components.vnAutocomplete}[field="itemTag.tagFk"] input`, + tagsButton: `vn-menu-item a[ui-sref="item.card.tags"]`, + firstRemoveTagButton: `vn-item-tags vn-horizontal:nth-child(2) vn-icon-button[icon="remove_circle_outline"]`, + 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) > ${components.vnAutocomplete}[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`, + 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`, - secondTagSelect: `vn-item-tags vn-horizontal:nth-child(3) > ${components.vnAutocomplete}[field="itemTag.tagFk"] 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) > ${components.vnAutocomplete}[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`, + 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`, - thirdTagSelect: `vn-item-tags vn-horizontal:nth-child(4) > ${components.vnAutocomplete}[field="itemTag.tagFk"] 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) > ${components.vnAutocomplete}[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`, + 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`, - fourthTagSelect: `vn-item-tags vn-horizontal:nth-child(5) > ${components.vnAutocomplete}[field="itemTag.tagFk"] 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) > ${components.vnAutocomplete}[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`, + 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`, - fifthTagSelect: `vn-item-tags vn-horizontal:nth-child(6) > ${components.vnAutocomplete}[field="itemTag.tagFk"] 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) > ${components.vnAutocomplete}[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(5)`, + 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`, - addItemTagButton: `${components.vnIcon}[icon="add_circle"]`, + addItemTagButton: `vn-icon-button[icon="add_circle"]`, submitItemTagsButton: `${components.vnSubmit}` }, itemTax: { - taxButton: `${components.vnMenuItem}[ui-sref="item.card.tax"]`, - firstClassSelect: `vn-horizontal:nth-child(2) > ${components.vnAutocomplete}[field="tax.taxClassFk"] input`, - firstClassSelectOptionTwo: `vn-horizontal:nth-child(2) > ${components.vnAutocomplete} vn-drop-down ul > li:nth-child(2)`, - secondClassSelect: `vn-horizontal:nth-child(3) > ${components.vnAutocomplete}[field="tax.taxClassFk"] input`, - secondClassSelectOptionOne: `vn-horizontal:nth-child(3) > ${components.vnAutocomplete} vn-drop-down ul > li:nth-child(1)`, - thirdClassSelect: `vn-horizontal:nth-child(4) > ${components.vnAutocomplete}[field="tax.taxClassFk"] input`, - thirdClassSelectOptionTwo: `vn-horizontal:nth-child(4) > ${components.vnAutocomplete} vn-drop-down ul > li:nth-child(2)`, + taxButton: `vn-menu-item a[ui-sref="item.card.tax"]`, + firstClassSelect: `vn-horizontal:nth-child(2) > vn-autocomplete[field="tax.taxClassFk"] input`, + firstClassSelectOptionTwo: `vn-horizontal:nth-child(2) > vn-autocomplete vn-drop-down ul > li:nth-child(2)`, + secondClassSelect: `vn-horizontal:nth-child(3) > vn-autocomplete[field="tax.taxClassFk"] input`, + secondClassSelectOptionOne: `vn-horizontal:nth-child(3) > vn-autocomplete vn-drop-down ul > li:nth-child(1)`, + thirdClassSelect: `vn-horizontal:nth-child(4) > vn-autocomplete[field="tax.taxClassFk"] input`, + thirdClassSelectOptionTwo: `vn-horizontal:nth-child(4) > vn-autocomplete vn-drop-down ul > li:nth-child(2)`, submitTaxButton: `${components.vnSubmit}` }, itemBarcodes: { - barcodeButton: `${components.vnMenuItem}[ui-sref="item.card.itemBarcode"]`, - addBarcodeButton: `${components.vnIcon}[icon="add_circle"]`, + barcodeButton: `vn-menu-item a[ui-sref="item.card.itemBarcode"]`, + addBarcodeButton: `vn-icon[icon="add_circle"]`, thirdCodeInput: `vn-item-barcode vn-horizontal:nth-child(4) > ${components.vnTextfield}`, submitBarcodesButton: `${components.vnSubmit}`, - firstCodeRemoveButton: `vn-horizontal:nth-child(2) > ${components.vnIcon}[icon="remove_circle_outline"]` + firstCodeRemoveButton: `vn-horizontal:nth-child(2) > vn-icon[icon="remove_circle_outline"]` }, itemNiches: { - nicheButton: `${components.vnMenuItem}[ui-sref="item.card.niche"]`, - addNicheButton: `${components.vnIcon}[icon="add_circle"]`, - firstWarehouseSelect: `${components.vnAutocomplete}[field="itemNiche.warehouseFk"] input`, + 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`, - firstWarehouseSelectSecondOption: `${components.vnAutocomplete}[field="itemNiche.warehouseFk"] vn-drop-down ul > li:nth-child(2)`, + 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`, - secondWarehouseSelect: `vn-horizontal:nth-child(3) > ${components.vnAutocomplete}[field="itemNiche.warehouseFk"] 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`, - secondNicheRemoveButton: `vn-horizontal:nth-child(3) > ${components.vnIcon}[icon="remove_circle_outline"]`, - thirdWarehouseSelect: `vn-horizontal:nth-child(4) > ${components.vnAutocomplete}[field="itemNiche.warehouseFk"] 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`, - thirdWarehouseSelectFourthOption: `vn-horizontal:nth-child(4) > ${components.vnAutocomplete}[field="itemNiche.warehouseFk"] vn-drop-down ul > li:nth-child(4)`, + 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`, submitNichesButton: `${components.vnSubmit}` }, itemBotanical: { - botanicalButton: `${components.vnMenuItem}[ui-sref="item.card.botanical"]`, + botanicalButton: `vn-menu-item a[ui-sref="item.card.botanical"]`, botanicalInput: `vn-horizontal:nth-child(2) > ${components.vnTextfield}`, - genusSelect: `${components.vnAutocomplete}[field="$ctrl.botanical.genusFk"] input`, - genusSelectOptionOne: `${components.vnAutocomplete}[field="$ctrl.botanical.genusFk"] vn-drop-down ul > li:nth-child(1)`, - genusSelectOptionTwo: `${components.vnAutocomplete}[field="$ctrl.botanical.genusFk"] vn-drop-down ul > li:nth-child(2)`, - speciesSelect: `${components.vnAutocomplete}[field="$ctrl.botanical.specieFk"] input`, - speciesSelectOptionOne: `${components.vnAutocomplete}[field="$ctrl.botanical.specieFk"] vn-drop-down ul > li:nth-child(1)`, - speciesSelectOptionTwo: `${components.vnAutocomplete}[field="$ctrl.botanical.specieFk"] vn-drop-down ul > li:nth-child(2)`, + genusSelect: `vn-autocomplete[field="$ctrl.botanical.genusFk"] input`, + genusSelectOptionOne: `vn-autocomplete[field="$ctrl.botanical.genusFk"] vn-drop-down ul > li:nth-child(1)`, + genusSelectOptionTwo: `vn-autocomplete[field="$ctrl.botanical.genusFk"] vn-drop-down ul > li:nth-child(2)`, + speciesSelect: `vn-autocomplete[field="$ctrl.botanical.specieFk"] input`, + speciesSelectOptionOne: `vn-autocomplete[field="$ctrl.botanical.specieFk"] vn-drop-down ul > li:nth-child(1)`, + speciesSelectOptionTwo: `vn-autocomplete[field="$ctrl.botanical.specieFk"] vn-drop-down ul > li:nth-child(2)`, submitBotanicalButton: `${components.vnSubmit}` }, itemSummary: { - basicData: `${components.vnItemSummary} vn-vertical[name="basicData"]`, - vat: `${components.vnItemSummary} vn-vertical[name="tax"]`, - tags: `${components.vnItemSummary} vn-vertical[name="tags"]`, - niche: `${components.vnItemSummary} vn-vertical[name="niche"]`, - botanical: `${components.vnItemSummary} vn-vertical[name="botanical"]`, - barcode: `${components.vnItemSummary} vn-vertical[name="barcode"]` + basicData: `vn-item-summary vn-vertical[name="basicData"]`, + vat: `vn-item-summary vn-vertical[name="tax"]`, + tags: `vn-item-summary vn-vertical[name="tags"]`, + niche: `vn-item-summary vn-vertical[name="niche"]`, + botanical: `vn-item-summary vn-vertical[name="botanical"]`, + barcode: `vn-item-summary vn-vertical[name="barcode"]` }, ticketsIndex: { createTicketButton: `${components.vnFloatButton}`, searchResult: `table > tbody > tr`, searchTicketInput: `${components.vnTextfield}`, - searchButton: `${components.vnSearchBar} > vn-icon-button` + searchButton: `vn-searchbar vn-icon-button[icon="search"]` }, ticketNotes: { - notesButton: `${components.vnMenuItem}[ui-sref="ticket.card.observation"]`, - firstNoteRemoveButton: `${components.vnIcon}[icon="remove_circle_outline"]`, - addNoteButton: `${components.vnIcon}[icon="add_circle"]`, - firstNoteSelect: `${components.vnAutocomplete}[field="ticketObservation.observationTypeFk"] input`, - firstNoteSelectSecondOption: `${components.vnAutocomplete}[field="ticketObservation.observationTypeFk"] vn-drop-down ul > li:nth-child(2)`, + notesButton: `vn-menu-item a[ui-sref="ticket.card.observation"]`, + firstNoteRemoveButton: `vn-icon[icon="remove_circle_outline"]`, + 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`, submitNotesButton: `${components.vnSubmit}` }, ticketExpedition: { - expeditionButton: `${components.vnMenuItem}[ui-sref="ticket.card.expedition"]`, + expeditionButton: `vn-menu-item a[ui-sref="ticket.card.expedition"]`, secondExpeditionRemoveButton: `body > vn-app > vn-vertical > vn-vertical > ui-view > vn-ticket-card > vn-main-block > vn-horizontal > vn-one > vn-vertical > vn-ticket-expedition > vn-vertical > vn-card > div > vn-vertical > vn-one > vn-horizontal:nth-child(2) > vn-one:nth-child(1) > i`, secondExpeditionText: `body > vn-app > vn-vertical > vn-vertical > ui-view > vn-ticket-card > vn-main-block > vn-horizontal > vn-one > vn-vertical > vn-ticket-expedition > vn-vertical > vn-card > div > vn-vertical > vn-one > vn-horizontal:nth-child(2)` }, ticketPackages: { - packagesButton: `${components.vnMenuItem}[ui-sref="ticket.card.package.index"]`, - firstPackageSelect: `${components.vnAutocomplete}[label="Package"] > div > div > input`, - firstPackageSelectOptionThree: `${components.vnAutocomplete}[label="Package"] vn-drop-down ul > li:nth-child(3)`, + packagesButton: `vn-menu-item a[ui-sref="ticket.card.package.index"]`, + firstPackageSelect: `vn-autocomplete[label="Package"] > div > div > input`, + firstPackageSelectOptionThree: `vn-autocomplete[label="Package"] vn-drop-down ul > li:nth-child(3)`, firstQuantityInput: `vn-textfield[label="Quantity"] > div > input`, firstRemovePackageButton: `vn-icon[vn-tooltip="Remove package"]`, addPackageButton: `vn-icon[vn-tooltip="Add package"]`, - clearPackageSelectButton: `${components.vnAutocomplete}[label="Package"] > div > div > div > vn-icon > i`, + clearPackageSelectButton: `vn-autocomplete[label="Package"] > div > div > div > vn-icon > i`, savePackagesButton: `${components.vnSubmit}` }, ticketSales: { - saleButton: `${components.vnMenuItem}[ui-sref="ticket.card.sale"]`, + saleButton: `vn-menu-item a[ui-sref="ticket.card.sale"]`, firstSaleText: `table > tbody > tr:nth-child(1)`, secondSaleText: `table > tbody > tr:nth-child(2)` }, ticketTracking: { - trackingButton: `${components.vnMenuItem}[ui-sref="ticket.card.tracking.index"]`, + trackingButton: `vn-menu-item a[ui-sref="ticket.card.tracking.index"]`, createStateButton: `${components.vnFloatButton}`, firstSaleText: `table > tbody > tr:nth-child(1)`, secondSaleText: `table > tbody > tr:nth-child(2)` }, createStateView: { - stateInput: `${components.vnAutocomplete}[field="$ctrl.ticket.stateFk"] > div > div > input`, - stateInputOptionOne: `${components.vnAutocomplete}[field="$ctrl.ticket.stateFk"] vn-drop-down ul > li:nth-child(1)`, - clearStateInputButton: `${components.vnAutocomplete}[field="$ctrl.ticket.stateFk"] > div > div > div > vn-icon > i`, + stateInput: `vn-autocomplete[field="$ctrl.ticket.stateFk"] > div > div > input`, + stateInputOptionOne: `vn-autocomplete[field="$ctrl.ticket.stateFk"] vn-drop-down ul > li:nth-child(1)`, + clearStateInputButton: `vn-autocomplete[field="$ctrl.ticket.stateFk"] > div > div > div > vn-icon > i`, saveStateButton: `${components.vnSubmit}` } }; diff --git a/e2e/paths/client-module/01_create_client.spec.js b/e2e/paths/client-module/01_create_client.spec.js index 7b3497ee1..971d5842c 100644 --- a/e2e/paths/client-module/01_create_client.spec.js +++ b/e2e/paths/client-module/01_create_client.spec.js @@ -67,7 +67,7 @@ describe('Client', () => { .click(selectors.createClientView.createButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Some fields are invalid'); + expect(result).toContain('Some fields are invalid'); }); }); diff --git a/e2e/paths/client-module/04_edit_pay_method.spec.js b/e2e/paths/client-module/04_edit_pay_method.spec.js index 0520fd127..cc084d802 100644 --- a/e2e/paths/client-module/04_edit_pay_method.spec.js +++ b/e2e/paths/client-module/04_edit_pay_method.spec.js @@ -58,7 +58,7 @@ describe('Client', () => { .waitToClick(selectors.clientPayMethod.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Error'); + expect(result).toContain('requires an IBAN'); }); }); diff --git a/e2e/paths/client-module/05_add_address.spec.js b/e2e/paths/client-module/05_add_address.spec.js index 1855dba3b..8ab306fb0 100644 --- a/e2e/paths/client-module/05_add_address.spec.js +++ b/e2e/paths/client-module/05_add_address.spec.js @@ -143,7 +143,7 @@ describe('Client', () => { .waitToClick(selectors.clientAddresses.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Error:'); + expect(result).toContain('The default consignee can not be unchecked'); }); }); }); diff --git a/e2e/paths/client-module/06_add_address_notes.spec.js b/e2e/paths/client-module/06_add_address_notes.spec.js index 4b243698d..15e75b088 100644 --- a/e2e/paths/client-module/06_add_address_notes.spec.js +++ b/e2e/paths/client-module/06_add_address_notes.spec.js @@ -65,7 +65,7 @@ describe('Client', () => { .waitToClick(selectors.clientAddresses.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('No field can be blank'); + expect(result).toContain('type cannot be blank'); }); }); 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 9e6a49d7f..4515e7023 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 @@ -63,7 +63,7 @@ describe('Client', () => { .evaluate(selector => { console.log(document.querySelector(selector)); return document.querySelector(selector).className; - }, 'vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(4) > label') + }, selectors.clientFiscalData.verifiedDataCheckbox) .then(result => { expect(result).toContain('is-disabled'); }); @@ -152,7 +152,7 @@ describe('Client', () => { .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) .evaluate(selector => { return document.querySelector(selector).className; - }, 'vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(3) > label') + }, selectors.clientFiscalData.verifiedDataCheckbox) .then(result => { expect(result).not.toContain('is-disabled'); }); @@ -265,7 +265,7 @@ describe('Client', () => { .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) .evaluate(selector => { return document.querySelector(selector).className; - }, 'vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(3) > label') + }, selectors.clientFiscalData.verifiedDataCheckbox) .then(result => { expect(result).toContain('is-disabled'); }); @@ -341,7 +341,7 @@ describe('Client', () => { .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) .evaluate(selector => { return document.querySelector(selector).className; - }, 'vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(3) > label') + }, selectors.clientFiscalData.verifiedDataCheckbox) .then(result => { expect(result).not.toContain('is-disabled'); }); @@ -454,7 +454,7 @@ describe('Client', () => { .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) .evaluate(selector => { return document.querySelector(selector).className; - }, 'vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(4) > label') + }, selectors.clientFiscalData.verifiedDataCheckbox) .then(result => { expect(result).toContain('is-disabled'); }); diff --git a/e2e/paths/ticket-module/01_create_ticket_observations.spec.js b/e2e/paths/ticket-module/01_create_ticket_observations.spec.js index 9905145d8..0e7b27975 100644 --- a/e2e/paths/ticket-module/01_create_ticket_observations.spec.js +++ b/e2e/paths/ticket-module/01_create_ticket_observations.spec.js @@ -23,7 +23,7 @@ describe('Ticket', () => { it('should search for the ticket with id 1', () => { return nightmare .wait(selectors.ticketsIndex.searchTicketInput) - .type(selectors.ticketsIndex.searchTicketInput, '1') + .type(selectors.ticketsIndex.searchTicketInput, 'id:1') .click(selectors.ticketsIndex.searchButton) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .countSearchResults(selectors.ticketsIndex.searchResult) diff --git a/e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js b/e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js index 559358439..38900da9d 100644 --- a/e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js +++ b/e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js @@ -23,7 +23,7 @@ describe('Ticket', () => { it('should search for the ticket with id 1', () => { return nightmare .wait(selectors.ticketsIndex.searchTicketInput) - .type(selectors.ticketsIndex.searchTicketInput, '1') + .type(selectors.ticketsIndex.searchTicketInput, 'id:1') .click(selectors.ticketsIndex.searchButton) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .countSearchResults(selectors.ticketsIndex.searchResult) diff --git a/e2e/paths/ticket-module/03_list_sale.spec.js b/e2e/paths/ticket-module/03_list_sale.spec.js index d9cf449a9..0c1fc77c9 100644 --- a/e2e/paths/ticket-module/03_list_sale.spec.js +++ b/e2e/paths/ticket-module/03_list_sale.spec.js @@ -25,7 +25,7 @@ describe('Ticket', () => { it('should search for the ticket 1', () => { return nightmare .wait(selectors.ticketsIndex.searchResult) - .type(selectors.ticketsIndex.searchTicketInput, 1) + .type(selectors.ticketsIndex.searchTicketInput, 'id:1') .click(selectors.ticketsIndex.searchButton) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .countSearchResults(selectors.ticketsIndex.searchResult) @@ -51,7 +51,7 @@ describe('Ticket', () => { .wait(selectors.ticketSales.firstSaleText) .getInnerText(selectors.ticketSales.firstSaleText) .then(value => { - expect(value).toContain('Color Yellow'); + expect(value).toContain('Yellow'); expect(value).toContain('5'); expect(value).toContain('€1.50'); expect(value).toContain('0 %'); @@ -64,7 +64,7 @@ describe('Ticket', () => { .wait(selectors.ticketSales.secondSaleText) .getInnerText(selectors.ticketSales.secondSaleText) .then(value => { - expect(value).toContain('Color Yellow'); + expect(value).toContain('Yellow'); expect(value).toContain('2'); expect(value).toContain('€1.50'); expect(value).toContain('0 %'); diff --git a/e2e/paths/ticket-module/04_create_ticket_packages.spec.js b/e2e/paths/ticket-module/04_create_ticket_packages.spec.js index 1b98f9190..c87b99705 100644 --- a/e2e/paths/ticket-module/04_create_ticket_packages.spec.js +++ b/e2e/paths/ticket-module/04_create_ticket_packages.spec.js @@ -25,7 +25,7 @@ // it('should search for the ticket 1', () => { // return nightmare // .wait(selectors.ticketsIndex.searchResult) -// .type(selectors.ticketsIndex.searchTicketInput, 1) +// .type(selectors.ticketsIndex.searchTicketInput, 'id:1') // .click(selectors.ticketsIndex.searchButton) // .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) // .countSearchResults(selectors.ticketsIndex.searchResult) diff --git a/e2e/paths/ticket-module/05_create_new_tracking_state.spec.js b/e2e/paths/ticket-module/05_create_new_tracking_state.spec.js index 028c195a9..ce44e1b26 100644 --- a/e2e/paths/ticket-module/05_create_new_tracking_state.spec.js +++ b/e2e/paths/ticket-module/05_create_new_tracking_state.spec.js @@ -25,7 +25,7 @@ describe('Ticket', () => { it('should search for the ticket 1', () => { return nightmare .wait(selectors.ticketsIndex.searchResult) - .type(selectors.ticketsIndex.searchTicketInput, 1) + .type(selectors.ticketsIndex.searchTicketInput, 'id:1') .click(selectors.ticketsIndex.searchButton) .waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1) .countSearchResults(selectors.ticketsIndex.searchResult) @@ -65,7 +65,7 @@ describe('Ticket', () => { }); }); - it(`should attempt create a new state but receive an error if state have been cleared`, () => { + it(`should attempt create a new state then clear and save it`, () => { return nightmare .waitToClick(selectors.createStateView.stateInput) .waitToClick(selectors.createStateView.stateInputOptionOne) @@ -73,7 +73,17 @@ describe('Ticket', () => { .click(selectors.createStateView.saveStateButton) .waitForSnackbar() .then(result => { - expect(result).toContain('No changes to save'); + expect(result).toContain('Data saved!'); + }); + }); + + it('should access to the create state view by clicking the create floating button', () => { + return nightmare + .click(selectors.ticketTracking.createStateButton) + .wait(selectors.createStateView.stateInput) + .parsedUrl() + .then(url => { + expect(url.hash).toContain('tracking/edit'); }); }); diff --git a/package-lock.json b/package-lock.json index 94775b281..fc16c8417 100644 --- a/package-lock.json +++ b/package-lock.json @@ -103,19 +103,19 @@ "dev": true }, "angular": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.6.8.tgz", - "integrity": "sha512-9WErZIOw1Cu1V5Yxdvxz/6YpND8ntdP71fdPpufPFJvZodZXqCjQBYrHqEoMZreO5i84O3D/Jw/vepoFt68Azw==" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.0.tgz", + "integrity": "sha512-3LboCLjrOuC7dWh953O0+dI3dJ7PexYRSCIrfqoN5qoHyja/wak3eWoxPKb2Sl2qwiPbrUV5KJXwgpUQ48McBQ==" }, "angular-cookies": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.6.4.tgz", - "integrity": "sha1-wo8/aqx6mCbB5F8daAckADblsm0=" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.7.0.tgz", + "integrity": "sha512-bxY7SAl7M+P+DazcDq4OVSFhmR0QET6KWw7bsxh4V22Ky+NcGbdyFySRNqu0TtWB5LkiGvo0wCFLd/vDyuMQOQ==" }, "angular-mocks": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.6.6.tgz", - "integrity": "sha1-yTAY54OMbcXOrxprz5vhPIMOpRU=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.0.tgz", + "integrity": "sha512-tBlj9jIEpbgiYY1VpV6XAi+5JSAO0AXFziVW4TSIFETB23fautoREI7XbOeRgy/QmOhZA4P320gs2XgpbvLd0w==", "dev": true }, "angular-paging": { @@ -124,19 +124,19 @@ "integrity": "sha1-cC9XTW0UBpADXqxkOV/jEfeYf7s=" }, "angular-translate": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.17.0.tgz", - "integrity": "sha512-SudfI0R0Hhtvngc0X3wFChXQGmw90o95i+QPZ11LhJJryneTq8LR3+3E4E7jgHA4fu6TcswgcfZ9+cp5ckbUHw==", + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.18.1.tgz", + "integrity": "sha512-Mw0kFBqsv5j8ItL9IhRZunIlVmIRW6iFsiTmRs9wGr2QTt8z4rehYlWyHos8qnXc/kyOYJiW50iH50CSNHGB9A==", "requires": { - "angular": "1.6.8" + "angular": "1.7.0" } }, "angular-translate-loader-partial": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/angular-translate-loader-partial/-/angular-translate-loader-partial-2.17.0.tgz", - "integrity": "sha512-pyRJcRc93iwiUnRnh9ZfehbQE/yxO5T6jmEqIvLEVz8gKLjDqDLKcaQFgPef9wCIN2n3e531YbStkkbSH3LYmQ==", + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/angular-translate-loader-partial/-/angular-translate-loader-partial-2.18.1.tgz", + "integrity": "sha512-+bPzY3+F2I1tb+X5bscvZq0OGoVEVkHwPGZvaY4nhbktpshArYpvIEV+RQFUa/QNj8vQc3iQ/pruJDb8w3zIdw==", "requires": { - "angular-translate": "2.17.0" + "angular-translate": "2.18.1" } }, "ansi-align": { @@ -1383,7 +1383,7 @@ "bluebird": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk=", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", "dev": true }, "bn.js": { @@ -10785,7 +10785,7 @@ "jasmine-spec-reporter": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz", - "integrity": "sha1-HWMq7ANBZwrTJPkrqEtLMrNeniI=", + "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==", "dev": true, "requires": { "colors": "1.1.2" @@ -10933,7 +10933,7 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", + "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", "dev": true, "requires": { "bluebird": "3.5.1", @@ -10985,7 +10985,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", + "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", "dev": true, "requires": { "fs-access": "1.0.1", @@ -11822,7 +11822,7 @@ "resolved": "https://registry.npmjs.org/mg-crud/-/mg-crud-1.1.2.tgz", "integrity": "sha1-p6AWGzWSPK7/8ZpIBpS2V1vDggw=", "requires": { - "angular": "1.6.8" + "angular": "1.7.0" } }, "micromatch": { @@ -19992,7 +19992,7 @@ "useragent": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", - "integrity": "sha1-IX+UOtVAyyEoZYqyP8lg9qiMmXI=", + "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", "dev": true, "requires": { "lru-cache": "4.1.1", diff --git a/package.json b/package.json index 35ade2ee7..8ad42c02e 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,14 @@ }, "dependencies": { "@uirouter/angularjs": "^1.0.3", - "angular": "^1.6.8", - "angular-cookies": "^1.6.4", + "angular": "^1.7.0", + "angular-cookies": "^1.7.0", "angular-paging": "^2.2.2", - "angular-translate": "^2.17.0", - "angular-translate-loader-partial": "^2.17.0", + "angular-translate": "^2.18.1", + "angular-translate-loader-partial": "^2.18.1", "flatpickr": "^4.4.6", "fs-extra": "^5.0.0", + "js-yaml": "^3.10.0", "material-design-lite": "^1.3.0", "mg-crud": "^1.1.2", "npm": "^5.8.0", @@ -25,7 +26,7 @@ "validator": "^6.2.1" }, "devDependencies": { - "angular-mocks": "^1.6.6", + "angular-mocks": "^1.7.0", "assets-webpack-plugin": "^3.5.1", "babel": "^6.23.0", "babel-core": "^6.26.0", @@ -55,7 +56,6 @@ "html-loader": "^0.4.4", "jasmine": "^2.9.0", "jasmine-spec-reporter": "^4.2.1", - "js-yaml": "^3.10.0", "karma": "^1.7.1", "karma-chrome-launcher": "^2.2.0", "karma-firefox-launcher": "^1.1.0", diff --git a/services/client/common/methods/address/crudAddressObservations.js b/services/client/common/methods/address/crudAddressObservations.js deleted file mode 100644 index 9487319e4..000000000 --- a/services/client/common/methods/address/crudAddressObservations.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = Self => { - Self.installCrudModel('crudAddressObservations'); -}; diff --git a/services/client/common/methods/credit-insurance/filter.js b/services/client/common/methods/credit-insurance/filter.js deleted file mode 100644 index 033afae7a..000000000 --- a/services/client/common/methods/credit-insurance/filter.js +++ /dev/null @@ -1,14 +0,0 @@ -module.exports = Self => { - Self.installMethod('filter', filterParams); - - function filterParams(params) { - return { - where: { - creditClassification: params.creditClassificationFk - }, - skip: (params.page - 1) * params.size, - limit: params.size, - order: params.order - }; - } -}; diff --git a/services/client/common/models/address-observation.js b/services/client/common/models/address-observation.js index ad82941df..d148b967e 100644 --- a/services/client/common/models/address-observation.js +++ b/services/client/common/models/address-observation.js @@ -1,3 +1,25 @@ module.exports = function(Self) { - require('../methods/address/crudAddressObservations')(Self); + Self.validatesPresenceOf('observationTypeFk', { + message: 'Observation type cannot be blank' + }); + + Self.validateAsync('typeUnique', typeIsUnique, { + message: 'Observation type must be unique' + }); + async function typeIsUnique(err, done) { + let filter = { + fields: ['id'], + where: { + observationTypeFk: this.observationTypeFk, + addressFk: this.addressFk + } + }; + + if (this.id) + filter.where.id = {neq: this.id}; + + if (await Self.findOne(filter)) + err(); + done(); + } }; diff --git a/services/client/common/models/credit-insurance.js b/services/client/common/models/credit-insurance.js index 653c7e2fd..20a832ee2 100644 --- a/services/client/common/models/credit-insurance.js +++ b/services/client/common/models/credit-insurance.js @@ -1,6 +1,4 @@ module.exports = function(Self) { - require('../methods/credit-insurance/filter')(Self); - Self.validateCredit = function(credit) { return credit >= 0; }; @@ -20,6 +18,26 @@ module.exports = function(Self) { allowNull: true }); + async function validateNullGrade(err, done) { + let filter = { + fields: ['grade'], + where: { + creditClassification: this.creditClassification + }, + order: 'created DESC' + }; + let insurance = await Self.findOne(filter); + + if (insurance && (!insurance.grade && this.grade || insurance.grade && ! this.grade)) + err(); + + done(); + } + + Self.validateAsync('nullGrade', validateNullGrade, { + message: 'The grade must be similar to the last one' + }); + Self.messageSend = async function(data, accessToken) { let filter = { include: { diff --git a/services/db/export-data.cmd b/services/db/export-data.cmd index 3aae81473..dc277cf45 100755 --- a/services/db/export-data.cmd +++ b/services/db/export-data.cmd @@ -6,7 +6,7 @@ mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> install/dump echo USE `vn`; >> install/dump/03-dumpedFixtures.sql mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc >> install/dump/03-dumpedFixtures.sql echo USE `vn2008`; >> install/dump/03-dumpedFixtures.sql -mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos Monedas>> install/dump/03-dumpedFixtures.sql +mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos Monedas container>> install/dump/03-dumpedFixtures.sql echo USE `bi`; >> install/dump/03-dumpedFixtures.sql mysqldump --defaults-file=connect.ini --no-create-info bi tarifa_componentes tarifa_componentes_series >> install/dump/03-dumpedFixtures.sql echo USE `cache`; >> install/dump/03-dumpedFixtures.sql diff --git a/services/db/export-data.sh b/services/db/export-data.sh index 054b60729..c0beb8bb6 100755 --- a/services/db/export-data.sh +++ b/services/db/export-data.sh @@ -7,7 +7,7 @@ mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> install/dump echo "USE \`vn\`;" >> install/dump/03-dumpedFixtures.sql mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc >> install/dump/03-dumpedFixtures.sql echo "USE \`vn2008\`;" >> install/dump/03-dumpedFixtures.sql -mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos Monedas>> install/dump/03-dumpedFixtures.sql +mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos Monedas container>> install/dump/03-dumpedFixtures.sql echo "USE \`bi\`;" >> install/dump/03-dumpedFixtures.sql mysqldump --defaults-file=connect.ini --no-create-info bi tarifa_componentes tarifa_componentes_series >> install/dump/03-dumpedFixtures.sql echo "USE \`cache\`;" >> install/dump/03-dumpedFixtures.sql diff --git a/services/db/install/changes/1.0.6/buy.sql b/services/db/install/changes/1.0.6/buy.sql new file mode 100644 index 000000000..a46700342 --- /dev/null +++ b/services/db/install/changes/1.0.6/buy.sql @@ -0,0 +1,32 @@ +USE `vn`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `buy` AS + SELECT + `c`.`Id_Compra` AS `id`, + `c`.`Id_Entrada` AS `entryFk`, + `c`.`Id_Article` AS `itemFk`, + `c`.`Costefijo` AS `buyingValue`, + `c`.`Cantidad` AS `quantity`, + `c`.`Id_Cubo` AS `packageFk`, + `c`.`Etiquetas` AS `stickers`, + `c`.`Portefijo` AS `freightValue`, + `c`.`Embalajefijo` AS `packageValue`, + `c`.`Comisionfija` AS `comissionValue`, + `c`.`Packing` AS `packing`, + `c`.`grouping` AS `grouping`, + `c`.`caja` AS `groupingMode`, + `c`.`Nicho` AS `location`, + `c`.`Tarifa1` AS `price1`, + `c`.`Tarifa2` AS `price2`, + `c`.`Tarifa3` AS `price3`, + `c`.`PVP` AS `minPrice`, + `c`.`Productor` AS `producer`, + `c`.`Vida` AS `printedStickers`, + `c`.`punteo` AS `isChecked`, + `c`.`buy_edi_id` AS `ektFk`, + `c`.`Novincular` AS `isIgnored` + FROM + `vn2008`.`Compres` `c`; diff --git a/services/db/install/changes/1.0.6/ekt.sql b/services/db/install/changes/1.0.6/ekt.sql new file mode 100644 index 000000000..04679d689 --- /dev/null +++ b/services/db/install/changes/1.0.6/ekt.sql @@ -0,0 +1,45 @@ +USE `edi`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `edi`.`ekt` AS + SELECT + `vn2008`.`buy_edi`.`id` AS `id`, + `vn2008`.`buy_edi`.`barcode` AS `barcode`, + `vn2008`.`buy_edi`.`entry_year` AS `entry_year`, + `vn2008`.`buy_edi`.`delivery_number` AS `delivery_number`, + `vn2008`.`buy_edi`.`fec` AS `fec`, + `vn2008`.`buy_edi`.`hor` AS `hor`, + `vn2008`.`buy_edi`.`now` AS `now`, + `vn2008`.`buy_edi`.`ptj` AS `ptj`, + `vn2008`.`buy_edi`.`ref` AS `ref`, + `vn2008`.`buy_edi`.`item` AS `item`, + `vn2008`.`buy_edi`.`pac` AS `pac`, + `vn2008`.`buy_edi`.`qty` AS `qty`, + `vn2008`.`buy_edi`.`ori` AS `ori`, + `vn2008`.`buy_edi`.`cat` AS `cat`, + `vn2008`.`buy_edi`.`agj` AS `agj`, + `vn2008`.`buy_edi`.`kop` AS `kop`, + `vn2008`.`buy_edi`.`ptd` AS `ptd`, + `vn2008`.`buy_edi`.`sub` AS `sub`, + `vn2008`.`buy_edi`.`pro` AS `pro`, + `vn2008`.`buy_edi`.`pri` AS `pri`, + `vn2008`.`buy_edi`.`package` AS `package`, + `vn2008`.`buy_edi`.`auction` AS `auction`, + `vn2008`.`buy_edi`.`klo` AS `klo`, + `vn2008`.`buy_edi`.`k01` AS `k01`, + `vn2008`.`buy_edi`.`k02` AS `k02`, + `vn2008`.`buy_edi`.`k03` AS `k03`, + `vn2008`.`buy_edi`.`k04` AS `k04`, + `vn2008`.`buy_edi`.`s1` AS `s1`, + `vn2008`.`buy_edi`.`s2` AS `s2`, + `vn2008`.`buy_edi`.`s3` AS `s3`, + `vn2008`.`buy_edi`.`s4` AS `s4`, + `vn2008`.`buy_edi`.`s5` AS `s5`, + `vn2008`.`buy_edi`.`s6` AS `s6`, + `vn2008`.`buy_edi`.`ok` AS `ok`, + `vn2008`.`buy_edi`.`trolley_id` AS `trolley_id`, + `vn2008`.`buy_edi`.`scanned` AS `scanned` + FROM + `vn2008`.`buy_edi`; diff --git a/services/db/install/changes/1.0.6/itemLastEntries.sql b/services/db/install/changes/1.0.6/itemLastEntries.sql new file mode 100644 index 000000000..1bf18bce8 --- /dev/null +++ b/services/db/install/changes/1.0.6/itemLastEntries.sql @@ -0,0 +1,40 @@ +USE `vn`; +DROP procedure IF EXISTS `itemLastEntries`; + +DELIMITER $$ +USE `vn`$$ +CREATE DEFINER=`root`@`%` PROCEDURE `itemLastEntries`(vItem INT, vDays DATE) +BEGIN + SELECT + w.id AS warehouseFk, + tr.landed, + b.entryFk, + b.isIgnored, + b.price2, + b.price3, + b.stickers, + b.packing, + b.grouping, + i.stems, + b.quantity, + b.buyingValue, + b.packageFk , + s.id AS supplierFk +FROM itemType it + RIGHT JOIN (entry e + LEFT JOIN supplier s ON s.id = e.supplierFk + RIGHT JOIN buy b ON b.entryFk = e.id + LEFT JOIN item i ON i.id = b.itemFk + LEFT JOIN ink ON ink.id = i.inkFk + LEFT JOIN travel tr ON tr.id = e.travelFk + LEFT JOIN warehouse w ON w.id = tr.warehouseInFk + LEFT JOIN origin o ON o.id = i.originFk + ) ON it.id = i.typeFk + LEFT JOIN edi.ekt ek ON b.ektFk = ek.id +WHERE b.itemFk = vItem And tr.shipped BETWEEN vDays AND CURDATE() + ORDER BY tr.landed DESC , b.id DESC; + +END$$ + +DELIMITER ; + diff --git a/services/db/install/dump/01-structure.sql b/services/db/install/dump/01-structure.sql index 0080d40c4..3549ba1ff 100644 --- a/services/db/install/dump/01-structure.sql +++ b/services/db/install/dump/01-structure.sql @@ -270,7 +270,7 @@ CREATE TABLE `role` ( `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Roles'; +) ENGINE=InnoDB AUTO_INCREMENT=58 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Roles'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -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=14209 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Global users'; +) ENGINE=InnoDB AUTO_INCREMENT=14242 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 */ ; @@ -2433,7 +2433,7 @@ CREATE TABLE `Agencias_dits` ( `value_old` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, `value_new` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`idAgencia_dits`) -) ENGINE=InnoDB AUTO_INCREMENT=20680 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=20719 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2533,7 +2533,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=312492 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=313524 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 */ ; @@ -2723,7 +2723,7 @@ CREATE TABLE `Articles_dits` ( KEY `fgkey1_idx` (`idaccion_dits`), KEY `fgkey2_idx` (`Id_Ticket`), KEY `fgkey3_idx` (`Id_Trabajador`) -) ENGINE=InnoDB AUTO_INCREMENT=20197 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=20221 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2745,7 +2745,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=466709 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=472091 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2909,7 +2909,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=585503 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=588092 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 */ ; @@ -3056,7 +3056,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=14207 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=14242 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 */ ; @@ -3339,7 +3339,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=212089 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=230680 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -3421,7 +3421,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=253422636 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=254891207 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 */ ; @@ -3673,7 +3673,7 @@ CREATE TABLE `Compres_ok` ( KEY `Id_Movimiento` (`Id_Compra`), KEY `Id_Accion` (`Id_Accion`), CONSTRAINT `Compres_ok_ibfk_1` FOREIGN KEY (`Id_Compra`) REFERENCES `Compres` (`Id_Compra`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=19141 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=19565 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -3717,7 +3717,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=25102 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=25151 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 */ ; @@ -3901,7 +3901,7 @@ CREATE TABLE `Contactos` ( PRIMARY KEY (`Id_Contacto`), KEY `Telefono` (`Telefono`), KEY `Movil` (`Movil`) -) ENGINE=InnoDB AUTO_INCREMENT=2633 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2634 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 */ ; @@ -4098,7 +4098,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=142448 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='InnoDB free: 88064 kB; (`Id_Proveedor`) REFER `vn2008/Provee'; +) ENGINE=InnoDB AUTO_INCREMENT=143067 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 */ ; @@ -4262,7 +4262,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=2797253 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2815062 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -4280,7 +4280,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=258 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona las entradas con los origenes de compra'; +) ENGINE=InnoDB AUTO_INCREMENT=339 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona las entradas con los origenes de compra'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -4523,7 +4523,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=453920 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=457354 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 */ ; @@ -4741,7 +4741,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=2233651 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=FIXED; +) ENGINE=InnoDB AUTO_INCREMENT=2248721 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 */ ; @@ -4942,7 +4942,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=20917575 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=21049676 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 */ ; @@ -5091,7 +5091,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=10638135 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=10756970 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5161,7 +5161,7 @@ CREATE TABLE `Ordenes` ( KEY `Id_Comprador` (`CodCOMPRADOR`), KEY `Id_Movimiento` (`Id_Movimiento`), KEY `Id_Vendedor` (`CodVENDEDOR`) -) ENGINE=InnoDB AUTO_INCREMENT=30788 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=31081 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5333,7 +5333,7 @@ CREATE TABLE `Proveedores` ( CONSTRAINT `pay_dem_id` FOREIGN KEY (`pay_dem_id`) REFERENCES `pay_dem` (`id`) ON UPDATE CASCADE, CONSTRAINT `pay_met_id` FOREIGN KEY (`pay_met_id`) REFERENCES `pay_met` (`id`) ON UPDATE CASCADE, CONSTRAINT `province_id` FOREIGN KEY (`province_id`) REFERENCES `province` (`province_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2503 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2510 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5359,7 +5359,7 @@ CREATE TABLE `Proveedores_account` ( KEY `fk_Proveedores_account_entity1_idx` (`entity_id`), KEY `fk_banco_prov_account_idx` (`Id_Banco`), CONSTRAINT `fk_banco_prov_account` FOREIGN KEY (`Id_Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=639 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=644 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5450,7 +5450,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=462009 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=465616 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 */ ; @@ -5541,7 +5541,7 @@ CREATE TABLE `Relaciones` ( KEY `Id_Contacto` (`Id_Contacto`), KEY `Id_Proveedor` (`Id_Proveedor`), KEY `Id_Cliente` (`Id_Cliente`) -) ENGINE=InnoDB AUTO_INCREMENT=2634 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2635 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5561,7 +5561,7 @@ CREATE TABLE `Remesas` ( KEY `empresa_id` (`empresa_id`), CONSTRAINT `Remesas_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE, CONSTRAINT `Remesas_ibfk_2` FOREIGN KEY (`Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1070 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1078 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5586,7 +5586,7 @@ CREATE TABLE `Reservas` ( PRIMARY KEY (`Id_Reserva`), KEY `Id_1` (`Id_Ticket`), KEY `Id_Article` (`Id_Article`) -) ENGINE=InnoDB AUTO_INCREMENT=786 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1168 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5617,7 +5617,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=38837 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=39113 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 */ ; @@ -5805,7 +5805,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=321219 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=321737 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5823,7 +5823,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=36235 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=36244 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5851,7 +5851,7 @@ CREATE TABLE `Stockcontrol` ( CONSTRAINT `Stockcontrol_ibfk_1` FOREIGN KEY (`Id_Article`) REFERENCES `Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Stockcontrol_ibfk_2` FOREIGN KEY (`Id_Remitente`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Stockcontrol_ibfk_3` FOREIGN KEY (`Id_Solver`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=23507 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=23513 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5909,7 +5909,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=1874093 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1882728 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 */ ; @@ -6118,7 +6118,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=58938859 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=59101617 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6167,7 +6167,7 @@ CREATE TABLE `Tickets_turno` ( `weekDay` tinyint(1) DEFAULT NULL COMMENT 'funcion de mysql Lunes = 0, Domingo = 6', PRIMARY KEY (`Id_Ticket`), CONSTRAINT `Id_Ticket_fk` FOREIGN KEY (`Id_Ticket`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1873622 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1882387 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6312,6 +6312,7 @@ CREATE TABLE `Trabajadores` ( `user_id` int(10) unsigned DEFAULT NULL, `boss` int(11) NOT NULL DEFAULT '2', `DniExpiration` datetime DEFAULT NULL, + `hasMachineryAutorized` tinyint(2) DEFAULT '0', PRIMARY KEY (`Id_Trabajador`), UNIQUE KEY `CodigoTrabajador_UNIQUE` (`CodigoTrabajador`), UNIQUE KEY `user` (`user`), @@ -6320,7 +6321,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=1118 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1119 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 */ ; @@ -6447,7 +6448,7 @@ CREATE TABLE `Vehiculos` ( KEY `provinceFk_idx` (`warehouseFk`), CONSTRAINT `Vehiculos_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE, CONSTRAINT `provinceFk` FOREIGN KEY (`warehouseFk`) REFERENCES `province` (`province_id`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB AUTO_INCREMENT=378 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=379 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6473,7 +6474,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=8148 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=8225 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 */; -- @@ -6587,7 +6588,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=3321290 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=3350773 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 */ ; @@ -6695,7 +6696,7 @@ CREATE TABLE `account_conciliacion` ( KEY `fg_accconciliacion_key1_idx` (`Id_Proveedores_account`), KEY `index_id_calculated` (`id_calculated`), CONSTRAINT `fg_key1_accountconc` FOREIGN KEY (`Id_Proveedores_account`) REFERENCES `Proveedores_account` (`Id_Proveedores_account`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1966 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2547 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 */ ; @@ -6773,7 +6774,7 @@ CREATE TABLE `accumulatorsReadingDate` ( PRIMARY KEY (`id`), KEY `pagoSdcFk_idx` (`pagoSdcfk`), CONSTRAINT `pagoSdcFk` FOREIGN KEY (`pagoSdcfk`) REFERENCES `pago_sdc` (`pago_sdc_id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=271 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=275 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6862,7 +6863,7 @@ CREATE TABLE `agency_hour` ( CONSTRAINT `agency_hour_ibfk_1` FOREIGN KEY (`agency_id`) REFERENCES `agency` (`agency_id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `agency_hour_ibfk_2` FOREIGN KEY (`warehouse_id`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `agency_hour_ibfk_3` FOREIGN KEY (`province_id`) REFERENCES `province` (`province_id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=4629 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4633 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 */ ; @@ -7028,7 +7029,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=2279 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2308 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7105,7 +7106,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=2548 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2560 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 */ ; @@ -7363,7 +7364,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=2212 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2223 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7481,7 +7482,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=35736 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=35847 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7622,7 +7623,7 @@ CREATE TABLE `buy_edi` ( KEY `kop` (`kop`), KEY `barcode` (`barcode`), KEY `fec` (`fec`) -) ENGINE=InnoDB AUTO_INCREMENT=697977 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=702925 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7876,7 +7877,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=83376 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Acciones en respuesta a las reclamaciones'; +) ENGINE=InnoDB AUTO_INCREMENT=83904 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Acciones en respuesta a las reclamaciones'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7910,7 +7911,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=45191 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Causas de las reclamaciones'; +) ENGINE=InnoDB AUTO_INCREMENT=45421 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Causas de las reclamaciones'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7964,7 +7965,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=115084 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle de las reclamaciones'; +) ENGINE=InnoDB AUTO_INCREMENT=115779 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle de las reclamaciones'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8021,7 +8022,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=49559 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Reclamaciones, tabla principal'; +) ENGINE=InnoDB AUTO_INCREMENT=49947 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Reclamaciones, tabla principal'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8134,7 +8135,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=63623 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; +) ENGINE=InnoDB AUTO_INCREMENT=63843 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8300,7 +8301,7 @@ CREATE TABLE `consignatarios_observation` ( `text` text COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`consignatarios_observation_id`), UNIQUE KEY `Id_Consigna` (`Id_Consigna`,`observation_type_id`) -) ENGINE=InnoDB AUTO_INCREMENT=3164 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Observaciones de los consignatarios'; +) ENGINE=InnoDB AUTO_INCREMENT=3187 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Observaciones de los consignatarios'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8382,7 +8383,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=63214 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=63490 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8813,6 +8814,8 @@ CREATE TABLE `empresa` ( `morosidad` tinyint(4) NOT NULL DEFAULT '0', `empresa_grupo` int(11) NOT NULL DEFAULT '1', `CodigoEmpresa` int(2) DEFAULT NULL COMMENT 'Campo para movConta', + `footnotes` longtext COLLATE utf8_unicode_ci COMMENT 'pie de paginas en las facturas', + `phytosanitary` longtext COLLATE utf8_unicode_ci, PRIMARY KEY (`id`), KEY `gerente_id` (`gerente_id`), KEY `empresa_cliente_idx` (`Id_Cliente`), @@ -8855,7 +8858,7 @@ CREATE TABLE `entity` ( UNIQUE KEY `bic_UNIQUE` (`bic`), KEY `fg_entity1_idx` (`pais_id`), CONSTRAINT `fg_entity1` FOREIGN KEY (`pais_id`) REFERENCES `Paises` (`Id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=30007 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Entidades bancarias '; +) ENGINE=InnoDB AUTO_INCREMENT=30008 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Entidades bancarias '; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8894,7 +8897,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=15406 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=15458 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8923,7 +8926,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=2412876 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2427728 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 */ ; @@ -9044,7 +9047,7 @@ CREATE TABLE `expeditions_deleted` ( KEY `index2` (`EsBulto`), KEY `index3` (`odbc_date`), KEY `index4` (`ticket_id`) -) ENGINE=InnoDB AUTO_INCREMENT=2412323 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2427724 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -9183,7 +9186,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=985305 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='document managment system'; +) ENGINE=InnoDB AUTO_INCREMENT=995970 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 */ ; @@ -9382,7 +9385,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=65725 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=66071 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -9720,7 +9723,7 @@ CREATE TABLE `mail` ( `recipientFk` int(11) DEFAULT NULL, `plainTextBody` text COLLATE utf8_unicode_ci, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=1342007 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=MyISAM AUTO_INCREMENT=1353602 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -9778,7 +9781,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=14991 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=15071 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 */ ; @@ -9987,7 +9990,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=41495 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=41646 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 */ ; @@ -10068,7 +10071,7 @@ CREATE TABLE `pago_sdc` ( CONSTRAINT `empresa_sdc` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE, CONSTRAINT `financial_type_fk` FOREIGN KEY (`financialProductTypefk`) REFERENCES `financialProductType` (`id`) ON UPDATE CASCADE, CONSTRAINT `pago_sdc_entity_fk` FOREIGN KEY (`entity_id`) REFERENCES `entity` (`entity_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=45 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Seguros de cambio'; +) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Seguros de cambio'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -10482,7 +10485,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=53547 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=53716 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 */ ; @@ -10544,7 +10547,7 @@ CREATE TABLE `producer` ( `visible` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (`producer_id`), UNIQUE KEY `name_UNIQUE` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=4523 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4574 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -10713,7 +10716,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=68074 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=68422 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 */ ; @@ -11302,7 +11305,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=91322 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=91947 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11325,7 +11328,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=88491 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=89163 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 */ ; @@ -11368,7 +11371,7 @@ CREATE TABLE `recovery` ( KEY `cliente_idx` (`Id_Cliente`), CONSTRAINT `cliente333` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE, CONSTRAINT `cliente_cliente` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=258 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='En esta tabla apuntaremos los acuerdos de recobro semanal a '; +) ENGINE=InnoDB AUTO_INCREMENT=259 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='En esta tabla apuntaremos los acuerdos de recobro semanal a '; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11562,7 +11565,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=56856 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Se borra automaticamente 8 dias en el pasado desde vn2008.clean'; +) ENGINE=InnoDB AUTO_INCREMENT=57826 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 */; -- @@ -11602,7 +11605,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=725408 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=736401 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11624,7 +11627,7 @@ CREATE TABLE `sharingcart` ( KEY `Suplent` (`Id_Suplente`), CONSTRAINT `Suplent_key` FOREIGN KEY (`Id_Suplente`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE, CONSTRAINT `Trabajador_key` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1786 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1794 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 */ ; @@ -11800,6 +11803,21 @@ 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` -- @@ -12079,7 +12097,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=1071942 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; +) ENGINE=InnoDB AUTO_INCREMENT=1077635 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -12202,7 +12220,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=106537 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=107031 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 */ ; @@ -12339,7 +12357,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=167282 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=168617 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -12366,7 +12384,7 @@ CREATE TABLE `travel_pattern` ( CONSTRAINT `travel_pattern_ibfk_3` FOREIGN KEY (`warehouse_out`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE, CONSTRAINT `travel_pattern_ibfk_4` FOREIGN KEY (`agency_id`) REFERENCES `Agencias` (`Id_Agencia`) ON UPDATE CASCADE, CONSTRAINT `travel_pattern_ibfk_5` FOREIGN KEY (`warehouse_in`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=323 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=325 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -13713,7 +13731,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=135 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=146 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -15688,7 +15706,7 @@ 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 FUNCTION IF EXISTS `ticket_volumen_en_cajas` */; +/*!50003 DROP FUNCTION IF EXISTS `ticket_volumen_en_cajasKK` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -15698,7 +15716,7 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` FUNCTION `ticket_volumen_en_cajas`(idT INT) RETURNS decimal(10,1) +CREATE DEFINER=`root`@`%` FUNCTION `ticket_volumen_en_cajasKK`(idT INT) RETURNS decimal(10,1) BEGIN /* Devuelve el volumen estimado de un pedido, en cajas @@ -36894,7 +36912,7 @@ BEGIN * @param maxRiskDate Fecha maxima de los registros * @return table tmp.risk */ - DECLARE startingDate DATETIME DEFAULT TIMESTAMPADD(DAY, - DAYOFMONTH(CURDATE()) - 30, CURDATE()); + DECLARE startingDate DATETIME DEFAULT TIMESTAMPADD(DAY, - DAYOFMONTH(CURDATE()) - 60, CURDATE()); DECLARE endingDate DATETIME; DECLARE MAX_RISK_ALLOWED INT DEFAULT 200; @@ -40372,6 +40390,8 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `travel_tree`(vDate DATE, vAddress INT, vAgency INT) BEGIN /** + *DEPRECATED use vn.agencyHourGetShipped + * * Devuelve la lista de almacenes disponibles y la fecha de * envío desde cada uno. * @@ -40455,6 +40475,8 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `travel_tree_list`(vAddress INT, vDate DATE) BEGIN /** + *DEPRECATED use vn.agencyHourGetAgency + * * Devuelve el listado de agencias disponibles para la fecha * y dirección pasadas. * @@ -40508,6 +40530,8 @@ BEGIN CLOSE vCur; SELECT * FROM agency_list; + DROP TEMPORARY TABLE agency_list; + DROP TEMPORARY TABLE travel_tree; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -43218,7 +43242,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=163558 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=164082 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43324,6 +43348,8 @@ SET character_set_client = utf8; 1 AS `supplierAccountFk`, 1 AS `workerManagerFk`, 1 AS `sage200Company`, + 1 AS `footnotes`, + 1 AS `phytosanitary`, 1 AS `companyCode`*/; SET character_set_client = @saved_cs_client; @@ -43608,7 +43634,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=2750 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2755 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 */ ; @@ -43653,7 +43679,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=1894 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalla los clientes que tienen seguro de credito'; +) ENGINE=InnoDB AUTO_INCREMENT=1901 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 */ ; @@ -43808,7 +43834,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=3162 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=3175 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43849,7 +43875,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=4303 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4339 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43869,7 +43895,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=4125 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=4135 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 */; -- @@ -43894,7 +43920,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=829 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=916 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43990,7 +44016,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=46221 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=47652 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44574,7 +44600,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=62443 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=66411 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 */; -- @@ -44617,7 +44643,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=913436 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=927466 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44825,10 +44851,11 @@ CREATE TABLE `itemTag` ( `value` varchar(20) COLLATE utf8_unicode_ci NOT NULL, `priority` int(2) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), + UNIQUE KEY `itemFk` (`itemFk`,`tagFk`), 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=303671 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=322902 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44890,7 +44917,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=487058 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Define la clase de iva por artículo y pais'; +) ENGINE=InnoDB AUTO_INCREMENT=490910 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 */; -- @@ -45121,7 +45148,7 @@ CREATE TABLE `message` ( KEY `sender` (`sender`), KEY `recipient` (`recipient`), KEY `uuid` (`uuid`(8)) -) ENGINE=InnoDB AUTO_INCREMENT=1481460 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1489264 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45143,7 +45170,7 @@ CREATE TABLE `messageInbox` ( PRIMARY KEY (`id`), KEY `uuid` (`uuid`(8)), KEY `finalRecipient` (`finalRecipient`) -) ENGINE=InnoDB AUTO_INCREMENT=1627657 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1635671 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -46044,7 +46071,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=473078 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=482434 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -46131,7 +46158,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=95585 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=96248 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -46295,7 +46322,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=316355 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=322470 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -46517,7 +46544,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=828310 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=903759 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 */ ; @@ -46617,7 +46644,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=25940 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=27602 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47064,7 +47091,24 @@ 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=5249 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=5358 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `workerHourPrice` +-- + +DROP TABLE IF EXISTS `workerHourPrice`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `workerHourPrice` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `dated` date NOT NULL, + `hollidayInc` decimal(4,2) DEFAULT NULL, + `nightInc` decimal(4,2) DEFAULT NULL, + `extraInc` decimal(4,2) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Recoge los acuerdos de los distintos convenios'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47089,10 +47133,11 @@ CREATE TABLE `workerJourney` ( `extra` decimal(5,2) NOT NULL DEFAULT '0.00', `contractJourney` decimal(5,2) NOT NULL DEFAULT '0.00', `priceExtraHollyday` decimal(5,2) NOT NULL DEFAULT '0.00', + `businessFk` int(11) DEFAULT NULL, PRIMARY KEY (`id`,`userFk`), KEY `fk_workerJourney_user_idx` (`userFk`), CONSTRAINT `fk_workerJourney_user` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=121259 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=408966 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47114,7 +47159,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=3982 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4174 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47141,11 +47186,13 @@ DROP TABLE IF EXISTS `workerTimeControl`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `workerTimeControl` ( `id` int(11) NOT NULL, - `userFk` int(11) NOT NULL, + `userFk` int(10) unsigned NOT NULL, `timed` datetime NOT NULL, `manual` tinyint(4) NOT NULL DEFAULT '0', `order` int(11) DEFAULT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `workerTimeControl_fk1_idx` (`userFk`), + CONSTRAINT `workerTimeControl_fk1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Fichadas'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -47181,7 +47228,7 @@ CREATE TABLE `workingHours` ( PRIMARY KEY (`id`), KEY `user_working_hour_idx` (`userId`), CONSTRAINT `user_working_hour` FOREIGN KEY (`userId`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=22501 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Almacena horas de Entrada y de Salida del personal'; +) ENGINE=InnoDB AUTO_INCREMENT=23002 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Almacena horas de Entrada y de Salida del personal'; /*!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 */ ; @@ -48990,7 +49037,7 @@ 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 `agencyHourListOffer` */; +/*!50003 DROP PROCEDURE IF EXISTS `agencyHourGetAgency` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -49000,22 +49047,70 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `agencyHourListOffer`(vDate DATE, vAddressFk INT, vAgencyFk INT) +CREATE DEFINER=`root`@`%` PROCEDURE `agencyHourGetAgency`(vAddress INT, vDate DATE) BEGIN +/** + * Devuelve el listado de agencias disponibles para la fecha + * y dirección pasadas. + * + * @param vAddress Id de dirección de envío, %NULL si es recogida + * @param vDate Fecha de recogida + * @table agencyModeList Listado de agencias disponibles + */ + DECLARE vAgency INT; + DECLARE vDone BOOL DEFAULT FALSE; - CALL vn.agencyHourOffer(vDate, vAddressFk, vAgencyFk); + DECLARE vCur CURSOR FOR + SELECT DISTINCT a.id + FROM agency a + JOIN agencyHour ah ON ah.agencyFk = a.id; - SELECT * FROM tmp.agencyHourOffer; - - DROP TEMPORARY TABLE tmp.agencyHourOffer; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + DROP TEMPORARY TABLE IF EXISTS agencyModeList; + CREATE TEMPORARY TABLE agencyModeList ( + id INT NOT NULL, + agency VARCHAR(20), + description VARCHAR(45), + deliveryMethodFk VARCHAR(45), + shipped DATE, + warehouse VARCHAR(45), + PRIMARY KEY(id) + ) + ENGINE = MEMORY; + + OPEN vCur; + FETCH vCur INTO vAgency; + + WHILE NOT vDone + DO + CALL vn.agencyHourGetShipped(vDate, vAddress, vAgency); + INSERT INTO agencyModeList + SELECT a.id, a.name, a.description, + a.deliveryMethodFk, ah.shipped, w.name + FROM agencyMode a + JOIN tmp.agencyHourGetShipped ah + JOIN warehouse w on w.id = ah.warehouseFk + WHERE a.agencyFk = vAgency + AND a.web + ON DUPLICATE KEY UPDATE + warehouse = CONCAT(warehouse, ', ', w.name); + + FETCH vCur INTO vAgency; + END WHILE; + + CLOSE vCur; + DROP TEMPORARY TABLE tmp.agencyHourGetShipped; + SELECT * FROM agencyModeList; + DROP TEMPORARY TABLE IF EXISTS agencyModeList; 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 `agencyHourOffer` */; +/*!50003 DROP PROCEDURE IF EXISTS `agencyHourGetShipped` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -49025,7 +49120,7 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `agencyHourOffer`(vDate DATE, vAddressFk INT, vAgencyFk INT) +CREATE DEFINER=`root`@`%` PROCEDURE `agencyHourGetShipped`(vDate DATE, vAddressFk INT, vAgencyFk INT) BEGIN /** * Devuelve las posibles fechas de envío de un ticket @@ -49033,20 +49128,20 @@ BEGIN * @param vDate La fecha * @param vAddressFk Id del consignatario * @param vAgencyFk Id de la agencia - * @return tmp.agencyHourOffer + * @return tmp.agencyHourGetShipped */ DECLARE vDone BOOL; DECLARE vWarehouseFk SMALLINT; DECLARE vCur CURSOR FOR SELECT w.id warehouseFk - FROM warehouse w + FROM vn.warehouse w WHERE w.hasAvailable; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - DROP TEMPORARY TABLE IF EXISTS tmp.agencyHourOffer; - CREATE TEMPORARY TABLE tmp.agencyHourOffer + DROP TEMPORARY TABLE IF EXISTS tmp.agencyHourGetShipped; + CREATE TEMPORARY TABLE tmp.agencyHourGetShipped ( warehouseFk TINYINT NOT NULL PRIMARY KEY, shipped DATE NOT NULL, @@ -49063,8 +49158,7 @@ BEGIN IF vDone THEN LEAVE l; END IF; - - INSERT INTO tmp.agencyHourOffer (warehouseFk, shipped, landed) + INSERT INTO tmp.agencyHourGetShipped (warehouseFk, shipped, landed) SELECT vWarehouseFk, shipping, vDate FROM ( SELECT TIMESTAMPADD(DAY, -ah.substractDay, vDate) shipping, ah.maxHour FROM agencyHour ah @@ -49084,7 +49178,7 @@ BEGIN ) DESC LIMIT 1 ) t - WHERE t.shipping >= CURDATE() + WHERE t.shipping >= CURDATE() AND IF(t.shipping = CURDATE(), t.maxHour > HOUR(NOW()), TRUE); END LOOP; @@ -49095,6 +49189,120 @@ 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 `agencyHourGetWarehouse` */; +/*!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 `agencyHourGetWarehouse`(vAddress INT, vDate DATE, vWarehouse INT) +BEGIN +/** +* Devuelve el listado de agencias disponibles para la fecha, + * dirección y warehouuse pasadas + * + * @param vAddress no puede ser NULL + * @param vWarehouse warehouse donde comprobaremos las agencias y fecha + * @param vDate Fecha de recogida + * @table agencyModeWarehouseList Listado de agencias disponibles + */ + DECLARE vAgency INT; + DECLARE vDone BOOL DEFAULT FALSE; + DECLARE vCur CURSOR FOR + SELECT DISTINCT a.id + FROM agency a + JOIN agencyHour ah ON ah.agencyFk = a.id; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + IF vAddress IS NULL + THEN + CALL util.throw ('Address cannot be null'); + END IF; + + DROP TEMPORARY TABLE IF EXISTS tmp.agencyModeWarehouseList; + CREATE TEMPORARY TABLE tmp.agencyModeWarehouseList ( + id INT NOT NULL, + agency VARCHAR(20), + description VARCHAR(45), + deliveryMethodFk VARCHAR(45), + shipped DATE, + warehouse VARCHAR(45), + PRIMARY KEY(id) + ) + ENGINE = MEMORY; + + OPEN vCur; + FETCH vCur INTO vAgency; + + WHILE NOT vDone + DO + + INSERT INTO tmp.agencyModeWarehouseList + SELECT am.id, am.name, am.description,am.deliveryMethodFk, TIMESTAMPADD(DAY, -ah.substractDay, vDate), w.name + FROM agencyHour ah + LEFT JOIN address a ON a.id = vAddress + JOIN agencyMode am ON am.agencyFk = vAgency + JOIN warehouse w on w.id = ah.warehouseFk + WHERE ah.warehouseFk = vWarehouse + AND (weekDay = WEEKDAY(vDate) + OR weekDay IS NULL) + AND (ah.agencyFk = vAgency + OR ah.agencyFk IS NULL) + AND (ah.provinceFk = a.provinceFk + OR ah.provinceFk IS NULL + OR vAddress IS NULL) + AND TIMESTAMPADD(DAY, -ah.substractDay, vDate) >= CURDATE() + AND IF(TIMESTAMPADD(DAY, -ah.substractDay, vDate) = CURDATE(), ah.maxHour > HOUR(NOW()), TRUE) + ORDER BY ( + (ah.weekDay IS NOT NULL) + + (ah.agencyFk IS NOT NULL) + + ((ah.provinceFk IS NOT NULL) * 3) + ) DESC + LIMIT 1; + + + FETCH vCur INTO vAgency; + END WHILE; + + CLOSE vCur; + + SELECT * FROM tmp.agencyModeWarehouseList; + DROP TEMPORARY TABLE tmp.agencyModeWarehouseList; +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 `agencyHourListGetShipped` */; +/*!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 `agencyHourListGetShipped`(vDate DATE, vAddress INT, vAgency INT) +BEGIN + CALL vn.agencyHourGetShipped(vDate, vAddress, vAgency); + + SELECT * FROM tmp.agencyHourGetShipped; + + DROP TEMPORARY TABLE IF EXISTS tmp.agencyHourGetShipped; + +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 `agencyListAvailable` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -52263,10 +52471,11 @@ BEGIN ) SELECT vInvoice, pgcFk, - SUM(taxableBase), + SUM(taxableBase) as BASE, SUM(tax) FROM tmp.ticketTax - GROUP BY pgcFk; + GROUP BY pgcFk + HAVING BASE; DROP TEMPORARY TABLE tmp.ticket; DROP TEMPORARY TABLE tmp.ticketTax; @@ -52299,13 +52508,13 @@ BEGIN origin, reference, name, - 'in', - 'out', - @a := @a + IFNULL('in',0) - IFNULL('out',0) as balance + `in`, + `out`, + @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance FROM ( SELECT tr.landed as date, - b.quantity as 'in', - NULL as 'out', + b.quantity as `in`, + NULL as `out`, IF(tr.isReceived != FALSE,3, IF(tr.isDelivered,1,0)) as alertLevel, s.name as name, e.ref as reference, @@ -52322,8 +52531,8 @@ BEGIN UNION ALL SELECT tr.shipped as date, - NULL as 'in', - b.quantity as 'out', + NULL as `in`, + b.quantity as `out`, IF(tr.isReceived != FALSE,3, IF(tr.isDelivered,1,0)) as alertLevel, s.name as name, e.ref as reference, @@ -52343,8 +52552,8 @@ BEGIN UNION ALL SELECT t.shipped as date, - NULL as 'in', - s.quantity as 'out', + NULL as `in`, + s.quantity as `out`, IF(t.shipped < vCurdate,3,IF(t.shipped > vCurdate, 0, IFNULL(ts.alertLevel,0))) as alertLevel, t.nickname as name, t.refFk as reference, @@ -52357,7 +52566,7 @@ BEGIN AND s.itemFk = vItemId AND vWarehouse =t.warehouseFk ) AS itemDiary - ORDER BY date, alertLevel, 'in' DESC; + ORDER BY date, alertLevel, `in` DESC; END ;; DELIMITER ; @@ -52365,6 +52574,52 @@ 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 `itemLastEntries` */; +/*!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 `itemLastEntries`(vItem INT, vDays DATE) +BEGIN + SELECT + w.id AS Warehouse, + tr.landed, + b.entryFk, + b.isIgnored, + b.price2, + b.price3, + b.stickers, + b.packing, + b.grouping, + i.stems, + b.quantity, + b.buyingValue, + b.packageFk , + s.id AS Supplier +FROM itemType it + RIGHT JOIN (entry e + LEFT JOIN supplier s ON s.id = e.supplierFk + RIGHT JOIN buy b ON b.entryFk = e.id + LEFT JOIN item i ON i.id = b.itemFk + LEFT JOIN ink ON ink.id = i.inkFk + LEFT JOIN travel tr ON tr.id = e.travelFk + LEFT JOIN warehouse w ON w.id = tr.warehouseInFk + LEFT JOIN origin o ON o.id = i.originFk + ) ON it.id = i.typeFk + LEFT JOIN edi.ekt ek ON b.ektFk = ek.id +WHERE b.itemFk = vItem And tr.shipped > vDays + ORDER BY tr.landed DESC , b.id DESC; +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 `itemPlacementSave` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -54546,7 +54801,7 @@ proc: BEGIN SELECT * FROM ( SELECT pf.itemFk, pf.grouping, pf.packing, pf.box, pf.rate2, pf.rate3, aho.warehouseFk FROM priceFixed pf - JOIN tmp.agencyHourOffer aho ON pf.warehouseFk = aho.warehouseFk OR pf.warehouseFk = 0 + JOIN tmp.agencyHourGetShipped aho ON pf.warehouseFk = aho.warehouseFk OR pf.warehouseFk = 0 WHERE aho.shipped BETWEEN pf.started AND pf.ended ORDER BY pf.itemFk, pf.warehouseFk DESC ) tpf GROUP BY tpf.itemFk, tpf.warehouseFk @@ -54669,7 +54924,7 @@ proc: BEGIN JOIN agencyWeekDayBonus awb ON awb.warehouseFk = amz.warehouseFk AND awb.zone = amz.zone AND am.id = awb.agencyFk LEFT JOIN bi.rotacion r ON r.warehouse_id = tcc.warehouseFk AND r.Id_Article = tcc.itemFk - JOIN tmp.agencyHourOffer aho ON aho.warehouseFk = awb.warehouseFk + JOIN tmp.agencyHourGetShipped aho ON aho.warehouseFk = awb.warehouseFk AND WEEKDAY(aho.landed) = awb.weekDay HAVING cost <> 0 LIMIT 1; @@ -54685,7 +54940,7 @@ proc: BEGIN INSERT INTO tmp.ticketComponent SELECT tcb.warehouseFk, tcb.itemFk, vExtraFreightComponent, tcb.base * (IFNULL(pe.percentage,pp.percentage)/100) FROM tmp.ticketComponentBase tcb - JOIN tmp.agencyHourOffer aho ON aho.warehouseFk = tcb.warehouseFk + JOIN tmp.agencyHourGetShipped aho ON aho.warehouseFk = tcb.warehouseFk LEFT JOIN preparationPercentage pp ON pp.weekDay = WEEKDAY(aho.shipped) AND tcb.warehouseFk = IFNULL(pp.warehouseFk, tcb.warehouseFk) LEFT JOIN preparationException pe ON pe.exceptionDay = aho.shipped @@ -54791,30 +55046,43 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketComponentMakeUpdate`( vTicketFk INT, + vClientFk INT, vAgencyModeFk INT, vAddressFk INT, vWarehouseFk INT, vShipped DATETIME, vLanded DATE, vIsDeleted BOOLEAN, + vHasToBeUnrouted BOOLEAN, vOption INT) BEGIN /** - * Devuelve las diferencias de precio - * de los movimientos de un ticket. + * Calcula los componentes de un ticket + * y los actualiza con los nuevos datos. * * @param vTicketFk Id del ticket + * @param vClientFk Id del cliente + * @param vAgencyModeFk Id del tipo de agencia + * @param vAddressFk Id del consignatario + * @param vWarehouseFk Id del almacén + * @param vShipped Fecha de salida + * @param vLanded Fecha de llegada + * @param vIsDeleted Marcado como eliminado + * @param vHasToBeUnrouted Marcado para sacar de ruta + * @param vOption Id de la acción ticketUpdateAction */ - CALL vn.ticketComponentPreview (vLanded, vAddressFk, vAgencyModeFk, vTicketFk); + CALL vn.ticketComponentPreview (vTicketFk, vLanded, vAddressFk, vAgencyModeFk, vWarehouseFk); CALL vn.ticketComponentUpdate ( vTicketFk, + vClientFk, vAgencyModeFk, vAddressFk, vWarehouseFk, vShipped, vLanded, vIsDeleted, + vHasToBeUnrouted, vOption ); @@ -54838,37 +55106,34 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `ticketComponentPreview`( + vTicketFk INT, vDate DATE, vAddressFk INT, vAgencyModeFk INT, - vTicketFk INT) + vWarehouseFk SMALLINT) BEGIN /** * Devuelve un listado previo de * componentes para un ticket * + * @param vTicketFk Id del ticket * @param vDate Fecha de envío * @param vAddressFk Id del consignatario * @param vAgencyModeFk Id del modo de agencia - * @param vTicketFk Id del ticket + * @param vWarehouseFk Id del almacén */ - DECLARE vWarehouseFk SMALLINT; DECLARE vAgencyFk INT; DECLARE vShipped DATE; DECLARE vBuyOrderItem INT DEFAULT 100; - SELECT warehouseFk INTO vWarehouseFK - FROM ticket - WHERE id = vTicketFk; - SELECT agencyFk INTO vAgencyFk FROM agencyMode WHERE id = vAgencyModeFk; - CALL agencyHourOffer(vDate, vAddressFk, vAgencyFk); + CALL agencyHourGetShipped(vDate, vAddressFk, vAgencyFk); SELECT shipped INTO vShipped - FROM tmp.agencyHourOffer + FROM tmp.agencyHourGetShipped WHERE warehouseFk = vWarehouseFK; CALL buyUltimate(vWarehouseFK, vShipped); @@ -54899,7 +55164,7 @@ BEGIN SET @shipped = vShipped; DROP TEMPORARY TABLE - tmp.agencyHourOffer, + tmp.agencyHourGetShipped, tmp.buyUltimate, tmp.ticketLot; @@ -54923,18 +55188,23 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `ticketComponentPriceDifference`( - vDate DATE, + vTicketFk INT, + vDate DATE, vAddressFk INT, vAgencyModeFk INT, - vTicketFk INT) + vWarehouseFk INT) BEGIN /** * Devuelve las diferencias de precio * de los movimientos de un ticket. * * @param vTicketFk Id del ticket + * @param vDate Fecha de envío + * @param vAddressFk Id del consignatario + * @param vAgencyModeFk Id del modo de agencia + * @param vWarehouseFk Id del almacén */ - CALL vn.ticketComponentPreview(vDate, vAddressFk, vAgencyModeFk, vTicketFk); + CALL vn.ticketComponentPreview(vTicketFk, vDate, vAddressFk, vAgencyModeFk, vWarehouseFk); SELECT s.itemFk, @@ -54981,14 +55251,31 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `ticketComponentUpdate`( vTicketFk INT, + vClientFk INT, vAgencyModeFk INT, vAddressFk INT, vWarehouseFk INT, vShipped DATETIME, vLanded DATE, vIsDeleted BOOLEAN, + vHasToBeUnrouted BOOLEAN, vOption INT) BEGIN +/** + * Actualiza un ticket y sus componentes + * con los nuevos datos. + * + * @param vTicketFk Id del ticket + * @param vClientFk Id del cliente + * @param vAgencyModeFk Id del tipo de agencia + * @param vAddressFk Id del consignatario + * @param vWarehouseFk Id del almacén + * @param vShipped Fecha de salida + * @param vLanded Fecha de llegada + * @param vIsDeleted Marcado como eliminado + * @param vHasToBeUnrouted Marcado para sacar de ruta + * @param vOption Id de la acción ticketUpdateAction + */ DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN ROLLBACK; @@ -54999,6 +55286,7 @@ BEGIN UPDATE ticket t SET + t.clientFk = vClientFk, t.agencyModeFk = vAgencyModeFk, t.addressFk = vAddressFk, t.warehouseFk = vWarehouseFk, @@ -55008,6 +55296,11 @@ BEGIN WHERE t.id = vTicketFk; + IF vHasToBeUnrouted THEN + UPDATE ticket t SET t.routeFk = NULL + WHERE t.id = vTicketFk; + END IF; + IF vOption <> 8 THEN DROP TEMPORARY TABLE IF EXISTS tmp.sale; CREATE TEMPORARY TABLE tmp.sale @@ -55020,7 +55313,6 @@ BEGIN DROP TEMPORARY TABLE tmp.sale; END IF; - COMMIT; END ;; DELIMITER ; @@ -56051,7 +56343,7 @@ 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 `ticketVolume` */; +/*!50003 DROP PROCEDURE IF EXISTS `ticketVolumekk` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -56061,7 +56353,7 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `ticketVolume`(IN vTicketId INT) +CREATE DEFINER=`root`@`%` PROCEDURE `ticketVolumekk`(IN vTicketId INT) BEGIN DECLARE vWarehouseId INTEGER; DECLARE vShippedDate DATE; @@ -56377,8 +56669,10 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControlNonDays`() BEGIN - SELECT userFk, date(timed) as Fecha , MAX(`order`) as maxOrder, c.name as worker + SELECT wtc.userFk, date(wtc.timed) as Fecha , MAX(wtc.`order`) as maxOrder, c.name as worker, wb.workerCode as Boss FROM workerTimeControl wtc + JOIN worker w ON w.userFk = wtc.userFk + LEFT JOIN worker wb ON wb.id = w.bossFk JOIN client c ON c.id = wtc.userFk WHERE timed < CURDATE() GROUP BY userFk, date(timed) @@ -56779,7 +57073,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=323068 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=326843 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -57117,7 +57411,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=344499 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=348296 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -63194,7 +63488,7 @@ CREATE TABLE `cdr` ( KEY `dstchannel` (`dst_channel`), KEY `disposition` (`disposition`), KEY `src` (`src`) -) ENGINE=MyISAM AUTO_INCREMENT=198191 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=MyISAM AUTO_INCREMENT=199241 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -63973,7 +64267,7 @@ CREATE TABLE `cache_calc` ( KEY `cache_id` (`cache_id`), KEY `cacheName` (`cacheName`), KEY `expires` (`expires`) -) ENGINE=InnoDB AUTO_INCREMENT=124348 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=128144 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -65742,7 +66036,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=10764998 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=10910658 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 */ ; @@ -66478,7 +66772,7 @@ CREATE TABLE `news` ( KEY `tag` (`tag`), CONSTRAINT `news_ibfk_1` FOREIGN KEY (`userFk`) REFERENCES `account`.`account` (`id`) ON UPDATE CASCADE, CONSTRAINT `news_ibfk_2` FOREIGN KEY (`tag`) REFERENCES `newsTag` (`name`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=13010 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=13011 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -66529,7 +66823,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=1402020 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1413533 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -66628,7 +66922,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=8633130 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=8699865 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 */ ; @@ -66975,7 +67269,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=217397 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Transactions realized through the virtual TPV'; +) ENGINE=InnoDB AUTO_INCREMENT=219991 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Transactions realized through the virtual TPV'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -67010,7 +67304,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=1265990 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1274258 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -67030,7 +67324,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=2756759 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2778507 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -67055,7 +67349,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=1804929 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1814096 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -67075,7 +67369,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=2636343 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2654162 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -72179,7 +72473,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `company` AS select `e`.`id` AS `id`,`e`.`abbreviation` AS `code`,`e`.`Id_Proveedores_account` AS `supplierAccountFk`,`e`.`gerente_id` AS `workerManagerFk`,`e`.`digito_factura` AS `sage200Company`,`e`.`CodigoEmpresa` AS `companyCode` from `vn2008`.`empresa` `e` */; +/*!50001 VIEW `company` AS select `e`.`id` AS `id`,`e`.`abbreviation` AS `code`,`e`.`Id_Proveedores_account` AS `supplierAccountFk`,`e`.`gerente_id` AS `workerManagerFk`,`e`.`digito_factura` AS `sage200Company`,`e`.`footnotes` AS `footnotes`,`e`.`phytosanitary` AS `phytosanitary`,`e`.`CodigoEmpresa` AS `companyCode` from `vn2008`.`empresa` `e` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -72575,7 +72869,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `exchangeInsuranceOut` AS select `p`.`received` AS `received`,sum(`p`.`divisa`) AS `divisa`,(sum(`p`.`divisa`) / sum(`p`.`amount`)) AS `rate` from (`vn`.`payment` `p` join `vn`.`exchangeInsurance` `ei` on((`ei`.`id` = `p`.`exchangeInsuranceFk`))) group by `p`.`received` */; +/*!50001 VIEW `exchangeInsuranceOut` AS select `p`.`received` AS `received`,sum(`p`.`divisa`) AS `divisa`,(sum(`p`.`divisa`) / sum(`p`.`amount`)) AS `rate` from (`vn`.`payment` `p` join `vn`.`bank` `b` on((`b`.`id` = `p`.`bankFk`))) where ((`p`.`currencyFk` = 2) and (`b`.`cash` = 0) and (`p`.`supplierFk` <> 2213)) group by `p`.`received` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -75060,4 +75354,4 @@ USE `stock`; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-05-28 13:41:46 +-- Dump completed on 2018-06-05 12:42:12 diff --git a/services/db/install/dump/03-dumpedFixtures.sql b/services/db/install/dump/03-dumpedFixtures.sql index ac23201e0..3d4072b6b 100644 --- a/services/db/install/dump/03-dumpedFixtures.sql +++ b/services/db/install/dump/03-dumpedFixtures.sql @@ -22,7 +22,7 @@ USE `account`; LOCK TABLES `role` WRITE; /*!40000 ALTER TABLE `role` DISABLE KEYS */; -INSERT INTO `role` VALUES (0,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2018-04-23 14:33:59'),(1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de departamento',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',0,'2018-02-16 14:07:10','2018-02-23 13:30:32'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',1,'2018-02-26 15:28:23','2018-02-26 15:28:23'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'creditInsurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2018-03-05 07:44:35'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'); +INSERT INTO `role` VALUES (0,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2018-04-23 14:33:59'),(1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de departamento',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',0,'2018-02-16 14:07:10','2018-02-23 13:30:32'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',1,'2018-02-26 15:28:23','2018-02-26 15:28:23'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'creditInsurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2018-03-05 07:44:35'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'); /*!40000 ALTER TABLE `role` ENABLE KEYS */; UNLOCK TABLES; @@ -32,7 +32,7 @@ UNLOCK TABLES; LOCK TABLES `roleRole` WRITE; /*!40000 ALTER TABLE `roleRole` DISABLE KEYS */; -INSERT INTO `roleRole` VALUES (0,0),(0,1),(0,2),(0,3),(0,5),(0,6),(0,9),(0,11),(0,13),(0,15),(0,16),(0,17),(0,18),(0,19),(0,20),(0,21),(0,22),(0,30),(0,31),(0,32),(0,33),(0,34),(0,35),(0,36),(0,37),(0,38),(0,39),(0,40),(0,41),(0,42),(0,43),(0,44),(0,45),(0,47),(0,48),(0,49),(0,50),(0,51),(0,52),(0,53),(0,54),(0,55),(1,1),(1,2),(1,3),(1,6),(1,11),(2,2),(2,6),(2,11),(3,3),(3,6),(3,11),(5,1),(5,2),(5,3),(5,5),(5,6),(5,11),(5,13),(5,18),(5,19),(5,21),(5,33),(5,53),(6,6),(9,0),(9,1),(9,2),(9,3),(9,5),(9,6),(9,9),(9,11),(9,13),(9,15),(9,16),(9,17),(9,18),(9,19),(9,20),(9,21),(9,22),(9,30),(9,31),(9,32),(9,33),(9,34),(9,35),(9,36),(9,37),(9,38),(9,39),(9,40),(9,41),(9,42),(9,43),(9,44),(9,45),(9,47),(9,48),(9,49),(9,50),(9,51),(9,52),(9,53),(9,54),(9,55),(11,6),(11,11),(13,1),(13,2),(13,3),(13,6),(13,11),(13,13),(15,1),(15,2),(15,3),(15,6),(15,11),(15,15),(15,35),(16,1),(16,2),(16,3),(16,6),(16,11),(16,13),(16,15),(16,16),(16,35),(17,1),(17,2),(17,3),(17,5),(17,6),(17,11),(17,13),(17,17),(17,18),(17,19),(17,20),(17,21),(17,33),(17,37),(17,39),(17,53),(18,1),(18,2),(18,3),(18,6),(18,11),(18,18),(19,1),(19,2),(19,3),(19,6),(19,11),(19,13),(19,18),(19,19),(19,21),(19,53),(20,1),(20,2),(20,3),(20,6),(20,11),(20,13),(20,20),(21,1),(21,2),(21,3),(21,6),(21,11),(21,13),(21,18),(21,21),(21,53),(22,1),(22,2),(22,3),(22,6),(22,11),(22,13),(22,18),(22,21),(22,22),(22,53),(30,1),(30,2),(30,3),(30,5),(30,6),(30,11),(30,13),(30,18),(30,19),(30,20),(30,21),(30,22),(30,30),(30,33),(30,53),(31,1),(31,2),(31,3),(31,6),(31,11),(31,31),(32,1),(32,2),(32,3),(32,6),(32,11),(32,32),(33,33),(34,1),(34,2),(34,3),(34,6),(34,11),(34,13),(34,33),(34,34),(35,1),(35,2),(35,3),(35,6),(35,11),(35,35),(36,1),(36,2),(36,3),(36,6),(36,11),(36,36),(36,44),(36,47),(37,1),(37,2),(37,3),(37,6),(37,11),(37,37),(38,1),(38,2),(38,3),(38,6),(38,11),(38,37),(38,38),(39,1),(39,2),(39,3),(39,5),(39,6),(39,11),(39,13),(39,18),(39,19),(39,21),(39,33),(39,39),(39,53),(40,1),(40,2),(40,3),(40,6),(40,11),(40,40),(41,1),(41,2),(41,3),(41,6),(41,11),(41,13),(41,40),(41,41),(42,1),(42,2),(42,3),(42,6),(42,11),(42,42),(43,1),(43,2),(43,3),(43,6),(43,11),(43,13),(43,42),(43,43),(44,1),(44,2),(44,3),(44,6),(44,11),(44,44),(45,1),(45,2),(45,3),(45,6),(45,11),(45,13),(45,44),(45,45),(47,1),(47,2),(47,3),(47,6),(47,11),(47,47),(48,1),(48,2),(48,3),(48,6),(48,11),(48,13),(48,47),(48,48),(49,1),(49,2),(49,3),(49,6),(49,11),(49,36),(49,44),(49,47),(49,49),(50,1),(50,2),(50,3),(50,6),(50,11),(50,13),(50,36),(50,44),(50,47),(50,49),(50,50),(51,1),(51,2),(51,3),(51,6),(51,11),(51,51),(52,1),(52,2),(52,3),(52,6),(52,11),(52,13),(52,51),(52,52),(53,1),(53,2),(53,3),(53,6),(53,11),(53,53),(54,1),(54,2),(54,3),(54,6),(54,11),(54,54),(55,1),(55,2),(55,3),(55,6),(55,11),(55,13),(55,54),(55,55); +INSERT INTO `roleRole` VALUES (0,0),(0,1),(0,2),(0,3),(0,5),(0,6),(0,9),(0,11),(0,13),(0,15),(0,16),(0,17),(0,18),(0,19),(0,20),(0,21),(0,22),(0,30),(0,31),(0,32),(0,33),(0,34),(0,35),(0,36),(0,37),(0,38),(0,39),(0,40),(0,41),(0,42),(0,43),(0,44),(0,45),(0,47),(0,48),(0,49),(0,50),(0,51),(0,52),(0,53),(0,54),(0,55),(0,56),(0,57),(1,1),(1,2),(1,3),(1,6),(1,11),(2,2),(2,6),(2,11),(3,3),(3,6),(3,11),(5,1),(5,2),(5,3),(5,5),(5,6),(5,11),(5,13),(5,18),(5,19),(5,21),(5,33),(5,53),(6,6),(9,0),(9,1),(9,2),(9,3),(9,5),(9,6),(9,9),(9,11),(9,13),(9,15),(9,16),(9,17),(9,18),(9,19),(9,20),(9,21),(9,22),(9,30),(9,31),(9,32),(9,33),(9,34),(9,35),(9,36),(9,37),(9,38),(9,39),(9,40),(9,41),(9,42),(9,43),(9,44),(9,45),(9,47),(9,48),(9,49),(9,50),(9,51),(9,52),(9,53),(9,54),(9,55),(9,56),(9,57),(11,6),(11,11),(13,1),(13,2),(13,3),(13,6),(13,11),(13,13),(15,1),(15,2),(15,3),(15,6),(15,11),(15,15),(15,35),(16,1),(16,2),(16,3),(16,6),(16,11),(16,13),(16,15),(16,16),(16,35),(17,1),(17,2),(17,3),(17,5),(17,6),(17,11),(17,13),(17,17),(17,18),(17,19),(17,20),(17,21),(17,33),(17,35),(17,37),(17,39),(17,53),(18,1),(18,2),(18,3),(18,6),(18,11),(18,18),(19,1),(19,2),(19,3),(19,6),(19,11),(19,13),(19,18),(19,19),(19,21),(19,53),(20,1),(20,2),(20,3),(20,6),(20,11),(20,13),(20,20),(20,35),(21,1),(21,2),(21,3),(21,6),(21,11),(21,13),(21,18),(21,21),(21,53),(22,1),(22,2),(22,3),(22,6),(22,11),(22,13),(22,18),(22,21),(22,22),(22,53),(30,1),(30,2),(30,3),(30,5),(30,6),(30,11),(30,13),(30,18),(30,19),(30,20),(30,21),(30,22),(30,30),(30,33),(30,35),(30,53),(31,1),(31,2),(31,3),(31,6),(31,11),(31,31),(32,1),(32,2),(32,3),(32,6),(32,11),(32,32),(33,33),(34,1),(34,2),(34,3),(34,6),(34,11),(34,13),(34,33),(34,34),(35,1),(35,2),(35,3),(35,6),(35,11),(35,35),(36,1),(36,2),(36,3),(36,6),(36,11),(36,36),(36,44),(36,47),(37,1),(37,2),(37,3),(37,6),(37,11),(37,37),(38,1),(38,2),(38,3),(38,6),(38,11),(38,37),(38,38),(39,1),(39,2),(39,3),(39,5),(39,6),(39,11),(39,13),(39,18),(39,19),(39,21),(39,33),(39,39),(39,53),(40,1),(40,2),(40,3),(40,6),(40,11),(40,40),(41,1),(41,2),(41,3),(41,6),(41,11),(41,13),(41,40),(41,41),(42,1),(42,2),(42,3),(42,6),(42,11),(42,42),(43,1),(43,2),(43,3),(43,6),(43,11),(43,13),(43,42),(43,43),(44,1),(44,2),(44,3),(44,6),(44,11),(44,44),(45,1),(45,2),(45,3),(45,6),(45,11),(45,13),(45,44),(45,45),(47,1),(47,2),(47,3),(47,6),(47,11),(47,47),(48,1),(48,2),(48,3),(48,6),(48,11),(48,13),(48,47),(48,48),(49,1),(49,2),(49,3),(49,6),(49,11),(49,36),(49,44),(49,47),(49,49),(50,1),(50,2),(50,3),(50,6),(50,11),(50,13),(50,36),(50,44),(50,47),(50,49),(50,50),(51,1),(51,2),(51,3),(51,6),(51,11),(51,51),(52,1),(52,2),(52,3),(52,6),(52,11),(52,13),(52,51),(52,52),(53,1),(53,2),(53,3),(53,6),(53,11),(53,53),(54,1),(54,2),(54,3),(54,6),(54,11),(54,54),(55,1),(55,2),(55,3),(55,6),(55,11),(55,13),(55,54),(55,55),(56,1),(56,2),(56,3),(56,6),(56,11),(56,56),(57,1),(57,2),(57,3),(57,6),(57,11),(57,13),(57,56),(57,57); /*!40000 ALTER TABLE `roleRole` ENABLE KEYS */; UNLOCK TABLES; @@ -42,7 +42,7 @@ UNLOCK TABLES; LOCK TABLES `roleInherit` WRITE; /*!40000 ALTER TABLE `roleInherit` DISABLE KEYS */; -INSERT INTO `roleInherit` VALUES (9,0),(5,1),(13,1),(18,1),(31,1),(32,1),(34,1),(35,1),(37,1),(40,1),(42,1),(44,1),(47,1),(51,1),(53,1),(54,1),(1,2),(1,3),(30,5),(39,5),(11,6),(1,11),(2,11),(3,11),(16,13),(20,13),(21,13),(22,13),(34,13),(41,13),(43,13),(45,13),(48,13),(50,13),(52,13),(55,13),(16,15),(21,18),(5,19),(17,20),(30,20),(19,21),(22,21),(39,21),(30,22),(5,33),(34,33),(15,35),(49,36),(17,37),(38,37),(17,39),(41,40),(43,42),(36,44),(45,44),(36,47),(48,47),(50,49),(52,51),(21,53),(30,53),(55,54); +INSERT INTO `roleInherit` VALUES (9,0),(5,1),(13,1),(18,1),(31,1),(32,1),(34,1),(35,1),(37,1),(40,1),(42,1),(44,1),(47,1),(51,1),(53,1),(54,1),(56,1),(1,2),(1,3),(30,5),(39,5),(11,6),(1,11),(2,11),(3,11),(16,13),(20,13),(21,13),(22,13),(34,13),(41,13),(43,13),(45,13),(48,13),(50,13),(52,13),(55,13),(57,13),(16,15),(21,18),(5,19),(17,20),(30,20),(19,21),(22,21),(39,21),(30,22),(5,33),(34,33),(15,35),(20,35),(49,36),(17,37),(38,37),(17,39),(41,40),(43,42),(36,44),(45,44),(36,47),(48,47),(50,49),(52,51),(21,53),(30,53),(55,54),(57,56); /*!40000 ALTER TABLE `roleInherit` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -55,7 +55,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-05-10 11:06:50 +-- Dump completed on 2018-06-01 12:01:00 USE `salix`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -80,7 +80,7 @@ USE `salix`; LOCK TABLES `ACL` WRITE; /*!40000 ALTER TABLE `ACL` DISABLE KEYS */; -INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','employee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','employee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','employee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','employee'),(28,'ClientObservation','*','READ','ALLOW','ROLE','employee'),(30,'GreugeType','*','READ','ALLOW','ROLE','employee'),(31,'Mandate','*','READ','ALLOW','ROLE','employee'),(32,'MandateType','*','READ','ALLOW','ROLE','employee'),(33,'Company','*','READ','ALLOW','ROLE','employee'),(34,'Greuge','*','READ','ALLOW','ROLE','employee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(52,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','employee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(57,'CreditClassification','*','READ','ALLOW','ROLE','employee'),(58,'CreditClassification','*','WRITE','ALLOW','ROLE','creditInsurance'),(59,'CreditInsurance','*','READ','ALLOW','ROLE','employee'),(60,'CreditInsurance','*','WRITE','ALLOW','ROLE','creditInsurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','*','ALLOW','ROLE','employee'),(66,'TicketTracking','*','*','ALLOW','ROLE','employee'),(67,'TicketState','*','*','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','READ','ALLOW','ROLE','employee'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'); +INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','employee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','employee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','employee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','employee'),(28,'ClientObservation','*','READ','ALLOW','ROLE','employee'),(30,'GreugeType','*','READ','ALLOW','ROLE','employee'),(31,'Mandate','*','READ','ALLOW','ROLE','employee'),(32,'MandateType','*','READ','ALLOW','ROLE','employee'),(33,'Company','*','READ','ALLOW','ROLE','employee'),(34,'Greuge','*','READ','ALLOW','ROLE','employee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(52,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','employee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(57,'CreditClassification','*','READ','ALLOW','ROLE','employee'),(58,'CreditClassification','*','WRITE','ALLOW','ROLE','creditInsurance'),(59,'CreditInsurance','*','READ','ALLOW','ROLE','employee'),(60,'CreditInsurance','*','WRITE','ALLOW','ROLE','creditInsurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(67,'TicketState','*','*','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','READ','ALLOW','ROLE','employee'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','removes','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'); /*!40000 ALTER TABLE `ACL` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -93,7 +93,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-05-10 11:06:50 +-- Dump completed on 2018-06-01 12:01:01 USE `vn`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -171,7 +171,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-05-10 11:06:50 +-- Dump completed on 2018-06-01 12:01:01 USE `vn2008`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -206,7 +206,7 @@ UNLOCK TABLES; LOCK TABLES `Gastos` WRITE; /*!40000 ALTER TABLE `Gastos` DISABLE KEYS */; -INSERT INTO `Gastos` VALUES ('2000000000',1,'Inmovilizado pendiente',1,0,0),('2000000000',3,'Compra de bienes de inmovilizado',1,0,0),('2600000000',1,'Fianzas',0,0,0),('4600000000',1,'Anticipos de remuneraciones',1,0,0),('4600000001',1,'Anticpos de remuneración',1,0,0),('4751000000',0,'Retenciones',0,1,0),('4751000000',1,'Retenciones',0,1,0),('4751000000',6,'Retencion',0,0,0),('5200000006',1,'Deudas a c/p CRA',1,0,0),('5200000008',0,'Prestamo CP Transolver IVECO 269',1,0,0),('5200000008',1,'Prestamo Transolver 201600269',1,0,0),('5200000009',0,'Prestamo CP Transolver IVECO 270',1,0,0),('5200000009',1,'Prestamo Transolver 201600270',1,0,0),('5200000010',0,'Prestamo CP Transolver IVECO 271',1,0,0),('5200000010',1,'Prestamo Transolver 201600271',1,0,0),('5200000011',1,'Prestamo Transolver 339',0,0,0),('5200000012',1,'Prestamo Transolver 340',1,0,0),('5200000013',1,'Prestamo Transolver 341',1,0,0),('5200000014',1,'Prestamo a c/p BBVA 600.000€',1,0,0),('5200000022',1,'Linea comercio exterior',1,0,0),('5240000001',1,'Leasing BBVA',1,0,0),('5240002032',1,'Leasing Iveco',1,0,0),('5240002066',1,'Leasing c/p Man',1,0,0),('5240002104',1,'Leasing c/p La caixa 3 vehículos',1,0,0),('5325000003',6,'Prestamo a partes vinculadas',0,0,0),('5660000001',1,'Suplidos',0,0,0),('5660000001',20,'Suplidos',1,0,0),('5660000002',0,'Suplidos',0,0,0),('5660000002',1,'Suplidos Transitarios nacionales',1,0,0),('5660000003',1,'Deposito c/p Ebury',1,0,0),('5660000003',4,'Deposito Ebury',0,0,0),('5660000004',4,'Deposito Global Reach',0,0,0),('6001000000',1,'Compras a terceros nacional',1,0,0),('6001000000',18,'Compras a terceros nacional',1,0,0),('6001000000',19,'Compras a terceros nacional',1,0,0),('6001000001',1,'Adquisiones en Europa',0,0,0),('6001000001',3,'Adquisición en Europa',1,0,0),('6002000000',1,'Transportes de compras',1,0,0),('6002000001',1,'Tranportes de compra Europa',1,0,0),('6002000001',4,'Transportes de compras Europa',1,0,0),('6002000567',0,'Transporte de compras VNH',1,0,0),('6003000000',1,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000000',5,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000000',6,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000567',0,'Compra de mercancia extracomunitaria VNH',1,0,0),('6004000000',1,'Transporte compras Sudamérica',1,0,0),('6004000000',4,'Transporte compras Sudamérica',1,0,0),('6004000000',6,'Transporte compras Sudamérica',1,0,0),('6010000000',1,'Materias primas',1,0,0),('6020000000',1,'Otros aprovisionamientos',1,0,0),('6020000001',1,'Embalajes',1,0,0),('6020000002',1,'Otros aprov. Taller artíficial',1,0,0),('6070000000',1,'Trabajos de produccion encargados a terceros',1,0,0),('6090000000',6,'Rappels por compras',1,0,0),('6100000000',0,'Variacion existencias',1,0,0),('6210000000',1,'Arrendamientos',1,0,0),('6210000001',1,'Arrendamiento vehículo',1,0,0),('6210000001',4,'Gastos de arrendamiento vehículos',1,0,0),('6210000002',1,'Arrendamiento nave',1,0,0),('6210000003',1,'Arrendamiento espacio virtual-informatic',1,0,0),('6210000004',1,'Arrendamiento elementos para el proceso de informa',1,0,0),('6210000005',1,'Arrendamiento CC y banddejas',1,0,0),('6210000567',0,'Alquiler VNH',1,0,0),('6220000000',1,'Reparaciones y conservacion',1,0,0),('6220000001',1,'Reparación-Informatica',1,0,0),('6220000001',4,'Reparacion y mantenimiento informatica',1,0,0),('6220000003',1,'Reparación-Vehiculos',1,0,0),('6220000004',1,'Reparación-Instalaciones',1,0,0),('6220000005',1,'Reparación y mantenimineto CCs',1,0,0),('6220000006',1,'Repracion y conser maquinaria',1,0,0),('6230000000',1,'Servicios de profesionales independientes',1,0,0),('6230000000',4,'Servicio de profesionales',0,0,0),('6230000000',6,'Servicios de profesionales',1,0,0),('6230000001',1,'Servicios por gestión de ventas',1,0,0),('6230000001',4,'Servicios por gestión de ventas',1,0,0),('6240000000',1,'Transportes',1,0,0),('6240000000',4,'Transportes de ventas',1,0,0),('6240000001',1,'Transporte ventas troncal',1,0,0),('6240000567',0,'Transporte ventas VNH',1,0,0),('6250000000',1,'Primas de seguros',1,0,0),('6250000000',4,'Prima de Seguros',1,0,0),('6250000001',1,'Primas de seguros-Personales',1,0,0),('6250000002',1,'Primas de seguros-Colectivos',1,0,0),('6250000003',1,'Primas de seguros-Vehiculos',1,0,0),('6250000004',1,'Primas de seguros-Inmuebles',1,0,0),('6250000567',0,'Seguros VNH',1,0,0),('6260000000',1,'Gastos bancarios',1,0,0),('6260000000',4,'Gastos bancarios',0,0,0),('6260000001',1,'Gastos bancarios datafono',1,0,0),('6260000002',1,'Gastos bancarios transferencia nacional',1,0,0),('6260000003',1,'Gastos bancarios transferencia Europa',1,0,0),('6260000004',1,'Gastos bancarios transferencia divisas',1,0,0),('6260000567',0,'Gastos bancarios VNH',1,0,0),('6270000000',1,'Publicidad y RRPP',1,0,0),('6270000000',3,'Publicidad, propaganda y RR PP',1,0,0),('6270000000',6,'Publicidad',1,0,0),('6270000000',14,'Publicidad, propaganda RRPP',1,0,0),('6270000001',1,'Patrocinio',0,0,0),('6280000000',1,'Suministros',1,0,0),('6280000001',1,'Telefonos',1,0,0),('6280000002',1,'Gasoil',1,0,0),('6280000003',1,'Suministros-Electricidad',1,0,0),('6280000004',1,'Internet',1,0,0),('6280000567',0,'Suministros VNH',1,0,0),('6280001567',0,'Suministros telefono VNH',1,0,0),('6280003567',0,'Suministro luz VNH',1,0,0),('6290000000',1,'Otros servicios',1,0,0),('6290000001',1,'Material de oficina',1,0,0),('6290000002',1,'Gastos en formacion',1,0,0),('6290000003',1,'Asesoria juridica',1,0,0),('6290000004',4,'Otros servicios UE',1,0,0),('6290000005',1,'Gastos varios-Correos',1,0,0),('6290000006',6,'Otros servicios extranjero',1,0,0),('6290000007',1,'Gastos pequeño material',1,0,0),('6290000007',3,'Compras pequeño material',1,0,0),('6290000007',6,'Pequeño material',1,0,0),('6290000008',1,'Gastos varios-uniformes personal',1,0,0),('6290000008',3,'Compra uniformes',1,0,0),('6290000009',1,'Gastos-CC Container',1,0,0),('6290000010',1,'Gastos formación clientes',1,0,0),('6290000012',1,'Gastos gestión contra-reembolsos',1,0,0),('6290000013',1,'Arrendamiento Vilassar',1,0,0),('6290000014',1,'Gasto laboral espresas ETT',1,0,0),('6290000015',1,'Gasto compra terminales moviles y similares',1,0,0),('6290000015',3,'Gasto compra terminales moviles y similares',1,0,0),('6290000015',6,'Gasto compra terminales moviles y similares',1,0,0),('6290000016',1,'Gasto gestión cobro ventas',1,0,0),('6290000553',1,'Gastos viaje administrador',1,0,0),('6290000553',4,'Gastos viaje administrador-gerente',1,0,0),('6290000553',6,'Gastos viaje administrador',1,0,0),('6290001000',1,'Gastos de viaje',1,0,0),('6290001000',4,'Gastos viajes otros departamentos',1,0,0),('6290001000',6,'Gastos viaje personal otros departamentos',1,0,0),('6290001001',1,'Gastos R.R.P.P. Gerente',1,0,0),('6290001002',1,'Gastos R.R.P.P. Comerciales',1,0,0),('6290001567',0,'Gastos material oficina',1,0,0),('6300000000',1,'Impuesto de sociedades',1,0,0),('6310000000',1,'Otros tributos',1,0,0),('6380000000',1,'Ajustes positivos s/b Bº',1,0,0),('6400000000',0,'Sueldos y salarios',1,0,0),('6400000000',1,'Salarios',0,0,0),('6400000001',0,'Productividad',1,0,0),('6400000567',0,'Salarios VNH',1,0,0),('6410000001',1,'Indemnizaciones',1,0,0),('6420000000',0,'Seguridad Social a cargo de la empresa',1,0,0),('6420000000',1,'Seguridad Social',0,0,0),('6490000000',1,'Otros gastos sociales',1,0,0),('6500000000',1,'Impagados definitivos',1,0,0),('6620000000',0,'Intereses Bancarios',1,0,0),('6620000001',1,'Intereses Leasing BBVA Dic 2017',1,0,0),('6620000006',1,'Intereses deuda prestamo CRA',1,0,0),('6620000007',1,'Intereses La Caixa linea comercio exterior',1,0,0),('6620000007',16,'Intereses La Caixa Linea Comercio Exterior',0,0,0),('6620000008',1,'Intereses Prestamos Transolver 2016',1,0,0),('6620000011',1,'Intereses BBVA linea comercio exterior',1,0,0),('6620000014',1,'Intereses Prestamo BBVA',1,0,0),('6620000015',1,'Interés Póliza Deutsche Bank',0,0,0),('6620000023',1,'Intereses Bankinter Póliza Comercio Exterior',0,0,0),('6620002032',1,'Intereses Leaing Iveco',1,0,0),('6620002066',1,'Leasing Intereses Man',1,0,0),('6620002104',1,'Intereses Leasing La caixa 3 vehículos',1,0,0),('6681000000',1,'Diferencia negativa tipo de cambio',1,0,0),('6681000000',4,'Diferencia negativa tipo de cambio',0,0,0),('6681000000',6,'Diferencia negativa tipo de cambio',1,0,0),('6681000567',0,'Diferencias de cambio VNH',1,0,0),('6690000000',1,'Otros gastos financieros',1,0,0),('6690000000',6,'Gastos financieros',1,0,0),('6720000000',16,'Perdidas procedentes de inversiones',0,0,0),('6780000000',1,'Gastos extraordinarios',1,0,0),('6780000001',1,'Gastos no deducibles',1,0,0),('6780000001',16,'Gasto no deducible',0,0,0),('6800000000',1,'Amortización inmovilizado intangible',1,0,0),('6800000001',0,'Amortizacion inmovilizado material',1,0,0),('6810000000',0,'Amortizaciones inmovilizado',1,0,0),('6810000000',1,'Amortizacion inmovilizado material',1,0,0),('7000000000',0,'Ventas',1,0,0),('7000000001',1,'Venta entre empresas',1,0,0),('7000010000',0,'Terceros Flor',1,0,0),('7000020000',0,'Terceros Planta',1,0,0),('7000030000',0,'Terceros Complementos',1,0,0),('7000040000',0,'Terceros Artificial',1,0,0),('7000050000',0,'Terceros Verdes',1,0,0),('7000060000',0,'Terceros Otros',1,0,0),('7000070000',0,'Terceros Confección',1,0,0),('7000080000',1,'Terceros Logística',1,0,0),('7001000000',1,'Mercaderia',1,0,1),('7001010000',0,'Grupo Flor',1,0,0),('7001020000',0,'Grupo Planta',1,0,0),('7001030000',0,'Grupo Complementos',1,0,0),('7001040000',0,'Grupo Artificial',1,0,0),('7001050000',0,'Grupo Verdes',1,0,0),('7001060000',0,'Grupo Otros',1,0,0),('7001070000',0,'Grupo Confección',1,0,0),('7001080000',1,'Grupo Logística',1,0,0),('7002010000',0,'Asociados Flor',1,0,0),('7002020000',0,'Asociados Planta',1,0,0),('7002030000',0,'Asociados Complementos',1,0,0),('7002040000',0,'Asociados Artificial',1,0,0),('7002050000',0,'Asociados Verdes',1,0,0),('7002060000',0,'Asociados Otros',1,0,0),('7002070000',0,'Asociados Confección',1,0,0),('7002080000',1,'Asociados Logística',1,0,0),('7040000000',1,'Embalajes',1,0,1),('7050000000',1,'Prestacion de servicios',1,0,1),('7400000000',1,'Subvenciones, donaciones a la explotacion',1,0,0),('7550000000',0,'Ingresos por serivicios al personal',1,0,0),('7680000000',0,'Diferencias positivas de cambio',1,0,0),('7680000000',1,'Diferenica positiva tipo de cambio',1,0,0),('7690000000',1,'Otros ingresos financieros',1,0,0),('7780000000',1,'Ingresos excepcionales',1,0,0),('7780000000',16,'Ingreso extraordinario',0,0,0),('7780000001',1,'Indemnizaciones transporte',1,0,0),('7780000001',4,'Indemnizaciones agencias transporte',1,0,0),('7780000001',5,'Indemnizaciones agencias transporte',1,0,0),('7780000001',6,'Indemnizaciones transporte',1,0,0),('7940000000',16,'Reversión impagos',0,0,0); +INSERT INTO `Gastos` VALUES ('2000000000',1,'Inmovilizado pendiente',1,0,0),('2000000000',3,'Compra de bienes de inmovilizado',1,0,0),('2600000000',1,'Fianzas',0,0,0),('4600000000',1,'Anticipos de remuneraciones',1,0,0),('4600000001',1,'Anticpos de remuneración',1,0,0),('4751000000',0,'Retenciones',0,1,0),('4751000000',1,'Retenciones',0,1,0),('4751000000',6,'Retencion',0,0,0),('5200000006',1,'Deudas a c/p CRA',1,0,0),('5200000008',0,'Prestamo CP Transolver IVECO 269',1,0,0),('5200000008',1,'Prestamo Transolver 201600269',1,0,0),('5200000009',0,'Prestamo CP Transolver IVECO 270',1,0,0),('5200000009',1,'Prestamo Transolver 201600270',1,0,0),('5200000010',0,'Prestamo CP Transolver IVECO 271',1,0,0),('5200000010',1,'Prestamo Transolver 201600271',1,0,0),('5200000011',1,'Prestamo Transolver 339',0,0,0),('5200000012',1,'Prestamo Transolver 340',1,0,0),('5200000013',1,'Prestamo Transolver 341',1,0,0),('5200000014',1,'Prestamo a c/p BBVA 600.000€',1,0,0),('5200000022',1,'Linea comercio exterior',1,0,0),('5240000001',1,'Leasing BBVA',1,0,0),('5240002032',1,'Leasing Iveco',1,0,0),('5240002066',1,'Leasing c/p Man',1,0,0),('5240002104',1,'Leasing c/p La caixa 3 vehículos',1,0,0),('5325000003',6,'Prestamo a partes vinculadas',0,0,0),('5660000001',1,'Suplidos',0,0,0),('5660000001',20,'Suplidos',1,0,0),('5660000002',0,'Suplidos',0,0,0),('5660000002',1,'Suplidos Transitarios nacionales',1,0,0),('5660000003',1,'Deposito c/p Ebury',1,0,0),('5660000003',4,'Deposito Ebury',0,0,0),('5660000004',4,'Deposito Global Reach',0,0,0),('6001000000',1,'Compras a terceros nacional',1,0,0),('6001000000',18,'Compras a terceros nacional',1,0,0),('6001000000',19,'Compras a terceros nacional',1,0,0),('6001000001',1,'Adquisiones en Europa',0,0,0),('6001000001',3,'Adquisición en Europa',1,0,0),('6002000000',1,'Transportes de compras',1,0,0),('6002000001',1,'Tranportes de compra Europa',1,0,0),('6002000001',4,'Transportes de compras Europa',1,0,0),('6002000567',0,'Transporte de compras VNH',1,0,0),('6003000000',1,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000000',5,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000000',6,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000567',0,'Compra de mercancia extracomunitaria VNH',1,0,0),('6004000000',1,'Transporte compras Sudamérica',1,0,0),('6004000000',4,'Transporte compras Sudamérica',1,0,0),('6004000000',6,'Transporte compras Sudamérica',1,0,0),('6010000000',1,'Materias primas',1,0,0),('6020000000',1,'Otros aprovisionamientos',1,0,0),('6020000001',1,'Embalajes',1,0,0),('6020000002',1,'Otros aprov. Taller artíficial',1,0,0),('6070000000',1,'Trabajos de produccion encargados a terceros',1,0,0),('6090000000',6,'Rappels por compras',1,0,0),('6100000000',0,'Variacion existencias',1,0,0),('6210000000',1,'Arrendamientos',1,0,0),('6210000001',1,'Arrendamiento vehículo',1,0,0),('6210000001',4,'Gastos de arrendamiento vehículos',1,0,0),('6210000002',1,'Arrendamiento nave',1,0,0),('6210000003',1,'Arrendamiento espacio virtual-informatic',1,0,0),('6210000004',1,'Arrendamiento elementos para el proceso de informa',1,0,0),('6210000005',1,'Arrendamiento CC y banddejas',1,0,0),('6210000567',0,'Alquiler VNH',1,0,0),('6220000000',1,'Reparaciones y conservacion',1,0,0),('6220000001',1,'Reparación-Informatica',1,0,0),('6220000001',4,'Reparacion y mantenimiento informatica',1,0,0),('6220000003',1,'Reparación-Vehiculos',1,0,0),('6220000004',1,'Reparación-Instalaciones',1,0,0),('6220000005',1,'Reparación y mantenimineto CCs',1,0,0),('6220000006',1,'Repracion y conser maquinaria',1,0,0),('6230000000',1,'Servicios de profesionales independientes',1,0,0),('6230000000',4,'Servicio de profesionales',0,0,0),('6230000000',6,'Servicios de profesionales',1,0,0),('6230000001',1,'Servicios por gestión de ventas',1,0,0),('6230000001',4,'Servicios por gestión de ventas',1,0,0),('6240000000',1,'Transportes',1,0,0),('6240000000',4,'Transportes de ventas',1,0,0),('6240000001',1,'Transporte ventas troncal',1,0,0),('6240000567',0,'Transporte ventas VNH',1,0,0),('6250000000',1,'Primas de seguros',1,0,0),('6250000000',4,'Prima de Seguros',1,0,0),('6250000001',1,'Primas de seguros-Personales',1,0,0),('6250000002',1,'Primas de seguros-Colectivos',1,0,0),('6250000003',1,'Primas de seguros-Vehiculos',1,0,0),('6250000004',1,'Primas de seguros-Inmuebles',1,0,0),('6250000567',0,'Seguros VNH',1,0,0),('6260000000',1,'Gastos bancarios',1,0,0),('6260000000',4,'Gastos bancarios',0,0,0),('6260000000',6,'Gastos bancarios',1,0,0),('6260000001',1,'Gastos bancarios datafono',1,0,0),('6260000002',1,'Gastos bancarios transferencia nacional',1,0,0),('6260000003',1,'Gastos bancarios transferencia Europa',1,0,0),('6260000004',1,'Gastos bancarios transferencia divisas',1,0,0),('6260000567',0,'Gastos bancarios VNH',1,0,0),('6270000000',1,'Publicidad y RRPP',1,0,0),('6270000000',3,'Publicidad, propaganda y RR PP',1,0,0),('6270000000',6,'Publicidad',1,0,0),('6270000000',14,'Publicidad, propaganda RRPP',1,0,0),('6270000001',1,'Patrocinio',0,0,0),('6280000000',1,'Suministros',1,0,0),('6280000001',1,'Telefonos',1,0,0),('6280000002',1,'Gasoil',1,0,0),('6280000003',1,'Suministros-Electricidad',1,0,0),('6280000004',1,'Internet',1,0,0),('6280000567',0,'Suministros VNH',1,0,0),('6280001567',0,'Suministros telefono VNH',1,0,0),('6280003567',0,'Suministro luz VNH',1,0,0),('6290000000',1,'Otros servicios',1,0,0),('6290000001',1,'Material de oficina',1,0,0),('6290000002',1,'Gastos en formacion',1,0,0),('6290000003',1,'Asesoria juridica',1,0,0),('6290000004',4,'Otros servicios UE',1,0,0),('6290000005',1,'Gastos varios-Correos',1,0,0),('6290000006',6,'Otros servicios extranjero',1,0,0),('6290000007',1,'Gastos pequeño material',1,0,0),('6290000007',3,'Compras pequeño material',1,0,0),('6290000007',6,'Pequeño material',1,0,0),('6290000008',1,'Gastos varios-uniformes personal',1,0,0),('6290000008',3,'Compra uniformes',1,0,0),('6290000009',1,'Gastos-CC Container',1,0,0),('6290000010',1,'Gastos formación clientes',1,0,0),('6290000012',1,'Gastos gestión contra-reembolsos',1,0,0),('6290000013',1,'Arrendamiento Vilassar',1,0,0),('6290000014',1,'Gasto laboral espresas ETT',1,0,0),('6290000015',1,'Gasto compra terminales moviles y similares',1,0,0),('6290000015',3,'Gasto compra terminales moviles y similares',1,0,0),('6290000015',6,'Gasto compra terminales moviles y similares',1,0,0),('6290000016',1,'Gasto gestión cobro ventas',1,0,0),('6290000553',1,'Gastos viaje administrador',1,0,0),('6290000553',4,'Gastos viaje administrador-gerente',1,0,0),('6290000553',6,'Gastos viaje administrador',1,0,0),('6290001000',1,'Gastos de viaje',1,0,0),('6290001000',4,'Gastos viajes otros departamentos',1,0,0),('6290001000',6,'Gastos viaje personal otros departamentos',1,0,0),('6290001001',1,'Gastos R.R.P.P. Gerente',1,0,0),('6290001002',1,'Gastos R.R.P.P. Comerciales',1,0,0),('6290001567',0,'Gastos material oficina',1,0,0),('6300000000',1,'Impuesto de sociedades',1,0,0),('6310000000',1,'Otros tributos',1,0,0),('6380000000',1,'Ajustes positivos s/b Bº',1,0,0),('6400000000',0,'Sueldos y salarios',1,0,0),('6400000000',1,'Salarios',0,0,0),('6400000001',0,'Productividad',1,0,0),('6400000567',0,'Salarios VNH',1,0,0),('6410000001',1,'Indemnizaciones',1,0,0),('6420000000',0,'Seguridad Social a cargo de la empresa',1,0,0),('6420000000',1,'Seguridad Social',0,0,0),('6490000000',1,'Otros gastos sociales',1,0,0),('6500000000',1,'Impagados definitivos',1,0,0),('6620000000',0,'Intereses Bancarios',1,0,0),('6620000001',1,'Intereses Leasing BBVA Dic 2017',1,0,0),('6620000006',1,'Intereses deuda prestamo CRA',1,0,0),('6620000007',1,'Intereses La Caixa linea comercio exterior',1,0,0),('6620000007',16,'Intereses La Caixa Linea Comercio Exterior',0,0,0),('6620000008',1,'Intereses Prestamos Transolver 2016',1,0,0),('6620000011',1,'Intereses BBVA linea comercio exterior',1,0,0),('6620000014',1,'Intereses Prestamo BBVA',1,0,0),('6620000015',1,'Interés Póliza Deutsche Bank',0,0,0),('6620000023',1,'Intereses Bankinter Póliza Comercio Exterior',0,0,0),('6620002032',1,'Intereses Leaing Iveco',1,0,0),('6620002066',1,'Leasing Intereses Man',1,0,0),('6620002104',1,'Intereses Leasing La caixa 3 vehículos',1,0,0),('6681000000',1,'Diferencia negativa tipo de cambio',1,0,0),('6681000000',4,'Diferencia negativa tipo de cambio',0,0,0),('6681000000',6,'Diferencia negativa tipo de cambio',1,0,0),('6681000567',0,'Diferencias de cambio VNH',1,0,0),('6690000000',1,'Otros gastos financieros',1,0,0),('6690000000',6,'Gastos financieros',1,0,0),('6720000000',16,'Perdidas procedentes de inversiones',0,0,0),('6780000000',1,'Gastos extraordinarios',1,0,0),('6780000001',1,'Gastos no deducibles',1,0,0),('6780000001',16,'Gasto no deducible',0,0,0),('6800000000',1,'Amortización inmovilizado intangible',1,0,0),('6800000001',0,'Amortizacion inmovilizado material',1,0,0),('6810000000',0,'Amortizaciones inmovilizado',1,0,0),('6810000000',1,'Amortizacion inmovilizado material',1,0,0),('7000000000',0,'Ventas',1,0,0),('7000000001',1,'Venta entre empresas',1,0,0),('7000010000',0,'Terceros Flor',1,0,0),('7000020000',0,'Terceros Planta',1,0,0),('7000030000',0,'Terceros Complementos',1,0,0),('7000040000',0,'Terceros Artificial',1,0,0),('7000050000',0,'Terceros Verdes',1,0,0),('7000060000',0,'Terceros Otros',1,0,0),('7000070000',0,'Terceros Confección',1,0,0),('7000080000',1,'Terceros Logística',1,0,0),('7001000000',1,'Mercaderia',1,0,1),('7001010000',0,'Grupo Flor',1,0,0),('7001020000',0,'Grupo Planta',1,0,0),('7001030000',0,'Grupo Complementos',1,0,0),('7001040000',0,'Grupo Artificial',1,0,0),('7001050000',0,'Grupo Verdes',1,0,0),('7001060000',0,'Grupo Otros',1,0,0),('7001070000',0,'Grupo Confección',1,0,0),('7001080000',1,'Grupo Logística',1,0,0),('7002010000',0,'Asociados Flor',1,0,0),('7002020000',0,'Asociados Planta',1,0,0),('7002030000',0,'Asociados Complementos',1,0,0),('7002040000',0,'Asociados Artificial',1,0,0),('7002050000',0,'Asociados Verdes',1,0,0),('7002060000',0,'Asociados Otros',1,0,0),('7002070000',0,'Asociados Confección',1,0,0),('7002080000',1,'Asociados Logística',1,0,0),('7040000000',1,'Embalajes',1,0,1),('7050000000',1,'Prestacion de servicios',1,0,1),('7400000000',1,'Subvenciones, donaciones a la explotacion',1,0,0),('7550000000',0,'Ingresos por serivicios al personal',1,0,0),('7680000000',0,'Diferencias positivas de cambio',1,0,0),('7680000000',1,'Diferenica positiva tipo de cambio',1,0,0),('7690000000',1,'Otros ingresos financieros',1,0,0),('7780000000',1,'Ingresos excepcionales',1,0,0),('7780000000',16,'Ingreso extraordinario',0,0,0),('7780000001',1,'Indemnizaciones transporte',1,0,0),('7780000001',4,'Indemnizaciones agencias transporte',1,0,0),('7780000001',5,'Indemnizaciones agencias transporte',1,0,0),('7780000001',6,'Indemnizaciones transporte',1,0,0),('7940000000',16,'Reversión impagos',0,0,0); /*!40000 ALTER TABLE `Gastos` ENABLE KEYS */; UNLOCK TABLES; @@ -259,6 +259,16 @@ LOCK TABLES `Monedas` WRITE; INSERT INTO `Monedas` VALUES (1,'EUR','Euro',1),(2,'USD','Dollar USA',1.4),(3,'GBP','Libra',1),(4,'JPY','Yen Japones',1); /*!40000 ALTER TABLE `Monedas` ENABLE KEYS */; UNLOCK TABLES; + +-- +-- Dumping data for table `container` +-- + +LOCK TABLES `container` WRITE; +/*!40000 ALTER TABLE `container` DISABLE KEYS */; +INSERT INTO `container` VALUES (1,'atado'),(2,'bandeja'),(3,'blister'),(4,'bola'),(5,'bolsa'),(6,'bote'),(7,'botella'),(8,'bulto'),(9,'caja'),(10,'capazo'),(11,'CC'),(13,'cubo'),(14,'ejemplar'),(15,'expositor'),(16,'fardo'),(17,'full'),(18,'garba'),(21,'maceta'),(22,'macetero'),(23,'metro'),(24,'pack'),(25,'paquete'),(26,'pieza'),(27,'rollo'),(28,'saco'),(29,'set'),(30,'sobre'),(31,'tabaco'),(32,'tallo'),(33,'tubo'),(34,'vaso'),(35,'x 2 media'),(36,NULL),(37,'pallet'); +/*!40000 ALTER TABLE `container` ENABLE KEYS */; +UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; @@ -269,7 +279,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-05-10 11:06:50 +-- Dump completed on 2018-06-01 12:01:01 USE `bi`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -317,7 +327,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-05-10 11:06:50 +-- Dump completed on 2018-06-01 12:01:02 USE `cache`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -355,4 +365,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-05-10 11:06:51 +-- Dump completed on 2018-06-01 12:01:02 diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index 19717e819..ccdf72114 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -328,16 +328,16 @@ INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `des INSERT INTO `vn`.`ticketTracking`(`id`, `ticketFk`, `stateFk`, `workerFk`, `created`) VALUES - (1, 1, 1, 5, CURDATE()), - (2, 2, 2, 5, CURDATE()), - (3, 3, 3, 5, CURDATE()), - (4, 4, 1, 5, CURDATE()), - (5, 5, 2, 18, CURDATE()), - (6, 6, 3, 18, CURDATE()), - (7, 7, 1, 18, CURDATE()), - (8, 8, 2, 19, CURDATE()), - (9, 9, 3, 19, CURDATE()), - (10, 10, 3, 19, CURDATE()), + (1, 1, 13, 5, CURDATE()), + (2, 2, 15, 5, CURDATE()), + (3, 3, 16, 5, CURDATE()), + (4, 4, 13, 5, CURDATE()), + (5, 5, 15, 18, CURDATE()), + (6, 6, 16, 18, CURDATE()), + (7, 7, 13, 18, CURDATE()), + (8, 8, 15, 19, CURDATE()), + (9, 9, 16, 19, CURDATE()), + (10, 10, 13, 19, CURDATE()), (11, 11, 3, 19, CURDATE()), (12, 12, 3, 19, CURDATE()), (13, 13, 3, 19, CURDATE()), @@ -346,9 +346,9 @@ INSERT INTO `vn`.`ticketTracking`(`id`, `ticketFk`, `stateFk`, `workerFk`, `crea (16, 16, 1, 19, CURDATE()), (17, 17, 1, 19, CURDATE()), (18, 18, 1, 19, CURDATE()), - (19, 19, 1, 19, CURDATE()), - (20, 20, 1, 19, CURDATE()), - (21, 21, 1, 19, CURDATE()); + (19, 19, 13, 19, CURDATE()), + (20, 20, 15, 19, CURDATE()), + (21, 21, 16, 19, CURDATE()); INSERT INTO `vn`.`vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk`, `warehouseFk`, `description`, `m3`, `isActive`) VALUES @@ -631,12 +631,12 @@ INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`) ( 4, 4), ( 5, 6); -INSERT INTO `vn`.`travel`(`id`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `m3`, `kg`) +INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `m3`, `kg`) VALUES - ( 1, CURDATE(), 1, 2, 1, 100.00, 1000), - ( 2, CURDATE(), 1, 2, 1, 150, 2000), - ( 3, CURDATE(), 1, 2, 1, 0.00, 0.00), - ( 4, CURDATE(), 1, 2, 1, 50.00, 500); + ( 1, CURDATE(), CURDATE(), 1, 2, 1, 100.00, 1000), + ( 2, CURDATE(), CURDATE(), 1, 2, 1, 150, 2000), + ( 3, CURDATE(), CURDATE(), 1, 2, 1, 0.00, 0.00), + ( 4, CURDATE(), CURDATE(), 1, 2, 1, 50.00, 500); INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `companyFk`) VALUES @@ -674,4 +674,14 @@ INSERT INTO `bi`.`claims_ratio`(`id_Cliente`, `Consumo`, `Reclamaciones`, `Ratio ( 101, 500, NULL, 0.00, 0.00, 1.00), ( 102, 1000, 2.00, 0.01, 0.05, 1.00), ( 103, 2000, 0.00, 0.00, 0.02, 1.00), - ( 104, 2500, 150.00, 0.02, 0.10, 1.00); \ No newline at end of file + ( 104, 2500, 150.00, 0.02, 0.10, 1.00); + +INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packageFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`,`minPrice`,`producer`,`printedStickers`,`isChecked`,`isIgnored`) + VALUES + (1, 1, 1, 2.5, 4, 1, 1, 0.350, 0.050, 0.000, 1, 1, 1, NULL, 1.50, 1.25, 1.30, 2.00, NULL, 0, 1, 0), + (2, 2, 2, 5, 2, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2, 1.00, 1.30, 2.00, NULL, 0, 1, 0), + (3, 3, 3, 10, 1, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2.50, 1.00, 2.50, 2.00, NULL, 0, 1, 0); + +INSERT INTO `vn2008`.`tblContadores`(`id`,`FechaInventario`) + VALUES + (1,CURDATE()); \ No newline at end of file diff --git a/services/item/common/models/warehouse.json b/services/item/common/models/warehouse.json deleted file mode 100644 index d52991ed6..000000000 --- a/services/item/common/models/warehouse.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "Warehouse", - "base": "VnModel", - "options": { - "mysql": { - "table": "warehouse", - "database": "vn" - } - }, - "properties": { - "id": { - "type": "Number", - "id": true, - "description": "Identifier" - }, - "name": { - "type": "String", - "required": true - } - }, - "acls": [ - { - "accessType": "READ", - "principalType": "ROLE", - "principalId": "$everyone", - "permission": "ALLOW" - } - ] - } diff --git a/services/loopback/common/locale/en.json b/services/loopback/common/locale/en.json index 117e45e79..cb55ef678 100644 --- a/services/loopback/common/locale/en.json +++ b/services/loopback/common/locale/en.json @@ -17,5 +17,6 @@ "The IBAN does not have the correct format": "The IBAN does not have the correct format", "That payment method requires an IBAN": "That payment method requires an IBAN", "State cannot be blank": "State cannot be blank", - "Cannot change the payment method if no salesperson": "Cannot change the payment method if no salesperson" + "Cannot change the payment method if no salesperson": "Cannot change the payment method if no salesperson", + "Observation type cannot be blank": "Observation type cannot be blank" } \ No newline at end of file diff --git a/services/loopback/common/locale/es.json b/services/loopback/common/locale/es.json index caf866ca5..35e24433b 100644 --- a/services/loopback/common/locale/es.json +++ b/services/loopback/common/locale/es.json @@ -18,6 +18,10 @@ "That payment method requires an IBAN": "El método de pago seleccionado requiere que se especifique el IBAN", "State cannot be blank": "El estado no puede estar en blanco", "Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado", - "EXPIRED_DATE": "EXPIRED_DATE", + "can't be blank": "El campo no puede estar vacío", + "Observation type cannot be blank": "El tipo de observación no puede estar en blanco", + "Observation type must be unique": "El tipo de observación no puede repetirse", + "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero", + "The grade must be similar to the last one": "El grade debe ser similar al último", "NO_AGENCY_AVAILABLE": "NO_AGENCY_AVAILABLE" } \ No newline at end of file diff --git a/services/loopback/common/methods/client/createWithUser.js b/services/loopback/common/methods/client/createWithUser.js index 59aa2c8e8..9b56d7c29 100644 --- a/services/loopback/common/methods/client/createWithUser.js +++ b/services/loopback/common/methods/client/createWithUser.js @@ -40,6 +40,7 @@ module.exports = function(Self) { street: data.street, city: data.city, provinceFk: data.provinceFk, + countryFk: data.countryFk, isEqualizated: data.isEqualizated }; newClient = await Self.create(client); diff --git a/services/loopback/common/methods/client/filter.js b/services/loopback/common/methods/client/filter.js deleted file mode 100644 index bb1288630..000000000 --- a/services/loopback/common/methods/client/filter.js +++ /dev/null @@ -1,61 +0,0 @@ -module.exports = function(Client) { - Client.installMethod('filter', filterClients); - - function filterClients(params) { - let filters = { - where: {}, - skip: (params.page - 1) * params.size, - limit: params.size - }; - - delete params.page; - delete params.size; - - if (params.search) { - filters.where.and = [ - { - or: [ - {id: params.search}, - {name: {regexp: params.search}} - ] - } - ]; - delete params.search; - } - - if (params.phone) { - let phones = [ - {phone: params.phone}, - {mobile: params.phone} - ]; - if (filters.where.and) { - filters.where.and.push( - { - or: phones - } - ); - } else { - filters.where.or = phones; - } - delete params.phone; - } - - let properties = Object.keys(params); - if (properties.length) { - properties.forEach( - property => { - let propertyToBeEqual = (property === 'postcode' || property === 'fi' || property === 'id'); - if (filters.where.and) { - let filter = {}; - filter[property] = propertyToBeEqual ? params[property] : {regexp: params[property]}; - filters.where.and.push(filter); - } else { - filters.where[property] = propertyToBeEqual ? params[property] : {regexp: params[property]}; - } - } - ); - } - - return filters; - } -}; diff --git a/services/loopback/common/methods/item-tag/crudItemTags.js b/services/loopback/common/methods/item-tag/crudItemTags.js deleted file mode 100644 index 4a9702327..000000000 --- a/services/loopback/common/methods/item-tag/crudItemTags.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = Self => { - Self.installCrudModel('crudItemTags'); -}; diff --git a/services/loopback/common/methods/item/clone.js b/services/loopback/common/methods/item/clone.js index 4846a4825..0919fa602 100644 --- a/services/loopback/common/methods/item/clone.js +++ b/services/loopback/common/methods/item/clone.js @@ -47,9 +47,10 @@ module.exports = Self => { FROM vn.itemBotanical ib WHERE itemFk = ?`; promises.push(Self.rawSql(createBotanical, [newItem.id, origin.id])); - let createTags = `INSERT INTO vn.itemTag (itemFk, tagFk, value, priority) - SELECT ?, tagFk, value, priority - FROM vn.itemTag WHERE itemFk = ?`; + let createTags = `INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT ?, i.tagFk, i.value,i.priority + FROM vn.itemTag i WHERE i.itemFk = ? + ON DUPLICATE KEY UPDATE value = i.value, priority = i.priority`; promises.push(Self.rawSql(createTags, [newItem.id, origin.id])); let createTax = `REPLACE INTO vn.itemTaxCountry (itemFk, countryFk, taxClassFk) diff --git a/services/loopback/common/methods/item/filter.js b/services/loopback/common/methods/item/filter.js deleted file mode 100644 index 3f2273f97..000000000 --- a/services/loopback/common/methods/item/filter.js +++ /dev/null @@ -1,62 +0,0 @@ -module.exports = Self => { - Self.installMethod('filter', filterParams); - - function filterParams(params) { - let filter = { - where: {}, - skip: (params.page - 1) * params.size, - limit: params.size, - order: params.order || 'name ASC', // name, relevancy DESC - include: [ - {relation: 'itemType', - scope: { - fields: ['name', 'workerFk'], - include: { - relation: 'worker', - fields: ['firstName', 'name'] - } - } - }, - {relation: 'origin'}, - {relation: 'ink'}, - {relation: 'producer'}, - {relation: 'intrastat'}, - {relation: 'expence'} - ] - }; - - delete params.page; - delete params.size; - delete params.order; - - if (params.search) { - filter.where.and = [ - { - or: [ - {id: params.search}, - {name: {regexp: params.search}} - ] - } - ]; - delete params.search; - } - - if (params.itemSize) { - params.size = params.itemSize; - delete params.itemSize; - } - - Object.keys(params).forEach( - key => { - if (filter.where.and) { - let filter = {}; - filter[key] = (key === 'description' || key === 'name') ? {regexp: params[key]} : params[key]; - filter.where.and.push(filter); - } else { - filter.where[key] = (key === 'description' || key === 'name') ? {regexp: params[key]} : params[key]; - } - } - ); - return filter; - } -}; diff --git a/services/loopback/common/methods/item/getDiary.js b/services/loopback/common/methods/item/getDiary.js new file mode 100644 index 000000000..df4176713 --- /dev/null +++ b/services/loopback/common/methods/item/getDiary.js @@ -0,0 +1,24 @@ +module.exports = Self => { + Self.remoteMethod('getDiary', { + description: 'Returns the ', + accessType: 'READ', + accepts: [{ + arg: 'params', + type: 'object', + description: 'itemFk, warehouseFk' + }], + returns: { + arg: 'diary', + root: true + }, + http: { + path: `/getDiary`, + verb: 'GET' + } + }); + + Self.getDiary = async params => { + let [diary] = await Self.rawSql(`CALL vn.itemDiary(?, ?)`, [params.itemFk, params.warehouseFk]); + return diary; + }; +}; diff --git a/services/loopback/common/methods/message/send.js b/services/loopback/common/methods/message/send.js index 0a918a1d2..b7bf00965 100644 --- a/services/loopback/common/methods/message/send.js +++ b/services/loopback/common/methods/message/send.js @@ -31,7 +31,7 @@ module.exports = Self => { } }); - Self.send = async (recipient, data, ctx) => { + Self.send = async(recipient, data, ctx) => { let query = `SELECT vn.messageSendWithUser(?, ?, ?) AS sent`; let [result] = await Self.rawSql(query, [ctx.req.accessToken.userId, recipient, data.message]); diff --git a/services/loopback/common/methods/sale/moveToTicket.js b/services/loopback/common/methods/sale/moveToTicket.js new file mode 100644 index 000000000..45b7f49df --- /dev/null +++ b/services/loopback/common/methods/sale/moveToTicket.js @@ -0,0 +1,35 @@ +module.exports = Self => { + Self.remoteMethod('moveToTicket', { + description: 'Change the state of a ticket', + accessType: '', + accepts: [{ + arg: 'params', + type: 'object', + required: true, + description: '[sales IDs], newTicketFk, actualTicketFk', + http: {source: 'body'} + }], + returns: { + type: 'string', + root: true + }, + http: { + path: `/moveToTicket`, + verb: 'post' + } + }); + + Self.moveToTicket = async params => { + let thisTicketIsEditable = await Self.app.models.Ticket.isEditable(params.actualTicketFk); + if (!thisTicketIsEditable) + throw new Error(`The sales of this ticket can't be modified`); + + let newTicketIsEditable = await Self.app.models.Ticket.isEditable(params.newTicketFk); + if (!newTicketIsEditable) + throw new Error(`The sales of this 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/sale/priceDifference.js b/services/loopback/common/methods/sale/priceDifference.js index 707bef883..b6f4855dd 100644 --- a/services/loopback/common/methods/sale/priceDifference.js +++ b/services/loopback/common/methods/sale/priceDifference.js @@ -25,7 +25,7 @@ module.exports = Self => { } }); - Self.priceDifference = async (ticketFk, data) => { + Self.priceDifference = async(ticketFk, data) => { let filter = { where: { ticketFk: ticketFk @@ -57,8 +57,14 @@ module.exports = Self => { salesObj.totalNewPrice = 0.00; salesObj.totalDifference = 0.00; - let query = `CALL vn.ticketComponentPriceDifference(?, ?, ?, ?)`; - let [differences] = await Self.rawSql(query, [data.landed, data.addressFk, data.agencyModeFk, ticketFk]); + let query = `CALL vn.ticketComponentPriceDifference(?, ?, ?, ?, ?)`; + let [differences] = await Self.rawSql(query, [ + ticketFk, + data.landed, + data.addressFk, + data.agencyModeFk, + data.warehouseFk + ]); salesObj.items.forEach(sale => { differences.forEach(difference => { diff --git a/services/loopback/common/methods/sale/removes.js b/services/loopback/common/methods/sale/removes.js new file mode 100644 index 000000000..24c8e7783 --- /dev/null +++ b/services/loopback/common/methods/sale/removes.js @@ -0,0 +1,31 @@ +module.exports = Self => { + Self.remoteMethod('removes', { + description: 'Change the state of a ticket', + accessType: '', + accepts: [{ + arg: 'params', + type: 'object', + required: true, + description: '[sales IDs], actualTicketFk', + http: {source: 'body'} + }], + returns: { + type: 'string', + root: true + }, + http: { + path: `/removes`, + verb: 'post' + } + }); + + Self.removes = async params => { + let thisTicketIsEditable = await Self.app.models.Ticket.isEditable(params.actualTicketFk); + if (!thisTicketIsEditable) + throw new Error(`The sales of this ticket can't be modified`); + + for (let i = 0; i < params.sales.length; i++) { + await Self.app.models.Sale.destroyById(params.sales[i].id); + } + }; +}; diff --git a/services/loopback/common/methods/sale/specs/priceDifference.spec.js b/services/loopback/common/methods/sale/specs/priceDifference.spec.js index 387a8da56..bf65a8de6 100644 --- a/services/loopback/common/methods/sale/specs/priceDifference.spec.js +++ b/services/loopback/common/methods/sale/specs/priceDifference.spec.js @@ -5,7 +5,8 @@ describe('sale priceDifference()', () => { let data = { landed: Date.now(), addressFk: 121, - agencyModeFk: 1 + agencyModeFk: 1, + warehouseFk: 1 }; app.models.Sale.priceDifference(1, data) .catch(response => { diff --git a/services/loopback/common/methods/ticket/componentUpdate.js b/services/loopback/common/methods/ticket/componentUpdate.js index 284b5baf3..712bd47ae 100644 --- a/services/loopback/common/methods/ticket/componentUpdate.js +++ b/services/loopback/common/methods/ticket/componentUpdate.js @@ -12,8 +12,14 @@ module.exports = Self => { arg: 'data', type: 'Object', required: true, - description: 'landed, addressFk, agencyModeFk', + description: 'landed, addressFk, agencyModeFk, warehouseFk', http: {source: 'body'} + }, { + arg: 'context', + type: 'object', + http: function(ctx) { + return ctx; + } }], returns: { type: ['Object'], @@ -25,16 +31,24 @@ module.exports = Self => { } }); - Self.componentUpdate = async (ticketFk, data) => { - let query = 'CALL vn.ticketComponentMakeUpdate(?, ?, ?, ?, ?, ?, ?, ?)'; + Self.componentUpdate = async(ticketFk, data, ctx) => { + let userId = ctx.req.accessToken.userId; + let hasDeliveryRole = await Self.app.models.Account.hasRole(userId, 'delivery'); + + if (!hasDeliveryRole) + data.hasToBeUnrouted = true; + + let query = 'CALL vn.ticketComponentMakeUpdate(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'; let res = await Self.rawSql(query, [ - ticketFk, - data.agencyModeFk, - data.addressFk, - data.warehouseFk, - data.shipped, + ticketFk, + data.clientFk, + data.agencyModeFk, + data.addressFk, + data.warehouseFk, + data.shipped, data.landed, data.isDeleted, + data.hasToBeUnrouted, data.option ]); return res; diff --git a/services/loopback/common/methods/ticket/deleted.js b/services/loopback/common/methods/ticket/deleted.js new file mode 100644 index 000000000..36bffaf95 --- /dev/null +++ b/services/loopback/common/methods/ticket/deleted.js @@ -0,0 +1,25 @@ +module.exports = Self => { + Self.remoteMethod('deleted', { + description: 'Sets the isDeleted value of a ticket to 1', + accessType: '', + accepts: [{ + arg: 'ticketFk', + type: 'Object', + required: true, + description: 'TicketFk', + http: {source: 'body'} + }], + returns: { + type: 'string', + root: true + }, + http: { + path: `/deleted`, + verb: 'post' + } + }); + + Self.deleted = async params => { + return await Self.app.models.Ticket.update({id: params.id}, {isDeleted: '1'}); + }; +}; diff --git a/services/loopback/common/methods/ticket/filter.js b/services/loopback/common/methods/ticket/filter.js deleted file mode 100644 index 8c0ba8c52..000000000 --- a/services/loopback/common/methods/ticket/filter.js +++ /dev/null @@ -1,87 +0,0 @@ -module.exports = Self => { - Self.installMethod('filter', filterParams); - - function filterParams(params) { - let filters = { - where: {}, - skip: (params.page - 1) * params.size, - limit: params.size, - order: params.order || 'created DESC', - include: [ - { - relation: 'address', - scope: { - fields: ['provinceFk'], - include: { - relation: 'province', - scope: { - fields: ['name'] - } - } - } - }, { - relation: 'warehouse', - scope: { - fields: ['name'] - } - }, { - relation: 'agencyMode', - scope: { - fields: ['name'] - } - }, { - relation: 'tracking', - scope: { - fields: ['stateFk'], - include: { - relation: 'state', - scope: { - fields: ['name'] - } - } - } - }, { - relation: 'client', - scope: { - fields: ['salesPersonFk'], - include: { - relation: 'salesPerson', - scope: { - fields: ['name'] - } - } - } - } - ] - }; - - delete params.page; - delete params.size; - delete params.order; - - if (params.search) { - filters.where.and = [ - { - or: [ - {id: params.search}, - {name: {regexp: params.search}} - ] - } - ]; - delete params.search; - } - - Object.keys(params).forEach( - key => { - if (filters.where.and) { - let filter = {}; - filter[key] = (key === 'nickname') ? {regexp: params[key]} : params[key]; - filters.where.and.push(filter); - } else { - filters.where[key] = (key === 'nickname') ? {regexp: params[key]} : params[key]; - } - } - ); - return filters; - } -}; diff --git a/services/loopback/common/methods/ticket/getTaxes.js b/services/loopback/common/methods/ticket/getTaxes.js index 4ca66f72d..151866eff 100644 --- a/services/loopback/common/methods/ticket/getTaxes.js +++ b/services/loopback/common/methods/ticket/getTaxes.js @@ -25,4 +25,4 @@ module.exports = Self => { return taxes; }; -}; \ No newline at end of file +}; diff --git a/services/loopback/common/methods/ticket/getTotal.js b/services/loopback/common/methods/ticket/getTotal.js index b743de090..8e342cf5d 100644 --- a/services/loopback/common/methods/ticket/getTotal.js +++ b/services/loopback/common/methods/ticket/getTotal.js @@ -25,4 +25,4 @@ module.exports = Self => { return total.amount ? total.amount : 0.00; }; -}; \ No newline at end of file +}; diff --git a/services/loopback/common/methods/ticket/isEditable.js b/services/loopback/common/methods/ticket/isEditable.js index 149a87ee1..a3968a315 100644 --- a/services/loopback/common/methods/ticket/isEditable.js +++ b/services/loopback/common/methods/ticket/isEditable.js @@ -21,7 +21,7 @@ module.exports = Self => { Self.isEditable = async ticketFk => { let state = await Self.app.models.TicketState.findOne({where: {ticketFk: ticketFk}, fields: 'alertLevel'}); - - return state != null && state.alertLevel == 0; + let exists = await Self.app.models.Ticket.findOne({where: {id: ticketFk}, fields: 'isDeleted'}); + return (exists && state == null && exists.isDeleted == 0) || (exists.isDeleted == 0 && state.alertLevel == 0); }; }; diff --git a/services/loopback/common/methods/ticket/specs/componentUpdate.spec.js b/services/loopback/common/methods/ticket/specs/componentUpdate.spec.js index bcef7e79a..6634708ec 100644 --- a/services/loopback/common/methods/ticket/specs/componentUpdate.spec.js +++ b/services/loopback/common/methods/ticket/specs/componentUpdate.spec.js @@ -4,13 +4,15 @@ describe('ticket componentUpdate()', () => { it('should call the componentUpdate method', done => { let data = { agencyModeFk: 1, - addressFk: 121, + addressFk: 121, warehouseFk: 1, shipped: Date.now(), landed: Date.now(), + hasToBeUnrouted: true, option: 1 }; - app.models.Ticket.componentUpdate(1, data) + let ctx = {req: {accessToken: {userId: 101}}}; + app.models.Ticket.componentUpdate(1, data, ctx) .catch(response => { expect(response).toEqual(new Error('ER_SIGNAL_EXCEPTION: NO_AGENCY_AVAILABLE')); done(); diff --git a/services/loopback/common/methods/ticket/threeLastActive.js b/services/loopback/common/methods/ticket/threeLastActive.js new file mode 100644 index 000000000..9ec1390ca --- /dev/null +++ b/services/loopback/common/methods/ticket/threeLastActive.js @@ -0,0 +1,35 @@ +module.exports = Self => { + Self.remoteMethod('threeLastActive', { + description: 'Returns the last three tickets of a client that have the alertLevel at 0 and the shiped day is gt today', + accessType: '', + accepts: [{ + arg: 'filter', + type: 'object', + required: true, + description: 'client id, ticketFk' + }], + returns: { + type: [this.modelName], + root: true + }, + http: { + path: `/threeLastActive`, + verb: 'GET' + } + }); + + 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 + JOIN vn.ticketState ts ON t.id = ts.ticketFk + JOIN vn.agencyMode a ON t.agencyModeFk = a.id + JOIN vn.warehouse w ON t.warehouseFk = w.id + WHERE t.shipped > CURDATE() AND t.clientFk = ? AND ts.alertLevel = 0 AND t.id <> ? + ORDER BY t.shipped + LIMIT 3`; + let result = await Self.rawSql(query, [filter.clientFk, filter.ticketFk]); + return result; + }; +}; diff --git a/services/loopback/common/methods/vnModel/installMethod.js b/services/loopback/common/methods/vn-model/installMethod.js similarity index 100% rename from services/loopback/common/methods/vnModel/installMethod.js rename to services/loopback/common/methods/vn-model/installMethod.js diff --git a/services/loopback/common/methods/vnModel/rawSql.js b/services/loopback/common/methods/vn-model/rawSql.js similarity index 100% rename from services/loopback/common/methods/vnModel/rawSql.js rename to services/loopback/common/methods/vn-model/rawSql.js diff --git a/services/loopback/common/methods/vnModel/specs/installCrudModel.spec.js b/services/loopback/common/methods/vn-model/specs/installCrudModel.spec.js similarity index 100% rename from services/loopback/common/methods/vnModel/specs/installCrudModel.spec.js rename to services/loopback/common/methods/vn-model/specs/installCrudModel.spec.js diff --git a/services/loopback/common/methods/vnModel/validateBinded.js b/services/loopback/common/methods/vn-model/validateBinded.js similarity index 100% rename from services/loopback/common/methods/vnModel/validateBinded.js rename to services/loopback/common/methods/vn-model/validateBinded.js diff --git a/services/loopback/common/methods/vnModel/installCrudModel.js b/services/loopback/common/methods/vnModel/installCrudModel.js deleted file mode 100644 index 4ab6f6d1d..000000000 --- a/services/loopback/common/methods/vnModel/installCrudModel.js +++ /dev/null @@ -1,46 +0,0 @@ -module.exports = function(Self) { - Self.installCrudModel = function(methodName) { - let Model = this; - Model.remoteMethod(methodName, { - description: 'create, update or delete model', - accessType: 'WRITE', - accepts: [ - { - arg: 'crudStruct', - type: 'Object', - require: true, - description: 'object with instances of model to create, update or delete, Example: {create: [], update: [], delete: []}', - http: {source: 'body'} - } - ], - http: { - path: `/${methodName}`, - verb: 'post' - } - }); - Model[methodName] = async crudObject => { - let promises = []; - let transaction = await Model.beginTransaction({}); - let options = {transaction: transaction}; - - try { - if (crudObject.delete && crudObject.delete.length) { - promises.push(Model.destroyAll({id: {inq: crudObject.delete}}, options)); - } - if (crudObject.create && crudObject.create.length) { - promises.push(Model.create(crudObject.create, options)); - } - if (crudObject.update) { - crudObject.update.forEach(toUpdate => { - promises.push(Model.upsert(toUpdate, options)); - }); - } - await Promise.all(promises); - await transaction.commit(); - } catch (error) { - await transaction.rollback(); - throw Array.isArray(error) ? error[0] : error; - } - }; - }; -}; diff --git a/services/loopback/common/models/client.js b/services/loopback/common/models/client.js index 667916de4..762cbe2f5 100644 --- a/services/loopback/common/models/client.js +++ b/services/loopback/common/models/client.js @@ -10,7 +10,6 @@ module.exports = Self => { require('../methods/client/card')(Self); require('../methods/client/createWithUser')(Self); require('../methods/client/listWorkers')(Self); - require('../methods/client/filter')(Self); require('../methods/client/hasCustomerRole')(Self); require('../methods/client/isValidClient')(Self); require('../methods/client/activeSalesPerson')(Self); diff --git a/services/loopback/common/models/item-tag.js b/services/loopback/common/models/item-tag.js index ad237ab3f..61bd7af6b 100644 --- a/services/loopback/common/models/item-tag.js +++ b/services/loopback/common/models/item-tag.js @@ -1,4 +1,3 @@ module.exports = Self => { - require('../methods/item-tag/crudItemTags')(Self); require('../methods/item-tag/filterItemTags')(Self); }; diff --git a/services/loopback/common/models/item.js b/services/loopback/common/models/item.js index 1186c5ce3..5763f58d4 100644 --- a/services/loopback/common/models/item.js +++ b/services/loopback/common/models/item.js @@ -1,9 +1,9 @@ let UserError = require('../helpers').UserError; module.exports = Self => { - require('../methods/item/filter')(Self); require('../methods/item/clone')(Self); require('../methods/item/updateTaxes')(Self); + require('../methods/item/getDiary')(Self); Self.validatesPresenceOf('name', {message: 'Cannot be blank'}); Self.validatesPresenceOf('originFk', {message: 'Cannot be blank'}); diff --git a/services/loopback/common/models/sale.js b/services/loopback/common/models/sale.js index 755cd432e..2d2aa22f5 100644 --- a/services/loopback/common/models/sale.js +++ b/services/loopback/common/models/sale.js @@ -3,4 +3,9 @@ module.exports = Self => { require('../methods/sale/saleComponentFilter')(Self); require('../methods/sale/priceDifference')(Self); require('../methods/sale/crudSale')(Self); + require('../methods/sale/moveToTicket')(Self); + require('../methods/sale/removes')(Self); +// require('../methods/sale/updateDiscount')(Self); +// require('../methods/sale/updatePrice')(Self); +// require('../methods/sale/updateQuantity')(Self); }; diff --git a/services/loopback/common/models/ticket.js b/services/loopback/common/models/ticket.js index a2897354c..a0a99a7ca 100644 --- a/services/loopback/common/models/ticket.js +++ b/services/loopback/common/models/ticket.js @@ -1,11 +1,14 @@ module.exports = Self => { require('../methods/ticket/changeTime')(Self); require('../methods/ticket/changeWorker')(Self); - require('../methods/ticket/filter')(Self); require('../methods/ticket/getVolume')(Self); require('../methods/ticket/getTotalVolume')(Self); require('../methods/ticket/summary')(Self); require('../methods/ticket/getTotal')(Self); require('../methods/ticket/getTaxes')(Self); require('../methods/ticket/componentUpdate')(Self); +// require('../methods/ticket/create')(Self); + require('../methods/ticket/isEditable')(Self); + require('../methods/ticket/threeLastActive')(Self); + require('../methods/ticket/deleted')(Self); }; diff --git a/services/loopback/common/models/vn-model.js b/services/loopback/common/models/vn-model.js index abac75625..5d1f4b7be 100644 --- a/services/loopback/common/models/vn-model.js +++ b/services/loopback/common/models/vn-model.js @@ -1,8 +1,8 @@ module.exports = function(Self) { Self.setup = function() { Self.super_.setup.call(this); - - /* let disableMethods = { + /* + let disableMethods = { create: true, replaceOrCreate: true, patchOrCreate: true, @@ -22,7 +22,9 @@ module.exports = function(Self) { }; for (let method in disableMethods) { // this.disableRemoteMethod(method, disableMethods[method]); - } */ + } + */ + this.installCrudModel('crud'); }; Self.defineScope = function(serverFilter) { @@ -116,8 +118,51 @@ module.exports = function(Self) { }; }; - require('../methods/vnModel/rawSql')(Self); - require('../methods/vnModel/installMethod')(Self); - require('../methods/vnModel/validateBinded')(Self); - require('../methods/vnModel/installCrudModel')(Self); + Self.installCrudModel = function(methodName) { + this.remoteMethod(methodName, { + description: 'Create, update or/and delete instances from model in a single request', + accessType: 'WRITE', + accepts: [ + { + arg: 'actions', + type: 'Object', + require: true, + description: 'Instances to update, example: {create: [instances], update: [instances], delete: [ids]}', + http: {source: 'body'} + } + ], + http: { + path: `/${methodName}`, + verb: 'POST' + } + }); + this[methodName] = async actions => { + let promises = []; + let transaction = await this.beginTransaction({}); + let options = {transaction: transaction}; + + try { + if (actions.delete && actions.delete.length) { + promises.push(this.destroyAll({id: {inq: actions.delete}}, options)); + } + if (actions.create && actions.create.length) { + promises.push(this.create(actions.create, options)); + } + if (actions.update) { + actions.update.forEach(toUpdate => { + promises.push(this.upsert(toUpdate, options)); + }); + } + await Promise.all(promises); + await transaction.commit(); + } catch (error) { + await transaction.rollback(); + throw Array.isArray(error) ? error[0] : error; + } + }; + }; + + require('../methods/vn-model/rawSql')(Self); + require('../methods/vn-model/installMethod')(Self); + require('../methods/vn-model/validateBinded')(Self); }; diff --git a/services/loopback/server/server.js b/services/loopback/server/server.js index 294500854..012dd21b7 100644 --- a/services/loopback/server/server.js +++ b/services/loopback/server/server.js @@ -75,7 +75,7 @@ function vnBoot(app, rootDir, rootModule) { let packageJson = require(`${rootDir}/../package.json`); let appName = packageJson.name; let baseUrl = app.get('url').replace(/\/$/, ''); - console.log(`Web server ${appName} listening at: %s`, baseUrl); + console.log(`Web server ${appName} listening at: %s`, `${baseUrl}/explorer`); } let args = port ? [port, onListen] : [onListen];