verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

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

This commit is contained in:
Gerard 2019-02-06 11:40:43 +01:00
parent 87b3032a4f 91d83bc132
commit 9573c875e2
101 changed files with 644 additions and 1679 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/core/components/calendar/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-calendar {
display: block;

2
front/core/components/check/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-check {
position: relative;

2
front/core/components/chip/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-chip {
margin: 0 0.5em 0.5em 0;

2
front/core/components/date-picker/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-date-picker {
.mdl-chip__action {

2
front/core/components/drop-down/style.scss
View File

@ -1,5 +1,5 @@
@import "effects";
@import "colors";
@import "variables";
vn-drop-down {
.dropdown {

2
front/core/components/fetched-tags/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-fetched-tags {
&.noTitle vn-one {

2
front/core/components/icon-button/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-icon-button {
outline: 0;

2
front/core/components/input-number/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
@import '../textfield/style.scss';
vn-input-number {

2
front/core/components/input-range/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-input-range {
label {
color: $main-01;

2
front/core/components/input-time/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
@import '../textfield/style.scss';
vn-input-time {

2
front/core/components/label-value/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-label-value > section {
& > vn-label {

2
front/core/components/log/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-log {
vn-td {

2
front/core/components/paging/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-paging {
display: block;

4
front/core/components/searchbar/style.scss
View File

@ -1,4 +1,4 @@
@import "padding";
@import "variables";
vn-searchbar {
padding-top: 6px;
@ -13,6 +13,6 @@ vn-searchbar {
max-height: 48em;
& > form {
@extend .pad-large;
padding: $pad-large;
}
}

2
front/core/components/snackbar/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-snackbar #shapes {
max-height: 20.625em;

2
front/core/components/step-control/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-step-control {
display: flex;

2
front/core/components/textarea/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-textarea {
& > .mdl-textfield {

2
front/core/components/textfield/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-textfield {
margin: 20px 0!important;
display: inline-block;

2
front/core/components/treeview/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-treeview {
ul {

2
front/core/styles/mdl-override.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
/**
* Rewrited CSS rules from Material Design Lite.

6
front/salix/components/app/style.scss
View File

@ -1,9 +1,7 @@
@import "background";
@import "margin";
@import "variables";
body {
@extend .bg-content;
background-color: $bg-content;
overflow: auto;
}
vn-app {
@ -56,7 +54,7 @@ vn-app {
padding-top: $topbar-height;
}
.content-block {
@extend .margin-medium;
margin: $margin-medium;
form vn-horizontal {
& > * {

2
front/salix/components/login/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-login {
position: absolute;

2
front/salix/components/topbar/style.scss
View File

@ -1,4 +1,4 @@
@import "background";
@import "variables";
vn-topbar {
display: flex;

2
front/salix/components/user-configuration-popover/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-user-configuration-popover {
vn-popover {

9
front/salix/styles/background.scss
View File

@ -1,11 +1,4 @@
@import "colors";
$bg-main: $color-green;
$bg-minor: $color-orange;
$bg-content: $color-light-grey;
$bg-panel: $color-white;
$bg-dark-bar: $main-header;
$bg-dark-menu: $color-dark-grey;
@import "./variables";
html [bg-main], .bg-main {
background-color: $main-bg;

7
front/salix/styles/border.scss
View File

@ -1,8 +1,5 @@
@import "colors";
$border-color: #AAA;
$border-thin: 1px;
$border-thick: 2px;
@import "./colors";
@import "./variables";
html [border-none], .border-none {
border: 0;

12
front/salix/styles/descriptor.scss
View File

@ -1,7 +1,7 @@
@import "./effects";
@import "./colors";
@import "./padding";
@import "./variables";
.vn-descriptor {
box-shadow: 0 .1em .2em rgba(1, 1, 1, .2);
@ -28,13 +28,13 @@
}
}
& > .body {
@extend .pad-small;
padding: $pad-small;
& > * {
@extend .pad-small;
padding: $pad-small;
}
& > .attributes > h5 {
@extend .pad-small-bottom;
padding-bottom: $pad-small;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
@ -46,7 +46,7 @@
padding: 0;
& > vn-icon {
@extend .pad-small;
padding: $pad-small;
color: #666;
opacity: .4;
font-size: 1.5em;
@ -64,7 +64,7 @@
padding: 0;
& > a {
@extend .pad-small;
padding: $pad-small;
& > vn-icon {
font-size: 1.8em;

28
front/salix/styles/font-style.scss
View File

@ -1,5 +1,5 @@
@import "colors";
@import "font-family";
@import "./colors";
@import "./font-family";
body {
color: $main-font-color;
@ -9,16 +9,16 @@ html [uppercase], .uppercase {
text-transform: uppercase;
}
html [orange], .orange{color: $main-01}
html [green], .green{color: $main-02}
html [blue], .blue{color: $main-03}
html [orange], .orange {color: $main-01}
html [green], .green {color: $main-02}
html [blue], .blue {color: $main-03}
html [red], html [alert], .red, .alert {color: $alert-01}
html [white], .white{color: $color-white}
html [dark], .dark{color: $color-dark}
html [dark-grey], .dark-grey{color: $color-dark-grey}
html [light-grey], .light-grey{color: $color-light-grey}
html [medium-grey], .medium-grey{color: $hover}
html [medium-green], .medium-green{color: $color-medium-green}
html [medium-orange], .medium-orange{color: $color-medium-orange}
html [light-green], .light-green{color: $color-light-green}
html [light-orange], .light-orange{color: $color-light-orange}
html [white], .white {color: $color-white}
html [dark], .dark {color: $color-dark}
html [dark-grey], .dark-grey {color: $color-dark-grey}
html [light-grey], .light-grey {color: $color-light-grey}
html [medium-grey], .medium-grey {color: $hover}
html [medium-green], .medium-green {color: $color-medium-green}
html [medium-orange], .medium-orange {color: $color-medium-orange}
html [light-green], .light-green {color: $color-light-green}
html [light-orange], .light-orange {color: $color-light-orange}

76
front/salix/styles/margin.scss
View File

@ -1,8 +1,4 @@
$margin-none: 0;
$margin-small: 8px;
$margin-medium: 16px;
$margin-large: 32px;
@import "variables";
/* None */
@ -16,101 +12,101 @@ html [margin-small], .margin-small {
margin: $margin-small;
}
html [margin-small-top], .margin-small-top {
margin-top: $margin-small;
margin-top: $margin-small;
}
html [margin-small-left], .margin-small-left {
margin-left: $margin-small;
margin-left: $margin-small;
}
html [margin-small-right], .margin-small-right {
margin-right: $margin-small;
margin-right: $margin-small;
}
html [margin-small-bottom], .margin-small-bottom {
margin-bottom: $margin-small;
margin-bottom: $margin-small;
}
html [margin-small-v], .margin-small-v {
margin-top: $margin-small;
margin-bottom: $margin-small;
margin-top: $margin-small;
margin-bottom: $margin-small;
}
html [margin-small-h], .margin-small-h {
margin-left: $margin-small;
margin-right: $margin-small;
margin-left: $margin-small;
margin-right: $margin-small;
}
/* Medium */
html [margin-medium], .margin-medium {
margin: $margin-medium;
margin: $margin-medium;
}
html [margin-medium-top], .margin-medium-top {
margin-top: $margin-medium;
margin-top: $margin-medium;
}
html [margin-medium-left], .margin-medium-left {
margin-left: $margin-medium;
margin-left: $margin-medium;
}
html [margin-medium-right], .margin-medium-right {
margin-right: $margin-medium;
margin-right: $margin-medium;
}
html [margin-medium-bottom], .margin-medium-bottom {
margin-bottom: $margin-medium;
margin-bottom: $margin-medium;
}
html [margin-medium-v], .margin-medium-v {
margin-top: $margin-medium;
margin-bottom: $margin-medium;
margin-top: $margin-medium;
margin-bottom: $margin-medium;
}
html [margin-medium-h], .margin-medium-h {
margin-left: $margin-medium;
margin-right: $margin-medium;
margin-left: $margin-medium;
margin-right: $margin-medium;
}
/* Large */
html [margin-large], .margin-large {
margin: $margin-large;
margin: $margin-large;
}
html [margin-large-top], .margin-large-top {
margin-top: $margin-large;
margin-top: $margin-large;
}
html [margin-large-left], .margin-large-left {
margin-left: $margin-large;
margin-left: $margin-large;
}
html [margin-large-right], .margin-large-right {
margin-right: $margin-large;
margin-right: $margin-large;
}
html [margin-large-bottom], .margin-large-bottom {
margin-bottom: $margin-large;
margin-bottom: $margin-large;
}
html [margin-large-v], .margin-large-v {
margin-top: $margin-large;
margin-bottom: $margin-large;
margin-top: $margin-large;
margin-bottom: $margin-large;
}
html [margin-large-h], .margin-large-h {
margin-left: $margin-large;
margin-right: $margin-large;
margin-left: $margin-large;
margin-right: $margin-large;
}
/* Minus Small */
html [margin--small], .margin--small {
margin: -$margin-small;
margin: -$margin-small;
}
html [margin--small-top], .margin--small-top {
margin-top: -$margin-small;
margin-top: -$margin-small;
}
html [margin--small-left], .margin--small-left {
margin-left: -$margin-small;
margin-left: -$margin-small;
}
html [margin--small-right], .margin--small-right {
margin-right: -$margin-small;
margin-right: -$margin-small;
}
html [margin--small-bottom], .margin--small-bottom {
margin-bottom: -$margin-small;
margin-bottom: -$margin-small;
}
html [margin--small-v], .margin--small-v {
margin-top: -$margin-small;
margin-bottom: -$margin-small;
margin-top: -$margin-small;
margin-bottom: -$margin-small;
}
html [margin--small-h], .margin--small-h {
margin-left: -$margin-small;
margin-right: -$margin-small;
margin-left: -$margin-small;
margin-right: -$margin-small;
}

8
front/salix/styles/misc.scss
View File

@ -1,7 +1,5 @@
@import "./padding";
@import "./margin";
@import "./variables";
@import "./colors";
@import "./border";
@import "./effects";
a:focus,
@ -160,8 +158,8 @@ a.vn-list-item {
}
.vn-list-item {
@extend .pad-medium;
@extend .border-solid-bottom;
padding: $pad-medium;
border-bottom: $border-thin solid $border-color;
display: block;
text-decoration: none;

2
front/salix/styles/order-product.scss
View File

@ -1,7 +1,5 @@
@import "./colors";
@media screen and (max-width: 1920px){
.catalog-list .product {
width: 25%;

6
front/salix/styles/padding.scss
View File

@ -1,8 +1,4 @@
$pad-none: 0;
$pad-small: 8px;
$pad-medium: 16px;
$pad-large: 32px;
@import "./variables";
/* None */

35
front/salix/styles/summary.scss
View File

@ -1,6 +1,5 @@
@import "./colors";
@import "./margin";
@import "./padding";
@import "./variables";
.summary {
margin: 0 auto;
@ -8,7 +7,7 @@
& > div {
& > h5 {
@extend .pad-small;
padding: $pad-small;
border: none;
background: $main-01;
color: $color-white;
@ -21,10 +20,10 @@
}
& > vn-horizontal {
flex-wrap: wrap;
@extend .pad-medium;
padding: $pad-medium;
h4 {
@extend .margin-medium-bottom;
margin-bottom: $margin-medium;
text-transform: uppercase;
font-size: 15pt;
line-height: 1;
@ -38,7 +37,7 @@
text-overflow: ellipsis;
}
& > * {
@extend .margin-small;
margin: $margin-small;
min-width: 14em;
overflow: hidden;
padding: 0;
@ -80,27 +79,3 @@
font-size: .9em
}
}
.state {
padding: 5px;
background-color: $main-01;
color: white;
p {
font-size: 13px;
line-height: 15px;
text-align: center;
margin: .1em 0;
&:nth-child(1) {
text-transform: uppercase;
}
}
vn-one {
padding: 0;
&:nth-child(1) {
border-right: .1em solid white;
}
}
}

2
front/salix/styles/title.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "./colors";
h1 {
font-size: 32pt;

32
front/salix/styles/variables.scss
View File

@ -1,4 +1,34 @@
@import "./colors";
$menu-width: 16em;
$topbar-height: 4em;
$mobile-width: 800px;
$mobile-width: 800px;
// Background color
$bg-main: $color-green;
$bg-minor: $color-orange;
$bg-content: $color-light-grey;
$bg-panel: $color-white;
$bg-dark-bar: $main-header;
$bg-dark-menu: $color-dark-grey;
// Padding
$pad-none: 0;
$pad-small: 8px;
$pad-medium: 16px;
$pad-large: 32px;
// Margin
$margin-none: 0;
$margin-small: 8px;
$margin-medium: 16px;
$margin-large: 32px;
// Border
$border-color: #AAA;
$border-thin: 1px;
$border-thick: 2px;

2
modules/claim/front/index/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-claim-index {
.Pendiente {

27
modules/client/front/sample/create/style.scss
View File

@ -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
}
}
}
}

2
modules/client/front/summary/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-client-summary {
.alert span {

2
modules/client/front/web-payment/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-client-web-payment {
vn-icon[icon=clear] {

4
modules/item/front/descriptor/index.html
View File

@ -31,7 +31,7 @@
</vn-float-button>
</a>
</div>
<vn-horizontal class="state">
<vn-horizontal class="item-state">
<vn-one>
<p translate>Visible</p>
<p>{{$ctrl.item.visible}}</p>
@ -46,7 +46,7 @@
<div class="attributes">
<h5>{{$ctrl.item.id}}</h5>
<vn-label-value label="Name"
value="{{::$ctrl.item.name}}">
value="{{$ctrl.item.name}}">
</vn-label-value>
<vn-label-value label="Buyer"
value="{{$ctrl.item.itemType.worker.user.nickname}}">

2
modules/item/front/diary/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-item-diary {
& > vn-vertical {

2
modules/item/front/index/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-item-product {
display: block;

2
modules/item/front/last-entries/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-item-last-entries {
.round {
background-color: $lines;

4
modules/item/front/summary/index.html
View File

@ -7,7 +7,7 @@
ng-src="//verdnatura.es/vn-image-data/catalog/200x200/{{$ctrl.item.image}}"
zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{$ctrl.item.image}}" on-error-src/>
</vn-one>
<vn-horizontal class="state">
<vn-horizontal class="item-state">
<vn-one>
<p translate>Visible</p>
<p>{{$ctrl.summary.visible}}</p>
@ -36,7 +36,7 @@
value="{{$ctrl.summary.item.origin.name}}">
</vn-label-value>
<vn-label-value label="stems"
value="{{$ctrl.summary.item.origin.stems}}">
value="{{$ctrl.summary.item.stems}}">
</vn-label-value>
<vn-label-value label="Buyer"
value="{{$ctrl.summary.item.itemType.worker.user.nickname}}">

30
modules/item/front/summary/style.scss
View File

@ -1,5 +1,35 @@
@import "./colors";
vn-item-summary {
p {
margin: 0;
}
}
.item-state {
padding: .4em;
background-color: $main-01;
color: white;
p {
font-size: .8em;
text-align: center;
margin: 0;
&:first-child {
text-transform: uppercase;
line-height: 1;
}
&:last-child {
font-size: 1.5em;
font-weight: bold;
}
}
vn-one {
padding: 0;
&:nth-child(1) {
border-right: .1em solid white;
}
}
}

6
modules/item/front/tags/index.js
View File

@ -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'
}
});

2
modules/item/front/ticket-descriptor/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-dialog.modal-form {
vn-horizontal.header{

2
modules/order/front/catalog/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-order-catalog .catalog-header {
border-color: $lines;

15
modules/order/front/filter/style.scss
View File

@ -1,26 +1,27 @@
@import "colors";
@import "padding";
@import "variables";
@import "variables";
vn-catalog-filter > div {
& > .input {
@extend .pad-medium-h;
padding-left: $pad-medium;
padding-right: $pad-medium;
border-color: $lines;
border-bottom: 1px solid rgba($lines, 0.5);
}
.item-category {
@extend .pad-small;
padding: $pad-small;
justify-content: flex-start;
align-items: flex-start;
flex-wrap: wrap;
& > vn-one {
@extend .pad-small;
padding: $pad-small;
min-width: 33.33%;
text-align: center;
box-sizing: border-box;
& > vn-icon {
@extend .pad-small;
padding: $pad-small;
background-color: $secondary-font-color;
border-radius: 50%;
cursor: pointer;
@ -39,7 +40,7 @@ vn-catalog-filter > div {
}
.chips {
flex-wrap: wrap;
@extend .pad-medium;
padding: $pad-medium;
}
vn-autocomplete[vn-id="type"] .list {

2
modules/order/front/prices-popover/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-order-prices-popover {
width: 150px;

2
modules/ticket/front/data/step-one/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
tpl-item{
&.notActive {

2
modules/ticket/front/index/style.scss
View File

@ -1,4 +1,4 @@
@import 'colors';
@import "variables";
vn-ticket-index{
vn-icon-menu{

2
modules/ticket/front/sale/style.scss
View File

@ -1,4 +1,4 @@
@import "colors";
@import "variables";
vn-ticket-sale {
vn-popover.edit {
div.popover{

1349
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
package.json
View File

@ -4,10 +4,10 @@
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",
"repository": {
"type": "git",
"url": "https://gitea.verdnatura.es/verdnatura/salix"
},
"repository": {
"type": "git",
"url": "https://gitea.verdnatura.es/verdnatura/salix"
},
"dependencies": {
"compression": "^1.7.3",
"fs-extra": "^5.0.0",
@ -36,7 +36,7 @@
"@babel/register": "^7.0.0",
"angular-mocks": "^1.7.4",
"babel-loader": "^8.0.5",
"css-loader": "^0.25.0",
"css-loader": "^2.1.0",
"del": "^2.2.2",
"eslint": "^5.12.0",
"eslint-config-google": "^0.11.0",
@ -73,9 +73,9 @@
"node-sass": "^4.9.3",
"nodemon": "^1.18.5",
"plugin-error": "^1.0.1",
"raw-loader": "*",
"sass-loader": "^6.0.7",
"style-loader": "^0.20.3",
"raw-loader": "^1.0.0",
"sass-loader": "^7.1.0",
"style-loader": "^0.23.1",
"webpack": "^4.28.3",
"webpack-cli": "^3.2.1",
"webpack-dev-server": "^3.1.14",

2
print/report/claim-pickup-order/assets/css/style.css → print/common/css/email.css
View File

@ -37,4 +37,4 @@ body {
font-size: 32px;
color: #333;
margin: 0
}
}

5
print/common/css/layout.css
View File

@ -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 {

10
print/common/css/report.css Normal file
View File

@ -0,0 +1,10 @@
body {
zoom: 0.55
}
.title {
margin-bottom: 20px;
font-weight: 100;
margin-top: 0;
font-size: 2em
}

1
print/config/routes.json
View File

@ -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"},

3
print/report/claim-pickup-order/assets/css/index.js
View File

@ -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();

4
print/report/claim-pickup-order/index.html
View File

@ -5,7 +5,9 @@
</head>
<body>
<section class="container">
<!-- Header component -->
<email-header></email-header>
<!-- End header component -->
<section class="main">
<!-- Title block -->
<div class="title">
@ -26,7 +28,9 @@
<p>{{$t('sections.howToBuy.stock')}}</p>
<p>{{$t('sections.howToBuy.delivery')}}</p> -->
</section>
<!-- Footer component -->
<email-footer :locale="locale"></email-footer>
<!-- End footer component -->
</section>
</body>
</html>

3
print/report/client-welcome/assets/css/index.js
View File

@ -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();

40
print/report/client-welcome/assets/css/style.css
View File

@ -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
}

4
print/report/client-welcome/index.html
View File

@ -5,7 +5,9 @@
</head>
<body>
<section class="container">
<!-- Header component -->
<email-header></email-header>
<!-- End header component -->
<section class="main">
<!-- Title block -->
<div class="title">
@ -62,7 +64,9 @@
</section>
</p>
</section>
<!-- Footer component -->
<email-footer :locale="locale"></email-footer>
<!-- End footer component -->
</section>
</body>
</html>

3
print/report/letter-debtor-nd/assets/css/index.js
View File

@ -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();

42
print/report/letter-debtor-nd/assets/css/style.css
View File

@ -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
}

1
print/report/letter-debtor-nd/index.html
View File

@ -8,7 +8,6 @@
<!-- Header component -->
<email-header></email-header>
<!-- End header component -->
<section class="main">
<!-- Title block -->
<div class="title">

3
print/report/letter-debtor-st/assets/css/index.js
View File

@ -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();

42
print/report/letter-debtor-st/assets/css/style.css
View File

@ -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
}

1
print/report/letter-debtor-st/index.html
View File

@ -8,7 +8,6 @@
<!-- Header component -->
<email-header></email-header>
<!-- End header component -->
<section class="main">
<!-- Title block -->
<div class="title">

3
print/report/payment-update/assets/css/index.js
View File

@ -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();

39
print/report/payment-update/assets/css/style.css
View File

@ -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
}

1
print/report/payment-update/index.html
View File

@ -8,7 +8,6 @@
<!-- Header component -->
<email-header></email-header>
<!-- End header component -->
<section class="main">
<!-- Title block -->
<div class="title">

3
print/report/printer-setup/assets/css/index.js
View File

@ -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();

40
print/report/printer-setup/assets/css/style.css
View File

@ -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
}

1
print/report/printer-setup/index.html
View File

@ -8,7 +8,6 @@
<!-- Header component -->
<email-header></email-header>
<!-- End header component -->
<section class="main">
<!-- Title block -->
<div class="title">

1
print/report/rpt-claim-pickup-order/assets/css/index.js
View File

@ -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();

11
print/report/rpt-claim-pickup-order/assets/css/style.css
View File

@ -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
}

7
print/report/rpt-claim-pickup-order/index.html
View File

@ -2,7 +2,9 @@
<html lang="es">
<body>
<section class="container">
<report-header></report-header>
<!-- Header component -->
<report-header :locale="locale"></report-header>
<!-- End header component -->
<section class="main">
<section class="columns">
<section class="size50">
@ -72,12 +74,13 @@
<p v-html="$t('sections.agency.description')"></p>
</section>
<!-- Footer component -->
<report-footer id="pageFooter"
:left-text="$t('claim', [claimId])"
:center-text="clientName"
:locale="locale">
</report-footer>
<!-- End footer component -->
</section>
</body>
</html>

1
print/report/rpt-delivery-note/assets/css/index.js
View File

@ -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();

11
print/report/rpt-delivery-note/assets/css/style.css
View File

@ -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
}

18
print/report/rpt-delivery-note/index.html
View File

@ -1,8 +1,10 @@
<!DOCTYPE html>
<html lang="es">
<body>
<section class="container">
<report-header></report-header>
<section class="container" id="report">
<!-- Header component -->
<report-header :locale="locale"></report-header>
<!-- End header component -->
<section class="main">
<section class="columns">
<section class="size50">
@ -74,13 +76,21 @@
</tr> -->
</tfoot>
</table>
</section>
<div class="panel" style="text-align:center;background-color:red">
<div class="header">Firma digital</div>
<img width="200" src="http://windows.verdnatura.es/signatures/tickets/1161229.png"/>
<section>{{dmsCreated}}</section>
</div>
</div>
</section>
<!-- Footer component -->
<report-footer id="pageFooter"
:left-text="$t('ticket', [clientId])"
:left-text="$t('ticket', [ticketId])"
:center-text="clientName"
:locale="locale">
</report-footer>
<!-- End footer component -->
</section>
</body>
</html>

12
print/report/rpt-delivery-note/index.js
View File

@ -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) {

8
print/report/rpt-informe/assets/css/index.js Normal file
View File

@ -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();

3
print/report/rpt-informe/assets/css/style.css Normal file
View File

@ -0,0 +1,3 @@
table.column-oriented {
margin-top: 50px !important
}

39
print/report/rpt-informe/index.html Normal file
View File

@ -0,0 +1,39 @@
<!DOCTYPE html>
<html lang="es">
<body>
<section class="container" id="report">
<!-- Header component -->
<report-header :locale="locale"></report-header>
<!-- End header component -->
<section class="main">
<!-- Report start -->
<h1 class="title">{{$t('title')}}</h1>
<p>{{$t('date')}} {{dated()}}</p>
<table class="column-oriented">
<thead>
<tr>
<th>Id</th>
<th>{{$t('concept')}}</th>
<th>{{$t('quantity')}}</th>
</tr>
</thead>
<tbody>
<tr v-for="sale in sales" :key="sale.id">
<td class="font gray">{{sale.id}}</td>
<td>{{sale.concept}}</td>
<td>{{sale.quantity}}</td>
</tr>
</tbody>
</table>
<!-- Report end -->
</section>
<!-- Footer component -->
<report-footer id="pageFooter"
:left-text="$t('client', [client.id])"
:center-text="client.name"
:locale="locale">
</report-footer>
<!-- End footer component -->
</section>
</body>
</html>

32
print/report/rpt-informe/index.js Executable file
View File

@ -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'),
},
};

11
print/report/rpt-informe/locale.js Normal file
View File

@ -0,0 +1,11 @@
module.exports = {
messages: {
es: {
title: 'Sample report',
date: 'Fecha',
quantity: 'Cantidad',
concept: 'Concepto',
client: 'Cliente {0}',
},
},
};

1
print/report/rpt-letter-debtor/assets/css/index.js
View File

@ -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();

11
print/report/rpt-letter-debtor/assets/css/style.css
View File

@ -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
}

9
print/report/rpt-letter-debtor/index.html
View File

@ -2,7 +2,9 @@
<html lang="es">
<body>
<section class="container">
<report-header></report-header>
<!-- Header component -->
<report-header :locale="locale"></report-header>
<!-- End header component -->
<section class="main">
<section class="columns">
<section class="size50">
@ -71,12 +73,13 @@
</tfoot>
</table>
</section>
<!-- Footer component -->
<report-footer id="pageFooter"
:left-text="$t('client', [clientId])"
:left-text="$t('claim', [claimId])"
:center-text="clientName"
:locale="locale">
</report-footer>
<!-- End footer component -->
</section>
</body>
</html>

1
print/report/rpt-sepa-core/assets/css/index.js
View File

@ -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();

11
print/report/rpt-sepa-core/assets/css/style.css
View File

@ -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
}

9
print/report/rpt-sepa-core/index.html
View File

@ -2,7 +2,9 @@
<html lang="es">
<body>
<section class="container">
<report-header></report-header>
<!-- Header component -->
<report-header :locale="locale"></report-header>
<!-- End header component -->
<section class="main">
<h1 class="title centered">{{$t('title')}}</h1>
<section class="panel supplierPanel">
@ -139,12 +141,13 @@
<p class="font small">{{$t('mandatoryFields')}}</p>
<p class="font small">{{$t('sendOrder')}}</p>
</section>
<!-- Footer component -->
<report-footer id="pageFooter"
:left-text="$t('order', [mandateCode])"
:left-text="$t('claim', [claimId])"
:center-text="clientName"
:locale="locale">
</report-footer>
<!-- End footer component -->
</section>
</body>
</html>

1
print/report/sample-report/assets/css/index.js
View File

@ -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();

6
print/report/sample-report/index.html
View File

@ -1,8 +1,10 @@
<!DOCTYPE html>
<html lang="es">
<body>
<section class="container">
<section class="container" id="report">
<!-- Header component -->
<report-header :locale="locale"></report-header>
<!-- End header component -->
<section class="main">
<!-- Report start -->
<h1 class="title">{{$t('title')}}</h1>
@ -25,11 +27,13 @@
</table>
<!-- Report end -->
</section>
<!-- Footer component -->
<report-footer id="pageFooter"
:left-text="$t('client', [client.id])"
:center-text="client.name"
:locale="locale">
</report-footer>
<!-- End footer component -->
</section>
</body>
</html>

3
print/report/sepa-core/assets/css/index.js
View File

@ -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();

40
print/report/sepa-core/assets/css/style.css
View File

@ -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
}

4
print/report/sepa-core/index.html
View File

@ -8,7 +8,6 @@
<!-- Header component -->
<email-header></email-header>
<!-- End header component -->
<section class="main">
<!-- Title block -->
<div class="title">
@ -19,10 +18,9 @@
<p>{{$t('description.dear')}},</p>
<p>{{$t('description.instructions')}}</p>
<p>{{$t('description.conclusion')}}</p>
</section>
<!-- Footer component -->
<email-footer></email-footer>
<email-footer :locale="locale"></email-footer>
<!-- End footer component -->
</section>
</body>

59
services/db/install/dump/fixtures.sql
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More