galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Making code PSR2 compliant

Browse Source
This commit is contained in:
gamonoid
2017-09-24 19:23:30 +02:00
parent 05b57e0236
commit 6c61577583
160 changed files with 1432 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Payroll/Admin/Api/PayrollActionManager.php
View File

@@ -29,7 +29,7 @@ class PayrollActionManager extends SubActionManager
const REG_HOURS_PER_WEEK = 40;
var $calCache = array();
protected $calCache = array();
public function addToCalculationCache($key, $val)
{
@@ -45,8 +45,14 @@ class PayrollActionManager extends SubActionManager
return null;
}
public function calculatePayrollColumn($col, $payroll, $employeeId, $payrollEmployeeId, $noColumnCalculations = false)
{
public function calculatePayrollColumn(
$col,
$payroll,
$employeeId,
$payrollEmployeeId,
$noColumnCalculations = false
) {
$val = $this->getFromCalculationCache($col->id."-".$payroll->id."-".$employeeId);
if (!empty($val)) {
return $val;
@@ -55,7 +61,11 @@ class PayrollActionManager extends SubActionManager
//LogManager::getInstance()->info("calculatePayrollColumn:".json_encode($col));
if (!empty($col->calculation_hook)) {
$sum = BaseService::getInstance()->executeCalculationHook(array($employeeId, $payroll->date_start, $payroll->date_end), $col->calculation_hook, null);
$sum = BaseService::getInstance()->executeCalculationHook(
array($employeeId, $payroll->date_start, $payroll->date_end),
$col->calculation_hook,
null
);
$val = number_format(round($sum, 2), 2, '.', '');
$this->addToCalculationCache($col->id."-".$payroll->id."-".$employeeId, $val);
return $val;
@@ -71,7 +81,10 @@ class PayrollActionManager extends SubActionManager
if (!empty($col->salary_components) &&
!empty(json_decode($col->salary_components, true))) {
$salaryComponent = new SalaryComponent();
$salaryComponents = $salaryComponent->Find("id in (".implode(",", json_decode($col->salary_components, true)).")", array());
$salaryComponents = $salaryComponent->Find(
"id in (".implode(",", json_decode($col->salary_components, true)).")",
array()
);
LogManager::getInstance()->info("salary components:".$salaryComponents);
foreach ($salaryComponents as $salaryComponent) {
$sum += $this->getTotalForEmployeeSalaryByComponent($employeeId, $salaryComponent->id);
@@ -83,9 +96,15 @@ class PayrollActionManager extends SubActionManager
!empty(json_decode($col->deductions, true))) {
$deduction = new Deduction();
if (empty($payRollEmp->deduction_group)) {
$deductions = $deduction->Find("id in (".implode(",", json_decode($col->deductions, true)).")", array());
$deductions = $deduction->Find(
"id in (".implode(",", json_decode($col->deductions, true)).")",
array()
);
} else {
$deductions = $deduction->Find("deduction_group = ? and id in (".implode(",", json_decode($col->deductions, true)).")", array($payRollEmp->deduction_group));
$deductions = $deduction->Find(
"deduction_group = ? and id in (".implode(",", json_decode($col->deductions, true)).")",
array($payRollEmp->deduction_group)
);
}
$allowedDeductions = $this->getAllowedDeductionsForEmployee($employeeId, $payRollEmp->deduction_group);
@@ -165,13 +184,19 @@ class PayrollActionManager extends SubActionManager
$salaryComponents = array();
if (!empty($deduction->componentType) && !empty(json_decode($deduction->componentType, true))) {
$salaryComponent = new SalaryComponent();
$salaryComponents = $salaryComponent->Find("componentType in (".implode(",", json_decode($deduction->componentType, true)).")", array());
$salaryComponents = $salaryComponent->Find(
"componentType in (".implode(",", json_decode($deduction->componentType, true)).")",
array()
);
}
$salaryComponents2 = array();
if (!empty($deduction->component) && !empty(json_decode($deduction->component, true))) {
$salaryComponent = new SalaryComponent();
$salaryComponents2 = $salaryComponent->Find("id in (".implode(",", json_decode($deduction->component, true)).")", array());
$salaryComponents2 = $salaryComponent->Find(
"id in (".implode(",", json_decode($deduction->component, true)).")",
array()
);
}
$sum = 0;
@@ -352,7 +377,10 @@ class PayrollActionManager extends SubActionManager
}
$column = new $columnTable();
$columns = $column->Find("enabled = ? and id in (".implode(",", $columnList).") order by colorder, id", array('Yes'));
$columns = $column->Find(
"enabled = ? and id in (".implode(",", $columnList).") order by colorder, id",
array('Yes')
);
$cost = new $valueTable();
$costs = $cost->Find("payroll = ?", array($req->payrollId));
@@ -372,7 +400,10 @@ class PayrollActionManager extends SubActionManager
if ($payroll->status != "Completed") {
foreach ($columns as $column) {
if (isset($valueMap[$e->id][$column->id]) && $column->editable == "Yes") {
$this->addToCalculationCache($column->id."-".$payroll->id."-".$e->id, $valueMap[$e->id][$column->id]->amount);
$this->addToCalculationCache(
$column->id."-".$payroll->id."-".$e->id,
$valueMap[$e->id][$column->id]->amount
);
continue;
}
$item = new PayrollData();

2
src/Payroll/Common/Model/Deduction.php
View File

@@ -12,7 +12,7 @@ use Model\BaseModel;
class Deduction extends BaseModel
{
var $_table = 'Deductions';
public $table = 'Deductions';
public function getAdminAccess()
{

2
src/Payroll/Common/Model/DeductionGroup.php
View File

@@ -12,7 +12,7 @@ use Model\BaseModel;
class DeductionGroup extends BaseModel
{
var $_table = 'DeductionGroup';
public $table = 'DeductionGroup';
public function getAdminAccess()
{

2
src/Payroll/Common/Model/PayFrequency.php
View File

@@ -12,7 +12,7 @@ use Model\BaseModel;
class PayFrequency extends BaseModel
{
var $_table = 'PayFrequency';
public $table = 'PayFrequency';
public function getAdminAccess()
{
return array("get","element","save","delete");

2
src/Payroll/Common/Model/Payroll.php
View File

@@ -13,7 +13,7 @@ use Model\BaseModel;
class Payroll extends BaseModel
{
var $_table = 'Payroll';
public $table = 'Payroll';
public function getAdminAccess()
{
return array("get","element","save","delete");

15
src/Payroll/Common/Model/PayrollCalculations.php
View File

@@ -27,7 +27,10 @@ class PayrollCalculations extends BaseModel
} else {
//Find all pay period salary
$employeeSalary = new EmployeeSalary();
$list = $employeeSalary->Find("employee = ? and pay_frequency = ?", array($employeeId, $payroll->pay_period));
$list = $employeeSalary->Find(
"employee = ? and pay_frequency = ?",
array($employeeId, $payroll->pay_period)
);
$amount = 0;
foreach ($list as $sal) {
$amount += floatval($sal->amount);
@@ -53,7 +56,10 @@ class PayrollCalculations extends BaseModel
$end = date("Y-m-d", strtotime($attendance->out_time));
$timesheet = new EmployeeTimeSheet();
$timesheet->Load("date_start <= ? and date_end >= ? and employee = ?", array($start, $end, $attendance->employee));
$timesheet->Load(
"date_start <= ? and date_end >= ? and employee = ?",
array($start, $end, $attendance->employee)
);
if (!empty($timesheet->id)) {
if ($timesheet->status == "Approved") {
@@ -73,7 +79,10 @@ class PayrollCalculations extends BaseModel
$endTime = strtotime($end);
$attendance = new Attendance();
$list = $attendance->Find("employee = ? and ((in_time >= ? and in_time <= ?) or (out_time >= ? and out_time <= ?))", array($employee, $start, $end, $start, $end));
$list = $attendance->Find(
"employee = ? and ((in_time >= ? and in_time <= ?) or (out_time >= ? and out_time <= ?))",
array($employee, $start, $end, $start, $end)
);
$seconds = 0;
$unapprovedSeconds = 0;

2
src/Payroll/Common/Model/PayrollColumn.php
View File

@@ -12,7 +12,7 @@ use Model\BaseModel;
class PayrollColumn extends BaseModel
{
var $_table = 'PayrollColumns';
public $table = 'PayrollColumns';
public function getAdminAccess()
{
return array("get","element","save","delete");

2
src/Payroll/Common/Model/PayrollColumnTemplate.php
View File

@@ -12,7 +12,7 @@ use Model\BaseModel;
class PayrollColumnTemplate extends BaseModel
{
var $_table = 'PayrollColumnTemplates';
public $table = 'PayrollColumnTemplates';
public function getAdminAccess()
{
return array("get","element","save","delete");

2
src/Payroll/Common/Model/PayrollData.php
View File

@@ -12,7 +12,7 @@ use Model\BaseModel;
class PayrollData extends BaseModel
{
var $_table = 'PayrollData';
public $table = 'PayrollData';
public function getAdminAccess()
{

2
src/Payroll/Common/Model/PayslipTemplate.php
View File

@@ -12,7 +12,7 @@ use Model\BaseModel;
class PayslipTemplate extends BaseModel
{
var $_table = 'PayslipTemplates';
public $table = 'PayslipTemplates';
public function getAdminAccess()
{