fix(mian): Add silence files; add casting

Everything now casts right at the SQL interpolation point

config/form.yml

@@ -2,8 +2,7 @@ services:
     websmid.customhtml.form.type.customhtml_group:
         public: true
         class: 'Websmid\CustomHtml\Form\Type\CustomHtmlGroupType'
-        arguments:
-            - '@translator'
+        parent: "form.type.translatable.aware"
         tags:
             - { name: form.type }
 
@@ -37,16 +36,22 @@ services:
     websmid.customhtml.form.type.customhtml_faq:
         public: true
         class: 'Websmid\CustomHtml\Form\Type\CustomHtmlFaqType'
-        arguments:
-            - '@translator'
+        parent: "form.type.translatable.aware"
+        tags:
+            - { name: form.type }
+
+    websmid.customhtml.form.type.customhtml_slide:
+        public: true
+        class: 'Websmid\CustomHtml\Form\Type\CustomHtmlSlideType'
+        parent: "form.type.translatable.aware"
         tags:
             - { name: form.type }
 
     websmid.customhtml.form.type.customhtml_block:
         public: true
         class: 'Websmid\CustomHtml\Form\Type\CustomHtmlBlockType'
+        parent: "form.type.translatable.aware"
         arguments:
-            - '@translator'
             - '@websmid.customhtml.form.choice_provider.customhtml_group_choice_provider'
         tags:
             - { name: form.type }

config/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

config/routes.yml

@@ -39,6 +39,12 @@ customhtmlgroup_delete:
     defaults:
         _controller: 'Websmid\CustomHtml\Controller\CustomHtmlGroupController::deleteAction'
 
+customhtmlgroup_toggle:
+    path: ws_customhtml/group/toggle/{idCustomHtmlGroup}
+    methods: [GET, POST]
+    defaults:
+        _controller: 'Websmid\CustomHtml\Controller\CustomHtmlGroupController::toggleAction'
+
 customhtmlgroup_update_position:
     path: ws_customhtml/group/update-position
     methods: [POST]

src/Config/Config.php

@@ -15,8 +15,23 @@ class Config
         'faq'    => 'FAQ Accordion',
         'banner' => 'Banner',
         'alert'  => 'Alert',
+        'usp'    => 'USP',
+        'slider' => 'Slider',
     ];
 
+    const SLIDER_DEFAULT_SLIDES_PER_VIEW_MOBILE = 1;
+
+    const SLIDER_DEFAULT_SLIDES_PER_VIEW_TABLET = 2;
+
+    const SLIDER_MODES = [
+        'always'     => 'Always show as a slider',
+        'responsive' => 'Mobile only',
+    ];
+
+    const SLIDER_DEFAULT_MODE = 'always';
+
+    const SLIDER_RESPONSIVE_BREAKPOINT = 480;
+
     const ALERT_STYLES = [
         'success' => 'Success',
         'info'    => 'Info',

src/Config/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Controller/CustomHtmlBlockController.php

@@ -21,8 +21,11 @@ class CustomHtmlBlockController extends FrameworkBundleAdminController
 {
     public function indexAction(Request $request, CustomHtmlBlockFilters $filters): Response
     {
+        $idGroup = null;
+
         if ($request->query->has('idGroup')) {
-            $filters->addFilter(['id_ws_customhtml_group' => (int) $request->query->get('idGroup')]);
+            $idGroup = (int) $request->query->get('idGroup');
+            $filters->addFilter(['id_ws_customhtml_group' => $idGroup]);
             $filters->setNeedsToBePersisted(false);
         }
 
@@ -31,7 +34,7 @@ class CustomHtmlBlockController extends FrameworkBundleAdminController
 
         return $this->render('@Modules/ws_customhtml/views/templates/admin/grid/customhtmlblock.html.twig', [
             'customHtmlBlockGrid'   => $this->presentGrid($grid),
-            'layoutHeaderToolbarBtn' => $this->getToolbarButtons($request->get('_legacy_controller')),
+            'layoutHeaderToolbarBtn' => $this->getToolbarButtons($request->get('_legacy_controller'), $idGroup),
         ]);
     }
 
@@ -51,9 +54,11 @@ class CustomHtmlBlockController extends FrameworkBundleAdminController
         $formHandler = $this->get('websmid.customhtml.form.customhtmlblock_form_handler');
 
         $form = $formBuilder->getForm();
+        $idGroup = $request->query->has('idGroup') ? (int) $request->query->get('idGroup') : null;
+        $redirectParams = null !== $idGroup ? ['idGroup' => $idGroup] : [];
 
-        if ($request->isMethod('GET') && $request->query->has('idGroup')) {
-            $form->get('id_ws_customhtml_group')->setData((int) $request->query->get('idGroup'));
+        if ($request->isMethod('GET') && null !== $idGroup) {
+            $form->get('id_ws_customhtml_group')->setData($idGroup);
         }
 
         $form->handleRequest($request);
@@ -64,7 +69,7 @@ class CustomHtmlBlockController extends FrameworkBundleAdminController
             if (null !== $handlerResult->getIdentifiableObjectId()) {
                 $this->addFlash('success', $this->trans('Successful creation.', 'Admin.Notifications.Success'));
 
-                return $this->redirectToRoute('customhtmlblock_index');
+                return $this->redirectToRoute('customhtmlblock_index', $redirectParams);
             }
         } catch (Exception $e) {
             $this->addFlash('error', $this->getErrorMessageForException($e, []));
@@ -72,6 +77,7 @@ class CustomHtmlBlockController extends FrameworkBundleAdminController
 
         return $this->render('@Modules/ws_customhtml/views/templates/admin/form/customhtmlblock_create.html.twig', [
             'customHtmlBlockForm' => $form->createView(),
+            'idGroup'             => $idGroup,
         ]);
     }
 
@@ -81,6 +87,8 @@ class CustomHtmlBlockController extends FrameworkBundleAdminController
         $formHandler = $this->get('websmid.customhtml.form.customhtmlblock_form_handler');
 
         $form = $formBuilder->getFormFor($idCustomHtmlBlock);
+        $idGroup = $request->query->has('idGroup') ? (int) $request->query->get('idGroup') : null;
+        $redirectParams = null !== $idGroup ? ['idGroup' => $idGroup] : [];
 
         try {
             $form->handleRequest($request);
@@ -89,7 +97,7 @@ class CustomHtmlBlockController extends FrameworkBundleAdminController
             if ($handlerResult->isSubmitted() && $handlerResult->isValid()) {
                 $this->addFlash('success', $this->trans('Successful update.', 'Admin.Notifications.Success'));
 
-                return $this->redirectToRoute('customhtmlblock_index');
+                return $this->redirectToRoute('customhtmlblock_index', $redirectParams);
             }
         } catch (Exception $e) {
             $this->addFlash('error', $this->getErrorMessageForException($e, []));
@@ -102,24 +110,28 @@ class CustomHtmlBlockController extends FrameworkBundleAdminController
             'customHtmlBlockForm' => $form->createView(),
             'idCustomHtmlBlock'   => $idCustomHtmlBlock,
             'currentImageUrl'     => $currentImageUrl,
+            'idGroup'             => $idGroup,
         ]);
     }
 
     public function deleteAction(Request $request, int $idCustomHtmlBlock): RedirectResponse
     {
+        $idGroup = $request->query->has('idGroup') ? (int) $request->query->get('idGroup') : null;
+        $redirectParams = null !== $idGroup ? ['idGroup' => $idGroup] : [];
+
         $block = new CustomHtmlBlock($idCustomHtmlBlock);
 
         if (!Validate::isLoadedObject($block)) {
             $this->addFlash('error', $this->trans('Unable to find the block.', 'Modules.Wscustomhtml.Admin'));
 
-            return $this->redirectToRoute('customhtmlblock_index');
+            return $this->redirectToRoute('customhtmlblock_index', $redirectParams);
         }
 
         CustomHtmlFaq::deleteByBlockId($idCustomHtmlBlock);
         $block->delete();
         $this->addFlash('success', $this->trans('Successful deletion.', 'Admin.Notifications.Success'));
 
-        return $this->redirectToRoute('customhtmlblock_index');
+        return $this->redirectToRoute('customhtmlblock_index', $redirectParams);
     }
 
     public function updatePositionAction(int $idGroup, Request $request): RedirectResponse
@@ -144,7 +156,7 @@ class CustomHtmlBlockController extends FrameworkBundleAdminController
         return $this->redirectToRoute('customhtmlblock_index', ['idGroup' => $idGroup]);
     }
 
-    private function getToolbarButtons(?string $securitySubject): array
+    private function getToolbarButtons(?string $securitySubject, ?int $idGroup = null): array
     {
         $toolbarButtons = [];
 
@@ -152,8 +164,10 @@ class CustomHtmlBlockController extends FrameworkBundleAdminController
             return $toolbarButtons;
         }
 
+        $routeParams = null !== $idGroup ? ['idGroup' => $idGroup] : [];
+
         $toolbarButtons['customhtmlblock_create'] = [
-            'href'           => $this->generateUrl('customhtmlblock_create'),
+            'href'           => $this->generateUrl('customhtmlblock_create', $routeParams),
             'desc'           => $this->trans('New block', 'Admin.Actions'),
             'icon'           => 'add_circle_outline',
             'class'          => 'btn-primary',

src/Controller/CustomHtmlGroupController.php

@@ -106,6 +106,27 @@ class CustomHtmlGroupController extends FrameworkBundleAdminController
         return $this->redirectToRoute('customhtmlgroup_index');
     }
 
+    public function toggleAction(int $idCustomHtmlGroup): RedirectResponse
+    {
+        $group = new CustomHtmlGroup($idCustomHtmlGroup);
+
+        if (!Validate::isLoadedObject($group)) {
+            $this->addFlash('error', $this->trans('Unable to find the group.', 'Modules.Wscustomhtml.Admin'));
+
+            return $this->redirectToRoute('customhtmlgroup_index');
+        }
+
+        $group->active = (int) !$group->active;
+
+        if (!$group->update()) {
+            $this->addFlash('error', $this->trans('An error occurred while updating the status.', 'Admin.Notifications.Error'));
+        } else {
+            $this->addFlash('success', $this->trans('Successful update.', 'Admin.Notifications.Success'));
+        }
+
+        return $this->redirectToRoute('customhtmlgroup_index');
+    }
+
     public function updatePositionAction(Request $request): RedirectResponse
     {
         $positionDefinition = $this->get('websmid.customhtml.grid.position.customhtmlgroup_position_definition');

src/Controller/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Form/ChoiceProvider/CustomHtmlGroupChoiceProvider.php

@@ -5,6 +5,7 @@ namespace Websmid\CustomHtml\Form\ChoiceProvider;
 use PrestaShop\PrestaShop\Core\Form\ConfigurableFormChoiceProviderInterface;
 use PrestaShop\PrestaShop\Core\Form\FormChoiceAttributeProviderInterface;
 use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
+use Context;
 use Db;
 
 final class CustomHtmlGroupChoiceProvider implements
@@ -14,22 +15,9 @@ final class CustomHtmlGroupChoiceProvider implements
 {
     public function getChoices(array $options = []): array
     {
-        $groups = Db::getInstance()->executeS(
-            'SELECT `id_ws_customhtml_group`, `title`
-             FROM `' . _DB_PREFIX_ . 'ws_customhtml_group`
-             ORDER BY `title` ASC'
-        );
-
-        $titleCounts = array_count_values(array_column($groups, 'title'));
         $choices = [];
 
-        foreach ($groups as $group) {
-            $label = $group['title'];
-
-            if ($titleCounts[$label] > 1) {
-                $label .= ' (#' . $group['id_ws_customhtml_group'] . ')';
-            }
-
+        foreach ($this->getGroupsWithLabels() as $label => $group) {
             $choices[$label] = (int) $group['id_ws_customhtml_group'];
         }
 
@@ -38,6 +26,42 @@ final class CustomHtmlGroupChoiceProvider implements
 
     public function getChoicesAttributes(): array
     {
-        return [];
+        $choicesAttributes = [];
+
+        foreach ($this->getGroupsWithLabels() as $label => $group) {
+            if (!empty($group['default_block_class'])) {
+                $choicesAttributes[$label]['data-default-block-class'] = $group['default_block_class'];
+            }
+        }
+
+        return $choicesAttributes;
+    }
+
+    private function getGroupsWithLabels(): array
+    {
+        $idLang = (int) Context::getContext()->language->id;
+
+        $groups = Db::getInstance()->executeS(
+            'SELECT g.`id_ws_customhtml_group`, gl.`title`, g.`default_block_class`
+             FROM `' . _DB_PREFIX_ . 'ws_customhtml_group` g
+             LEFT JOIN `' . _DB_PREFIX_ . 'ws_customhtml_group_lang` gl
+                 ON gl.`id_ws_customhtml_group` = g.`id_ws_customhtml_group` AND gl.`id_lang` = ' . (int) $idLang . '
+             ORDER BY gl.`title` ASC'
+        );
+
+        $titleCounts = array_count_values(array_column($groups, 'title'));
+        $groupsWithLabels = [];
+
+        foreach ($groups as $group) {
+            $label = $group['title'];
+
+            if ($titleCounts[$label] > 1) {
+                $label .= ' (#' . $group['id_ws_customhtml_group'] . ')';
+            }
+
+            $groupsWithLabels[$label] = $group;
+        }
+
+        return $groupsWithLabels;
     }
 }

src/Form/ChoiceProvider/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Form/DataHandler/CustomHtmlBlockDataHandler.php

@@ -6,6 +6,7 @@ use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FormDataHandl
 use Websmid\CustomHtml\Config\Config;
 use Websmid\CustomHtml\Model\CustomHtmlBlock;
 use Websmid\CustomHtml\Model\CustomHtmlFaq;
+use Websmid\CustomHtml\Model\CustomHtmlSlide;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Db;
 use Exception;
@@ -19,16 +20,22 @@ final class CustomHtmlBlockDataHandler implements FormDataHandlerInterface
 
         $block = new CustomHtmlBlock();
         $block->id_ws_customhtml_group = $idGroup;
-        $block->title                  = (string) $formData['title'];
+        $block->title                  = $formData['title'];
         $block->type                   = (string) $formData['type'];
         $block->show_title             = (int) $formData['show_title'];
         $block->custom_class           = (string) ($formData['custom_class'] ?? '');
-        $block->content                = (string) $formData['content'];
-        $block->description            = (string) ($formData['description'] ?? '');
-        $block->extra_description      = (string) ($formData['extra_description'] ?? '');
-        $block->link                   = (string) ($formData['link'] ?? '');
+        $block->content                = $formData['content'];
+        $block->description            = $formData['description'] ?? [];
+        $block->extra_description      = $formData['extra_description'] ?? [];
+        $block->link                   = $formData['link'] ?? [];
+        $block->link_text              = $formData['link_text'] ?? [];
         $block->alert_type             = (string) ($formData['alert_type'] ?? 'info');
         $block->timeout                = (int) ($formData['timeout'] ?? 0);
+        $block->slider_mode             = (string) ($formData['slider_mode'] ?? Config::SLIDER_DEFAULT_MODE);
+        $block->slides_per_view_mobile  = (float) ($formData['slides_per_view_mobile'] ?? Config::SLIDER_DEFAULT_SLIDES_PER_VIEW_MOBILE);
+        $block->slides_per_view_tablet  = (float) ($formData['slides_per_view_tablet'] ?? Config::SLIDER_DEFAULT_SLIDES_PER_VIEW_TABLET);
+        $block->slides_per_view_desktop = (float) ($formData['slides_per_view_desktop'] ?? 0);
+        $block->autoplay_delay          = (int) ($formData['autoplay_delay'] ?? 0);
         $block->image                  = $this->saveUploadedImage($formData['image'] ?? null, '');
         $block->active                 = (int) $formData['active'];
         $block->ordering               = $this->getNextOrdering($idGroup);
@@ -38,6 +45,7 @@ final class CustomHtmlBlockDataHandler implements FormDataHandlerInterface
         }
 
         $this->saveFaqs((int) $block->id, $formData['faqs'] ?? []);
+        $this->saveSlides((int) $block->id, $formData['slides'] ?? []);
 
         return $block->id;
     }
@@ -51,16 +59,22 @@ final class CustomHtmlBlockDataHandler implements FormDataHandlerInterface
         }
 
         $block->id_ws_customhtml_group = (int) $formData['id_ws_customhtml_group'];
-        $block->title                  = (string) $formData['title'];
+        $block->title                  = $formData['title'];
         $block->type                   = (string) $formData['type'];
         $block->show_title             = (int) $formData['show_title'];
         $block->custom_class           = (string) ($formData['custom_class'] ?? '');
