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

# 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 80e26028ff
20 changed files with 258 additions and 46 deletions

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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()) {

View File

@ -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);

View File

@ -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:

View File

@ -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);

View File

@ -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');

View File

@ -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.

View File

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

View File

@ -1,8 +1,8 @@
z<?php
<?php
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -13,19 +13,24 @@ z<?php
* @version 1.0.0
* @link http://orange-management.com
*/
return [
return ['Billing' => [
'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',
];
]];

View File

@ -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(); ?>
<ul class="tab-links">
<li><label for="c-tab-1"><?= $this->getText('Invoice') ?></label></li>
<li><label for="c-tab-2"><?= $this->getText('Items') ?></label></li>
<li><label for="c-tab-3"><?= $this->getText('Payment') ?></label></li>
<li><label for="c-tab-4"><?= $this->getText('Media') ?></label></li>
<li><label for="c-tab-5"><?= $this->getText('Logs') ?></label></li>
</ul>
</div>
<div class="tab-content">
@ -56,6 +59,10 @@ echo $this->getData('nav')->render(); ?>
<tr><td><select id="iShipment" name="shipment">
<option>
</select>
<tr><td><label for="iTermsOfDelivery"><?= $this->getText('TermsOfDelivery') ?></label>
<tr><td><select id="iTermsOfDelivery" name="termsofdelivery">
<option>
</select>
<tr><td colspan="3"><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
</table>
</form>
@ -144,10 +151,95 @@ echo $this->getData('nav')->render(); ?>
<td><input type="number" min="0">
<td><input type="number" min="0" max="100" step="any">
<td><input type="number" min="0" step="any">
<td><input type="number" min="0" step="any">
<td>
<td>
</table>
</div>
</div>
<input type="radio" id="c-tab-3" name="tabular-2">
<div class="tab">
<section class="box w-50 floatLeft">
<header><h1><?= $this->getText('Payment') ?></h1></header>
<div class="inner">
<form>
<table class="layout wf-100">
<tr><td><label for="iType"><?= $this->getText('Type') ?></label>
<tr><td><select id="iType" name="type">
<option>
</select>
<tr><td><label for="iType"><?= $this->getText('Type') ?></label>
<tr><td><select id="iType" name="type">
<option><?= $this->getText('MoneyTransfer') ?>
<option><?= $this->getText('Prepaid') ?>
<option><?= $this->getText('AlreadyPaid') ?>
<option><?= $this->getText('CreditCard') ?>
<option><?= $this->getText('DirectDebit') ?>
</select>
<tr><td><label for="iDue"><?= $this->getText('Due') ?></label>
<tr><td><input type="datetime-local" id="iDue" name="due">
<tr><td><label for="iDue"><?= $this->getText('Due') ?> - <?= $this->getText('Cashback') ?></label>
<tr><td><input type="datetime-local" id="iDue" name="due">
<tr><td><label for="iCashBack"><?= $this->getText('Cashback') ?></label>
<tr><td><input type="number" id="iCashBack" name="cashback">
<tr><td><label for="iDue"><?= $this->getText('Due') ?> - <?= $this->getText('Cashback') ?> 2</label>
<tr><td><input type="datetime-local" id="iDue" name="due">
<tr><td><label for="iCashBack2"><?= $this->getText('Cashback') ?> 2</label>
<tr><td><input type="number" id="iCashBack2" name="cashback2">
<tr><td colspan="3"><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
</table>
</form>
</div>
</section>
</div>
<input type="radio" id="c-tab-4" name="tabular-2">
<div class="tab">
<section class="box w-50 floatLeft">
<header><h1><?= $this->getText('Media'); ?></h1></header>
<div class="inner">
<form>
<table class="layout wf-100">
<tbody>
<tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
<tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
<tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
<tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
</table>
</form>
</div>
</section>
</div>
<input type="radio" id="c-tab-5" 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>Create Invoice
<td><?= (new \DateTime('now'))->format('Y-m-d H:i:s') ?>
</table>
</div>
</div>
</div>
</div>

