Errores en relaciones solucionados

client/client/src/card/index.js

@@ -7,7 +7,7 @@ export const COMPONENT = {
     controllerAs: 'card',
     controller: function($http, $stateParams) {
         this.client = null;
-        $http.get(`/client/api/Clients/${$stateParams.id}?filter[include][accountFk]`).then(
+        $http.get(`/client/api/Clients/${$stateParams.id}?filter[include][account]`).then(
             json => this.client = json.data
         );
 

services/client/common/models/Address.json

@@ -44,17 +44,17 @@
   },
   "validations": [],
   "relations": {
-    "provinceFk": {
+    "province": {
       "type": "belongsTo",
       "model": "Province",
       "foreignKey": "provinceFk"
     },
-    "clientFk": {
+    "client": {
       "type": "belongsTo",
       "model": "Client",
       "foreignKey": "clientFk"
     },
-    "defaultAgencyFk": {
+    "defaultAgency": {
       "type": "belongsTo",
       "model": "Agency",
       "foreignKey": "defaultAgencyFk"

services/client/common/models/AgencyService.json

@@ -26,12 +26,12 @@
     }
   },
   "relations": {
-    "agencyFk": {
+    "agency": {
       "type": "belongsTo",
       "model": "Agency",
       "foreignKey": "agencyFk"
     },
-    "agencyTypeFk": {
+    "agencyType": {
       "type": "belongsTo",
       "model": "AgencyType",
       "foreignKey": "agencyTypeFk"

services/client/common/models/Client.json

@@ -94,46 +94,48 @@
     "isRelevant": {
       "type": "boolean"
     },
-    "typeFk": {
-      "type": "Number"
-    },
     "accountingAccount": {
       "type": "string"
     }
   },
   "validations": [],
   "relations": {
-    "accountFk": {
+    "account": {
       "type": "belongsTo",
       "model": "Account",
       "foreignKey": "id"
     },
-    "payMethodFk": {
+    "payMethod": {
       "type": "belongsTo",
       "model": "PayMethod",
       "foreignKey": "payMethodFk"
     },
-    "salesPersonFk": {
+    "salesPerson": {
       "type": "belongsTo",
       "model": "Employee",
       "foreignKey": "salesPersonFk"
     },
-    "provinceFk":{
+    "province":{
       "type": "belongsTo",
       "model": "Province",
       "foreignKey": "provinceFk"
     },
-    "countryFk":{
+    "country":{
       "type": "belongsTo",
       "model": "Country",
       "foreignKey": "countryFk"
     },
-    "contactChannelFk":{
+    "contactChannel":{
       "type": "belongsTo",
       "model": "ContactChannel",
       "foreignKey": "contactChannelFk"
     },
-    "addressesFk": {
+    "type": {
+      "type": "belongsTo",
+      "model": "ClientType",
+      "foreignKey": "typeFk"
+    },
+    "addresses": {
       "type": "hasMany",
       "model": "Address",
       "foreignKey": "clientFk"

services/client/common/models/ClientObservation.json

@@ -22,12 +22,12 @@
     }
   },
   "relations": {
-    "employeeFk": {
+    "employee": {
       "type": "belongsTo",
       "model": "Employee",
       "foreignKey": "employeeFk"
     },
-    "clientFk": {
+    "client": {
       "type": "hasOne",
       "model": "Client",
       "foreignKey": "id"

services/client/common/models/Country.json

@@ -20,12 +20,12 @@
     }
   },
   "relations": {
-    "currencyFk": {
+    "currency": {
       "type": "belongsTo",
       "model": "Currency",
       "foreignKey": "currencyFk"
     },
-    "realCountryFk": {
+    "realCountry": {
       "type": "belongsTo",
       "model": "Country",
       "foreignKey": "realCountryFk"

services/client/common/models/Employee.json

@@ -14,7 +14,7 @@
     }
   },
   "relations": {
-    "userFk": {
+    "user": {
       "type": "belongsTo",
       "model": "Account",
       "foreignKey": "userFk"

services/client/common/models/Province.json

@@ -14,17 +14,17 @@
     }
   },
   "relations": {
-    "countryFk": {
+    "country": {
       "type": "belongsTo",
       "model": "Country",
       "foreignKey": "countryFk"
     },
-    "warehouseFk": {
+    "warehouse": {
       "type": "belongsTo",
       "model": "Warehouse",
       "foreignKey": "warehouseFk"
     },
-    "zoneFk": {
+    "zone": {
       "type": "belongsTo",
       "model": "Zone",
       "foreignKey": "zoneFk"