diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index ef26205..1547553 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -156,8 +156,8 @@ "pid": "/", "type": 2, "subtype": 1, - "name": "BatchPostings", - "uri": "{/base}/accounting/stack/list", + "name": "Postings", + "uri": "{/base}/accounting/posting/list", "target": "self", "icon": null, "order": 10, @@ -171,7 +171,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/accounting/stack/list", + "uri": "{/base}/accounting/posting/list", "target": "self", "icon": null, "order": 5, @@ -186,7 +186,7 @@ "type": 3, "subtype": 1, "name": "Archive", - "uri": "{/base}/accounting/stack/archive/list", + "uri": "{/base}/accounting/posting/archive", "target": "self", "icon": null, "order": 10, @@ -200,8 +200,8 @@ "pid": "/", "type": 3, "subtype": 1, - "name": "Predefined", - "uri": "{/base}/accounting/stack/predefined/list", + "name": "Template", + "uri": "{/base}/accounting/posting/template/list", "target": "self", "icon": null, "order": 10, @@ -209,21 +209,6 @@ "permission": { "permission": 2, "category": null, "element": null }, "parent": 1002605001, "children": [] - }, - { - "id": 1002605401, - "pid": "/", - "type": 3, - "subtype": 1, - "name": "Create", - "uri": "{/base}/accounting/stack/create", - "target": "self", - "icon": null, - "order": 15, - "from": "Accounting", - "permission": { "permission": 4, "category": null, "element": null }, - "parent": 1002605001, - "children": [] } ] }, @@ -233,7 +218,7 @@ "type": 2, "subtype": 1, "name": "Entries", - "uri": "{/base}/accounting/entries/dashboard", + "uri": "{/base}/accounting/entry/dashboard", "target": "self", "icon": null, "order": 1, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 0a6257d..367d8cd 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -18,7 +18,7 @@ use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; return [ - '^/accounting/entries/dashboard(\?.*$|$)' => [ + '^/accounting/entry/dashboard(\?.*$|$)' => [ [ 'dest' => '\Modules\Accounting\Controller\BackendController:viewEntries', 'verb' => RouteVerb::GET, @@ -30,63 +30,63 @@ return [ ], ], ], - '^/accounting/stack/list(\?.*$|$)' => [ + '^/accounting/entry/list(\?.*$|$)' => [ [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewStackList', + 'dest' => '\Modules\Accounting\Controller\BackendController:viewEntryList', 'verb' => RouteVerb::GET, 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionCategory::STACK, + 'state' => PermissionCategory::ENTRY, ], ], ], - '^/accounting/stack/entries(\?.*$|$)' => [ + '^/accounting/entry/view(\?.*$|$)' => [ [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewStackEntries', + 'dest' => '\Modules\Accounting\Controller\BackendController:viewEntryView', 'verb' => RouteVerb::GET, 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionCategory::STACK, + 'state' => PermissionCategory::ENTRY, ], ], ], - '^/accounting/stack/archive/list(\?.*$|$)' => [ + '^/accounting/entry/create(\?.*$|$)' => [ [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewStackArchiveList', + 'dest' => '\Modules\Accounting\Controller\BackendController:viewEntryCreate', 'verb' => RouteVerb::GET, 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionCategory::STACK, + 'state' => PermissionCategory::ENTRY, ], ], ], - '^/accounting/stack/create(\?.*$|$)' => [ + '^/accounting/entry/archive(\?.*$|$)' => [ [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewStackCreate', - 'verb' => RouteVerb::GET, - 'active' => true, - 'permission' => [ - 'module' => BackendController::NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionCategory::STACK, - ], - ], - ], - '^/accounting/stack/predefined/list(\?.*$|$)' => [ - [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewStackPredefinedList', + 'dest' => '\Modules\Accounting\Controller\BackendController:viewEntryArchiveList', 'verb' => RouteVerb::GET, 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionCategory::STACK, + 'state' => PermissionCategory::ENTRY, + ], + ], + ], + '^/accounting/entry/template/list(\?.*$|$)' => [ + [ + 'dest' => '\Modules\Accounting\Controller\BackendController:viewEntryTemplateList', + 'verb' => RouteVerb::GET, + 'active' => true, + 'permission' => [ + 'module' => BackendController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::ENTRY, ], ], ], @@ -126,54 +126,6 @@ return [ ], ], ], - '^/accounting/dun/print(\?.*$|$)' => [ - [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewCostCenterView', - 'verb' => RouteVerb::GET, - 'active' => true, - 'permission' => [ - 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionCategory::COST_CENTER, - ], - ], - ], - '^/accounting/statement/print(\?.*$|$)' => [ - [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewCostCenterView', - 'verb' => RouteVerb::GET, - 'active' => true, - 'permission' => [ - 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionCategory::ACCOUNT, - ], - ], - ], - '^/accounting/balances/print(\?.*$|$)' => [ - [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewCostCenterView', - 'verb' => RouteVerb::GET, - 'active' => true, - 'permission' => [ - 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionCategory::ACCOUNT, - ], - ], - ], - '^/accounting/accountform/print(\?.*$|$)' => [ - [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewCostCenterView', - 'verb' => RouteVerb::GET, - 'active' => true, - 'permission' => [ - 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionCategory::ACCOUNT, - ], - ], - ], '^/accounting/costcenter/list(\?.*$|$)' => [ [ @@ -296,28 +248,4 @@ return [ ], ], ], - '^/accounting/supplier/entries(\?.*$|$)' => [ - [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewSupplierView', - 'verb' => RouteVerb::GET, - 'active' => true, - 'permission' => [ - 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionCategory::SUPPLIER, - ], - ], - ], - '^/accounting/client/entries(\?.*$|$)' => [ - [ - 'dest' => '\Modules\Accounting\Controller\BackendController:viewClientView', - 'verb' => RouteVerb::GET, - 'active' => true, - 'permission' => [ - 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionCategory::CLIENT, - ], - ], - ], ]; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 2fb7192..d5fa415 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -104,10 +104,10 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewStackList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface + public function viewEntryList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/Accounting/Theme/Backend/stack-list'); + $view->setTemplate('/Modules/Accounting/Theme/Backend/entry-list'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response); return $view; @@ -125,10 +125,10 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewStackPredefinedList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface + public function viewEntryTemplateList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/Accounting/Theme/Backend/stack-predefined-list'); + $view->setTemplate('/Modules/Accounting/Theme/Backend/entry-template-list'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response); return $view; @@ -146,10 +146,10 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewStackCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface + public function viewEntryCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/Accounting/Theme/Backend/stack-create'); + $view->setTemplate('/Modules/Accounting/Theme/Backend/entry-create'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response); return $view; @@ -167,10 +167,10 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewStackEntries(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface + public function viewEntryView(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/Accounting/Theme/Backend/stack-entries'); + $view->setTemplate('/Modules/Accounting/Theme/Backend/entry-view'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response); return $view; @@ -188,10 +188,10 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewStackArchiveList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface + public function viewEntryArchiveList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/Accounting/Theme/Backend/stack-archive-list'); + $view->setTemplate('/Modules/Accounting/Theme/Backend/entry-archive-list'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002605001, $request, $response); return $view; diff --git a/Theme/Backend/coa-list.tpl.php b/Theme/Backend/coa-list.tpl.php index c58c2f1..b08297b 100644 --- a/Theme/Backend/coa-list.tpl.php +++ b/Theme/Backend/coa-list.tpl.php @@ -23,7 +23,7 @@ echo $this->data['nav']->render(); ?>
-
+
getHtml('COA'); ?>download
@@ -43,6 +43,6 @@ echo $this->data['nav']->render(); ?>
getHtml('Empty', '0', '0'); ?>
-
+
diff --git a/Theme/Backend/costcenter-list.tpl.php b/Theme/Backend/costcenter-list.tpl.php index 4e6d9c6..6678f4d 100755 --- a/Theme/Backend/costcenter-list.tpl.php +++ b/Theme/Backend/costcenter-list.tpl.php @@ -26,7 +26,7 @@ $next = empty($costcenter) ? '{/base}/accounting/costcenter/list' : '{/base} echo $this->data['nav']->render(); ?>
-
+
getHtml('CostCenters'); ?>download
@@ -45,6 +45,7 @@ echo $this->data['nav']->render(); ?>
getHtml('Empty', '0', '0'); ?> -
+ +
diff --git a/Theme/Backend/costobject-list.tpl.php b/Theme/Backend/costobject-list.tpl.php index 2dcbd0c..8fad2dd 100755 --- a/Theme/Backend/costobject-list.tpl.php +++ b/Theme/Backend/costobject-list.tpl.php @@ -26,7 +26,7 @@ $next = empty($costobject) ? '{/base}/accounting/costobject/list' : '{/base} echo $this->data['nav']->render(); ?>
-
+
getHtml('CostObjects'); ?>download
@@ -45,6 +45,7 @@ echo $this->data['nav']->render(); ?>
getHtml('Empty', '0', '0'); ?> -
+ +
diff --git a/Theme/Backend/entries.tpl.php b/Theme/Backend/entries.tpl.php index 2178bcb..0bf3c6c 100755 --- a/Theme/Backend/entries.tpl.php +++ b/Theme/Backend/entries.tpl.php @@ -90,7 +90,7 @@ $footerView->setResults(1);
-
+
getHtml('Entries'); ?>download
@@ -119,7 +119,7 @@ $footerView->setResults(1);
-
+
@@ -127,7 +127,7 @@ $footerView->setResults(1);
-
+
getHtml('Accounts'); ?>download
@@ -146,10 +146,10 @@ $footerView->setResults(1);
-
+
-
+
getHtml('CostCenter'); ?>download
@@ -168,10 +168,10 @@ $footerView->setResults(1);
-
+
-
+
getHtml('CostObject'); ?>download
@@ -190,7 +190,7 @@ $footerView->setResults(1);
-
+
diff --git a/Theme/Backend/personal-view.tpl.php b/Theme/Backend/personal-view.tpl.php index 20b180b..1b9aa7f 100644 --- a/Theme/Backend/personal-view.tpl.php +++ b/Theme/Backend/personal-view.tpl.php @@ -210,7 +210,7 @@ echo $this->data['nav']->render(); ?>
- +