v19.0.OS (#35)

* Updates from pro v19

* Update travis

* Update db script

* Update docs

* change build script
This commit is contained in:
icehrm
2016-12-05 16:22:47 +01:00
committed by GitHub
parent 4c171bfce3
commit a619f76b3a
304 changed files with 3387 additions and 68986 deletions

View File

@@ -102,12 +102,13 @@ class EmployeesActionManager extends SubActionManager{
$ok = $archived->Save();
if(!$ok){
return new IceResponse(IceResponse::ERROR, "Error occured while archiving employee");
return new IceResponse(IceResponse::ERROR, "Error occurred while archiving employee");
}
$ok = $employee->Delete();
if(!$ok){
return new IceResponse(IceResponse::ERROR, "Error occured while deleting employee");
return new IceResponse(IceResponse::ERROR, "Error occurred while deleting employee");
}
return new IceResponse(IceResponse::SUCCESS, $archived);