View File

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

View File

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

View File

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

View File

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

View File

@ -1,8 +1,8 @@
z<?php
<?php
/**
* Orange Management
*
* PHP Version 7.0
* PHP Version 7.1
*
* @category TBD
* @package TBD
@ -13,19 +13,24 @@ z<?php
* @version 1.0.0
* @link http://orange-management.com
*/
return [
return ['Billing' => [
'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',
];
]];

View File

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

View File

@ -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(); ?>
<ul class="tab-links">
<li><label for="c-tab-1"><?= $this->getText('Invoice') ?></label></li>
<li><label for="c-tab-2"><?= $this->getText('Items') ?></label></li>
<li><label for="c-tab-3"><?= $this->getText('Payment') ?></label></li>
<li><label for="c-tab-4"><?= $this->getText('Media') ?></label></li>
<li><label for="c-tab-5"><?= $this->getText('Logs') ?></label></li>
</ul>
</div>
<div class="tab-content">
@ -56,6 +59,10 @@ echo $this->getData('nav')->render(); ?>
<tr><td><select id="iShipment" name="shipment">
<option>
</select>
<tr><td><label for="iTermsOfDelivery"><?= $this->getText('TermsOfDelivery') ?></label>
<tr><td><select id="iTermsOfDelivery" name="termsofdelivery">
<option>
</select>
<tr><td colspan="3"><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
</table>
</form>
@ -144,10 +151,95 @@ echo $this->getData('nav')->render(); ?>
<td><input type="number" min="0">
<td><input type="number" min="0" max="100" step="any">
<td><input type="number" min="0" step="any">
<td><input type="number" min="0" step="any">
<td>
<td>
</table>
</div>
</div>
<input type="radio" id="c-tab-3" name="tabular-2">
<div class="tab">
<section class="box w-50 floatLeft">
<header><h1><?= $this->getText('Payment') ?></h1></header>
<div class="inner">
<form>
<table class="layout wf-100">
<tr><td><label for="iType"><?= $this->getText('Type') ?></label>
<tr><td><select id="iType" name="type">
<option>
</select>
<tr><td><label for="iType"><?= $this->getText('Type') ?></label>
<tr><td><select id="iType" name="type">
<option><?= $this->getText('MoneyTransfer') ?>
<option><?= $this->getText('Prepaid') ?>
<option><?= $this->getText('AlreadyPaid') ?>
<option><?= $this->getText('CreditCard') ?>
<option><?= $this->getText('DirectDebit') ?>
</select>
<tr><td><label for="iDue"><?= $this->getText('Due') ?></label>
<tr><td><input type="datetime-local" id="iDue" name="due">
<tr><td><label for="iDue"><?= $this->getText('Due') ?> - <?= $this->getText('Cashback') ?></label>
<tr><td><input type="datetime-local" id="iDue" name="due">
<tr><td><label for="iCashBack"><?= $this->getText('Cashback') ?></label>
<tr><td><input type="number" id="iCashBack" name="cashback">
<tr><td><label for="iDue"><?= $this->getText('Due') ?> - <?= $this->getText('Cashback') ?> 2</label>
<tr><td><input type="datetime-local" id="iDue" name="due">
<tr><td><label for="iCashBack2"><?= $this->getText('Cashback') ?> 2</label>
<tr><td><input type="number" id="iCashBack2" name="cashback2">
<tr><td colspan="3"><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
</table>
</form>
</div>
</section>
</div>
<input type="radio" id="c-tab-4" name="tabular-2">
<div class="tab">
<section class="box w-50 floatLeft">
<header><h1><?= $this->getText('Media'); ?></h1></header>
<div class="inner">
<form>
<table class="layout wf-100">
<tbody>
<tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
<tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
<tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
<tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
</table>
</form>
</div>
</section>
</div>
<input type="radio" id="c-tab-5" 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>Create Invoice
<td><?= (new \DateTime('now'))->format('Y-m-d H:i:s') ?>
</table>
</div>
</div>
</div>
</div>

View File

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

View File

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