-        $block->content                = (string) $formData['content'];
-        $block->description            = (string) ($formData['description'] ?? '');
-        $block->extra_description      = (string) ($formData['extra_description'] ?? '');
-        $block->link                   = (string) ($formData['link'] ?? '');
+        $block->content                = $formData['content'];
+        $block->description            = $formData['description'] ?? [];
+        $block->extra_description      = $formData['extra_description'] ?? [];
+        $block->link                   = $formData['link'] ?? [];
+        $block->link_text              = $formData['link_text'] ?? [];
         $block->alert_type             = (string) ($formData['alert_type'] ?? 'info');
         $block->timeout                = (int) ($formData['timeout'] ?? 0);
+        $block->slider_mode             = (string) ($formData['slider_mode'] ?? Config::SLIDER_DEFAULT_MODE);
+        $block->slides_per_view_mobile  = (float) ($formData['slides_per_view_mobile'] ?? Config::SLIDER_DEFAULT_SLIDES_PER_VIEW_MOBILE);
+        $block->slides_per_view_tablet  = (float) ($formData['slides_per_view_tablet'] ?? Config::SLIDER_DEFAULT_SLIDES_PER_VIEW_TABLET);
+        $block->slides_per_view_desktop = (float) ($formData['slides_per_view_desktop'] ?? 0);
+        $block->autoplay_delay          = (int) ($formData['autoplay_delay'] ?? 0);
         $block->image                  = $this->saveUploadedImage($formData['image'] ?? null, $block->image);
         $block->active                 = (int) $formData['active'];
 
@@ -69,6 +83,7 @@ final class CustomHtmlBlockDataHandler implements FormDataHandlerInterface
         }
 
         $this->saveFaqs((int) $id, $formData['faqs'] ?? []);
+        $this->saveSlides((int) $id, $formData['slides'] ?? []);
 
         return true;
     }
@@ -120,7 +135,7 @@ final class CustomHtmlBlockDataHandler implements FormDataHandlerInterface
     {
         $maxOrdering = Db::getInstance()->getValue(
             'SELECT MAX(`ordering`) FROM `' . _DB_PREFIX_ . 'ws_customhtml`
-             WHERE `id_ws_customhtml_group` = ' . $idGroup
+             WHERE `id_ws_customhtml_group` = ' . (int) $idGroup
         );
 
         return $maxOrdering === false || $maxOrdering === null ? 0 : ((int) $maxOrdering + 1);
@@ -131,16 +146,53 @@ final class CustomHtmlBlockDataHandler implements FormDataHandlerInterface
         CustomHtmlFaq::deleteByBlockId($idBlock);
 
         foreach (array_values($faqs) as $position => $faqData) {
-            if (empty($faqData['question'])) {
+            $question = $faqData['question'] ?? [];
+
+            if (empty(array_filter($question, static function ($value) {
+                return trim((string) $value) !== '';
+            }))) {
                 continue;
             }
 
             $faq = new CustomHtmlFaq();
             $faq->id_ws_customhtml = $idBlock;
-            $faq->question         = (string) $faqData['question'];
-            $faq->answer           = (string) ($faqData['answer'] ?? '');
+            $faq->question         = $question;
+            $faq->answer           = $faqData['answer'] ?? [];
             $faq->ordering         = $position;
             $faq->add();
         }
     }
+
+    /**
+     * Slides are fully replaced on every save, like FAQ items — except a
+     * slide's image can't round-trip through its file input, so the previous
+     * filename is looked up by the slide's hidden id and reused whenever no
+     * new file was uploaded for that row.
+     */
+    private function saveSlides(int $idBlock, array $slides): void
+    {
+        $existingImages = [];
+
+        foreach (CustomHtmlSlide::getByBlockId($idBlock) as $existingSlide) {
+            $existingImages[(int) $existingSlide['id_ws_customhtml_slide']] = $existingSlide['image'];
+        }
+
+        CustomHtmlSlide::deleteByBlockId($idBlock);
+
+        foreach (array_values($slides) as $position => $slideData) {
+            $existingId = (int) ($slideData['id'] ?? 0);
+            $existingImage = $existingImages[$existingId] ?? '';
+
+            $slide = new CustomHtmlSlide();
+            $slide->id_ws_customhtml  = $idBlock;
+            $slide->title             = $slideData['title'] ?? [];
+            $slide->description       = $slideData['description'] ?? [];
+            $slide->extra_description = $slideData['extra_description'] ?? [];
+            $slide->link              = $slideData['link'] ?? [];
+            $slide->link_text         = $slideData['link_text'] ?? [];
+            $slide->image             = $this->saveUploadedImage($slideData['image'] ?? null, $existingImage);
+            $slide->ordering          = $position;
+            $slide->add();
+        }
+    }
 }

src/Form/DataHandler/CustomHtmlGroupDataHandler.php

@@ -15,10 +15,12 @@ final class CustomHtmlGroupDataHandler implements FormDataHandlerInterface
     public function create(array $formData)
     {
         $group = new CustomHtmlGroup();
-        $group->title     = (string) $formData['title'];
-        $group->hook_name = (string) $formData['hook_name'];
-        $group->active    = (int) $formData['active'];
-        $group->ordering  = $this->getNextOrdering();
+        $group->title        = $formData['title'];
+        $group->hook_name    = (string) $formData['hook_name'];
+        $group->custom_class = (string) ($formData['custom_class'] ?? '');
+        $group->default_block_class = (string) ($formData['default_block_class'] ?? '');
+        $group->active       = (int) $formData['active'];
+        $group->ordering     = $this->getNextOrdering();
 
         if (!$group->add()) {
             return false;
@@ -46,9 +48,11 @@ final class CustomHtmlGroupDataHandler implements FormDataHandlerInterface
             return false;
         }
 
-        $group->title     = (string) $formData['title'];
-        $group->hook_name = (string) $formData['hook_name'];
-        $group->active    = (int) $formData['active'];
+        $group->title        = $formData['title'];
+        $group->hook_name    = (string) $formData['hook_name'];
+        $group->custom_class = (string) ($formData['custom_class'] ?? '');
+        $group->default_block_class = (string) ($formData['default_block_class'] ?? '');
+        $group->active       = (int) $formData['active'];
 
         if (!$group->update()) {
             return false;

src/Form/DataHandler/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Form/DataProvider/CustomHtmlBlockDataProvider.php

@@ -3,8 +3,10 @@
 namespace Websmid\CustomHtml\Form\DataProvider;
 
 use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FormDataProviderInterface;
+use Websmid\CustomHtml\Config\Config;
 use Websmid\CustomHtml\Model\CustomHtmlBlock;
 use Websmid\CustomHtml\Model\CustomHtmlFaq;
+use Websmid\CustomHtml\Model\CustomHtmlSlide;
 use Validate;
 
 final class CustomHtmlBlockDataProvider implements FormDataProviderInterface
@@ -28,9 +30,16 @@ final class CustomHtmlBlockDataProvider implements FormDataProviderInterface
             'description'            => $block->description,
             'extra_description'      => $block->extra_description,
             'link'                   => $block->link,
+            'link_text'              => $block->link_text,
             'alert_type'             => $block->alert_type,
             'timeout'                => (int) $block->timeout,
+            'slider_mode'             => $block->slider_mode,
+            'slides_per_view_mobile'  => (float) $block->slides_per_view_mobile,
+            'slides_per_view_tablet'  => (float) $block->slides_per_view_tablet,
+            'slides_per_view_desktop' => (float) $block->slides_per_view_desktop > 0 ? (float) $block->slides_per_view_desktop : null,
+            'autoplay_delay'          => (int) $block->autoplay_delay,
             'faqs'                   => $this->loadFaqs((int) $id),
+            'slides'                 => $this->loadSlides((int) $id),
             'active'                 => (bool) $block->active,
         ];
     }
@@ -39,18 +48,25 @@ final class CustomHtmlBlockDataProvider implements FormDataProviderInterface
     {
         return [
             'id_ws_customhtml_group' => 0,
-            'title'                  => '',
+            'title'                  => [],
             'type'                   => 'html',
             'show_title'             => false,
             'custom_class'           => '',
-            'content'                => '',
+            'content'                => [],
             'image'                  => null,
-            'description'            => '',
-            'extra_description'      => '',
-            'link'                   => '',
+            'description'            => [],
+            'extra_description'      => [],
+            'link'                   => [],
+            'link_text'              => [],
             'alert_type'             => 'info',
             'timeout'                => 0,
+            'slider_mode'             => Config::SLIDER_DEFAULT_MODE,
+            'slides_per_view_mobile'  => Config::SLIDER_DEFAULT_SLIDES_PER_VIEW_MOBILE,
+            'slides_per_view_tablet'  => Config::SLIDER_DEFAULT_SLIDES_PER_VIEW_TABLET,
+            'slides_per_view_desktop' => null,
+            'autoplay_delay'          => 0,
             'faqs'                   => [],
+            'slides'                 => [],
             'active'                 => true,
         ];
     }
@@ -64,4 +80,19 @@ final class CustomHtmlBlockDataProvider implements FormDataProviderInterface
             ];
         }, CustomHtmlFaq::getByBlockId($idBlock));
     }
+
+    private function loadSlides(int $idBlock): array
+    {
+        return array_map(static function (array $slide) {
+            return [
+                'id'                => (int) $slide['id_ws_customhtml_slide'],
+                'title'             => $slide['title'],
+                'description'       => $slide['description'],
+                'extra_description' => $slide['extra_description'],
+                'link'              => $slide['link'],
+                'link_text'         => $slide['link_text'],
+                'image'             => null,
+            ];
+        }, CustomHtmlSlide::getByBlockId($idBlock));
+    }
 }

src/Form/DataProvider/CustomHtmlGroupDataProvider.php

@@ -17,18 +17,22 @@ final class CustomHtmlGroupDataProvider implements FormDataProviderInterface
         }
 
         return [
-            'title'     => $group->title,
-            'hook_name' => $group->hook_name,
-            'active'    => (bool) $group->active,
+            'title'                => $group->title,
+            'hook_name'            => $group->hook_name,
+            'custom_class'         => $group->custom_class,
+            'default_block_class'  => $group->default_block_class,
+            'active'               => (bool) $group->active,
         ];
     }
 
     public function getDefaultData()
     {
         return [
-            'title'     => '',
-            'hook_name' => '',
-            'active'    => true,
+            'title'                => [],
+            'hook_name'            => '',
+            'custom_class'         => '',
+            'default_block_class'  => '',
+            'active'               => true,
         ];
     }
 }

src/Form/DataProvider/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Form/Type/CustomHtmlBlockType.php

@@ -8,23 +8,29 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use PrestaShop\PrestaShop\Core\Form\ConfigurableFormChoiceProviderInterface;
+use PrestaShopBundle\Form\Admin\Type\FormattedTextareaType;
 use PrestaShopBundle\Form\Admin\Type\SwitchType;
+use PrestaShopBundle\Form\Admin\Type\TranslatableType;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Websmid\CustomHtml\Config\Config;
 
 class CustomHtmlBlockType extends AbstractType
 {
     private $translator;
+    private $locales;
     private $groupChoiceProvider;
 
     public function __construct(
         TranslatorInterface $translator,
+        array $locales,
         ConfigurableFormChoiceProviderInterface $groupChoiceProvider
     ) {
         $this->translator = $translator;
+        $this->locales = $locales;
         $this->groupChoiceProvider = $groupChoiceProvider;
     }
 
@@ -32,17 +38,20 @@ class CustomHtmlBlockType extends AbstractType
     {
         $formBuilder
             ->add('id_ws_customhtml_group', ChoiceType::class, [
-                'label'    => $this->translator->trans('Group', [], 'Modules.Wscustomhtml.Admin'),
-                'choices'  => $this->groupChoiceProvider->getChoices(),
-                'required' => true,
+                'label'       => $this->translator->trans('Group', [], 'Modules.Wscustomhtml.Admin'),
+                'choices'     => $this->groupChoiceProvider->getChoices(),
+                'choice_attr' => $this->groupChoiceProvider->getChoicesAttributes(),
+                'required'    => true,
             ])
             ->add('type', ChoiceType::class, [
                 'label'    => $this->translator->trans('Block type', [], 'Modules.Wscustomhtml.Admin'),
                 'choices'  => array_flip(Config::BLOCK_TYPES),
                 'required' => true,
             ])
-            ->add('title', TextType::class, [
+            ->add('title', TranslatableType::class, [
+                'type'     => TextType::class,
                 'label'    => $this->translator->trans('Title', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
                 'required' => true,
                 'row_attr' => ['class' => 'col-8'],
             ])
@@ -51,16 +60,17 @@ class CustomHtmlBlockType extends AbstractType
                 'required' => false,
                 'row_attr' => ['class' => 'col-3'],
             ])
-            ->add('content', TextareaType::class, [
+            ->add('content', TranslatableType::class, [
+                'type'     => FormattedTextareaType::class,
                 'label'    => $this->translator->trans('Content', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
                 'required' => false,
-                'attr'     => ['class' => 'autoload_rte'],
                 'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-html'],
             ])
             ->add('image', FileType::class, [
-                'label'    => $this->translator->trans('Banner image', [], 'Modules.Wscustomhtml.Admin'),
+                'label'    => $this->translator->trans('Image', [], 'Modules.Wscustomhtml.Admin'),
                 'required' => false,
-                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-banner'],
+                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-banner customhtmlblock-type-usp'],
             ])
             ->add('faqs', CollectionType::class, [
                 'entry_type'   => CustomHtmlFaqType::class,
@@ -70,6 +80,50 @@ class CustomHtmlBlockType extends AbstractType
                 'prototype'    => true,
                 'required'     => false,
             ])
+            ->add('slides', CollectionType::class, [
+                'entry_type'   => CustomHtmlSlideType::class,
+                'allow_add'    => true,
+                'allow_delete' => true,
+                'by_reference' => false,
+                'prototype'    => true,
+                'required'     => false,
+            ])
+            ->add('slider_mode', ChoiceType::class, [
+                'label'    => $this->translator->trans('Slider mode', [], 'Modules.Wscustomhtml.Admin'),
+                'choices'  => array_flip(Config::SLIDER_MODES),
+                'required' => false,
+                'help'     => $this->translator->trans('"Mobile only": slider only on mobile, a static grid shows instead from tablet up.', [], 'Modules.Wscustomhtml.Admin'),
+                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-slider'],
+            ])
+            ->add('slides_per_view_mobile', NumberType::class, [
+                'label'    => $this->translator->trans('Slides visible on mobile', [], 'Modules.Wscustomhtml.Admin'),
+                'required' => false,
+                'scale'    => 2,
+                'attr'     => ['min' => 0, 'step' => '0.05'],
+                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-slider col-4'],
+            ])
+            ->add('slides_per_view_tablet', NumberType::class, [
+                'label'    => $this->translator->trans('Slides visible on tablet', [], 'Modules.Wscustomhtml.Admin'),
+                'required' => false,
+                'scale'    => 2,
+                'attr'     => ['min' => 0, 'step' => '0.05'],
+                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-slider col-4'],
+            ])
+            ->add('slides_per_view_desktop', NumberType::class, [
+                'label'    => $this->translator->trans('Slides visible on desktop', [], 'Modules.Wscustomhtml.Admin'),
+                'required' => false,
+                'scale'    => 2,
+                'attr'     => ['min' => 0, 'step' => '0.05', 'placeholder' => $this->translator->trans('Auto', [], 'Modules.Wscustomhtml.Admin')],
+                'help'     => $this->translator->trans('In "Mobile only" mode this is rounded to the nearest whole number of columns. Leave empty for an equal-width column.', [], 'Modules.Wscustomhtml.Admin'),
+                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-slider col-4'],
+            ])
+            ->add('autoplay_delay', IntegerType::class, [
+                'label'    => $this->translator->trans('Autoplay delay (seconds)', [], 'Modules.Wscustomhtml.Admin'),
+                'required' => false,
+                'attr'     => ['min' => 0, 'placeholder' => '0'],
+                'help'     => $this->translator->trans('0 means the slider never auto-advances; visitors can still swipe or use the arrows.', [], 'Modules.Wscustomhtml.Admin'),
+                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-slider'],
+            ])
             ->add('alert_type', ChoiceType::class, [
                 'label'    => $this->translator->trans('Alert style', [], 'Modules.Wscustomhtml.Admin'),
                 'choices'  => array_flip(Config::ALERT_STYLES),
@@ -83,21 +137,35 @@ class CustomHtmlBlockType extends AbstractType
                 'help'     => $this->translator->trans('0 means the alert never auto-dismisses; visitors can still close it manually.', [], 'Modules.Wscustomhtml.Admin'),
                 'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-alert'],
             ])
-            ->add('description', TextareaType::class, [
+            ->add('description', TranslatableType::class, [
+                'type'     => TextareaType::class,
                 'label'    => $this->translator->trans('Description', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
                 'required' => false,
-                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-banner customhtmlblock-type-alert'],
+                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-banner customhtmlblock-type-alert customhtmlblock-type-usp'],
             ])
-            ->add('extra_description', TextareaType::class, [
+            ->add('extra_description', TranslatableType::class, [
+                'type'     => TextareaType::class,
                 'label'    => $this->translator->trans('Extra description', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
                 'required' => false,
                 'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-banner'],
             ])
-            ->add('link', TextType::class, [
-                'label'    => $this->translator->trans('Link', [], 'Modules.Wscustomhtml.Admin'),
+            ->add('link', TranslatableType::class, [
+                'type'     => TextType::class,
+                'label'    => $this->translator->trans('Link URL', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
                 'required' => false,
-                'attr'     => ['placeholder' => 'https://example.com or /internal-page'],
-                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-banner'],
+                'options'  => ['attr' => ['placeholder' => 'https://example.com or /internal-page']],
+                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-banner customhtmlblock-type-usp customhtmlblock-type-alert'],
+            ])
+            ->add('link_text', TranslatableType::class, [
+                'type'     => TextType::class,
+                'label'    => $this->translator->trans('Link text', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
+                'required' => false,
+                'options'  => ['attr' => ['placeholder' => 'Learn more']],
+                'row_attr' => ['class' => 'customhtmlblock-type-field customhtmlblock-type-alert col-6'],
             ])
             ->add('custom_class', TextType::class, [
                 'label'    => $this->translator->trans('Custom classes', [], 'Modules.Wscustomhtml.Admin'),

src/Form/Type/CustomHtmlFaqType.php

@@ -6,26 +6,33 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use PrestaShopBundle\Form\Admin\Type\TranslatableType;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class CustomHtmlFaqType extends AbstractType
 {
     private $translator;
+    private $locales;
 
-    public function __construct(TranslatorInterface $translator)
+    public function __construct(TranslatorInterface $translator, array $locales)
     {
         $this->translator = $translator;
+        $this->locales = $locales;
     }
 
     public function buildForm(FormBuilderInterface $formBuilder, array $options): void
     {
         $formBuilder
-            ->add('question', TextType::class, [
+            ->add('question', TranslatableType::class, [
+                'type'     => TextType::class,
                 'label'    => $this->translator->trans('Question', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
                 'required' => false,
             ])
-            ->add('answer', TextareaType::class, [
+            ->add('answer', TranslatableType::class, [
+                'type'     => TextareaType::class,
                 'label'    => $this->translator->trans('Answer', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
                 'required' => false,
             ]);
     }

src/Form/Type/CustomHtmlGroupType.php

@@ -6,28 +6,44 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use PrestaShopBundle\Form\Admin\Type\SwitchType;
+use PrestaShopBundle\Form\Admin\Type\TranslatableType;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class CustomHtmlGroupType extends AbstractType
 {
     private $translator;
+    private $locales;
 
-    public function __construct(TranslatorInterface $translator)
+    public function __construct(TranslatorInterface $translator, array $locales)
     {
         $this->translator = $translator;
+        $this->locales = $locales;
     }
 
     public function buildForm(FormBuilderInterface $formBuilder, array $options): void
     {
         $formBuilder
-            ->add('title', TextType::class, [
+            ->add('title', TranslatableType::class, [
+                'type'     => TextType::class,
                 'label'    => $this->translator->trans('Title', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
                 'required' => true,
             ])
             ->add('hook_name', TextType::class, [
                 'label'    => $this->translator->trans('Hook name', [], 'Modules.Wscustomhtml.Admin'),
                 'required' => true,
             ])
+            ->add('custom_class', TextType::class, [
+                'label'    => $this->translator->trans('Custom group classes', [], 'Modules.Wscustomhtml.Admin'),
+                'required' => false,
+                'attr'     => ['placeholder' => 'col-md-6'],
+            ])
+            ->add('default_block_class', TextType::class, [
+                'label'    => $this->translator->trans('Default block class', [], 'Modules.Wscustomhtml.Admin'),
+                'required' => false,
+                'attr'     => ['placeholder' => 'col-12 col-lg-6 col-xl-5'],
+                'help'     => $this->translator->trans('Applied to every block in this group automatically, in addition to that block\'s own custom classes. Useful when several blocks need the same column layout.', [], 'Modules.Wscustomhtml.Admin'),
+            ])
             ->add('active', SwitchType::class, [
                 'label'    => $this->translator->trans('Active', [], 'Modules.Wscustomhtml.Admin'),
                 'required' => false,

src/Form/Type/CustomHtmlSlideType.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Websmid\CustomHtml\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use PrestaShopBundle\Form\Admin\Type\TranslatableType;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class CustomHtmlSlideType extends AbstractType
+{
+    private $translator;
+    private $locales;
+
+    public function __construct(TranslatorInterface $translator, array $locales)
+    {
+        $this->translator = $translator;
+        $this->locales = $locales;
+    }
+
+    public function buildForm(FormBuilderInterface $formBuilder, array $options): void
+    {
+        $formBuilder
+            ->add('id', HiddenType::class, [
+                'required' => false,
+            ])
+            ->add('title', TranslatableType::class, [
+                'type'     => TextType::class,
+                'label'    => $this->translator->trans('Title', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
+                'required' => false,
+            ])
+            ->add('description', TranslatableType::class, [
+                'type'     => TextareaType::class,
+                'label'    => $this->translator->trans('Description', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
+                'required' => false,
+            ])
+            ->add('extra_description', TranslatableType::class, [
+                'type'     => TextareaType::class,
+                'label'    => $this->translator->trans('Extra description', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
+                'required' => false,
+            ])
+            ->add('link', TranslatableType::class, [
+                'type'     => TextType::class,
+                'label'    => $this->translator->trans('Link URL', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
+                'required' => false,
+                'options'  => ['attr' => ['placeholder' => 'https://example.com or /internal-page']],
+            ])
+            ->add('link_text', TranslatableType::class, [
+                'type'     => TextType::class,
+                'label'    => $this->translator->trans('Link text', [], 'Modules.Wscustomhtml.Admin'),
+                'locales'  => $this->locales,
+                'required' => false,
+                'options'  => ['attr' => ['placeholder' => 'Learn more']],
+            ])
+            ->add('image', FileType::class, [
+                'label'    => $this->translator->trans('Image', [], 'Modules.Wscustomhtml.Admin'),
+                'required' => false,
+            ]);
+    }
+}

src/Form/Type/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Form/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Grid/Definition/Factory/CustomHtmlBlockGridDefinitionFactory.php

@@ -170,10 +170,17 @@ final class CustomHtmlBlockGridDefinitionFactory extends AbstractGridDefinitionF
                     'route_param_field'  => 'id_ws_customhtml',
                     'use_inline_display' => true,
                     'clickable_row'      => true,
+                    'extra_route_params' => ['idGroup' => 'id_ws_customhtml_group'],
                 ])
             )
             ->add(
-                $this->buildDeleteAction('customhtmlblock_delete', 'idCustomHtmlBlock', 'id_ws_customhtml')
+                $this->buildDeleteAction(
+                    'customhtmlblock_delete',
+                    'idCustomHtmlBlock',
+                    'id_ws_customhtml',
+                    'POST',
+                    ['idGroup' => 'id_ws_customhtml_group']
+                )
             );
     }
 }

src/Grid/Definition/Factory/CustomHtmlGroupGridDefinitionFactory.php

@@ -9,6 +9,7 @@ use PrestaShop\PrestaShop\Core\Grid\Action\Type\SimpleGridAction;
 use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollection;
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ActionColumn;
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\PositionColumn;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ToggleColumn;
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\DataColumn;
 use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory;
 use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\DeleteActionTrait;
@@ -78,9 +79,14 @@ final class CustomHtmlGroupGridDefinitionFactory extends AbstractGridDefinitionF
                 ->setOptions(['field' => 'blocks_count', 'sortable' => false])
             )
             ->add(
-                (new DataColumn('active'))
+                (new ToggleColumn('active'))
                 ->setName($this->trans('Active', [], 'Admin.Global'))
-                ->setOptions(['field' => 'active'])
+                ->setOptions([
+                    'field'            => 'active',
+                    'primary_field'    => 'id_ws_customhtml_group',
+                    'route'            => 'customhtmlgroup_toggle',
+                    'route_param_name' => 'idCustomHtmlGroup',
+                ])
             )
             ->add(
                 (new PositionColumn('position'))

src/Grid/Definition/Factory/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Grid/Definition/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Grid/Filters/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Grid/Query/CustomHtmlBlockQueryBuilder.php

@@ -11,6 +11,8 @@ use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
 
 final class CustomHtmlBlockQueryBuilder extends AbstractDoctrineQueryBuilder
 {
+    private $contextLanguageId;
+
     public function __construct(
         Connection $connection,
         string $dbPrefix,
@@ -22,6 +24,8 @@ final class CustomHtmlBlockQueryBuilder extends AbstractDoctrineQueryBuilder
         Configuration $configuration
     ) {
         parent::__construct($connection, $dbPrefix);
+
+        $this->contextLanguageId = $contextLanguageId;
     }
 
     public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria)
@@ -31,8 +35,8 @@ final class CustomHtmlBlockQueryBuilder extends AbstractDoctrineQueryBuilder
         $qb->select(
             'wchb.`id_ws_customhtml`',
             'wchb.`id_ws_customhtml_group`',
-            'wchb.`title`',
-            'wchg.`title` AS group_title',
+            'wchbl.`title`',
+            'wchgl.`title` AS group_title',
             'wchb.`type`',
             'wchb.`active`',
             'wchb.`ordering`',
@@ -71,6 +75,18 @@ final class CustomHtmlBlockQueryBuilder extends AbstractDoctrineQueryBuilder
                 $this->dbPrefix . 'ws_customhtml_group',
                 'wchg',
                 'wchg.`id_ws_customhtml_group` = wchb.`id_ws_customhtml_group`'
+            )
+            ->leftJoin(
+                'wchb',
+                $this->dbPrefix . 'ws_customhtml_group_lang',
+                'wchgl',
+                'wchgl.`id_ws_customhtml_group` = wchb.`id_ws_customhtml_group` AND wchgl.`id_lang` = ' . (int) $this->contextLanguageId
+            )
+            ->leftJoin(
+                'wchb',
+                $this->dbPrefix . 'ws_customhtml_lang',
+                'wchbl',
+                'wchbl.`id_ws_customhtml` = wchb.`id_ws_customhtml` AND wchbl.`id_lang` = ' . (int) $this->contextLanguageId
             );
     }
 
@@ -93,8 +109,14 @@ final class CustomHtmlBlockQueryBuilder extends AbstractDoctrineQueryBuilder
                 continue;
             }
 
+            if ($filterName === 'title') {
+                $qb->andWhere('wchbl.`title` LIKE :title')
+                   ->setParameter('title', '%' . pSQL($filterValue) . '%');
+                continue;
+            }
+
             if ($filterName === 'group_title') {
-                $qb->andWhere('wchg.`title` LIKE :group_title')
+                $qb->andWhere('wchgl.`title` LIKE :group_title')
                    ->setParameter('group_title', '%' . pSQL($filterValue) . '%');
                 continue;
             }

src/Grid/Query/CustomHtmlGroupQueryBuilder.php

@@ -11,6 +11,8 @@ use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
 
 final class CustomHtmlGroupQueryBuilder extends AbstractDoctrineQueryBuilder
 {
+    private $contextLanguageId;
+
     public function __construct(
         Connection $connection,
         string $dbPrefix,
@@ -22,6 +24,8 @@ final class CustomHtmlGroupQueryBuilder extends AbstractDoctrineQueryBuilder
         Configuration $configuration
     ) {
         parent::__construct($connection, $dbPrefix);
+
+        $this->contextLanguageId = $contextLanguageId;
     }
 
     public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria)
@@ -30,8 +34,9 @@ final class CustomHtmlGroupQueryBuilder extends AbstractDoctrineQueryBuilder
 
         $qb->select(
             'wchg.`id_ws_customhtml_group`',
-            'wchg.`title`',
+            'wchgl.`title`',
             'wchg.`hook_name`',
+            'wchg.`custom_class`',
             'wchg.`active`',
             'wchg.`ordering`',
             'wchg.`date_add`',
@@ -65,7 +70,13 @@ final class CustomHtmlGroupQueryBuilder extends AbstractDoctrineQueryBuilder
     {
         return $this->connection
             ->createQueryBuilder()
-            ->from($this->dbPrefix . 'ws_customhtml_group', 'wchg');
+            ->from($this->dbPrefix . 'ws_customhtml_group', 'wchg')
+            ->leftJoin(
+                'wchg',
+                $this->dbPrefix . 'ws_customhtml_group_lang',
+                'wchgl',
+                'wchgl.`id_ws_customhtml_group` = wchg.`id_ws_customhtml_group` AND wchgl.`id_lang` = ' . (int) $this->contextLanguageId
+            );
     }
 
     private function applyFilters($qb, SearchCriteriaInterface $searchCriteria): void
@@ -81,6 +92,12 @@ final class CustomHtmlGroupQueryBuilder extends AbstractDoctrineQueryBuilder
                 continue;
             }
 
+            if ($filterName === 'title') {
+                $qb->andWhere('wchgl.`title` LIKE :title')
+                   ->setParameter('title', '%' . pSQL($filterValue) . '%');
+                continue;
+            }
+
             $qb->andWhere('wchg.`' . $filterName . '` LIKE :' . $filterName)
                ->setParameter($filterName, '%' . pSQL($filterValue) . '%');
         }

src/Grid/Query/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Grid/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Model/CustomHtmlBlock.php

@@ -34,6 +34,9 @@ class CustomHtmlBlock extends ObjectModel
     /** @var string */
     public $link = '';
 
+    /** @var string */
+    public $link_text = '';
+
     /** @var string */
     public $image = '';
 
@@ -43,6 +46,21 @@ class CustomHtmlBlock extends ObjectModel
     /** @var int */
     public $timeout = 0;
 
+    /** @var string */
+    public $slider_mode = 'always';
+
+    /** @var float */
+    public $slides_per_view_mobile = 1;
+
+    /** @var float */
+    public $slides_per_view_tablet = 2;
+
+    /** @var float */
+    public $slides_per_view_desktop = 3;
+
+    /** @var int */
+    public $autoplay_delay = 0;
+
     /** @var int */
     public $active = 1;
 
@@ -59,20 +77,27 @@ class CustomHtmlBlock extends ObjectModel
     public $date_upd;
 
     public static $definition = [
-        'table'   => 'ws_customhtml',
-        'primary' => 'id_ws_customhtml',
-        'fields'  => [
+        'table'     => 'ws_customhtml',
+        'primary'   => 'id_ws_customhtml',
+        'multilang' => true,
+        'fields'    => [
             'id_ws_customhtml_group' => ['type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true],
-            'title'                  => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 256],
+            'title'                  => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 256, 'lang' => true],
             'type'                   => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 32],
-            'content'                => ['type' => self::TYPE_HTML, 'validate' => 'isCleanHtml'],
+            'content'                => ['type' => self::TYPE_HTML, 'validate' => 'isCleanHtml', 'lang' => true],
             'custom_class'           => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 128],
-            'description'            => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 1024],
-            'extra_description'      => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 1024],
-            'link'                   => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 512],
+            'description'            => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 1024, 'lang' => true],
+            'extra_description'      => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 1024, 'lang' => true],
+            'link'                   => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 512, 'lang' => true],
+            'link_text'              => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 128, 'lang' => true],
             'image'                  => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 255],
             'alert_type'             => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 16],
             'timeout'                => ['type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'required' => false],
+            'slider_mode'             => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 16],
+            'slides_per_view_mobile'  => ['type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat', 'required' => false],
+            'slides_per_view_tablet'  => ['type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat', 'required' => false],
+            'slides_per_view_desktop' => ['type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat', 'required' => false],
+            'autoplay_delay'          => ['type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'required' => false],
             'active'                 => ['type' => self::TYPE_BOOL, 'validate' => 'isBool'],
             'show_title'             => ['type' => self::TYPE_BOOL, 'validate' => 'isBool'],
             'ordering'               => ['type' => self::TYPE_INT, 'validate' => 'isInt'],
@@ -95,7 +120,7 @@ class CustomHtmlBlock extends ObjectModel
         return _MODULE_DIR_ . 'ws_customhtml/views/img/banners/' . $filename;
     }
 
-    public static function getActiveByGroupIds(array $groupIds): array
+    public static function getActiveByGroupIds(array $groupIds, int $idLang): array
     {
         $groupIds = array_map('intval', $groupIds);
 
@@ -104,12 +129,16 @@ class CustomHtmlBlock extends ObjectModel
         }
 
         $result = Db::getInstance()->executeS(
-            'SELECT `id_ws_customhtml`, `id_ws_customhtml_group`, `title`, `type`, `content`, `custom_class`,
-                    `description`, `extra_description`, `link`, `image`, `alert_type`, `timeout`, `active`, `show_title`, `ordering`
-             FROM `' . _DB_PREFIX_ . 'ws_customhtml`
-             WHERE `id_ws_customhtml_group` IN (' . implode(',', $groupIds) . ')
-             AND `active` = 1
-             ORDER BY `ordering` ASC'
+            'SELECT wch.`id_ws_customhtml`, wch.`id_ws_customhtml_group`, wchl.`title`, wch.`type`, wchl.`content`, wch.`custom_class`,
+                    wchl.`description`, wchl.`extra_description`, wchl.`link`, wchl.`link_text`, wch.`image`, wch.`alert_type`, wch.`timeout`,
+                    wch.`slider_mode`, wch.`slides_per_view_mobile`, wch.`slides_per_view_tablet`, wch.`slides_per_view_desktop`, wch.`autoplay_delay`,
+                    wch.`active`, wch.`show_title`, wch.`ordering`
+             FROM `' . _DB_PREFIX_ . 'ws_customhtml` wch
+             LEFT JOIN `' . _DB_PREFIX_ . 'ws_customhtml_lang` wchl
+                 ON wchl.`id_ws_customhtml` = wch.`id_ws_customhtml` AND wchl.`id_lang` = ' . (int) $idLang . '
+             WHERE wch.`id_ws_customhtml_group` IN (' . implode(',', $groupIds) . ')
+             AND wch.`active` = 1
+             ORDER BY wch.`ordering` ASC'
         );
 
         $blocksByGroup = [];

src/Model/CustomHtmlFaq.php

@@ -29,27 +29,56 @@ class CustomHtmlFaq extends ObjectModel
     public $date_upd;
 
     public static $definition = [
-        'table'   => 'ws_customhtml_faq',
-        'primary' => 'id_ws_customhtml_faq',
-        'fields'  => [
+        'table'     => 'ws_customhtml_faq',
+        'primary'   => 'id_ws_customhtml_faq',
+        'multilang' => true,
+        'fields'    => [
             'id_ws_customhtml' => ['type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true],
-            'question'         => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 512],
-            'answer'           => ['type' => self::TYPE_HTML, 'validate' => 'isCleanHtml'],
+            'question'         => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 512, 'lang' => true],
+            'answer'           => ['type' => self::TYPE_HTML, 'validate' => 'isCleanHtml', 'lang' => true],
             'ordering'         => ['type' => self::TYPE_INT, 'validate' => 'isInt'],
             'date_add'         => ['type' => self::TYPE_DATE, 'validate' => 'isDate'],
             'date_upd'         => ['type' => self::TYPE_DATE, 'validate' => 'isDate'],
         ],
     ];
 
+    /**
+     * Admin use — loads every language into lang fields as [id_lang => value] arrays.
+     */
     public static function getByBlockId(int $idBlock): array
     {
-        $result = Db::getInstance()->executeS(
-            'SELECT `id_ws_customhtml_faq`, `question`, `answer`, `ordering`
-             FROM `' . _DB_PREFIX_ . 'ws_customhtml_faq`
+        $ids = Db::getInstance()->executeS(
+            'SELECT `id_ws_customhtml_faq` FROM `' . _DB_PREFIX_ . 'ws_customhtml_faq`
              WHERE `id_ws_customhtml` = ' . (int) $idBlock . '
              ORDER BY `ordering` ASC'
         );
 
+        return array_map(static function (array $row) {
+            $faq = new self((int) $row['id_ws_customhtml_faq']);
+
+            return [
+                'id_ws_customhtml_faq' => (int) $faq->id,
+                'question'             => $faq->question,
+                'answer'               => $faq->answer,
+                'ordering'             => (int) $faq->ordering,
+            ];
+        }, $ids ?: []);
+    }
+
+    /**
+     * Front-end use — resolves lang fields to plain strings for one language.
+     */
+    public static function getByBlockIdForLang(int $idBlock, int $idLang): array
+    {
+        $result = Db::getInstance()->executeS(
+            'SELECT wcf.`id_ws_customhtml_faq`, wcfl.`question`, wcfl.`answer`, wcf.`ordering`
+             FROM `' . _DB_PREFIX_ . 'ws_customhtml_faq` wcf
+             LEFT JOIN `' . _DB_PREFIX_ . 'ws_customhtml_faq_lang` wcfl
+                 ON wcfl.`id_ws_customhtml_faq` = wcf.`id_ws_customhtml_faq` AND wcfl.`id_lang` = ' . (int) $idLang . '
+             WHERE wcf.`id_ws_customhtml` = ' . (int) $idBlock . '
+             ORDER BY wcf.`ordering` ASC'
+        );
+
         return $result ?: [];
     }
 

src/Model/CustomHtmlGroup.php

@@ -16,6 +16,12 @@ class CustomHtmlGroup extends ObjectModel
     /** @var string */
     public $title = '';
 
+    /** @var string */
+    public $custom_class = '';
+
+    /** @var string */
+    public $default_block_class = '';
+
     /** @var int */
     public $active = 1;
 
@@ -29,11 +35,14 @@ class CustomHtmlGroup extends ObjectModel
     public $date_upd;
 
     public static $definition = [
-        'table'   => 'ws_customhtml_group',
-        'primary' => 'id_ws_customhtml_group',
-        'fields'  => [
+        'table'     => 'ws_customhtml_group',
+        'primary'   => 'id_ws_customhtml_group',
+        'multilang' => true,
+        'fields'    => [
             'hook_name' => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 64],
-            'title'     => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 256],
+            'title'     => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 256, 'lang' => true],
+            'custom_class' => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 128],
+            'default_block_class' => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 128],
             'active'    => ['type' => self::TYPE_BOOL, 'validate' => 'isBool'],
             'ordering'  => ['type' => self::TYPE_INT, 'validate' => 'isInt'],
             'date_add'  => ['type' => self::TYPE_DATE, 'validate' => 'isDate'],
@@ -44,7 +53,7 @@ class CustomHtmlGroup extends ObjectModel
     public static function getActiveByHookName(string $hookName): array
     {
         $result = Db::getInstance()->executeS(
-            'SELECT `id_ws_customhtml_group`, `title`, `active`, `ordering`
+            'SELECT `id_ws_customhtml_group`, `active`, `custom_class`, `default_block_class`, `ordering`
              FROM `' . _DB_PREFIX_ . 'ws_customhtml_group`
              WHERE `hook_name` = \'' . pSQL($hookName) . '\'
              AND `active` = 1

src/Model/CustomHtmlSlide.php

@@ -0,0 +1,110 @@
+<?php
+
+namespace Websmid\CustomHtml\Model;
+
+use ObjectModel;
+use Db;
+
+class CustomHtmlSlide extends ObjectModel
+{
+    /** @var int */
+    public $id;
+
+    /** @var int */
+    public $id_ws_customhtml;
+
+    /** @var string */
+    public $title = '';
+
+    /** @var string */
+    public $description = '';
+
+    /** @var string */
+    public $extra_description = '';
+
+    /** @var string */
+    public $link = '';
+
+    /** @var string */
+    public $link_text = '';
+
+    /** @var string */
+    public $image = '';
+
+    /** @var int */
+    public $ordering = 0;
+
+    /** @var string */
+    public $date_add;
+
+    /** @var string */
+    public $date_upd;
+
+    public static $definition = [
+        'table'      => 'ws_customhtml_slide',
+        'primary'    => 'id_ws_customhtml_slide',
+        'multilang'  => true,
+        'fields'     => [
+            'id_ws_customhtml'  => ['type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true],
+            'title'             => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 256, 'lang' => true],
+            'description'       => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 1024, 'lang' => true],
+            'extra_description' => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 1024, 'lang' => true],
+            'link'              => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 512, 'lang' => true],
+            'link_text'         => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 128, 'lang' => true],
+            'image'             => ['type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => false, 'size' => 255],
+            'ordering'          => ['type' => self::TYPE_INT, 'validate' => 'isInt'],
+            'date_add'          => ['type' => self::TYPE_DATE, 'validate' => 'isDate'],
+            'date_upd'          => ['type' => self::TYPE_DATE, 'validate' => 'isDate'],
+        ],
+    ];
+
+    /**
+     * Admin use — loads every language into lang fields as [id_lang => value] arrays.
+     */
+    public static function getByBlockId(int $idBlock): array
+    {
+        $ids = Db::getInstance()->executeS(
+            'SELECT `id_ws_customhtml_slide` FROM `' . _DB_PREFIX_ . 'ws_customhtml_slide`
+             WHERE `id_ws_customhtml` = ' . (int) $idBlock . '
+             ORDER BY `ordering` ASC'
+        );
+
+        return array_map(static function (array $row) {
+            $slide = new self((int) $row['id_ws_customhtml_slide']);
+
+            return [
+                'id_ws_customhtml_slide' => (int) $slide->id,
+                'title'                  => $slide->title,
+                'description'            => $slide->description,
+                'extra_description'      => $slide->extra_description,
+                'link'                   => $slide->link,
+                'link_text'              => $slide->link_text,
+                'image'                  => $slide->image,
+                'ordering'               => (int) $slide->ordering,
+            ];
+        }, $ids ?: []);
+    }
+
+    /**
+     * Front-end use — resolves lang fields to plain strings for one language.
+     */
+    public static function getByBlockIdForLang(int $idBlock, int $idLang): array
+    {
+        $result = Db::getInstance()->executeS(
+            'SELECT wcs.`id_ws_customhtml_slide`, wcsl.`title`, wcsl.`description`, wcsl.`extra_description`,
+                    wcsl.`link`, wcsl.`link_text`, wcs.`image`, wcs.`ordering`
+             FROM `' . _DB_PREFIX_ . 'ws_customhtml_slide` wcs
+             LEFT JOIN `' . _DB_PREFIX_ . 'ws_customhtml_slide_lang` wcsl
+                 ON wcsl.`id_ws_customhtml_slide` = wcs.`id_ws_customhtml_slide` AND wcsl.`id_lang` = ' . (int) $idLang . '
+             WHERE wcs.`id_ws_customhtml` = ' . (int) $idBlock . '
+             ORDER BY wcs.`ordering` ASC'
+        );
+
+        return $result ?: [];
+    }
+
+    public static function deleteByBlockId(int $idBlock): void
+    {
+        Db::getInstance()->delete('ws_customhtml_slide', '`id_ws_customhtml` = ' . (int) $idBlock);
+    }
+}

src/Model/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/Module/DisplayHooks.php

@@ -2,9 +2,11 @@
 
 namespace Websmid\CustomHtml\Module;
 
+use Websmid\CustomHtml\Config\Config;
 use Websmid\CustomHtml\Model\CustomHtmlBlock;
 use Websmid\CustomHtml\Model\CustomHtmlFaq;
 use Websmid\CustomHtml\Model\CustomHtmlGroup;
+use Websmid\CustomHtml\Model\CustomHtmlSlide;
 use Context;
 
 trait DisplayHooks
@@ -47,7 +49,8 @@ trait DisplayHooks
 
     public function getWidgetVariables($hookName = null, array $configuration = [])
     {
-        $groupList = $this->loadActiveGroupsWithBlocks((string) $hookName);
+        $idLang = (int) Context::getContext()->language->id;
+        $groupList = $this->loadActiveGroupsWithBlocks((string) $hookName, $idLang);
 
         if (empty($groupList)) {
             return [];
@@ -59,7 +62,7 @@ trait DisplayHooks
         ];
     }
 
-    private function loadActiveGroupsWithBlocks(string $hookName): array
+    private function loadActiveGroupsWithBlocks(string $hookName, int $idLang): array
     {
         $groups = CustomHtmlGroup::getActiveByHookName($hookName);
 
@@ -67,9 +70,10 @@ trait DisplayHooks
             return [];
         }
 
-        $blocksByGroup = CustomHtmlBlock::getActiveByGroupIds(array_column($groups, 'id_ws_customhtml_group'));
-        $blocksByGroup = $this->attachFaqsToBlocks($blocksByGroup);
-        $blocksByGroup = $this->attachBannerImageUrls($blocksByGroup);
+        $blocksByGroup = CustomHtmlBlock::getActiveByGroupIds(array_column($groups, 'id_ws_customhtml_group'), $idLang);
+        $blocksByGroup = $this->attachFaqsToBlocks($blocksByGroup, $idLang);
+        $blocksByGroup = $this->attachImageUrls($blocksByGroup);
+        $blocksByGroup = $this->attachSlidesToBlocks($blocksByGroup, $idLang);
 
         $groups = array_map(static function (array $group) use ($blocksByGroup) {
             $group['blocks'] = $blocksByGroup[(int) $group['id_ws_customhtml_group']] ?? [];
@@ -82,12 +86,12 @@ trait DisplayHooks
         }));
     }
 
-    private function attachFaqsToBlocks(array $blocksByGroup): array
+    private function attachFaqsToBlocks(array $blocksByGroup, int $idLang): array
     {
-        return array_map(static function (array $blocks) {
-            return array_map(static function (array $block) {
+        return array_map(static function (array $blocks) use ($idLang) {
+            return array_map(static function (array $block) use ($idLang) {
                 if ($block['type'] === 'faq') {
-                    $block['faqs'] = CustomHtmlFaq::getByBlockId((int) $block['id_ws_customhtml']);
+                    $block['faqs'] = CustomHtmlFaq::getByBlockIdForLang((int) $block['id_ws_customhtml'], $idLang);
                 }
 
                 return $block;
@@ -95,11 +99,11 @@ trait DisplayHooks
         }, $blocksByGroup);
     }
 
-    private function attachBannerImageUrls(array $blocksByGroup): array
+    private function attachImageUrls(array $blocksByGroup): array
     {
         return array_map(static function (array $blocks) {
             return array_map(static function (array $block) {
-                if ($block['type'] === 'banner') {
+                if (in_array($block['type'], ['banner', 'usp'], true)) {
                     $block['image_url'] = CustomHtmlBlock::getBannerImageUrl($block['image']);
                 }
 
@@ -107,4 +111,74 @@ trait DisplayHooks
             }, $blocks);
         }, $blocksByGroup);
     }
+
+    private function attachSlidesToBlocks(array $blocksByGroup, int $idLang): array
+    {
+        return array_map(function (array $blocks) use ($idLang) {
+            return array_map(function (array $block) use ($idLang) {
+                if ($block['type'] === 'slider') {
+                    $block['slides'] = $this->loadSlidesForBlock((int) $block['id_ws_customhtml'], $idLang);
+                    $block['slider_config'] = $this->buildSliderConfig($block);
+                    $block['slider_desktop_column_width'] = $this->buildSliderDesktopColumnWidth($block);
+                }
+
+                return $block;
+            }, $blocks);
+        }, $blocksByGroup);
+    }
+
+    private function loadSlidesForBlock(int $idBlock, int $idLang): array
+    {
+        return array_map(static function (array $slide) {
+            $slide['image_url'] = CustomHtmlBlock::getBannerImageUrl($slide['image']);
+            $slide['show_title'] = true;
+
+            return $slide;
+        }, CustomHtmlSlide::getByBlockIdForLang($idBlock, $idLang));
+    }
+
+    private function buildSliderConfig(array $block): string
+    {
+        $config = [
+            'slidesPerView' => (float) $block['slides_per_view_mobile'],
+            'spaceBetween'  => 16,
+            'speed'         => 500,
+            'watchOverflow' => true,
+        ];
+
+        if ($block['slider_mode'] === 'responsive') {
+            $config['breakpoints'] = [
+                Config::SLIDER_RESPONSIVE_BREAKPOINT => ['slidesPerView' => (float) $block['slides_per_view_tablet']],
+            ];
+        } else {
+            $config['breakpoints'] = [
+                768 => ['slidesPerView' => (float) $block['slides_per_view_tablet']],
+            ];
+
+            if ((float) $block['slides_per_view_desktop'] > 0) {
+                $config['breakpoints'][992] = ['slidesPerView' => (float) $block['slides_per_view_desktop']];
+            }
+        }
+
+        if ((int) $block['autoplay_delay'] > 0) {
+            $config['loop'] = true;
+            $config['autoplay'] = [
+                'delay'                => (int) $block['autoplay_delay'] * 1000,
+                'disableOnInteraction' => false,
+            ];
+        }
+
+        return json_encode($config);
+    }
+
+    private function buildSliderDesktopColumnWidth(array $block): ?string
+    {
+        if ((float) $block['slides_per_view_desktop'] <= 0) {
+            return null;
+        }
+
+        $columns = max(1, (int) round((float) $block['slides_per_view_desktop']));
+
+        return round(100 / $columns, 4) . '%';
+    }
 }

src/Module/Install.php

@@ -49,7 +49,8 @@ trait Install
             CREATE TABLE IF NOT EXISTS ' . _DB_PREFIX_ . 'ws_customhtml_group (
                 `id_ws_customhtml_group` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 `hook_name` VARCHAR(64) NOT NULL,
-                `title` VARCHAR(256) NOT NULL DEFAULT \'\',
+                `custom_class` VARCHAR(128) NOT NULL DEFAULT \'\',
+                `default_block_class` VARCHAR(128) NOT NULL DEFAULT \'\',
                 `active` TINYINT(1) NOT NULL DEFAULT 1,
                 `ordering` INT(11) NOT NULL DEFAULT 0,
                 `date_add` DATETIME NOT NULL,
@@ -57,18 +58,29 @@ trait Install
             );
         ';
 
+        $sqlToExec[] = '
+            CREATE TABLE IF NOT EXISTS ' . _DB_PREFIX_ . 'ws_customhtml_group_lang (
+                `id_ws_customhtml_group` INT(11) NOT NULL,
+                `id_lang` INT(11) NOT NULL,
+                `title` VARCHAR(256) NOT NULL DEFAULT \'\',
+                PRIMARY KEY (`id_ws_customhtml_group`, `id_lang`)
+            );
+        ';
+
         $sqlToExec[] = '
             CREATE TABLE IF NOT EXISTS ' . _DB_PREFIX_ . 'ws_customhtml (
                 `id_ws_customhtml` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 `id_ws_customhtml_group` INT(11) NOT NULL,
-                `title` VARCHAR(256) NOT NULL DEFAULT \'\',
                 `type` VARCHAR(32) NOT NULL DEFAULT \'html\',
-                `content` LONGTEXT,
                 `custom_class` VARCHAR(128) NOT NULL DEFAULT \'\',
-                `description` TEXT,
-                `extra_description` TEXT,
-                `link` VARCHAR(512) NOT NULL DEFAULT \'\',
                 `image` VARCHAR(255) NOT NULL DEFAULT \'\',
+                `alert_type` VARCHAR(16) NOT NULL DEFAULT \'info\',
+                `timeout` INT(11) NOT NULL DEFAULT 0,
+                `slider_mode` VARCHAR(16) NOT NULL DEFAULT \'always\',
+                `slides_per_view_mobile` DECIMAL(4,2) NOT NULL DEFAULT 1,
+                `slides_per_view_tablet` DECIMAL(4,2) NOT NULL DEFAULT 2,
+                `slides_per_view_desktop` DECIMAL(4,2) NOT NULL DEFAULT 3,
+                `autoplay_delay` INT(11) NOT NULL DEFAULT 0,
                 `active` TINYINT(1) NOT NULL DEFAULT 1,
                 `show_title` TINYINT(1) NOT NULL DEFAULT 0,
                 `ordering` INT(11) NOT NULL DEFAULT 0,
@@ -78,12 +90,24 @@ trait Install
             );
         ';
 
+        $sqlToExec[] = '
+            CREATE TABLE IF NOT EXISTS ' . _DB_PREFIX_ . 'ws_customhtml_lang (
+                `id_ws_customhtml` INT(11) NOT NULL,
+                `id_lang` INT(11) NOT NULL,
+                `title` VARCHAR(256) NOT NULL DEFAULT \'\',
+                `content` LONGTEXT,
+                `description` TEXT,
+                `extra_description` TEXT,
+                `link` VARCHAR(512) NOT NULL DEFAULT \'\',
+                `link_text` VARCHAR(128) NOT NULL DEFAULT \'\',
+                PRIMARY KEY (`id_ws_customhtml`, `id_lang`)
+            );
+        ';
+
         $sqlToExec[] = '
             CREATE TABLE IF NOT EXISTS ' . _DB_PREFIX_ . 'ws_customhtml_faq (
                 `id_ws_customhtml_faq` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 `id_ws_customhtml` INT(11) NOT NULL,
-                `question` VARCHAR(512) NOT NULL DEFAULT \'\',
-                `answer` TEXT,
                 `ordering` INT(11) NOT NULL DEFAULT 0,
                 `date_add` DATETIME NOT NULL,
                 `date_upd` DATETIME NOT NULL,
@@ -91,6 +115,41 @@ trait Install
             );
         ';
 
+        $sqlToExec[] = '
+            CREATE TABLE IF NOT EXISTS ' . _DB_PREFIX_ . 'ws_customhtml_faq_lang (
+                `id_ws_customhtml_faq` INT(11) NOT NULL,
+                `id_lang` INT(11) NOT NULL,
+                `question` VARCHAR(512) NOT NULL DEFAULT \'\',
+                `answer` TEXT,
+                PRIMARY KEY (`id_ws_customhtml_faq`, `id_lang`)
+            );
+        ';
+
+        $sqlToExec[] = '
+            CREATE TABLE IF NOT EXISTS ' . _DB_PREFIX_ . 'ws_customhtml_slide (
+                `id_ws_customhtml_slide` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                `id_ws_customhtml` INT(11) NOT NULL,
+                `image` VARCHAR(255) NOT NULL DEFAULT \'\',
+                `ordering` INT(11) NOT NULL DEFAULT 0,
+                `date_add` DATETIME NOT NULL,
+                `date_upd` DATETIME NOT NULL,
+                KEY `id_ws_customhtml` (`id_ws_customhtml`)
+            );
+        ';
+
+        $sqlToExec[] = '
+            CREATE TABLE IF NOT EXISTS ' . _DB_PREFIX_ . 'ws_customhtml_slide_lang (
+                `id_ws_customhtml_slide` INT(11) NOT NULL,
+                `id_lang` INT(11) NOT NULL,
+                `title` VARCHAR(256) NOT NULL DEFAULT \'\',
+                `description` TEXT,
+                `extra_description` TEXT,
+                `link` VARCHAR(512) NOT NULL DEFAULT \'\',
+                `link_text` VARCHAR(128) NOT NULL DEFAULT \'\',
+                PRIMARY KEY (`id_ws_customhtml_slide`, `id_lang`)
+            );
+        ';
+
         foreach ($sqlToExec as $sqlBlock) {
             Db::getInstance()->execute(trim($sqlBlock));
         }

src/Module/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

src/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

translations/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

translations/nl-NL/ModulesWscustomhtmlAdmin.nl-NL.xlf

@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file original="Modules.Wscustomhtml.Admin.xlf" source-language="en" target-language="nl" datatype="plaintext">
+    <body>
+      <trans-unit id="512923e3b931df3400cc06287e7541cc" approved="yes">
+        <source>Custom HTML</source>
+        <target state="final">Aangepaste HTML</target>
+        <note>File: ws_customhtml.php [Line: 39]</note>
+      </trans-unit>
+      <trans-unit id="7831af914461a744912d0579b8bb9d1a" approved="yes">
+        <source>Create and manage custom HTML blocks for frontend hooks.</source>
+        <target state="final">Aangepaste HTML-blokken maken en beheren voor frontend hooks.</target>
+        <note>File: ws_customhtml.php [Line: 40]</note>
+      </trans-unit>
+      <trans-unit id="b78a3223503896721cca1303f776159b" approved="yes">
+        <source>Title</source>
+        <target state="final">Titel</target>
+        <note>File: src/Form/Type/CustomHtmlGroupType.php [Line: 28]</note>
+      </trans-unit>
+      <trans-unit id="26f548bcbdeea5047396db341a10a2bf" approved="yes">
+        <source>Hook name</source>
+        <target state="final">Hooknaam</target>
+        <note>File: src/Form/Type/CustomHtmlGroupType.php [Line: 33]</note>
+      </trans-unit>
+      <trans-unit id="843575e3d0942a474aed722856631ec1" approved="yes">
+        <source>Custom group classes</source>
+        <target state="final">Aangepaste groepsklassen</target>
+        <note>File: src/Form/Type/CustomHtmlGroupType.php [Line: 37]</note>
+      </trans-unit>
+      <trans-unit id="c9339c0b1a199af41f690392077119af" approved="yes">
+        <source>Default block class</source>
+        <target state="final">Standaard blokklasse</target>
+        <note>File: src/Form/Type/CustomHtmlGroupType.php [Line: 42]</note>
+      </trans-unit>
+      <trans-unit id="dee82074a8fdd944350a8ed6ef7000ba" approved="yes">
+        <source>Applied to every block in this group automatically, in addition to that block&apos;s own custom classes. Useful when several blocks need the same column layout.</source>
+        <target state="final">Wordt automatisch toegepast op elk blok in deze groep, naast de eigen aangepaste klassen van dat blok. Handig wanneer meerdere blokken dezelfde kolomindeling nodig hebben.</target>
+        <note>File: src/Form/Type/CustomHtmlGroupType.php [Line: 45]</note>
+      </trans-unit>
+      <trans-unit id="4d3d769b812b6faa6b76e1a8abaece2d" approved="yes">
+        <source>Active</source>
+        <target state="final">Actief</target>
+        <note>File: src/Form/Type/CustomHtmlGroupType.php [Line: 48]</note>
+      </trans-unit>
+      <trans-unit id="3c889850381b0603721d568824ecfd18" approved="yes">
+        <source>Custom HTML Groups</source>
+        <target state="final">Aangepaste HTML-groepen</target>
+        <note>File: src/Grid/Definition/Factory/CustomHtmlGroupGridDefinitionFactory.php [Line: 40]</note>
+      </trans-unit>
+      <trans-unit id="b9b371458ab7c314f88b81c553f6ce51" approved="yes">
+        <source>Hook</source>
+        <target state="final">Hook</target>
+        <note>File: src/Grid/Definition/Factory/CustomHtmlGroupGridDefinitionFactory.php [Line: 73]</note>
+      </trans-unit>
+      <trans-unit id="04c4f9f595c4f21d1de65eb07056c15a" approved="yes">
+        <source>Blocks</source>
+        <target state="final">Blokken</target>
+        <note>File: src/Grid/Definition/Factory/CustomHtmlGroupGridDefinitionFactory.php [Line: 78]</note>
+      </trans-unit>
+      <trans-unit id="195a8106bcb998b48a86acb2fee032c5" approved="yes">
+        <source>View blocks</source>
+        <target state="final">Blokken bekijken</target>
+        <note>File: src/Grid/Definition/Factory/CustomHtmlGroupGridDefinitionFactory.php [Line: 156]</note>
+      </trans-unit>
+      <trans-unit id="2ff8071bcd15a31f9a743f1b06d0d00f" approved="yes">
+        <source>Add block</source>
+        <target state="final">Blok toevoegen</target>
+        <note>File: src/Grid/Definition/Factory/CustomHtmlGroupGridDefinitionFactory.php [Line: 166]</note>
+      </trans-unit>
+      <trans-unit id="93ee75bea0afaff1edf1444b1f8d4757" approved="yes">
+        <source>Custom HTML Blocks</source>
+        <target state="final">Aangepaste HTML-blokken</target>
+        <note>File: src/Grid/Definition/Factory/CustomHtmlBlockGridDefinitionFactory.php [Line: 41]</note>
+      </trans-unit>
+      <trans-unit id="03937134cedab9078be39a77ee3a48a0" approved="yes">
+        <source>Group</source>
+        <target state="final">Groep</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 41]</note>
+      </trans-unit>
+      <trans-unit id="a1fa27779242b4902f7ae3bdd5c6d508" approved="yes">
+        <source>Type</source>
+        <target state="final">Type</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 47]</note>
+      </trans-unit>
+      <trans-unit id="52f5e0bc3859bc5f5e25130b6c7e8881" approved="yes">
+        <source>Position</source>
+        <target state="final">Positie</target>
+        <note>File: src/Grid/Definition/Factory/CustomHtmlBlockGridDefinitionFactory.php [Line: 89]</note>
+      </trans-unit>
+      <trans-unit id="7c060faccd05262f4901c16573f645a9" approved="yes">
+        <source>Unable to find the group.</source>
+        <target state="final">Kan de groep niet vinden.</target>
+        <note>File: src/Controller/CustomHtmlGroupController.php [Line: 98]</note>
+      </trans-unit>
+      <trans-unit id="d738152dd177b4600836d2db542e8845" approved="yes">
+        <source>Unable to find the block.</source>
+        <target state="final">Kan het blok niet vinden.</target>
+        <note>File: src/Controller/CustomHtmlBlockController.php [Line: 125]</note>
+      </trans-unit>
+      <trans-unit id="b5a812dff3c33b63cf77f0ce007da42e" approved="yes">
+        <source>Block type</source>
+        <target state="final">Bloktype</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 47]</note>
+      </trans-unit>
+      <trans-unit id="507b7246f245b8935c5aafd81e80c4ee" approved="yes">
+        <source>Show title</source>
+        <target state="final">Titel tonen</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 59]</note>
+      </trans-unit>
+      <trans-unit id="f15c1cae7882448b3fb0404682e17e61" approved="yes">
+        <source>Content</source>
+        <target state="final">Inhoud</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 65]</note>
+      </trans-unit>
+      <trans-unit id="be53a0541a6d36f6ecb879fa2c584b08" approved="yes">
+        <source>Image</source>
+        <target state="final">Afbeelding</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 71]</note>
+      </trans-unit>
+      <trans-unit id="d60bc7c265eb450473afbd22ececda09" approved="yes">
+        <source>Slider mode</source>
+        <target state="final">Slidermodus</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 92]</note>
+      </trans-unit>
+      <trans-unit id="9e2352975b97b9b49e97dcd80788ed88" approved="yes">
+        <source>&quot;Mobile only&quot;: slider only on mobile, a static grid shows instead from tablet up.</source>
+        <target state="final">&quot;Alleen mobiel&quot;: slider alleen op mobiel, vanaf tablet wordt in plaats daarvan een statisch raster getoond.</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 95]</note>
+      </trans-unit>
+      <trans-unit id="0cffdd608d41a4c9c7bac7cf621ca5b9" approved="yes">
+        <source>Slides visible on mobile</source>
+        <target state="final">Zichtbare slides op mobiel</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 99]</note>
+      </trans-unit>
+      <trans-unit id="35bf3a5e2797e56b2d06b18acaae41f9" approved="yes">
+        <source>Slides visible on tablet</source>
+        <target state="final">Zichtbare slides op tablet</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 106]</note>
+      </trans-unit>
+      <trans-unit id="40d77e75964dd04ea925f34300dd8b48" approved="yes">
+        <source>Slides visible on desktop</source>
+        <target state="final">Zichtbare slides op desktop</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 113]</note>
+      </trans-unit>
+      <trans-unit id="06b9281e396db002010bde1de57262eb" approved="yes">
+        <source>Auto</source>
+        <target state="final">Automatisch</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 116]</note>
+      </trans-unit>
+      <trans-unit id="921048c199ee33279927fc77d2dc213a" approved="yes">
+        <source>In &quot;Mobile only&quot; mode this is rounded to the nearest whole number of columns. Leave empty for an equal-width column.</source>
+        <target state="final">In de modus &quot;Alleen mobiel&quot; wordt dit afgerond naar het dichtstbijzijnde hele aantal kolommen. Laat leeg voor een kolom met gelijke breedte.</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 117]</note>
+      </trans-unit>
+      <trans-unit id="db03b62817b3b2f4657b679c13bb5b28" approved="yes">
+        <source>Autoplay delay (seconds)</source>
+        <target state="final">Vertraging automatisch afspelen (seconden)</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 121]</note>
+      </trans-unit>
+      <trans-unit id="ae8c3292c47fef302c93202badd63109" approved="yes">
+        <source>0 means the slider never auto-advances; visitors can still swipe or use the arrows.</source>
+        <target state="final">0 betekent dat de slider nooit automatisch doorschuift; bezoekers kunnen nog wel swipen of de pijlen gebruiken.</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 124]</note>
+      </trans-unit>
+      <trans-unit id="d479cd75faccc438f93b8b6414a2a329" approved="yes">
+        <source>Alert style</source>
+        <target state="final">Waarschuwingsstijl</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 128]</note>
+      </trans-unit>
+      <trans-unit id="4527eae2e84aed7a238504cbbf509272" approved="yes">
+        <source>Auto-dismiss after (seconds)</source>
+        <target state="final">Automatisch sluiten na (seconden)</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 134]</note>
+      </trans-unit>
+      <trans-unit id="e59eb2e617eb720ae30bbf71010a7a97" approved="yes">
+        <source>0 means the alert never auto-dismisses; visitors can still close it manually.</source>
+        <target state="final">0 betekent dat de melding nooit automatisch sluit; bezoekers kunnen deze nog wel handmatig sluiten.</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 137]</note>
+      </trans-unit>
+      <trans-unit id="b5a7adde1af5c87d7fd797b6245c2a39" approved="yes">
+        <source>Description</source>
+        <target state="final">Beschrijving</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 142]</note>
+      </trans-unit>
+      <trans-unit id="7cc0fd746c5cec9842dd8d5251ee2352" approved="yes">
+        <source>Extra description</source>
+        <target state="final">Extra beschrijving</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 149]</note>
+      </trans-unit>
+      <trans-unit id="5e4e1bd6f922fed062b62c446ca34f84" approved="yes">
+        <source>Link URL</source>
+        <target state="final">Link-URL</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 156]</note>
+      </trans-unit>
+      <trans-unit id="63a11faa3a692d4e00fa8e03bbe8a0d6" approved="yes">
+        <source>Link text</source>
+        <target state="final">Linktekst</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 163]</note>
+      </trans-unit>
+      <trans-unit id="c15a6ec85c9e2dfc65fde2c60b592564" approved="yes">
+        <source>Custom classes</source>
+        <target state="final">Aangepaste klassen</target>
+        <note>File: src/Form/Type/CustomHtmlBlockType.php [Line: 171]</note>
+      </trans-unit>
+      <trans-unit id="a97ea56b0e00b2379736ae60869ff66a" approved="yes">
+        <source>Question</source>
+        <target state="final">Vraag</target>
+        <note>File: src/Form/Type/CustomHtmlFaqType.php [Line: 24]</note>
+      </trans-unit>
+      <trans-unit id="3751695c17afed4055a7a5ad5d46f6f5" approved="yes">
+        <source>Answer</source>
+        <target state="final">Antwoord</target>
+        <note>File: src/Form/Type/CustomHtmlFaqType.php [Line: 28]</note>
+      </trans-unit>
+      <trans-unit id="c28fc5d6c4a0a5ee47e06d56bab36dec" approved="yes">
+        <source>Custom HTML Block</source>
+        <target state="final">Aangepast HTML-blok</target>
+        <note>File: views/templates/admin/form/blocks/block_form.html.twig [Line: 26]</note>
+      </trans-unit>
+      <trans-unit id="73be1b885def51a0ff0d8905365b3eeb" approved="yes">
+        <source>Current image</source>
+        <target state="final">Huidige afbeelding</target>
+        <note>File: views/templates/admin/form/blocks/block_form.html.twig [Line: 42]</note>
+      </trans-unit>
+      <trans-unit id="4dfb7691cbfd8ee3a0f42018bcb2db65" approved="yes">
+        <source>FAQ items</source>
+        <target state="final">FAQ-items</target>
+        <note>File: views/templates/admin/form/blocks/block_form.html.twig [Line: 50]</note>
+      </trans-unit>
+      <trans-unit id="a4156d4998aa5183e106a57342f7315a" approved="yes">
+        <source>Add FAQ item</source>
+        <target state="final">FAQ-item toevoegen</target>
+        <note>File: views/templates/admin/form/blocks/block_form.html.twig [Line: 70]</note>
+      </trans-unit>
+      <trans-unit id="a8d90ed8f17c347c8d46e0ef22c85ecb" approved="yes">
+        <source>Slides</source>
+        <target state="final">Slides</target>
+        <note>File: views/templates/admin/form/blocks/block_form.html.twig [Line: 76]</note>
+      </trans-unit>
+      <trans-unit id="056f53405bf3cf4bde3731c26d725365" approved="yes">
+        <source>Add slide</source>
+        <target state="final">Slide toevoegen</target>
+        <note>File: views/templates/admin/form/blocks/block_form.html.twig [Line: 96]</note>
+      </trans-unit>
+      <trans-unit id="5ff997cff41cb8eeb86e6e484233a8af" approved="yes">
+        <source>The group that this block belongs to applies the classes &quot;%s%&quot; to every block. Edit the group to change this - it is stored under the &quot;Default block class&quot; input.</source>
+        <target state="final">De groep waartoe dit blok behoort past de klassen &quot;%s%&quot; toe op elk blok. Bewerk de groep om dit te wijzigen - dit wordt opgeslagen onder het veld &quot;Standaard blokklasse&quot;.</target>
+        <note>File: views/templates/admin/form/blocks/block_form.html.twig [Line: 118]</note>
+      </trans-unit>
+      <trans-unit id="5973aee626e71dba35de5485ccde9481" approved="yes">
+        <source>Custom HTML Group</source>
+        <target state="final">Aangepaste HTML-groep</target>
+        <note>File: views/templates/admin/form/blocks/group_form.html.twig [Line: 9]</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>

