established the compatibility with Shopware from version 6.5

sschreier · Sep 5, 2023 · 6bb23c9 · 6bb23c9
1 parent 8e7b242
commit 6bb23c9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "sschreier/sschreiertopbarnotifications",
     "description": "Leiste für Informations- und Hinweistexte oder Meldungen",
-    "version": "1.0.5",
+    "version": "1.1.0",
     "type": "shopware-platform-plugin",
     "license": "proprietary",
     "authors": [
@@ -11,8 +11,8 @@
         }
     ],
     "require": {
-        "shopware/core": "~6.4.18",
-        "shopware/storefront": "~6.4.18"
+        "shopware/core": "~6.5.0",
+        "shopware/storefront": "~6.5.0"
     },
     "extra": {
         "shopware-plugin-class": "Sschreier\\TopbarNotifications\\SschreierTopbarNotifications",

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" ?>
-
      <container xmlns="http://symfony.com/schema/dic/services"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
      <services>
-
           <service id="Sschreier\TopbarNotifications\Subscriber\ThemeVariablesSubscriber">
-               <argument type="service" id="Shopware\Core\System\SystemConfig\SystemConfigService" />
-
+              <argument type="service" id="Shopware\Core\System\SystemConfig\SystemConfigService" />
               <tag name="kernel.event_subscriber"/>
           </service>
-
      </services>
-
 </container>
diff --git a/src/Resources/views/storefront/topbarnotifications.html.twig b/src/Resources/views/storefront/topbarnotifications.html.twig
@@ -1,4 +1,4 @@
-<div class="topbar-outer-container {{ config('SschreierTopbarNotifications.config.showContentIn') }}">
+<div class="topbar-outer-container {{ config('SschreierTopbarNotifications.config.showContentIn') }}{% block base_header_inner_topbarnotifications_container_outer_cssclass %}{% endblock %}">
     {% block base_header_inner_topbarnotifications_container %}
         <div class="container">
             {% block base_header_inner_topbarnotifications_container_topbar %}
@@ -74,7 +74,7 @@
 
                                     {% if (showTopBarArea == true) %}
                                         {% block base_header_inner_topbarnotifications_container_topbar_nav_item_container_link %}
-                                            {% if (linkTopBarArea != "") %}<a {% if (linkTargetTopBarArea == "modalbox") %}data-toggle="modal" data-url="{% if (linkTargetTopBarArea == "modalbox") %}{{ path('frontend.cms.page', { id:  linkTopBarArea }) }}{% else %}{{ linkTopBarArea }}{% endif %}" {% endif %}href="{% if (linkTargetTopBarArea == "modalbox") %}{{ path('frontend.cms.page', { id:  linkTopBarArea }) }}{% else %}{{ linkTopBarArea }}{% endif %}"{% if (linkTitleTopBarArea != "") %} title="{{ linkTitleTopBarArea }}"{% endif %} class="top-bar-notification-nav-item-link d-none {% for showInViewportTopBarAreaArray in showInViewportTopBarArea %}{{ "d-only-" ~ showInViewportTopBarAreaArray ~ "-flex " }}{% endfor %}"{% if (linkTargetTopBarArea == "blank") %} target="_blank"{% endif %}>{% endif %}
+                                            {% if (linkTopBarArea != "") %}<a {% if (linkTargetTopBarArea == "modalbox") %}data-ajax-modal="true" data-url="{% if (linkTargetTopBarArea == "modalbox") %}{{ path('frontend.cms.page', { id:  linkTopBarArea }) }}{% else %}{{ linkTopBarArea }}{% endif %}" {% endif %}href="{% if (linkTargetTopBarArea == "modalbox") %}{{ path('frontend.cms.page', { id:  linkTopBarArea }) }}{% else %}{{ linkTopBarArea }}{% endif %}"{% if (linkTitleTopBarArea != "") %} title="{{ linkTitleTopBarArea }}"{% endif %} class="top-bar-notification-nav-item-link d-none {% for showInViewportTopBarAreaArray in showInViewportTopBarArea %}{{ "d-only-" ~ showInViewportTopBarAreaArray ~ "-flex " }}{% endfor %}"{% if (linkTargetTopBarArea == "blank") %} target="_blank"{% endif %}>{% endif %}
                                                 {% block base_header_inner_topbarnotifications_container_topbar_nav_item_container %}
                                                     <div class="top-bar-notification-nav-item-container {% if (linkTopBarArea == "") %}d-none {% for showInViewportTopBarAreaArray in showInViewportTopBarArea %}{{ "d-only-" ~ showInViewportTopBarAreaArray ~ "-flex " }}{% endfor %}{% endif %}">
                                                         <div class="top-bar-notification-nav-item-inner-container top-bar-notification-nav-item-container-{{ i }} {{ orientationTopBarArea }}">