From 892cd59660d27ef243c4636612faf2df4da22d32 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 10 Mar 2024 02:24:56 +0000 Subject: [PATCH] bump --- Admin/Install/Navigation.install.json | 6 +- Controller/BackendController.php | 4 +- Theme/Backend/event-create.tpl.php | 44 --------------- Theme/Backend/event-list.tpl.php | 49 ----------------- Theme/Backend/event-view.tpl.php | 0 Theme/Backend/promotion-create.tpl.php | 44 --------------- Theme/Backend/promotion-view.tpl.php | 76 +++++++++++++++++++------- info.json | 3 +- 8 files changed, 62 insertions(+), 164 deletions(-) delete mode 100755 Theme/Backend/event-create.tpl.php delete mode 100755 Theme/Backend/event-list.tpl.php delete mode 100644 Theme/Backend/event-view.tpl.php delete mode 100755 Theme/Backend/promotion-create.tpl.php diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index cde4a93..b42cb09 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -65,7 +65,7 @@ "type": 2, "subtype": 1, "name": "Events", - "uri": "{/base}/marketing/event/list?{?}", + "uri": "{/base}/eventmanagement/list?{?}", "target": "self", "icon": null, "order": 5, @@ -79,7 +79,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/marketing/event/list?{?}", + "uri": "{/base}/eventmanagement/list?{?}", "target": "self", "icon": null, "order": 1, @@ -94,7 +94,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/marketing/event/create?{?}", + "uri": "{/base}/eventmanagement/create?{?}", "target": "self", "icon": null, "order": 5, diff --git a/Controller/BackendController.php b/Controller/BackendController.php index db6bb42..736cf51 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -150,7 +150,7 @@ final class BackendController extends Controller public function viewMarketingPromotionCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/Marketing/Theme/Backend/promotion-create'); + $view->setTemplate('/Modules/Marketing/Theme/Backend/promotion-view'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001902001, $request, $response); return $view; @@ -192,7 +192,7 @@ final class BackendController extends Controller public function viewMarketingEventCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/Marketing/Theme/Backend/event-create'); + $view->setTemplate('/Modules/Marketing/Theme/Backend/event-view'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001903001, $request, $response); return $view; diff --git a/Theme/Backend/event-create.tpl.php b/Theme/Backend/event-create.tpl.php deleted file mode 100755 index 33edeec..0000000 --- a/Theme/Backend/event-create.tpl.php +++ /dev/null @@ -1,44 +0,0 @@ -data['nav']->render(); ?> - -
-
-
-

getHtml('Event'); ?>

-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file diff --git a/Theme/Backend/event-list.tpl.php b/Theme/Backend/event-list.tpl.php deleted file mode 100755 index da45b26..0000000 --- a/Theme/Backend/event-list.tpl.php +++ /dev/null @@ -1,49 +0,0 @@ -l11nManager, $this->request, $this->response); -$footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig'); -$footerView->setPages(20); -$footerView->setPage(1); - -echo $this->data['nav']->render(); ?> - -
-
-
-
getHtml('Events'); ?>download
-
- - - - - $value) : ++$count; ?> - - -
getHtml('Status'); ?> - getHtml('Type'); ?> - getHtml('Title'); ?> - getHtml('Start'); ?> - getHtml('End'); ?> - getHtml('Location'); ?> - getHtml('Expenses'); ?> - getHtml('Sales'); ?> - getHtml('Budget'); ?> -
getHtml('Empty', '0', '0'); ?> - -
-
-
-
-
diff --git a/Theme/Backend/event-view.tpl.php b/Theme/Backend/event-view.tpl.php deleted file mode 100644 index e69de29..0000000 diff --git a/Theme/Backend/promotion-create.tpl.php b/Theme/Backend/promotion-create.tpl.php deleted file mode 100755 index 5aeff96..0000000 --- a/Theme/Backend/promotion-create.tpl.php +++ /dev/null @@ -1,44 +0,0 @@ -data['nav']->render(); ?> - -
-
-
-

getHtml('Promotion'); ?>

-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file diff --git a/Theme/Backend/promotion-view.tpl.php b/Theme/Backend/promotion-view.tpl.php index 2d141a5..4af9f29 100644 --- a/Theme/Backend/promotion-view.tpl.php +++ b/Theme/Backend/promotion-view.tpl.php @@ -12,42 +12,75 @@ */ declare(strict_types=1); -$promotion = $this->data['promotion']; +use Modules\Marketing\Models\NullPromotion; + +$promotion = $this->data['promotion'] ?? new NullPromotion(); echo $this->data['nav']->render(); ?>
-
-

printHtml($promotion->getName()); ?>

-
-
- - -
-
-
- -
- -
-
-
-
-
-
-
+
+
+
getHtml('Promotion'); ?>
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+
+ + +
+
+ +
+
+ + +
+
+
+ +
+ + +
+
+ id === 0) : ?> + + + + +
+
+ id !== 0) : ?>
getData('tasklist')->render($promotion->tasks); ?>
+
+id !== 0) : ?>
getData('calendar')->render($promotion->getCalendar()); ?> @@ -64,4 +97,5 @@ echo $this->data['nav']->render(); ?>

Finances

-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/info.json b/info.json index 329a143..d4a52ff 100755 --- a/info.json +++ b/info.json @@ -20,7 +20,8 @@ "Admin": "1.0.0", "Media": "1.0.0", "Tasks": "1.0.0", - "Calendar": "1.0.0" + "Calendar": "1.0.0", + "EventManagement": "1.0.0" }, "providing": { "Navigation": "*"