translations/nl-NL/ModulesWscustomhtmlShop.nl-NL.xlf

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file original="Modules.Wscustomhtml.Shop.xlf" source-language="en" target-language="nl" datatype="plaintext">
+    <body>
+      <trans-unit id="d59048f21fd887ad520398ce677be586" approved="yes">
+        <source>Learn more</source>
+        <target state="final">Meer informatie</target>
+        <note>File: views/templates/hook/_alert.tpl [Line: 20]</note>
+      </trans-unit>
+      <trans-unit id="d3d2e617335f08df83599665eef8a418" approved="yes">
+        <source>Close</source>
+        <target state="final">Sluiten</target>
+        <note>File: views/templates/hook/_alert.tpl [Line: 23]</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>

translations/nl-NL/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

upgrade/upgrade-1.10.0.php

@@ -1,31 +0,0 @@
-<?php
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_1_10_0($module)
-{
-    $columnsToAdd = [
-        'alert_type' => 'VARCHAR(16) NOT NULL DEFAULT \'info\'',
-        'timeout'    => 'INT(11) NOT NULL DEFAULT 0',
-    ];
-
-    foreach ($columnsToAdd as $column => $definition) {
-        $existing = Db::getInstance()->executeS(
-            'SHOW COLUMNS FROM `' . _DB_PREFIX_ . 'ws_customhtml` LIKE \'' . $column . '\''
-        );
-
-        if (!empty($existing)) {
-            continue;
-        }
-
-        if (!Db::getInstance()->execute(
-            'ALTER TABLE `' . _DB_PREFIX_ . 'ws_customhtml` ADD COLUMN `' . $column . '` ' . $definition
-        )) {
-            return false;
-        }
-    }
-
-    return true;
-}

upgrade/upgrade-1.11.0.php

@@ -1,24 +0,0 @@
-<?php
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_1_11_0($module)
-{
-    $groups = Db::getInstance()->executeS(
-        'SELECT `id_ws_customhtml_group` FROM `' . _DB_PREFIX_ . 'ws_customhtml_group` ORDER BY `id_ws_customhtml_group` ASC'
-    );
-
-    foreach ($groups as $index => $group) {
-        if (!Db::getInstance()->update(
-            'ws_customhtml_group',
-            ['ordering' => (int) $index],
-            '`id_ws_customhtml_group` = ' . (int) $group['id_ws_customhtml_group']
-        )) {
-            return false;
-        }
-    }
-
-    return true;
-}

upgrade/upgrade-1.2.0.php

@@ -1,38 +0,0 @@
-<?php
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_1_2_0($module)
-{
-    $columns = Db::getInstance()->executeS(
-        'SHOW COLUMNS FROM `' . _DB_PREFIX_ . 'ws_customhtml` LIKE \'type\''
-    );
-
-    if (empty($columns)) {
-        if (!Db::getInstance()->execute(
-            'ALTER TABLE `' . _DB_PREFIX_ . 'ws_customhtml`
-             ADD COLUMN `type` VARCHAR(32) NOT NULL DEFAULT \'html\' AFTER `title`'
-        )) {
-            return false;
-        }
-    }
-
-    if (!Db::getInstance()->execute(
-        'CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'ws_customhtml_faq` (
-            `id_ws_customhtml_faq` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-            `id_ws_customhtml` INT(11) NOT NULL,
-            `question` VARCHAR(512) NOT NULL DEFAULT \'\',
-            `answer` TEXT,
-            `ordering` INT(11) NOT NULL DEFAULT 0,
-            `date_add` DATETIME NOT NULL,
-            `date_upd` DATETIME NOT NULL,
-            KEY `id_ws_customhtml` (`id_ws_customhtml`)
-        )'
-    )) {
-        return false;
-    }
-
-    return $module->registerHook('actionCustomhtmlblockGridDataModifier');
-}

upgrade/upgrade-1.3.0.php

@@ -1,23 +0,0 @@
-<?php
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_1_3_0($module)
-{
-    $columns = Db::getInstance()->executeS(
-        'SHOW COLUMNS FROM `' . _DB_PREFIX_ . 'ws_customhtml` LIKE \'column_class\''
-    );
-
-    if (empty($columns)) {
-        if (!Db::getInstance()->execute(
-            'ALTER TABLE `' . _DB_PREFIX_ . 'ws_customhtml`
-             ADD COLUMN `column_class` VARCHAR(128) NOT NULL DEFAULT \'col-12\' AFTER `content`'
-        )) {
-            return false;
-        }
-    }
-
-    return true;
-}

upgrade/upgrade-1.4.0.php

@@ -1,14 +0,0 @@
-<?php
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_1_4_0($module)
-{
-    if (!Hook::isModuleRegisteredOnHook($module, 'actionFrontControllerSetMedia', (int) Context::getContext()->shop->id)) {
-        return $module->registerHook('actionFrontControllerSetMedia');
-    }
-
-    return true;
-}

upgrade/upgrade-1.5.0.php

@@ -1,32 +0,0 @@
-<?php
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_1_5_0($module)
-{
-    $newColumn = Db::getInstance()->executeS(
-        'SHOW COLUMNS FROM `' . _DB_PREFIX_ . 'ws_customhtml` LIKE \'custom_class\''
-    );
-
-    if (!empty($newColumn)) {
-        return true;
-    }
-
-    $oldColumn = Db::getInstance()->executeS(
-        'SHOW COLUMNS FROM `' . _DB_PREFIX_ . 'ws_customhtml` LIKE \'column_class\''
-    );
-
-    if (!empty($oldColumn)) {
-        return Db::getInstance()->execute(
-            'ALTER TABLE `' . _DB_PREFIX_ . 'ws_customhtml`
-             CHANGE `column_class` `custom_class` VARCHAR(128) NOT NULL DEFAULT \'\''
-        );
-    }
-
-    return Db::getInstance()->execute(
-        'ALTER TABLE `' . _DB_PREFIX_ . 'ws_customhtml`
-         ADD COLUMN `custom_class` VARCHAR(128) NOT NULL DEFAULT \'\' AFTER `content`'
-    );
-}

upgrade/upgrade-1.6.0.php

@@ -1,34 +0,0 @@
-<?php
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_1_6_0($module)
-{
-    $columnsToAdd = [
-        'description'       => 'TEXT',
-        'extra_description' => 'TEXT',
-        'link'              => 'VARCHAR(512) NOT NULL DEFAULT \'\'',
-        'template'          => 'VARCHAR(32) NOT NULL DEFAULT \'image_left\'',
-        'image'             => 'VARCHAR(255) NOT NULL DEFAULT \'\'',
-    ];
-
-    foreach ($columnsToAdd as $column => $definition) {
-        $existing = Db::getInstance()->executeS(
-            'SHOW COLUMNS FROM `' . _DB_PREFIX_ . 'ws_customhtml` LIKE \'' . $column . '\''
-        );
-
-        if (!empty($existing)) {
-            continue;
-        }
-
-        if (!Db::getInstance()->execute(
-            'ALTER TABLE `' . _DB_PREFIX_ . 'ws_customhtml` ADD COLUMN `' . $column . '` ' . $definition
-        )) {
-            return false;
-        }
-    }
-
-    return true;
-}

upgrade/upgrade-1.7.0.php

@@ -1,20 +0,0 @@
-<?php
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_1_7_0($module)
-{
-    $existing = Db::getInstance()->executeS(
-        'SHOW COLUMNS FROM `' . _DB_PREFIX_ . 'ws_customhtml` LIKE \'template\''
-    );
-
-    if (empty($existing)) {
-        return true;
-    }
-
-    return Db::getInstance()->execute(
-        'ALTER TABLE `' . _DB_PREFIX_ . 'ws_customhtml` DROP COLUMN `template`'
-    );
-}

upgrade/upgrade-1.8.0.php

@@ -1,20 +0,0 @@
-<?php
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_1_8_0($module)
-{
-    $existing = Db::getInstance()->executeS(
-        'SHOW COLUMNS FROM `' . _DB_PREFIX_ . 'ws_customhtml` LIKE \'template_key\''
-    );
-
-    if (!empty($existing)) {
-        return true;
-    }
-
-    return Db::getInstance()->execute(
-        'ALTER TABLE `' . _DB_PREFIX_ . 'ws_customhtml` ADD COLUMN `template_key` VARCHAR(64) NOT NULL DEFAULT \'\''
-    );
-}

upgrade/upgrade-1.9.0.php

@@ -1,20 +0,0 @@
-<?php
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_1_9_0($module)
-{
-    $existing = Db::getInstance()->executeS(
-        'SHOW COLUMNS FROM `' . _DB_PREFIX_ . 'ws_customhtml` LIKE \'template_key\''
-    );
-
-    if (empty($existing)) {
-        return true;
-    }
-
-    return Db::getInstance()->execute(
-        'ALTER TABLE `' . _DB_PREFIX_ . 'ws_customhtml` DROP COLUMN `template_key`'
-    );
-}

views/css/admin/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/css/front/customhtml.css

@@ -7,6 +7,7 @@
     padding: 2rem;
     bottom: 0px;
     position: absolute;
+    z-index: 2;
 }
 
 .customhtml-banner-title {
@@ -18,12 +19,15 @@
     margin-bottom: 1rem;
 }
 
+.customhtml-banner-image {
+    position: relative;
+}
+
 .customhtml-banner-image--gradient {
-    width: 100%;
-    height: 100%;
     position: absolute;
-    background: transparent linear-gradient(180deg, #27272777 0%, #272727 100%)
-        0% 0% no-repeat padding-box;
+    inset: 0;
+    pointer-events: none;
+    z-index: 1;
 }
 /* Alert */
 .customhtml-alert {
@@ -48,6 +52,52 @@
     margin-right: 0.5rem;
 }
 
+.customhtml-alert-btn {
+    margin-left: 0.75rem;
+    white-space: nowrap;
+}
+
+.customhtml-usp {
+    gap: 0.5rem;
+    color: inherit;
+    text-decoration: none;
+}
+
+.customhtml-usp-icon img {
+    max-height: 32px;
+    width: auto;
+}
+
+.customhtml-usp-text {
+    font-weight: 500;
+}
+
+/* Slider */
+.customhtml-slider-grid-item {
+    padding-left: 0.75rem;
+    padding-right: 0.75rem;
+    margin-bottom: 1rem;
+}
+
+/* Home banners slider (migrated from ws_extrabanner's home-banners section) */
+.displayHomeBannersSlider--container .customhtml-banner-image {
+    min-height: 220px;
+    background-color: #f2f0e9;
+}
+
+.displayHomeBannersSlider--container .customhtml-banner-content * {
+    color: #fff;
+}
+
+.displayHomeBannersSlider--container .customhtml-banner-description,
+.displayHomeBannersSlider--container .customhtml-banner-extra-description {
+    margin-bottom: 0;
+}
+
+.displayHomeBannersSlider--container .customhtml-banner-extra-description {
+    font-weight: 500;
+}
+
 /* FAQ */
 .accordion-icon-minus {
     display: block;

views/css/front/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/css/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/img/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/js/admin/customhtmlblock_form.js

@@ -0,0 +1,64 @@
+$(document).ready(function () {
+    window.prestashop.component.initComponents([
+        'TinyMCEEditor',
+        'TranslatableField',
+        'TranslatableInput',
+    ]);
+
+    function toggleBlockTypeFields() {
+        var type = $('#custom_html_block_type').val();
+
+        $('.customhtmlblock-type-html').hide();
+        $('.customhtmlblock-type-faq').hide();
+        $('.customhtmlblock-type-banner').hide();
+        $('.customhtmlblock-type-alert').hide();
+        $('.customhtmlblock-type-usp').hide();
+        $('.customhtmlblock-type-slider').hide();
+        $('.customhtmlblock-type-' + type).show();
+    }
+
+    $('#custom_html_block_type').on('change', toggleBlockTypeFields);
+    toggleBlockTypeFields();
+
+    function toggleGroupDefaultClassHint() {
+        var hint = $('#customhtmlblock-group-default-class-hint');
+        var defaultClass = $('#custom_html_block_id_ws_customhtml_group option:selected').data('defaultBlockClass');
+
+        if (defaultClass) {
+            hint.text(hint.data('template').replace('%s%', defaultClass)).show();
+        } else {
+            hint.hide();
+        }
+    }
+
+    $('#custom_html_block_id_ws_customhtml_group').on('change', toggleGroupDefaultClassHint);
+    toggleGroupDefaultClassHint();
+
+    function initRepeater(containerSelector, addButtonSelector, itemClass, removeButtonClass) {
+        var container = $(containerSelector);
+        var removeLabel = container.data('removeLabel');
+
+        $(addButtonSelector).on('click', function () {
+            var index = container.data('index');
+            var prototype = container.data('prototype').replace(/__name__/g, index);
+
+            var item = $('<div class="' + itemClass + ' card mb-2"><div class="card-body"></div></div>');
+            item.find('.card-body')
+                .append(prototype)
+                .append(
+                    '<button type="button" class="btn btn-outline-danger btn-sm ' + removeButtonClass + '">' +
+                    '<i class="material-icons">delete</i> ' + removeLabel + '</button>'
+                );
+
+            container.append(item);
+            container.data('index', index + 1);
+        });
+
+        container.on('click', '.' + removeButtonClass, function () {
+            $(this).closest('.' + itemClass).remove();
+        });
+    }
+
+    initRepeater('#customhtmlblock-faq-items', '#customhtmlblock-add-faq', 'customhtmlblock-faq-item', 'customhtmlblock-remove-faq');
+    initRepeater('#customhtmlblock-slide-items', '#customhtmlblock-add-slide', 'customhtmlblock-slide-item', 'customhtmlblock-remove-slide');
+});

views/js/admin/customhtmlblock_grid.js

@@ -0,0 +1,9 @@
+$(document).ready(function () {
+    const customhtmlblockGrid = new window.prestashop.component.Grid('customhtmlblock');
+
+    customhtmlblockGrid.addExtension(new window.prestashop.component.GridExtensions.SortingExtension());
+    customhtmlblockGrid.addExtension(new window.prestashop.component.GridExtensions.FiltersResetExtension());
+    customhtmlblockGrid.addExtension(new window.prestashop.component.GridExtensions.ColumnTogglingExtension());
+    customhtmlblockGrid.addExtension(new window.prestashop.component.GridExtensions.SubmitRowActionExtension());
+    customhtmlblockGrid.addExtension(new window.prestashop.component.GridExtensions.PositionExtension());
+});

views/js/admin/customhtmlgroup_form.js

@@ -0,0 +1,6 @@
+$(document).ready(function () {
+    window.prestashop.component.initComponents([
+        'TranslatableField',
+        'TranslatableInput',
+    ]);
+});

views/js/admin/customhtmlgroup_grid.js

@@ -0,0 +1,9 @@
+$(document).ready(function () {
+    const customhtmlgroupGrid = new window.prestashop.component.Grid('customhtmlgroup');
+
+    customhtmlgroupGrid.addExtension(new window.prestashop.component.GridExtensions.SortingExtension());
+    customhtmlgroupGrid.addExtension(new window.prestashop.component.GridExtensions.FiltersResetExtension());
+    customhtmlgroupGrid.addExtension(new window.prestashop.component.GridExtensions.ColumnTogglingExtension());
+    customhtmlgroupGrid.addExtension(new window.prestashop.component.GridExtensions.SubmitRowActionExtension());
+    customhtmlgroupGrid.addExtension(new window.prestashop.component.GridExtensions.PositionExtension());
+});

views/js/admin/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/js/front/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/js/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/templates/admin/form/blocks/block_form.html.twig

@@ -7,6 +7,17 @@
 {% endmacro %}
 {% import _self as faqMacros %}
 
+{% macro slideFields(slideForm) %}
+    {{ form_widget(slideForm.id) }}
+    {{ form_row(slideForm.title) }}
+    {{ form_row(slideForm.description) }}
+    {{ form_row(slideForm.extra_description) }}
+    {{ form_row(slideForm.link) }}
+    {{ form_row(slideForm.link_text) }}
+    {{ form_row(slideForm.image) }}
+{% endmacro %}
+{% import _self as slideMacros %}
+
 {% block customhtmlblock_form_block %}
     <div class="card">
         {{ form_start(customHtmlBlockForm) }}
@@ -27,7 +38,7 @@
                 {{ form_row(customHtmlBlockForm.content) }}
 
                 {% if currentImageUrl is defined and currentImageUrl %}
-                    <div class="customhtmlblock-type-field customhtmlblock-type-banner customhtmlblock-current-image">
+                    <div class="customhtmlblock-type-field customhtmlblock-type-banner customhtmlblock-type-usp customhtmlblock-current-image">
                         <label class="form-control-label">{{ 'Current image'|trans({}, 'Modules.Wscustomhtml.Admin') }}</label>
                         <div><img src="{{ currentImageUrl }}" alt="" style="max-width: 200px; max-height: 200px;"></div>
                     </div>
@@ -42,6 +53,7 @@
                         id="customhtmlblock-faq-items"
                         data-prototype="{{ faqMacros.faqFields(customHtmlBlockForm.faqs.vars.prototype)|e('html_attr') }}"
                         data-index="{{ customHtmlBlockForm.faqs|length }}"
+                        data-remove-label="{{ 'Remove'|trans({}, 'Admin.Actions')|e('html_attr') }}"
                     >
                         {% for faqRow in customHtmlBlockForm.faqs %}
                             <div class="customhtmlblock-faq-item card mb-2">
@@ -59,18 +71,58 @@
                     </button>
                 </div>
 
+                <div class="customhtmlblock-type-field customhtmlblock-type-slider">
+                    <label class="form-control-label">
+                        {{ 'Slides'|trans({}, 'Modules.Wscustomhtml.Admin') }}
+                    </label>
+                    <div
+                        id="customhtmlblock-slide-items"
+                        data-prototype="{{ slideMacros.slideFields(customHtmlBlockForm.slides.vars.prototype)|e('html_attr') }}"
+                        data-index="{{ customHtmlBlockForm.slides|length }}"
+                        data-remove-label="{{ 'Remove'|trans({}, 'Admin.Actions')|e('html_attr') }}"
+                    >
+                        {% for slideRow in customHtmlBlockForm.slides %}
+                            <div class="customhtmlblock-slide-item card mb-2">
+                                <div class="card-body">
+                                    {{ slideMacros.slideFields(slideRow) }}
+                                    <button type="button" class="btn btn-outline-danger btn-sm customhtmlblock-remove-slide">
+                                        <i class="material-icons">delete</i> {{ 'Remove'|trans({}, 'Admin.Actions') }}
+                                    </button>
+                                </div>
+                            </div>
+                        {% endfor %}
+                    </div>
+                    <button type="button" id="customhtmlblock-add-slide" class="btn btn-outline-primary btn-sm">
+                        <i class="material-icons">add</i> {{ 'Add slide'|trans({}, 'Modules.Wscustomhtml.Admin') }}
+                    </button>
+                </div>
+
+                {{ form_row(customHtmlBlockForm.slider_mode) }}
+                <div class="row">
+                    {{ form_row(customHtmlBlockForm.slides_per_view_mobile) }}
+                    {{ form_row(customHtmlBlockForm.slides_per_view_tablet) }}
+                    {{ form_row(customHtmlBlockForm.slides_per_view_desktop) }}
+                </div>
+                {{ form_row(customHtmlBlockForm.autoplay_delay) }}
+
                 {{ form_row(customHtmlBlockForm.alert_type) }}
                 {{ form_row(customHtmlBlockForm.timeout) }}
                 {{ form_row(customHtmlBlockForm.description) }}
                 {{ form_row(customHtmlBlockForm.extra_description) }}
                 {{ form_row(customHtmlBlockForm.link) }}
+                {{ form_row(customHtmlBlockForm.link_text) }}
 
+                <p
+                    id="customhtmlblock-group-default-class-hint"
+                    class="alert alert-warning"
+                    data-template="{{ 'The group that this block belongs to applies the classes "%s%" to every block. Edit the group to change this - it is stored under the "Default block class" input.'|trans({}, 'Modules.Wscustomhtml.Admin')|e('html_attr') }}"
+                ></p>
                 {{ form_row(customHtmlBlockForm.custom_class) }}
                 {{ form_row(customHtmlBlockForm.active) }}
                 {{ form_rest(customHtmlBlockForm) }}
             </div>
             <div class="card-footer">
-                <a href="{{ path('customhtmlblock_index') }}" class="btn btn-outline-secondary">
+                <a href="{{ path('customhtmlblock_index', idGroup is defined and idGroup ? {'idGroup': idGroup} : {}) }}" class="btn btn-outline-secondary">
                     {{ 'Cancel'|trans({}, 'Admin.Actions') }}
                 </a>
                 <button class="btn btn-primary float-right">

views/templates/admin/form/blocks/group_form.html.twig

@@ -17,6 +17,9 @@
                     {{ 'Cancel'|trans({}, 'Admin.Actions') }}
                 </a>
                 {% if idCustomHtmlGroup is defined %}
+                    <a href="{{ path('customhtmlblock_index', {'idGroup': idCustomHtmlGroup}) }}" class="btn btn-outline-primary">
+                        {{ 'View blocks'|trans({}, 'Modules.Wscustomhtml.Admin') }}
+                    </a>
                     <a href="{{ path('customhtmlblock_create', {'idGroup': idCustomHtmlGroup}) }}" class="btn btn-outline-primary">
                         {{ 'Add block'|trans({}, 'Modules.Wscustomhtml.Admin') }}
                     </a>

views/templates/admin/form/blocks/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/templates/admin/form/customhtmlblock_create.html.twig

@@ -8,47 +8,5 @@
 
 {% block javascripts %}
     {{ parent() }}
-    <script>
-        $(document).ready(function () {
-            window.prestashop.component.initComponents([
-                'TinyMCEEditor',
-            ]);
-
-            function toggleBlockTypeFields() {
-                var type = $('#custom_html_block_type').val();
-
-                $('.customhtmlblock-type-html').hide();
-                $('.customhtmlblock-type-faq').hide();
-                $('.customhtmlblock-type-banner').hide();
-                $('.customhtmlblock-type-alert').hide();
-                $('.customhtmlblock-type-' + type).show();
-            }
-
-            $('#custom_html_block_type').on('change', toggleBlockTypeFields);
-            toggleBlockTypeFields();
-
-            var removeFaqLabel = '{{ 'Remove'|trans({}, 'Admin.Actions')|e('js') }}';
-            var faqContainer = $('#customhtmlblock-faq-items');
-
-            $('#customhtmlblock-add-faq').on('click', function () {
-                var index = faqContainer.data('index');
-                var prototype = faqContainer.data('prototype').replace(/__name__/g, index);
-
-                var item = $('<div class="customhtmlblock-faq-item card mb-2"><div class="card-body"></div></div>');
-                item.find('.card-body')
-                    .append(prototype)
-                    .append(
-                        '<button type="button" class="btn btn-outline-danger btn-sm customhtmlblock-remove-faq">' +
-                        '<i class="material-icons">delete</i> ' + removeFaqLabel + '</button>'
-                    );
-
-                faqContainer.append(item);
-                faqContainer.data('index', index + 1);
-            });
-
-            faqContainer.on('click', '.customhtmlblock-remove-faq', function () {
-                $(this).closest('.customhtmlblock-faq-item').remove();
-            });
-        });
-    </script>
+    <script src="{{ asset('../modules/ws_customhtml/views/js/admin/customhtmlblock_form.js') }}"></script>
 {% endblock %}

views/templates/admin/form/customhtmlblock_edit.html.twig

@@ -8,47 +8,5 @@
 
 {% block javascripts %}
     {{ parent() }}
-    <script>
-        $(document).ready(function () {
-            window.prestashop.component.initComponents([
-                'TinyMCEEditor',
-            ]);
-
-            function toggleBlockTypeFields() {
-                var type = $('#custom_html_block_type').val();
-
-                $('.customhtmlblock-type-html').hide();
-                $('.customhtmlblock-type-faq').hide();
-                $('.customhtmlblock-type-banner').hide();
-                $('.customhtmlblock-type-alert').hide();
-                $('.customhtmlblock-type-' + type).show();
-            }
-
-            $('#custom_html_block_type').on('change', toggleBlockTypeFields);
-            toggleBlockTypeFields();
-
-            var removeFaqLabel = '{{ 'Remove'|trans({}, 'Admin.Actions')|e('js') }}';
-            var faqContainer = $('#customhtmlblock-faq-items');
-
-            $('#customhtmlblock-add-faq').on('click', function () {
-                var index = faqContainer.data('index');
-                var prototype = faqContainer.data('prototype').replace(/__name__/g, index);
-
-                var item = $('<div class="customhtmlblock-faq-item card mb-2"><div class="card-body"></div></div>');
-                item.find('.card-body')
-                    .append(prototype)
-                    .append(
-                        '<button type="button" class="btn btn-outline-danger btn-sm customhtmlblock-remove-faq">' +
-                        '<i class="material-icons">delete</i> ' + removeFaqLabel + '</button>'
-                    );
-
-                faqContainer.append(item);
-                faqContainer.data('index', index + 1);
-            });
-
-            faqContainer.on('click', '.customhtmlblock-remove-faq', function () {
-                $(this).closest('.customhtmlblock-faq-item').remove();
-            });
-        });
-    </script>
+    <script src="{{ asset('../modules/ws_customhtml/views/js/admin/customhtmlblock_form.js') }}"></script>
 {% endblock %}

views/templates/admin/form/customhtmlgroup_create.html.twig

@@ -5,3 +5,8 @@
         {% include '@Modules/ws_customhtml/views/templates/admin/form/blocks/group_form.html.twig' %}
     {% endblock %}
 {% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+    <script src="{{ asset('../modules/ws_customhtml/views/js/admin/customhtmlgroup_form.js') }}"></script>
+{% endblock %}

views/templates/admin/form/customhtmlgroup_edit.html.twig

@@ -5,3 +5,8 @@
         {% include '@Modules/ws_customhtml/views/templates/admin/form/blocks/group_form.html.twig' %}
     {% endblock %}
 {% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+    <script src="{{ asset('../modules/ws_customhtml/views/js/admin/customhtmlgroup_form.js') }}"></script>
+{% endblock %}

views/templates/admin/form/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/templates/admin/grid/customhtmlblock.html.twig

@@ -12,15 +12,6 @@
 
 {% block javascripts %}
     {{ parent() }}
-    <script>
-        $(document).ready(function () {
-            const customhtmlblockGrid = new window.prestashop.component.Grid('customhtmlblock');
-
-            customhtmlblockGrid.addExtension(new window.prestashop.component.GridExtensions.SortingExtension());
-            customhtmlblockGrid.addExtension(new window.prestashop.component.GridExtensions.FiltersResetExtension());
-            customhtmlblockGrid.addExtension(new window.prestashop.component.GridExtensions.ColumnTogglingExtension());
-            customhtmlblockGrid.addExtension(new window.prestashop.component.GridExtensions.SubmitRowActionExtension());
-            customhtmlblockGrid.addExtension(new window.prestashop.component.GridExtensions.PositionExtension());
-        });
-    </script>
+    <script src="{{ asset('themes/default/js/bundle/pagination.js') }}"></script>
+    <script src="{{ asset('../modules/ws_customhtml/views/js/admin/customhtmlblock_grid.js') }}"></script>
 {% endblock %}

views/templates/admin/grid/customhtmlgroup.html.twig

@@ -12,15 +12,6 @@
 
 {% block javascripts %}
     {{ parent() }}
-    <script>
-        $(document).ready(function () {
-            const customhtmlgroupGrid = new window.prestashop.component.Grid('customhtmlgroup');
-
-            customhtmlgroupGrid.addExtension(new window.prestashop.component.GridExtensions.SortingExtension());
-            customhtmlgroupGrid.addExtension(new window.prestashop.component.GridExtensions.FiltersResetExtension());
-            customhtmlgroupGrid.addExtension(new window.prestashop.component.GridExtensions.ColumnTogglingExtension());
-            customhtmlgroupGrid.addExtension(new window.prestashop.component.GridExtensions.SubmitRowActionExtension());
-            customhtmlgroupGrid.addExtension(new window.prestashop.component.GridExtensions.PositionExtension());
-        });
-    </script>
+    <script src="{{ asset('themes/default/js/bundle/pagination.js') }}"></script>
+    <script src="{{ asset('../modules/ws_customhtml/views/js/admin/customhtmlgroup_grid.js') }}"></script>
 {% endblock %}

views/templates/admin/grid/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/templates/admin/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/templates/hook/_alert.tpl

@@ -1,16 +1,30 @@
 {if !empty($block.description)}
 <div
-    id="customhtml-alert-{$block.id_ws_customhtml|intval}"
     class="alert alert-{$block.alert_type|escape:'html':'UTF-8'} alert-dismissible customhtml-alert"
     role="alert"
     data-timeout="{$block.timeout|intval}"
 >
-    {if $block.show_title && !empty($block.title)}
-    <strong class="customhtml-alert-title">{$block.title|escape:'html':'UTF-8'}</strong>
-    {/if}
-    <span class="customhtml-alert-text">{$block.description|escape:'html':'UTF-8'|nl2br}</span>
-    <button type="button" class="close customhtml-alert-close" aria-label="{l s='Close' d='Modules.Wscustomhtml.Shop'}">
-        <span aria-hidden="true">&times;</span>
-    </button>
+    <div class="row">
+        {block name=alert_content}
+        <div class="col d-flex align-items-center">
+            {if $block.show_title && !empty($block.title)}
+            <strong class="customhtml-alert-title">{$block.title|escape:'html':'UTF-8'}</strong>
+            {/if}
+            <span class="customhtml-alert-text">{$block.description|escape:'html':'UTF-8'|nl2br}</span>
+        </div>
+        {/block}
+        {block name=alert_actions}
+        <div class="col-auto">
+            {if !empty($block.link)}
+            <a href="{$block.link|escape:'html':'UTF-8'}" class="btn btn-{$block.alert_type|escape:'html':'UTF-8'} customhtml-alert-btn">
+                {if !empty($block.link_text)}{$block.link_text|escape:'html':'UTF-8'}{else}{l s='Learn more' d='Modules.Wscustomhtml.Shop'}{/if}
+            </a>
+            {/if}
+            <button type="button" class="close customhtml-alert-close" aria-label="{l s='Close' d='Modules.Wscustomhtml.Shop'}">
+                <span aria-hidden="true">&times;</span>
+            </button>
+        </div>
+        {/block}
+    </div>
 </div>
 {/if}

views/templates/hook/_banner.tpl

@@ -1,11 +1,38 @@
 <div class="customhtml-banner row flex-column position-relative">
-    <div class="customhtml-banner-image">
-    <div class="customhtml-banner-image--gradient"></div>
-    {if !empty($block.image_url)}
-        <img src="{$block.image_url|escape:'html':'UTF-8'}" alt="{$block.title|escape:'html':'UTF-8'}">
-    {/if}
-    </div>
+    {block name=banner_image}
+        <div class="customhtml-banner-image">
+            <div class="customhtml-banner-image--gradient"></div>
+            {if !empty($block.image_url)}
+                <img src="{$block.image_url|escape:'html':'UTF-8'}" alt="{$block.title|escape:'html':'UTF-8'}">
+            {else}
+                <img
+                    src="{$urls.img_ps_url}noimageavailable.jpg"
+                    alt="{$block.title|escape:'html':'UTF-8'}"
+                    width="100%"
+                    class="img-fluid rounded lazyload"
+                />
+            {/if}
+        </div>
+    {/block}
+    {block name=banner_content}
     <div class="customhtml-banner-content">
-        {include file="module:ws_customhtml/views/templates/hook/_banner_content.tpl" block=$block}
+        {if !empty($count)}
+            <span class="customhtml-banner-count font-monospace">{$count}</span>
+        {/if}
+        {if $block.show_title && !empty($block.title)}
+            <h3 class="customhtml-banner-title">{$block.title|escape:'html':'UTF-8'}</h3>
+        {/if}
+        {if !empty($block.description)}
+            <div class="customhtml-banner-description">{$block.description|escape:'html':'UTF-8'|nl2br}</div>
+        {/if}
+        {if !empty($block.extra_description)}
+            <div class="customhtml-banner-extra-description">{$block.extra_description|escape:'html':'UTF-8'|nl2br}</div>
+        {/if}
+        {if !empty($block.link)}
+            <a href="{$block.link|escape:'html':'UTF-8'}" class="btn btn-primary customhtml-banner-link">
+                {if !empty($block.link_text)}{$block.link_text|escape:'html':'UTF-8'}{else}{l s='Learn more' d='Modules.Wscustomhtml.Shop'}{/if}
+            </a>
+        {/if}
     </div>
-</div>
+    {/block}
+</div>

views/templates/hook/_banner_content.tpl

@@ -1,12 +0,0 @@
-{if $block.show_title && !empty($block.title)}
-<h3 class="customhtml-banner-title">{$block.title|escape:'html':'UTF-8'}</h3>
-{/if}
-{if !empty($block.description)}
-<div class="customhtml-banner-description">{$block.description|escape:'html':'UTF-8'|nl2br}</div>
-{/if}
-{if !empty($block.extra_description)}
-<div class="customhtml-banner-extra-description">{$block.extra_description|escape:'html':'UTF-8'|nl2br}</div>
-{/if}
-{if !empty($block.link)}
-<a href="{$block.link|escape:'html':'UTF-8'}" class="btn btn-primary customhtml-banner-link">{l s='Learn more' d='Modules.Wscustomhtml.Shop'}</a>
-{/if}

views/templates/hook/_faq_accordion.tpl

@@ -1,48 +1,61 @@
 {if !empty($block.faqs)}
-<div class="accordion customhtml-faq-accordion" id="customhtml-faq-{$block.id_ws_customhtml|intval}">
-    {foreach from=$block.faqs item="faq" name="customhtmlFaqLoop"}
-    <div class="card">
-        <div class="card-header" id="customhtml-faq-heading-{$block.id_ws_customhtml|intval}-{$faq.id_ws_customhtml_faq|intval}">
-            <button
-                class="btn btn-link col-12 d-flex text-left {if !$smarty.foreach.customhtmlFaqLoop.first} collapsed{/if}"
-                type="button"
-                data-toggle="collapse"
-                data-target="#customhtml-faq-collapse-{$block.id_ws_customhtml|intval}-{$faq.id_ws_customhtml_faq|intval}"
-                aria-expanded="{if $smarty.foreach.customhtmlFaqLoop.first}true{else}false{/if}"
-                aria-controls="customhtml-faq-collapse-{$block.id_ws_customhtml|intval}-{$faq.id_ws_customhtml_faq|intval}"
-            >
-               <div class="col">
-                {$faq.question|escape:'html':'UTF-8'}
-                 
-               </div>
-                <div class="col-auto d-flex align-items-center ">
-                    <span class="accordion-icons accordion-icon-minus">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="28" height="2" viewBox="0 0 28 2">
-                            <line id="Line_18" data-name="Line 18" x2="26" transform="translate(1 1)" fill="none" stroke="#272727" stroke-linecap="round" stroke-width="2"/>
-                        </svg>
-                    </span>
-                    <span class="accordion-icons accordion-icon-plus">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28">
-                            <g id="Group_31" data-name="Group 31" transform="translate(-1615 -4031.5)">
-                                <line id="Line_21" data-name="Line 21" x2="26" transform="translate(1616 4045.5)" fill="none" stroke="#272727" stroke-linecap="round" stroke-width="2"/>
-                                <line id="Line_22" data-name="Line 22" x2="26" transform="translate(1629 4032.5) rotate(90)" fill="none" stroke="#272727" stroke-linecap="round" stroke-width="2"/>
-                            </g>
-                        </svg>
-                    </span>
+    <div class="accordion customhtml-faq-accordion" id="customhtml-faq-{$block.id_ws_customhtml|intval}">
+        {foreach from=$block.faqs item="faq" name="customhtmlFaqLoop"}
+            <div class="card">
+                {block name=faq_question}
+                <div class="card-header" id="customhtml-faq-heading-{$block.id_ws_customhtml|intval}-{$faq.id_ws_customhtml_faq|intval}">
+
+                    {if !empty($faq.answer)}
+                        <button
+                            class="btn btn-link col-12 d-flex text-left{if !$smarty.foreach.customhtmlFaqLoop.first} collapsed{/if}"
+                            type="button"
+                            data-toggle="collapse"
+                            data-target="#customhtml-faq-collapse-{$block.id_ws_customhtml|intval}-{$faq.id_ws_customhtml_faq|intval}"
+                            aria-expanded="{if $smarty.foreach.customhtmlFaqLoop.first}true{else}false{/if}"
+                            aria-controls="customhtml-faq-collapse-{$block.id_ws_customhtml|intval}-{$faq.id_ws_customhtml_faq|intval}"
+                        >
+                    {/if}
+
+                    <div class="faq-question col pl-0">
+                        {$faq.question|escape:'html':'UTF-8'}
+                    </div>
+
+                    {if !empty($faq.answer)}
+                        <div class="col-auto d-flex align-items-center">
+                            <span class="accordion-icons accordion-icon-minus">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="28" height="2" viewBox="0 0 28 2">
+                                    <line id="Line_18" data-name="Line 18" x2="26" transform="translate(1 1)" fill="none" stroke="#272727" stroke-linecap="round" stroke-width="2"/>
+                                </svg>
+                            </span>
+                            <span class="accordion-icons accordion-icon-plus">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28">
+                                    <g id="Group_31" data-name="Group 31" transform="translate(-1615 -4031.5)">
+                                        <line id="Line_21" data-name="Line 21" x2="26" transform="translate(1616 4045.5)" fill="none" stroke="#272727" stroke-linecap="round" stroke-width="2"/>
+                                        <line id="Line_22" data-name="Line 22" x2="26" transform="translate(1629 4032.5) rotate(90)" fill="none" stroke="#272727" stroke-linecap="round" stroke-width="2"/>
+                                    </g>
+                                </svg>
+                            </span>
+                        </div>
+                        </button>
+                    {/if}
+
                 </div>
-            </button>
-        </div>
-        <div
-            id="customhtml-faq-collapse-{$block.id_ws_customhtml|intval}-{$faq.id_ws_customhtml_faq|intval}"
-            class="collapse{if $smarty.foreach.customhtmlFaqLoop.first} show{/if}"
-            aria-labelledby="customhtml-faq-heading-{$block.id_ws_customhtml|intval}-{$faq.id_ws_customhtml_faq|intval}"
-            data-parent="#customhtml-faq-{$block.id_ws_customhtml|intval}"
-        >
-            <div class="card-body">
-                {$faq.answer nofilter}
+                {/block}
+                {if !empty($faq.answer)}
+                    {block name=faq_answer}
+                    <div
+                        id="customhtml-faq-collapse-{$block.id_ws_customhtml|intval}-{$faq.id_ws_customhtml_faq|intval}"
+                        class="collapse{if $smarty.foreach.customhtmlFaqLoop.first} show{/if}"
+                        aria-labelledby="customhtml-faq-heading-{$block.id_ws_customhtml|intval}-{$faq.id_ws_customhtml_faq|intval}"
+                        data-parent="#customhtml-faq-{$block.id_ws_customhtml|intval}"
+                    >
+                        <div class="card-body">
+                            {$faq.answer nofilter}
+                        </div>
+                    </div>
+                    {/block}
+                {/if}
             </div>
-        </div>
+        {/foreach}
     </div>
-    {/foreach}
-</div>
 {/if}

views/templates/hook/_slide.tpl

@@ -0,0 +1 @@
+{extends file="module:ws_customhtml/views/templates/hook/_banner.tpl"}

views/templates/hook/_slider.tpl

@@ -0,0 +1,59 @@
+{if !empty($block.slides)}
+    {if $block.slider_mode == 'responsive'}
+        {block name=slider_responsive}
+            <div class="d-lg-none">
+                <div class="swiper customhtml-slider" data-swiper="{$block.slider_config|escape:'html':'UTF-8'}">
+                    <div class="swiper-wrapper">
+                        {foreach from=$block.slides item="slide" name="slides"}
+                        {assign var="count" value=$smarty.foreach.slides.iteration|string_format:"%02d"}
+                        <div class="swiper-slide">
+                            {assign var="customhtmlOverridePath" value="{$smarty.const._PS_THEME_DIR_}modules/ws_customhtml/views/templates/hook/{$hookName}/slide.tpl"}
+                            {if file_exists($customhtmlOverridePath)}
+                                {include file="module:ws_customhtml/views/templates/hook/`$hookName`/slide.tpl" block=$slide group=$group hookName=$hookName count=$count}
+                            {else}
+                                {include file="module:ws_customhtml/views/templates/hook/_slide.tpl" block=$slide count=$count}
+                            {/if}
+                        </div>
+                        {/foreach}
+                    </div>
+                </div>
+            </div>
+            <div class="row d-none d-lg-flex customhtml-slider-grid">
+                {foreach from=$block.slides item="slide" name="slides"}
+                {assign var="count" value=$smarty.foreach.slides.iteration|string_format:"%02d"}
+                {if !empty($block.slider_desktop_column_width)}
+                <div class="customhtml-slider-grid-item" style="flex: 0 0 {$block.slider_desktop_column_width|escape:'html':'UTF-8'}; max-width: {$block.slider_desktop_column_width|escape:'html':'UTF-8'};">
+                {else}
+                <div class="customhtml-slider-grid-item col">
+                {/if}
+                   {assign var="customhtmlOverridePath" value="{$smarty.const._PS_THEME_DIR_}modules/ws_customhtml/views/templates/hook/{$hookName}/slide.tpl"}
+                    {if file_exists($customhtmlOverridePath)}
+                        {include file="module:ws_customhtml/views/templates/hook/`$hookName`/slide.tpl" block=$slide group=$group hookName=$hookName count=$count}
+                    {else}
+                        {include file="module:ws_customhtml/views/templates/hook/_slide.tpl" block=$slide count=$count}
+                    {/if}
+                </div>
+                {/foreach}
+            </div>
+        {/block}
+    {/if}
+    {if $block.slider_mode != 'responsive'}
+        {block name=slider_always}
+            <div class="swiper customhtml-slider" data-swiper="{$block.slider_config|escape:'html':'UTF-8'}">
+                <div class="swiper-wrapper">
+                    {foreach from=$block.slides item="slide" name="slides"}
+                    {assign var="count" value=$smarty.foreach.slides.iteration|string_format:"%02d"}
+                    <div class="swiper-slide">
+                        {assign var="customhtmlOverridePath" value="{$smarty.const._PS_THEME_DIR_}modules/ws_customhtml/views/templates/hook/{$hookName}/slide.tpl"}
+                        {if file_exists($customhtmlOverridePath)}
+                            {include file="module:ws_customhtml/views/templates/hook/`$hookName`/slide.tpl" block=$slide group=$group hookName=$hookName count=$count}
+                        {else}
+                            {include file="module:ws_customhtml/views/templates/hook/_slide.tpl" block=$slide count=$count}
+                        {/if}
+                    </div>
+                    {/foreach}
+                </div>
+            </div>
+        {/block}
+    {/if}
+{/if}

views/templates/hook/_usp.tpl

@@ -0,0 +1,27 @@
+{if !empty($block.image_url) || ($block.show_title && !empty($block.title)) || !empty($block.description)}
+{if !empty($block.link)}
+<a href="{$block.link|escape:'html':'UTF-8'}" class="customhtml-usp d-flex align-items-center">
+{else}
+<div class="customhtml-usp d-flex align-items-center">
+{/if}
+    {block name=usp_icon}
+    {if !empty($block.image_url)}
+    <span class="customhtml-usp-icon">
+        <img src="{$block.image_url|escape:'html':'UTF-8'}" alt="">
+    </span>
+    {/if}
+    {/block}
+    {block name=usp_content}
+    {if $block.show_title && !empty($block.title)}
+    <span class="customhtml-usp-text">{$block.title|escape:'html':'UTF-8'}</span>
+    {/if}
+    {if !empty($block.description)}
+    <span class="customhtml-usp-description">{$block.description|escape:'html':'UTF-8'|nl2br}</span>
+    {/if}
+    {/block}
+{if !empty($block.link)}
+</a>
+{else}
+</div>
+{/if}
+{/if}

views/templates/hook/customhtml_block.tpl

@@ -1,13 +1,13 @@
 {if !empty($groupList)}
 <div class="customhtml-container {$hookName|escape:'html':'UTF-8'}--container">
     {foreach from=$groupList item="group"}
-    <div class="customhtml-group customhtml-group-{$group.id_ws_customhtml_group|intval} row">
-        {foreach from=$group.blocks item="block"}
-        <div class="customhtml-block col{if !empty($block.custom_class)} {$block.custom_class|escape:'html':'UTF-8'}{/if}">
+    <div class="customhtml-group row{if !empty($group.custom_class)} {$group.custom_class|escape:'html':'UTF-8'}{/if}">
+        {foreach from=$group.blocks item="block" name="blocks"}
+        <div class="customhtml-block col{if !empty($group.default_block_class)} {$group.default_block_class|escape:'html':'UTF-8'}{/if}{if !empty($block.custom_class)} {$block.custom_class|escape:'html':'UTF-8'}{/if}">
             {assign var="customhtmlOverridePath" value="{$smarty.const._PS_THEME_DIR_}modules/ws_customhtml/views/templates/hook/{$hookName}/{$block.type}.tpl"}
 
             {if file_exists($customhtmlOverridePath)}
-                {include file="module:ws_customhtml/views/templates/hook/`$hookName`/`$block.type`.tpl" block=$block group=$group hookName=$hookName}
+                {include file="module:ws_customhtml/views/templates/hook/`$hookName`/`$block.type`.tpl" block=$block group=$group hookName=$hookName iteration=$smarty.foreach.blocks.iteration}
             {elseif $block.type == 'faq'}
                 {if $block.show_title && !empty($block.title)}
                 <div class="customhtml-title">{$block.title|escape:'html':'UTF-8'}</div>
@@ -17,6 +17,13 @@
                 {include file="module:ws_customhtml/views/templates/hook/_banner.tpl" block=$block}
             {elseif $block.type == 'alert'}
                 {include file="module:ws_customhtml/views/templates/hook/_alert.tpl" block=$block}
+            {elseif $block.type == 'usp'}
+                {include file="module:ws_customhtml/views/templates/hook/_usp.tpl" block=$block}
+            {elseif $block.type == 'slider'}
+                {if $block.show_title && !empty($block.title)}
+                <div class="customhtml-title">{$block.title|escape:'html':'UTF-8'}</div>
+                {/if}
+                {include file="module:ws_customhtml/views/templates/hook/_slider.tpl" block=$block}
             {else}
                 {if $block.show_title && !empty($block.title)}
                 <div class="customhtml-title">{$block.title|escape:'html':'UTF-8'}</div>

views/templates/hook/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

views/templates/index.php

@@ -0,0 +1,8 @@
+<?php
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+header('Location: ../');
+exit;

ws_customhtml.php

@@ -29,7 +29,7 @@ class Ws_CustomHtml extends Module implements WidgetInterface
     public function __construct()
     {
         $this->name = 'ws_customhtml';
-        $this->version = '1.11.0';
+        $this->version = '1.24.0';
         $this->author = 'Isabelle Oving-Anno | De Websmid BV';
         $this->need_instance = 0;
         $this->bootstrap = true;