From 3e72142d7aff86875a069a1eb431a81e73be8fe5 Mon Sep 17 00:00:00 2001
From: Thomas <tf@webks.de>
Date: Thu, 9 May 2019 10:56:12 +0200
Subject: [PATCH 01/37] Fixed the option to order without regsiter an account

Fixes https://github.com/conexco/shopware-bootstrap-theme/issues/33
---
 .../frontend/register/personal_fieldset.tpl   | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
index 35eff42..0f64b48 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
@@ -121,26 +121,28 @@
             {* Skip login *}
             {if !$update}
                 {block name='frontend_register_personal_fieldset_skip_login'}
-                    {if ($showNoAccount || $form_data.accountmode) && !$sEsd && !$form_data.sValidation && !{config name=NoAccountDisable}}
+                    <input type="hidden"
+                            value="0"
+                            name="register[personal][accountmode]"
+                            class="register--checkbox chkbox"/>
+                    {if !$sEsd && !$form_data.sValidation && ({config name=NoAccountDisable} == 1 || {config name=NoAccountDisable} == 2)}
+                        {$accountModeChecked = {config name=NoAccountDisable} == 1}
+                        {if isset($form_data.accountmode)}
+                            {$accountModeChecked = $form_data.accountmode}
+                        {/if}
                         <div class="form-group register-check sw5-plugin">
                             <div class="{$FormInputSize} {$FormLabelOffset}">
-                                <label for="register_personal_skipLogin" class="checkbox-inline">
-                                    <input type="checkbox" 
-                                           value="1" 
-                                           id="register_personal_skipLogin" 
-                                           name="register[personal][accountmode]" 
-                                           {if $form_data.accountmode || $accountmode}checked {/if} /> 
+                                <label for="register_personal_skipLogin"
+                                    class="checkbox-inline">
+                                    <input type="checkbox" value="1"
+                                        id="register_personal_skipLogin"
+                                        name="register[personal][accountmode]" 
+                                        {if $form_data.accountmode || $accountmode}checked{/if} />
                                     <strong>{s name='RegisterLabelNoAccount'}{/s}</strong>
                                 </label>
                             </div>
                         </div>
-                    {else}
-                        <input type="hidden"
-                               value="0"
-                               id="register_personal_skipLogin"
-                               name="register[personal][accountmode]"
-                               {if $form_data.accountmode || $accountmode}checked="checked" {/if}/>
-                    {/if}
+                    {/if} 
                 {/block}
 
                 {* E-Mail *}
@@ -282,4 +284,4 @@
             {/if}
         {/block}
     </fieldset>
-{/block}
\ No newline at end of file
+{/block}

From cc75b6f269acaff3e055c14461243f41817e6824 Mon Sep 17 00:00:00 2001
From: Thomas <thomasfrobieter@gmail.com>
Date: Thu, 9 May 2019 11:50:52 +0200
Subject: [PATCH 02/37] Create privacy.tpl

Added missing include from bare.
---
 .../BootstrapBare/frontend/_includes/privacy.tpl | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl
new file mode 100644
index 0000000..4721875
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl
@@ -0,0 +1,16 @@
+{block name="frontend_data_protection_information"}
+    <p class="privacy-information">
+        {if {config name=ACTDPRCHECK} && !$hideCheckbox}
+            {block name="frontend_data_protection_information_checkbox"}
+                <input name="privacy-checkbox" type="checkbox" id="privacy-checkbox" required="required" aria-required="true" value="1" class="is--required"{if $smarty.post['privacy-checkbox']} checked{/if} />
+                <label for="privacy-checkbox">
+                    {s name="PrivacyText" namespace="frontend/index/privacy"}{/s}
+                </label>
+            {/block}
+        {elseif {config name=ACTDPRTEXT}}
+            {block name="frontend_data_protection_information_text"}
+                {s name="PrivacyText" namespace="frontend/index/privacy"}{/s}
+            {/block}
+        {/if}
+    </p>
+{/block}

From 3509310c96528de71e5c0a02146659e3a0ec7189 Mon Sep 17 00:00:00 2001
From: Thomas <thomasfrobieter@gmail.com>
Date: Thu, 9 May 2019 12:00:47 +0200
Subject: [PATCH 03/37] Added data protection information checkbox

Related to https://github.com/conexco/shopware-bootstrap-theme/issues/35
---
 .../BootstrapBare/frontend/forms/form-elements.tpl         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
index 29b6b3f..844d563 100644
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
@@ -104,6 +104,13 @@
                     </div>
                 {/block}
 
+                {* Data protection information *}
+                {block name='frontend_forms_form_elements_form_privacy'}
+                    {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+                        {include file="frontend/_includes/privacy.tpl"}
+                    {/if}
+                {/block}
+
                 {* Forms actions *}
                 {block name='frontend_forms_elements_form_submit'}
                     <div class="form-group">

From 6976abb5daa071cd9e827feee36849786f77eaa8 Mon Sep 17 00:00:00 2001
From: Thomas <thomasfrobieter@gmail.com>
Date: Thu, 9 May 2019 12:04:40 +0200
Subject: [PATCH 04/37] Added data protection information checkbox

Related to https://github.com/conexco/shopware-bootstrap-theme/issues/35
---
 .../BootstrapBare/frontend/blog/comment/form.tpl         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/blog/comment/form.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/blog/comment/form.tpl
index b7790d4..3950e35 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/blog/comment/form.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/blog/comment/form.tpl
@@ -111,6 +111,13 @@
                 </div>
             {/block}
 
+            {* Data protection information *}
+            {block name='frontend_forms_form_elements_form_privacy'}
+                {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+                    {include file="frontend/_includes/privacy.tpl"}
+                {/if}
+            {/block}
+
             {* Submit button *}
             {block name='frontend_blog_comments_input_submit'}
                 <div class="form-group">
@@ -125,4 +132,4 @@
             {/block}
         </fieldset>
     </form>
-{/block}
\ No newline at end of file
+{/block}

From b8868e2404fa230769e9b440084c2d92c7541500 Mon Sep 17 00:00:00 2001
From: Thomas <thomasfrobieter@gmail.com>
Date: Thu, 9 May 2019 12:06:32 +0200
Subject: [PATCH 05/37] Added data protection information checkbox

Related to https://github.com/conexco/shopware-bootstrap-theme/issues/35
---
 .../BootstrapBare/frontend/detail/comment/form.tpl       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/detail/comment/form.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/detail/comment/form.tpl
index 2769ea6..39b10e6 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/detail/comment/form.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/detail/comment/form.tpl
@@ -130,6 +130,13 @@
             </div>
         {/block}
 
+        {* Data protection information *}
+        {block name='frontend_forms_form_elements_form_privacy'}
+            {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+                {include file="frontend/_includes/privacy.tpl"}
+            {/if}
+        {/block}
+
         {* Review actions *}
         {block name='frontend_detail_comment_input_actions'}
             <div class="form-group">
@@ -146,4 +153,4 @@
         {/block}
     </fieldset>
     </form>
-{/block}
\ No newline at end of file
+{/block}

From fdbc668797b0adb04257594ac710482ce754f97a Mon Sep 17 00:00:00 2001
From: Thomas <thomasfrobieter@gmail.com>
Date: Thu, 9 May 2019 12:10:21 +0200
Subject: [PATCH 06/37] Added data protection information checkbox

Related to https://github.com/conexco/shopware-bootstrap-theme/issues/35
---
 .../frontend/index/footer-navigation.tpl         | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/footer-navigation.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/footer-navigation.tpl
index bb23b29..cc46758 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/index/footer-navigation.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/footer-navigation.tpl
@@ -95,6 +95,20 @@
                                                         </button>
                                                     </span>
                                                 {/block}
+                                                
+                                                {* Data protection information *}
+                                                {block name="frontend_index_footer_column_newsletter_privacy"}
+                                                    {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+                                                        {$hideCheckbox=false}
+
+                                                        {* If a captcha is active, the user has to accept the privacy statement on the newsletter page *}
+                                                        {if {config name=newsletterCaptcha} !== "nocaptcha"}
+                                                            {$hideCheckbox=true}
+                                                        {/if}
+
+                                                        {include file="frontend/_includes/privacy.tpl" hideCheckbox=$hideCheckbox}
+                                                    {/if}
+                                                {/block}
                                             </div>
                                         {/block}
                                     </form>
@@ -106,4 +120,4 @@
             {/block}
         {/block}
     </div>
-{/block}
\ No newline at end of file
+{/block}

From f4381551cc51728a040836c9a30106cddb45f013 Mon Sep 17 00:00:00 2001
From: Thomas <thomasfrobieter@gmail.com>
Date: Thu, 9 May 2019 12:12:35 +0200
Subject: [PATCH 07/37] Added data protection information checkbox

Related to https://github.com/conexco/shopware-bootstrap-theme/issues/35
---
 .../Frontend/BootstrapBare/frontend/newsletter/index.tpl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/newsletter/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/newsletter/index.tpl
index 863b801..bbbb095 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/newsletter/index.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/newsletter/index.tpl
@@ -221,6 +221,13 @@
                                 {/if}
                             {/block}
 
+                            {* Data protection information *}
+                            {block name="frontend_newsletter_form_privacy"}
+                                {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+                                    {include file="frontend/_includes/privacy.tpl"}
+                                {/if}
+                            {/block}
+
                             {* Submit button *}
                             {block name="frontend_newsletter_form_submit"}
                                 <div class="form-group">
@@ -236,4 +243,4 @@
             </div>
         {/if}
     {/block}
-{/block}
\ No newline at end of file
+{/block}

From 2022d615a845a8c07a8b0dd901b1bef157cfb7ce Mon Sep 17 00:00:00 2001
From: Thomas <thomasfrobieter@gmail.com>
Date: Thu, 9 May 2019 12:15:05 +0200
Subject: [PATCH 08/37] Added data protection information checkbox

Related to https://github.com/conexco/shopware-bootstrap-theme/issues/35
---
 .../BootstrapBare/frontend/plugins/notification/index.tpl   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/plugins/notification/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/plugins/notification/index.tpl
index 83adef6..8382f02 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/plugins/notification/index.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/plugins/notification/index.tpl
@@ -46,6 +46,12 @@
                                         </span>
                                     {/block}
                                 </div>
+                                {* Data protection information *}
+                                {block name="frontend_detail_index_notification_privacy"}
+                                    {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+                                        {include file="frontend/_includes/privacy.tpl"}
+                                    {/if}
+                                {/block}
                             </form>
                         </div>
                     </div>

From 366b53ae11d8a2e81d3fc13386f6a56b522ffa39 Mon Sep 17 00:00:00 2001
From: Thomas <thomasfrobieter@gmail.com>
Date: Thu, 9 May 2019 12:21:55 +0200
Subject: [PATCH 09/37] Moved frontend_forms_form_elements_form_privacy

Moved frontend_forms_form_elements_form_privacy into the submit form group.
---
 .../BootstrapBare/frontend/forms/form-elements.tpl  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
index 844d563..0d5e116 100644
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
@@ -104,17 +104,16 @@
                     </div>
                 {/block}
 
-                {* Data protection information *}
-                {block name='frontend_forms_form_elements_form_privacy'}
-                    {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
-                        {include file="frontend/_includes/privacy.tpl"}
-                    {/if}
-                {/block}
-
                 {* Forms actions *}
                 {block name='frontend_forms_elements_form_submit'}
                     <div class="form-group">
                         <div class="{$FormLabelOffset} {$FormInputSize}">
+                            {* Data protection information *}
+                            {block name='frontend_forms_form_elements_form_privacy'}
+                                {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+                                    {include file="frontend/_includes/privacy.tpl"}
+                                {/if}
+                            {/block}
                             <span class="help-block required-info">{s name='SupportLabelInfoFields'}{/s}</span>
                             <input class="btn btn-primary" type="submit" name="Submit" value="{s name='SupportActionSubmit'}{/s}">
                         </div>

From 0ecde7c48d457507bb29b55042991744e830fcfd Mon Sep 17 00:00:00 2001
From: Thomas <thomasfrobieter@gmail.com>
Date: Thu, 9 May 2019 12:23:00 +0200
Subject: [PATCH 10/37] Moved the input checkbox element into the label

... so we have the checkbox next to the text instead of above.
---
 .../Frontend/BootstrapBare/frontend/_includes/privacy.tpl       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl
index 4721875..d359ae7 100644
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl
@@ -2,8 +2,8 @@
     <p class="privacy-information">
         {if {config name=ACTDPRCHECK} && !$hideCheckbox}
             {block name="frontend_data_protection_information_checkbox"}
-                <input name="privacy-checkbox" type="checkbox" id="privacy-checkbox" required="required" aria-required="true" value="1" class="is--required"{if $smarty.post['privacy-checkbox']} checked{/if} />
                 <label for="privacy-checkbox">
+                    <input name="privacy-checkbox" type="checkbox" id="privacy-checkbox" required="required" aria-required="true" value="1" class="is--required"{if $smarty.post['privacy-checkbox']} checked{/if} />
                     {s name="PrivacyText" namespace="frontend/index/privacy"}{/s}
                 </label>
             {/block}

From 3cc58a0b18a4cd3486e919166e2f4aaad6454bfd Mon Sep 17 00:00:00 2001
From: Thomas <thomasfrobieter@gmail.com>
Date: Thu, 9 May 2019 12:31:17 +0200
Subject: [PATCH 11/37] Moved the privacy checkbox out of the form group

---
 .../frontend/index/footer-navigation.tpl      | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/footer-navigation.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/footer-navigation.tpl
index cc46758..977253a 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/index/footer-navigation.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/footer-navigation.tpl
@@ -95,21 +95,20 @@
                                                         </button>
                                                     </span>
                                                 {/block}
-                                                
-                                                {* Data protection information *}
-                                                {block name="frontend_index_footer_column_newsletter_privacy"}
-                                                    {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
-                                                        {$hideCheckbox=false}
-
-                                                        {* If a captcha is active, the user has to accept the privacy statement on the newsletter page *}
-                                                        {if {config name=newsletterCaptcha} !== "nocaptcha"}
-                                                            {$hideCheckbox=true}
-                                                        {/if}
+                                            </div>
+                                            {* Data protection information *}
+                                            {block name="frontend_index_footer_column_newsletter_privacy"}
+                                                {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+                                                    {$hideCheckbox=false}
 
-                                                        {include file="frontend/_includes/privacy.tpl" hideCheckbox=$hideCheckbox}
+                                                    {* If a captcha is active, the user has to accept the privacy statement on the newsletter page *}
+                                                    {if {config name=newsletterCaptcha} !== "nocaptcha"}
+                                                        {$hideCheckbox=true}
                                                     {/if}
-                                                {/block}
-                                            </div>
+
+                                                    {include file="frontend/_includes/privacy.tpl" hideCheckbox=$hideCheckbox}
+                                                {/if}
+                                            {/block}
                                         {/block}
                                     </form>
                                  {/block}

From 3e53ab6c9a80bde2e6af578330afd4f5cde4a7f9 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Thu, 9 May 2019 13:49:16 +0200
Subject: [PATCH 12/37] Fixed form captcha

---
 .../frontend/forms/form-elements.tpl          | 29 ++-----------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
index 0d5e116..58c6683 100644
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
@@ -3,30 +3,11 @@
 {block name='frontend_forms_form_elements'}
     {capture name="formlabel"}<label class="control-label {$FormLabelSize}" {/capture}
     <form id="support" name="support" class="{$sSupport.class} form-horizontal" method="post"
-          action="{url controller='ticket' action='index' id=$id}" enctype="multipart/form-data">
+        action="{url action='index' id=$id}" enctype="multipart/form-data">
         <input type="hidden" name="forceMail" value="{$forceMail|escape}">
 
         {* Form Content *}
         {block name='frontend_forms_form_elements_form_content'}
-            {if $sSupport.sErrors.e || $sSupport.sErrors.v}
-                <div class="alert alert-danger">
-                    {if $sSupport.sErrors.v}
-                        {foreach from=$sSupport.sErrors.v key=sKey item=sError}
-                            {if $sKey !=0&&$sSupport.sElements.$sError.error_msg}<br/>{/if}
-                            {$sSupport.sElements.$sError.error_msg}
-                        {/foreach}
-                        {if $sSupport.sErrors.e}<br/>{/if}
-                    {/if}
-                    {if $sSupport.sErrors.e}
-                        {if $sSupport.sErrors.e['sCaptcha'] == true}
-                            {$errorContent="{$errorContent}{s name='SupportInfoFillCaptcha' namespace="frontend/forms/elements"}{/s}"}
-                        {else}
-                            {s name='SupportInfoFillRedFields'}{/s}
-                        {/if}
-                    {/if}
-                </div>
-            {/if}
-
             <fieldset>
                 {block name='frontend_forms_form_elements_form_builder'}
                     {foreach from=$sSupport.sElements item=sElement key=sKey}
@@ -86,18 +67,14 @@
                         {/if}
                     {/foreach}
                 {/block}
-
+                
                 {* Captcha *}
                 {block name='frontend_forms_elements_form_captcha'}
                     <div class="form-group{if $sSupport.sErrors.e.sCaptcha} has-error{/if} captcha">
                         <div class="{$FormLabelOffset} {$FormInputSize}">
                             <div class="row">
                                 <div class="col-xs-12">
-                                    <div class="captcha-placeholder" data-src="{url module=widgets controller=Captcha action=refreshCaptcha}"></div>
-                                </div>
-                                <div class="col-xs-12">
-                                    <p class="mtm"><small>{s name='SupportLabelCaptcha'}{/s}</small></p>
-                                    <input type="text" name="sCaptcha" class="form-control mtm is-required" required="required" aria-required="true" />
+                                    <div class="captcha-placeholder" data-src="{url module=widgets controller=Captcha action=index}"></div>
                                 </div>
                             </div>
                         </div>

From 525802d95383cd2cd4b429207aa1d244d179cbbb Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Thu, 9 May 2019 14:12:19 +0200
Subject: [PATCH 13/37] moved newsletter privacy checkbox into the submit form
 group

---
 .../BootstrapBare/frontend/newsletter/index.tpl     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/newsletter/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/newsletter/index.tpl
index bbbb095..043e638 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/newsletter/index.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/newsletter/index.tpl
@@ -221,17 +221,16 @@
                                 {/if}
                             {/block}
 
-                            {* Data protection information *}
-                            {block name="frontend_newsletter_form_privacy"}
-                                {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
-                                    {include file="frontend/_includes/privacy.tpl"}
-                                {/if}
-                            {/block}
-
                             {* Submit button *}
                             {block name="frontend_newsletter_form_submit"}
                                 <div class="form-group">
                                     <div class="{$FormLabelOffset} {$FormInputSize}">
+                                        {* Data protection information *}
+                                        {block name="frontend_newsletter_form_privacy"}
+                                            {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+                                                {include file="frontend/_includes/privacy.tpl"}
+                                            {/if}
+                                        {/block}
                                         <span class="help-block required-info">{s name='RegisterPersonalRequiredText' namespace='frontend/register/personal_fieldset'}{/s}</span>
                                         <button class="btn btn-primary" type="submit" name="submit">{s name=sNewsletterButton}{/s}</button>
                                     </div>

From cf2508c98585d1cf3cdd2ca2198b235f29b4d2c8 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Thu, 9 May 2019 14:21:59 +0200
Subject: [PATCH 14/37] Added error messages from Bare - already removed the
 none working error messages from the form-elements.tpl

---
 .../BootstrapBare/frontend/forms/index.tpl    | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/index.tpl
index f71158f..9d15c94 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/index.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/index.tpl
@@ -22,6 +22,36 @@
         <div class="h1">{$sSupport.name}</div>
     {/block}
 
+    {* Form error *}
+    {block name='frontend_forms_elements_error'}
+        {if $sSupport.sErrors.e || $sSupport.sErrors.v}
+            {$errorContent=""}
+            <div class="error">
+                {if $sSupport.sErrors.v}
+                    {foreach from=$sSupport.sErrors.v key=sKey item=sError}
+                        {if $sKey !=0&&$sSupport.sElements.$sError.error_msg}{$errorContent="{$errorContent}<br />"}{/if}
+                        {$errorContent="{$errorContent}{$sSupport.sElements.$sError.error_msg}"}
+                    {/foreach}
+                    {if $sSupport.sErrors.e}
+                        {$errorContent="{$errorContent}<br />"}
+                    {/if}
+                {/if}
+
+                {if $sSupport.sErrors.e}
+                    {if $sSupport.sErrors.e['sCaptcha'] == true}
+                        {$errorContent="{$errorContent}{s name='SupportInfoFillCaptcha' namespace="frontend/forms/elements"}{/s}"}
+                    {else}
+                        {$errorContent="{$errorContent}{s name='SupportInfoFillRedFields' namespace="frontend/forms/elements"}{/s}"}
+                    {/if}
+                {/if}
+
+                {block name='frontend_forms_elements_error_messages'}
+                    {include file="frontend/_includes/messages.tpl" type='error' content=$errorContent}
+                {/block}
+            </div>
+        {/if}
+    {/block}
+
     {* Forms Content *}
     {block name='frontend_forms_index_content'}
         {if $sSupport.sElements}
@@ -38,5 +68,4 @@
 {/block}
 
 {* Sidebar right *}
-{block name='frontend_index_content_right'}{/block}
-
+{block name='frontend_index_content_right'}{/block}
\ No newline at end of file

From b237d031471096b37e56cc6a2c4ce5efe7914594 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Fri, 10 May 2019 17:24:44 +0200
Subject: [PATCH 15/37] Added Bootstrap hidden class to form-groups with fields
 from type "hidden" - otherwise just the label is printed out.

---
 .../Frontend/BootstrapBare/frontend/forms/form-elements.tpl    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
index 58c6683..3df4a97 100644
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
@@ -16,6 +16,9 @@
                             {$field = $sSupport.sFields[$sKey]|replace:'{literal}':''|replace:'{/literal}':''|replace:'%*%':"{s name='RequiredField' namespace='frontend/register/index'}{/s}"}
 
                             {if !$sSupport.sFields[$sKey]|strstr:"type=\"checkbox"}
+                                <pre>
+                                    {$sSupport.sFields[$sKey]|@print_r}
+                                </pre>
                                 <div class="form-group{if $sSupport.sFields[$sKey]|strpos:"instyle_error"} has-error{/if}">
                                     {$sSupport.sLabels.$sKey|replace:'<label ':$smarty.capture.formlabel}
                                     <div class="{$FormInputSize}">

From 4904c09a3d6f956543666322ca22ee5b23bad126 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Fri, 10 May 2019 17:25:47 +0200
Subject: [PATCH 16/37] Added bootstraps hidden class to the form-group wrapper
 if the field type is "hidden". Otherwise just the label is printed out.

---
 .../Frontend/BootstrapBare/frontend/forms/form-elements.tpl  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
index 3df4a97..1489c09 100644
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
@@ -16,10 +16,7 @@
                             {$field = $sSupport.sFields[$sKey]|replace:'{literal}':''|replace:'{/literal}':''|replace:'%*%':"{s name='RequiredField' namespace='frontend/register/index'}{/s}"}
 
                             {if !$sSupport.sFields[$sKey]|strstr:"type=\"checkbox"}
-                                <pre>
-                                    {$sSupport.sFields[$sKey]|@print_r}
-                                </pre>
-                                <div class="form-group{if $sSupport.sFields[$sKey]|strpos:"instyle_error"} has-error{/if}">
+                                <div class="form-group{if $sSupport.sFields[$sKey]|strpos:"instyle_error"} has-error{/if}{if $sSupport.sFields[$sKey]|strstr:"type=\"hidden"} hidden{/if}">
                                     {$sSupport.sLabels.$sKey|replace:'<label ':$smarty.capture.formlabel}
                                     <div class="{$FormInputSize}">
                                         {if $field|strstr:"class=\"strasse"}

From 637287d9c80d318cbe6d41ff5a2b716d78048716 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Thu, 23 May 2019 14:57:12 +0200
Subject: [PATCH 17/37] Added missing sitemap_index_xml templatefile

---
 .../BootstrapBare/frontend/sitemap_index_xml/entry.tpl |  4 ++++
 .../BootstrapBare/frontend/sitemap_index_xml/index.tpl | 10 ++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/entry.tpl
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/index.tpl

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/entry.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/entry.tpl
new file mode 100644
index 0000000..fc2c3de
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/entry.tpl
@@ -0,0 +1,4 @@
+    <sitemap>
+        <loc>{link file=$sitemap->getFilename() fullPath}</loc>
+        <lastmod>{$sitemap->getCreated()->format('Y-m-d')}</lastmod>
+    </sitemap>
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/index.tpl
new file mode 100644
index 0000000..06edfe5
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/index.tpl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+{strip}
+    {block name="frontend_sitemap_index_xml_index"}
+        {foreach $sitemaps as $sitemap}
+            {include file="frontend/sitemap_index_xml/entry.tpl" sitemap=$sitemap}
+        {/foreach}
+    {/block}
+{/strip}
+</sitemapindex>

From a4baf5789e3e426e5b5559b947eea393ee61fe1a Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Tue, 4 Jun 2019 15:07:51 +0200
Subject: [PATCH 18/37] Update description.tpl

Fixed order of supplier info & links like in bootstrap Bare default.
---
 .../frontend/detail/tabs/description.tpl       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/detail/tabs/description.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/detail/tabs/description.tpl
index e775f2d..127a25f 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/detail/tabs/description.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/detail/tabs/description.tpl
@@ -37,6 +37,14 @@
     </div>
 {/block}
 
+{* Supplier *}
+{block name='frontend_detail_description_supplier'}
+    {if $sArticle.supplierDescription}
+        <h3>{s name="DetailDescriptionSupplier"}{/s} "{$sArticle.supplierName}"</h3>
+        <p>{$sArticle.supplierDescription}</p>
+    {/if}
+{/block}
+
 {* Links *}
 {block name='frontend_detail_description_links'}
     {if $sArticle.sLinks}
@@ -59,14 +67,6 @@
     {/if}
 {/block}
 
-{* Supplier *}
-{block name='frontend_detail_description_supplier'}
-    {if $sArticle.supplierDescription}
-        <h3>{s name="DetailDescriptionSupplier"}{/s} "{$sArticle.supplierName}"</h3>
-        <p>{$sArticle.supplierDescription}</p>
-    {/if}
-{/block}
-
 {* Downloads *}
 {block name='frontend_detail_description_downloads'}
     {if $sArticle.sDownloads}
@@ -93,4 +93,4 @@
             </blockquote>
         </div>
     {/block}
-{/if}
\ No newline at end of file
+{/if}

From ec085127fa207ac769112d69e7e83c57c73c990f Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Tue, 4 Jun 2019 20:56:26 +0200
Subject: [PATCH 19/37] Fixed custom page tabs links frontend/custom/index.tpl

Fixed tabs links in custom parent pages to link to the link instead of the custom page URL, if a custom link is set. Furthermore added data-attributes and target like in menu links.
---
 .../Frontend/BootstrapBare/frontend/custom/index.tpl      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/custom/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/custom/index.tpl
index 68cc4de..42775f7 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/custom/index.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/custom/index.tpl
@@ -31,7 +31,11 @@
         <ul class="nav nav-tabs">
             {foreach $pages as $subPage}
                 <li{if $subPage.active} class="active"{/if}>
-                    <a href="{url controller=custom sCustom=$subPage.id}" title="{$subPage.description}">{$subPage.description}</a>
+                    <a href="{if $subPage.link}{$subPage.link}{else}{url controller='custom' sCustom=$subPage.id title=$subPage.description}{/if}"
+                    title="{$subPage.description}"
+                    data-categoryId="{$subPage.id}"
+                    data-fetchUrl="{url module=widgets controller=listing action=getCustomPage pageId={$subPage.id}}"
+                    {if $subPage.target}target="{$subPage.target}"{/if}>{$subPage.description}</a>
                 </li>
             {/foreach}
         </ul>
@@ -52,4 +56,4 @@
 {* Sidebar left *}
 {block name='frontend_index_content_left'}
     {include file='frontend/index/sidebar.tpl'}
-{/block}
\ No newline at end of file
+{/block}

From 72267b81080cc40ffcf5238c6bb325aafece2dcd Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Thu, 13 Jun 2019 12:10:53 +0200
Subject: [PATCH 20/37] Create index.tpl

Added bootstrap document templates
---
 .../BootstrapBare/documents/index.tpl         | 365 ++++++++++++++++++
 1 file changed, 365 insertions(+)
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/documents/index.tpl

diff --git a/Resources/Themes/Frontend/BootstrapBare/documents/index.tpl b/Resources/Themes/Frontend/BootstrapBare/documents/index.tpl
new file mode 100644
index 0000000..a1e3579
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/documents/index.tpl
@@ -0,0 +1,365 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; utf-8">
+<meta name="author" content=""/>
+<meta name="copyright" content="" />
+
+<title></title>
+<style type="text/css">
+{block name="document_index_css"}
+body {
+    {$Containers.Body.style}
+}
+
+div#head_logo {
+    {$Containers.Logo.style}
+}
+
+div#head_sender {
+    {$Containers.Header_Recipient.style}
+}
+
+div#header {
+    {$Containers.Header.style}
+}
+
+div#head_left {
+    {$Containers.Header_Box_Left.style}
+}
+
+div#head_right {
+    {$Containers.Header_Box_Right.style}
+}
+
+div#head_bottom {
+    {$Containers.Header_Box_Bottom.style}
+}
+
+div#content {
+    {$Containers.Content.style}
+}
+
+td {
+    {$Containers.Td.style}
+}
+
+td.name {
+    {$Containers.Td_Name.style}
+}
+
+td.line {
+    {$Containers.Td_Line.style}
+}
+
+td.head  {
+    {$Containers.Td_Head.style}
+}
+
+#footer {
+    {$Containers.Footer.style}
+}
+
+#amount {
+    {$Containers.Content_Amount.style}
+}
+
+#sender {
+    {$Containers.Header_Sender.style}
+}
+
+#info {
+    {$Containers.Content_Info.style}
+}
+{/block}
+</style>
+</head>
+
+<body>
+{block name="document_index_body"}
+{foreach from=$Pages item=positions name="pagingLoop" key=page}
+
+    {* @Deprecated: Wrong variable will be removed in next major release *}
+    {$postions = $positions}
+
+    <div id="head_logo">
+        {$Containers.Logo.value}
+    </div>
+    <div id="header">
+        {block name="document_index_head_left_wrapper"}
+            <div id="head_left">
+            {if $smarty.foreach.pagingLoop.first}
+                {block name="document_index_selectAdress"}
+                    {assign var="address" value="billing"}
+                {/block}
+                <div id="head_sender">
+                    {block name="document_index_address"}
+                        {block name="document_index_address_sender"}
+                            <p class="sender">{$Containers.Header_Sender.value}</p>
+                        {/block}
+                        {block name="document_index_address_base"}
+                            {if $User.$address.company}{$User.$address.company}<br />{/if}
+                            {if $User.$address.department}{$User.$address.department}<br />{/if}
+                            {$User.$address.salutation|salutation}
+                            {if {config name="displayprofiletitle"}}
+                                {$User.$address.title}<br/>
+                            {/if}
+                            {$User.$address.firstname} {$User.$address.lastname}<br />
+                            {$User.$address.street}<br />
+                        {/block}
+                        {block name="document_index_address_additionalAddressLines"}
+                            {if {config name=showAdditionAddressLine1}}
+                                {$User.$address.additional_address_line1}<br />
+                            {/if}
+                            {if {config name=showAdditionAddressLine2}}
+                                {$User.$address.additional_address_line2}<br />
+                            {/if}
+                        {/block}
+                        {block name="document_index_address_cityZip"}
+                            {if {config name=showZipBeforeCity}}
+                                {$User.$address.zipcode} {$User.$address.city}<br />
+                            {else}
+                                {$User.$address.city} {$User.$address.zipcode}<br />
+                            {/if}
+                        {/block}
+                        {block name="document_index_address_countryData"}
+                            {if $User.$address.state.shortcode}{$User.$address.state.shortcode} - {/if}{$User.$address.country.countryen}<br />
+                        {/block}
+                    {/block}
+                </div>
+            {/if}
+            </div>
+        {/block}
+        {block name="document_index_head_right_wrapper"}
+            <div id="head_right">
+                    <strong>
+                    {block name="document_index_head_right"}
+                        {$Containers.Header_Box_Right.value}
+                        {s name="DocumentIndexCustomerID"}{/s} {$User.billing.customernumber|string_format:"%06d"}<br />
+                        {if $User.billing.ustid}
+                        {s name="DocumentIndexUstID"}{/s} {$User.billing.ustid|replace:" ":""|replace:"-":""}<br />
+                        {/if}
+                        {s name="DocumentIndexOrderID"}{/s} {$Order._order.ordernumber}<br />
+                        {s name="DocumentIndexDate"}{/s} {$Document.date}<br />
+                        {if $Document.deliveryDate}{s name="DocumentIndexDeliveryDate"}{/s} {$Document.deliveryDate}<br />{/if}
+                    {/block}
+                    </strong>
+            </div>
+        {/block}
+    </div>
+
+    {block name="document_index_head_bottom_wrapper"}
+        <div id="head_bottom" style="clear:both">
+            {block name="document_index_head_bottom"}
+                <h1>{s name="DocumentIndexInvoiceNumber"}Rechnung Nr. {$Document.id}{/s}</h1>
+                {s name="DocumentIndexPageCounter"}Seite {$page+1} von {$Pages|@count}{/s}
+             {/block}
+        </div>
+    {/block}
+
+    <div id="content">
+        {block name="document_index_table_header"}
+            <table cellpadding="0" cellspacing="0" width="100%">
+            <tbody valign="top">
+            <tr>
+                {block name="document_index_table_head_pos"}
+                    <td align="left" width="5%" class="head">
+                        <strong>{s name="DocumentIndexHeadPosition"}{/s}</strong>
+                    </td>
+                {/block}
+                {block name="document_index_table_head_nr"}
+                    <td align="left" width="10%" class="head">
+                        <strong>{s name="DocumentIndexHeadArticleID"}{/s}</strong>
+                    </td>
+                {/block}
+                {block name="document_index_table_head_name"}
+                    <td align="left" width="48%" class="head">
+                        <strong>{s name="DocumentIndexHeadName"}{/s}</strong>
+                    </td>
+                {/block}
+                {block name="document_index_table_head_quantity"}
+                    <td align="right" width="5%" class="head">
+                        <strong>{s name="DocumentIndexHeadQuantity"}{/s}</strong>
+                    </td>
+                {/block}
+                {block name="document_index_table_head_tax"}
+                    {if $Document.netto != true}
+                        <td align="right" width="6%" class="head">
+                            <strong>{s name="DocumentIndexHeadTax"}{/s}</strong>
+                        </td>
+                    {/if}
+                {/block}
+                {block name="document_index_table_head_price"}
+                    {if $Document.netto != true && $Document.nettoPositions != true}
+                        <td align="right" width="10%" class="head">
+                            <strong>{s name="DocumentIndexHeadPrice"}{/s}</strong>
+                        </td>
+                        <td align="right" width="12%" class="head">
+                            <strong>{s name="DocumentIndexHeadAmount"}{/s}</strong>
+                        </td>
+                    {else}
+                         <td align="right" width="10%" class="head">
+                            <strong>{s name="DocumentIndexHeadNet"}{/s}</strong>
+                         </td>
+                         <td align="right" width="12%" class="head">
+                            <strong>{s name="DocumentIndexHeadNetAmount"}{/s}</strong>
+                         </td>
+                    {/if}
+                {/block}
+            </tr>
+        {/block}
+    {foreach from=$positions item=position key=number}
+    {block name="document_index_table_each"}
+    <tr>
+        {block name="document_index_table_pos"}
+            <td align="left" width="5%" valign="top">
+                {$number+1}
+            </td>
+        {/block}
+        {block name="document_index_table_nr"}
+            <td align="left" width="10%" valign="top">
+                {$position.articleordernumber|truncate:14:""}
+            </td>
+        {/block}
+        {block name="document_index_table_name"}
+            <td align="left" width="48%" valign="top">
+            {if $position.name == 'Versandkosten'}
+                {s name="DocumentIndexPositionNameShippingCosts"}{$position.name}{/s}
+            {else}
+                {s name="DocumentIndexPositionNameDefault"}{$position.name|nl2br|wordwrap:65:"<br />\n"}{/s}
+            {/if}
+            </td>
+        {/block}
+        {block name="document_index_table_quantity"}
+            <td align="right" width="5%" valign="top">
+                {$position.quantity}
+            </td>
+        {/block}
+        {block name="document_index_table_tax"}
+            {if $Document.netto != true}
+                <td align="right" width="6%" valign="top">
+                    {$position.tax} %
+                </td>
+            {/if}
+        {/block}
+        {block name="document_index_table_price"}
+            {if $Document.netto != true && $Document.nettoPositions != true}
+                <td align="right" width="10%" valign="top">
+                    {$position.price|currency}
+                </td>
+                <td align="right" width="12%" valign="top">
+                    {$position.amount|currency}
+                </td>
+            {else}
+                <td align="right" width="10%" valign="top">
+                    {$position.netto|currency}
+                </td>
+                <td align="right" width="12%" valign="top">
+                    {$position.amount_netto|currency}
+                </td>
+            {/if}
+        {/block}
+    </tr>
+    {/block}
+    {/foreach}
+    </tbody>
+    </table>
+    </div>
+
+    {if $smarty.foreach.pagingLoop.last}
+        {block name="document_index_amount"}
+            <div id="amount">
+              <table width="300px" cellpadding="0" cellspacing="0">
+              <tbody>
+              <tr>
+                <td align="right" width="100px" class="head">{s name="DocumentIndexTotalNet"}{/s}</td>
+                <td align="right" width="200px" class="head">{$Order._amountNetto|currency}</td>
+              </tr>
+              {if $Document.netto == false}
+                  {foreach from=$Order._tax key=key item=tax}
+                  <tr>
+                    <td align="right">{s name="DocumentIndexTax"}zzgl. {$key|tax}{/s}</td>
+                    <td align="right">{$tax|currency}</td>
+                  </tr>
+                  {/foreach}
+              {/if}
+              {if $Document.netto == false}
+                  <tr>
+                    <td align="right"><b>{s name="DocumentIndexTotal"}{/s}</b></td>
+                    <td align="right"><b>{$Order._amount|currency}</b></td>
+                  </tr>
+              {else}
+                  <tr>
+                    <td align="right"><b>{s name="DocumentIndexTotal"}{/s}</b></td>
+                    <td align="right"><b>{$Order._amountNetto|currency}</b></td>
+                  </tr>
+              {/if}
+              </tbody>
+              </table>
+            </div>
+        {/block}
+        {block name="document_index_info"}
+            <div id="info">
+            {block name="document_index_info_comment"}
+                {if $Document.comment}
+                    <div style="font-size:11px;color:#333;font-weight:bold">
+                        {$Document.comment|replace:"€":"&euro;"}
+                    </div>
+                {/if}
+            {/block}
+            {block name="document_index_info_net"}
+                {if $Document.netto == true}
+                <p>{s name="DocumentIndexAdviceNet"}{/s}</p>
+                {/if}
+                <p>{s name="DocumentIndexSelectedPayment"}{/s} {$Order._payment.description}</p>
+            {/block}
+            {block name="document_index_info_voucher"}
+                {if $Document.voucher}
+                    <div style="font-size:11px;color:#333;">
+                    {s name="DocumentIndexVoucher"}
+                        Für den nächsten Einkauf schenken wir Ihnen einen {$Document.voucher.value} {$Document.voucher.prefix} Gutschein
+                        mit dem Code "{$Document.voucher.code}".<br />
+                    {/s}
+                    </div>
+                {/if}
+            {/block}
+            {block name="document_index_info_ordercomment"}
+                {if $Order._order.customercomment}
+                    <div style="font-size:11px;color:#333;">
+                        {s name="DocumentIndexComment"}{/s}
+                        {$Order._order.customercomment|replace:"€":"&euro;"}
+                    </div>
+                {/if}
+            {/block}
+            {block name="document_index_info_dispatch"}
+                {if $Order._dispatch.name}
+                    <p>
+                        {s name="DocumentIndexSelectedDispatch"}{/s}
+                        {$Order._dispatch.name}
+                    </p>
+                {/if}
+            {/block}
+
+                {$Containers.Content_Info.value}
+            {block name="document_index_info_currency"}
+                {if $Order._currency.factor != 1}{s name="DocumentIndexCurrency"}
+                    <br>Euro Umrechnungsfaktor: {$Order._currency.factor|replace:".":","}
+                    {/s}
+                {/if}
+            {/block}
+            </div>
+        {/block}
+    {/if}
+
+    {block name="document_index_footer"}
+        <div id="footer">
+        {$Containers.Footer.value}
+        </div>
+        {if !$smarty.foreach.pagingLoop.last}
+            <pagebreak />
+        {/if}
+    {/block}
+{/foreach}
+{/block}
+</body>
+</html>

