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

limpieza de models auth obsoleto, ahora vn

This commit is contained in:
Javi Gallego 2017-11-22 12:43:12 +01:00
parent b3e8b4542a
commit bfd584487f
10 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/client/src/billing-data/billing-data.html
View File

@ -27,13 +27,13 @@
</vn-horizontal> </vn-horizontal>
<vn-horizontal margin-medium-bottom> <vn-horizontal margin-medium-bottom>
<vn-one> <vn-one>
<vn-check label="Recibido core VNH" field="$ctrl.client.HasCoreVnh" 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-one> <vn-one>
<vn-check label="Recibido core VNL" field="$ctrl.client.HasCoreVnl" 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-one> <vn-one>
<vn-check label="Recibido B2B VNL" field="$ctrl.client.hasSepavnl" vn-acl="administrative"></vn-check> <vn-check label="Recibido B2B VNL" field="$ctrl.client.hasSepaVnl" vn-acl="administrative"></vn-check>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
</vn-vertical> </vn-vertical>

15
client/client/src/fiscal-data/fiscal-data.html
View File

@ -42,12 +42,14 @@
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal margin-small-bottom> <vn-horizontal margin-small-bottom>
<vn-one>
<vn-check label="Active" field="$ctrl.client.isActive" vn-acl="administrative"></vn-check>
</vn-one>
<vn-one> <vn-one>
<vn-check label="Invoice by address" field="$ctrl.client.hasToInvoiceByAddress" vn-acl="administrative"></vn-check> <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="Active" field="$ctrl.client.isActive" vn-acl="administrative"></vn-check> <vn-check label="Datos comprobados" field="$ctrl.client.isTaxDataChecked" vn-acl="administrative"></vn-check>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
@ -55,13 +57,12 @@
<vn-check label="Has to invoice" field="$ctrl.client.hasToInvoice" vn-acl="administrative"></vn-check> <vn-check label="Has to invoice" field="$ctrl.client.hasToInvoice" vn-acl="administrative"></vn-check>
</vn-one> </vn-one>
<vn-one> <vn-one>
<vn-check label="Invoice by mail" field="$ctrl.client.invoiceByEmail" vn-acl="administrative"></vn-check> <vn-check vn-one label="Invoice by mail" field="$ctrl.client.invoiceByEmail" vn-acl="administrative"></vn-check>
</vn-one> </vn-one>
<vn-one> <vn-one>
<vn-check label="Vies" field="$ctrl.client.isVies" vn-acl="administrative"></vn-check> <vn-check vn-one label="Vies" field="$ctrl.client.isVies" vn-acl="administrative"></vn-check>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
@ -76,8 +77,8 @@
> >
<tpl-body> <tpl-body>
<vn-vertical> <vn-vertical>
<vn-one text-center translate>You changes the equivalent tax</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 consignees?</vn-one> <vn-one text-center translate>Do you want to spread the change to their consig
</vn-vertical> </vn-vertical>
</tpl-body> </tpl-body>
<tpl-buttons> <tpl-buttons>

12
services/auth/server/model-config.json
View File

