From bfd584487f09cfad9c8e4e2df3c0046809e3cf7b Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 22 Nov 2017 12:43:12 +0100
Subject: [PATCH] limpieza de models auth obsoleto, ahora vn

---
 .../client/src/billing-data/billing-data.html |  6 ++--
 .../client/src/fiscal-data/fiscal-data.html   | 33 +++++++++---------
 services/auth/server/model-config.json        | 12 +++----
 services/client/common/models/client.json     | 13 +++++--
 services/client/server/model-config.json      | 34 +++++++++----------
 .../loopback/server/datasources.test.json     | 22 ++++--------
 services/loopback/server/model-config.json    | 12 +++----
 services/production/server/model-config.json  | 12 +++----
 services/route/server/model-config.json       | 12 +++----
 services/salix/server/model-config.json       | 12 +++----
 10 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/client/client/src/billing-data/billing-data.html b/client/client/src/billing-data/billing-data.html
index 3020e1fc72..19b9615581 100644
--- a/client/client/src/billing-data/billing-data.html
+++ b/client/client/src/billing-data/billing-data.html
@@ -27,13 +27,13 @@
             </vn-horizontal>
             <vn-horizontal margin-medium-bottom>
                 <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-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-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-horizontal>
         </vn-vertical>
diff --git a/client/client/src/fiscal-data/fiscal-data.html b/client/client/src/fiscal-data/fiscal-data.html
index f3347761b4..6d47bff727 100644
--- a/client/client/src/fiscal-data/fiscal-data.html
+++ b/client/client/src/fiscal-data/fiscal-data.html
@@ -42,26 +42,27 @@
                 </vn-autocomplete>
             </vn-horizontal>
             <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-check label="Invoice by address" field="$ctrl.client.hasToInvoiceByAddress" vn-acl="administrative"></vn-check>
                 </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-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.isVies" vn-acl="administrative"></vn-check>
-                    </vn-one>
-                </vn-horizontal>
-                
         </vn-vertical>
         
     </vn-card>
@@ -76,8 +77,8 @@
     >
     <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>
diff --git a/services/auth/server/model-config.json b/services/auth/server/model-config.json
index 8d0bcc990a..69156182d2 100644
--- a/services/auth/server/model-config.json
+++ b/services/auth/server/model-config.json
@@ -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"
   }
 }
\ No newline at end of file
diff --git a/services/client/common/models/client.json b/services/client/common/models/client.json
index 2fe808da17..dc6ff0e5e9 100644
--- a/services/client/common/models/client.json
+++ b/services/client/common/models/client.json
@@ -1,6 +1,12 @@
 {
   "name": "Client",
   "base": "VnModel",
+  "options": {
+    "mysql": {
+      "table": "client",
+      "database": "vn"
+    }
+  },
   "properties": {
     "id": {
       "type": "Number",
@@ -39,7 +45,7 @@
     "mobile": {
       "type": "string"
     },
-    "IsActive": {
+    "isActive": {
       "type": "boolean"
     },
     "credit": {
@@ -70,7 +76,7 @@
       "type": "boolean",
       "description": "Send invoices by email"
     },
-    "hasSepavnl": {
+    "hasSepaVnl": {
       "type": "boolean"
     },
     "hasCoreVnl": {
@@ -79,6 +85,9 @@
     "hasCoreVnh": {
       "type": "boolean"
     },
+    "isTaxDataChecked":{
+      "type": "boolean"
+    },
     "eypbc": {
       "type": "boolean"
     },
diff --git a/services/client/server/model-config.json b/services/client/server/model-config.json
index fd46187303..3c9c2199d2 100644
--- a/services/client/server/model-config.json
+++ b/services/client/server/model-config.json
@@ -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"
   }
 }
diff --git a/services/loopback/server/datasources.test.json b/services/loopback/server/datasources.test.json
index 1e2cbf4288..5f988ebf16 100644
--- a/services/loopback/server/datasources.test.json
+++ b/services/loopback/server/datasources.test.json
@@ -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"
   }
 }
 
diff --git a/services/loopback/server/model-config.json b/services/loopback/server/model-config.json
index b89b94371e..70215ba069 100644
--- a/services/loopback/server/model-config.json
+++ b/services/loopback/server/model-config.json
@@ -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"
   }
 }
diff --git a/services/production/server/model-config.json b/services/production/server/model-config.json
index 5ecf23cfe1..3b60b6f130 100644
--- a/services/production/server/model-config.json
+++ b/services/production/server/model-config.json
@@ -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"
diff --git a/services/route/server/model-config.json b/services/route/server/model-config.json
index 032bbc8625..ee7a7241b9 100644
--- a/services/route/server/model-config.json
+++ b/services/route/server/model-config.json
@@ -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"
diff --git a/services/salix/server/model-config.json b/services/salix/server/model-config.json
index 6bf5864372..2369e9e19b 100644
--- a/services/salix/server/model-config.json
+++ b/services/salix/server/model-config.json
@@ -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"
   }
 }