From 732070db0ebccdd05b183d18921792e41684100b Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Thu, 13 Jun 2019 12:11:50 +0200
Subject: [PATCH 21/37] Add files via upload

Added document templates from bare to make documents work.
---
 .../BootstrapBare/documents/index_gs.tpl      |  9 +++
 .../BootstrapBare/documents/index_ls.tpl      | 25 +++++++++
 .../BootstrapBare/documents/index_sr.tpl      | 55 +++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/documents/index_gs.tpl
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/documents/index_ls.tpl
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/documents/index_sr.tpl

diff --git a/Resources/Themes/Frontend/BootstrapBare/documents/index_gs.tpl b/Resources/Themes/Frontend/BootstrapBare/documents/index_gs.tpl
new file mode 100644
index 0000000..6de92f4
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/documents/index_gs.tpl
@@ -0,0 +1,9 @@
+{extends file="documents/index.tpl"}
+{block name="document_index_head_bottom"}
+    <h1>{s name="DocumentIndexCreditNumber"}{/s} {$Document.id}</h1>
+    {s name="DocumentIndexPageCounter"}Seite {$page+1} von {$Pages|@count}{/s}
+{/block}
+{block name="document_index_head_right"}
+    {$smarty.block.parent}
+    {if $Document.bid}{s name="DocumentIndexInvoiceID"}{/s} {$Document.bid}<br />{/if}
+{/block}
diff --git a/Resources/Themes/Frontend/BootstrapBare/documents/index_ls.tpl b/Resources/Themes/Frontend/BootstrapBare/documents/index_ls.tpl
new file mode 100644
index 0000000..67cd530
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/documents/index_ls.tpl
@@ -0,0 +1,25 @@
+{extends file="documents/index.tpl"}
+
+{block name="document_index_table_head_tax"}
+{/block}
+{block name="document_index_table_head_price"}
+{/block}
+{block name="document_index_table_tax"}
+{/block}
+{block name="document_index_table_price"}
+{/block}
+{block name="document_index_amount"}
+{/block}
+
+{block name="document_index_head_bottom"}
+    <h1>{s name="DocumentIndexShippingNumber"}{/s} {$Document.id}</h1>
+    {s name="DocumentIndexPageCounter"}{/s}
+{/block}
+{block name="document_index_selectAdress"}
+    {assign var="address" value="shipping"}
+{/block}
+{block name="document_index_table_each"}{if $position.modus == 0 || $position.modus == 1}{$smarty.block.parent}{/if}{/block}
+{block name="document_index_head_right"}
+    {$smarty.block.parent}
+    {if $Document.bid}{s name="DocumentIndexInvoiceID"}{/s} {$Document.bid}<br />{/if}
+{/block}
diff --git a/Resources/Themes/Frontend/BootstrapBare/documents/index_sr.tpl b/Resources/Themes/Frontend/BootstrapBare/documents/index_sr.tpl
new file mode 100644
index 0000000..d2890ee
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/documents/index_sr.tpl
@@ -0,0 +1,55 @@
+{extends file="documents/index.tpl"}
+
+{block name="document_index_table_price"}
+    {if $Document.netto != true && $Document.nettoPositions != true}
+        <td align="right" width="10%">
+            {($position.price*-1)|currency}
+        </td>
+        <td align="right" width="12%">
+            {($position.amount*-1)|currency}
+        </td>
+    {else}
+        <td align="right" width="10%">
+            {($position.netto*-1)|currency}
+        </td>
+        <td align="right" width="12%">
+            {($position.amount_netto*-1)|currency}
+        </td>
+    {/if}
+{/block}
+{block name="document_index_amount"}
+<div id="amount">
+      <table width="300px" cellpadding="0" cellspacing="0">
+      <tbody>
+      <tr>
+        <td align="right" width="100px" class="head">{s name="DocumentIndexTotalNet"}{/s}</td>
+        <td align="right" width="200px" class="head">-{$Order._amountNetto|currency}</td>
+      </tr>
+      {if $Document.netto == false}
+          {foreach from=$Order._tax key=key item=tax}
+          <tr>
+            <td align="right">{s name="DocumentIndexTax"}{/s}</td>
+            <td align="right">-{$tax|currency}</td>
+          </tr>
+          {/foreach}
+      {/if}
+      {if $Document.netto == false}
+          <tr>
+            <td align="right"><b>{s name="DocumentIndexTotal"}{/s}</b></td>
+            <td align="right"><b>-{$Order._amount|currency}</b></td>
+          </tr>
+      {else}
+          <tr>
+            <td align="right"><b>{s name="DocumentIndexTotal"}{/s}</b></td>
+            <td align="right"><b>-{$Order._amountNetto|currency}</b></td>
+          </tr>
+      {/if}
+      </tbody>
+      </table>
+</div>
+{/block}
+
+{block name="document_index_head_bottom"}
+    <h1>{s name="DocumentIndexCancelationNumber"}{/s}</h1>
+    {s name="DocumentIndexPageCounter"}{/s}
+{/block}
\ No newline at end of file

From 1f6796ab3d58ef710a4dd11888f1eb3723cb598d Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Thu, 11 Jul 2019 09:35:46 +0200
Subject: [PATCH 22/37] Fixed customer type select on registration: {if {config
 name=showCompanySelectField}} vs {if {config name=showCompanySelectField} ==
 0}

---
 .../frontend/register/personal_fieldset.tpl   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
index 0f64b48..fb84d24 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
@@ -16,7 +16,7 @@
                     <input type="hidden" name="register[personal][sValidation]" value="{$form_data.sValidation|escape}"/>
                 {else}
                     <div class="form-group{if isset($error_flags.customer_type)} has-error{/if} register-customertype sw5-plugin">
-                        {if {config name=showCompanySelectField}}
+                        {if {config name=showCompanySelectField} == 0}
                             <label for="register_personal_customer_type" class="{$FormLabelSize} control-label">{s name='RegisterPersonalLabelType'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}</label>
 
                             <div class="{$FormInputSize}">
@@ -25,12 +25,17 @@
                                         class="form-control is-required" 
                                         required="required" aria-required="true">
   
