diff --git a/Admin/Activate.php b/Admin/Activate.php index 7741d2f..d24a778 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 @@ -16,7 +16,7 @@ namespace Modules\Billing\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 7070441..8487d92 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 @@ -16,7 +16,7 @@ namespace Modules\Billing\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/ItemReference.php b/Admin/Install/ItemReference.php index 7444fd3..5af7a98 100644 --- a/Admin/Install/ItemReference.php +++ b/Admin/Install/ItemReference.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -16,7 +16,7 @@ namespace Modules\Billing\Admin\Install; use phpOMS\DataStorage\Database\DatabaseType; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; /** * Media addition class. @@ -35,7 +35,7 @@ class ItemReference /** * {@inheritdoc} */ - public static function install(Pool $dbPool, InfoManager $info) + public static function install(string $path, DatabasePool $dbPool, InfoManager $info) { switch ($dbPool->get('core')->getType()) { diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 61b0c0f..f1da5c7 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 @@ -14,7 +14,7 @@ * @link http://orange-management.com */ namespace Modules\Billing\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(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 cec84ab..ba3e864 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 @@ -16,7 +16,7 @@ namespace Modules\Billing\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,9 +37,9 @@ class Installer extends InstallerAbstract /** * {@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()) { case DatabaseType::MYSQL: diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index 1e2617d..061c034 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 @@ -16,7 +16,7 @@ namespace Modules\Billing\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\Schema\Builder; use phpOMS\Module\UninstallAbstract; @@ -37,7 +37,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 a36eb12..bf50cd0 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 @@ -16,7 +16,7 @@ namespace Modules\Billing\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'); diff --git a/Controller.php b/Controller.php index a8eec71..b26c403 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 @@ -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 = 'Billing'; + /* public */ const MODULE_NAME = 'Billing'; /** * Providing. diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 68f2e10..e170710 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 7d1ecee..103242f 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -1,8 +1,8 @@ -z [ 'Address' => 'Address', 'Addresses' => 'Addresses', + 'AlreadyPaid' => 'Already Paid', 'Bonus' => 'Bonus', + 'Cashback' => 'Cash Back', 'City' => 'City', 'Client' => 'Client', 'ClientID' => 'Client ID', 'Confirmation' => 'Confirmation', 'Country' => 'Country', 'Created' => 'Created', + 'CreditCard' => 'CreditCard', 'CreditNote' => 'Credit Note', + 'Date' => 'Date', 'Delivery' => 'Delivery', 'DeliveryNote' => 'Delivery Note', + 'DirectDebit' => 'DirectDebit', 'Discount' => 'Discount', 'DiscountP' => 'Discount %', 'Due' => 'Due', @@ -35,19 +40,28 @@ return [ 'Invoices' => 'Invoices', 'Item' => 'Item', 'Items' => 'Items', + 'Log' => 'Log', + 'Logs' => 'Logs', + 'Media' => 'Media', + 'MoneyTransfer' => 'Money Transfer', 'Name' => 'Name', 'Net' => 'Net', 'Offer' => 'Offer', + 'Payment' => 'Payment', + 'Prepaid' => 'Prepaid', 'Price' => 'Price', 'Quantity' => 'Quantity', 'Recipient' => 'Recipient', + 'Select' => 'Select', 'Shipment' => 'Shipment', 'Source' => 'Source', 'Supplier' => 'Supplier', 'SupplierID' => 'Supplier ID', 'Tax' => 'Tax', + 'TermsOfDelivery' => 'Terms Of Delivery', 'Total' => 'Total', 'Type' => 'Type', + 'Upload' => 'Upload', 'Variation' => 'Variation', 'Zip' => 'Zip', -]; +]]; diff --git a/Theme/Backend/invoice-create.tpl.php b/Theme/Backend/invoice-create.tpl.php index 394b7c7..5bb007a 100644 --- a/Theme/Backend/invoice-create.tpl.php +++ b/Theme/Backend/invoice-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -24,6 +24,9 @@ echo $this->getData('nav')->render(); ?>
@@ -56,6 +59,10 @@ echo $this->getData('nav')->render(); ?> + + @@ -144,10 +151,95 @@ echo $this->getData('nav')->render(); ?> + - + +
+ + +
+
+

getText('Payment') ?>

+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+ +
+ 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(); ?> + Create Invoice + format('Y-m-d H:i:s') ?>
+ diff --git a/Theme/Backend/invoice-list.tpl.php b/Theme/Backend/invoice-list.tpl.php index 080229a..16cd308 100644 --- a/Theme/Backend/invoice-list.tpl.php +++ b/Theme/Backend/invoice-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/invoice-single.tpl.php b/Theme/Backend/invoice-single.tpl.php index 3011837..9e3f926 100644 --- a/Theme/Backend/invoice-single.tpl.php +++ b/Theme/Backend/invoice-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/purchase-invoice-list.tpl.php b/Theme/Backend/purchase-invoice-list.tpl.php index 5290221..7872f39 100644 --- a/Theme/Backend/purchase-invoice-list.tpl.php +++ b/Theme/Backend/purchase-invoice-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/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php index 68f2e10..e170710 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 7d1ecee..103242f 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -1,8 +1,8 @@ -z [ 'Address' => 'Address', 'Addresses' => 'Addresses', + 'AlreadyPaid' => 'Already Paid', 'Bonus' => 'Bonus', + 'Cashback' => 'Cash Back', 'City' => 'City', 'Client' => 'Client', 'ClientID' => 'Client ID', 'Confirmation' => 'Confirmation', 'Country' => 'Country', 'Created' => 'Created', + 'CreditCard' => 'CreditCard', 'CreditNote' => 'Credit Note', + 'Date' => 'Date', 'Delivery' => 'Delivery', 'DeliveryNote' => 'Delivery Note', + 'DirectDebit' => 'DirectDebit', 'Discount' => 'Discount', 'DiscountP' => 'Discount %', 'Due' => 'Due', @@ -35,19 +40,28 @@ return [ 'Invoices' => 'Invoices', 'Item' => 'Item', 'Items' => 'Items', + 'Log' => 'Log', + 'Logs' => 'Logs', + 'Media' => 'Media', + 'MoneyTransfer' => 'Money Transfer', 'Name' => 'Name', 'Net' => 'Net', 'Offer' => 'Offer', + 'Payment' => 'Payment', + 'Prepaid' => 'Prepaid', 'Price' => 'Price', 'Quantity' => 'Quantity', 'Recipient' => 'Recipient', + 'Select' => 'Select', 'Shipment' => 'Shipment', 'Source' => 'Source', 'Supplier' => 'Supplier', 'SupplierID' => 'Supplier ID', 'Tax' => 'Tax', + 'TermsOfDelivery' => 'Terms Of Delivery', 'Total' => 'Total', 'Type' => 'Type', + 'Upload' => 'Upload', 'Variation' => 'Variation', 'Zip' => 'Zip', -]; +]]; diff --git a/Theme/backend/invoice-archive.tpl.php b/Theme/backend/invoice-archive.tpl.php index 3011837..9e3f926 100644 --- a/Theme/backend/invoice-archive.tpl.php +++ b/Theme/backend/invoice-archive.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/invoice-create.tpl.php b/Theme/backend/invoice-create.tpl.php index 394b7c7..5bb007a 100644 --- a/Theme/backend/invoice-create.tpl.php +++ b/Theme/backend/invoice-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD @@ -24,6 +24,9 @@ echo $this->getData('nav')->render(); ?>
@@ -56,6 +59,10 @@ echo $this->getData('nav')->render(); ?> + + @@ -144,10 +151,95 @@ echo $this->getData('nav')->render(); ?> + - + +
+ + +
+
+

getText('Payment') ?>

+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+ +
+ 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(); ?> + Create Invoice + format('Y-m-d H:i:s') ?>
+ diff --git a/Theme/backend/invoice-single.tpl.php b/Theme/backend/invoice-single.tpl.php index 3011837..9e3f926 100644 --- a/Theme/backend/invoice-single.tpl.php +++ b/Theme/backend/invoice-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/purchase-invoice-list.tpl.php b/Theme/backend/purchase-invoice-list.tpl.php index 5290221..7872f39 100644 --- a/Theme/backend/purchase-invoice-list.tpl.php +++ b/Theme/backend/purchase-invoice-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD