diff --git a/Admin/Hooks/Manual.php b/Admin/Hooks/Manual.php index c48aef5..24cb569 100644 --- a/Admin/Hooks/Manual.php +++ b/Admin/Hooks/Manual.php @@ -13,7 +13,7 @@ declare(strict_types=1); return [ - '/PRE:Module:Billing\-bill\-finalize/' => [ + '/PRE:Billing\-bill\-finalize/' => [ 'callback' => ['\Modules\Accounting\Controller\ApiController:eventBillArchive'], ], ]; diff --git a/Admin/Hooks/Web/Api.php b/Admin/Hooks/Web/Api.php index aedf974..fe6d78e 100644 --- a/Admin/Hooks/Web/Api.php +++ b/Admin/Hooks/Web/Api.php @@ -13,10 +13,10 @@ declare(strict_types=1); return [ - 'POST:Module:ClientManagement-client-create' => [ + 'POST:ClientManagement-client-create' => [ 'callback' => ['\Modules\Accounting\Controller\ApiController:hookPersonalAccountCreate'], ], - 'POST:Module:SupplierManagement-supplier-create' => [ + 'POST:SupplierManagement-supplier-create' => [ 'callback' => ['\Modules\Accounting\Controller\ApiController:hookPersonalAccountCreate'], ], ]; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index c3813e5..1cad496 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -245,7 +245,7 @@ final class BackendController extends Controller $view->data['account'] = AccountAbstractMapper::get() ->with('parent') ->with('l11n') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('l11n/language', $response->header->l11n->language) ->execute(); @@ -351,7 +351,7 @@ final class BackendController extends Controller $view->data['costcenter'] = CostCenterMapper::get() ->with('parent') ->with('l11n') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('l11n/language', $response->header->l11n->language) ->execute(); @@ -388,7 +388,7 @@ final class BackendController extends Controller $view->data['costobject'] = CostObjectMapper::get() ->with('parent') ->with('l11n') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('l11n/language', $response->header->l11n->language) ->execute(); @@ -562,7 +562,7 @@ final class BackendController extends Controller ->with('attributes/type/l11n') ->with('attributes/value') ->with('attributes/value/l11n') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('attributes/type/l11n/language', $response->header->l11n->language) ->where('attributes/value/l11n/language', [$response->header->l11n->language, null]) ->execute(); @@ -671,7 +671,7 @@ final class BackendController extends Controller ->with('attributes/type/l11n') ->with('attributes/value') ->with('attributes/value/l11n') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('attributes/type/l11n/language', $response->header->l11n->language) ->where('attributes/value/l11n/language', [$response->header->l11n->language, null]) ->execute(); diff --git a/Theme/Backend/personal-view.tpl.php b/Theme/Backend/personal-view.tpl.php index 6bf7a71..39ffe08 100644 --- a/Theme/Backend/personal-view.tpl.php +++ b/Theme/Backend/personal-view.tpl.php @@ -31,7 +31,7 @@ $isNew = ($account?->id ?? 0) === 0; $isClient = $account instanceof Client; -$accountImage = $this->getData('accountImage') ?? new NullMedia(); +$accountImage = $this->data['accountImage'] ?? new NullMedia(); $attributeView = $this->data['attributeView']; @@ -211,7 +211,7 @@ echo $this->data['nav']->render(); ?>
- +