Jingga/oms-Marketing
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Marketing.git synced 2026-01-31 10:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Karaka-Management/oms-Marketing into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:58:29 +00:00
commit a7b463efe0
9 changed files with 18 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Controller/BackendController.php
View File

@ -47,10 +47,10 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Marketing/Theme/Backend/promotion-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001902001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001902001, $request, $response);
$promotions = PromotionMapper::getAll()->limit(25)->execute();
$view->addData('promotions', $promotions);
$view->data['promotions'] = $promotions;
return $view;
}
@ -70,27 +70,27 @@ final class BackendController extends Controller
public function viewMarketingPromotionProfile(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->get('Content')->getData('head');
$head = $response->get('Content')->head;
$head->addAsset(AssetType::CSS, '/Modules/Calendar/Theme/Backend/css/styles.css?v=1.0.0');
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Marketing/Theme/Backend/promotion-profile');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001902001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001902001, $request, $response);
$taskListView = new \Modules\Tasks\Theme\Backend\Components\Tasks\ListView($this->app->l11nManager, $request, $response);
$taskListView->setTemplate('/Modules/Tasks/Theme/Backend/Components/Tasks/list');
$view->addData('tasklist', $taskListView);
$view->data['tasklist'] = $taskListView;
$calendarView = new \Modules\Calendar\Theme\Backend\Components\Calendar\BaseView($this->app->l11nManager, $request, $response);
$calendarView->setTemplate('/Modules/Calendar/Theme/Backend/Components/Calendar/mini');
$view->addData('calendar', $calendarView);
$view->data['calendar'] = $calendarView;
$mediaListView = new \Modules\Media\Views\MediaView($this->app->l11nManager, $request, $response);
$mediaListView->setTemplate('/Modules/Media/Theme/Backend/Components/Media/list');
$view->addData('medialist', $mediaListView);
$view->data['medialist'] = $mediaListView;
$promotion = PromotionMapper::get()->where('id', (int) $request->getData('id'))->execute();
$view->addData('promotion', $promotion);
$view->data['promotion'] = $promotion;
return $view;
}
@ -111,7 +111,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Marketing/Theme/Backend/promotion-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001902001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001902001, $request, $response);
return $view;
}
@ -132,7 +132,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Marketing/Theme/Backend/event-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001903001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001903001, $request, $response);
return $view;
}
@ -153,7 +153,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Marketing/Theme/Backend/event-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001903001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001903001, $request, $response);
return $view;
}

12
Models/PromotionAttribute.php
View File

@ -67,18 +67,6 @@ class PromotionAttribute implements \JsonSerializable
$this->value = new NullPromotionAttributeValue();
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* {@inheritdoc}
*/

12
Models/PromotionAttributeType.php
View File

@ -89,18 +89,6 @@ class PromotionAttributeType implements \JsonSerializable
$this->setL11n($name);
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Set l11n
*

11
Models/PromotionAttributeValue.php
View File

@ -108,17 +108,6 @@ class PromotionAttributeValue implements \JsonSerializable
*/
private ?BaseStringL11n $l11n = null;
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Set value

2
Theme/Backend/event-create.tpl.php
View File

@ -16,7 +16,7 @@ declare(strict_types=1);
* @var \phpOMS\Views\View $this
*/
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">

2
Theme/Backend/event-list.tpl.php
View File

@ -17,7 +17,7 @@ $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
$footerView->setPages(20);
$footerView->setPage(1);
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

2
Theme/Backend/promotion-create.tpl.php
View File

@ -16,7 +16,7 @@ declare(strict_types=1);
* @var \phpOMS\Views\View $this
*/
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">

4
Theme/Backend/promotion-list.tpl.php
View File

@ -17,9 +17,9 @@ $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
$footerView->setPages(20);
$footerView->setPage(1);
$list = $this->getData('promotions');
$list = $this->data['promotions'];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

4
Theme/Backend/promotion-profile.tpl.php
View File

@ -12,10 +12,10 @@
*/
declare(strict_types=1);
$promotion = $this->getData('promotion');
$promotion = $this->data['promotion'];
$tasks = $promotion->getTasks();
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">