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

This commit is contained in:
Juan Ferrer Toribio 2017-01-24 16:06:15 +01:00
commit 278d764575
8 changed files with 51 additions and 37 deletions

View File

@ -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();

View File

@ -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
);

View File

@ -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();

View File

@ -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();

View File

@ -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();
}

View File

@ -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": {}
}

View File

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

View File

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