Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix

@salix/crud/src/client/basic-data/index.js

@@ -35,8 +35,7 @@ export const COMPONENT = {
             if (!equalsObject(this.client, this.clientOld)) {
                 var newClient = modified(this.client, this.clientOld);
                 newClient.modify = "BasicData";
-                newClient.id = this.clientOld.id;
-                $http.put('/client/api/Clients', newClient).then(
+                $http.put(`/client/api/Clients/${this.clientOld.id}`, newClient).then(
                     json => {
                         copyObject(json.data, this.client);
                         this.copyClient();

@salix/crud/src/client/card/card.js

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

@salix/crud/src/client/descriptor/descriptor.js

@@ -19,8 +19,8 @@ export const COMPONENT = {
         
         $scope.$watch('descriptor.client.active', function(newValue, oldValue) {
             if (self.client && self.clientOld && self.client.active !== self.clientOld.active) {
-                self.client.modify = "Active";
-                $http.put('/client/api/Clients', self.client).then(
+                var newClient = {id: self.client.id, active: self.client.active, modify: "Active"};
+                $http.put('/client/api/Clients', newClient).then(
                     json => {
                         self.client = json.data;
                         self.copyClient();

@salix/crud/src/client/fiscal-data/index.js

@@ -16,8 +16,7 @@ export const COMPONENT = {
             if (!equalsObject(this.client, this.clientOld)) {
                 var newClient = modified(this.client, this.clientOld);
                 newClient.modify = "FiscalData";
-                newClient.id = this.clientOld.id;
-                $http.put('/client/api/Clients', this.client).then(
+                $http.put(`/client/api/Clients/${this.clientOld.id}`, newClient).then(
                     json => {
                         this.client = json.data;
                         this.copyClient();

services/client/common/models/Client.js

@@ -14,7 +14,7 @@ module.exports = function(Client) {
     }
 
     // Hooks
-    Client.observe('before save', function (ctx, next) {
+    Client.observe('before save', function (ctx, next) { 
         if (ctx.instance) {
             if (!ctx.instance.dueDay){
                 ctx.instance.dueDay = 5;
@@ -27,6 +27,8 @@ module.exports = function(Client) {
                         if (item.payMethod != ctx.data.payMethod && item.dueDay == ctx.data.dueDay) {
                             ctx.data.dueDay = 5;
                         }
+                        if(!ctx.data.name)
+                            ctx.data.name = item.name;
                     }
                     next();
                 }

services/client/common/models/Client.json

@@ -11,7 +11,7 @@
     "name": {
       "type": "string",
       "required": true
-    }, 
+    },
     "fi": {
       "type": "string",
       "description": "Fiscal indetifier"
@@ -64,8 +64,8 @@
     "dueDay": {
       "type": "Number"
     },
-    "gestdoc":{
-      "type":"Number"
+    "gestdoc": {
+      "type": "Number"
     },
     "surcharge": {
       "type": "boolean",
@@ -80,26 +80,38 @@
       "description": "Send invoices by email"
     },
     "relations": {
-      "salesPerson": {
-        "type": "belongsTo",
-        "model": "SalesPerson",
-        "foreignKey": "salePersonId"
-      },
-      "paymentMethod":{
-        "type": "belongsTo",
-        "model": "PaymentMethod",
-        "foreingKey": "payId"
-      },
-      "country":{
-        "type": "belongsTo",
-        "model": "Country",
-        "foreignKey": "countryId"
-      },
-      "province":{
-        "type": "belongsTo",
-        "model": "Province",
-        "foreignKey": "provinceId"
+      "type": {
+        "salesPerson": {
+          "type": "belongsTo",
+          "model": "SalesPerson",
+          "foreignKey": "salePersonId"
+        },
+        "paymentMethod": {
+          "type": "belongsTo",
+          "model": "PaymentMethod",
+          "foreingKey": "payId"
+        },
+        "country": {
+          "type": "belongsTo",
+          "model": "Country",
+          "foreignKey": "countryId"
+        },
+        "province": {
+          "type": "belongsTo",
+          "model": "Province",
+          "foreignKey": "provinceId"
+        }
       }
     }
-  }
+  },
+  "validations": [],
+  "relations": {
+    "account": {
+      "type": "hasOne",
+      "model": "Account",
+      "foreignKey": "id"
+    }
+  },
+  "acls": [],
+  "methods": {}
 }

services/client/common/models/ClientObservation.js

@@ -6,7 +6,6 @@ module.exports = function(ClientObservation) {
     }
 
     ClientObservation.observe('before save', function (ctx, next) {
-        var loopback = require('loopback');
         ctx.instance.creationDate = Date();
         next();
     });

services/client/common/models/account.json

@@ -4,16 +4,19 @@
   "validateUpsert": true,
   "properties": {
     "id": {
-      "type": "Number",
-      "id": true,
-      "description": "Identifier"
+      "type": "number",
+      "required": true
     },
     "name": {
       "type": "string",
       "required": true
-    }, 
+    },
     "active": {
       "type": "boolean"
     }
-  }
+  },
+  "validations": [],
+  "relations": {},
+  "acls": [],
+  "methods": {}
 }