diff --git a/back/model-config.json b/back/model-config.json index 7a7b7af56..0a0772b04 100644 --- a/back/model-config.json +++ b/back/model-config.json @@ -38,7 +38,7 @@ "Vehicle": { "dataSource": "vn" }, - "UserTableConfiguration": { + "UserConfigView": { "dataSource": "vn" } } diff --git a/back/models/user-table-configuration.json b/back/models/user-config-view.json similarity index 71% rename from back/models/user-table-configuration.json rename to back/models/user-config-view.json index 084d64e27..1cb933079 100644 --- a/back/models/user-table-configuration.json +++ b/back/models/user-config-view.json @@ -1,9 +1,9 @@ { - "name": "UserTableConfiguration", + "name": "UserConfigView", "base": "VnModel", "options": { "mysql": { - "table": "salix.userTableConfiguration" + "table": "salix.userConfigView" } }, "properties": { @@ -21,10 +21,10 @@ } }, "relations": { - "worker": { + "user": { "type": "belongsTo", - "model": "Worker", - "foreignKey": "workerFk" + "model": "Account", + "foreignKey": "userFk" } } } diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index b3b937f48..bc0135e40 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -164,7 +164,7 @@ export default { newPaymentButton: `${components.vnFloatButton}`, newPaymentBankInut: `vn-client-risk-create vn-textfield[field="$ctrl.receipt.bankFk"] input`, newPaymentAmountInput: `vn-client-risk-create vn-textfield[field="$ctrl.receipt.amountPaid"] input`, - saveButton: `${components.vnSubmit}`, + saveButton: `vn-client-risk-create vn-button[label="Save"]`, firstRiskLineBalance: 'vn-client-risk-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)' }, diff --git a/front/core/components/dialog/dialog.js b/front/core/components/dialog/dialog.js index fb904f2f0..7ea588a27 100644 --- a/front/core/components/dialog/dialog.js +++ b/front/core/components/dialog/dialog.js @@ -47,9 +47,6 @@ export default class Dialog extends Component { if (this.onOpen) this.onOpen(); - - let firstFocusable = this.element.querySelector('input, textarea'); - if (firstFocusable) firstFocusable.focus(); } /** diff --git a/front/salix/styles/index.js b/front/salix/styles/index.js index 6149668b8..7f919436a 100644 --- a/front/salix/styles/index.js +++ b/front/salix/styles/index.js @@ -13,3 +13,4 @@ import './effects.scss'; import './order-product.scss'; import './summary.scss'; import './descriptor.scss'; +import './modal-form.scss'; diff --git a/front/salix/styles/modal-form.scss b/front/salix/styles/modal-form.scss new file mode 100644 index 000000000..e353833e6 --- /dev/null +++ b/front/salix/styles/modal-form.scss @@ -0,0 +1,38 @@ +@import 'colors'; +@import "./padding"; + +vn-dialog.modal-form { + vn-horizontal.header{ + @extend .pad-small; + background-color: $main-01; + h5{ + color: white; + margin: 0 auto; + } + } + tpl-body { + width: 100%; + } + table { + width: 100% + } + & > div{ + padding: 0!important; + } + vn-textfield { + width: 100%; + } + .buttons{ + margin-top: 0!important; + } + + p{ + display: none; + } + button.close > vn-icon{ + color: white!important; + } + vn-ticket-sale-edit-discount > div { + padding-bottom: 0!important; + } +} \ No newline at end of file diff --git a/modules/client/front/risk/create/index.html b/modules/client/front/risk/create/index.html index 095d16986..950d54a52 100644 --- a/modules/client/front/risk/create/index.html +++ b/modules/client/front/risk/create/index.html @@ -1,44 +1,45 @@ - - - -
- - - - - - + + + + +
New payment
 - - - - - +
+ + + + + + + + + + + + +
+ + + - - - - - -
\ No newline at end of file + + \ No newline at end of file diff --git a/modules/client/front/risk/create/index.js b/modules/client/front/risk/create/index.js index a828d7264..11e701791 100644 --- a/modules/client/front/risk/create/index.js +++ b/modules/client/front/risk/create/index.js @@ -1,11 +1,13 @@ import ngModule from '../../module'; +import './style.scss'; class Controller { - constructor($scope, $state, $http, $stateParams) { + constructor($scope, $state, $http, vnApp, $translate) { this.$http = $http; this.$ = $scope; this.$state = $state; - this.$stateParams = $stateParams; + this.vnApp = vnApp; + this.$translate = $translate; this.receipt = { payed: new Date(), @@ -13,21 +15,26 @@ class Controller { companyFk: window.localStorage.defaultCompanyFk, bankFk: window.localStorage.defaultBankFk }; - - if (this.$stateParams.payed) - this.receipt.payed = this.$stateParams.payed; - - if (this.$stateParams.bankFk) - this.receipt.bankFk = this.$stateParams.bankFk; - - if (this.$stateParams.amountPaid) - this.receipt.amountPaid = this.$stateParams.amountPaid; - - if (this.$stateParams.companyFk) - this.receipt.companyFk = this.$stateParams.companyFk; } - $onInit() { + set payed(value) { + this.receipt.payed = value; + } + + set bankFk(value) { + this.receipt.bankFk = value; + } + + set amountPaid(value) { + this.receipt.amountPaid = value; + } + + set companyFk(value) { + this.receipt.companyFk = value; + this.getAmountPaid(); + } + + getAmountPaid() { let filter = { where: { clientFk: this.$state.params.id, @@ -41,25 +48,34 @@ class Controller { }); } - cancel() { - this.goToIndex(); + show() { + this.$.dialog.show(); } - goToIndex() { - this.$state.go('client.card.risk.index'); + hide() { + this.$.dialog.hide(); } - onSubmit() { - this.$.watcher.submit().then( - () => { - this.goToIndex(); - } - ); + save() { + let query = `/client/api/receipts`; + this.$http.post(query, this.receipt).then(() => { + this.vnApp.showSuccess(this.$translate.instant('Data saved!')); + this.hide(); + if (this.onResponse) + this.onResponse(); + }); } } -Controller.$inject = ['$scope', '$state', '$http', '$stateParams']; +Controller.$inject = ['$scope', '$state', '$http', 'vnApp', '$translate']; ngModule.component('vnClientRiskCreate', { template: require('./index.html'), - controller: Controller + controller: Controller, + bindings: { + payed: ' - - - - + fixed-bottom-right + ng-click="$ctrl.openCreateDialog()"> + + + + \ No newline at end of file diff --git a/modules/client/front/risk/index/index.js b/modules/client/front/risk/index/index.js index 14c1be3b7..6feea8b96 100644 --- a/modules/client/front/risk/index/index.js +++ b/modules/client/front/risk/index/index.js @@ -31,6 +31,9 @@ class Controller { setOrder(value) { this.params.params.companyFk = value; this.filter.where.companyFk = value; + } + + refresh() { this.$.model.refresh(); this.$.riskModel.refresh(); } @@ -55,6 +58,14 @@ class Controller { return this._risks; } + openCreateDialog() { + this.$.riskCreateDialog.companyFk = this.companyFk; + this.$.riskCreateDialog.onResponse = () => { + this.refresh(); + }; + this.$.riskCreateDialog.show(); + } + onDownload() { alert('Not implemented yet'); } diff --git a/modules/client/front/sample/create/style.scss b/modules/client/front/sample/create/style.scss index eecc8ad09..a958e264b 100644 --- a/modules/client/front/sample/create/style.scss +++ b/modules/client/front/sample/create/style.scss @@ -5,7 +5,32 @@ vn-client-sample-create { } tpl-body { - min-width: 800px + min-width: 800px; + + .container, .container h1 { + font-family: "Roboto","Helvetica","Arial",sans-serif; + font-size: 1em !important; + + h1 { + font-weight: bold; + margin: auto + } + + p { + margin: 1em 0 + } + + footer p { + font-size: 10px !important; + line-height: 10px + } + } + + + .title h1 { + font-size: 2em !important; + margin: 0 + } } } } \ No newline at end of file diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html index 7e76d2cb0..56f64c3aa 100644 --- a/modules/item/front/descriptor/index.html +++ b/modules/item/front/descriptor/index.html @@ -46,7 +46,7 @@
{{$ctrl.item.id}}
+ value="{{$ctrl.item.name}}"> diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html index 210bb88b1..bca5b8177 100644 --- a/modules/item/front/last-entries/index.html +++ b/modules/item/front/last-entries/index.html @@ -39,7 +39,7 @@ diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html index 6575b2a0b..c74dc36f9 100644 --- a/modules/item/front/summary/index.html +++ b/modules/item/front/summary/index.html @@ -36,7 +36,7 @@ value="{{$ctrl.summary.item.origin.name}}"> + value="{{$ctrl.summary.item.stems}}"> diff --git a/modules/item/front/tags/index.js b/modules/item/front/tags/index.js index 2fc30e1ac..b187e5baf 100644 --- a/modules/item/front/tags/index.js +++ b/modules/item/front/tags/index.js @@ -67,6 +67,7 @@ class Controller { this.$scope.model.save().then(() => { this.$scope.watcher.notifySaved(); this.$scope.model.refresh(); + this.card.reload(); }); } } @@ -75,5 +76,8 @@ Controller.$inject = ['$stateParams', '$scope']; ngModule.component('vnItemTags', { template: require('./index.html'), - controller: Controller + controller: Controller, + require: { + card: '^vnItemCard' + } }); diff --git a/modules/item/front/ticket-descriptor/index.js b/modules/item/front/ticket-descriptor/index.js index 948994701..53f13eb1a 100644 --- a/modules/item/front/ticket-descriptor/index.js +++ b/modules/item/front/ticket-descriptor/index.js @@ -1,5 +1,4 @@ import ngModule from '../module'; -import './style.scss'; class Controller { constructor($state, $scope, $http, vnApp, $translate) { diff --git a/modules/order/back/methods/order/catalogFilter.js b/modules/order/back/methods/order/catalogFilter.js index 519c96267..7c609ec8d 100644 --- a/modules/order/back/methods/order/catalogFilter.js +++ b/modules/order/back/methods/order/catalogFilter.js @@ -37,7 +37,7 @@ module.exports = Self => { }, }); - Self.catalogFilter = async (orderFk, orderBy, filter, tags) => { + Self.catalogFilter = async(orderFk, orderBy, filter, tags) => { let conn = Self.dataSource.connector; const stmts = []; let stmt; diff --git a/modules/order/front/filter/index.html b/modules/order/front/filter/index.html index f4949c88a..f4c1c6390 100644 --- a/modules/order/front/filter/index.html +++ b/modules/order/front/filter/index.html @@ -19,9 +19,7 @@ - - {{::nickname}} + field="$ctrl.ticket.addressFk" + order="isActive DESC"> + + {{::isActive ? '' : 'INACTIVE'}} {{::nickname}} - {{::street}} - {{::city}} - {{::province.name}} - {{::agencyMode.name}} diff --git a/modules/ticket/front/data/step-one/index.js b/modules/ticket/front/data/step-one/index.js index 69d4f25c5..f3e8bf300 100644 --- a/modules/ticket/front/data/step-one/index.js +++ b/modules/ticket/front/data/step-one/index.js @@ -1,5 +1,6 @@ import ngModule from '../../module'; import {toJsonDate} from 'core/lib/date'; +import './style.scss'; class Controller { constructor($scope, $http, $translate, vnApp) { diff --git a/modules/ticket/front/data/step-one/style.scss b/modules/ticket/front/data/step-one/style.scss new file mode 100644 index 000000000..30c25c46a --- /dev/null +++ b/modules/ticket/front/data/step-one/style.scss @@ -0,0 +1,13 @@ +@import 'colors'; + +tpl-item{ + &.notActive { + background-color: $main-bg; + color: $secondary-font-color; + width: 100%; + } + + & > .inactive { + text-transform: uppercase; + } +} diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 066bac993..44c35263c 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -3,7 +3,7 @@ url="/ticket/api/Tickets/filter" limit="20" data="tickets" - order="shipped ASC" + order="shipped DESC" auto-load="false">
@@ -74,7 +74,12 @@ {{::ticket.agencyMode}} {{::ticket.warehouse}} {{::ticket.total | currency: 'EUR': 2}} - + + + { + this.goToTurns('ticket.weekly'); + }, name: 'Turns', always: true}, ]; if (!$stateParams.q) { @@ -42,6 +44,10 @@ export default class Controller { this.$.model.clear(); } + goToLines(ticketFk) { + this.$state.go('ticket.card.lines', {id: ticketFk}); + } + goToTurns() { this.$state.go('ticket.weekly'); } diff --git a/modules/ticket/front/tracking/index/index.html b/modules/ticket/front/tracking/index/index.html index 21ef5c176..c5a8c993b 100644 --- a/modules/ticket/front/tracking/index/index.html +++ b/modules/ticket/front/tracking/index/index.html @@ -34,6 +34,6 @@ - + \ No newline at end of file diff --git a/print/report/sepa-core/assets/css/style.css b/print/common/css/email.css similarity index 99% rename from print/report/sepa-core/assets/css/style.css rename to print/common/css/email.css index a197ee5cd..6b15fbcba 100644 --- a/print/report/sepa-core/assets/css/style.css +++ b/print/common/css/email.css @@ -37,4 +37,4 @@ body { font-size: 32px; color: #333; margin: 0 -} \ No newline at end of file +} diff --git a/print/common/css/layout.css b/print/common/css/layout.css index 216d9fcae..ee5a189d6 100644 --- a/print/common/css/layout.css +++ b/print/common/css/layout.css @@ -1,7 +1,6 @@ .container { - font-family: arial, sans-serif; - font-size: 16px; - zoom: 0.55 + font-family: "Roboto", "Helvetica", "Arial", sans-serif; + font-size: 16px } .columns { diff --git a/print/common/css/report.css b/print/common/css/report.css new file mode 100644 index 000000000..24b20c330 --- /dev/null +++ b/print/common/css/report.css @@ -0,0 +1,10 @@ +body { + zoom: 0.55 +} + +.title { + margin-bottom: 20px; + font-weight: 100; + margin-top: 0; + font-size: 2em +} \ No newline at end of file diff --git a/print/config/routes.json b/print/config/routes.json index 4fa82eea3..c8326effa 100644 --- a/print/config/routes.json +++ b/print/config/routes.json @@ -11,6 +11,7 @@ {"type": "report", "name": "rpt-claim-pickup-order"}, {"type": "report", "name": "rpt-letter-debtor"}, {"type": "report", "name": "rpt-sepa-core"}, + {"type": "report", "name": "rpt-informe"}, {"type": "static", "name": "email-header"}, {"type": "static", "name": "email-footer"}, {"type": "static", "name": "report-header"}, diff --git a/print/report/claim-pickup-order/assets/css/index.js b/print/report/claim-pickup-order/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/claim-pickup-order/assets/css/index.js +++ b/print/report/claim-pickup-order/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/claim-pickup-order/assets/css/style.css b/print/report/claim-pickup-order/assets/css/style.css deleted file mode 100644 index a197ee5cd..000000000 --- a/print/report/claim-pickup-order/assets/css/style.css +++ /dev/null @@ -1,40 +0,0 @@ -body { - background-color: #EEE -} - -.container { - max-width: 600px; - min-width: 320px; - margin: 0 auto; - color: #555 -} - -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/claim-pickup-order/index.html b/print/report/claim-pickup-order/index.html index 4790693f5..fa2b0c530 100644 --- a/print/report/claim-pickup-order/index.html +++ b/print/report/claim-pickup-order/index.html @@ -5,7 +5,9 @@
+ +
@@ -26,7 +28,9 @@

{{$t('sections.howToBuy.stock')}}

{{$t('sections.howToBuy.delivery')}}

-->
+ +
\ No newline at end of file diff --git a/print/report/client-welcome/assets/css/index.js b/print/report/client-welcome/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/client-welcome/assets/css/index.js +++ b/print/report/client-welcome/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/client-welcome/assets/css/style.css b/print/report/client-welcome/assets/css/style.css deleted file mode 100644 index a197ee5cd..000000000 --- a/print/report/client-welcome/assets/css/style.css +++ /dev/null @@ -1,40 +0,0 @@ -body { - background-color: #EEE -} - -.container { - max-width: 600px; - min-width: 320px; - margin: 0 auto; - color: #555 -} - -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/client-welcome/index.html b/print/report/client-welcome/index.html index 28c36bd1a..d6643e978 100644 --- a/print/report/client-welcome/index.html +++ b/print/report/client-welcome/index.html @@ -5,7 +5,9 @@
+ +
@@ -62,7 +64,9 @@

+ + \ No newline at end of file diff --git a/print/report/letter-debtor-nd/assets/css/index.js b/print/report/letter-debtor-nd/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/letter-debtor-nd/assets/css/index.js +++ b/print/report/letter-debtor-nd/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/letter-debtor-nd/assets/css/style.css b/print/report/letter-debtor-nd/assets/css/style.css deleted file mode 100644 index 8f5acd032..000000000 --- a/print/report/letter-debtor-nd/assets/css/style.css +++ /dev/null @@ -1,42 +0,0 @@ -body { - background-color: #EEE -} - -.container { - font-family: arial, sans-serif; - max-width: 600px; - min-width: 320px; - font-size: 16px; - margin: 0 auto; - color: #555 -} - -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/letter-debtor-nd/index.html b/print/report/letter-debtor-nd/index.html index f7d4c39b3..e1daa91a6 100644 --- a/print/report/letter-debtor-nd/index.html +++ b/print/report/letter-debtor-nd/index.html @@ -8,7 +8,6 @@ -
diff --git a/print/report/letter-debtor-st/assets/css/index.js b/print/report/letter-debtor-st/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/letter-debtor-st/assets/css/index.js +++ b/print/report/letter-debtor-st/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/letter-debtor-st/assets/css/style.css b/print/report/letter-debtor-st/assets/css/style.css deleted file mode 100644 index 8f5acd032..000000000 --- a/print/report/letter-debtor-st/assets/css/style.css +++ /dev/null @@ -1,42 +0,0 @@ -body { - background-color: #EEE -} - -.container { - font-family: arial, sans-serif; - max-width: 600px; - min-width: 320px; - font-size: 16px; - margin: 0 auto; - color: #555 -} - -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/letter-debtor-st/index.html b/print/report/letter-debtor-st/index.html index e87a2f9f1..f9c915072 100644 --- a/print/report/letter-debtor-st/index.html +++ b/print/report/letter-debtor-st/index.html @@ -8,7 +8,6 @@ -
diff --git a/print/report/payment-update/assets/css/index.js b/print/report/payment-update/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/payment-update/assets/css/index.js +++ b/print/report/payment-update/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/payment-update/assets/css/style.css b/print/report/payment-update/assets/css/style.css deleted file mode 100644 index f6f42c447..000000000 --- a/print/report/payment-update/assets/css/style.css +++ /dev/null @@ -1,39 +0,0 @@ -body { - background-color: #EEE -} - -.container { - max-width: 600px; - min-width: 320px; - margin: 0 auto; - color: #555 -} -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/payment-update/index.html b/print/report/payment-update/index.html index 2f0f130ed..bd4b9a0db 100644 --- a/print/report/payment-update/index.html +++ b/print/report/payment-update/index.html @@ -8,7 +8,6 @@ -
diff --git a/print/report/printer-setup/assets/css/index.js b/print/report/printer-setup/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/printer-setup/assets/css/index.js +++ b/print/report/printer-setup/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/printer-setup/assets/css/style.css b/print/report/printer-setup/assets/css/style.css deleted file mode 100644 index a197ee5cd..000000000 --- a/print/report/printer-setup/assets/css/style.css +++ /dev/null @@ -1,40 +0,0 @@ -body { - background-color: #EEE -} - -.container { - max-width: 600px; - min-width: 320px; - margin: 0 auto; - color: #555 -} - -.main { - background-color: #FFF; - padding: 20px -} - -.main a { - color: #8dba25 -} - -.main h1 { - color: #999 -} - -.main h3 { - font-size: 16px -} - -.title { - background-color: #95d831; - text-transform: uppercase; - text-align: center; - padding: 35px 0 -} - -.title h1 { - font-size: 32px; - color: #333; - margin: 0 -} \ No newline at end of file diff --git a/print/report/printer-setup/index.html b/print/report/printer-setup/index.html index 52a0535a4..0b62f5919 100644 --- a/print/report/printer-setup/index.html +++ b/print/report/printer-setup/index.html @@ -8,7 +8,6 @@ -
diff --git a/print/report/rpt-claim-pickup-order/assets/css/index.js b/print/report/rpt-claim-pickup-order/assets/css/index.js index d40ab4984..515dea750 100644 --- a/print/report/rpt-claim-pickup-order/assets/css/index.js +++ b/print/report/rpt-claim-pickup-order/assets/css/index.js @@ -2,6 +2,7 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, `${appPath}/common/css/misc.css`, `${__dirname}/style.css`]) .mergeStyles(); diff --git a/print/report/rpt-claim-pickup-order/assets/css/style.css b/print/report/rpt-claim-pickup-order/assets/css/style.css index 21b89e27b..c3b21a257 100644 --- a/print/report/rpt-claim-pickup-order/assets/css/style.css +++ b/print/report/rpt-claim-pickup-order/assets/css/style.css @@ -1,14 +1,3 @@ -.container { - color: #000 -} - -.title { - font-weight: 100; - margin-top: 0; - margin-bottom: 20px; - font-size: 2em -} - table.column-oriented { margin-top: 50px !important } diff --git a/print/report/rpt-claim-pickup-order/index.html b/print/report/rpt-claim-pickup-order/index.html index 568d972d9..42a8f9096 100644 --- a/print/report/rpt-claim-pickup-order/index.html +++ b/print/report/rpt-claim-pickup-order/index.html @@ -2,7 +2,9 @@
- + + +
@@ -72,12 +74,13 @@

- + +
\ No newline at end of file diff --git a/print/report/rpt-delivery-note/assets/css/index.js b/print/report/rpt-delivery-note/assets/css/index.js index d40ab4984..515dea750 100644 --- a/print/report/rpt-delivery-note/assets/css/index.js +++ b/print/report/rpt-delivery-note/assets/css/index.js @@ -2,6 +2,7 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, `${appPath}/common/css/misc.css`, `${__dirname}/style.css`]) .mergeStyles(); diff --git a/print/report/rpt-delivery-note/assets/css/style.css b/print/report/rpt-delivery-note/assets/css/style.css index 05dbab652..e621f3e23 100644 --- a/print/report/rpt-delivery-note/assets/css/style.css +++ b/print/report/rpt-delivery-note/assets/css/style.css @@ -1,14 +1,3 @@ -.container { - color: #000 -} - -.title { - font-weight: 100; - margin-top: 0; - margin-bottom: 20px; - font-size: 2em -} - table.column-oriented { margin-top: 50px !important } \ No newline at end of file diff --git a/print/report/rpt-delivery-note/index.html b/print/report/rpt-delivery-note/index.html index fb59a88e1..36a2f1e11 100644 --- a/print/report/rpt-delivery-note/index.html +++ b/print/report/rpt-delivery-note/index.html @@ -1,8 +1,10 @@ -
- +
+ + +
@@ -74,13 +76,21 @@ --> -
+
+
Firma digital
+ +
{{dmsCreated}}
+
+
+
+ +
\ No newline at end of file diff --git a/print/report/rpt-delivery-note/index.js b/print/report/rpt-delivery-note/index.js index 1056fb1d1..52b3d90d7 100755 --- a/print/report/rpt-delivery-note/index.js +++ b/print/report/rpt-delivery-note/index.js @@ -33,11 +33,17 @@ module.exports = { data() { return {totalBalance: 0.00}; }, + computed: { + dmsPath() { + return `http://windows.verdnatura.es/signatures/tickets/1161229.png`; + } + }, methods: { fetchClient(ticketFk) { return database.pool.query( `SELECT c.id clientId, + t.id ticketId, u.lang locale, c.email AS recipient, c.socialName AS clientName, @@ -46,12 +52,16 @@ module.exports = { c.city, c.fi, p.name AS province, - ct.country + ct.country, + dt.dmsFk, + d.created AS dmsCreated FROM ticket t JOIN client c ON c.id = t.clientFk JOIN account.user u ON u.id = c.id JOIN country ct ON ct.id = c.countryFk LEFT JOIN province p ON p.id = c.provinceFk + LEFT JOIN dmsTicket dt ON dt.ticketFk = t.id + LEFT JOIN dms d ON d.id = dt.dmsFk WHERE t.id = ?`, [ticketFk]); }, fetchSales(clientFk, companyFk) { diff --git a/print/report/rpt-informe/assets/css/index.js b/print/report/rpt-informe/assets/css/index.js new file mode 100644 index 000000000..515dea750 --- /dev/null +++ b/print/report/rpt-informe/assets/css/index.js @@ -0,0 +1,8 @@ +const CssReader = require(`${appPath}/lib/cssReader`); + +module.exports = new CssReader([ + `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, + `${appPath}/common/css/misc.css`, + `${__dirname}/style.css`]) + .mergeStyles(); diff --git a/print/report/rpt-informe/assets/css/style.css b/print/report/rpt-informe/assets/css/style.css new file mode 100644 index 000000000..e621f3e23 --- /dev/null +++ b/print/report/rpt-informe/assets/css/style.css @@ -0,0 +1,3 @@ +table.column-oriented { + margin-top: 50px !important +} \ No newline at end of file diff --git a/print/report/rpt-informe/index.html b/print/report/rpt-informe/index.html new file mode 100644 index 000000000..9a60114fd --- /dev/null +++ b/print/report/rpt-informe/index.html @@ -0,0 +1,39 @@ + + + +
+ + + +
+ +

{{$t('title')}}

+

{{$t('date')}} {{dated()}}

+ + + + + + + + + + + + + + + +
Id{{$t('concept')}}{{$t('quantity')}}
{{sale.id}}{{sale.concept}}{{sale.quantity}}
+ +
+ + + + +
+ + \ No newline at end of file diff --git a/print/report/rpt-informe/index.js b/print/report/rpt-informe/index.js new file mode 100755 index 000000000..8338e2df7 --- /dev/null +++ b/print/report/rpt-informe/index.js @@ -0,0 +1,32 @@ +const strftime = require('strftime'); + +module.exports = { + name: 'rpt-informe', + created() { + if (this.locale) + this.$i18n.locale = this.locale; + }, + data() { + return { + client: { + id: 10252, + name: 'Batman', + }, + sales: [ + {id: 1, concept: 'My item 1', quantity: 25}, + {id: 2, concept: 'My item 2', quantity: 50}, + {id: 3, concept: 'My item 3', quantity: 150} + ], + locale: 'es' + }; + }, + methods: { + dated: () => { + return strftime('%d-%m-%Y', new Date()); + }, + }, + components: { + 'report-header': require('../report-header'), + 'report-footer': require('../report-footer'), + }, +}; diff --git a/print/report/rpt-informe/locale.js b/print/report/rpt-informe/locale.js new file mode 100644 index 000000000..d231e10ff --- /dev/null +++ b/print/report/rpt-informe/locale.js @@ -0,0 +1,11 @@ +module.exports = { + messages: { + es: { + title: 'Sample report', + date: 'Fecha', + quantity: 'Cantidad', + concept: 'Concepto', + client: 'Cliente {0}', + }, + }, +}; diff --git a/print/report/rpt-letter-debtor/assets/css/index.js b/print/report/rpt-letter-debtor/assets/css/index.js index d40ab4984..515dea750 100644 --- a/print/report/rpt-letter-debtor/assets/css/index.js +++ b/print/report/rpt-letter-debtor/assets/css/index.js @@ -2,6 +2,7 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, `${appPath}/common/css/misc.css`, `${__dirname}/style.css`]) .mergeStyles(); diff --git a/print/report/rpt-letter-debtor/assets/css/style.css b/print/report/rpt-letter-debtor/assets/css/style.css index 05dbab652..e621f3e23 100644 --- a/print/report/rpt-letter-debtor/assets/css/style.css +++ b/print/report/rpt-letter-debtor/assets/css/style.css @@ -1,14 +1,3 @@ -.container { - color: #000 -} - -.title { - font-weight: 100; - margin-top: 0; - margin-bottom: 20px; - font-size: 2em -} - table.column-oriented { margin-top: 50px !important } \ No newline at end of file diff --git a/print/report/rpt-letter-debtor/index.html b/print/report/rpt-letter-debtor/index.html index 6ced7b98a..6e8b681ba 100644 --- a/print/report/rpt-letter-debtor/index.html +++ b/print/report/rpt-letter-debtor/index.html @@ -2,7 +2,9 @@
- + + +
@@ -71,12 +73,13 @@
- + +
\ No newline at end of file diff --git a/print/report/rpt-sepa-core/assets/css/index.js b/print/report/rpt-sepa-core/assets/css/index.js index d40ab4984..515dea750 100644 --- a/print/report/rpt-sepa-core/assets/css/index.js +++ b/print/report/rpt-sepa-core/assets/css/index.js @@ -2,6 +2,7 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, `${appPath}/common/css/misc.css`, `${__dirname}/style.css`]) .mergeStyles(); diff --git a/print/report/rpt-sepa-core/assets/css/style.css b/print/report/rpt-sepa-core/assets/css/style.css index a2d4ed818..056a89b69 100644 --- a/print/report/rpt-sepa-core/assets/css/style.css +++ b/print/report/rpt-sepa-core/assets/css/style.css @@ -1,14 +1,3 @@ -.container { - color: #000 -} - -.title { - margin-bottom: 10px; - font-weight: 100; - font-size: 1.5em; - margin-top: 0 -} - .payment-type { width: auto } diff --git a/print/report/rpt-sepa-core/index.html b/print/report/rpt-sepa-core/index.html index 220346946..ec82a61d2 100644 --- a/print/report/rpt-sepa-core/index.html +++ b/print/report/rpt-sepa-core/index.html @@ -2,7 +2,9 @@
- + + +

{{$t('title')}}

@@ -139,12 +141,13 @@

{{$t('mandatoryFields')}}

{{$t('sendOrder')}}

- + +
\ No newline at end of file diff --git a/print/report/sample-report/assets/css/index.js b/print/report/sample-report/assets/css/index.js new file mode 100644 index 000000000..515dea750 --- /dev/null +++ b/print/report/sample-report/assets/css/index.js @@ -0,0 +1,8 @@ +const CssReader = require(`${appPath}/lib/cssReader`); + +module.exports = new CssReader([ + `${appPath}/common/css/layout.css`, + `${appPath}/common/css/report.css`, + `${appPath}/common/css/misc.css`, + `${__dirname}/style.css`]) + .mergeStyles(); diff --git a/print/report/sample-report/assets/css/style.css b/print/report/sample-report/assets/css/style.css new file mode 100644 index 000000000..e621f3e23 --- /dev/null +++ b/print/report/sample-report/assets/css/style.css @@ -0,0 +1,3 @@ +table.column-oriented { + margin-top: 50px !important +} \ No newline at end of file diff --git a/print/report/sample-report/index.html b/print/report/sample-report/index.html new file mode 100644 index 000000000..9a60114fd --- /dev/null +++ b/print/report/sample-report/index.html @@ -0,0 +1,39 @@ + + + +
+ + + +
+ +

{{$t('title')}}

+

{{$t('date')}} {{dated()}}

+ + + + + + + + + + + + + + + +
Id{{$t('concept')}}{{$t('quantity')}}
{{sale.id}}{{sale.concept}}{{sale.quantity}}
+ +
+ + + + +
+ + \ No newline at end of file diff --git a/print/report/sample-report/index.js b/print/report/sample-report/index.js new file mode 100755 index 000000000..b6894060a --- /dev/null +++ b/print/report/sample-report/index.js @@ -0,0 +1,32 @@ +const strftime = require('strftime'); + +module.exports = { + name: 'sample-report', + created() { + if (this.locale) + this.$i18n.locale = this.locale; + }, + data() { + return { + client: { + id: 10252, + name: 'Batman', + }, + sales: [ + {id: 1, concept: 'My item 1', quantity: 25}, + {id: 2, concept: 'My item 2', quantity: 50}, + {id: 3, concept: 'My item 3', quantity: 150} + ], + locale: 'es' + }; + }, + methods: { + dated: () => { + return strftime('%d-%m-%Y', new Date()); + }, + }, + components: { + 'report-header': require('../report-header'), + 'report-footer': require('../report-footer'), + }, +}; diff --git a/print/report/sample-report/locale.js b/print/report/sample-report/locale.js new file mode 100644 index 000000000..d231e10ff --- /dev/null +++ b/print/report/sample-report/locale.js @@ -0,0 +1,11 @@ +module.exports = { + messages: { + es: { + title: 'Sample report', + date: 'Fecha', + quantity: 'Cantidad', + concept: 'Concepto', + client: 'Cliente {0}', + }, + }, +}; diff --git a/print/report/sepa-core/assets/css/index.js b/print/report/sepa-core/assets/css/index.js index c1943eee1..321c632dc 100644 --- a/print/report/sepa-core/assets/css/index.js +++ b/print/report/sepa-core/assets/css/index.js @@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`); module.exports = new CssReader([ `${appPath}/common/css/layout.css`, - `${__dirname}/style.css`]) + `${appPath}/common/css/email.css`, + `${appPath}/common/css/misc.css`]) .mergeStyles(); diff --git a/print/report/sepa-core/index.html b/print/report/sepa-core/index.html index 6c1355708..c41c18593 100644 --- a/print/report/sepa-core/index.html +++ b/print/report/sepa-core/index.html @@ -8,7 +8,6 @@ -
@@ -19,10 +18,9 @@

{{$t('description.dear')}},

{{$t('description.instructions')}}

{{$t('description.conclusion')}}

-
- +
diff --git a/services/db/install/changes/1.2-CHECK/23-userConfigView.sql b/services/db/install/changes/1.2-CHECK/23-userConfigView.sql new file mode 100644 index 000000000..855b77f0f --- /dev/null +++ b/services/db/install/changes/1.2-CHECK/23-userConfigView.sql @@ -0,0 +1,9 @@ + +CREATE TABLE `salix`.`userConfigView` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `userFk` int(10) unsigned NOT NULL, + `tableCode` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `configuration` text COLLATE utf8_unicode_ci, + PRIMARY KEY (`id`), + UNIQUE KEY `uniqueUser_TableCode` (`userFk`,`tableCode`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; diff --git a/services/db/install/changes/1.2-CHECK/23-userTableConfiguration.sql b/services/db/install/changes/1.2-CHECK/23-userTableConfiguration.sql deleted file mode 100644 index 089b38a36..000000000 --- a/services/db/install/changes/1.2-CHECK/23-userTableConfiguration.sql +++ /dev/null @@ -1,18 +0,0 @@ -CREATE TABLE `salix`.`userTableConfiguration` ( - `id` INT NOT NULL AUTO_INCREMENT, - `workerFk` INT(11) NOT NULL, - `tableCode` VARCHAR(255) NOT NULL, - `configuration` TEXT NULL, - PRIMARY KEY (`id`)); - - - - -ALTER TABLE `salix`.`userTableConfiguration` -ADD INDEX `fgn_worker_idx` (`workerFk` ASC); -ALTER TABLE `salix`.`userTableConfiguration` -ADD CONSTRAINT `fgn_worker` - FOREIGN KEY (`workerFk`) - REFERENCES `vn2008`.`Trabajadores` (`Id_Trabajador`) - ON DELETE CASCADE - ON UPDATE CASCADE; diff --git a/services/db/install/changes/1.2-CHECK/25-expedition.sql b/services/db/install/changes/1.2-CHECK/25-expedition.sql new file mode 100644 index 000000000..75018bf9f --- /dev/null +++ b/services/db/install/changes/1.2-CHECK/25-expedition.sql @@ -0,0 +1,23 @@ +ALTER TABLE `vn2008`.`expeditions` +ADD COLUMN `externalId` BIGINT(25) NULL DEFAULT NULL AFTER `workerFk`; + + +USE `vn`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `vn`.`expedition` AS + SELECT + `e`.`expeditions_id` AS `id`, + `e`.`agency_id` AS `agencyModeFk`, + `e`.`ticket_id` AS `ticketFk`, + `e`.`EsBulto` AS `isBox`, + `e`.`odbc_date` AS `created`, + `e`.`Id_Article` AS `itemFk`, + `e`.`counter` AS `counter`, + `e`.`checked` AS `checked`, + `e`.`workerFk` AS `workerFk`, + `e`.`externalId` AS `externalId` + FROM + `vn2008`.`expeditions` `e`; diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index d46224559..3ac85aa3f 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -211,35 +211,36 @@ INSERT INTO `vn`.`clientManaCache`(`clientFk`, `mana`, `dated`) INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `isDefaultAddress`, `clientFk`, `agencyModeFk`, `longitude`, `latitude`, `isEqualizated`) VALUES - (101, 'address 01', 'Somewhere in Thailand', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (102, 'address 02', 'Somewhere in Poland', 'Silla', 46460, 1, 3333333333, 444444444, 1, 0, 109, 2, NULL, NULL, 0), - (103, 'address 03', 'Somewhere in Japan', 'Silla', 46460, 1, 3333333333, 444444444, 1, 0, 109, 2, NULL, NULL, 0), - (104, 'address 04', 'Somewhere in Spain', 'Silla', 46460, 1, 3333333333, 444444444, 1, 0, 109, 2, NULL, NULL, 0), - (105, 'address 05', 'Somewhere in Potugal', 'Silla', 46460, 1, 5555555555, 666666666, 1, 0, 109, 2, NULL, NULL, 0), - (106, 'address 06', 'Somewhere in UK', 'Silla', 46460, 1, 5555555555, 666666666, 1, 0, 109, 2, NULL, NULL, 0), - (107, 'address 07', 'Somewhere in Valencia', 'Silla', 46460, 1, 5555555555, 666666666, 1, 0, 109, 2, NULL, NULL, 0), - (108, 'address 08', 'Somewhere in Silla', 'Silla', 46460, 1, 5555555555, 666666666, 1, 0, 109, 2, NULL, NULL, 0), - (109, 'address 09', 'Somewhere in London', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (110, 'address 10', 'Somewhere in Algemesi', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (111, 'address 11', 'Somewhere in Carlet', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (112, 'address 12', 'Somewhere in Campanar', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (113, 'address 13', 'Somewhere in Malilla', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (114, 'address 14', 'Somewhere in France', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (115, 'address 15', 'Somewhere in Birmingham', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (116, 'address 16', 'Somewhere in Scotland', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (117, 'address 17', 'Somewhere in nowhere', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (118, 'address 18', 'Somewhere over the rainbow', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (119, 'address 19', 'Somewhere in Alberic', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (120, 'address 20', 'Somewhere in Montortal', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), - (121, 'address 21', 'the bat cave', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 101, 2, NULL, NULL, 0), - (122, 'address 22', 'NY roofs', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 102, 2, NULL, NULL, 0), - (123, 'address 23', 'The phone box', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 103, 2, NULL, NULL, 0), - (124, 'address 24', 'Stark tower', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 104, 2, NULL, NULL, 0), - (125, 'address 25', 'The plastic cell', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 105, 2, NULL, NULL, 0), - (126, 'address 26', 'Many places', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 106, 2, NULL, NULL, 0), - (127, 'address 27', 'Your pocket', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 107, 2, NULL, NULL, 0), - (128, 'address 28', 'Cerebro', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 108, 2, NULL, NULL, 0), - (129, 'address 29', 'Luke Cages Bar', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 110, 2, NULL, NULL, 0); + (101, 'address 01', 'Somewhere in Thailand', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (102, 'address 02', 'Somewhere in Poland', 'Silla', 46460, 1, 3333333333, 444444444, 1, 0, 109, 2, NULL, NULL, 0), + (103, 'address 03', 'Somewhere in Japan', 'Silla', 46460, 1, 3333333333, 444444444, 1, 0, 109, 2, NULL, NULL, 0), + (104, 'address 04', 'Somewhere in Spain', 'Silla', 46460, 1, 3333333333, 444444444, 1, 0, 109, 2, NULL, NULL, 0), + (105, 'address 05', 'Somewhere in Potugal', 'Silla', 46460, 1, 5555555555, 666666666, 1, 0, 109, 2, NULL, NULL, 0), + (106, 'address 06', 'Somewhere in UK', 'Silla', 46460, 1, 5555555555, 666666666, 1, 0, 109, 2, NULL, NULL, 0), + (107, 'address 07', 'Somewhere in Valencia', 'Silla', 46460, 1, 5555555555, 666666666, 1, 0, 109, 2, NULL, NULL, 0), + (108, 'address 08', 'Somewhere in Silla', 'Silla', 46460, 1, 5555555555, 666666666, 1, 0, 109, 2, NULL, NULL, 0), + (109, 'address 09', 'Somewhere in London', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (110, 'address 10', 'Somewhere in Algemesi', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (111, 'address 11', 'Somewhere in Carlet', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (112, 'address 12', 'Somewhere in Campanar', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (113, 'address 13', 'Somewhere in Malilla', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (114, 'address 14', 'Somewhere in France', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (115, 'address 15', 'Somewhere in Birmingham', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (116, 'address 16', 'Somewhere in Scotland', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (117, 'address 17', 'Somewhere in nowhere', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (118, 'address 18', 'Somewhere over the rainbow', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (119, 'address 19', 'Somewhere in Alberic', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (120, 'address 20', 'Somewhere in Montortal', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 109, 2, NULL, NULL, 0), + (121, 'address 21', 'the bat cave', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 101, 2, NULL, NULL, 0), + (122, 'address 22', 'NY roofs', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 102, 2, NULL, NULL, 0), + (123, 'address 23', 'The phone box', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 103, 2, NULL, NULL, 0), + (124, 'address 24', 'Stark tower', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 104, 2, NULL, NULL, 0), + (125, 'address 25', 'The plastic cell', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 105, 2, NULL, NULL, 0), + (126, 'address 26', 'Many places', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 106, 2, NULL, NULL, 0), + (127, 'address 27', 'Your pocket', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 107, 2, NULL, NULL, 0), + (128, 'address 28', 'Cerebro', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 108, 2, NULL, NULL, 0), + (129, 'address 29', 'Luke Cages Bar', 'Silla', 46460, 1, 1111111111, 222222222, 1, 0, 110, 2, NULL, NULL, 0), + (130, 'address 30', 'Non valid address', 'Silla', 46460, 1, 1111111111, 222222222, 0, 0, 101, 2, NULL, NULL, 0); INSERT INTO `vn`.`clientCredit`(`id`, `clientFk`, `workerFk`, `amount`, `created`) VALUES