diff --git a/hesabixCore/src/Controller/PersonsController.php b/hesabixCore/src/Controller/PersonsController.php index c5c8ef5..05a353d 100644 --- a/hesabixCore/src/Controller/PersonsController.php +++ b/hesabixCore/src/Controller/PersonsController.php @@ -123,7 +123,17 @@ class PersonsController extends AbstractController //check exist before if (!$person) { $person = new Person(); - $person->setCode($provider->getAccountingCode($acc['bid'], 'person')); + $code = $provider->getAccountingCode($acc['bid'], 'person'); + $exist = $entityManager->getRepository(Person::class)->findOneBy([ + 'code' => $code + ]); + while ($exist) { + $code = $provider->getAccountingCode($acc['bid'], 'person'); + $exist = $entityManager->getRepository(Person::class)->findOneBy([ + 'code' => $code + ]); + } + $person->setCode($code); } } else { @@ -259,7 +269,17 @@ class PersonsController extends AbstractController //check exist before if (!$person) { $person = new Person(); - $person->setCode($provider->getAccountingCode($acc['bid'], 'person')); + $code = $provider->getAccountingCode($acc['bid'], 'person'); + $exist = $entityManager->getRepository(Person::class)->findOneBy([ + 'code' => $code + ]); + while ($exist) { + $code = $provider->getAccountingCode($acc['bid'], 'person'); + $exist = $entityManager->getRepository(Person::class)->findOneBy([ + 'code' => $code + ]); + } + $person->setCode($code); } } else { @@ -1397,7 +1417,17 @@ class PersonsController extends AbstractController //check exist before if (!$person) { $person = new Person(); - $person->setCode($provider->getAccountingCode($acc['bid'], 'person')); + $code = $provider->getAccountingCode($acc['bid'], 'person'); + $exist = $entityManager->getRepository(Person::class)->findOneBy([ + 'code' => $code + ]); + while ($exist) { + $code = $provider->getAccountingCode($acc['bid'], 'person'); + $exist = $entityManager->getRepository(Person::class)->findOneBy([ + 'code' => $code + ]); + } + $person->setCode($code); $person->setNikename($item[0]); $person->setBid($acc['bid']); diff --git a/hesabixCore/src/Service/Access.php b/hesabixCore/src/Service/Access.php index b56fa01..f11de14 100644 --- a/hesabixCore/src/Service/Access.php +++ b/hesabixCore/src/Service/Access.php @@ -77,10 +77,7 @@ class Access if (!$money) { return false; } } else{ - $money = $this->em->getRepository(Money::class)->findOneBy([ - 'name' => $bid->getMoney(), - ]); - if (!$money) { return false; } + $money = $bid->getMoney(); } $accessArray = [ diff --git a/hesabixCore/src/Service/Provider.php b/hesabixCore/src/Service/Provider.php index 3fc16f7..dd73230 100644 --- a/hesabixCore/src/Service/Provider.php +++ b/hesabixCore/src/Service/Provider.php @@ -96,6 +96,7 @@ class Provider return $count; } + /** * @throws ReflectionException */ diff --git a/webUI/src/views/user/profile/dashboard.vue b/webUI/src/views/user/profile/dashboard.vue index 41058c0..59f7fd9 100644 --- a/webUI/src/views/user/profile/dashboard.vue +++ b/webUI/src/views/user/profile/dashboard.vue @@ -3,6 +3,7 @@ + {{ $t('tabs.suggestions') }} @@ -108,6 +109,15 @@ + + + + + + + + +