Merge branch 'dev' of https://git.verdnatura.es/salix into dev
This commit is contained in:
Daniel Herrero
commit
bd5e2a5d91
|
|
@ -27,13 +27,13 @@
|
|||
</vn-horizontal>
|
||||
<vn-horizontal margin-medium-bottom>
|
||||
<vn-one>
|
||||
<vn-check label="Recibido core VNH" field="$ctrl.client.coreVnh" vn-acl="administrative"></vn-check>
|
||||
<vn-check label="Recibido core VNH" field="$ctrl.client.hasCoreVnh" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<vn-check label="Recibido core VNL" field="$ctrl.client.coreVnl" vn-acl="administrative"></vn-check>
|
||||
<vn-check label="Recibido core VNL" field="$ctrl.client.hasCoreVnl" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<vn-check label="Recibido B2B VNL" field="$ctrl.client.sepaVnl" vn-acl="administrative"></vn-check>
|
||||
<vn-check label="Recibido B2B VNL" field="$ctrl.client.hasSepaVnl" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
</vn-horizontal>
|
||||
</vn-vertical>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
vn-descriptor {
|
||||
font-family: raleway-bold;
|
||||
font-family: vn-font-bold;
|
||||
}
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
<div class="margin-none">{{::$ctrl.client.id}}</div>
|
||||
<div class="margin-none">{{$ctrl.client.name}}</div>
|
||||
<div class="margin-none">{{$ctrl.client.phone}}</div>
|
||||
<vn-switch label="Activo" model="$ctrl.active"></vn-switch>
|
||||
</vn-vertical>
|
||||
</vn-horizontal>
|
||||
</vn-vertical>
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
<vn-horizontal>
|
||||
<vn-textfield autofocus vn-two label="Social name" field="$ctrl.client.socialName" vn-acl="administrative"></vn-textfield>
|
||||
<vn-textfield vn-one label="Tax number" field="$ctrl.client.fi" vn-acl="administrative"></vn-textfield>
|
||||
<vn-check vn-one label="Equalization tax" field="$ctrl.client.isEqualizated" vn-acl="administrative"></vn-check>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-textfield vn-two label="Street" field="$ctrl.client.street" vn-focus vn-acl="administrative"></vn-textfield>
|
||||
|
|
@ -42,25 +43,26 @@
|
|||
</vn-horizontal>
|
||||
<vn-horizontal margin-small-bottom>
|
||||
<vn-one>
|
||||
<vn-check label="Equalization tax" field="$ctrl.client.equalizationTax" vn-acl="administrative"></vn-check>
|
||||
<vn-check label="Active" field="$ctrl.client.isActive" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<vn-check label="Invoice by address" field="$ctrl.client.hasToInvoiceByAddress" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
<vn-one></vn-one>
|
||||
<vn-one>
|
||||
<vn-check label="Datos comprobados" field="$ctrl.client.isTaxDataChecked" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-one>
|
||||
<vn-check label="Has to invoice" field="$ctrl.client.hasToInvoice" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<vn-check vn-one label="Invoice by mail" field="$ctrl.client.invoiceByEmail" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<vn-check vn-one label="Vies" field="$ctrl.client.isVies" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-one>
|
||||
<vn-check label="Has to invoice" field="$ctrl.client.hasToInvoice" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<vn-check label="Invoice by mail" field="$ctrl.client.invoiceByEmail" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<vn-check label="Vies" field="$ctrl.client.vies" vn-acl="administrative"></vn-check>
|
||||
</vn-one>
|
||||
</vn-horizontal>
|
||||
|
||||
</vn-vertical>
|
||||
|
||||
</vn-card>
|
||||
|
|
@ -70,13 +72,13 @@
|
|||
</vn-button-bar>
|
||||
</form>
|
||||
<vn-dialog
|
||||
vn-id="propagate-equalizationTax"
|
||||
vn-id="propagate-isEqualizated"
|
||||
on-response="$ctrl.returnDialogEt(response)"
|
||||
>
|
||||
<tpl-body>
|
||||
<vn-vertical>
|
||||
<vn-one text-center translate>You changes the equivalent tax</vn-one>
|
||||
<vn-one text-center translate>Do you want to spread the change to their consignees?</vn-one>
|
||||
<vn-one text-center translate>You changes the equivalen
|
||||
<vn-one text-center translate>Do you want to spread the change to their consig
|
||||
</vn-vertical>
|
||||
</tpl-body>
|
||||
<tpl-buttons>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ export default class ClientFiscalData {
|
|||
this.$http = $http;
|
||||
this.vnApp = vnApp;
|
||||
this.translate = $translate;
|
||||
this.equalizationTax = undefined;
|
||||
this.isEqualizated = undefined;
|
||||
this.copyData();
|
||||
}
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ export default class ClientFiscalData {
|
|||
|
||||
copyData() {
|
||||
if (this.client) {
|
||||
this.equalizationTax = this.client.equalizationTax;
|
||||
this.isEqualizated = this.client.isEqualizated;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -26,16 +26,16 @@ export default class ClientFiscalData {
|
|||
}
|
||||
|
||||
checkEtChanges() {
|
||||
let equals = this.equalizationTax == this.client.equalizationTax;
|
||||
this.equalizationTax = this.client.equalizationTax;
|
||||
let equals = this.isEqualizated == this.client.isEqualizated;
|
||||
this.isEqualizated = this.client.isEqualizated;
|
||||
|
||||
if (!equals)
|
||||
this.$.propagateEqualizationTax.show();
|
||||
this.$.propagateIsEqualizated.show();
|
||||
}
|
||||
|
||||
returnDialogEt(response) {
|
||||
if (response === 'ACCEPT') {
|
||||
this.$http.patch(`/client/api/Clients/${this.client.id}/addressesPropagateRe`, {isEqualizated: this.client.equalizationTax}).then(
|
||||
this.$http.patch(`/client/api/Clients/${this.client.id}/addressesPropagateRe`, {isEqualizated: this.client.isEqualizated}).then(
|
||||
res => {
|
||||
if (res.data)
|
||||
this.vnApp.showMessage(this.translate.instant('Equivalent tax spreaded'));
|
||||
|
|
|
|||
|
|
@ -12,5 +12,5 @@ vn-item-client a:hover {
|
|||
}
|
||||
|
||||
.vn-item-client-name {
|
||||
font-family: raleway-bold;
|
||||
font-family: vn-font-bold;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
"Active": "Activo",
|
||||
"Client": "Cliente",
|
||||
"Clients": "Clientes",
|
||||
"Fiscal data": "Datos Fiscales",
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ ul.vn-autocomplete {
|
|||
}
|
||||
&.load-more {
|
||||
color: #ffa410;
|
||||
font-weight: bold;
|
||||
font-family: vn-font-bold;
|
||||
padding: .4em .8em;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
vn-confirm .dialog-title {
|
||||
color:#424242;
|
||||
font-family: raleway-bold;
|
||||
}
|
||||
|
||||
vn-confirm .dialog-title {
|
||||
color:#424242;
|
||||
font-family: vn-font-bold;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,68 +1,68 @@
|
|||
.vn-dialog {
|
||||
display: none;
|
||||
z-index: 100;
|
||||
position: fixed;
|
||||
left: 0;
|
||||
top: 0;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
background-color: rgba(1,1,1,.4);
|
||||
|
||||
button.close {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
border-style: none;
|
||||
background-color: transparent;
|
||||
padding: .3em;
|
||||
cursor: pointer;
|
||||
|
||||
vn-icon {
|
||||
display: block;
|
||||
|
||||
i {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background-color: rgba(0, 0, 0, .1);
|
||||
}
|
||||
}
|
||||
& > div {
|
||||
position: relative;
|
||||
box-shadow: 0 0 .4em rgba(1,1,1,.4);
|
||||
background-color: white;
|
||||
border-radius: .2em;
|
||||
overflow: auto;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
padding: 2em;
|
||||
box-sizing: border-box;
|
||||
|
||||
width: 28em;
|
||||
margin-top: -10em;
|
||||
margin-left: -14em;
|
||||
}
|
||||
.button-bar {
|
||||
margin-top: 1.5em;
|
||||
text-align: right;
|
||||
|
||||
button {
|
||||
background: none;
|
||||
border: none;
|
||||
text-transform: uppercase;
|
||||
font-size: 1.1em;
|
||||
color: #ffa410;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
padding: .5em;
|
||||
margin: -0.5em;
|
||||
margin-left: .5em;
|
||||
|
||||
&:hover {
|
||||
background-color: rgba(1,1,1,.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.vn-dialog {
|
||||
display: none;
|
||||
z-index: 100;
|
||||
position: fixed;
|
||||
left: 0;
|
||||
top: 0;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
background-color: rgba(1,1,1,.4);
|
||||
|
||||
button.close {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
border-style: none;
|
||||
background-color: transparent;
|
||||
padding: .3em;
|
||||
cursor: pointer;
|
||||
|
||||
vn-icon {
|
||||
display: block;
|
||||
|
||||
i {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background-color: rgba(0, 0, 0, .1);
|
||||
}
|
||||
}
|
||||
& > div {
|
||||
position: relative;
|
||||
box-shadow: 0 0 .4em rgba(1,1,1,.4);
|
||||
background-color: white;
|
||||
border-radius: .2em;
|
||||
overflow: auto;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
padding: 2em;
|
||||
box-sizing: border-box;
|
||||
|
||||
width: 28em;
|
||||
margin-top: -10em;
|
||||
margin-left: -14em;
|
||||
}
|
||||
.button-bar {
|
||||
margin-top: 1.5em;
|
||||
text-align: right;
|
||||
|
||||
button {
|
||||
background: none;
|
||||
border: none;
|
||||
text-transform: uppercase;
|
||||
font-size: 1.1em;
|
||||
color: #ffa410;
|
||||
font-family: vn-font-bold;
|
||||
cursor: pointer;
|
||||
padding: .5em;
|
||||
margin: -0.5em;
|
||||
margin-left: .5em;
|
||||
|
||||
&:hover {
|
||||
background-color: rgba(1,1,1,.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,60 +1,60 @@
|
|||
/**
|
||||
* Rewrited CSS rules from Material Design Lite.
|
||||
* TODO: don't use !important
|
||||
*/
|
||||
|
||||
.mdl-textfield {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mdl-button {
|
||||
font-weight: bolder;
|
||||
color: #ffa410;
|
||||
}
|
||||
.mdl-button--colored {
|
||||
color: white !important;
|
||||
}
|
||||
.mdl-button--colored,
|
||||
.mdl-button--colored:focus,
|
||||
.mdl-button--colored:active {
|
||||
background-color: #ffa410 !important;
|
||||
}
|
||||
.mdl-button--colored:hover,
|
||||
.mdl-button--raised:hover {
|
||||
background-color: #ffa410 !important;
|
||||
}
|
||||
.mdl-button--fab{
|
||||
color: white !important;
|
||||
background-color: #ff9400 !important;
|
||||
}
|
||||
|
||||
.mdl-dialog__actions--full-width>*{
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.mdl-dialog{
|
||||
width: 400px;
|
||||
font-family: raleway-regular;
|
||||
line-height:60px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.mdl-textfield__error {
|
||||
visibility: visible;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
width: 100%;
|
||||
}
|
||||
.mdl-textfield.invalid .mdl-textfield__input {
|
||||
border-color: #d50000;
|
||||
box-shadow: none;
|
||||
}
|
||||
.mdl-textfield.invalid .mdl-textfield__label::after {
|
||||
background-color: #d50000;
|
||||
}
|
||||
.mdl-textfield--floating-label.invalid .mdl-textfield__label {
|
||||
color: #d50000;
|
||||
font-size: 12px;
|
||||
top: 4px;
|
||||
}
|
||||
/**
|
||||
* Rewrited CSS rules from Material Design Lite.
|
||||
* TODO: don't use !important
|
||||
*/
|
||||
|
||||
.mdl-textfield {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mdl-button {
|
||||
font-weight: bolder;
|
||||
color: #ffa410;
|
||||
}
|
||||
.mdl-button--colored {
|
||||
color: white !important;
|
||||
}
|
||||
.mdl-button--colored,
|
||||
.mdl-button--colored:focus,
|
||||
.mdl-button--colored:active {
|
||||
background-color: #ffa410 !important;
|
||||
}
|
||||
.mdl-button--colored:hover,
|
||||
.mdl-button--raised:hover {
|
||||
background-color: #ffa410 !important;
|
||||
}
|
||||
.mdl-button--fab{
|
||||
color: white !important;
|
||||
background-color: #ff9400 !important;
|
||||
}
|
||||
|
||||
.mdl-dialog__actions--full-width>*{
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.mdl-dialog{
|
||||
width: 400px;
|
||||
font-family: vn-font;
|
||||
line-height:60px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.mdl-textfield__error {
|
||||
visibility: visible;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
width: 100%;
|
||||
}
|
||||
.mdl-textfield.invalid .mdl-textfield__input {
|
||||
border-color: #d50000;
|
||||
box-shadow: none;
|
||||
}
|
||||
.mdl-textfield.invalid .mdl-textfield__label::after {
|
||||
background-color: #d50000;
|
||||
}
|
||||
.mdl-textfield--floating-label.invalid .mdl-textfield__label {
|
||||
color: #d50000;
|
||||
font-size: 12px;
|
||||
top: 4px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@
|
|||
}
|
||||
|
||||
.popover-label {
|
||||
font-weight: bold;
|
||||
color: black;
|
||||
padding-top:5px;
|
||||
font-family: vn-font-bold;
|
||||
color: black;
|
||||
padding-top:5px;
|
||||
}
|
||||
|
||||
/* Icon cuadrado */
|
||||
|
|
|
|||
|
|
@ -1,21 +1,12 @@
|
|||
@font-face {
|
||||
font-family: raleway-italic;
|
||||
src: url(./fonts/Raleway-Italic.ttf);
|
||||
}
|
||||
@font-face {
|
||||
font-family: raleway-thin;
|
||||
src: url(./fonts/Raleway-Thin.ttf);
|
||||
}
|
||||
@font-face {
|
||||
font-family: raleway-regular;
|
||||
src: url(./fonts/Raleway-Regular.ttf);
|
||||
}
|
||||
@font-face {
|
||||
font-family: raleway-bold;
|
||||
src: url(./fonts/Raleway-Bold.ttf);
|
||||
}
|
||||
@font-face {
|
||||
font-family: raleway-semi-bold;
|
||||
src: url(./fonts/Raleway-SemiBold.ttf);
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: vn-font-medium;
|
||||
src: url(./fonts/Roboto-Medium.ttf);
|
||||
}
|
||||
@font-face {
|
||||
font-family: vn-font;
|
||||
src: url(./fonts/Roboto.ttf);
|
||||
}
|
||||
@font-face {
|
||||
font-family: vn-font-bold;
|
||||
src: url(./fonts/Roboto-Bold.ttf);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
@import "colors";
|
||||
@import "font-family";
|
||||
|
||||
$font-color: $color-dark-grey;
|
||||
|
||||
body {
|
||||
color: $font-color;
|
||||
font-family: raleway-regular;
|
||||
}
|
||||
html [uppercase], .uppercase {
|
||||
text-transform: uppercase;
|
||||
@import "colors";
|
||||
@import "font-family";
|
||||
|
||||
$font-color: $color-dark-grey;
|
||||
|
||||
body {
|
||||
color: $font-color;
|
||||
font-family: vn-font;
|
||||
}
|
||||
html [uppercase], .uppercase {
|
||||
text-transform: uppercase;
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -64,7 +64,7 @@ html [vn-center], .vn-center{
|
|||
.tooltip {
|
||||
.list-header{
|
||||
border-bottom: 3px solid $color-medium-grey;
|
||||
font-weight: bold;
|
||||
font-family: vn-font-bold;
|
||||
text-align: center
|
||||
}
|
||||
.list-element{
|
||||
|
|
@ -72,7 +72,7 @@ html [vn-center], .vn-center{
|
|||
}
|
||||
}
|
||||
.list-footer{
|
||||
font-weight: bold;
|
||||
font-family: vn-font-bold;
|
||||
border-top: 3px solid $color-medium-grey;
|
||||
}
|
||||
.list-element.warning{
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
|
||||
h1 {
|
||||
font-size: 32pt;
|
||||
}
|
||||
h2 {
|
||||
font-size: 28pt;
|
||||
}
|
||||
h3 {
|
||||
font-size: 24pt;
|
||||
}
|
||||
h4 {
|
||||
font-size: 20pt;
|
||||
}
|
||||
h5 {
|
||||
font-size: 16pt;
|
||||
}
|
||||
h6 {
|
||||
font-size: 12pt;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
padding: 0;
|
||||
margin: .4em 0;
|
||||
font-family: raleway-semi-bold;
|
||||
|
||||
h1 {
|
||||
font-size: 32pt;
|
||||
}
|
||||
h2 {
|
||||
font-size: 28pt;
|
||||
}
|
||||
h3 {
|
||||
font-size: 24pt;
|
||||
}
|
||||
h4 {
|
||||
font-size: 20pt;
|
||||
}
|
||||
h5 {
|
||||
font-size: 16pt;
|
||||
}
|
||||
h6 {
|
||||
font-size: 12pt;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
padding: 0;
|
||||
margin: .4em 0;
|
||||
font-family: vn-font-bold;
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"user": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"AccessToken": {
|
||||
"dataSource": "auth",
|
||||
"dataSource": "salix",
|
||||
"relations": {
|
||||
"user": {
|
||||
"type": "belongsTo",
|
||||
|
|
@ -13,15 +13,15 @@
|
|||
}
|
||||
},
|
||||
"ACL": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"RoleMapping": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Role": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Account": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,12 @@
|
|||
{
|
||||
"name": "Client",
|
||||
"base": "VnModel",
|
||||
"options": {
|
||||
"mysql": {
|
||||
"table": "client",
|
||||
"database": "vn"
|
||||
}
|
||||
},
|
||||
"properties": {
|
||||
"id": {
|
||||
"type": "Number",
|
||||
|
|
@ -39,15 +45,9 @@
|
|||
"mobile": {
|
||||
"type": "string"
|
||||
},
|
||||
"fax": {
|
||||
"type": "string"
|
||||
},
|
||||
"active": {
|
||||
"isActive": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"discount":{
|
||||
"type": "Number"
|
||||
},
|
||||
"credit": {
|
||||
"type": "Number"
|
||||
},
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
"dueDay": {
|
||||
"type": "Number"
|
||||
},
|
||||
"equalizationTax": {
|
||||
"isEqualizated": {
|
||||
"type": "boolean",
|
||||
"description": "The client has equalization tax"
|
||||
},
|
||||
|
|
@ -76,13 +76,16 @@
|
|||
"type": "boolean",
|
||||
"description": "Send invoices by email"
|
||||
},
|
||||
"sepaVnl": {
|
||||
"hasSepaVnl": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"coreVnl": {
|
||||
"hasCoreVnl": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"coreVnh": {
|
||||
"hasCoreVnh": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"isTaxDataChecked":{
|
||||
"type": "boolean"
|
||||
},
|
||||
"eypbc": {
|
||||
|
|
@ -91,7 +94,7 @@
|
|||
"quality": {
|
||||
"type": "Number"
|
||||
},
|
||||
"vies": {
|
||||
"isVies": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"isRelevant": {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"user": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"AccessToken": {
|
||||
"dataSource": "auth",
|
||||
"dataSource": "salix",
|
||||
"relations": {
|
||||
"user": {
|
||||
"type": "belongsTo",
|
||||
|
|
@ -13,51 +13,51 @@
|
|||
}
|
||||
},
|
||||
"ACL": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"RoleMapping": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Role": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Account": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Client": {
|
||||
"dataSource": "vn"
|
||||
},
|
||||
"ClientCredit": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"ClientCreditLimit": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"ClientObservation": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"PayMethod": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Address": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"AgencyMode": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Province": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Country": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"ContactChannel": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Employee": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"CreditClassification": {
|
||||
"dataSource": "vn"
|
||||
"dataSource": "salix"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,17 @@
|
|||
{
|
||||
"db":
|
||||
{
|
||||
"name": "db",
|
||||
"connector": "memory",
|
||||
"file": "db.json"
|
||||
},
|
||||
"auth":
|
||||
{
|
||||
"vn": {
|
||||
"name": "mysql",
|
||||
"connector": "mysql",
|
||||
"database": "salix",
|
||||
"database": "vn",
|
||||
"debug": false,
|
||||
"host": "localhost",
|
||||
"port": 3306,
|
||||
"username": "root",
|
||||
"password": ""
|
||||
"password": "",
|
||||
"connectTimeout": 20000,
|
||||
"acquireTimeout": 20000
|
||||
},
|
||||
"vn": {
|
||||
"salix": {
|
||||
"name": "mysql",
|
||||
"connector": "mysql",
|
||||
"database": "salix",
|
||||
|
|
@ -27,11 +22,6 @@
|
|||
"password": "",
|
||||
"connectTimeout": 20000,
|
||||
"acquireTimeout": 20000
|
||||
},
|
||||
"client": {
|
||||
"name": "client",
|
||||
"connector": "remote",
|
||||
"url": "http://localhost:3002/api"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@
|
|||
]
|
||||
},
|
||||
"user": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"AccessToken": {
|
||||
"dataSource": "auth",
|
||||
"dataSource": "salix",
|
||||
"relations": {
|
||||
"user": {
|
||||
"type": "belongsTo",
|
||||
|
|
@ -27,15 +27,15 @@
|
|||
}
|
||||
},
|
||||
"ACL": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"RoleMapping": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Role": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Account": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"user": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"AccessToken": {
|
||||
"dataSource": "auth",
|
||||
"dataSource": "salix",
|
||||
"relations": {
|
||||
"user": {
|
||||
"type": "belongsTo",
|
||||
|
|
@ -13,16 +13,16 @@
|
|||
}
|
||||
},
|
||||
"ACL": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"RoleMapping": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Role": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Account": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Ticket": {
|
||||
"dataSource": "vn"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"user": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"AccessToken": {
|
||||
"dataSource": "auth",
|
||||
"dataSource": "salix",
|
||||
"relations": {
|
||||
"user": {
|
||||
"type": "belongsTo",
|
||||
|
|
@ -13,16 +13,16 @@
|
|||
}
|
||||
},
|
||||
"ACL": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"RoleMapping": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Role": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Account": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Delivery": {
|
||||
"dataSource": "vn"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"user": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"AccessToken": {
|
||||
"dataSource": "auth",
|
||||
"dataSource": "salix",
|
||||
"relations": {
|
||||
"user": {
|
||||
"type": "belongsTo",
|
||||
|
|
@ -13,15 +13,15 @@
|
|||
}
|
||||
},
|
||||
"ACL": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"RoleMapping": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Role": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
},
|
||||
"Account": {
|
||||
"dataSource": "auth"
|
||||
"dataSource": "salix"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue