Jingga/oms-ClientManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ClientManagement.git synced 2026-02-11 22:38:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	Draw/Controller.js
#	Draw/Models/DrawType.enum.js
#	Draw/Models/Editor.js
#	Media/Models/UploadFile.php
This commit is contained in:
Dennis Eichhorn 2017-01-26 16:42:29 +01:00
commit ca5845d87d
14 changed files with 98 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin/Activate.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -16,7 +16,7 @@
namespace Modules\ClientManagement\Admin; namespace Modules\ClientManagement\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\ActivateAbstract; use phpOMS\Module\ActivateAbstract;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
@ -37,7 +37,7 @@ class Activate extends ActivateAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function activate(Pool $dbPool, InfoManager $info) public static function activate(DatabasePool $dbPool, InfoManager $info)
{ {
parent::activate($dbPool, $info); parent::activate($dbPool, $info);
} }

6
Admin/Deactivate.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -16,7 +16,7 @@
namespace Modules\ClientManagement\Admin; namespace Modules\ClientManagement\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\DeactivateAbstract;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function deactivate(Pool $dbPool, InfoManager $info) public static function deactivate(DatabasePool $dbPool, InfoManager $info)
{ {
parent::deactivate($dbPool, $info); parent::deactivate($dbPool, $info);
} }

