From 7d3de6c1aacd6f32f4e8b4051dee7580c147668d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 9 Apr 2016 10:42:22 +0200 Subject: [PATCH] Fixing remaining bugs for route-restructure --- Admin/Installer.php | 1 + Admin/Routes/http.php | 2 ++ Controller.php | 12 ++++++------ Theme/Backend/Lang/Navigation.en.lang.php | 4 ++-- Theme/Backend/Lang/en.lang.php | 4 ++-- Theme/backend/Lang/en.lang.php | 4 ++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 3da9038..f7ae728 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -17,6 +17,7 @@ namespace Modules\Purchase\Admin; use phpOMS\DataStorage\Database\DatabaseType; use phpOMS\DataStorage\Database\Pool; +use phpOMS\Module\InfoManager; use phpOMS\Module\InstallerAbstract; /** diff --git a/Admin/Routes/http.php b/Admin/Routes/http.php index 9473ec6..4b9e2d2 100644 --- a/Admin/Routes/http.php +++ b/Admin/Routes/http.php @@ -1,5 +1,7 @@ [ [ diff --git a/Controller.php b/Controller.php index 14106a4..933594f 100644 --- a/Controller.php +++ b/Controller.php @@ -90,7 +90,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewPurchaseInvoiceList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewPurchaseInvoiceList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/invoice-list'); @@ -109,7 +109,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewPurchaseInvoiceCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewPurchaseInvoiceCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/invoice-create'); @@ -128,7 +128,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewPurchaseArticleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewPurchaseArticleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/article-list'); @@ -147,7 +147,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewPurchaseArticleCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewPurchaseArticleCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/article-create'); @@ -166,7 +166,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewPurchaseArticleProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewPurchaseArticleProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/article-profile'); @@ -185,7 +185,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewPurchaseOrderRecommendation(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewPurchaseOrderRecommendation(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/article-order-recommendation'); diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 91770d7..a591d6d 100644 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,7 +13,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -$MODLANG['Navigation'] = [ +return ['Navigation' => [ 'Analysis' => 'Analysis', 'Articles' => 'Articles', 'Create' => 'Create', @@ -25,4 +25,4 @@ $MODLANG['Navigation'] = [ 'Profile' => 'Profile', 'Purchase' => 'Purchase', 'Suppliers' => 'Suppliers', -]; +]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index c0cc349..6af9464 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,7 +13,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -$MODLANG['Purchase'] = [ +return ['Purchase' => [ 'Account' => 'Account', 'Active' => 'Active', 'Activity' => 'Activity', @@ -100,4 +100,4 @@ $MODLANG['Purchase'] = [ 'Turnover' => 'Turnover', 'Type' => 'Type', 'ZipCode' => 'ZipCode', -]; +]]; diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index c0cc349..6af9464 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -13,7 +13,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -$MODLANG['Purchase'] = [ +return ['Purchase' => [ 'Account' => 'Account', 'Active' => 'Active', 'Activity' => 'Activity', @@ -100,4 +100,4 @@ $MODLANG['Purchase'] = [ 'Turnover' => 'Turnover', 'Type' => 'Type', 'ZipCode' => 'ZipCode', -]; +]];