Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-01-11 13:38:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug and media fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-10-29 14:49:55 +02:00
parent 01d4320fa3
commit 5766dae413
9 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Settings/Theme/Backend/settings.tpl.php
View File

@ -274,8 +274,8 @@ echo $this->getData('nav')->render();
<div class="form-group">
<label><?= $this->getHtml('Currencyformat'); ?></label>
<select form="fLocalization" name="settings_currencyformat">
<option value="0"<?= $this->printHtml('0' === $l11n->getCurrencyFormat() ? ' selected' : ''); ?>><?= $this->getHtml('Amount') , ' ' , $this->printHtml($l11n->getCurrency()); ?>
<option value="1"<?= $this->printHtml('1' === $l11n->getCurrencyFormat() ? ' selected' : ''); ?>><?= $this->printHtml($l11n->getCurrency()) , ' ' , $this->getHtml('Amount'); ?>
<option value="0"<?= $this->printHtml($l11n->getCurrencyFormat() === '0' ? ' selected' : ''); ?>><?= $this->getHtml('Amount') , ' ' , $this->printHtml($l11n->getCurrency()); ?>
<option value="1"<?= $this->printHtml($l11n->getCurrencyFormat() === '1' ? ' selected' : ''); ?>><?= $this->printHtml($l11n->getCurrency()) , ' ' , $this->getHtml('Amount'); ?>
</select>
</div>

4
Theme/Backend/accounts-single.tpl.php
View File

@ -464,8 +464,8 @@ echo $this->getData('nav')->render(); ?>
<div class="form-group">
<label><?= $this->getHtml('Currencyformat'); ?></label>
<select form="fLocalization" name="settings_currencyformat">
<option value="0"<?= $this->printHtml('0' === $l11n->getCurrencyFormat() ? ' selected' : ''); ?>><?= $this->getHtml('Amount') , ' ' , $this->printHtml($l11n->getCurrency()); ?>
<option value="1"<?= $this->printHtml('1' === $l11n->getCurrencyFormat() ? ' selected' : ''); ?>><?= $this->printHtml($l11n->getCurrency()) , ' ' , $this->getHtml('Amount'); ?>
<option value="0"<?= $this->printHtml($l11n->getCurrencyFormat() === '0' ? ' selected' : ''); ?>><?= $this->getHtml('Amount') , ' ' , $this->printHtml($l11n->getCurrency()); ?>
<option value="1"<?= $this->printHtml($l11n->getCurrencyFormat() === '1' ? ' selected' : ''); ?>><?= $this->printHtml($l11n->getCurrency()) , ' ' , $this->getHtml('Amount'); ?>
</select>
</div>
<div class="form-group">

4
Theme/Backend/settings-general.tpl.php
View File

@ -275,8 +275,8 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
<div class="form-group">
<label><?= $this->getHtml('Currencyformat'); ?></label>
<select form="fLocalization" name="settings_currencyformat">
<option value="0"<?= $this->printHtml('0' === $l11n->getCurrencyFormat() ? ' selected' : ''); ?>><?= $this->getHtml('Amount') , ' ' , $this->printHtml($l11n->getCurrency()); ?>
<option value="1"<?= $this->printHtml('1' === $l11n->getCurrencyFormat() ? ' selected' : ''); ?>><?= $this->printHtml($l11n->getCurrency()) , ' ' , $this->getHtml('Amount'); ?>
<option value="0"<?= $this->printHtml($l11n->getCurrencyFormat() === '0' ? ' selected' : ''); ?>><?= $this->getHtml('Amount') , ' ' , $this->printHtml($l11n->getCurrency()); ?>
<option value="1"<?= $this->printHtml($l11n->getCurrencyFormat() === '1' ? ' selected' : ''); ?>><?= $this->printHtml($l11n->getCurrency()) , ' ' , $this->getHtml('Amount'); ?>
</select>
</div>

2
tests/Bootstrap.php
View File

@ -392,4 +392,4 @@ function phpServe() : void
});
}
phpServe();
\phpServe();

1
tests/Controller/Api/ApiControllerAccountTrait.php
View File

@ -14,7 +14,6 @@ declare(strict_types=1);
namespace Modules\Admin\tests\Controller\Api;
use phpOMS\Account\GroupStatus;
use phpOMS\Account\AccountStatus;
use phpOMS\Account\AccountType;
use phpOMS\Message\Http\HttpRequest;

