v6.5.8

CHANGELOG_de-DE.md

@@ -1,3 +1,11 @@
+# 6.5.8
+* Der Express-Checkout funktioniert unter Shopware 6.6 wieder zuverlässig, einschließlich PayPal und Apple Pay
+* Beim Express-Checkout wird nun eine verständliche Fehlermeldung angezeigt, wenn die Erstellung der Zahlung fehlschlägt, anstatt den Kunden kommentarlos weiterzuleiten
+* Bestellbestätigungen werden nun in der korrekten Sprache versendet und gehen nicht mehr verloren
+* Benutzer ohne Berechtigung für die Erweiterung können die Plugin-Einstellungen nicht mehr anzeigen oder bearbeiten
+* Produktbilder im Warenkorb werden nun automatisch in einer geeigneten Größe verarbeitet und verursachen keine Gateway-Fehler mehr
+* Bestell- und Zahlungsstatus für Direktüberweisung werden nun zuverlässig anhand des Zahlungs- und Transaktionsstatus aktualisiert
+
 # 6.5.7
 * Zuverlässigerer Checkout: Der „Bezahlen“-Button wartet jetzt, bis alle erforderlichen Komponenten vollständig geladen sind, wodurch fehlgeschlagene Bestellungen verhindert werden.
 * Leistungsverbesserung: Ein redundanter Abruf der Händlerkonfiguration wurde entfernt, wenn die Konfiguration bereits vorhanden ist.

CHANGELOG_en-GB.md

@@ -1,3 +1,11 @@
+# 6.5.8
+* Express checkout no longer fails in Shopware 6.6, including PayPal and Apple Pay
+* Express checkout now shows a clear error message when payment creation fails, instead of silently redirecting
+* Order confirmation emails are sent in the correct language and no longer go missing
+* Users without extension permissions can no longer view or edit the plugin settings
+* Basket item images are resized so they no longer cause gateway errors
+* Order and payment status for Direct Bank Transfer now update correctly based on payment and transaction state
+
 # 6.5.7
 * More reliable checkout: The "Pay" button now waits until all required components are fully loaded, preventing failed orders.
 * Performance improvement: Eliminated a redundant merchant config fetch when the config is already provided.

composer.json

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

src/Components/PaymentHandler/AbstractUnzerPaymentHandler.php