@ -1,9 +1,9 @@
{ {
"user": { "user": {
"dataSource": "auth" "dataSource": "salix"
}, },
"AccessToken": { "AccessToken": {
"dataSource": "auth", "dataSource": "salix",
"relations": { "relations": {
"user": { "user": {
"type": "belongsTo", "type": "belongsTo",
@ -13,15 +13,15 @@
} }
}, },
"ACL": { "ACL": {
"dataSource": "auth" "dataSource": "salix"
}, },
"RoleMapping": { "RoleMapping": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Role": { "Role": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Account": { "Account": {
"dataSource": "auth" "dataSource": "salix"
} }
} }

13
services/client/common/models/client.json
View File

@ -1,6 +1,12 @@
{ {
"name": "Client", "name": "Client",
"base": "VnModel", "base": "VnModel",
"options": {
"mysql": {
"table": "client",
"database": "vn"
}
},
"properties": { "properties": {
"id": { "id": {
"type": "Number", "type": "Number",
@ -39,7 +45,7 @@
"mobile": { "mobile": {
"type": "string" "type": "string"
}, },
"IsActive": { "isActive": {
"type": "boolean" "type": "boolean"
}, },
"credit": { "credit": {
@ -70,7 +76,7 @@
"type": "boolean", "type": "boolean",
"description": "Send invoices by email" "description": "Send invoices by email"
}, },
"hasSepavnl": { "hasSepaVnl": {
"type": "boolean" "type": "boolean"
}, },
"hasCoreVnl": { "hasCoreVnl": {
@ -79,6 +85,9 @@
"hasCoreVnh": { "hasCoreVnh": {
"type": "boolean" "type": "boolean"
}, },
"isTaxDataChecked":{
"type": "boolean"
},
"eypbc": { "eypbc": {
"type": "boolean" "type": "boolean"
}, },

34
services/client/server/model-config.json
View File

@ -1,9 +1,9 @@
{ {
"user": { "user": {
"dataSource": "auth" "dataSource": "salix"
}, },
"AccessToken": { "AccessToken": {
"dataSource": "auth", "dataSource": "salix",
"relations": { "relations": {
"user": { "user": {
"type": "belongsTo", "type": "belongsTo",
@ -13,51 +13,51 @@
} }
}, },
"ACL": { "ACL": {
"dataSource": "auth" "dataSource": "salix"
}, },
"RoleMapping": { "RoleMapping": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Role": { "Role": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Account": { "Account": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Client": { "Client": {
"dataSource": "vn" "dataSource": "vn"
}, },
"ClientCredit": { "ClientCredit": {
"dataSource": "vn" "dataSource": "salix"
}, },
"ClientCreditLimit": { "ClientCreditLimit": {
"dataSource": "vn" "dataSource": "salix"
}, },
"ClientObservation": { "ClientObservation": {
"dataSource": "vn" "dataSource": "salix"
}, },
"PayMethod": { "PayMethod": {
"dataSource": "vn" "dataSource": "salix"
}, },
"Address": { "Address": {
"dataSource": "vn" "dataSource": "salix"
}, },
"AgencyMode": { "AgencyMode": {
"dataSource": "vn" "dataSource": "salix"
}, },
"Province": { "Province": {
"dataSource": "vn" "dataSource": "salix"
}, },
"Country": { "Country": {
"dataSource": "vn" "dataSource": "salix"
}, },
"ContactChannel": { "ContactChannel": {
"dataSource": "vn" "dataSource": "salix"
}, },
"Employee": { "Employee": {
"dataSource": "vn" "dataSource": "salix"
}, },
"CreditClassification": { "CreditClassification": {
"dataSource": "vn" "dataSource": "salix"
} }
} }

22
services/loopback/server/datasources.test.json
View File

@ -1,22 +1,17 @@
{ {
"db": "vn": {
{
"name": "db",
"connector": "memory",
"file": "db.json"
},
"auth":
{
"name": "mysql", "name": "mysql",
"connector": "mysql", "connector": "mysql",
"database": "salix", "database": "vn",
"debug": false, "debug": false,
"host": "localhost", "host": "localhost",
"port": 3306, "port": 3306,
"username": "root", "username": "root",
"password": "" "password": "",
"connectTimeout": 20000,
"acquireTimeout": 20000
}, },
"vn": { "salix": {
"name": "mysql", "name": "mysql",
"connector": "mysql", "connector": "mysql",
"database": "salix", "database": "salix",
@ -27,11 +22,6 @@
"password": "", "password": "",
"connectTimeout": 20000, "connectTimeout": 20000,
"acquireTimeout": 20000 "acquireTimeout": 20000
},
"client": {
"name": "client",
"connector": "remote",
"url": "http://localhost:3002/api"
} }
} }

12
services/loopback/server/model-config.json
View File

@ -14,10 +14,10 @@
] ]
}, },
"user": { "user": {
"dataSource": "auth" "dataSource": "salix"
}, },
"AccessToken": { "AccessToken": {
"dataSource": "auth", "dataSource": "salix",
"relations": { "relations": {
"user": { "user": {
"type": "belongsTo", "type": "belongsTo",
@ -27,15 +27,15 @@
} }
}, },
"ACL": { "ACL": {
"dataSource": "auth" "dataSource": "salix"
}, },
"RoleMapping": { "RoleMapping": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Role": { "Role": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Account": { "Account": {
"dataSource": "auth" "dataSource": "salix"
} }
} }

12
services/production/server/model-config.json
View File

@ -1,9 +1,9 @@
{ {
"user": { "user": {
"dataSource": "auth" "dataSource": "salix"
}, },
"AccessToken": { "AccessToken": {
"dataSource": "auth", "dataSource": "salix",
"relations": { "relations": {
"user": { "user": {
"type": "belongsTo", "type": "belongsTo",
@ -13,16 +13,16 @@
} }
}, },
"ACL": { "ACL": {
"dataSource": "auth" "dataSource": "salix"
}, },
"RoleMapping": { "RoleMapping": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Role": { "Role": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Account": { "Account": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Ticket": { "Ticket": {
"dataSource": "vn" "dataSource": "vn"

12
services/route/server/model-config.json
View File

@ -1,9 +1,9 @@
{ {
"user": { "user": {
"dataSource": "auth" "dataSource": "salix"
}, },
"AccessToken": { "AccessToken": {
"dataSource": "auth", "dataSource": "salix",
"relations": { "relations": {
"user": { "user": {
"type": "belongsTo", "type": "belongsTo",
@ -13,16 +13,16 @@
} }
}, },
"ACL": { "ACL": {
"dataSource": "auth" "dataSource": "salix"
}, },
"RoleMapping": { "RoleMapping": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Role": { "Role": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Account": { "Account": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Delivery": { "Delivery": {
"dataSource": "vn" "dataSource": "vn"

12
services/salix/server/model-config.json
View File

@ -1,9 +1,9 @@
{ {
"user": { "user": {
"dataSource": "auth" "dataSource": "salix"
}, },
"AccessToken": { "AccessToken": {
"dataSource": "auth", "dataSource": "salix",
"relations": { "relations": {
"user": { "user": {
"type": "belongsTo", "type": "belongsTo",
@ -13,15 +13,15 @@
} }
}, },
"ACL": { "ACL": {
"dataSource": "auth" "dataSource": "salix"
}, },
"RoleMapping": { "RoleMapping": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Role": { "Role": {
"dataSource": "auth" "dataSource": "salix"
}, },
"Account": { "Account": {
"dataSource": "auth" "dataSource": "salix"
} }
} }