-                                    <option value="private"{if $form_data.customer_type eq "private"} selected="selected"{/if}>
-                                        {s name='RegisterPersonalLabelPrivate'}{/s}
-                                    </option>
-                                    <option value="business"{if $form_data.customer_type eq "business" or $form_data.company or $form_data.sValidation} selected="selected"{/if}>
-                                        {s name='RegisterPersonalLabelBusiness'}{/s}
-                                    </option>
+                                        <option value="" disabled="disabled" {if $form_data.customer_type eq ""} selected="selected"{/if}>
+                                            {s name='RegisterPersonalLabelType'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}
+                                        </option>
+
+                                        <option value="private" {if $form_data.customer_type eq "private" or (!$form_data.company and $sUserLoggedIn)} selected="selected"{/if}>
+                                            {s name='RegisterPersonalLabelPrivate'}{/s}
+                                        </option>
+
+                                        <option value="business"{if $form_data.customer_type eq "business" or $form_data.company or $form_data.sValidation} selected="selected"{/if}>
+                                            {s name='RegisterPersonalLabelBusiness'}{/s}
+                                        </option>
                                 </select>
                             </div>
                         {else}

From b1447f1742cf140501a1f679bfc1e90785c3a248 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Thu, 11 Jul 2019 10:52:27 +0200
Subject: [PATCH 23/37] Added bares default select option the the register
 forms salutation select field, because many customers missed changing this
 field, so all of them where "male".

Hint: In different to bare, we had to remove the disabled attribute from the newly added option, because the javascript which creates the stylable select box, ignores disabled items. Howewer, it works fine due to the empty value attribute.
---
 .../BootstrapBare/frontend/register/personal_fieldset.tpl    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
index fb84d24..82bfaab 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
@@ -63,6 +63,11 @@
                                 class="form-control is-required"
                                 required="required" aria-required="true">
 
+                            <option value=""
+                                    {if $form_data.salutation eq ""} selected="selected"{/if}>
+                                {s name='RegisterPlaceholderSalutation'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}
+                            </option>
+
                             {foreach $salutations as $key => $label}
                                 <option value="{$key}"{if $form_data.salutation eq $key} selected="selected"{/if}>{$label}</option>
                             {/foreach}

From 936fc0b2e4d50b4eabbe5c893d5d9ecb98a56fc3 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Mon, 13 Jan 2020 11:16:56 +0100
Subject: [PATCH 24/37] Added GPDR cookie consent banner scripts from boostrap
 responsive (still needs work "plugin is undefined")

---
 .../Themes/Frontend/BootstrapBare/Theme.php   |   3 +
 .../shopware/jquery.cookie-consent-manager.js | 427 ++++++++++++++++++
 .../js/shopware/jquery.cookie-permission.js   | 170 ++++++-
 .../js/shopware/jquery.invalid-tos-jump.js    |  53 +++
 .../jquery.notification-message-close.js      |  29 ++
 5 files changed, 677 insertions(+), 5 deletions(-)
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.invalid-tos-jump.js
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.notification-message-close.js

diff --git a/Resources/Themes/Frontend/BootstrapBare/Theme.php b/Resources/Themes/Frontend/BootstrapBare/Theme.php
index 7abfd8d..3a2b06b 100755
--- a/Resources/Themes/Frontend/BootstrapBare/Theme.php
+++ b/Resources/Themes/Frontend/BootstrapBare/Theme.php
@@ -92,6 +92,9 @@ public function __construct()
             "jquery.form-polyfill.js",
             "jquery.pseudo-text.js",
             "jquery.preloader-button.js",
+            "jquery.invalid-tos-jump.js",
+            "jquery.notification-message-close.js",
+            "jquery.cookie-consent-manager.js",
         ];
 
         $sourceJavascripts = [
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
new file mode 100644
index 0000000..2e799e4
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
@@ -0,0 +1,427 @@
+;(function ($, window, undefined) {
+    'use strict';
+
+    $.getCookiePreference = function(cookieName) {
+        var cookie = $.getCookie('cookiePreferences'),
+            activeState = false,
+            groupKeys,
+            cookieKeys,
+            cookiePreferences;
+
+        if (!cookie) {
+            return activeState;
+        }
+
+        cookiePreferences = JSON.parse(cookie);
+        groupKeys = Object.keys(cookiePreferences.groups);
+
+        $.each(groupKeys, function (groupIndex, groupKey) {
+            if (!cookiePreferences.groups.hasOwnProperty(groupKey)) {
+                return;
+            }
+
+            cookieKeys = Object.keys(cookiePreferences.groups[groupKey].cookies);
+
+            $.each(cookieKeys, function (cookieIndex, cookieKey) {
+                if (!cookiePreferences.groups[groupKey].cookies.hasOwnProperty(cookieKey)) {
+                    return;
+                }
+
+                if (cookieKey !== cookieName) {
+                    return;
+                }
+
+                activeState = cookiePreferences.groups[groupKey].cookies[cookieKey].active;
+            });
+        });
+
+        return activeState;
+    };
+
+    $.plugin('swCookieConsentManager', {
+
+        defaults: {
+            /**
+             * Class which will be applied when opening the cookie consent manager.
+             *
+             * @property openClass
+             * @type {String}
+             */
+            openClass: 'is--open',
+
+            /**
+             * Selector of the element that should be clicked to close the consent manager modal.
+             *
+             * @property closeModalSelector
+             * @type {String}
+             */
+            closeModalSelector: '.cookie-consent--close',
+
+            /**
+             * Selector of the element that wraps around each group.
+             *
+             * @property cookieGroupSelector
+             * @type {String}
+             */
+            cookieGroupSelector: '.cookie-consent--group',
+
+            /**
+             * Selector of the hidden input element that contains the group's name.
+             *
+             * @property cookieGroupNameSelector
+             * @type {String}
+             */
+            cookieGroupNameSelector: '.cookie-consent--group-name',
+
+            /**
+             * Selector of the input element which contains the 'active' state of the cookie group.
+             *
+             * @property cookieGroupToggleInputSelector
+             * @type {String}
+             */
+            cookieGroupToggleInputSelector: '.cookie-consent--group-state-input',
+
+            /**
+             * Selector of the element which contains the cookies assigned to a group.
+             *
+             * @property cookieContainerSelector
+             * @type {String}
+             */
+            cookieContainerSelector: '.cookie-consent--cookie',
+
+            /**
+             * Selector of the hidden input element which contains the name of a cookie.
+             *
+             * @property cookieNameSelector
+             * @type {String}
+             */
+            cookieNameSelector: '.cookie-consent--cookie-name',
+
+            /**
+             * Selector of the input element which contains the 'active' state of the cookie.
+             *
+             * @property cookieActiveInputSelector
+             * @type {String}
+             */
+            cookieActiveInputSelector: '.cookie-consent--cookie-state-input',
+
+            /**
+             * Selector of the label element for the active input.
+             *
+             * @property cookieActiveInputLabelSelector
+             * @type {String}
+             */
+            cookieActiveInputLabelSelector: '.cookie-consent--cookie-state',
+
+            /**
+             * Selector of the button which should save the configured preferences.
+             *
+             * @property saveButtonSelector
+             * @type {String}
+             */
+            saveButtonSelector: '.cookie-consent--save-button',
+
+            /**
+             * Selector of the buttons to open the cookie consent manager.
+             *
+             * @property openConsentManagerButton
+             * @type {string}
+             */
+            openConsentManagerButton: '*[data-openConsentManager=true]',
+
+            /**
+             * Selector of the element which can be clicked as well to toggle a cookies state.
+             *
+             * @property cookieLabelSelector
+             * @type {string}
+             */
+            cookieLabelSelector: '.cookie--label',
+
+            /**
+             * The class which marks a group as "required".
+             *
+             * @property requiredClass
+             * @type {string}
+             */
+            requiredClass: 'cookie-consent--required'
+        },
+
+        /**
+         * Contains the selected cookie preferences.
+         *
+         * @property preferences
+         * @type {Object}
+         */
+        preferences: null,
+
+        /**
+         * Contains if the cookie consent manager is already open.
+         *
+         * @property isOpened
+         * @type {Boolean}
+         */
+        isOpened: false,
+
+        /**
+         * Contains the name for preference cookie.
+         *
+         * @property preferenceCookieName
+         * @type {String}
+         */
+        preferenceCookieName: 'cookiePreferences',
+
+        /**
+         * Contains the cookie permission jQuery plugin.
+         *
+         * @property cookiePermissionPlugin
+         * @type {Object}
+         */
+        cookiePermissionPlugin: null,
+
+        init: function () {
+            this.applyDataAttributes();
+
+            this.registerEvents();
+            this.cookiePermissionPlugin = $('*[data-cookie-permission="true"]').data('plugin_swCookiePermission');
+        },
+
+        registerEvents: function () {
+            this.$el.find(this.opts.closeModalSelector).on('click', $.proxy(this.onCloseClicked, this));
+            this.$el.find(this.opts.cookieGroupToggleInputSelector).on('change', $.proxy(this.onGroupToggleChanged, this));
+            this.$el.find(this.opts.cookieActiveInputSelector).on('change', $.proxy(this.onCookieToggleChanged, this));
+            this.$el.find(this.opts.saveButtonSelector).on('click', $.proxy(this.onSave, this));
+            this.$el.find(this.opts.cookieLabelSelector).on('click', $.proxy(this.onClickCookieName, this));
+
+            this._on(this.opts.openConsentManagerButton, 'click', $.proxy(this.openConsentManager, this));
+        },
+
+        assignCookieData: function () {
+            if (!this.hasSetPreferences()) {
+                return;
+            }
+
+            this.preferences = JSON.parse($.getCookie(this.preferenceCookieName));
+            this.parsePreferences();
+        },
+
+        parsePreferences: function () {
+            var me = this,
+                groupNames = Object.keys(me.preferences['groups']),
+                group,
+                groupRequired,
+                cookieNames,
+                cookie;
+
+            $.each(groupNames, function (groupIndex, groupName) {
+                group = me.findGroupByName(groupName);
+                groupRequired = group.find(me.opts.cookieActiveInputLabelSelector).hasClass(me.opts.requiredClass);
+                me.toggleGroup(group, groupRequired || me.preferences['groups'][groupName].active);
+
+                cookieNames = Object.keys(me.preferences['groups'][groupName].cookies);
+
+                $.each(cookieNames, function (cookieIndex, cookieName) {
+                    cookie = me.findCookieByName(cookieName);
+                    me.toggleCookie(cookie, groupRequired || me.preferences['groups'][groupName].cookies[cookieName].active);
+
+                    me.checkActiveStateForAllCookiesOfGroup(group, groupRequired || me.preferences['groups'][groupName].cookies[cookieName].active);
+                });
+            });
+        },
+
+        findGroupByName: function (groupName) {
+            return $(this.opts.cookieGroupNameSelector + '[value=' + groupName + ']').parent();
+        },
+
+        findCookieByName: function (cookieName) {
+            return $(this.opts.cookieNameSelector + '[value=' + cookieName + ']').parent();
+        },
+
+        hasSetPreferences: function () {
+            return $.getCookie(this.preferenceCookieName) !== undefined;
+        },
+
+        openConsentManager: function () {
+            this.open();
+
+            if (window.cookieRemoval !== 2) {
+                this.cookiePermissionPlugin.hideElement();
+            }
+        },
+
+        buildCookiePreferences: function (allTrue) {
+            var opts = this.opts,
+                cookieGroups = this.$el.find(this.opts.cookieGroupSelector),
+                preferences = { 'groups': {}},
+                date = new Date(),
+                uniqueNames = [];
+
+            allTrue = allTrue || false;
+
+            cookieGroups.each(function (index, cookieGroup) {
+                var groupName = $(cookieGroup).find(opts.cookieGroupNameSelector).val(),
+                    isActive = allTrue ? allTrue : $(cookieGroup).find(opts.cookieGroupToggleInputSelector).is(':checked'),
+                    cookies = $(cookieGroup).find(opts.cookieContainerSelector);
+
+                uniqueNames.push(groupName);
+
+                if (!preferences['groups'].hasOwnProperty(groupName)) {
+                    preferences['groups'][groupName] = {
+                        name: groupName,
+                        cookies: {}
+                    };
+                }
+
+                preferences['groups'][groupName].active = isActive;
+
+                cookies.each(function (cookieIndex, cookie) {
+                    var cookieName = $(cookie).find(opts.cookieNameSelector).val(),
+                        isCookieActive = allTrue ? allTrue : $(cookie).find(opts.cookieActiveInputSelector).is(':checked');
+
+                    uniqueNames.push(cookieName);
+
+                    if (!preferences['groups'][groupName].cookies.hasOwnProperty(cookieName)) {
+                        preferences['groups'][groupName].cookies[cookieName] = {
+                            name: cookieName
+                        };
+                    }
+
+                    preferences['groups'][groupName].cookies[cookieName].active = isCookieActive;
+                });
+            });
+
+            uniqueNames.sort();
+            preferences.hash = window.btoa(JSON.stringify(uniqueNames));
+
+            date.setTime(date.getTime() + (180 * 24 * 60 * 60 * 1000));
+            document.cookie = this.preferenceCookieName + '=' + JSON.stringify(preferences) + ';path=' + this.getBasePath() +';expires=' + date.toGMTString() + ';';
+
+            $.publish('plugin/swCookieConsentManager/onBuildCookiePreferences', [ this, preferences ]);
+        },
+
+        onClickCookieName: function (event) {
+            var cookieNameEl = $(event.currentTarget),
+                cookieCt = cookieNameEl.parent(this.opts.cookieContainerSelector),
+                inputEl = cookieCt.find(this.opts.cookieActiveInputSelector);
+
+            inputEl.click();
+        },
+
+        toggleAllCookiesFromGroup: function (cookies, active) {
+            var me = this;
+
+            cookies.each(function (cookieIndex, cookie) {
+                me.toggleCookie($(cookie), active);
+            });
+        },
+
+        checkActiveStateForAllCookiesOfGroup: function (group, cookieActiveStatus) {
+            var opts = this.opts,
+                cookies = group.find(this.opts.cookieContainerSelector),
+                allOfSame = true,
+                groupInput = group.find(this.opts.cookieGroupToggleInputSelector),
+                cookieInput;
+
+            cookies.each(function (cookieIndex, cookie) {
+                cookie = $(cookie);
+                cookieInput = cookie.find(opts.cookieActiveInputSelector);
+
+                if (cookieInput.is(':checked') !== cookieActiveStatus) {
+                    allOfSame = false;
+                }
+            });
+
+            if (allOfSame) {
+                groupInput.prop('indeterminate', false);
+                this.toggleGroup(group, cookieActiveStatus);
+            } else {
+                groupInput.prop('indeterminate', true);
+            }
+        },
+
+        toggleGroup: function (group, activeStatus) {
+            group.find(this.opts.cookieGroupToggleInputSelector).prop('checked', activeStatus);
+        },
+
+        toggleCookie: function (cookie, activeStatus) {
+            cookie.find(this.opts.cookieActiveInputSelector).prop('checked', activeStatus);
+        },
+
+        onSave: function () {
+            this.buildCookiePreferences();
+            this.close();
+            this.removeDeclinedAndAcceptedCookie();
+            $.overlay.close();
+
+            $.publish('plugin/swCookieConsentManager/onSave', [ this ]);
+        },
+
+        onGroupToggleChanged: function (event) {
+            var opts = this.opts,
+                groupToggle =  $(event.currentTarget),
+                group = groupToggle.parents(opts.cookieGroupSelector),
+                cookies = group.find(opts.cookieContainerSelector);
+
+            this.toggleAllCookiesFromGroup(cookies, groupToggle.is(':checked'));
+
+            $.publish('plugin/swCookieConsentManager/onGroupToggleChanged', [ this, groupToggle ]);
+        },
+
+        onCookieToggleChanged: function (event) {
+            var opts = this.opts,
+                cookieToggle = $(event.currentTarget),
+                cookie = cookieToggle.parents(opts.cookieContainerSelector),
+                group = cookie.parents(opts.cookieGroupSelector);
+
+            this.checkActiveStateForAllCookiesOfGroup(group, cookieToggle.is(':checked'));
+
+            $.publish('plugin/swCookieConsentManager/onCookieToggleChanged', [ this, cookieToggle ]);
+        },
+
+        onCloseClicked: function () {
+            $.overlay.close();
+            this.close();
+        },
+
+        open: function () {
+            if (this.isOpened) {
+                return;
+            }
+
+            this.assignCookieData();
+
+            this.$el.show();
+            this.$el.addClass(this.opts.openClass);
+
+            this.isOpened = true;
+
+            $.overlay.open({
+                onClose: $.proxy(this.close, this)
+            });
+        },
+
+        close: function () {
+            if (!this.isOpened) {
+                return;
+            }
+
+            this.$el.removeClass(this.opts.openClass);
+            this.isOpened = false;
+        },
+
+        removeDeclinedAndAcceptedCookie: function () {
+            $.removeCookie('cookieDeclined');
+            $.removeCookie('allowCookie');
+
+            window.localStorage.removeItem(this.cookiePermissionPlugin.storageKey);
+        },
+
+        getBasePath: function () {
+            return window.csrfConfig.basePath || '/';
+        }
+    });
+})(jQuery, window);
+
+function openCookieConsentManager () {
+    var plugin = $('*[data-cookie-consent-manager="true"]').data('plugin_swCookieConsentManager');
+    plugin.openConsentManager();
+}
\ No newline at end of file
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
index 68a079b..6983639 100644
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
@@ -31,6 +31,30 @@
              */
             acceptButtonSelector: '.cookie-permission--accept-button',
 
+            /**
+             * Selector of the decline button to select the button and register events on it.
+             *
+             * @property declineButtonSelector
+             * @type {string}
+             */
+            declineButtonSelector: '.cookie-permission--decline-button',
+
+            /**
+             * Selector of the cookie consent manager.
+             *
+             * @property cookieConsentManagerSelector
+             * @type {string}
+             */
+            cookieConsentManagerSelector: '#cookie-consent',
+
+            /**
+             * Selector of the close button to select the button and register events on it.
+             *
+             * @property declineButtonSelector
+             * @type {string}
+             */
+            closeButtonSelector: '.cookie-permission--close-button',
+
             /**
              * Selector of the privacy statement link "More information" to select and prepare the href property.
              *
@@ -39,6 +63,24 @@
              */
             privacyLinkSelector: '.cookie-permission--privacy-link',
 
+            /**
+             * Selector of the hidden input element that contains a cookie group's name.
+             * Will be used to check if the cookie preferences are up to date by checking against a hash.
+             *
+             * @property cookieGroupNameSelector
+             * @type {String}
+             */
+            cookieGroupNameSelector: '.cookie-consent--group-name',
+
+            /**
+             * Selector of the hidden input element which contains the name of a cookie.
+             * Will be used to check if the cookie preferences are up to date by checking against a hash.
+             *
+             * @property cookieNameSelector
+             * @type {String}
+             */
+            cookieNameSelector: '.cookie-consent--cookie-name',
+
             /**
              * The current shopId for create the storageKey
              *
@@ -53,7 +95,12 @@
              * @property host
              * @type {string}
              */
-            urlPrefix: ''
+            urlPrefix: '',
+
+            /**
+             * Modal title
+             */
+            title: ''
         },
 
         /**
@@ -113,7 +160,13 @@
          * @return {void}
          */
         update: function() {
-            this.setPermissionHeight();
+            var me = this;
+
+            this.displayCookiePermission(function(display) {
+                if (display) {
+                    me.setPermissionHeight();
+                }
+            });
         },
 
         /**
@@ -125,6 +178,7 @@
         createProperties: function() {
             this.$privacyLink = this.$el.find(this.opts.privacyLinkSelector);
             this.$acceptButton = this.$el.find(this.opts.acceptButtonSelector);
+            this.$declineButton = this.$el.find(this.opts.declineButtonSelector);
             this.storageKey = this.createStorageKey();
             this.storage = window.StorageManager.getLocalStorage();
         },
@@ -167,6 +221,7 @@
          */
         registerEvents: function() {
             this._on(this.$acceptButton, 'click', $.proxy(this.onAcceptButtonClick, this));
+            this._on(this.$declineButton, 'click', $.proxy(this.onDeclineButtonClick, this));
         },
 
         /**
@@ -175,9 +230,52 @@
          * @param {function} callback
          */
         displayCookiePermission: function(callback) {
+            if (window.cookieRemoval === 1) {
+                if ($.getCookie('cookieDeclined')) {
+                    callback(false);
+                    return;
+                }
+
+                if ($.getCookie('cookiePreferences') && !this.hasPreferencesHashChanged()) {
+                    callback(false);
+                    return;
+                }
+            }
+
+            if ((window.cookieRemoval === 2 && document.cookie.indexOf('allowCookie') !== -1)) {
+                callback(false);
+                return;
+            }
+
             callback(!this.storage.getItem(this.storageKey));
         },
 
+        /**
+         * Checks if the hash for the preferences has changed. This happened e.g. when a new cookie
+         * was registered by a plugin.
+         *
+         * @returns { boolean }
+         */
+        hasPreferencesHashChanged: function () {
+            var preferences = JSON.parse($.getCookie('cookiePreferences')),
+                currentHash = preferences.hash,
+                uniqueNames = [],
+                newHash;
+
+            $(this.opts.cookieGroupNameSelector).each(function (key, group) {
+                uniqueNames.push($(group).val());
+            });
+
+            $(this.opts.cookieNameSelector).each(function (key, cookie) {
+                uniqueNames.push($(cookie).val());
+            });
+
+            uniqueNames.sort();
+            newHash = window.btoa(JSON.stringify(uniqueNames));
+
+            return newHash !== currentHash;
+        },
+
         /**
          * Creates the storageKey from the prefix and the shopId like the following example:
          *
@@ -206,7 +304,51 @@
         onAcceptButtonClick: function(event) {
             event.preventDefault();
 
-            this.storage.setItem(this.storageKey, 'true');
+            try {
+                window.localStorage.setItem(this.storageKey, 'true');
+            } catch (err) {}
+
+            var d = new Date();
+            d.setTime(d.getTime() + (180 * 24 * 60 * 60 * 1000));
+
+            document.cookie = 'allowCookie=1; path=' + this.getBasePath() + ';expires=' + d.toGMTString() + ';';
+
+            this.hideElement();
+            this.applyActiveToPreferences();
+            
+            $.publish('plugin/swCookiePermission/onAcceptButtonClick', [this, event]);
+        },
+
+        applyActiveToPreferences: function () {
+            var cookieConsentPlugin = $(this.opts.cookieConsentManagerSelector).data('plugin_swCookieConsentManager');
+            cookieConsentPlugin.buildCookiePreferences(true);
+        },
+
+        /**
+         * Event handler for the declineButton click.
+         *
+         * @public
+         * @method onDeclineButtonClick
+         */
+        onDeclineButtonClick: function(event) {
+            event.preventDefault();
+
+            document.cookie = 'cookieDeclined=1; path=' + this.getBasePath() + ';';
+
+            this.hideElement();
+            
+            $.publish('plugin/swCookiePermission/onDeclineButtonClick', [this, event]);
+        },
+
+        /**
+         * Event handler for the closeButton click.
+         *
+         * @public
+         * @method onCloseButtonClick
+         */
+        onCloseButtonClick: function(event) {
+            event.preventDefault();
+
             this.hideElement();
         },
 
