v6.5.2

CHANGELOG_de-DE.md

@@ -1,3 +1,11 @@
+# 6.5.2
+* Fehler behoben, bei dem die AGB nicht bis zum Akzeptieren-Häkchen gescrollt wurden
+* Falsche UI-Komponente für B2B-Rechnung korrigiert
+* Fehlerhafte Kundendaten für UPL behoben
+* Fehlerbehebung für Apple Pay in Nicht-Safari-Browsern
+* Apple-Pay-Button wird nun immer angezeigt, wenn Apple Pay aktiv ist
+* Buchungsmodus-Fix für Wero
+
 # 6.5.1
 * Minor Fix am Customer-Objekt für besseren PayPal-B2B-Support
 

CHANGELOG_en-GB.md

@@ -1,3 +1,11 @@
+# 6.5.2
+* Fix for Terms and Conditions no scroll to accept checkmark
+* Fix incorrect UI Comp. for B2B invoice
+* Fix for incorrect customer data for UPL
+* Fix for Apple Pay in Non-Safari browsers
+* Fix to always show Apple Pay button when Apple Pay is active
+* Booking mode fix for Wero
+
 # 6.5.1
 * Minor fix to customer object for better Paypal B2B support
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "unzerdev/shopware6",
     "description": "Unzer payment integration for Shopware 6",
-    "version": "6.5.1",
+    "version": "6.5.2",
     "type": "shopware-platform-plugin",
     "license": "Apache-2.0",
     "minimum-stability": "dev",

src/Components/CancelService/CancelService.php

@@ -23,7 +23,7 @@
 
 class CancelService implements CancelServiceInterface
 {
-    private const PAYLATER_PAYMENT_METHODS = [
+    public const PAYLATER_PAYMENT_METHODS = [
         PaymentInstaller::PAYMENT_ID_PAYLATER_INVOICE,
         PaymentInstaller::PAYMENT_ID_PAYLATER_INSTALLMENT,
         PaymentInstaller::PAYMENT_ID_PAYLATER_DIRECT_DEBIT_SECURED,
@@ -41,7 +41,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function cancelChargeById(string $orderTransactionId, string $chargeId, float $amountGross, ?string $reasonCode, Context $context): void
+    public function cancelChargeById(string $orderTransactionId, string $chargeId, float $amountGross, ?string $reasonCode, Context $context, string $referenceText = ''): Cancellation
     {
         $decimalPrecision = UnzerPayment6::MAX_DECIMAL_PRECISION;
 
@@ -76,24 +76,26 @@ public function cancelChargeById(string $orderTransactionId, string $chargeId, f
         $payment = UnzerTransactionUtil::fetchPaymentFromOrderTransaction($transaction, $client);
         if ($this->isPaylaterPaymentMethod($transaction->getPaymentMethodId())) {
             $cancellation = new Cancellation($amountGross);
+            $cancellation->setPaymentReference($referenceText);
 
-            $client->cancelChargedPayment(
+            $responseCancellation = $client->cancelChargedPayment(
                 $payment,
                 $cancellation
             );
         } else {
-            $client->cancelChargeById(
+            $responseCancellation = $client->cancelChargeById(
                 $payment,
                 $chargeId,
                 $amountGross,
                 $this->getCancelReasonCode($reasonCode),
-                '',
+                $referenceText,
                 $amountNet,
                 $amountVat
             );
         }
 
         $this->updateOrderStatus($client, $transaction, $context);
+        return $responseCancellation;
     }
 
     /**
@@ -139,7 +141,7 @@ protected function getCancelReasonCode(?string $reasonCode): string
         return $reasonCode ?? CancelReasonCodes::REASON_CODE_CANCEL;
     }
 
-    protected function isPaylaterPaymentMethod(string $paymentMethodId): bool
+    public function isPaylaterPaymentMethod(string $paymentMethodId): bool
     {
         return \in_array($paymentMethodId, self::PAYLATER_PAYMENT_METHODS, true);
     }

src/Components/CancelService/CancelServiceInterface.php

@@ -6,6 +6,7 @@
 
 use Shopware\Core\Framework\Context;
 use UnzerSDK\Exceptions\UnzerApiException;
+use UnzerSDK\Resources\TransactionTypes\Cancellation;
 
 interface CancelServiceInterface
 {
@@ -18,8 +19,9 @@ public function cancelChargeById(
         string $chargeId,
         float $amountGross,
         ?string $reasonCode,
-        Context $context
-    ): void;
+        Context $context,
+        string $referenceText = ''
+    ): Cancellation;
 
     /**
      * @throws UnzerApiException
@@ -31,4 +33,6 @@ public function cancelAuthorizationById(
         float $amountGross,
         Context $context
     ): void;
+
+    public function isPaylaterPaymentMethod(string $paymentMethodId): bool;
 }

src/Components/ConfigReader/ConfigReader.php

@@ -43,6 +43,7 @@ class ConfigReader implements ConfigReaderInterface
     public const CONFIG_KEY_PAYPAL_SHOW_SAVE_ACCOUNT = 'paypalShowSaveAccount';
     public const CONFIG_KEY_DELIVERY_STATUS_FOR_CAPTURE = 'deliveryStatusForAutomaticCapture';
     public const CONFIG_KEY_DELIVERY_STATUS_FOR_REFUND = 'deliveryStatusForAutomaticRefund';
+    public const CONFIG_KEY_DELIVERY_STATUS_FOR_RETURNS_REFUND = 'deliveryStatusForAutomaticReturnsRefund';
 
     public const CONFIG_KEY_USE_EXPRESS_PAYPAL = 'usePaypalExpress';
     public const CONFIG_KEY_USE_EXPRESS_GOOGLE = 'useGooglePayExpress';