@@ -257,9 +257,9 @@ protected function executeFailTransition(string $transactionId, Context $context
     protected function getUnzerCustomer(string $unzerCustomerId, string $paymentMethodId, OrderTransactionEntity $orderTransaction, SalesChannelContext $salesChannelContext): AbstractUnzerResource
     {
         $customer = $salesChannelContext->getCustomer();
-        if (empty($orderTransaction->getOrder())) {
-            $orderTransaction = $this->fetchTransactionById($orderTransaction->getId(), $salesChannelContext->getContext());
-        }
+        // re-fetch to make sure all necessary fields are filled
+        $orderTransaction = $this->fetchTransactionById($orderTransaction->getId(), $salesChannelContext->getContext());
+
         $fetchedCustomer = null;
 
         if (!empty($unzerCustomerId)) {

src/Components/PaymentHandler/UnzerPayPalPaymentHandler.php

@@ -237,11 +237,15 @@ public function finalize(
                 && $this->paymentType instanceof Paypal
                 && $this->paymentType->getEmail() !== null
             ) {
-                $this->saveToDeviceVault(
-                    $salesChannelContext->getCustomer(),
-                    UnzerPaymentDeviceEntity::DEVICE_TYPE_PAYPAL,
-                    $salesChannelContext->getContext()
-                );
+                try {
+                    $this->saveToDeviceVault(
+                        $salesChannelContext->getCustomer(),
+                        UnzerPaymentDeviceEntity::DEVICE_TYPE_PAYPAL,
+                        $salesChannelContext->getContext()
+                    );
+                } catch (\Throwable $e) {
+                    $this->logger->warning('Could not save to device vault: ' . $e->getMessage());
+                }
             }
 
             $this->transactionStateHandler->transformTransactionState(

src/Components/PaymentTransitionMapper/OpenBankingTransitionMapper.php

@@ -4,13 +4,32 @@
 
 namespace UnzerPayment6\Components\PaymentTransitionMapper;
 
-use UnzerPayment6\Components\PaymentTransitionMapper\Traits\IsBasicPaymentMethodTransitionMapper;
+use Shopware\Core\System\StateMachine\Aggregation\StateMachineTransition\StateMachineTransitionActions;
+use UnzerPayment6\Components\PaymentTransitionMapper\Exception\TransitionMapperException;
+use UnzerSDK\Resources\Payment;
 use UnzerSDK\Resources\PaymentTypes\BasePaymentType;
 use UnzerSDK\Resources\PaymentTypes\OpenbankingPis;
 
 class OpenBankingTransitionMapper extends AbstractTransitionMapper
 {
-    use IsBasicPaymentMethodTransitionMapper;
+    public function getTargetPaymentStatus(Payment $paymentObject, string $orderTransactionId): string
+    {
+        try {
+            $charges = $paymentObject->getCharges();
+            $charge = reset($charges);
+            if ($paymentObject->isCompleted() && $charge->isPending()) {
+                return StateMachineTransitionActions::ACTION_REOPEN;
+            }
+
+            return parent::getTargetPaymentStatus($paymentObject, $orderTransactionId);
+        } catch (TransitionMapperException $exception) {
+            if ($paymentObject->isPending()) {
+                return StateMachineTransitionActions::ACTION_REOPEN;
+            }
+
+            throw $exception;
+        }
+    }
 
     public function supports(BasePaymentType $paymentType): bool
     {

src/Components/ResourceHydrator/BasketResourceHydrator.php

@@ -108,15 +108,6 @@ protected function hydrateLineItems(
             $basketItem->setTitle($label);
             $basketItem->setQuantity($lineItem->getQuantity());
             $basketItem->setType($lineItem->getUnitPrice() < 0 ? BasketItemTypes::VOUCHER : BasketItemTypes::GOODS);
-            if (!empty($lineItem->getCover()?->getUrl()) && !str_contains($lineItem->getCover()?->getUrl(), '.ddev.site')) {
-                try {
-                    $media = $lineItem->getCover();
-                    $url = $media?->getThumbnails()?->first()?->getUrl() ?? $media?->getUrl();
-                    $basketItem->setImageUrl($url);
-                } catch (\Exception $e) {
-                    $basketItem->setImageUrl($lineItem->getCover()?->getUrl());
-                }
-            }
 
             $taxCounter = 0;
             $amountTax = 0.0;
@@ -169,14 +160,12 @@ protected function hydrateShippingCosts(
             $amountPerUnit = round($shippingCosts->getUnitPrice(), $currencyPrecision);
         } else {
             $priceGross = 0.00;
-            $amountVat = 0.00;
             $taxRate = 0;
             $taxCounter = 0;
 
             /** @var CalculatedTax $tax */
             foreach ($shippingCosts->getCalculatedTaxes() as $tax) {
                 $priceGross += $tax->getPrice();
-                $amountVat += $tax->getTax();
                 $taxRate += $tax->getTaxRate();
                 ++$taxCounter;
 

src/Components/Struct/Webhook.php

@@ -12,6 +12,8 @@ class Webhook
 
     private string $retrieveUrl;
 
+    private string $paymentId;
+
     public function __construct(string $jsonData)
     {
         $this->fromJson($jsonData);
@@ -24,6 +26,7 @@ public function fromJson(string $jsonData): void
         $this->event = $webhookData['event'] ?? '';
         $this->publicKey = $webhookData['publicKey'] ?? '';
         $this->retrieveUrl = $webhookData['retrieveUrl'] ?? '';
+        $this->paymentId = $webhookData['paymentId'] ?? '';
     }
 
     public function getEvent(): string
@@ -61,4 +64,16 @@ public function setRetrieveUrl(string $retrieveUrl): self
 
         return $this;
     }
+
+    public function getPaymentId(): string
+    {
+        return $this->paymentId;
+    }
+
+    public function setPaymentId(string $paymentId): self
+    {
+        $this->paymentId = $paymentId;
+
+        return $this;
+    }
 }

src/Components/WebhookHandler/PaymentStatusWebhookHandler.php

@@ -4,12 +4,15 @@
 
 namespace UnzerPayment6\Components\WebhookHandler;
 
+use Doctrine\DBAL\Connection;
 use Psr\Log\LoggerInterface;
 use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity;
+use Shopware\Core\Defaults;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\Uuid\Exception\InvalidUuidException;
+use Shopware\Core\Framework\Uuid\Uuid;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
 use UnzerPayment6\Components\ClientFactory\ClientFactoryInterface;
 use UnzerPayment6\Components\CustomFieldsHelper\CustomFieldsHelperInterface;
@@ -27,19 +30,25 @@ public function __construct(
         private readonly ClientFactoryInterface $clientFactory,
         private readonly EntityRepository $orderTransactionRepository,
         private readonly LoggerInterface $logger,
-        private readonly CustomFieldsHelperInterface $customFieldsHelper
+        private readonly CustomFieldsHelperInterface $customFieldsHelper,
+        private readonly Connection $connection
     ) {
     }
 
     public function supports(Webhook $webhook, SalesChannelContext $context): bool
     {
-        return stripos($webhook->getEvent(), 'payment.') !== false;
+        return stripos($webhook->getEvent(), 'payment.') !== false || stripos($webhook->getEvent(), 'charge.succeeded') !== false;
     }
 
     public function execute(Webhook $webhook, SalesChannelContext $context): void
     {
         $client = $this->clientFactory->createClientFromPublicKey($webhook->getPublicKey(), $context->getSalesChannelId());
-        $payment = $client->getResourceService()->fetchResourceByUrl($webhook->getRetrieveUrl());
+
+        if (stripos($webhook->getEvent(), 'charge.') !== false) {
+            $payment = $client->fetchPayment($webhook->getPaymentId());
+        } else {
+            $payment = $client->getResourceService()->fetchResourceByUrl($webhook->getRetrieveUrl());
+        }
 
         if (!$payment instanceof Payment) {
             $this->logger->error(
@@ -65,7 +74,7 @@ public function execute(Webhook $webhook, SalesChannelContext $context): void
             return;
         }
 
-        $context->getContext()->assign(['languageIdChain' => [$transaction->getOrder()->getLanguageId()]]);
+        $context->getContext()->assign(['languageIdChain' => $this->getLanguageChain($transaction->getOrder()->getLanguageId())]);
         $this->customFieldsHelper->setOrderTransactionCustomFields($transaction, $context->getContext());
 
         $this->transactionStateHandler->transformTransactionState(
@@ -94,4 +103,15 @@ private function getOrderTransaction(?string $orderId, Context $context): ?Order
             return null;
         }
     }
+
+    private function getLanguageChain(string $languageId): array
+    {
+        $parent = $this->connection->fetchOne(
+            'SELECT LOWER(HEX(language.parent_id)) FROM language WHERE language.id = :languageId',
+            ['languageId' => Uuid::fromHexToBytes($languageId)]
+        );
+        $chain = array_filter(array_unique([$languageId, $parent, Defaults::LANGUAGE_SYSTEM]));
+
+        return $chain;
+    }
 }

src/Components/WebhookRegistrator/WebhookRegistrator.php

@@ -35,6 +35,48 @@ public function __construct(
     ) {
     }
 
+    public function registerWebhookDirectly(RequestDataBag $requestDataBag): array
+    {
+        $returnData = [];
+        $url = $requestDataBag->get('url', '');
+        $privateKey = $requestDataBag->get('privateKey');
+        try {
+            $relativePath = $this->router->generate('frontend.unzer.webhook.execute', [], UrlGeneratorInterface::ABSOLUTE_PATH);
+            if (!str_contains($url, $relativePath)) {
+                $url .= $relativePath;
+            }
+            $result = $this->clientFactory
+                ->createClientFromPrivateKey($privateKey)
+                ->createWebhook($url, 'all');
+
+            $returnData = [
+                'success' => true,
+                'url' => $url,
+                'data' => $result,
+                'message' => 'unzer-payment-settings.webhook.register.done',
+            ];
+
+            $this->logger->info(\sprintf('Webhooks registered for domain %s', $url));
+        } catch (UnzerApiException|\Throwable $exception) {
+            $returnData[$url] = [
+                'success' => false,
+                'message' => 'unzer-payment-settings.webhook.register.error',
+            ];
+
+            $this->logger->error(
+                \sprintf('Webhook registration failed for domain %s', $url),
+                [
+                    'message' => $exception->getMessage(),
+                    'code' => $exception->getCode(),
+                    'file' => $exception->getFile(),
+                    'trace' => $exception->getTraceAsString(),
+                ]
+            );
+        }
+
+        return $returnData;
+    }
+
     public function registerWebhook(RequestDataBag $salesChannelDomains): array
     {
         $returnData = [];
@@ -54,7 +96,9 @@ public function registerWebhook(RequestDataBag $salesChannelDomains): array
 
             try {
                 $relativePath = $this->router->generate('frontend.unzer.webhook.execute', [], UrlGeneratorInterface::ABSOLUTE_PATH);
-                $url = $domainUrl . $relativePath;
+                if (!str_contains($domainUrl, $relativePath)) {
+                    $url = $domainUrl . $relativePath;
+                }
 
                 $result = $this->clientFactory
                     ->createClientFromPrivateKey($privateKey, $salesChannelId)

src/Controllers/Administration/UnzerPaymentConfigurationController.php

@@ -104,6 +104,15 @@ public function registerWebhooks(RequestDataBag $dataBag): JsonResponse
         );
     }
 
+    #[Route(path: '/api/_action/unzer-payment/register-webhook-directly', name: 'api.action.unzer.webhook.register-directly', methods: ['POST'])]
+    public function registerWebhookDirectly(RequestDataBag $dataBag): JsonResponse
+    {
+        return new JsonResponse(
+            $this->webhookRegistrator->registerWebhookDirectly($dataBag),
+            200
+        );
+    }
+
     #[Route(path: '/api/_action/unzer-payment/clear-webhooks', name: 'api.action.unzer.webhooks.clear', methods: ['POST'])]
     public function clearWebhooks(RequestDataBag $dataBag): JsonResponse
     {

src/Controllers/Administration/UnzerPaymentTransactionController.php

@@ -33,7 +33,7 @@ class UnzerPaymentTransactionController extends AbstractController
     public function __construct(
         private readonly ClientFactoryInterface $clientFactory,
         private readonly UnzerTransactionUtil $unzerTransactionUtil,
-        private readonly PaymentActionService $paymentTransactionService,
+        private readonly PaymentActionService $paymentActionService,
         private readonly PaymentResourceHydratorInterface $hydrator,
         private readonly CancelServiceInterface $cancelService,
         private readonly ShipServiceInterface $shipService,
@@ -197,7 +197,7 @@ public function unifiedRefund(Request $request, Context $context): JsonResponse
         $comment = (string) $request->get('comment', '');
 
         try {
-            $this->paymentTransactionService->doUnifiedRefund(
+            $this->paymentActionService->doUnifiedRefund(
                 orderTransaction: $orderTransaction,
                 amount: $amount,
                 context: $context,