Release 5.0.2

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 5.0.2
+- Fix bug which happens when pressing back to shop or home clears cart.
+
+# 5.0.1
+- Adjust documentation
+
+# 5.0.0
+- Update composer file to only support 6.5
+
 # 4.0.56
 - Adjustment of the documentation
 

CHANGELOG_de-DE.md

@@ -1,3 +1,12 @@
+# 5.0.2
+- Behebung eines Fehlers, der auftritt, wenn Sie auf „Zurück zum Shop“ oder „Zuhause“ drücken, um den Warenkorb zu löschen.
+
+# 5.0.1
+- Anpassung der Dokumentation
+
+# 5.0.0
+- Aktualisieren Sie die Composer-Datei so, dass sie nur 6.5 unterstützt
+
 # 4.0.56
 - Anpassung der Dokumentation
 

README.md

@@ -62,7 +62,7 @@ tail -f var/log/wallee_payment*.log
 
 ## Documentation
 
-[Documentation](https://plugin-documentation.wallee.com/wallee-payment/shopware-6/5.0.1/docs/en/documentation.html)
+[Documentation](https://plugin-documentation.wallee.com/wallee-payment/shopware-6/5.0.2/docs/en/documentation.html)
 
 ## License
 

composer.json

@@ -1,62 +1,66 @@
 {
-  "authors": [
-	{
-	  "homepage": "https://www.wallee.com",
-	  "name": "wallee"
-	}
-  ],
-  "autoload": {
-	"psr-4": {
-	  "WalleePayment\\": "src/"
-	}
-  },
-  "conflict": {
-	"shopware/administration": "<6.4.2.1,>=7",
-	"shopware/storefront": "<6.4.2.1,>=7"
-  },
-  "description": "Wallee integration for Shopware 6",
-  "extra": {
-	"copyright": "(c) by wallee",
-	"description": {
-	  "de-DE": "Wallee integration für Shopware 6",
-	  "en-GB": "Wallee integration for Shopware 6",
-	  "fr-FR": "Intégration de Wallee pour Shopware 6",
-      "it-IT": "Integrazione Wallee per Shopware"
-	},
-	"label": {
-	  "de-DE": "Wallee Produkte für Shopware 6",
-	  "en-GB": "Wallee Products for Shopware 6",
-	  "fr-FR": "Wallee Produits for Shopware 6",
-	  "it-IT": "Wallee Prodotti per Shopware 6"
-	},
-	"manufacturerLink": {
-	  "de-DE": "https://www.wallee.com",
-	  "en-GB": "https://www.wallee.com",
-	  "fr-FR": "https://www.wallee.com",
-      "it-IT": "https://www.wallee.com"
-	},
-	"supportLink": {
-	  "de-DE": "https://app-wallee.com/space/select?target=/support",
-	  "en-GB": "https://app-wallee.com/space/select?target=/support",
-	  "fr-FR": "https://app-wallee.com/space/select?target=/support",
-      "it-IT": "https://app-wallee.com/space/select?target=/support"
-	},
-	"shopware-plugin-class": "WalleePayment\\WalleePayment"
-  },
-  "homepage": "https://www.wallee.com/",
-  "keywords": [
-	"wallee",
-	"payment",
-	"php",
-	"shopware"
-  ],
-  "license": "Apache-2.0",
-  "name": "wallee/shopware-6",
-  "require": {
-	"ext-curl": "*",
-	"ext-json": "*",
-	"ext-mbstring": "*",
-	"php": ">=7.4"
-  },
-  "type": "shopware-platform-plugin"
-}
+    "authors": [
+        {
+            "homepage": "https://www.wallee.com",
+            "name": "wallee"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "WalleePayment\\": "src/"
+        }
+    },
+    "conflict": {
+        "shopware/administration": "<6.4.2.1,>=7",
+        "shopware/storefront": "<6.4.2.1,>=7"
+    },
+    "description": "Wallee integration for Shopware 6",
+    "extra": {
+        "copyright": "(c) by wallee",
+        "description": {
+            "de-DE": "Wallee integration f\u00fcr Shopware 6",
+            "en-GB": "Wallee integration for Shopware 6",
+            "fr-FR": "Int\u00e9gration de Wallee pour Shopware 6",
+            "it-IT": "Integrazione Wallee per Shopware"
+        },
+        "label": {
+            "de-DE": "Wallee Produkte f\u00fcr Shopware 6",
+            "en-GB": "Wallee Products for Shopware 6",
+            "fr-FR": "Wallee Produits for Shopware 6",
+            "it-IT": "Wallee Prodotti per Shopware 6"
+        },
+        "manufacturerLink": {
+            "de-DE": "https://www.wallee.com",
+            "en-GB": "https://www.wallee.com",
+            "fr-FR": "https://www.wallee.com",
+            "it-IT": "https://www.wallee.com"
+        },
+        "supportLink": {
+            "de-DE": "https://app-wallee.com/space/select?target=/support",
+            "en-GB": "https://app-wallee.com/space/select?target=/support",
+            "fr-FR": "https://app-wallee.com/space/select?target=/support",
+            "it-IT": "https://app-wallee.com/space/select?target=/support"
+        },
+        "shopware-plugin-class": "WalleePayment\\WalleePayment"
+    },
+    "homepage": "https://www.wallee.com/",
+    "keywords": [
+        "wallee",
+        "payment",
+        "php",
+        "shopware"
+    ],
+    "license": "Apache-2.0",
+    "name": "wallee/shopware-6",
+    "require": {
+        "ext-curl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "php": ">=7.4",
+        "shopware/core": "6.5.*",
+        "shopware/storefront": "6.5.*",
+        "wallee/sdk": "3.2.0"
+    },
+    "type": "shopware-platform-plugin",
+    "version": "5.0.2"
+}

docs/en/documentation.html

@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/shopware-6/releases/tag/5.0.1/">
+		<a href="https://github.com/wallee-payment/shopware-6/releases/tag/5.0.2/">
 			Source
 		</a>
 	</li>

src/Core/Storefront/Checkout/Controller/CheckoutController.php

@@ -165,7 +165,7 @@ public function pay(SalesChannelContext $salesChannelContext, Request $request):
 
 		$transaction     = $this->getTransaction($orderId, $salesChannelContext->getContext());
 		$recreateCartUrl = $this->generateUrl(
-			'frontend.account.edit-order.page',
+			'frontend.wallee.checkout.recreate-cart',
 			['orderId' => $orderId,],
 			UrlGeneratorInterface::ABSOLUTE_URL
 		);

src/Resources/public/storefront/js/app.js

@@ -29,6 +29,7 @@
         payment_method_handler_status: 'input[name="wallee_payment_handler_validation_status"]',
         payment_form_id: 'confirmOrderForm',
         button_cancel_id: 'walleeOrderCancel',
+        button_home_override: 'walleeHomeLink',
         loader_id: 'walleeLoader',
         checkout_url: null,
         checkout_url_id: 'checkoutUrl',
@@ -45,6 +46,7 @@
             this.cart_recreate_url = document.getElementById(this.cart_recreate_url_id).value;
 
             document.getElementById(this.button_cancel_id).addEventListener('click', this.recreateCart, false);
+            document.getElementById(this.button_home_override).addEventListener('click', this.recreateCart, false);
             document.getElementById(this.payment_form_id).addEventListener('submit', this.submitPayment, false);
 
             WalleeCheckout.getIframe();

src/Resources/views/storefront/page/checkout/order/wallee_header.html.twig

@@ -1,5 +1,46 @@
 {% sw_extends '@Storefront/storefront/layout/header/header-minimal.html.twig' %}
 
+{% block layout_header_minimal_logo %}
+    <div class="col-6 col-md-4 header-minimal-logo">
+        {% block layout_header_logo_inner %}
+            <div class="header-logo-main">
+                {% block layout_header_logo_link %}
+                    <a class="header-logo-main-link"
+                    id="walleeHomeLink"
+                    href="{{ path('frontend.home.page') }}"
+                    title="{{ "header.logoLink"|trans|striptags }}">
+                        {% block layout_header_logo_image %}
+                            <picture class="header-logo-picture">
+                                    {% block layout_header_logo_image_tablet %}
+                                    {% if theme_config('sw-logo-tablet') and theme_config('sw-logo-tablet') != theme_config('sw-logo-desktop') %}
+                                        <source srcset="{{ theme_config('sw-logo-tablet') |sw_encode_url }}"
+                                                media="(min-width: {{ theme_config('breakpoint.md') }}px) and (max-width: {{ theme_config('breakpoint.lg') - 1 }}px)">
+                                    {% endif %}
+                                {% endblock %}
+
+                                {% block layout_header_logo_image_mobile %}
+                                    {% if theme_config('sw-logo-mobile') and theme_config('sw-logo-mobile') != theme_config('sw-logo-desktop') %}
+                                        <source srcset="{{ theme_config('sw-logo-mobile') |sw_encode_url }}"
+                                                media="(max-width: {{ theme_config('breakpoint.md') - 1 }}px)">
+                                    {% endif %}
+                                {% endblock %}
+
+                                {% block layout_header_logo_image_default %}
+                                    {% if theme_config('sw-logo-desktop') %}
+                                        <img src="{{ theme_config('sw-logo-desktop') |sw_encode_url }}"
+                                            alt="{{ "header.logoLink"|trans|striptags }}"
+                                            class="img-fluid header-logo-main-img"/>
+                                    {% endif %}
+                                {% endblock %}
+                            </picture>
+                        {% endblock %}
+                    </a>
+                {% endblock %}
+            </div>
+        {% endblock %}
+    </div>
+{% endblock %}
+
 {% block layout_header_minimal_button %}
     <div class="col-md-4 header-minimal-back-to-shop">
         <button type="button"