From 91d8318383564af966a01111f975aa04c7c480dc Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
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                            | 6 +++---
 Theme/Backend/Lang/Navigation.en.lang.php | 4 ++--
 Theme/Backend/Lang/en.lang.php            | 4 ++--
 Theme/backend/Lang/Navigation.en.lang.php | 4 ++--
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Admin/Installer.php b/Admin/Installer.php
index 66a7c80..d9bbccc 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -17,6 +17,7 @@ namespace Modules\Billing\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 1067267..bdba282 100644
--- a/Admin/Routes/http.php
+++ b/Admin/Routes/http.php
@@ -1,5 +1,7 @@
 <?php
 
+use phpOMS\Router\RouteVerb;
+
 return [
     '^.*/backend/sales/invoice/create.*$' => [
         [
diff --git a/Controller.php b/Controller.php
index ab4c8d4..6745064 100644
--- a/Controller.php
+++ b/Controller.php
@@ -90,7 +90,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewBillingInvoiceList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewBillingInvoiceList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Billing/Theme/Backend/invoice-list');
@@ -109,7 +109,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewBillingInvoiceCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewBillingInvoiceCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Billing/Theme/Backend/invoice-create');
@@ -128,7 +128,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewBillingPurchaInvoiceList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewBillingPurchaInvoiceList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Billing/Theme/Backend/purchase-invoice-list');
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 2a1e052..9341b24 100644
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -13,6 +13,6 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Navigation'] = [
+return ['Navigation' => [
     'Billing' => 'Billing',
-];
+]];
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 58b9027..3d01146 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -1,4 +1,4 @@
-<?php
+z<?php
 /**
  * Orange Management
  *
@@ -13,7 +13,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Billing'] = [
+return [
     'Address'      => 'Address',
     'Addresses'    => 'Addresses',
     'Bonus'        => 'Bonus',
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
index 2a1e052..9341b24 100644
--- a/Theme/backend/Lang/Navigation.en.lang.php
+++ b/Theme/backend/Lang/Navigation.en.lang.php
@@ -13,6 +13,6 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Navigation'] = [
+return ['Navigation' => [
     'Billing' => 'Billing',
-];
+]];