From 35500e78415da3aa0b7e18dc0631081fd9bca458 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 9 Oct 2016 20:07:30 +0200 Subject: [PATCH 1/7] Fix install --- Admin/Install/Navigation.php | 2 +- Admin/Installer.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 4f3bd20..62dbd8c 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool; */ class Navigation { - public static function install(Pool $dbPool) + public static function install(string $path, Pool $dbPool) { $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); diff --git a/Admin/Installer.php b/Admin/Installer.php index 6086168..f7303bb 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -37,9 +37,9 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(Pool $dbPool, InfoManager $info) + public static function install(string $path, Pool $dbPool, InfoManager $info) { - parent::install($dbPool, $info); + parent::install($path, $dbPool, $info); switch ($dbPool->get('core')->getType()) { case DatabaseType::MYSQL: From fd43129d7e9eb763a226605d4213c779a0f55fe8 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 29 Oct 2016 20:44:52 +0200 Subject: [PATCH 2/7] Adjust database pool name --- Admin/Activate.php | 4 ++-- Admin/Deactivate.php | 4 ++-- Admin/Install/Navigation.php | 4 ++-- Admin/Installer.php | 4 ++-- Admin/Uninstall.php | 4 ++-- Admin/Update.php | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Admin/Activate.php b/Admin/Activate.php index b95b2f2..91b909a 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -16,7 +16,7 @@ namespace Modules\ClientManagement\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\ActivateAbstract; use phpOMS\Module\InfoManager; @@ -37,7 +37,7 @@ class Activate extends ActivateAbstract /** * {@inheritdoc} */ - public static function activate(Pool $dbPool, InfoManager $info) + public static function activate(DatabasePool $dbPool, InfoManager $info) { parent::activate($dbPool, $info); } diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index b600755..0c6584b 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -16,7 +16,7 @@ namespace Modules\ClientManagement\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\InfoManager; @@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract /** * {@inheritdoc} */ - public static function deactivate(Pool $dbPool, InfoManager $info) + public static function deactivate(DatabasePool $dbPool, InfoManager $info) { parent::deactivate($dbPool, $info); } diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 62dbd8c..0d2a57d 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -14,7 +14,7 @@ * @link http://orange-management.com */ namespace Modules\ClientManagement\Admin\Install; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; /** * Navigation class. @@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool; */ class Navigation { - public static function install(string $path, Pool $dbPool) + public static function install(string $path, DatabasePool $dbPool) { $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); diff --git a/Admin/Installer.php b/Admin/Installer.php index f7303bb..9b1d7ff 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -16,7 +16,7 @@ namespace Modules\ClientManagement\Admin; use phpOMS\DataStorage\Database\DatabaseType; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\InfoManager; use phpOMS\Module\InstallerAbstract; @@ -37,7 +37,7 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(string $path, Pool $dbPool, InfoManager $info) + public static function install(string $path, DatabasePool $dbPool, InfoManager $info) { parent::install($path, $dbPool, $info); diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index 0aa1b38..22e9beb 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -16,7 +16,7 @@ namespace Modules\ClientManagement\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\UninstallAbstract; /** @@ -36,7 +36,7 @@ class Uninstall extends UninstallAbstract /** * {@inheritdoc} */ - public static function uninstall(Pool $dbPool, InfoManager $info) + public static function uninstall(DatabasePool $dbPool, InfoManager $info) { parent::uninstall($dbPool, $info); } diff --git a/Admin/Update.php b/Admin/Update.php index be589c7..bbc7e30 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -16,7 +16,7 @@ namespace Modules\ClientManagement\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\UpdateAbstract; use phpOMS\System\File\Directory; @@ -37,7 +37,7 @@ class Update extends UpdateAbstract /** * {@inheritdoc} */ - public static function update(Pool $dbPool, array $info) + public static function update(DatabasePool $dbPool, array $info) { Directory::deletePath(__DIR__ . '/Update'); mkdir('Update'); From f37b3da278df698f13937af0857ee5b93007ae0d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 7 Dec 2016 20:23:04 +0100 Subject: [PATCH 3/7] Prepare const visibility --- Controller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Controller.php b/Controller.php index 2351b93..2604820 100644 --- a/Controller.php +++ b/Controller.php @@ -45,7 +45,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_PATH = __DIR__; + /* public */ const MODULE_PATH = __DIR__; /** * Module version. @@ -53,7 +53,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_VERSION = '1.0.0'; + /* public */ const MODULE_VERSION = '1.0.0'; /** * Module name. @@ -61,7 +61,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_NAME = 'ClientManagement'; + /* public */ const MODULE_NAME = 'ClientManagement'; /** * Providing. From c2dfbacbdaab9b33bf090b29f8332155961e04ef Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 7 Dec 2016 20:56:15 +0100 Subject: [PATCH 4/7] Increase php version requirement --- Admin/Activate.php | 2 +- Admin/Deactivate.php | 2 +- Admin/Install/Navigation.php | 2 +- Admin/Installer.php | 2 +- Admin/Uninstall.php | 2 +- Admin/Update.php | 2 +- Controller.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/clients-create.tpl.php | 2 +- Theme/Backend/clients-list.tpl.php | 2 +- Theme/Backend/clients-single.tpl.php | 2 +- Theme/backend/Lang/Navigation.en.lang.php | 2 +- Theme/backend/Lang/en.lang.php | 2 +- Theme/backend/clients-create.tpl.php | 2 +- Theme/backend/clients-list.tpl.php | 2 +- Theme/backend/clients-single.tpl.php | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Admin/Activate.php b/Admin/Activate.php index 91b909a..1272a62 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index 0c6584b..cee46d5 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 0d2a57d..01fdb58 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Installer.php b/Admin/Installer.php index 9b1d7ff..50c05e5 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index 22e9beb..8847b52 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Update.php b/Admin/Update.php index bbc7e30..5259cff 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Controller.php b/Controller.php index 2604820..2f455cd 100644 --- a/Controller.php +++ b/Controller.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 754d136..228fc42 100644 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 568e100..853b619 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/clients-create.tpl.php b/Theme/Backend/clients-create.tpl.php index 1de3c06..fa731b3 100644 --- a/Theme/Backend/clients-create.tpl.php +++ b/Theme/Backend/clients-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/clients-list.tpl.php b/Theme/Backend/clients-list.tpl.php index 5ecae43..e92ce58 100644 --- a/Theme/Backend/clients-list.tpl.php +++ b/Theme/Backend/clients-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/clients-single.tpl.php b/Theme/Backend/clients-single.tpl.php index 9dd9c79..c1c057c 100644 --- a/Theme/Backend/clients-single.tpl.php +++ b/Theme/Backend/clients-single.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php index 754d136..228fc42 100644 --- a/Theme/backend/Lang/Navigation.en.lang.php +++ b/Theme/backend/Lang/Navigation.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index 568e100..853b619 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/clients-create.tpl.php b/Theme/backend/clients-create.tpl.php index 1de3c06..fa731b3 100644 --- a/Theme/backend/clients-create.tpl.php +++ b/Theme/backend/clients-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/clients-list.tpl.php b/Theme/backend/clients-list.tpl.php index 5ecae43..e92ce58 100644 --- a/Theme/backend/clients-list.tpl.php +++ b/Theme/backend/clients-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/clients-single.tpl.php b/Theme/backend/clients-single.tpl.php index 9dd9c79..c1c057c 100644 --- a/Theme/backend/clients-single.tpl.php +++ b/Theme/backend/clients-single.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD From 2e18354fb37991a7bf40ae6bb31b968bfd41099e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 14 Dec 2016 21:27:04 +0100 Subject: [PATCH 5/7] Template & lang fixes --- Theme/Backend/Lang/en.lang.php | 1 + Theme/backend/Lang/en.lang.php | 1 + 2 files changed, 2 insertions(+) diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 853b619..dc179d1 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -36,6 +36,7 @@ return ['ClientManagement' => [ 'Files' => 'Files', 'Freightage' => 'Freightage', 'Group' => 'Group', + 'ID' => 'ID', 'Info' => 'Info', 'Invoice' => 'Invoice', 'IsDefault' => 'Is default?', diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index 853b619..dc179d1 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -36,6 +36,7 @@ return ['ClientManagement' => [ 'Files' => 'Files', 'Freightage' => 'Freightage', 'Group' => 'Group', + 'ID' => 'ID', 'Info' => 'Info', 'Invoice' => 'Invoice', 'IsDefault' => 'Is default?', From 29e9a92486bebd8563dc0229d7ac27eeef7f2af3 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 30 Dec 2016 20:40:17 +0100 Subject: [PATCH 6/7] Added log view --- Theme/Backend/clients-create.tpl.php | 32 ++++++++++++++++++++++++++++ Theme/backend/Lang/en.lang.php | 3 +++ Theme/backend/clients-create.tpl.php | 32 ++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/Theme/Backend/clients-create.tpl.php b/Theme/Backend/clients-create.tpl.php index fa731b3..57d546c 100644 --- a/Theme/Backend/clients-create.tpl.php +++ b/Theme/Backend/clients-create.tpl.php @@ -29,6 +29,7 @@ echo $this->getData('nav')->render(); ?>
  • +
  • @@ -225,5 +226,36 @@ echo $this->getData('nav')->render(); ?>
    + +
    + app, $this->request, $this->response); + $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig'); + $footerView->setPages(20); + $footerView->setPage(1); + ?> +
    + + + + + + + + +
    getText('Logs') ?>
    IP + getText('ID', 0, 0); ?> + getText('Name'); ?> + getText('Log'); ?> + getText('Date'); ?> +
    render(); ?> +
    request->getOrigin(); ?> + request->getAccount(); ?> + request->getAccount(); ?> + Creating customer + format('Y-m-d H:i:s') ?> +
    +
    +
    diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index dc179d1..7d474e9 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -27,6 +27,7 @@ return ['ClientManagement' => [ 'Contact' => 'Contact', 'Country' => 'Country', 'Creditcard' => 'Creditcard', + 'Date' => 'Date', 'Default' => 'Default', 'Delivery' => 'Delivery', 'Discount' => 'Discount', @@ -40,6 +41,8 @@ return ['ClientManagement' => [ 'Info' => 'Info', 'Invoice' => 'Invoice', 'IsDefault' => 'Is default?', + 'Log' => 'Log', + 'Logs' => 'Logs', 'Master' => 'Master', 'Name' => 'Name', 'Name1' => 'Name1', diff --git a/Theme/backend/clients-create.tpl.php b/Theme/backend/clients-create.tpl.php index fa731b3..57d546c 100644 --- a/Theme/backend/clients-create.tpl.php +++ b/Theme/backend/clients-create.tpl.php @@ -29,6 +29,7 @@ echo $this->getData('nav')->render(); ?>
  • +
  • @@ -225,5 +226,36 @@ echo $this->getData('nav')->render(); ?>
    + +
    + app, $this->request, $this->response); + $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig'); + $footerView->setPages(20); + $footerView->setPage(1); + ?> +
    + + + + + + + + +
    getText('Logs') ?>
    IP + getText('ID', 0, 0); ?> + getText('Name'); ?> + getText('Log'); ?> + getText('Date'); ?> +
    render(); ?> +
    request->getOrigin(); ?> + request->getAccount(); ?> + request->getAccount(); ?> + Creating customer + format('Y-m-d H:i:s') ?> +
    +
    +
    From a014c34e07b9d1447cbb31a72e45e27858b8c25b Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 30 Dec 2016 20:40:22 +0100 Subject: [PATCH 7/7] Path fix --- Theme/Backend/Lang/en.lang.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index dc179d1..7d474e9 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -27,6 +27,7 @@ return ['ClientManagement' => [ 'Contact' => 'Contact', 'Country' => 'Country', 'Creditcard' => 'Creditcard', + 'Date' => 'Date', 'Default' => 'Default', 'Delivery' => 'Delivery', 'Discount' => 'Discount', @@ -40,6 +41,8 @@ return ['ClientManagement' => [ 'Info' => 'Info', 'Invoice' => 'Invoice', 'IsDefault' => 'Is default?', + 'Log' => 'Log', + 'Logs' => 'Logs', 'Master' => 'Master', 'Name' => 'Name', 'Name1' => 'Name1',