diff --git a/hesabixCore/src/Controller/BankController.php b/hesabixCore/src/Controller/BankController.php index 52e4972..c3de82a 100644 --- a/hesabixCore/src/Controller/BankController.php +++ b/hesabixCore/src/Controller/BankController.php @@ -59,8 +59,8 @@ class BankController extends AbstractController ->getQuery() ->getResult(); foreach ($items as $item) { - $bs += $item->getBs(); - $bd += $item->getBd(); + $bs += (float) $item->getBs(); + $bd += (float) $item->getBd(); } $data->setBalance($bd - $bs); } diff --git a/hesabixCore/src/Controller/CashdeskController.php b/hesabixCore/src/Controller/CashdeskController.php index b02ff8f..931004f 100644 --- a/hesabixCore/src/Controller/CashdeskController.php +++ b/hesabixCore/src/Controller/CashdeskController.php @@ -61,8 +61,8 @@ class CashdeskController extends AbstractController ->getQuery() ->getResult(); foreach ($items as $item) { - $bs += $item->getBs(); - $bd += $item->getBd(); + $bs += (float) $item->getBs(); + $bd += (float) $item->getBd(); } $data->setBalance($bd - $bs); $resp[] = Explore::ExploreCashdesk($data); @@ -206,8 +206,8 @@ class CashdeskController extends AbstractController ->getQuery() ->getResult(); foreach ($items as $item) { - $bs += $item->getBs(); - $bd += $item->getBd(); + $bs += (float) $item->getBs(); + $bd += (float) $item->getBd(); } $data->setBalance($bd - $bs); } @@ -255,8 +255,8 @@ class CashdeskController extends AbstractController ->getResult(); foreach ($items as $item) { - $bs += $item->getBs(); - $bd += $item->getBd(); + $bs += (float) $item->getBs(); + $bd += (float) $item->getBd(); } return $this->json([ diff --git a/hesabixCore/src/Service/Access.php b/hesabixCore/src/Service/Access.php index 88e4024..0b364d5 100644 --- a/hesabixCore/src/Service/Access.php +++ b/hesabixCore/src/Service/Access.php @@ -144,13 +144,26 @@ class Access } } + // normalize incoming role names to match Permission getters + $normalizeMap = [ + 'bank' => 'banks', + 'transfer' => 'bankTransfer', + 'person_receive' => 'person', + 'person_send' => 'person', + 'sell_receive' => 'sell', + 'buy_send' => 'buy', + 'all' => 'accounting', + ]; + if (isset($normalizeMap[$roll])) { + $roll = $normalizeMap[$roll]; + } $methodName = 'is' . ucfirst($roll); $permission = $this->em->getRepository(Permission::class)->findOneBy([ 'bid'=>$bid, 'user'=>$this->user ]); if($permission){ - if($permission->{$methodName}()) + if(method_exists($permission, $methodName) && $permission->{$methodName}()) return $accessArray; } return false;