@@ -217,8 +359,21 @@
          * @method showElement
          */
         showElement: function() {
-            this.$el.removeClass(this.opts.isHiddenClass);
-            this.setPermissionHeight();
+            if (window.cookieRemoval === 2) {
+                $.modal.open(this.$el.html(), {
+                    title: this.opts.title,
+                    sizing: 'content',
+                    width: 500
+                });
+
+                this.$acceptButton = $(this.opts.acceptButtonSelector);
+                this.$closeButton = $(this.opts.closeButtonSelector);
+                this._on(this.$acceptButton, 'click', $.proxy(this.onAcceptButtonClick, this));
+                this._on(this.$closeButton, 'click', $.proxy(this.onCloseButtonClick, this));
+            } else {
+                this.$el.removeClass(this.opts.isHiddenClass);
+                this.setPermissionHeight();
+            }
         },
 
         /**
@@ -230,6 +385,11 @@
         hideElement: function() {
             this.$el.addClass(this.opts.isHiddenClass);
             $body.css('padding-bottom', 0);
+            $.modal.close();
+        },
+
+        getBasePath: function () {
+            return window.csrfConfig.basePath || '/';
         }
     });
 }(jQuery, window));
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.invalid-tos-jump.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.invalid-tos-jump.js
new file mode 100644
index 0000000..5603192
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.invalid-tos-jump.js
@@ -0,0 +1,53 @@
+;(function($, window) {
+    'use strict';
+
+    /**
+     * Invalid ToS Jump plugin
+     *
+     * Triggers the has--error class for the sAGB checkbox (ToS-Checkbox) and scrolls up to display its unchecked state.
+     * Especially made for iOS-Devices due to missing hints if AGB/TOS hasn't been checked
+     *
+     * @example The example shows the basic usage:
+     *
+     * ```
+     * <form>
+     *    <input type="checkbox" required="required" id="sAGB" data-invalid-agb-jump="true">
+     * </form>
+     * ```
+     */
+    $.plugin('swInvalidTosJump', {
+
+        /**
+         * Default settings for the plugin
+         * @type {Object}
+         */
+        defaults: {
+            /**
+             * Selector, which is associated to the jumpElement to toggle an visual indicator / error-class
+             */
+            jumpLabelSelector: 'label[for="sAGB"]',
+
+            /**
+             * Class to add on invalid
+             */
+            errorClass: 'has--error'
+        },
+
+        /**
+         * Initializes the plugin and sets up the necessary event listeners.
+         */
+        init: function () {
+            var me = this;
+            me.$jumpLabel = $(me.opts.jumpLabelSelector);
+
+            me._on(me.$el, 'invalid', $.proxy(me.jumpToInvalid, me));
+        },
+
+        jumpToInvalid: function () {
+            var me = this;
+
+            window.scroll(0, me.$el.offset().top - (window.innerHeight/2));
+            me.$jumpLabel.addClass(me.opts.errorClass);
+        }
+    });
+})(jQuery, window);
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.notification-message-close.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.notification-message-close.js
new file mode 100644
index 0000000..ef0d0ec
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.notification-message-close.js
@@ -0,0 +1,29 @@
+$.plugin('swNotificationMessageClose', {
+
+    defaults: {
+        /**
+         * @var selector for notification
+         */
+        notificationSelector: '.alert',
+
+        /**
+         * @var called url when x is pressed
+         */
+        link: ''
+    },
+
+    init: function () {
+        this.applyDataAttributes();
+
+        this.$alert = this.$el.closest(this.opts.notificationSelector);
+
+        this._on(this.$el, 'click', $.proxy(this.closeMessage, this));
+    },
+
+    closeMessage: function (event) {
+        event.preventDefault();
+
+        $.post(this.opts.link);
+        this.$alert.fadeOut();
+    }
+});