6
Admin/Install/Navigation.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -14,7 +14,7 @@
* @link http://orange-management.com * @link http://orange-management.com
*/ */
namespace Modules\ClientManagement\Admin\Install; namespace Modules\ClientManagement\Admin\Install;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
/** /**
* Navigation class. * Navigation class.
@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool;
*/ */
class Navigation class Navigation
{ {
public static function install(Pool $dbPool) public static function install(string $path, DatabasePool $dbPool)
{ {
$navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);

8
Admin/Installer.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -16,7 +16,7 @@
namespace Modules\ClientManagement\Admin; namespace Modules\ClientManagement\Admin;
use phpOMS\DataStorage\Database\DatabaseType; use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
use phpOMS\Module\InstallerAbstract; use phpOMS\Module\InstallerAbstract;
@ -37,9 +37,9 @@ class Installer extends InstallerAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function install(Pool $dbPool, InfoManager $info) public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
{ {
parent::install($dbPool, $info); parent::install($path, $dbPool, $info);
switch ($dbPool->get('core')->getType()) { switch ($dbPool->get('core')->getType()) {
case DatabaseType::MYSQL: case DatabaseType::MYSQL:

6
Admin/Uninstall.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -16,7 +16,7 @@
namespace Modules\ClientManagement\Admin; namespace Modules\ClientManagement\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\UninstallAbstract; use phpOMS\Module\UninstallAbstract;
/** /**
@ -36,7 +36,7 @@ class Uninstall extends UninstallAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function uninstall(Pool $dbPool, InfoManager $info) public static function uninstall(DatabasePool $dbPool, InfoManager $info)
{ {
parent::uninstall($dbPool, $info); parent::uninstall($dbPool, $info);
} }

6
Admin/Update.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -16,7 +16,7 @@
namespace Modules\ClientManagement\Admin; namespace Modules\ClientManagement\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\UpdateAbstract; use phpOMS\Module\UpdateAbstract;
use phpOMS\System\File\Directory; use phpOMS\System\File\Directory;
@ -37,7 +37,7 @@ class Update extends UpdateAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function update(Pool $dbPool, array $info) public static function update(DatabasePool $dbPool, array $info)
{ {
Directory::deletePath(__DIR__ . '/Update'); Directory::deletePath(__DIR__ . '/Update');
mkdir('Update'); mkdir('Update');

8
Controller.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -45,7 +45,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
const MODULE_PATH = __DIR__; /* public */ const MODULE_PATH = __DIR__;
/** /**
* Module version. * Module version.
@ -53,7 +53,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
const MODULE_VERSION = '1.0.0'; /* public */ const MODULE_VERSION = '1.0.0';
/** /**
* Module name. * Module name.
@ -61,7 +61,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
const MODULE_NAME = 'ClientManagement'; /* public */ const MODULE_NAME = 'ClientManagement';
/** /**
* Providing. * Providing.

2
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

34
Theme/Backend/clients-create.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -29,6 +29,7 @@ echo $this->getData('nav')->render(); ?>
<li><label for="c-tab-6"><?= $this->getText('Prices') ?></label></li> <li><label for="c-tab-6"><?= $this->getText('Prices') ?></label></li>
<li><label for="c-tab-7"><?= $this->getText('AreaManager') ?></label></li> <li><label for="c-tab-7"><?= $this->getText('AreaManager') ?></label></li>
<li><label for="c-tab-8"><?= $this->getText('Files') ?></label></li> <li><label for="c-tab-8"><?= $this->getText('Files') ?></label></li>
<li><label for="c-tab-9"><?= $this->getText('Logs') ?></label>
</ul> </ul>
</div> </div>
<div class="tab-content"> <div class="tab-content">
@ -225,5 +226,36 @@ echo $this->getData('nav')->render(); ?>
<input type="radio" id="c-tab-8" name="tabular-2"> <input type="radio" id="c-tab-8" name="tabular-2">
<div class="tab"> <div class="tab">
</div> </div>
<input type="radio" id="c-tab-9" name="tabular-2">
<div class="tab">
<?php
$footerView = new \Web\Views\Lists\PaginationView($this->app, $this->request, $this->response);
$footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
$footerView->setPages(20);
$footerView->setPage(1);
?>
<div class="box w-100">
<table class="table">
<caption><?= $this->getText('Logs') ?></caption>
<thead>
<tr>
<td>IP
<td><?= $this->getText('ID', 0, 0); ?>
<td><?= $this->getText('Name'); ?>
<td class="wf-100"><?= $this->getText('Log'); ?>
<td><?= $this->getText('Date'); ?>
<tfoot>
<tr>
<td colspan="6"><?= $footerView->render(); ?>
<tbody>
<tr>
<td><?= $this->request->getOrigin(); ?>
<td><?= $this->request->getAccount(); ?>
<td><?= $this->request->getAccount(); ?>
<td>Creating customer
<td><?= (new \DateTime('now'))->format('Y-m-d H:i:s') ?>
</table>
</div>
</div>
</div> </div>
</div> </div>

2
Theme/Backend/clients-list.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/clients-single.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

6
Theme/backend/Lang/en.lang.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -27,6 +27,7 @@ return ['ClientManagement' => [
'Contact' => 'Contact', 'Contact' => 'Contact',
'Country' => 'Country', 'Country' => 'Country',
'Creditcard' => 'Creditcard', 'Creditcard' => 'Creditcard',
'Date' => 'Date',
'Default' => 'Default', 'Default' => 'Default',
'Delivery' => 'Delivery', 'Delivery' => 'Delivery',
'Discount' => 'Discount', 'Discount' => 'Discount',
@ -36,9 +37,12 @@ return ['ClientManagement' => [
'Files' => 'Files', 'Files' => 'Files',
'Freightage' => 'Freightage', 'Freightage' => 'Freightage',
'Group' => 'Group', 'Group' => 'Group',
'ID' => 'ID',
'Info' => 'Info', 'Info' => 'Info',
'Invoice' => 'Invoice', 'Invoice' => 'Invoice',
'IsDefault' => 'Is default?', 'IsDefault' => 'Is default?',
'Log' => 'Log',
'Logs' => 'Logs',
'Master' => 'Master', 'Master' => 'Master',
'Name' => 'Name', 'Name' => 'Name',
'Name1' => 'Name1', 'Name1' => 'Name1',

34
Theme/backend/clients-create.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -29,6 +29,7 @@ echo $this->getData('nav')->render(); ?>
<li><label for="c-tab-6"><?= $this->getText('Prices') ?></label></li> <li><label for="c-tab-6"><?= $this->getText('Prices') ?></label></li>
<li><label for="c-tab-7"><?= $this->getText('AreaManager') ?></label></li> <li><label for="c-tab-7"><?= $this->getText('AreaManager') ?></label></li>
<li><label for="c-tab-8"><?= $this->getText('Files') ?></label></li> <li><label for="c-tab-8"><?= $this->getText('Files') ?></label></li>
<li><label for="c-tab-9"><?= $this->getText('Logs') ?></label>
</ul> </ul>
</div> </div>
<div class="tab-content"> <div class="tab-content">
@ -225,5 +226,36 @@ echo $this->getData('nav')->render(); ?>
<input type="radio" id="c-tab-8" name="tabular-2"> <input type="radio" id="c-tab-8" name="tabular-2">
<div class="tab"> <div class="tab">
</div> </div>
<input type="radio" id="c-tab-9" name="tabular-2">
<div class="tab">
<?php
$footerView = new \Web\Views\Lists\PaginationView($this->app, $this->request, $this->response);
$footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
$footerView->setPages(20);
$footerView->setPage(1);
?>
<div class="box w-100">
<table class="table">
<caption><?= $this->getText('Logs') ?></caption>
<thead>
<tr>
<td>IP
<td><?= $this->getText('ID', 0, 0); ?>
<td><?= $this->getText('Name'); ?>
<td class="wf-100"><?= $this->getText('Log'); ?>
<td><?= $this->getText('Date'); ?>
<tfoot>
<tr>
<td colspan="6"><?= $footerView->render(); ?>
<tbody>
<tr>
<td><?= $this->request->getOrigin(); ?>
<td><?= $this->request->getAccount(); ?>
<td><?= $this->request->getAccount(); ?>
<td>Creating customer
<td><?= (new \DateTime('now'))->format('Y-m-d H:i:s') ?>
</table>
</div>
</div>
</div> </div>
</div> </div>

2
Theme/backend/clients-list.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD