Restructure

This commit is contained in:
Dennis Eichhorn 2015-12-31 18:05:19 +01:00
parent 741709d49d
commit 3e2ad6400a
9 changed files with 18 additions and 15 deletions

View File

@ -15,7 +15,7 @@
*/
namespace Modules\Billing\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\ActivateAbstract;

View File

@ -15,7 +15,7 @@
*/
namespace Modules\Billing\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\DeactivateAbstract;

View File

@ -14,6 +14,7 @@
* @link http://orange-management.com
*/
namespace Modules\Billing\Admin\Install;
use phpOMS\DataStorage\Database\Pool;
/**
* Navigation class.
@ -33,6 +34,7 @@ class Navigation
$navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
$class = '\\Modules\\Navigation\\Admin\\Installer';
/** @var $class \Modules\Navigation\Admin\Installer */
$class::installExternal($dbPool, $navData);
}
}

View File

@ -15,7 +15,7 @@
*/
namespace Modules\Billing\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\UninstallAbstract;

View File

@ -15,9 +15,10 @@
*/
namespace Modules\Billing\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\UpdateAbstract;
use phpOMS\System\FileSystem;
/**
* Navigation class.
@ -38,6 +39,8 @@ class Update extends UpdateAbstract
*/
public static function update(Pool $dbPool, array $info)
{
FileSystem::deletePath(__DIR__ . '/Update');
mkdir('Update');
parent::update($dbPool, $info);
}
}

View File

@ -62,7 +62,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var \string
* @since 1.0.0
*/
protected static $module = 'Billing';
const MODULE_NAME = 'Billing';
/**
* Localization files.
@ -71,7 +71,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0
*/
protected static $localization = [
RequestDestination::BACKEND => ['backend'],
RequestDestination::BACKEND => [''],
];
/**
@ -80,9 +80,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var \string
* @since 1.0.0
*/
protected static $providing = [
'Content',
];
protected static $providing = [];
/**
* Dependencies.
@ -119,7 +117,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function viewBillingInvoiceList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Billing/Theme/backend/invoice-list');
$view->setTemplate('/Modules/Billing/Theme/Backend/invoice-list');
$view->addData('nav', $this->createNavigation(1005104001, $request, $response));
return $view;
@ -138,7 +136,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function viewBillingInvoiceCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Billing/Theme/backend/invoice-create');
$view->setTemplate('/Modules/Billing/Theme/Backend/invoice-create');
$view->addData('nav', $this->createNavigation(1005104001, $request, $response));
return $view;
@ -157,7 +155,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function viewBillingPurchaInvoiceList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Billing/Theme/backend/purchase-invoice-list');
$view->setTemplate('/Modules/Billing/Theme/Backend/purchase-invoice-list');
$view->addData('nav', $this->createNavigation(1005104001, $request, $response));
return $view;
@ -177,7 +175,7 @@ class Controller extends ModuleAbstract implements WebInterface
{
$nav = Navigation::getInstance($request, $this->app->dbPool);
$navView = new NavigationView($this->app, $request, $response);
$navView->setTemplate('/Modules/Navigation/Theme/backend/mid');
$navView->setTemplate('/Modules/Navigation/Theme/Backend/mid');
$navView->setNav($nav->getNav());
$navView->setLanguage($request->getL11n()->language);
$navView->setParent($pageId);

View File

@ -37,7 +37,7 @@
"type": 5,
"from": "Billing",
"for": "Navigation",
"file": "nav.backend"
"file": "Navigation"
},
{
"pid": [
@ -46,7 +46,7 @@
],
"type": 5,
"for": "Content",
"file": "backend",
"file": "",
"from": "Billing"
}
]