From 07c2e14c3b497cfafb3b344b2c82565348479ca5 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Mon, 13 Jan 2020 11:31:42 +0100
Subject: [PATCH 25/37] Added GDPR cookie scripts to plugin initialization
 (still errors with "plugin is undefined" - also in the shopware demo
 https://www.shopwaredemo.de)

---
 .../frontend/_public/src/js/swbt._init.js     | 380 +++++++++---------
 1 file changed, 193 insertions(+), 187 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt._init.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt._init.js
index 476cd44..3093ec3 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt._init.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt._init.js
@@ -1,215 +1,221 @@
 (function($, window) {
 
-    // calculate and set breakpoints: 1rem = 16px
-    window.StateManager.init([
-        {
-            state:  'xs', // xs
-            enter:  0,
-            exit:   swfDefaultBreakpointXS / 16         // 479px
-        },
-        {
-            state:  's',  // sm
-            enter:  (swfDefaultBreakpointXS + 1) / 16,  // 480px
-            exit:   swfDefaultBreakpointSM / 16         // 767px
-        },
-        {
-            state:  'm',  // hd
-            enter:  (swfDefaultBreakpointSM + 1) / 16,  // 768px
-            exit:   swfDefaultBreakpointHD / 16         // 1023px
-        },
-        {
-            state:  'l',  // md
-            enter:  (swfDefaultBreakpointHD + 1) / 16,  // 1024px
-            exit:   swfDefaultBreakpointMD / 16         // 1259px
-        },
-        {
-            state:  'xl', // lg
-            enter:  (swfDefaultBreakpointMD + 1) / 16,  // 1260px
-            exit:   (5160 / 16)
-        }
-    ]);
-
-    window.StateManager.registerListener([{
-        state: '*',
-        enter: function() {
-            if ($('body').hasClass('ctl_detail'))
-                $('#similar').find('[data-equalheight="true"]').equalHeight();
-        }
-    }]);
-
-    // register move helper
-    window.StateManager.registerListener([{
-        state: '*',
-        enter: function() {
-            applyMoveHelper();
-        }
-    }]);
-
-    // Shopware plugin-base
-    window.StateManager
-        // Menu 
-        .addPlugin('[data-main-nav="true"]', 'mainNavigation')
-
-        .addPlugin('#navToggle', 'swOffcanvasMenu', ['xs', 's'])
-
-        // Product compare menu
-        .addPlugin('*[data-product-compare-menu="true"]', 'swProductCompareMenu', {
-            fullwidthat: 8
-        }, ['xl'])
-        .addPlugin('*[data-product-compare-menu="true"]', 'swProductCompareMenu', {
-            fullwidthat: 6
-        }, ['l'])
-        .addPlugin('*[data-product-compare-menu="true"]', 'swProductCompareMenu', {
-            fullwidthat: 4
-        }, ['m'])
-
-        // Offcanvas tabs detail
-        .addPlugin('.off-canvas-tabs [data-offcanvas="true"]', 'swOffcanvasMenu', (typeof swfDetailOffcanvasViewports != 'undefined' ? swfDetailOffcanvasViewports : ['xs']))
-        
-        // Offcanvas ajax cart 
-        .addPlugin('[data-ajax-cart="true"][data-offcanvas="true"]', 'swOffcanvasMenu', (typeof swfAjaxCartOffcanvasViewports != 'undefined' ? swfAjaxCartOffcanvasViewports : ['xs', 's']))
-        
-        // Offcanvas blog
-        .addPlugin('.off-canvas-blog [data-offcanvas="true"]', 'swOffcanvasMenu', (typeof swfBlogOffcanvasViewports != 'undefined' ? swfBlogOffcanvasViewports : ['xs', 's']))
-
-        // Offcanvas account
-        .addPlugin('.off-canvas-account [data-offcanvas="true"]', 'swOffcanvasMenu', (typeof swfAccountOffcanvasViewports != 'undefined' ? swfAccountOffcanvasViewports : ['xs', 's']))
-
-        // Ajax cart popover
-        .addPlugin('[data-ajax-cart="true"]', 'popoverWrapper', (typeof swfAjaxCartPopoverViewports != 'undefined' ? swfAjaxCartPopoverViewports : ['m', 'l', 'xl']))
-
-        // Default popover
-        .addPlugin('[data-toggle="popover"]', 'popoverWrapper')
-        
-        // Product navigation on detail
-        .addPlugin('body', 'swAjaxProductNavigation')
-
-        // Captcha
-        .addPlugin('div.captcha-placeholder[data-src]', 'swCaptcha')
-
-        // Tabs on detail
-        .addPlugin('.ctl_detail', 'detailTabs')
-
-        // Last seen products
-        .addPlugin('*[data-last-seen-products="true"]', 'swLastSeenProducts', $.extend({}, lastSeenProductsConfig))
-
-        // Register
-        .addPlugin('div[data-register="true"]', 'swRegister')
-
-        // Emotion world
-        .addPlugin('.emotion-wrapper', 'swEmotionLoader')
-
-        // Add article modal
-        .addPlugin('*[data-add-article="true"]', 'swAddArticle')
-
-        // Add product to compare
-        .addPlugin('*[data-compare-ajax="true"]', 'swProductCompareAdd')
-
-        // Listing
-        .addPlugin('*[data-listing-actions="true"]', 'swListingActions')
-
-        // Ajax wishlist
-        .addPlugin('*[data-ajax-wishlist="true"]', 'swAjaxWishlist')
-
-        // Ajax cart
-        .addPlugin('[data-ajax-cart="true"]', 'ajaxCart')
-
-        // Image zoom
-        .addPlugin('*[data-image-zoom="true"]', 'imageZoom')
-
-        // Auto submit
-        .addPlugin('form *[data-auto-submit="true"]', 'swAutoSubmit')
-
-        // Newsletter form
-        .addPlugin('*[data-newsletter="true"]', 'newsletterForm')
+    // GPDR Cookie consent banner
+    console.log('added gdpr inits');
+
+// calculate and set breakpoints: 1rem = 16px
+window.StateManager.init([
+    {
+        state:  'xs', // xs
+        enter:  0,
+        exit:   swfDefaultBreakpointXS / 16         // 479px
+    },
+    {
+        state:  's',  // sm
+        enter:  (swfDefaultBreakpointXS + 1) / 16,  // 480px
+        exit:   swfDefaultBreakpointSM / 16         // 767px
+    },
+    {
+        state:  'm',  // hd
+        enter:  (swfDefaultBreakpointSM + 1) / 16,  // 768px
+        exit:   swfDefaultBreakpointHD / 16         // 1023px
+    },
+    {
+        state:  'l',  // md
+        enter:  (swfDefaultBreakpointHD + 1) / 16,  // 1024px
+        exit:   swfDefaultBreakpointMD / 16         // 1259px
+    },
+    {
+        state:  'xl', // lg
+        enter:  (swfDefaultBreakpointMD + 1) / 16,  // 1260px
+        exit:   (5160 / 16)
+    }
+]);
+
+window.StateManager.registerListener([{
+    state: '*',
+    enter: function() {
+        if ($('body').hasClass('ctl_detail'))
+            $('#similar').find('[data-equalheight="true"]').equalHeight();
+    }
+}]);
+
+// register move helper
+window.StateManager.registerListener([{
+    state: '*',
+    enter: function() {
+        applyMoveHelper();
+    }
+}]);
+
+// Shopware plugin-base
+window.StateManager
+    // Menu
+    .addPlugin('[data-main-nav="true"]', 'mainNavigation')
+
+    .addPlugin('#navToggle', 'swOffcanvasMenu', ['xs', 's'])
+
+    // Product compare menu
+    .addPlugin('*[data-product-compare-menu="true"]', 'swProductCompareMenu', {
+        fullwidthat: 8
+    }, ['xl'])
+    .addPlugin('*[data-product-compare-menu="true"]', 'swProductCompareMenu', {
+        fullwidthat: 6
+    }, ['l'])
+    .addPlugin('*[data-product-compare-menu="true"]', 'swProductCompareMenu', {
+        fullwidthat: 4
+    }, ['m'])
+
+    // Offcanvas tabs detail
+    .addPlugin('.off-canvas-tabs [data-offcanvas="true"]', 'swOffcanvasMenu', (typeof swfDetailOffcanvasViewports != 'undefined' ? swfDetailOffcanvasViewports : ['xs']))
+
+    // Offcanvas ajax cart
+    .addPlugin('[data-ajax-cart="true"][data-offcanvas="true"]', 'swOffcanvasMenu', (typeof swfAjaxCartOffcanvasViewports != 'undefined' ? swfAjaxCartOffcanvasViewports : ['xs', 's']))
+
+    // Offcanvas blog
+    .addPlugin('.off-canvas-blog [data-offcanvas="true"]', 'swOffcanvasMenu', (typeof swfBlogOffcanvasViewports != 'undefined' ? swfBlogOffcanvasViewports : ['xs', 's']))
 
-        // ShippingPayment change after register
-        .addPlugin('*[data-ajax-shipping-payment="true"]', 'swShippingPayment')
+    // Offcanvas account
+    .addPlugin('.off-canvas-account [data-offcanvas="true"]', 'swOffcanvasMenu', (typeof swfAccountOffcanvasViewports != 'undefined' ? swfAccountOffcanvasViewports : ['xs', 's']))
 
-        // Infinite scrolling
-        .addPlugin('*[data-infinite-scrolling="true"]', 'swInfiniteScrolling')
+    // Ajax cart popover
+    .addPlugin('[data-ajax-cart="true"]', 'popoverWrapper', (typeof swfAjaxCartPopoverViewports != 'undefined' ? swfAjaxCartPopoverViewports : ['m', 'l', 'xl']))
+
+    // Default popover
+    .addPlugin('[data-toggle="popover"]', 'popoverWrapper')
+
+    // Product navigation on detail
+    .addPlugin('body', 'swAjaxProductNavigation')
 
-        // Load new variants via ajax
-        .addPlugin('*[data-ajax-variants-container="true"]', 'swAjaxVariant')
+    // Captcha
+    .addPlugin('div.captcha-placeholder[data-src]', 'swCaptcha')
 
-        // Range slider
-        .addPlugin('*[data-range-slider="true"]', 'swRangeSlider')
+    // Tabs on detail
+    .addPlugin('.ctl_detail', 'detailTabs')
 
-        // Address Selection
-        .addPlugin('*[data-address-selection="true"]', 'swAddressSelection')
-        
-        // Address Editor
-        .addPlugin('*[data-address-editor="true"]', 'swAddressEditor')
+    // Last seen products
+    .addPlugin('*[data-last-seen-products="true"]', 'swLastSeenProducts', $.extend({}, lastSeenProductsConfig))
 
-        // allows submit button outside of forms in IE/Edge
-        .addPlugin('input[type="submit"][form], button[form]', 'swFormPolyfill')
+    // Register
+    .addPlugin('div[data-register="true"]', 'swRegister')
 
-        // adds comment text to checkout confirm form 
-        .addPlugin('*[data-pseudo-text="true"]', 'swPseudoText')
+    // Emotion world
+    .addPlugin('.emotion-wrapper', 'swEmotionLoader')
 
-        // prevents multiple clicks on the same button
-        .addPlugin('*[data-preloader-button="true"]', 'swPreloaderButton')
+    // Add article modal
+    .addPlugin('*[data-add-article="true"]', 'swAddArticle')
 
-        // Ajax Search Plugin
-        .addPlugin('[data-ajax-search="true"]', 'ajaxSearch')
+    // Add product to compare
+    .addPlugin('*[data-compare-ajax="true"]', 'swProductCompareAdd')
 
-        // ScrollUp Button
-        .addPlugin('[data-scroll-up="true"]', 'scrollUp', ['xl'])
+    // Listing
+    .addPlugin('*[data-listing-actions="true"]', 'swListingActions')
 
-        // Image Modal / Image Modal Gallery
-        .addPlugin('a[data-toggle="img-modal"], [data-toggle="img-modal"] a', 'imgModal')
+    // Ajax wishlist
+    .addPlugin('*[data-ajax-wishlist="true"]', 'swAjaxWishlist')
 
-        // Ajax Modal
-        .addPlugin('a[data-toggle="ajax-modal"], [data-toggle="ajax-modal"] a', 'ajaxModal')
+    // Ajax cart
+    .addPlugin('[data-ajax-cart="true"]', 'ajaxCart')
 
-        // Notify Modal
-        .addPlugin('.submit-notify-modal', 'notifyModal')
+    // Image zoom
+    .addPlugin('*[data-image-zoom="true"]', 'imageZoom')
 
-        // Cookie Permisson Info
-        .addPlugin('*[data-cookie-permission="true"]', 'swCookiePermission')
+    // Auto submit
+    .addPlugin('form *[data-auto-submit="true"]', 'swAutoSubmit')
 
-        // Filter
-        .addPlugin('*[data-filter-type]', 'swFilterComponent')
+    // Newsletter form
+    .addPlugin('*[data-newsletter="true"]', 'newsletterForm')
 
-        // Sidebar Filter
-        .addPlugin('.sidebar-filter-offcanvas [data-offcanvas="true"]', 'swOffcanvasMenu', ['xs', 's'])
+    // ShippingPayment change after register
+    .addPlugin('*[data-ajax-shipping-payment="true"]', 'swShippingPayment')
 
-    ;   // window.StateManager addPlugin end
+    // Infinite scrolling
+    .addPlugin('*[data-infinite-scrolling="true"]', 'swInfiniteScrolling')
 
-    $(function($) {
-        // don't add over window.StateManager because it causes issues with equalHeight function
-        $('.slick').slickWrapper();
+    // Load new variants via ajax
+    .addPlugin('*[data-ajax-variants-container="true"]', 'swAjaxVariant')
 
-        $('[data-equalheight="true"]:not([data-mode="ajax"]):visible').equalHeight();
+    // Range slider
+    .addPlugin('*[data-range-slider="true"]', 'swRangeSlider')
 
-        $('[data-fixed-navbar="true"]').clingify({breakpoint: swfDefaultBreakpointSM || 767});
+    // Address Selection
+    .addPlugin('*[data-address-selection="true"]', 'swAddressSelection')
 
-        $('body').swSelectboxReplacement();
+    // Address Editor
+    .addPlugin('*[data-address-editor="true"]', 'swAddressEditor')
 
-        if (swfShowHidePwd) {
-            window.StateManager.addPlugin('input[type="password"]', 'passwordInputViewer');
-        }
-        if (swfShowPwdStrength) {
-            window.StateManager.addPlugin('.register-form input[type="password"]', 'passwordStrengthWrapper', $.extend({}, swfShowPwdStrengthConfig));
-        }
+    // allows submit button outside of forms in IE/Edge
+    .addPlugin('input[type="submit"][form], button[form]', 'swFormPolyfill')
 
-        $.subscribe('plugin/swAddArticle/onAddArticle', cartRefresh);
+    // adds comment text to checkout confirm form
+    .addPlugin('*[data-pseudo-text="true"]', 'swPseudoText')
 
-        // Check if cookies are disabled and show notification
-        if (!StorageManager.hasCookiesSupport)
-            createNoCookiesNoticeBox(window.snippets.noCookiesNotice);
+    // prevents multiple clicks on the same button
+    .addPlugin('*[data-preloader-button="true"]', 'swPreloaderButton')
 
-        // Create the no cookies notification message
-        function createNoCookiesNoticeBox(message) {
-            $('<div/>', {
-                'class': 'alert alert-warning no-cookies',
-                'html': message
-            })
-            .append('<i class="fa fa-times mtx pull-right"></i>')
-            .on('click', function() {
-                $(this).closest('.no-cookies').hide();
-            })
-            .appendTo('.page-wrap');
-        }
-    });
+    // Ajax Search Plugin
+    .addPlugin('[data-ajax-search="true"]', 'ajaxSearch')
+
+    // ScrollUp Button
+    .addPlugin('[data-scroll-up="true"]', 'scrollUp', ['xl'])
+
+    // Image Modal / Image Modal Gallery
+    .addPlugin('a[data-toggle="img-modal"], [data-toggle="img-modal"] a', 'imgModal')
+
+    // Ajax Modal
+    .addPlugin('a[data-toggle="ajax-modal"], [data-toggle="ajax-modal"] a', 'ajaxModal')
+
+    // Notify Modal
+    .addPlugin('.submit-notify-modal', 'notifyModal')
+
+    // Cookie Permisson Info
+    .addPlugin('*[data-cookie-permission="true"]', 'swCookiePermission')
+
+    // GDPR Cookie Compliance Banner
+    .addPlugin('*[data-notification-message-close="true"]', 'swNotificationMessageClose')
+    .addPlugin('*[data-cookie-consent-manager="true"]', 'swCookieConsentManager')
+
+    // Filter
+    .addPlugin('*[data-filter-type]', 'swFilterComponent')
+
+    // Sidebar Filter
+    .addPlugin('.sidebar-filter-offcanvas [data-offcanvas="true"]', 'swOffcanvasMenu', ['xs', 's'])
+;   // window.StateManager addPlugin end
+
+$(function($) {
+    // don't add over window.StateManager because it causes issues with equalHeight function
+    $('.slick').slickWrapper();
+
+    $('[data-equalheight="true"]:not([data-mode="ajax"]):visible').equalHeight();
+
+    $('[data-fixed-navbar="true"]').clingify({breakpoint: swfDefaultBreakpointSM || 767});
+
+    $('body').swSelectboxReplacement();
+
+    if (swfShowHidePwd) {
+        window.StateManager.addPlugin('input[type="password"]', 'passwordInputViewer');
+    }
+    if (swfShowPwdStrength) {
+        window.StateManager.addPlugin('.register-form input[type="password"]', 'passwordStrengthWrapper', $.extend({}, swfShowPwdStrengthConfig));
+    }
+
+    $.subscribe('plugin/swAddArticle/onAddArticle', cartRefresh);
+
+    // Check if cookies are disabled and show notification
+    if (!StorageManager.hasCookiesSupport)
+        createNoCookiesNoticeBox(window.snippets.noCookiesNotice);
+
+    // Create the no cookies notification message
+    function createNoCookiesNoticeBox(message) {
+        $('<div/>', {
+            'class': 'alert alert-warning no-cookies',
+            'html': message
+        })
+        .append('<i class="fa fa-times mtx pull-right"></i>')
+        .on('click', function() {
+            $(this).closest('.no-cookies').hide();
+        })
+        .appendTo('.page-wrap');
+    }
+});
 })(jQuery, window);

From be0b2f48875cd773d8278a6fd38a3e2de4dfc081 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Mon, 13 Jan 2020 11:45:10 +0100
Subject: [PATCH 26/37] Removed console log

---
 .../BootstrapBare/frontend/_public/src/js/swbt._init.js       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt._init.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt._init.js
index 3093ec3..22449e9 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt._init.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt._init.js
@@ -1,8 +1,4 @@
 (function($, window) {
-
-    // GPDR Cookie consent banner
-    console.log('added gdpr inits');
-
 // calculate and set breakpoints: 1rem = 16px
 window.StateManager.init([
     {

From 126d5d1d7957214777a91811f6302704b6c1b0a1 Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Mon, 13 Jan 2020 13:01:16 +0100
Subject: [PATCH 27/37] Updated jquery.cookie-consent-manager.js and
 jquery.cookie-permission.js to the latest responsive theme version

---
 .../vendors/js/shopware/jquery.cookie-consent-manager.js        | 2 +-
 .../_public/vendors/js/shopware/jquery.cookie-permission.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
 mode change 100644 => 100755 Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
old mode 100644
new mode 100755
index 2e799e4..9d76fbf
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
@@ -1,4 +1,4 @@
-;(function ($, window, undefined) {
+(function ($, window, undefined) {
     'use strict';
 
     $.getCookiePreference = function(cookieName) {
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
old mode 100644
new mode 100755
index 6983639..8095186
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
@@ -1,4 +1,4 @@
-;(function($, window) {
+(function($, window) {
     'use strict';
 
     var $body = $('body');

From 1a613382b0d6983aa4ed2f0364928127ab2f8b47 Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Mon, 13 Jan 2020 13:07:23 +0100
Subject: [PATCH 28/37] Added SW 5.6.4 Cookie Manager Template files

---
 .../_includes/cookie_permission_note.tpl      | 129 +++++++++++++-----
 .../frontend/index/cookie_consent/cookie.tpl  |  20 +++
 .../frontend/index/cookie_consent/group.tpl   |  46 +++++++
 3 files changed, 158 insertions(+), 37 deletions(-)
 mode change 100644 => 100755 Resources/Themes/Frontend/BootstrapBare/frontend/_includes/cookie_permission_note.tpl
 create mode 100755 Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/cookie.tpl
 create mode 100755 Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/cookie_permission_note.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/cookie_permission_note.tpl
old mode 100644
new mode 100755
index 5184e21..f033504
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/cookie_permission_note.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/cookie_permission_note.tpl
@@ -1,44 +1,99 @@
-<div class="alert alert-default no-cookies is--hidden sw5-plugin"
-    data-cookie-permission="true"
-    data-urlPrefix="{url controller=index action=index}"
-    {if $Shop}
-        data-shopId="{$Shop->getId()}"{/if}
-    >
-    {block name="cookie_permission_container"}
-        <div class="cookie-permission-container">
-            <div class="container-xs-height">
-                <div class="row row-sm-height">
-                    <div class="col-xs-12 col-sm-9 col-sm-height col-middle">
-                        {block name="cookie_permission_content"}
-                            <div class="cookie-permission-content">
-                                {block name="cookie_permission_content_text"}
-                                    {s namespace="frontend/cookiepermission/index" name="cookiePermission/text"}{/s}
-                                {/block}
+{namespace name="frontend/cookiepermission/index"}
+<div class="page-wrap--cookie-permission is--hidden"
+     data-cookie-permission="true"
+     data-urlPrefix="{url controller=index action=index}"
+     data-title="{s name="cookiePermission/title"}{/s}"
+     {if $Shop}data-shopId="{$Shop->getId()}"{/if}>
 
-                                {block name="cookie_permission_content_link"}
-                                    {$privacyLink = {config name="data_privacy_statement_link"}}
-                                    {if $privacyLink}
-                                        <a title="{s namespace="frontend/cookiepermission/index" name="cookiePermission/linkText"}{/s}"
-                                           class="cookie-permission--privacy-link sw5-plugin text-primary"
-                                           href="{$privacyLink}">
-                                            {s namespace="frontend/cookiepermission/index" name="cookiePermission/linkText"}{/s}
-                                        </a>
-                                    {/if}
-                                {/block}
-                            </div>
+    {if {config name="cookie_note_mode"} != 2}
+        {block name="cookie_permission_container"}
+            <div class="cookie-permission--container cookie-mode--{config name="cookie_note_mode"}">
+                {block name="cookie_permission_content"}
+                    <div class="cookie-permission--content{if {config name="cookie_note_mode"} == 1 && {config name="cookie_show_button"}} cookie-permission--extra-button{/if}">
+                        {block name="cookie_permission_content_text"}
+                            {if {config name="cookie_note_mode"} == 1}
+                                {s name="cookiePermission/textMode1"}{/s}
+                            {else}
+                                {s name="cookiePermission/text"}{/s}
+                            {/if}
+                        {/block}
+
+                        {block name="cookie_permission_content_link"}
+                            {$privacyLink = {config name="data_privacy_statement_link"}}
+                            {if $privacyLink}
+                                <a title="{s name="cookiePermission/linkText"}{/s}"
+                                   class="cookie-permission--privacy-link"
+                                   href="{$privacyLink}">
+                                    {s name="cookiePermission/linkText"}{/s}
+                                </a>
+                            {/if}
                         {/block}
                     </div>
-                    <div class="col-xs-12 col-sm-3 col-sm-height col-middle">
-                        {block name="cookie_permission_accept_button"}
-                            <div class="cookie-permission-button text-right">
-                                <a href="" class="cookie-permission--accept-button sw5-plugin btn btn-primary">
-                                    {s namespace="frontend/cookiepermission/index" name="cookiePermission/buttonText"}{/s}
+                {/block}
+
+                {block name="cookie_permission_accept_button"}
+                    <div class="cookie-permission--button{if {config name="cookie_note_mode"} == 1 && {config name="cookie_show_button"}} cookie-permission--extra-button{/if}">
+                        {block name="cookie_permission_decline_button_fixed"}
+                            {if {config name="cookie_note_mode"} == 1}
+                                {block name="cookie_permission_decline_button"}
+                                    <a href="#" class="cookie-permission--decline-button btn is--large is--center">
+                                        {s name="cookiePermission/declineText"}{/s}
+                                    </a>
+                                {/block}
+                            {/if}
+                        {/block}
+
+                        {block name="cookie_permission_accept_button_fixed"}
+                            {if {config name="cookie_note_mode"} == 1}
+                                {if {config name="cookie_show_button"}}
+                                    <a href="#" class="cookie-permission--accept-button btn is--large is--center">
+                                        {s name="cookiePermission/acceptAll"}{/s}
+                                    </a>
+                                {/if}
+
+                                <a href="#" class="cookie-permission--configure-button btn is--primary is--large is--center" data-openConsentManager="true">
+                                    {s name="cookiePermission/configure"}{/s}
                                 </a>
-                            </div>
+                            {else}
+                                <a href="#" class="cookie-permission--accept-button btn is--primary is--large is--center">
+                                    {s name="cookiePermission/buttonText"}{/s}
+                                </a>
+                            {/if}
                         {/block}
                     </div>
-                </div>
+                {/block}
+            </div>
+        {/block}
+    {else}
+        {block name="cookie_removal_container"}
+            <div class="cookie-removal--container">
+                <p>
+                    {s name="cookiePermission/infoText"}{/s}<br>
+                </p>
+                <ul class="cookie-removal--list">
+                    <li>{s name="cookiePermission/productToCart"}{/s}</li>
+                    <li>{s name="cookiePermission/wishList"}{/s}</li>
+                    <li>{s name="cookiePermission/productRecommandations"}{/s}</li>
+                </ul>
+
+                {block name="cookie_removal_container_footer"}
+                    <div class="cookie-removal--footer">
+                        {$privacyLink = {config name="data_privacy_statement_link"}}
+                        {if $privacyLink}
+                            <a title="{s name="cookiePermission/linkText"}{/s}"
+                               class="privacy--notice"
+                               href="{$privacyLink}">
+                                {s name="cookiePermission/linkText"}{/s}
+                            </a>
+                        {/if}
+
+                        <div class="cookie-removal--buttons">
+                            <a class="btn is--secondary cookie-permission--accept-button is--center">{s name="cookiePermission/buttonText"}{/s}</a>
+                            <a class="btn cookie-permission--close-button is--center">{s name="cookiePermission/close"}{/s}</a>
+                        </div>
+                    </div>
+                {/block}
             </div>
-        </div>
-    {/block}
-</div>
+        {/block}
+    {/if}
+</div>
\ No newline at end of file
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/cookie.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/cookie.tpl
new file mode 100755
index 0000000..55a746f
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/cookie.tpl
@@ -0,0 +1,20 @@
+{block name="frontend_index_cookie_consent_manager_cookie"}
+    <div class='cookie-consent--cookie'>
+        {block name="frontend_index_cookie_consent_manager_cookie_name_input"}
+            <input type="hidden" class="cookie-consent--cookie-name" value="{$cookie['name']}" />
+        {/block}
+
+        {block name="frontend_index_cookie_consent_manager_cookie_state_input"}
+            <label class="cookie-consent--cookie-state cookie-consent--state-input{if $cookieGroup['required']} cookie-consent--required{/if}">
+                <input type="checkbox" name="{$cookie['name']}-state" class="cookie-consent--cookie-state-input"{if $cookieGroup['required']} disabled="disabled" checked="checked"{/if} />
+                <span class="cookie-consent--state-input-element"></span>
+            </label>
+        {/block}
+
+        {block name="frontend_index_cookie_consent_manager_cookie_label"}
+            <div class='cookie--label cookie-consent--state-label'>
+                {$cookie['label']}
+            </div>
+        {/block}
+    </div>
+{/block}
\ No newline at end of file
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl
new file mode 100755
index 0000000..3f61ed3
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl
@@ -0,0 +1,46 @@
+{block name="frontend_index_cookie_consent_manager_group"}
+    <div class='cookie-consent--group'>
+        {block name="frontend_index_cookie_consent_manager_group_name_input"}
+            <input type="hidden" class="cookie-consent--group-name" value="{$cookieGroup['name']}" />
+        {/block}
+
+        {block name="frontend_index_cookie_consent_manager_group_state_input"}
+            <label class="cookie-consent--group-state cookie-consent--state-input{if $cookieGroup['required']} cookie-consent--required{/if}">
+                <input type="checkbox" name="{$cookieGroup['name']}-state" class="cookie-consent--group-state-input"{if $cookieGroup['required']} disabled="disabled" checked="checked"{/if}/>
+                <span class="cookie-consent--state-input-element"></span>
+            </label>
+        {/block}
+
+        {block name="frontend_index_cookie_consent_manager_group_title"}
+            <div class='cookie-consent--group-title' data-collapse-panel='true' data-contentSiblingSelector=".cookie-consent--group-container">
+                <div class="cookie-consent--group-title-label cookie-consent--state-label">
+                    {$cookieGroup['label']|truncate:25}
+                </div>
+
+                <span class="cookie-consent--group-arrow is-icon--right">
+                    <i class="icon--arrow-right"></i>
+                </span>
+            </div>
+        {/block}
+
+        {if $cookieGroup['description'] || $cookieGroup['cookies']}
+            {block name="frontend_index_cookie_consent_manager_group_container"}
+                <div class='cookie-consent--group-container'>
+                    {if {$cookieGroup['description']}}
+                        {block name="frontend_index_cookie_consent_manager_group_description"}
+                            <div class='cookie-consent--group-description'>
+                                {$cookieGroup['description']}
+                            </div>
+                        {/block}
+                    {/if}
+
+                    <div class='cookie-consent--cookies-container'>
+                        {foreach $cookieGroup['cookies'] as $cookie}
+                            {include file="frontend/index/cookie_consent/cookie.tpl"}
+                        {/foreach}
+                    </div>
+                </div>
+            {/block}
+        {/if}
+    </div>
+{/block}

From 2fd4a45f35bcf449491cebe3aa91a534f7eeb831 Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Mon, 13 Jan 2020 13:07:49 +0100
Subject: [PATCH 29/37] Corrected file permissions

---
 .../BootstrapBare/frontend/index/cookie_consent/cookie.tpl        | 0
 .../BootstrapBare/frontend/index/cookie_consent/group.tpl         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/cookie.tpl
 mode change 100755 => 100644 Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/cookie.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/cookie.tpl
old mode 100755
new mode 100644
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl
old mode 100755
new mode 100644

From 07875c04098caa4b9f18894666a2bc03c98676aa Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Mon, 13 Jan 2020 13:17:26 +0100
Subject: [PATCH 30/37] Added SW 5.6.4 Cookie Manager Template files

---
 .../frontend/index/cookie_consent.tpl         | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100755 Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl
new file mode 100755
index 0000000..cd26612
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl
@@ -0,0 +1,47 @@
+{namespace name='frontend/cookie_consent/main'}
+
+<div id='cookie-consent' class='off-canvas is--left' data-cookie-consent-manager='true'>
+    {block name='frontend_index_cookie_consent_manager_content'}
+        {block name='frontend_index_cookie_consent_manager_header'}
+            <div class='cookie-consent--header cookie-consent--close'>
+                {s name="manager/title"}{/s}
+
+                <i class="icon--arrow-right"></i>
+           </div>
+        {/block}
+
+        {block name='frontend_index_cookie_consent_manager_description'}
+            <div class='cookie-consent--description'>
+                {s name="manager/description"}{/s}
+            </div>
+        {/block}
+
+        {if $cookieGroups}
+            {block name='frontend_index_cookie_consent_manager_configuration'}
+                    <div class='cookie-consent--configuration'>
+                        {block name="frontend_index_cookie_consent_manager_configuration_header"}
+                            <div class='cookie-consent--configuration-header'>
+                                <div class='cookie-consent--configuration-header-text'>{s name="manager/configuration/title"}{/s}</div>
+                            </div>
+                        {/block}
+
+                        {block name="frontend_index_cookie_consent_manager_configuration_container"}
+                            <div class='cookie-consent--configuration-main'>
+                                {foreach $cookieGroups as $cookieGroup}
+                                    {if $cookieGroup['cookies']|count}
+                                       {include file="frontend/index/cookie_consent/group.tpl"}
+                                    {/if}
+                                {/foreach}
+                            </div>
+                        {/block}
+                    </div>
+            {/block}
+
+            {block name="frontend_index_cookie_consent_manager_save"}
+                <div class="cookie-consent--save">
+                    <input class="cookie-consent--save-button btn is--primary" type="button" value="{s name="manager/save"}{/s}" />
+                </div>
+            {/block}
+        {/if}
+    {/block}
+</div>
\ No newline at end of file

From d5789185d507a450dd1004721af260aced34ef64 Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Mon, 13 Jan 2020 13:30:38 +0100
Subject: [PATCH 31/37] Added frontend_index_cookie_consent_manager block in
 index/index.tpl

---
 .../BootstrapBare/frontend/index/index.tpl         | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
index b26f870..1221acf 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
@@ -51,7 +51,7 @@
                                             {block name="frontend_index_navigation_nav_toggle"}
                                                 <div class="col-xs-3 visible-xs visible-sm">
                                                     {if !$theme.checkoutHeader || $theme.checkoutHeader && !({controllerAction} == 'confirm' || {controllerAction} == 'shippingPayment' || {controllerAction} == 'finish')}
-                                                        <button id="navToggle" 
+                                                        <button id="navToggle"
                                                                 class="btn btn-link nav-toggle"
                                                                 type="button"
                                                                 data-offcanvas="true"
@@ -125,6 +125,12 @@
                             {block name='frontend_index_content_container'}
                                 {*! Content section *}
                                 <div id="content" class="container">
+                                    {* Cookie consent manager*}
+                                    {block name='frontend_index_cookie_consent_manager'}
+                                        {if {config name=cookie_note_mode} == 1 && {config name=show_cookie_note}}
+                                            {include file='frontend/index/cookie_consent.tpl'}
+                                        {/if}
+                                    {/block}
                                     {block name='frontend_index_content_container_inner'}
                                         <div class="content-container">
                                             {* Breadcrumb *}
@@ -165,7 +171,7 @@
                                                     {/block}
                                                 </div>
                                             {/block}
-                                        </div>    
+                                        </div>
                                     {/block}
                                 </div>
                             {/block}
@@ -202,7 +208,7 @@
                                     {block name="frontend_index_footer_container_include"}
                                         {include file='frontend/index/footer.tpl'}
                                     {/block}
-                                    
+
                                     {block name="frontend_index_footer_bootstrap_link"}
                                         <p class="text-center">
                                             <small>
@@ -370,4 +376,4 @@
     {/block}
     </body>
 {/block}
-</html>
\ No newline at end of file
+</html>

From 0cdaf461082f31f03c7e6e0da81240317ddac063 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Tue, 14 Jan 2020 12:19:04 +0100
Subject: [PATCH 32/37] [Intermediate commit] Further implementation of the
 shopware cookie consent solution

---
 .../_includes/cookie_permission_note.tpl      |  22 ++--
 .../frontend/_public/src/js/swbt.modal.js     |   2 +-
 .../sw-cookie-consent-manager.less            | 112 ++++++++++++++++
 .../less/_modules/sw-cookie-permission.less   |  88 +++++++++++++
 .../src/less/_variables/swf-zindex.less       |  13 +-
 .../frontend/_public/src/less/components.less |   1 +
 .../frontend/_public/src/less/modules.less    |   1 +
 .../shopware/jquery.cookie-consent-manager.js |  10 +-
 .../js/shopware/jquery.cookie-permission.js   |  13 +-
 .../js/shopware/jquery.state-manager.js       | 121 +++++++++++++-----
 .../frontend/index/cookie_consent.tpl         |  83 ++++++------
 .../frontend/index/cookie_consent/group.tpl   |  58 +++++----
 .../BootstrapBare/frontend/index/index.tpl    |   1 +
 .../widgets/index/statistic_include.tpl       |  55 ++++++--
 14 files changed, 444 insertions(+), 136 deletions(-)
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_components/sw-cookie-consent-manager.less
 create mode 100644 Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_modules/sw-cookie-permission.less

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/cookie_permission_note.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/cookie_permission_note.tpl
index f033504..fab704c 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/cookie_permission_note.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/cookie_permission_note.tpl
@@ -36,9 +36,9 @@
                         {block name="cookie_permission_decline_button_fixed"}
                             {if {config name="cookie_note_mode"} == 1}
                                 {block name="cookie_permission_decline_button"}
-                                    <a href="#" class="cookie-permission--decline-button btn is--large is--center">
+                                    <button class="cookie-permission--decline-button btn btn-default btn-lg btn-block">
                                         {s name="cookiePermission/declineText"}{/s}
-                                    </a>
+                                    </button>
                                 {/block}
                             {/if}
                         {/block}
@@ -46,18 +46,18 @@
                         {block name="cookie_permission_accept_button_fixed"}
                             {if {config name="cookie_note_mode"} == 1}
                                 {if {config name="cookie_show_button"}}
-                                    <a href="#" class="cookie-permission--accept-button btn is--large is--center">
+                                    <button class="cookie-permission--accept-button btn btn-primary btn-lg btn-block">
                                         {s name="cookiePermission/acceptAll"}{/s}
-                                    </a>
+                                    </button>
                                 {/if}
 
-                                <a href="#" class="cookie-permission--configure-button btn is--primary is--large is--center" data-openConsentManager="true">
+                                <button class="cookie-permission--configure-button btn btn-default btn-lg btn-block" data-openConsentManager="true">
                                     {s name="cookiePermission/configure"}{/s}
-                                </a>
+                                </button>
                             {else}
-                                <a href="#" class="cookie-permission--accept-button btn is--primary is--large is--center">
+                                <button class="cookie-permission--accept-button btn btn-primary btn-lg btn-block">
                                     {s name="cookiePermission/buttonText"}{/s}
-                                </a>
+                                </button>
                             {/if}
                         {/block}
                     </div>
@@ -88,12 +88,12 @@
                         {/if}
 
                         <div class="cookie-removal--buttons">
-                            <a class="btn is--secondary cookie-permission--accept-button is--center">{s name="cookiePermission/buttonText"}{/s}</a>
-                            <a class="btn cookie-permission--close-button is--center">{s name="cookiePermission/close"}{/s}</a>
+                            <button class="btn btn-secondary cookie-permission--accept-button">{s name="cookiePermission/buttonText"}{/s}</button>
+                            <button class="btn btn-default cookie-permission--close-button">{s name="cookiePermission/close"}{/s}</button>
                         </div>
                     </div>
                 {/block}
             </div>
         {/block}
     {/if}
-</div>
\ No newline at end of file
+</div>
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt.modal.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt.modal.js
index a79de58..42ee1de 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt.modal.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt.modal.js
@@ -252,7 +252,7 @@
             });
 
             $.publish('plugin/notifyModal/onOpenModal', [ me ]);
-        },
+        }
     });
 }(jQuery));
 
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_components/sw-cookie-consent-manager.less b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_components/sw-cookie-consent-manager.less
new file mode 100644
index 0000000..3c4b0fc
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_components/sw-cookie-consent-manager.less
@@ -0,0 +1,112 @@
+#cookie-consent:extend(.sidebar-main.off-canvas) {
+    z-index: @swf-zindex-cookie-message;
+    .cookie-consent--configuration {
+        .cookie-consent--group {
+            border-bottom: 1px solid @gray-light;
+            position: relative;
+            .panel-title{
+                display:flex;
+                align-items:center;
+                text-align:left;
+            }
+        }
+        .cookie-consent--group-state{
+            flex: 0 0 auto;
+        }
+        .cookie-consent--group-title {
+            cursor: pointer;
+            flex: 1 0 auto;
+            display:flex;
+            align-items:center;
+            &[aria-expanded="true"]{
+                .cookie-consent--group-state-icon{
+                    transform: rotate(-180deg);
+                }
+            }
+        }
+        .cookie-consent--group-state-icon{
+            margin-left:auto;
+            transition-duration:80ms;
+            transition-property: transform;
+        }
+        .cookie-consent--cookies-container{
+            &:last-child{
+                margin-bottom:0;
+            }
+        }
+        .cookie-consent--cookie{
+            display:flex;
+            align-items:center;
+        }
+        .cookie-consent--state-input{
+            flex:0 0 auto;
+        }
+        .cookie--label{
+            flex:1 0 auto;
+            cursor:pointer;
+        }
+    }
+}
+
+// State input
+.cookie-consent--state-input {
+    margin:0;
+    .unitize(margin-right, 10);
+    &.cookie-consent--required {
+        opacity: 0.4;
+
+        .cookie-consent--state-input-element {
+            cursor: default;
+        }
+    }
+
+    .cookie-consent--state-input-element {
+        .unitize-height(20);
+        .unitize-width(20);
+        .unitize(border-radius, 3);
+        border: 1px solid @border-color;
+        cursor: pointer;
+        display: block;
+        position: relative;
+    }
+
+    input {
+        display: none;
+
+        &:checked+.cookie-consent--state-input-element {
+            background: @highlight-success;
+
+            &::after {
+                .unitize-width(10);
+                .unitize-height(5);
+                .unitize(top, 4);
+                .unitize(left, 3);
+
+                border: 2px solid #fff;
+                border-top: none;
+                border-right: none;
+                background: transparent;
+                content: '';
+                position: absolute;
+                transform: rotate(-45deg);
+            }
+        }
+
+        &:indeterminate+.cookie-consent--state-input-element {
+            background: #5f7285;
+
+            &::after {
+                .unitize-width(10);
+                .unitize-height(5);
+                .unitize(top, 3);
+                .unitize(left, 4);
+
+                border: 2px none #fff;
+                border-bottom-style: solid;
+                background: transparent;
+                content: '';
+                position: absolute;
+            }
+        }
+    }
+}
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_modules/sw-cookie-permission.less b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_modules/sw-cookie-permission.less
new file mode 100644
index 0000000..3dc2301
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_modules/sw-cookie-permission.less
@@ -0,0 +1,88 @@
+.page-wrap--cookie-permission {
+    .unitize(padding, 10);
+    z-index: @swf-zindex-cookie-message;
+    border-top: 1px solid @gray-light;
+    background: #fff;
+    position: fixed;
+    bottom: 0;
+    right: 0;
+    left: 0;
+
+    .cookie-permission--container {
+        position: relative;
+        display: flex;
+        flex-direction: column;
+        text-align: center;
+        @media screen and (min-width: @phoneLandscapeViewportWidth) {
+            flex-direction: row;
+            align-items: center;
+            text-align: left;
+        }
+        .cookie-permission--button {
+            display: flex;
+            flex-direction: column;
+            flex:1 0 auto;
+            .unitize(margin-top, 15);
+            @media screen and (min-width: @phoneLandscapeViewportWidth) {
+                margin-top:0;
+                .unitize(margin-left, 15);
+            }
+            @media screen and (min-width: @tabletLandscapeViewportWidth) {
+                flex-direction: row;
+                align-items: center;
+                flex: 1 1 auto;
+            }
+
+            .btn {
+                flex: 1 0 auto;
+                .unitize(margin, 5);
+                @media screen and (min-width: @tabletLandscapeViewportWidth) {
+                    flex: 0 1 auto;
+                }
+            }
+        }
+        .cookie-permission--privacy-link{
+            text-decoration: underline @swf-brand-primary;
+        }
+    }
+}
+
+// TODO: What is this?
+.cookie-removal--container {
+    .unitize(padding, 25);
+
+    .cookie-removal--list {
+        .unitize(margin-bottom, 20);
+        list-style-position: inside;
+    }
+
+    .cookie-removal--buttons {
+        .unitize(margin-top, 20);
+    }
+
+    .cookie-removal--buttons .btn {
+        .unitize(margin-bottom, 6);
+    }
+}
+
+@media screen and (min-width: @phoneLandscapeViewportWidth) {
+    .cookie-removal--container {
+        .cookie-removal--buttons {
+            margin: 0;
+        }
+
+        .privacy--notice {
+            .unitize(padding-top, 8);
+            display: inline-block;
+        }
+    }
+
+    .page-wrap--cookie-permission .cookie-permission--container {
+
+        .cookie-permission--accept-button,
+        .cookie-permission--decline-button,
+        .cookie-permission--configure-button {
+            margin-top: 0;
+        }
+    }
+}
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_variables/swf-zindex.less b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_variables/swf-zindex.less
index 37d3d1d..be61011 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_variables/swf-zindex.less
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/_variables/swf-zindex.less
@@ -10,10 +10,10 @@
 // custom
 
 @swf-zindex-variant-label:      			100;
-@swf-zindex-emotion-slider-title: 			100;
+@swf-zindex-emotion-slider-title: 		100;
 @swf-zindex-variant-input:      			101;
-@swf-zindex-emotion-mapping-link: 			110;
-@swf-zindex-box-emotion-image-element:		500;
+@swf-zindex-emotion-mapping-link: 		110;
+@swf-zindex-box-emotion-image-element:500;
 @swf-zindex-box-label-element:				501;
 @swf-zindex-menu:               			999;
 @swf-zindex-scroll-up:          			999;
@@ -21,13 +21,14 @@
 @swf-zindex-emotion-overlay:    			1000;
 @swf-zindex-custom-select:      			1035;   // must be lower than modal-background, but higher than navbar-fixed
 @swf-zindex-compare-popover:    			1049;   // must be lower than modal
-@swf-zindex-emotion-video-element: 			1000;
+@swf-zindex-emotion-video-element: 		1000;
 @swf-zindex-emotion-video-text: 			1100;
-@swf-zindex-emotion-video-play-btn: 		1200;
+@swf-zindex-emotion-video-play-btn: 	1200;
 @swf-zindex-emotion-video-cover: 			1300;
 @swf-zindex-overlay:            			5000;
 @swf-zindex-loader-full:        			5001;
-@swf-zindex-cookie-message:                 6000;
+@swf-zindex-cookie-message:           9999999999; // Trusted shops badge has a very high z-index - we need to overlay it
+@swf-zindex-cookie-consent-manager:   @swf-zindex-cookie-message;
 
 // selectBoxIt z-index is set via javascript to 999999.
 // offcanvas needs to have a higher z-index,
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/components.less b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/components.less
index 25650fe..b90cf07 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/components.less
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/components.less
@@ -11,3 +11,4 @@
 @import "_components/menu.less";
 @import "_components/popover.less";
 @import "_components/captcha-honeypot.less";
+@import "_components/sw-cookie-consent-manager.less";
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/modules.less b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/modules.less
index a6452bd..eb88aaa 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/modules.less
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/less/modules.less
@@ -6,3 +6,4 @@
 @import "_modules/swf-listing.less";
 @import "_modules/swf-emotion.less";
 @import "_modules/swf-blog.less";
+@import "_modules/sw-cookie-permission.less";
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
index 9d76fbf..13c9c8f 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
@@ -389,9 +389,13 @@
 
             this.assignCookieData();
 
-            this.$el.show();
+            // this.$el.show();
+            this.$el.modal('show');
             this.$el.addClass(this.opts.openClass);
 
+            // #webksde-TF: Remove this fucking disturbing swbt js-overlay
+            $('.js-overlay').remove();
+
             this.isOpened = true;
 
             $.overlay.open({
@@ -404,6 +408,8 @@
                 return;
             }
 
+            this.$el.modal('hide');
+
             this.$el.removeClass(this.opts.openClass);
             this.isOpened = false;
         },
@@ -424,4 +430,4 @@
 function openCookieConsentManager () {
     var plugin = $('*[data-cookie-consent-manager="true"]').data('plugin_swCookieConsentManager');
     plugin.openConsentManager();
-}
\ No newline at end of file
+}
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
index 8095186..9752bcc 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
@@ -127,6 +127,8 @@
             me.preparePrivacyLink();
             me.registerEvents();
             me.displayCookiePermission(function(display) {
+                console.log('display:');
+                console.log(display);
                 if (display) {
                     me.showElement();
                 }
@@ -315,7 +317,7 @@
 
             this.hideElement();
             this.applyActiveToPreferences();
-            
+
             $.publish('plugin/swCookiePermission/onAcceptButtonClick', [this, event]);
         },
 
@@ -336,7 +338,7 @@
             document.cookie = 'cookieDeclined=1; path=' + this.getBasePath() + ';';
 
             this.hideElement();
-            
+
             $.publish('plugin/swCookiePermission/onDeclineButtonClick', [this, event]);
         },
 
@@ -360,11 +362,7 @@
          */
         showElement: function() {
             if (window.cookieRemoval === 2) {
-                $.modal.open(this.$el.html(), {
-                    title: this.opts.title,
-                    sizing: 'content',
-                    width: 500
-                });
+                $('#cookie-consent').modal('show');
 
                 this.$acceptButton = $(this.opts.acceptButtonSelector);
                 this.$closeButton = $(this.opts.closeButtonSelector);
@@ -385,7 +383,6 @@
         hideElement: function() {
             this.$el.addClass(this.opts.isHiddenClass);
             $body.css('padding-bottom', 0);
-            $.modal.close();
         },
 
         getBasePath: function () {
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.state-manager.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.state-manager.js
index 33e4800..aee84c5 100644
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.state-manager.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.state-manager.js
@@ -109,6 +109,41 @@
         vendorPropertyDiv = document.createElement('div'),
         vendorPrefixes = ['webkit', 'moz', 'ms', 'o'];
 
+    /**
+     * @returns { boolean }
+     */
+    function hasCookiesAllowed () {
+        if (window.cookieRemoval === 0) {
+            return true;
+        }
+
+        if (window.cookieRemoval === 1) {
+            if (document.cookie.indexOf('cookiePreferences') !== -1) {
+                return true;
+            }
+
+            return document.cookie.indexOf('cookieDeclined') === -1;
+        }
+
+        /**
+         * Must be cookieRemoval = 2, so only depends on existence of `allowCookie`
+         */
+        return document.cookie.indexOf('allowCookie') !== -1;
+    }
+
+    /**
+     * @returns { boolean }
+     */
+    function isDeviceCookieAllowed () {
+        var cookiesAllowed = hasCookiesAllowed();
+
+        if (window.cookieRemoval !== 1) {
+            return cookiesAllowed;
+        }
+
+        return cookiesAllowed && document.cookie.indexOf('"name":"x-ua-device","active":true') !== -1;
+    }
+
     /**
      * @class EventEmitter
      * @constructor
@@ -294,7 +329,7 @@
      * @type {Object}
      */
     window.StateManager = $.extend(Object.create(EventEmitter.prototype), {
-        
+
         /**
          * Constructor for Shopware EventEmitter
          *
@@ -303,7 +338,7 @@
          * @constructor
          */
         EventEmitter: EventEmitter,
-        
+
         /**
          * Collection of all registered breakpoints
          *
@@ -1095,6 +1130,7 @@
          * @method destroyPlugin
          * @param {String|jQuery} selector
          * @param {String} pluginName
+         * @returns {StateManager}
          */
         destroyPlugin: function (selector, pluginName) {
             var $el = (typeof selector === 'string') ? $(selector) : selector,
@@ -1105,7 +1141,7 @@
                 plugin;
 
             if (!len) {
-                return;
+                return this;
             }
 
             for (; i < len; i++) {
@@ -1116,6 +1152,8 @@
                     $currentEl.removeData(name);
                 }
             }
+
+            return this;
         },
 
         /**
@@ -1300,6 +1338,13 @@
             });
         },
 
+        /**
+         * Returns true when user has allowed to set cookies
+         *
+         * @returns {boolean}
+         */
+        hasCookiesAllowed: hasCookiesAllowed,
+
         _getCurrentDevice: function() {
             var i = 0,
                 width = this.getViewportWidth(),
@@ -1316,9 +1361,17 @@
         },
 
         _setDeviceCookie: function() {
-            var device = this._getCurrentDevice();
+            if (!isDeviceCookieAllowed()) {
+                return;
+            }
+
+            var device = this._getCurrentDevice(),
+                cookieString = 'x-ua-device=' + device + '; path=/';
 
-            document.cookie = 'x-ua-device=' + device + '; path=/';
+            if (window.secureShop !== undefined && window.secureShop === true) {
+                cookieString = 'x-ua-device=' + device + ';secure; path=/';
+            }
+            document.cookie = cookieString;
         },
 
         /**
@@ -1326,33 +1379,43 @@
          * and saves it to a object that can be accessed.
          *
          * @private
-         * @property _scrollBarSize
+         * @method _getScrollBarSize
          * @type {Object}
          */
-        _scrollBarSize: (function () {
-            var $el = $('<div>', {
-                    css: {
-                        width: 100,
-                        height: 100,
-                        overflow: 'scroll',
-                        position: 'absolute',
-                        top: -9999
-                    }
-                }),
-                el = $el[0],
-                width,
-                height;
+        _getScrollBarSize: (function () {
+            var cache;
+            var getSize = function(){
+                var $el = $('<div>', {
+                        css: {
+                            width: 100,
+                            height: 100,
+                            overflow: 'scroll',
+                            position: 'absolute',
+                            top: -9999
+                        }
+                    }),
+                    el = $el[0],
+                    width,
+                    height;
 
-            $('body').append($el);
+                $('body').append($el);
 
-            width = el.offsetWidth - el.clientWidth;
-            height = el.offsetHeight - el.clientHeight;
+                width = el.offsetWidth - el.clientWidth;
+                height = el.offsetHeight - el.clientHeight;
 
-            $($el).remove();
+                $($el).remove();
 
-            return {
-                width: width,
-                height: height
+                return {
+                    width: width,
+                    height: height
+                };
+            };
+
+            return function() {
+                if (!cache) {
+                    cache = getSize();
+                }
+                return cache;
             };
         }()),
 
@@ -1365,7 +1428,7 @@
          * @returns {Object} The width/height pair of the scroll bar size.
          */
         getScrollBarSize: function () {
-            return $.extend({}, this._scrollBarSize);
+            return $.extend({}, this._getScrollBarSize());
         },
 
         /**
@@ -1376,7 +1439,7 @@
          * @returns {Number} Width of the default browser scroll bar.
          */
         getScrollBarWidth: function () {
-            return this._scrollBarSize.width;
+            return this._getScrollBarSize().width;
         },
 
         /**
@@ -1387,7 +1450,7 @@
          * @returns {Number} Height of the default browser scroll bar.
          */
         getScrollBarHeight: function () {
-            return this._scrollBarSize.height;
+            return this._getScrollBarSize().height;
         },
 
         /**
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl
index cd26612..87398ef 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl
@@ -1,47 +1,52 @@
 {namespace name='frontend/cookie_consent/main'}
 
-<div id='cookie-consent' class='off-canvas is--left' data-cookie-consent-manager='true'>
-    {block name='frontend_index_cookie_consent_manager_content'}
-        {block name='frontend_index_cookie_consent_manager_header'}
-            <div class='cookie-consent--header cookie-consent--close'>
-                {s name="manager/title"}{/s}
+<div id='cookie-consent' class='modal' data-cookie-consent-manager='true'>
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            {block name='frontend_index_cookie_consent_manager_content'}
+                {block name='frontend_index_cookie_consent_manager_header'}
+                    <div class='modal-header cookie-consent--header'>
+                        {s name="manager/title"}{/s}
+                        <button type="button" class="close cookie-permission--close-button" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>                </div>
+                {/block}
+                <div class="panel-body">
+                    {block name='frontend_index_cookie_consent_manager_description'}
+                        <div class='cookie-consent--description'>
+                            {s name="manager/description"}{/s}
+                        </div>
+                    {/block}
+                    {block name='frontend_index_cookie_consent_manager_configuration'}
+                        {if $cookieGroups}
+                            <div class='cookie-consent--configuration'>
+                                {block name="frontend_index_cookie_consent_manager_configuration_header"}
+                                    <div class='cookie-consent--configuration-header'>
+                                        <div class='cookie-consent--configuration-header-text h5'>{s name="manager/configuration/title"}{/s}</div>
+                                    </div>
+                                {/block}
 
-                <i class="icon--arrow-right"></i>
-           </div>
-        {/block}
-
-        {block name='frontend_index_cookie_consent_manager_description'}
-            <div class='cookie-consent--description'>
-                {s name="manager/description"}{/s}
-            </div>
-        {/block}
-
-        {if $cookieGroups}
-            {block name='frontend_index_cookie_consent_manager_configuration'}
-                    <div class='cookie-consent--configuration'>
-                        {block name="frontend_index_cookie_consent_manager_configuration_header"}
-                            <div class='cookie-consent--configuration-header'>
-                                <div class='cookie-consent--configuration-header-text'>{s name="manager/configuration/title"}{/s}</div>
+                                {block name="frontend_index_cookie_consent_manager_configuration_container"}
+                                    <div id="cookie-consent--configuration-main" class='cookie-consent--configuration-main panel-group' role="tablist" aria-multiselectable="true">
+                                        {foreach $cookieGroups as $cookieGroup}
+                                            {if $cookieGroup['cookies']|count}
+                                                {include file="frontend/index/cookie_consent/group.tpl"}
+                                            {/if}
+                                        {/foreach}
+                                    </div>
+                                {/block}
                             </div>
-                        {/block}
-
-                        {block name="frontend_index_cookie_consent_manager_configuration_container"}
-                            <div class='cookie-consent--configuration-main'>
-                                {foreach $cookieGroups as $cookieGroup}
-                                    {if $cookieGroup['cookies']|count}
-                                       {include file="frontend/index/cookie_consent/group.tpl"}
-                                    {/if}
-                                {/foreach}
+                        {/if}
+                    {/block}
+                </div>
+                {if $cookieGroups}
+                    <div class="modal-footer">
+                        {block name="frontend_index_cookie_consent_manager_save"}
+                            <div class="cookie-consent--save">
+                                <input class="cookie-consent--save-button btn btn-primary" type="button" value="{s name="manager/save"}{/s}" />
                             </div>
                         {/block}
                     </div>
+                {/if}
             {/block}
-
-            {block name="frontend_index_cookie_consent_manager_save"}
-                <div class="cookie-consent--save">
-                    <input class="cookie-consent--save-button btn is--primary" type="button" value="{s name="manager/save"}{/s}" />
-                </div>
-            {/block}
-        {/if}
-    {/block}
-</div>
\ No newline at end of file
+        </div>
+    </div>
+</div>
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl
index 3f61ed3..90d349e 100644
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl
@@ -1,43 +1,45 @@
 {block name="frontend_index_cookie_consent_manager_group"}
-    <div class='cookie-consent--group'>
+    <div class='cookie-consent--group panel panel-default'>
         {block name="frontend_index_cookie_consent_manager_group_name_input"}
             <input type="hidden" class="cookie-consent--group-name" value="{$cookieGroup['name']}" />
         {/block}
 
-        {block name="frontend_index_cookie_consent_manager_group_state_input"}
-            <label class="cookie-consent--group-state cookie-consent--state-input{if $cookieGroup['required']} cookie-consent--required{/if}">
-                <input type="checkbox" name="{$cookieGroup['name']}-state" class="cookie-consent--group-state-input"{if $cookieGroup['required']} disabled="disabled" checked="checked"{/if}/>
-                <span class="cookie-consent--state-input-element"></span>
-            </label>
-        {/block}
-
         {block name="frontend_index_cookie_consent_manager_group_title"}
-            <div class='cookie-consent--group-title' data-collapse-panel='true' data-contentSiblingSelector=".cookie-consent--group-container">
-                <div class="cookie-consent--group-title-label cookie-consent--state-label">
-                    {$cookieGroup['label']|truncate:25}
-                </div>
-
-                <span class="cookie-consent--group-arrow is-icon--right">
-                    <i class="icon--arrow-right"></i>
-                </span>
+        <div class="panel-heading" role="tab">
+            <div class="panel-title">
+                <label class="cookie-consent--group-state cookie-consent--state-input{if $cookieGroup['required']} cookie-consent--required{/if}">
+                    <input type="checkbox" name="{$cookieGroup['name']}-state" class="cookie-consent--group-state-input"{if $cookieGroup['required']} disabled="disabled" checked="checked"{/if}/>
+                    <span class="cookie-consent--state-input-element"></span>
+                </label>
+                <a href="#cookie-consent--group-{$cookieGroup@key}" class='cookie-consent--group-title' role="button" data-toggle="collapse" data-parent="#cookie-consent--configuration-main">
+                    <span class="cookie-consent--group-title-label cookie-consent--state-label">
+                        {$cookieGroup['label']|truncate:25}
+                    </span>
+                    <i class="cookie-consent--group-state-icon fa fa-chevron-down"></i>
+                </a>
             </div>
+        </div>
         {/block}
 
         {if $cookieGroup['description'] || $cookieGroup['cookies']}
             {block name="frontend_index_cookie_consent_manager_group_container"}
-                <div class='cookie-consent--group-container'>
-                    {if {$cookieGroup['description']}}
-                        {block name="frontend_index_cookie_consent_manager_group_description"}
-                            <div class='cookie-consent--group-description'>
-                                {$cookieGroup['description']}
-                            </div>
-                        {/block}
-                    {/if}
+                <div id="cookie-consent--group-{$cookieGroup@key}" class='cookie-consent--group-container panel-collapse collapse'>
+                    <div class="panel-body">
+                        {if {$cookieGroup['description']}}
+                            {block name="frontend_index_cookie_consent_manager_group_description"}
+                                <p class='cookie-consent--group-description text-muted'>
+                                    {$cookieGroup['description']}
+                                </p>
+                            {/block}
+                        {/if}
 
-                    <div class='cookie-consent--cookies-container'>
-                        {foreach $cookieGroup['cookies'] as $cookie}
-                            {include file="frontend/index/cookie_consent/cookie.tpl"}
-                        {/foreach}
+                        <ul class='cookie-consent--cookies-container list-group'>
+                            {foreach $cookieGroup['cookies'] as $cookie}
+                                <li class="list-group-item">
+                                    {include file="frontend/index/cookie_consent/cookie.tpl"}
+                                </li>
+                            {/foreach}
+                        </ul>
                     </div>
                 </div>
             {/block}
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
index 1221acf..fb759be 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
@@ -351,6 +351,7 @@
                         { device: 'desktop', enter: 1260, exit: 5160 }
                     ];
 
+                    var cookieRemoval = cookieRemoval || {config name="cookie_note_mode"};
                 {/block}
             </script>
         {/block}
diff --git a/Resources/Themes/Frontend/BootstrapBare/widgets/index/statistic_include.tpl b/Resources/Themes/Frontend/BootstrapBare/widgets/index/statistic_include.tpl
index c4fa63f..001d39e 100755
--- a/Resources/Themes/Frontend/BootstrapBare/widgets/index/statistic_include.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/widgets/index/statistic_include.tpl
@@ -1,10 +1,43 @@
 {block name="widgets_index_statistic_include"}
     <iframe id="refresh-statistics" width="0" height="0" style="display:none;"></iframe>
-    <script type="text/javascript">
+    <script>
+        /**
+         * @returns { boolean }
+         */
+        function hasCookiesAllowed () {
+            if (window.cookieRemoval === 0) {
+                return true;
+            }
+
+            if (window.cookieRemoval === 1) {
+                if (document.cookie.indexOf('cookiePreferences') !== -1) {
+                    return true;
+                }
+
+                return document.cookie.indexOf('cookieDeclined') === -1;
+            }
+
+            /**
+             * Must be cookieRemoval = 2, so only depends on existence of `allowCookie`
+             */
+            return document.cookie.indexOf('allowCookie') !== -1;
+        }
+
+        /**
+         * @returns { boolean }
+         */
+        function isDeviceCookieAllowed () {
+            var cookiesAllowed = hasCookiesAllowed();
+
+            if (window.cookieRemoval !== 1) {
+                return cookiesAllowed;
+            }
+
+            return cookiesAllowed && document.cookie.indexOf('"name":"x-ua-device","active":true') !== -1;
+        }
+
         (function(window, document) {
-            var cok = document.cookie.match(/session-{$Shop->getId()}=([^;])+/g),
-                sid = (cok && cok[0]) ? cok[0] : null,
-                par = document.location.search.match(/sPartner=([^&])+/g),
+            var par = document.location.search.match(/sPartner=([^&])+/g),
                 pid = (par && par[0]) ? par[0].substring(9) : null,
                 cur = document.location.protocol + '//' + document.location.host,
                 ref = document.referrer.indexOf(cur) === -1 ? document.referrer : null,
@@ -12,17 +45,16 @@
                 pth = document.location.pathname.replace("{url controller=index}", "/");
 
             url += url.indexOf('?') === -1 ? '?' : '&';
-            url += 'requestPage=' + encodeURI(pth);
+            url += 'requestPage=' + encodeURIComponent(pth);
             url += '&requestController=' + encodeURI("{$Controller|escape}");
-            if(sid) { url += '&' + sid; }
             if(pid) { url += '&partner=' + pid; }
-            if(ref) { url += '&referer=' + encodeURI(ref); }
+            if(ref) { url += '&referer=' + encodeURIComponent(ref); }
             {if $sArticle.articleID}
             url += '&articleId=' + encodeURI("{$sArticle.articleID}");
             {/if}
 
             {* Early simple device detection for statistics, duplicated in StateManager for resizes *}
-            if (document.cookie.indexOf('x-ua-device') === -1) {
+            if (isDeviceCookieAllowed()) {
                 var i = 0,
                     device = 'desktop',
                     width = window.innerWidth,
@@ -41,10 +73,9 @@
                 document.cookie = 'x-ua-device=' + device + '; path=/';
             }
 
-            document.asyncReady(function(){
-                var frm = document.getElementById('refresh-statistics');
-                frm.src = url;
-            });
+            document
+                .getElementById('refresh-statistics')
+                .src = url;
         })(window, document);
     </script>
 {/block}

From 25a1455148cfa445fc0c6b2e4e8a9084eacaf252 Mon Sep 17 00:00:00 2001
From: thomasfrobieter <tf@webks.de>
Date: Tue, 14 Jan 2020 12:21:56 +0100
Subject: [PATCH 33/37] [Intermediate commit] Further implementation of the
 shopware cookie consent solution >> Removed console logs

---
 .../_public/vendors/js/shopware/jquery.cookie-permission.js     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
index 9752bcc..ed22bbb 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
@@ -127,8 +127,6 @@
             me.preparePrivacyLink();
             me.registerEvents();
             me.displayCookiePermission(function(display) {
-                console.log('display:');
-                console.log(display);
                 if (display) {
                     me.showElement();
                 }

From adebbc7461e506330f837e2d1a1d581a64510478 Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Thu, 16 Jan 2020 10:57:24 +0100
Subject: [PATCH 34/37] Improved swbt.modal.js a lot to better match SW
 jquery.modal.js core implementation in parameters.

---
 .../frontend/_public/src/js/swbt.modal.js     | 1372 ++++++++++++-----
 1 file changed, 1014 insertions(+), 358 deletions(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt.modal.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt.modal.js
index 42ee1de..eb73732 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt.modal.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/src/js/swbt.modal.js
@@ -1,358 +1,1014 @@
-;(function ($) {
-    "use strict";
-
-    var $body = $('body');
-
-    $.plugin('imgModal', {
-        defaults: {
-            responsiveImgClass: 'img-responsive img-center',
-            imgModalSelector: 'img-modal',
-            imgModalGallerySelector: 'img-modal-gallery',
-            detailGallery: '#gallery',
-            detailModalAttr: '-modal',
-            detailThumbs: '#thumbs',
-            href: false,
-            title: '',
-            'modal-size': 'modal-lg', // modal-sm | modal-md | modal-lg | modal-full
-            'modal-gallery-url': false
-        },
-
-        init: function () {
-            var me = this;
-
-            me.modalBody = '';
-            me.modalSelector = me.opts.imgModalSelector;
-
-            me.applyDataAttributes();
-            me.registerEvents();
-
-            $.publish('plugin/imgModal/onInit', [ me ]);
-        },
-
-        registerEvents: function () {
-            var me = this;
-
-            me._on(me.$el, 'click', $.proxy(me.openModal, me));
-
-            $.publish('plugin/imgModal/onRegisterEvents', [ me ]);
-        },
-
-        setSliderAttributes: function($slider) {
-            var opts = $slider.attr('data-modal-gallery-opts');
-
-            if (opts) {
-                $.each($.parseJSON(opts), function(key, value) {
-                    $slider.attr('data-' + key, JSON.stringify(value));
-                });
-            }
-        },
-
-        openModal: function (event) {
-            event.preventDefault();
-            var me = this,
-                imgSrc = me.opts.href || me.$el.attr("href");
-
-            if (!imgSrc) {
-                return;
-            }
-
-            if (!me.opts['modal-gallery-url']) {
-                me.modalBody = '<a href="" data-dismiss="modal"><img src="' + imgSrc + '" class="' + me.opts.responsiveImgClass + '"></a>';
-                $('body').createModal(me.modalBody, me.opts['modal-size'], me.opts.imgModalSelector + ' fade', me.opts.title);
-            } else {
-                $body.loader('show');
-                $.publish('plugin/imgModal/beforeOpenModal', [ me ]);
-
-                $.ajax({
-                    url: safeUrl(me.opts['modal-gallery-url']),
-                    type: 'GET',
-                    dataType: 'html',
-                    success: function (result) {
-                        var $detail = $(result),
-                            $gallery = $detail.find(me.opts.detailGallery),
-                            $thumbs = $detail.find(me.opts.detailThumbs);
-
-                        // id's need to be me made unique again
-                        $gallery.attr('id', $gallery.attr('id') + me.opts.detailModalAttr);
-                        $thumbs.attr('id', $thumbs.attr('id') + me.opts.detailModalAttr);
-
-                        // asnavfor data attribute needs to be updated with the new id's
-                        $gallery.attr('data-asnavfor', '#' + $thumbs.attr('id'));
-                        $thumbs.attr('data-asnavfor', '#' + $gallery.attr('id'));
-
-                        // remove data-toggle="img-modal"
-                        $gallery.find('[data-toggle="img-modal"]').attr('data-toggle', false).attr('href', '#');
-
-                        // set slider options
-                        me.setSliderAttributes($thumbs);
-                        me.setSliderAttributes($gallery);
-
-                        if ($gallery[0] && $thumbs[0]) {
-                            $body.createModal($gallery[0].outerHTML + $thumbs[0].outerHTML, me.opts['modal-size'], me.opts.imgModalGallerySelector + ' fade', me.opts.title, false, function(modal){
-                                picturefill();
-                                $(modal).find('.slick').slickWrapper();
-                                $body.loader('hide');
-                            });
-                        } else {
-                            $body.loader('hide');
-                        }
-
-                        $.publish('plugin/imgModal/afterOpenModal', [ me ]);
-                    }
-                });
-            }
-
-            $.publish('plugin/imgModal/onOpenModal', [ me ]);
-        }
-    });
-
-    $.plugin('ajaxModal', {
-
-        defaults: {
-            customModalClass: 'custom-page-modal',
-            'modal-class': '',
-            modalWrapperClassSelector :'.modal-dialog',
-            modalSelector: 'modal',
-            href: false,
-            'modal-size': 'modal-md' // modal-sm | modal-md | modal-lg | modal-full
-        },
-
-        init: function () {
-            var me = this;
-
-            me.applyDataAttributes();
-            me.registerEvents();
-
-            $.publish('plugin/ajaxModal/onInit', [ me ]);
-        },
-
-        registerEvents: function () {
-            var me = this;
-
-            me._on(me.$el, 'click', $.proxy(me.openModal, me));
-
-            $.publish('plugin/ajaxModal/onRegisterEvents', [ me ]);
-        },
-
-        openModal: function (event) {
-            event.preventDefault();
-            var me = this,
-                link = me.opts.href || me.$el.attr("href");
-
-            if (!link) {
-                return;
-            }
-
-            $body.loader('show');
-            $.publish('plugin/ajaxModal/beforeOpenModal', [ me ]);
-
-            $.ajax(safeUrl(link), {
-                data: {
-                    isXHR: 1
-                },
-                success: function (data) {
-
-                    me.modalData = data;
-
-                    $.publish('plugin/ajaxModal/beforeCreateModal', [ me ]);
-
-                    $body.showModal(me.modalData, me.opts.customModalClass + ' ' + me.opts['modal-class'], function(modal){
-                        $body.loader('hide');
-
-                        var $modal = $(modal);
-
-                        // add modal size classes
-                        $modal.find(me.opts.modalWrapperClassSelector).addClass(me.opts['modal-size']);
-                        if (me.opts['modal-size'] == 'modal-full') {
-                            $modal.addClass('fullscreen');
-                        }
-
-                        $modal.swSelectboxReplacement();
-
-                        picturefill();
-
-                        me.$modal = $modal;
-
-                        $.publish('plugin/ajaxModal/afterCreateModal', [ me ]);
-                    });
-
-                    $.publish('plugin/ajaxModal/afterOpenModal', [ me ]);
-                }
-            });
-
-            $.publish('plugin/ajaxModal/onOpenModal', [ me ]);
-        }
-    });
-
-    $.plugin('notifyModal', {
-        defaults: {
-            notifyModalSelector: '.notify-modal-alert',
-            articleNotificationSelector: '#article_notification',
-            modalAlertSelector: '.alert-info, .alert-success',
-            notifyModalFormSelector: '.notify-modal-form',
-            notifyModalIdSelector: '[id*="notifyModal"]',
-            notifyModalClassSelector: '.modal[id^=notifyModal-]'
-        },
-
-        init: function () {
-            var me = this;
-
-            me.applyDataAttributes();
-            me.registerEvents();
-
-            $.publish('plugin/notifyModal/onInit', [ me ]);
-        },
-
-        registerEvents: function () {
-            var me = this;
-
-            me._on(me.$el, 'click', $.proxy(me.openModal, me));
-
-            // reset notify modal content
-            $(me.opts.notifyModalClassSelector).on('show.bs.modal', function () {
-                $(me.opts.notifyModalFormSelector).removeClass('hidden');
-                $(me.opts.notifyModalSelector).html('');
-            });
-
-            $.publish('plugin/notifyModal/onRegisterEvents', [ me ]);
-        },
-
-        openModal: function (event) {
-            event.preventDefault();
-            var me = this,
-                $form = me.$el.closest('form');
-
-            me.$el.loader('show');
-            $.publish('plugin/notifyModal/beforeOpenModal', [ me ]);
-
-            $.ajax({
-                type: 'POST',
-                url: safeUrl($form.attr('action')),
-                data: $form.serialize(),
-                beforeSend: function (xhr) { // change header, complete template needs to be loaded
-                    xhr.setRequestHeader('X-Requested-With', {
-                            toString: function () {
-                                return '';
-                            }
-                        }
-                    );
-                }
-            }).done(function(response) {
-                var $alertContainer = $(me.opts.notifyModalSelector);
-
-                $alertContainer.html($(response).find(me.opts.articleNotificationSelector).html());
-
-                if ($alertContainer.find(me.opts.modalAlertSelector).length > 0) {
-                    me.$el.parents(me.opts.notifyModalIdSelector).find('form').addClass('hidden');
-                }
-
-                me.$el.loader('hide');
-
-                $.publish('plugin/notifyModal/afterOpenModal', [ me ]);
-            });
-
-            $.publish('plugin/notifyModal/onOpenModal', [ me ]);
-        }
-    });
-}(jQuery));
-
-// creates a new modal out of an existing html structure (e.g. the result of an ajax request)
-$.fn.showModal = function(content, selector, callback, options) {
-    var id = Math.floor(Math.random()*1000)+1,
-        selector = selector || 'default',
-        callback = callback || function(){},
-        options = options || {},
-        mergedOptions = $.extend({show:true}, options),
-        modal = '<div id="modal' + id + '" class="' + selector + ' modal">' + content + '</div>';
-
-    $(this).append(modal);
-    var $modal = $('#modal'+id);
-
-    $modal.on('shown.bs.modal',function (){
-        callback(this);
-    });
-    $modal.on('hidden.bs.modal',function (){
-        $modal.remove();
-    });
-    $modal.modal(mergedOptions);
-
-    return $modal;
-};
-
-// creates a new modal on the fly (the delivered content is wrapped in the standard bootstrap modal html structure)
-$.fn.createModal = function(body, size, selector, header, footer, callback){
-    var modalTemplate = {
-        start: '<div class="modal-dialog"><div class="modal-content">',
-        headerstart: '<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times</button><h4 class="modal-title">',
-        headerend: '</h4></div>',
-        bodystart: '<div class="modal-body">',
-        bodyend: '</div>',
-        footerstart: '<div class="modal-footer">',
-        footerend: '</div>',
-        end: '</div></div>',
-        error: '<span class="text-danger">Modal konnte nicht geladen werden</span>'
-    };
-
-    var id = Math.floor(Math.random()*1000)+1,
-        callback = callback || function(){},
-        modal = '<div id="modal'+id+'" class="'+selector+' modal">'+modalTemplate.start;
-
-    if (header)
-        modal = modal + modalTemplate.headerstart + header + modalTemplate.headerend;
-    if (body)
-        modal = modal + modalTemplate.bodystart + body + modalTemplate.bodyend;
-    if (footer)
-        modal = modal + modalTemplate.footerstart + footer + modalTemplate.footerend;
-    if (!header&&!body&&!footer)
-        modal = modal + modalTemplate.headerstart + modalTemplate.error + modalTemplate.headerend;
-
-    modal = modal + modalTemplate.end + '</div>';
-    $(this).append(modal);
-    var $modal = $('#modal'+id);
-
-    if (size) {
-        $modal.find('.modal-dialog').addClass(size);
-
-        // add modal size classes
-        if (size == 'modal-full') {
-            $modal.addClass('fullscreen');
-        }
-    }
-
-    $modal.on('shown.bs.modal',function (){
-        callback(this);
-    });
-    $modal.on('hidden.bs.modal',function (){
-        $modal.remove();
-    });
-    $modal.modal('show');
-
-    return $modal;
-};
-
-// escape close
-$(document).on('keydown',function(e){
-    if(e.keyCode === 27) $("[id^=modal]").modal('hide');
-});
-
-// create shopware modal fallback to prevent js errors in shopware plugins
-;(function($, window) {
-    'use strict';
-
-    $.modal = {
-        open: function(content) {
-            $('body').showModal(
-                content,
-                false,
-                function() {
-                    $('body').loader('hide');
-                }
-            );
-        }
-    };
-
-    $.plugin('swModalbox', {
-        init: function () {}
-    });
-
-})(jQuery, window);
+; (function ($) {
+    "use strict";
+
+    var $body = $('body');
+
+    // create shopware modal fallback to prevent js errors in shopware plugins
+    $.modal = {
+        /**
+         * The complete template wrapped in jQuery.
+         *
+         * @private
+         * @property _$modalBox
+         * @type {jQuery}
+         */
+        _$modalBox: null,
+
+        /**
+         * Container for the title wrapped in jQuery.
+         *
+         * @private
+         * @property _$header
+         * @type {jQuery}
+         */
+        _$header: null,
+
+        /**
+         * The title element wrapped in jQuery.
+         *
+         * @private
+         * @property _$title
+         * @type {jQuery}
+         */
+        _$title: null,
+
+        /**
+         * The content element wrapped in jQuery.
+         *
+         * @private
+         * @property _$content
+         * @type {jQuery}
+         */
+        _$content: null,
+
+        /**
+         * The close button wrapped in jQuery.
+         *
+         * @private
+         * @property _$closeButton
+         * @type {jQuery}
+         */
+        _$closeButton: null,
+
+        /**
+         * Default options of a opening session.
+         *
+         * @public
+         * @property defaults
+         * @type {jQuery}
+         */
+        defaults: {
+            /**
+             * The mode in which the lightbox should be showing.
+             *
+             * 'local':
+             *
+             * The given content is either text or HTML.
+             *
+             * 'ajax':
+             *
+             * The given content is the URL from what it should load the HTML.
+             *
+             * 'iframe':
+             *
+             * The given content is the source URL of the iframe.
+             *
+             * @type {String}
+             */
+            mode: 'local',
+
+            /**
+             * Sizing mode of the modal box.
+             *
+             * 'auto':
+             *
+             * Will set the given width as max-width so the container can shrink.
+             * Fullscreen mode on small mobile devices.
+             *
+             * 'fixed':
+             *
+             * Will use the width and height as static sizes and will not change to fullscreen mode.
+             *
+             * 'content':
+             *
+             * Will use the height of its content instead of a given height.
+             * The 'height' option will be ignored when set.
+             *
+             * 'full':
+             *
+             * Will set the modalbox to fullscreen.
+             *
+             * @type {String}
+             */
+            sizing: 'modal-lg',
+
+            /**
+             * The width of the modal box window.
+             * NOT used for bsmodal!
+             *
+             * @type {Number}
+             */
+            width: false,
+
+            /**
+             * The height of the modal box window.
+             * NOT used for bsmodal!
+             *
+             * @type {Number}
+             */
+            height: false,
+
+            /**
+             * The max height if sizing is set to `content`.
+             * NOT used for bsmodal!
+             *
+             * @type {Number}
+             */
+            maxHeight: false,
+
+            /**
+             * Whether or not the overlay should be shown.
+             * NOT used for bsmodal! It always has an overlay!
+             *
+             * @type {Boolean}
+             */
+            overlay: true,
+
+            /**
+             * Whether or not the modal box should be closed when the user clicks on the overlay.
+             * NOT used for bsmodal!
+             *
+             * @type {Boolean}
+             */
+            closeOnOverlay: true,
+
+            /**
+             * Whether or not the closing button should be shown.
+             * Not used for bsmodal!
+             *
+             * @type {Boolean}
+             */
+            showCloseButton: true,
+
+            /**
+             * Speed for every CSS transition animation.
+             * NOT used for bsmodal!
+             *
+             * @type {Number}
+             */
+            animationSpeed: 500,
+
+            /**
+             * The window title of the modal box.
+             * If empty, the header will be hidden.
+             *
+             * @type {String}
+             */
+            title: '',
+
+            /**
+             * Will be overridden by the current URL when the mode is 'ajax' or 'iframe'.
+             * Can be accessed by the options object.
+             * NOT used for bsmodal!
+             *
+             * @type {String}
+             */
+            src: '',
+
+            /**
+             * Array of key codes the modal box can be closed.
+             *
+             * @type {Array}
+             */
+            closeKeys: [27],
+
+            /**
+             * Whether or not it is possible to close the modal box by the keyboard.
+             *
+             * @type {Boolean}
+             */
+            keyboardClosing: true,
+
+            /**
+             * Function which will be called when the modal box is closing.
+             *
+             * @type {Function}
+             */
+            onClose: function () {},
+
+            /**
+             * Whether or not the picturefill function will be called when setting content.
+             * NOT used for bsmodal!
+             *
+             * @type {Boolean}
+             */
+            updateImages: false,
+
+            /**
+             * Class that will be added to the modalbox.
+             *
+             * @type {String}
+             */
+            additionalClass: '',
+            footer: null,
+            id: null,
+        },
+
+        /**
+         * The current merged options of the last .open() call.
+         *
+         * @public
+         * @property options
+         * @type {Object}
+         */
+        options: {},
+
+        /**
+         * Opens the modal box.
+         * Sets the given content and applies the given options to the current session.
+         * If given, the overlay options will be passed in its .open() call.
+         *
+         * @public
+         * @method open
+         * @param {String|jQuery|HTMLElement} content
+         * @param {Object} options
+         */
+        open: function (content, options) {
+            var me = this,
+                $modalBox = me._$modalBox,
+                opts;
+
+            me.options = opts = $.extend({}, me.defaults, options);
+
+            // Bootstrap Modal start:
+            $('body').createModal(content, opts.sizing, opts.additionalClass + ' fade', opts.title, opts.footer, function(){}, opts);
+            // Bootstrap Modal end:
+
+            $.publish('plugin/swModal/onOpen', [ me ]);
+            return me;
+        },
+
+        /**
+         * Closes the modal box and the overlay if its enabled.
+         * if the fading is completed, the content will be removed.
+         *
+         * @public
+         * @method close
+         */
+        close: function () {
+            var me = this,
+                opts = me.options,
+                $modalBox = me._$modalBox;
+
+            // TODO: Expected to work, but undefined:
+            // me.$el.modal('hide');
+            // Workaround:
+            $(".modal").modal('hide');
+
+            $.publish('plugin/swModal/onClose', [ me ]);
+
+            return me;
+        },
+
+        /**
+         * Sets the transition of the modal box.
+         *
+         * @public
+         * @method setTransition
+         * @param {Object} css
+         * @param {Number} duration
+         * @param {String} animation
+         * @param {Function} callback
+         */
+        setTransition: function (css, duration, animation, callback) {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+
+            var me = this,
+                // $modalBox = me._$modalBox,
+                opts = $.extend({
+                    animation: 'ease',
+                    duration: me.options.animationSpeed
+                }, {
+                    animation: animation,
+                    duration: duration
+                });
+
+            // if (!$.support.transition) {
+            //     $modalBox.stop(true).animate(css, opts.duration, opts.animation, callback);
+            //     return;
+            // }
+
+            // $modalBox.stop(true).transition(css, opts.duration, opts.animation, callback);
+
+            $.publish('plugin/swModal/onSetTransition', [ me, css, opts ]);
+        },
+
+        /**
+         * Sets the title of the modal box.
+         *
+         * @public
+         * @method setTitle
+         * @param {String} title
+         */
+        setTitle: function (title) {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+            var me = this;
+
+            // me._$title.html(title);
+
+            $.publish('plugin/swModal/onSetTitle', [ me, title ]);
+        },
+
+        /**
+         * Sets the content of the modal box.
+         *
+         * @public
+         * @method setContent
+         * @param {String|jQuery|HTMLElement} content
+         */
+        setContent: function (content) {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+
+            var me = this,
+                opts = me.options;
+
+            // me._$content.html(content);
+
+            // if (opts.sizing === 'content') {
+            //     // initial centering
+            //     me.center();
+
+            //     // centering again to fix some styling/positioning issues
+            //     window.setTimeout(me.center.bind(me), 25);
+            // }
+
+            // if (opts.updateImages) {
+            //     picturefill();
+            // }
+
+            $.publish('plugin/swModal/onSetContent', [ me ]);
+        },
+
+        /**
+         * Sets the width of the modal box.
+         * If a string was passed containing a only number, it will be parsed as a pixel value.
+         *
+         * @public
+         * @method setWidth
+         * @param {Number|String} width
+         */
+        setWidth: function (width) {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+            var me = this;
+
+            // me._$modalBox.css('width', (typeof width === 'string' && !(/^\d+$/.test(width))) ? width : parseInt(width, 10));
+
+            $.publish('plugin/swModal/onSetWidth', [ me ]);
+        },
+
+        /**
+         * Sets the height of the modal box.
+         * If a string was passed containing a only number, it will be parsed as a pixel value.
+         *
+         * @public
+         * @method setHeight
+         * @param {Number|String} height
+         */
+        setHeight: function (height) {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+            var me = this,
+                hasTitle = me._$title.text().length > 0,
+                headerHeight;
+
+            // height = (typeof height === 'string' && !(/^\d+$/.test(height))) ? height : window.parseInt(height, 10);
+
+            // if (hasTitle) {
+            //     headerHeight = window.parseInt(me._$header.css('height'), 10);
+            //     me._$content.css('height', (height - headerHeight));
+            // } else {
+            //     me._$content.css('height', '100%');
+            // }
+
+            // me._$modalBox.css('height', height);
+            $.publish('plugin/swModal/onSetHeight', [ me ]);
+        },
+
+        /**
+         * Sets the max height of the modal box if the provided value is not empty or greater than 0.
+         * If a string was passed containing a only number, it will be parsed as a pixel value.
+         *
+         * @public
+         * @method setMaxHeight
+         * @param {Number|String} height
+         */
+        setMaxHeight: function (height) {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+            var me = this;
+
+            // if (!height) {
+            //     return;
+            // }
+
+            // height = (typeof height === 'string' && !(/^\d+$/.test(height))) ? height : window.parseInt(height, 10);
+
+            // me._$modalBox.css('max-height', height);
+            $.publish('plugin/swModal/onSetMaxHeight', [ me ]);
+        },
+
+        /**
+         * Creates the modal box and all its elements.
+         * Appends it to the body.
+         *
+         * @public
+         * @method initModalBox
+         */
+        initModalBox: function () {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+            var me = this;
+
+            // me._$modalBox = $('<div>', {
+            //     'class': 'js--modal'
+            // });
+
+            // me._$header = $('<div>', {
+            //     'class': 'header'
+            // }).appendTo(me._$modalBox);
+
+            // me._$title = $('<div>', {
+            //     'class': 'title'
+            // }).appendTo(me._$header);
+
+            // me._$content = $('<div>', {
+            //     'class': 'content'
+            // }).appendTo(me._$modalBox);
+
+            // me._$closeButton = $('<div>', {
+            //     'class': 'btn icon--cross is--small btn--grey modal--close'
+            // }).appendTo(me._$modalBox);
+
+            // $('body').append(me._$modalBox);
+
+            $.publish('plugin/swModal/onInit', [ me ]);
+        },
+
+        /**
+         * Registers all needed event listeners.
+         *
+         * @public
+         * @method registerEvents
+         */
+        registerEvents: function () {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+            var me = this,
+                $window = $(window);
+
+            // me._$closeButton.on('click.modal touchstart.modal', $.proxy(me.close, me));
+
+            // $window.on('keydown.modal', $.proxy(me.onKeyDown, me));
+            // StateManager.on('resize', me.onWindowResize, me);
+
+            // StateManager.registerListener({
+            //     state: 'xs',
+            //     enter: function() {
+            //         me._$modalBox.addClass('is--fullscreen');
+            //     },
+            //     exit: function () {
+            //         me._$modalBox.removeClass('is--fullscreen');
+            //     }
+            // });
+
+            $.publish('plugin/swModal/onRegisterEvents', [ me ]);
+        },
+
+        /**
+         * Called when a key was pressed.
+         * Closes the modal box when the keyCode is mapped to a close key.
+         *
+         * @public
+         * @method onKeyDown
+         */
+        onKeyDown: function (event) {
+
+            var me = this,
+                keyCode = event.which,
+                keys = me.options.closeKeys,
+                len = keys.length,
+                i = 0;
+
+            if (!me.options.keyboardClosing) {
+                return;
+            }
+
+            for (; i < len; i++) {
+                if (keys[i] === keyCode) {
+                    me.close();
+                }
+            }
+
+            $.publish('plugin/swModal/onKeyDown', [ me, event, keyCode ]);
+        },
+
+        /**
+         * Called when the window was resized.
+         * Centers the modal box when the sizing is set to 'content'.
+         *
+         * @public
+         * @method onWindowResize
+         */
+        onWindowResize: function (event) {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+            var me = this;
+
+            // if (me.options.sizing === 'content') {
+            //     me.center();
+            // }
+
+            $.publish('plugin/swModal/onWindowResize', [ me, event ]);
+        },
+
+        /**
+         * Sets the top position of the modal box to center it to the screen
+         *
+         * @public
+         * @method centerModalBox
+         */
+        center: function () {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+            var me = this,
+                $modalBox = me._$modalBox,
+                windowHeight = window.innerHeight || $(window).height();
+
+            // $modalBox.css('top', (windowHeight - $modalBox.height()) / 2);
+
+            $.publish('plugin/swModal/onCenter', [ me ]);
+        },
+
+        /**
+         * Called when the overlay was clicked.
+         * Closes the modalbox when the 'closeOnOverlay' option is active.
+         *
+         * @public
+         * @method onOverlayClose
+         */
+        onOverlayClose: function () {
+            var me = this;
+
+            if (!me.options.closeOnOverlay) {
+                return;
+            }
+
+            me.close();
+
+            $.publish('plugin/swModal/onOverlayClick', [ me ]);
+        },
+
+        /**
+         * Removes the current modalbox element from the DOM and destroys its items.
+         * Also clears the options.
+         *
+         * @public
+         * @method destroy
+         */
+        destroy: function () {
+            // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+            // Original Responsive Theme Code:
+            var me = this,
+                p;
+
+            // me._$modalBox.remove();
+
+            // me._$modalBox = null;
+            // me._$header = null;
+            // me._$title = null;
+            // me._$content = null;
+            // me._$closeButton = null;
+
+            // for (p in me.options) {
+            //     if (!me.options.hasOwnProperty(p)) {
+            //         continue;
+            //     }
+            //     delete me.options[p];
+            // }
+
+            // StateManager.off('resize', me.onWindowResize, [ me ]);
+        }
+    };
+
+    $.plugin('swModalbox', {
+        // TODO: NO YET IMPLEMENTED FOR Bootstrap Theme!
+        init: function () {
+            console.error('This pluigin function is not yet implemented in swbt theme!');
+        },
+        open: function() {
+            console.error('This pluigin function is not yet implemented in swbt theme!');
+        },
+        close: function() {
+            console.error('This pluigin function is not yet implemented in swbt theme!');
+        },
+    });
+
+    $.plugin('imgModal', {
+        defaults: {
+            responsiveImgClass: 'img-responsive img-center',
+            imgModalSelector: 'img-modal',
+            imgModalGallerySelector: 'img-modal-gallery',
+            detailGallery: '#gallery',
+            detailModalAttr: '-modal',
+            detailThumbs: '#thumbs',
+            href: false,
+            title: '',
+            'modal-size': 'modal-lg', // modal-sm | modal-md | modal-lg | modal-full
+            'modal-gallery-url': false
+        },
+
+        init: function () {
+            var me = this;
+
+            me.modalBody = '';
+            me.modalSelector = me.opts.imgModalSelector;
+
+            me.applyDataAttributes();
+            me.registerEvents();
+
+            $.publish('plugin/imgModal/onInit', [me]);
+        },
+
+        registerEvents: function () {
+            var me = this;
+
+            me._on(me.$el, 'click', $.proxy(me.openModal, me));
+
+            $.publish('plugin/imgModal/onRegisterEvents', [me]);
+        },
+
+        setSliderAttributes: function ($slider) {
+            var opts = $slider.attr('data-modal-gallery-opts');
+
+            if (opts) {
+                $.each($.parseJSON(opts), function (key, value) {
+                    $slider.attr('data-' + key, JSON.stringify(value));
+                });
+            }
+        },
+
+        openModal: function (event) {
+            event.preventDefault();
+            var me = this,
+                imgSrc = me.opts.href || me.$el.attr("href");
+
+            if (!imgSrc) {
+                return;
+            }
+
+            if (!me.opts['modal-gallery-url']) {
+                me.modalBody = '<a href="" data-dismiss="modal"><img src="' + imgSrc + '" class="' + me.opts.responsiveImgClass + '"></a>';
+                $('body').createModal(me.modalBody, me.opts['modal-size'], me.opts.imgModalSelector + ' fade', me.opts.title);
+            } else {
+                $body.loader('show');
+                $.publish('plugin/imgModal/beforeOpenModal', [me]);
+
+                $.ajax({
+                    url: safeUrl(me.opts['modal-gallery-url']),
+                    type: 'GET',
+                    dataType: 'html',
+                    success: function (result) {
+                        var $detail = $(result),
+                            $gallery = $detail.find(me.opts.detailGallery),
+                            $thumbs = $detail.find(me.opts.detailThumbs);
+
+                        // id's need to be me made unique again
+                        $gallery.attr('id', $gallery.attr('id') + me.opts.detailModalAttr);
+                        $thumbs.attr('id', $thumbs.attr('id') + me.opts.detailModalAttr);
+
+                        // asnavfor data attribute needs to be updated with the new id's
+                        $gallery.attr('data-asnavfor', '#' + $thumbs.attr('id'));
+                        $thumbs.attr('data-asnavfor', '#' + $gallery.attr('id'));
+
+                        // remove data-toggle="img-modal"
+                        $gallery.find('[data-toggle="img-modal"]').attr('data-toggle', false).attr('href', '#');
+
+                        // set slider options
+                        me.setSliderAttributes($thumbs);
+                        me.setSliderAttributes($gallery);
+
+                        if ($gallery[0] && $thumbs[0]) {
+                            $body.createModal($gallery[0].outerHTML + $thumbs[0].outerHTML, me.opts['modal-size'], me.opts.imgModalGallerySelector + ' fade', me.opts.title, false, function (modal) {
+                                picturefill();
+                                $(modal).find('.slick').slickWrapper();
+                                $body.loader('hide');
+                            });
+                        } else {
+                            $body.loader('hide');
+                        }
+
+                        $.publish('plugin/imgModal/afterOpenModal', [me]);
+                    }
+                });
+            }
+
+            $.publish('plugin/imgModal/onOpenModal', [me]);
+        }
+    });
+
+    $.plugin('ajaxModal', {
+
+        defaults: {
+            customModalClass: 'custom-page-modal',
+            'modal-class': '',
+            modalWrapperClassSelector: '.modal-dialog',
+            modalSelector: 'modal',
+            href: false,
+            'modal-size': 'modal-md' // modal-sm | modal-md | modal-lg | modal-full
+        },
+
+        init: function () {
+            var me = this;
+
+            me.applyDataAttributes();
+            me.registerEvents();
+
+            $.publish('plugin/ajaxModal/onInit', [me]);
+        },
+
+        registerEvents: function () {
+            var me = this;
+
+            me._on(me.$el, 'click', $.proxy(me.openModal, me));
+
+            $.publish('plugin/ajaxModal/onRegisterEvents', [me]);
+        },
+
+        openModal: function (event) {
+            event.preventDefault();
+            var me = this,
+                link = me.opts.href || me.$el.attr("href");
+
+            if (!link) {
+                return;
+            }
+
+            $body.loader('show');
+            $.publish('plugin/ajaxModal/beforeOpenModal', [me]);
+
+            $.ajax(safeUrl(link), {
+                data: {
+                    isXHR: 1
+                },
+                success: function (data) {
+
+                    me.modalData = data;
+
+                    $.publish('plugin/ajaxModal/beforeCreateModal', [me]);
+
+                    $body.showModal(me.modalData, me.opts.customModalClass + ' ' + me.opts['modal-class'], function (modal) {
+                        $body.loader('hide');
+
+                        var $modal = $(modal);
+
+                        // add modal size classes
+                        $modal.find(me.opts.modalWrapperClassSelector).addClass(me.opts['modal-size']);
+                        if (me.opts['modal-size'] == 'modal-full') {
+                            $modal.addClass('fullscreen');
+                        }
+
+                        $modal.swSelectboxReplacement();
+
+                        picturefill();
+
+                        me.$modal = $modal;
+
+                        $.publish('plugin/ajaxModal/afterCreateModal', [me]);
+                    });
+
+                    $.publish('plugin/ajaxModal/afterOpenModal', [me]);
+                }
+            });
+
+            $.publish('plugin/ajaxModal/onOpenModal', [me]);
+        }
+    });
+
+    $.plugin('notifyModal', {
+        defaults: {
+            notifyModalSelector: '.notify-modal-alert',
+            articleNotificationSelector: '#article_notification',
+            modalAlertSelector: '.alert-info, .alert-success',
+            notifyModalFormSelector: '.notify-modal-form',
+            notifyModalIdSelector: '[id*="notifyModal"]',
+            notifyModalClassSelector: '.modal[id^=notifyModal-]'
+        },
+
+        init: function () {
+            var me = this;
+
+            me.applyDataAttributes();
+            me.registerEvents();
+
+            $.publish('plugin/notifyModal/onInit', [me]);
+        },
+
+        registerEvents: function () {
+            var me = this;
+
+            me._on(me.$el, 'click', $.proxy(me.openModal, me));
+
+            // reset notify modal content
+            $(me.opts.notifyModalClassSelector).on('show.bs.modal', function () {
+                $(me.opts.notifyModalFormSelector).removeClass('hidden');
+                $(me.opts.notifyModalSelector).html('');
+            });
+
+            $.publish('plugin/notifyModal/onRegisterEvents', [me]);
+        },
+
+        openModal: function (event) {
+            event.preventDefault();
+            var me = this,
+                $form = me.$el.closest('form');
+
+            me.$el.loader('show');
+            $.publish('plugin/notifyModal/beforeOpenModal', [me]);
+
+            $.ajax({
+                type: 'POST',
+                url: safeUrl($form.attr('action')),
+                data: $form.serialize(),
+                beforeSend: function (xhr) { // change header, complete template needs to be loaded
+                    xhr.setRequestHeader('X-Requested-With', {
+                        toString: function () {
+                            return '';
+                        }
+                    }
+                    );
+                }
+            }).done(function (response) {
+                var $alertContainer = $(me.opts.notifyModalSelector);
+
+                $alertContainer.html($(response).find(me.opts.articleNotificationSelector).html());
+
+                if ($alertContainer.find(me.opts.modalAlertSelector).length > 0) {
+                    me.$el.parents(me.opts.notifyModalIdSelector).find('form').addClass('hidden');
+                }
+
+                me.$el.loader('hide');
+
+                $.publish('plugin/notifyModal/afterOpenModal', [me]);
+            });
+
+            $.publish('plugin/notifyModal/onOpenModal', [me]);
+        },
+    });
+
+
+    // creates a new modal out of an existing html structure (e.g. the result of an ajax request)
+    $.fn.showModal = function (content, additionalClass, onShownCallback, options) {
+        var options = options || {},
+            id = options.id || ('modal' + Math.floor(Math.random() * 1000) + 1),
+            selector = selector || 'default',
+            callback = callback || function () { },
+            mergedOptions = $.extend({ show: true }, options),
+            modal = '<div id="' + id + '" class="' + additionalClass + ' modal swbt-modal">' + content + '</div>',
+            $modal,
+            showExisting = false;
+
+        // If content already IS a swbt-modal, don't build it, just show it instead.
+        if($(content).is('.modal.swbt-modal')){
+            $modal = $(body);
+            showExisting = true;
+        } else {
+            // Append new modal:
+            $(this).append(modal);
+            $modal = $('#' + id);
+
+            // Ensure removal on close:
+            $modal.on('hidden.bs.modal', function () {
+                $modal.remove();
+            });
+        }
+
+        // Register callbacks:
+        if(onShownCallback){
+            $modal.on('shown.bs.modal', function () {
+                 onShownCallback(this);
+             });
+         }
+         if(options.onCloseCallback){
+             $modal.on('hide.bs.modal', function () {
+                 options.onCloseCallback(this);
+             });
+         }
+
+        $modal.modal(mergedOptions);
+
+        return $modal;
+    };
+
+    // creates a new modal on the fly (the delivered content is wrapped in the standard bootstrap modal html structure)
+    $.fn.createModal = function (body, size, additionalClass, header, footer, onShownCallback, options) {
+        var modalTemplate = {
+                start: '<div class="modal-dialog"><div class="modal-content">',
+                headerstart: '<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times</button><h4 class="modal-title">',
+                headerend: '</h4></div>',
+                bodystart: '<div class="modal-body">',
+                bodyend: '</div>',
+                footerstart: '<div class="modal-footer">',
+                footerend: '</div>',
+                end: '</div></div>',
+                error: '<span class="text-danger">Modal konnte nicht geladen werden</span>'
+            },
+            options = options || {},
+            $modal,
+            id = options.id || ('modal' + Math.floor(Math.random() * 1000) + 1),
+            callback = callback || function () { },
+            modal = '<div id="' + id + '" class="' + additionalClass + ' modal swbt-modal">' + modalTemplate.start;
+
+        if (header)
+            modal = modal + modalTemplate.headerstart + header + modalTemplate.headerend;
+        if (body)
+            modal = modal + modalTemplate.bodystart + body + modalTemplate.bodyend;
+        if (footer)
+            modal = modal + modalTemplate.footerstart + footer + modalTemplate.footerend;
+        if (!header && !body && !footer){
+            modal = modal + modalTemplate.headerstart + modalTemplate.error + modalTemplate.headerend;
+        }
+        modal = modal + modalTemplate.end + '</div>';
+
+        // If body already IS a swbt-modal, don't build it, just show it instead.
+        if($(body).is('.modal.swbt-modal')){
+            $modal = $(body);
+            $modal.modal('show');
+        } else {
+            // Create modal:
+            $(this).append(modal);
+            $modal = $('#' + id);
+
+            // Ensure removal on close:
+            $modal.on('hidden.bs.modal', function () {
+                $modal.remove();
+            });
+        }
+
+
+        if (size) {
+            switch (size) {
+                case 'modal-sm':
+                    size = 'modal-sm';
+                    break;
+                case 'modal-md':
+                    size = 'modal-md';
+                    break;
+                case 'modal-lg':
+                case 'modal-full':
+                // Map SW sizes:
+                case 'auto':
+                case 'fixed':
+                case 'content':
+                case 'full':
+                    size = 'modal-lg';
+                    break;
+                default:
+                    break;
+            }
+
+            $modal.find('.modal-dialog').addClass(size);
+
+            // add modal size classes
+            if (size == 'modal-full') {
+                $modal.addClass('fullscreen');
+            }
+        }
+
+        // Register callbacks:
+        if(onShownCallback){
+           $modal.on('shown.bs.modal', function () {
+                onShownCallback(this);
+            });
+        }
+        if(options.onCloseCallback){
+            $modal.on('hide.bs.modal', function () {
+                options.onCloseCallback(this);
+            });
+        }
+
+        // Show!
+        $modal.modal('show');
+
+        return $modal;
+    };
+
+    // escape close
+    $(document).on('keydown', function (e) {
+        if (e.keyCode === 27) $(".swbt-modal").modal('hide');
+    });
+
+}(jQuery));

From 6b12890e813b4cd69c57c037baa438a13855656a Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Thu, 16 Jan 2020 11:15:43 +0100
Subject: [PATCH 35/37] Fixed cookie-manager and cookie-permission integration
 with as little library modifications as possible. Remaining required library
 modifications are caused by SW mistakes and their missing development against
 interfaces / plugins. Hopefully this will be solved in SW core in the future.

---
 .../shopware/jquery.cookie-consent-manager.js | 42 +++++++++++++------
 .../js/shopware/jquery.cookie-permission.js   | 17 ++++++--
 .../frontend/index/cookie_consent.tpl         |  5 ++-
 .../frontend/index/cookie_consent/cookie.tpl  |  0
 .../frontend/index/cookie_consent/group.tpl   |  0
 .../BootstrapBare/frontend/index/index.tpl    |  4 +-
 6 files changed, 47 insertions(+), 21 deletions(-)
 mode change 100644 => 100755 Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/cookie.tpl
 mode change 100644 => 100755 Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
index 13c9c8f..c21d6b4 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-consent-manager.js
@@ -389,18 +389,24 @@
 
             this.assignCookieData();
 
+            // TODO - Modification of copied SW core file / MANUAL HANDLING REQUIRED ON UPDATE!
+            // This currently has to be added because the core implementation
+            // doesn't call a js plugin (like modal in swbt.modal.js) but directly
+            // uses the jQuery functions (show / hide) which makes it impossible
+            // to delegate the function cleanly to a js $.plugin implementation!
+            // Hopefully the core implementation will change in the future
+            // and uses a plugin instead like $.modal.open() / $.modal.close()
+            // Util that we have to adopt this change to SW Updates!
+
+            // Call bootstrap API modal show function instead of jquery show().
             // this.$el.show();
-            this.$el.modal('show');
-            this.$el.addClass(this.opts.openClass);
-
-            // #webksde-TF: Remove this fucking disturbing swbt js-overlay
-            $('.js-overlay').remove();
-
+            $.modal.open(this.$el);
+            // this.$el.addClass(this.opts.openClass);
+            // $.overlay.open({
+            //     onClose: $.proxy(this.close, this)
+            // });
+            // TODO - Modification of core file END.
             this.isOpened = true;
-
-            $.overlay.open({
-                onClose: $.proxy(this.close, this)
-            });
         },
 
         close: function () {
@@ -408,9 +414,19 @@
                 return;
             }
 
-            this.$el.modal('hide');
-
-            this.$el.removeClass(this.opts.openClass);
+            // TODO - Modification of copied SW core file / MANUAL HANDLING REQUIRED ON UPDATE!
+            // This currently has to be added because the core implementation
+            // doesn't call a js plugin (like modal in swbt.modal.js) but directly
+            // uses the jQuery functions (show / hide) which makes it impossible
+            // to delegate the function cleanly to a js $.plugin implementation!
+            // Hopefully the core implementation will change in the future
+            // and uses a plugin instead like $.modal.open() / $.modal.close().
+            // Util that we have to adopt this change to SW Updates!
+
+            // Call modal plugin function
+            $.modal.close();
+            // this.$el.removeClass(this.opts.openClass);
+            // TODO - Modification of core file END.
             this.isOpened = false;
         },
 
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
index ed22bbb..9d8c913 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_public/vendors/js/shopware/jquery.cookie-permission.js
@@ -1,4 +1,4 @@
-(function($, window) {
+;(function($, window) {
     'use strict';
 
     var $body = $('body');
@@ -45,7 +45,7 @@
              * @property cookieConsentManagerSelector
              * @type {string}
              */
-            cookieConsentManagerSelector: '#cookie-consent',
+            cookieConsentManagerSelector: '*[data-cookie-consent-manager="true"]',
 
             /**
              * Selector of the close button to select the button and register events on it.
@@ -360,7 +360,11 @@
          */
         showElement: function() {
             if (window.cookieRemoval === 2) {
-                $('#cookie-consent').modal('show');
+                $.modal.open(this.$el.html(), {
+                    title: this.opts.title,
+                    sizing: 'content',
+                    width: 500
+                });
 
                 this.$acceptButton = $(this.opts.acceptButtonSelector);
                 this.$closeButton = $(this.opts.closeButtonSelector);
@@ -381,6 +385,13 @@
         hideElement: function() {
             this.$el.addClass(this.opts.isHiddenClass);
             $body.css('padding-bottom', 0);
+            // TODO - Modification of copied SW core file / MANUAL HANDLING REQUIRED ON UPDATE!
+            // The condition from showElement was missing here in SW core file
+            // which lead to unintended close of the cookie-consent-manager layer.
+            // Hopefully SW will fix this so this file can be reverted to be equal to core.
+            if (window.cookieRemoval === 2) {
+                $.modal.close();
+            }
         },
 
         getBasePath: function () {
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl
index 87398ef..192c776 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent.tpl
@@ -1,13 +1,14 @@
 {namespace name='frontend/cookie_consent/main'}
 
-<div id='cookie-consent' class='modal' data-cookie-consent-manager='true'>
+{* Set swbt-modal class to auto-open the modal in $.moda.open() instead of recreating it. *}
+<div id='cookie-consent' class='modal swbt-modal' data-cookie-consent-manager='true'>
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             {block name='frontend_index_cookie_consent_manager_content'}
                 {block name='frontend_index_cookie_consent_manager_header'}
                     <div class='modal-header cookie-consent--header'>
                         {s name="manager/title"}{/s}
-                        <button type="button" class="close cookie-permission--close-button" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>                </div>
+                        <button type="button" class="close cookie-permission--close-button cookie-consent--close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>                </div>
                 {/block}
                 <div class="panel-body">
                     {block name='frontend_index_cookie_consent_manager_description'}
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/cookie.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/cookie.tpl
old mode 100644
new mode 100755
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/cookie_consent/group.tpl
old mode 100644
new mode 100755
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
index fb759be..b5c0471 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
@@ -127,9 +127,7 @@
                                 <div id="content" class="container">
                                     {* Cookie consent manager*}
                                     {block name='frontend_index_cookie_consent_manager'}
-                                        {if {config name=cookie_note_mode} == 1 && {config name=show_cookie_note}}
-                                            {include file='frontend/index/cookie_consent.tpl'}
-                                        {/if}
+                                        {include file='frontend/index/cookie_consent.tpl'}
                                     {/block}
                                     {block name='frontend_index_content_container_inner'}
                                         <div class="content-container">

From a4069f4bdd9f3c43612dde0e56b959d9f5961c13 Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Thu, 20 Feb 2020 10:29:17 +0100
Subject: [PATCH 36/37] Update index.tpl

Added condition like in Bare Theme for frontend_index_footer_last_articles
---
 .../Themes/Frontend/BootstrapBare/frontend/index/index.tpl      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
index b5c0471..cb0da0f 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/index/index.tpl
@@ -176,7 +176,7 @@
 
                             {* Last seen products *}
                             {block name="frontend_index_footer_last_articles"}
-                                {if $sLastArticlesShow}
+                                {if $sLastArticlesShow && !$isEmotionLandingPage}
                                     {block name="frontend_index_footer_last_articles_container"}
                                         <div class="container last-seen-products-wrapper">
                                             {block name="frontend_index_footer_last_articles_hr"}

From ffe37f0da62d4126e68ce8865116bcf93120fd9e Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Wed, 10 Jun 2020 13:07:22 +0200
Subject: [PATCH 37/37] Fix missing blog entry count

blog_id parameter was missing so blog views were not counted
---
 .../Frontend/BootstrapBare/widgets/index/statistic_include.tpl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Themes/Frontend/BootstrapBare/widgets/index/statistic_include.tpl b/Resources/Themes/Frontend/BootstrapBare/widgets/index/statistic_include.tpl
index 001d39e..5d35414 100755
--- a/Resources/Themes/Frontend/BootstrapBare/widgets/index/statistic_include.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/widgets/index/statistic_include.tpl
@@ -52,6 +52,9 @@
             {if $sArticle.articleID}
             url += '&articleId=' + encodeURI("{$sArticle.articleID}");
             {/if}
+            {if $sArticle.id && $Controller === 'blog'}
+            url += '&blogId=' + encodeURI("{$sArticle.id}");
+            {/if}
 
             {* Early simple device detection for statistics, duplicated in StateManager for resizes *}
             if (isDeviceCookieAllowed()) {