lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix travis and return of api that change status

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-05 02:01:57 +01:00
parent 940e9cb1a5
commit 1e438b7ebd
2 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
htdocs/comm/propal/class/api_proposals.class.php
View File

@ -531,37 +531,6 @@ class Proposals extends DolibarrApi
} }
/**
* Set a commercial proposal billed. Could be also called setbilled
*
* @param int $id Commercial proposal ID
*
* @url POST {id}/setbilled
*
* @return array
*/
function setinvoiced($id)
{
if(! DolibarrApiAccess::$user->rights->propal->creer) {
throw new RestException(401);
}
$result = $this->propal->fetch($id);
if( ! $result ) {
throw new RestException(404, 'Commercial Proposal not found');
}
if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
$result = $this->propal->classifyBilled(DolibarrApiAccess::$user);
if( $result < 0) {
throw new RestException(400, $this->propal->error);
}
return $result;
}
/** /**
* Validate a commercial proposal * Validate a commercial proposal
* *
@ -584,8 +553,6 @@ class Proposals extends DolibarrApi
*/ */
function validate($id, $notrigger=0) function validate($id, $notrigger=0)
{ {
var_dump($notrigger);exit;
if(! DolibarrApiAccess::$user->rights->propal->creer) { if(! DolibarrApiAccess::$user->rights->propal->creer) {
throw new RestException(401); throw new RestException(401);
} }
@ -615,6 +582,8 @@ class Proposals extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
} }
$this->propal->fetchObjectLinked();
return $this->_cleanObjectDatas($this->propal); return $this->_cleanObjectDatas($this->propal);
} }
@ -652,16 +621,22 @@ class Proposals extends DolibarrApi
throw new RestException(500, 'Error when closing Commercial Proposal: '.$this->propal->error); throw new RestException(500, 'Error when closing Commercial Proposal: '.$this->propal->error);
} }
return array( $result = $this->propal->fetch($id);
'success' => array( if( ! $result ) {
'code' => 200, throw new RestException(404, 'Proposal not found');
'message' => 'Commercial Proposal closed (Ref='.$this->propal->ref.')' }
)
); if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
$this->propal->fetchObjectLinked();
return $this->_cleanObjectDatas($this->propal);
} }
/** /**
* Set a commercial proposal billed * Set a commercial proposal billed. Could be also called setbilled
* *
* @param int $id Commercial proposal ID * @param int $id Commercial proposal ID
* *
@ -688,12 +663,18 @@ class Proposals extends DolibarrApi
throw new RestException(500, 'Error : '.$this->propal->error); throw new RestException(500, 'Error : '.$this->propal->error);
} }
return array( $result = $this->propal->fetch($id);
'success' => array( if( ! $result ) {
'code' => 200, throw new RestException(404, 'Proposal not found');
'message' => 'Commercial Proposal set billed (Ref='.$this->propal->ref.')' }
)
); if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
$this->propal->fetchObjectLinked();
return $this->_cleanObjectDatas($this->propal);
} }

26
htdocs/commande/class/api_orders.class.php
View File

@ -605,7 +605,18 @@ class Orders extends DolibarrApi
throw new RestException(400, $this->commande->error); throw new RestException(400, $this->commande->error);
} }
return $result; $result = $this->commande->fetch($id);
if( ! $result ) {
throw new RestException(404, 'Order not found');
}
if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
$this->commande->fetchObjectLinked();
return $this->_cleanObjectDatas($this->commande);
} }
/** /**
@ -640,7 +651,18 @@ class Orders extends DolibarrApi
throw new RestException(500, 'Error when closing Order: '.$this->commande->error); throw new RestException(500, 'Error when closing Order: '.$this->commande->error);
} }
return $result; $result = $this->commande->fetch($id);
if( ! $result ) {
throw new RestException(404, 'Order not found');
}
if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
$this->commande->fetchObjectLinked();
return $this->_cleanObjectDatas($this->commande);
} }
/** /**