2
tests/Controller/ApiControllerTest.php
View File

@ -22,11 +22,11 @@ use Modules\Admin\tests\Controller\Api\ApiControllerGroupTrait;
use Modules\Admin\tests\Controller\Api\ApiControllerModuleTrait;
use Modules\Admin\tests\Controller\Api\ApiControllerPermissionTrait;
use Modules\Admin\tests\Controller\Api\ApiControllerSettingsTrait;
use phpOMS\DataStorage\Session\HttpSession;
use phpOMS\Account\Account;
use phpOMS\Account\AccountManager;
use phpOMS\Account\PermissionType;
use phpOMS\Application\ApplicationAbstract;
use phpOMS\DataStorage\Session\HttpSession;
use phpOMS\Dispatcher\Dispatcher;
use phpOMS\Event\EventManager;
use phpOMS\Module\ModuleAbstract;

13
tests/Models/AddressMapperTest.php
View File

@ -16,7 +16,6 @@ namespace Modules\Admin\tests\Models;
use Modules\Admin\Models\Address;
use Modules\Admin\Models\AddressMapper;
use phpOMS\Utils\TestUtils;
use phpOMS\Stdlib\Base\AddressType;
/**
@ -27,16 +26,16 @@ use phpOMS\Stdlib\Base\AddressType;
final class AddressMapperTest extends \PHPUnit\Framework\TestCase
{
/**
* @covers Modules\Admin\Models\AddressMapper
* @group module
*/
* @covers Modules\Admin\Models\AddressMapper
* @group module
*/
public function testCR() : void
{
$address = new Address();
$address->name = 'name';
$address->name = 'name';
$address->addition = 'addition';
$address->postal = '0123456789';
$address->postal = '0123456789';
$address->setType(AddressType::BUSINESS);
$address->city = 'city';
$address->address = 'Some address here';
@ -56,4 +55,4 @@ final class AddressMapperTest extends \PHPUnit\Framework\TestCase
self::assertEquals($address->address, $addressR->address);
self::assertEquals($address->state, $addressR->state);
}
}
}

16
tests/Models/AddressTest.php
View File

@ -50,7 +50,7 @@ final class AddressTest extends \PHPUnit\Framework\TestCase
'lat' => 0,
'long' => 0,
],
'name' => '',
'name' => '',
'addition' => '',
];
@ -72,13 +72,13 @@ final class AddressTest extends \PHPUnit\Framework\TestCase
'lat' => 12.1,
'long' => 11.2,
],
'name' => 'name',
'name' => 'name',
'addition' => 'addition',
];
$this->address->name = 'name';
$this->address->name = 'name';
$this->address->addition = 'addition';
$this->address->postal = '0123456789';
$this->address->postal = '0123456789';
$this->address->setType(AddressType::BUSINESS);
$this->address->city = 'city';
$this->address->address = 'Some address here';
@ -101,13 +101,13 @@ final class AddressTest extends \PHPUnit\Framework\TestCase
'lat' => 12.1,
'long' => 11.2,
],
'name' => 'name',
'name' => 'name',
'addition' => 'addition',
];
$this->address->name = 'name';
$this->address->name = 'name';
$this->address->addition = 'addition';
$this->address->postal = '0123456789';
$this->address->postal = '0123456789';
$this->address->setType(AddressType::BUSINESS);
$this->address->city = 'city';
$this->address->address = 'Some address here';
@ -131,7 +131,7 @@ final class AddressTest extends \PHPUnit\Framework\TestCase
'lat' => 12.1,
'long' => 11.2,
],
'name' => 'name',
'name' => 'name',
'addition' => 'addition',
];

5
tests/Models/AppMapperTest.php
View File

@ -17,7 +17,6 @@ namespace Modules\Admin\tests\Models;
use Modules\Admin\Models\App;
use Modules\Admin\Models\AppMapper;
use phpOMS\Application\ApplicationStatus;
use phpOMS\Utils\TestUtils;
/**
* @testdox Modules\Admin\tests\Models\AppMapperTest: App database mapper
@ -35,8 +34,8 @@ final class AppMapperTest extends \PHPUnit\Framework\TestCase
{
$app = new App();
$app->name = 'TestAppName';
$app->theme = 'Default';
$app->name = 'TestAppName';
$app->theme = 'Default';
$app->status = ApplicationStatus::NORMAL;
$id = AppMapper::create($app);