From 441a76110918692d59438fc8aa260a0510a22577 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 19 May 2023 02:37:35 +0000 Subject: [PATCH] test fixes + new test data --- Admin/Updater.php | 7 +++++++ Controller/BackendController.php | 2 +- Theme/Backend/item-list.tpl.php | 6 +++--- Theme/Backend/item-profile.tpl.php | 2 +- tests/Models/ItemTest.php | 3 +-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Admin/Updater.php b/Admin/Updater.php index 5ccb15e..57e7759 100755 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -26,4 +26,11 @@ use phpOMS\Module\UpdaterAbstract; */ final class Updater extends UpdaterAbstract { + /** + * Path of the file + * + * @var string + * @since 1.0.0 + */ + public const PATH = __DIR__; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index d6e2565..9270070 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -468,7 +468,7 @@ final class BackendController extends Controller $topCustomers = SalesBillMapper::getItemTopClients($item->id, new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5); $allInvoices = SalesBillMapper::getItemBills($item->id, new SmartDateTime('Y-01-01'), new SmartDateTime('now')); - $regionSales = SalesBillMapper::getItemRegionSales($item->id, new SmartDateTime('Y-01-01'), new SmartDateTime('now')); + $regionSales = []; $countrySales = SalesBillMapper::getItemCountrySales($item->id, new SmartDateTime('Y-01-01'), new SmartDateTime('now'), 5); $monthlySalesCosts = SalesBillMapper::getItemMonthlySalesCosts($item->id, (new SmartDateTime('now'))->createModify(-1), new SmartDateTime('now')); } else { diff --git a/Theme/Backend/item-list.tpl.php b/Theme/Backend/item-list.tpl.php index 2558476..11972fb 100755 --- a/Theme/Backend/item-list.tpl.php +++ b/Theme/Backend/item-list.tpl.php @@ -138,9 +138,9 @@ echo $this->getData('nav')->render(); ?> ? 'Web/Backend/img/logo_grey.png' : UriFactory::build($image->getPath()); ?>"> printHtml($value->number); ?> - printHtml($value->getL11n('name1')->description); ?> - printHtml($value->getL11n('name2')->description); ?> - printHtml($value->getL11n('name3')->description); ?> + printHtml($value->getL11n('name1')->content); ?> + printHtml($value->getL11n('name2')->content); ?> + printHtml($value->getL11n('name3')->content); ?> getCurrency($value->salesPrice); ?> diff --git a/Theme/Backend/item-profile.tpl.php b/Theme/Backend/item-profile.tpl.php index 906f595..dae49b5 100755 --- a/Theme/Backend/item-profile.tpl.php +++ b/Theme/Backend/item-profile.tpl.php @@ -480,7 +480,7 @@ echo $this->getData('nav')->render(); id; ?> printHtml($value->type->title); ?> printHtml($value->getLanguage()); ?> - printHtml($value->description); ?> + printHtml($value->content); ?> diff --git a/tests/Models/ItemTest.php b/tests/Models/ItemTest.php index b5d6f7e..f6217f7 100755 --- a/tests/Models/ItemTest.php +++ b/tests/Models/ItemTest.php @@ -17,7 +17,6 @@ namespace Modules\ItemManagement\tests\Models; use Modules\Editor\Models\EditorDoc; use Modules\ItemManagement\Models\Item; use Modules\Attribute\Models\Attribute; -use Modules\ItemManagement\Models\ItemL11n; use Modules\ItemManagement\Models\ItemStatus; use Modules\Media\Models\Media; use phpOMS\Localization\BaseStringL11n; @@ -51,7 +50,7 @@ final class ItemTest extends \PHPUnit\Framework\TestCase self::assertEquals([], $this->item->getNotes()); self::assertEquals([], $this->item->getFiles()); self::assertEquals([], $this->item->getAttributes()); - self::assertInstanceOf('Modules\ItemManagement\Models\ItemL11n', $this->item->getL11n('')); + self::assertInstanceOf(BaseStringL11n::class, $this->item->getL11n('')); self::assertInstanceOf('phpOMS\Localization\Money', $this->item->salesPrice); self::assertInstanceOf('phpOMS\Localization\Money', $this->item->purchasePrice); }