Release 7.3.2

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 7.3.2
+- Fix for partial refunds using standard refund option
+- Fixed issue with undefined array key
+- Fixed issue with recurring payments
+- Fixed concrete class reference; used interface instead
+
+# 7.3.1
+- Shopware 6.7.7.0 compatibility
+- Fix for missing payment icons
+- Fixed issue with 'Entire Set' coupons returning error due to totals mismatch
+- Fixed issue with orphaned order_transactions causing an admin UI failure
+- Fixed error thrown when customers who aren't logged in attempt to download an invoice
+
 # 7.3.0
 - Headless storefront support
 

CHANGELOG_de-DE.md

@@ -1,3 +1,15 @@
+# 7.3.2
+- Problem mit Teilrückerstattungen über die Standardrückerstattungsoption behoben
+- Problem mit undefiniertem Array-Schlüssel behoben
+- Problem mit einziehenden Zahlungen behoben
+- Konkrete Klasse durch Verwendung einer Schnittstelle korrigiert
+# 7.3.1
+- Kompatibilität mit Shopware 6.7.7.0
+- Fehlende Zahlungssymbole behoben
+- Problem mit „Gesamtes Set“-Gutscheinen aufgrund von Summenabweichungen behoben
+- Problem mit verwaisten Bestelltransaktionen behoben, die zu einem Fehler in der Admin-Oberfläche führten
+- Ein Fehler wurde behoben, der auftrat, wenn nicht angemeldete Kunden versuchten, eine Rechnung herunterzuladen.
+
 # 7.3.0
 - Headless Storefront unterstützung
 

README.md

@@ -13,10 +13,10 @@ Please note that this plugin is for versions 6.5, 6.6 or 6.7. For the 6.4 plugin
 
 ## Documentation
 
-- For English documentation click [here](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.0/docs/en/documentation.html)
-- Für die deutsche Dokumentation klicken Sie [hier](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.0/docs/de/documentation.html)
-- Pour la documentation Française, cliquez [ici](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.0/docs/fr/documentation.html)
-- Per la documentazione in tedesco, clicca [qui](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.0/docs/it/documentation.html)
+- For English documentation click [here](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.2/docs/en/documentation.html)
+- Für die deutsche Dokumentation klicken Sie [hier](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.2/docs/de/documentation.html)
+- Pour la documentation Française, cliquez [ici](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.2/docs/fr/documentation.html)
+- Per la documentazione in tedesco, clicca [qui](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.3.2/docs/it/documentation.html)
 
 ## Installation
 

composer.json

@@ -59,5 +59,5 @@
     "vrpayment/sdk": "^4.0.0"
   },
   "type": "shopware-platform-plugin",
-  "version": "7.3.0"
+  "version": "7.3.2"
 }

docs/de/documentation.html

@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.0/">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.2/">
 			Source
 		</a>
 	</li>

docs/en/documentation.html

@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.0/">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.2/">
 			Source
 		</a>
 	</li>

docs/fr/documentation.html

@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.0/">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.2/">
 			Source
 		</a>
 	</li>

docs/it/documentation.html

@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.0/">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.3.2/">
 			Source
 		</a>
 	</li>

src/Core/Api/Refund/Controller/RefundController.php

@@ -14,7 +14,8 @@ use Symfony\Component\{
 use VRPaymentPayment\Core\{
   Api\Refund\Service\RefundService,
   Api\Transaction\Service\TransactionService,
-  Settings\Service\SettingsService
+  Settings\Service\SettingsService,
+  Util\Exception\RefundNotSupportedException
 };
 
 /**
@@ -105,7 +106,12 @@ class RefundController extends AbstractController
             return new Response('refundExceedsQuantity', Response::HTTP_BAD_REQUEST);
         }
 
-        $refund = $this->refundService->create($transaction, $context, $lineItemId, $quantity);
+        try {
+            $refund = $this->refundService->create($transaction, $context, $lineItemId, $quantity);
+        } catch (RefundNotSupportedException $exception) {
+            $this->logger->info('Payment method does not support online refunds for transaction: ' . $transactionId);
+            return new Response('methodDoesNotSupportRefund', Response::HTTP_BAD_REQUEST);
+        }
 
         if ($refund === null) {
             return new Response('Refund was not created. Please check the refund amound or if the item was not refunded before', Response::HTTP_BAD_REQUEST);
@@ -148,7 +154,12 @@ class RefundController extends AbstractController
             return new Response('refundExceedsAmount', Response::HTTP_BAD_REQUEST);
         }
         
-        $refund = $this->refundService->createRefundByAmount($transaction, $refundableAmount, $context);
+        try {
+            $refund = $this->refundService->createRefundByAmount($transaction, $refundableAmount, $context);
+        } catch (RefundNotSupportedException $exception) {
+            $this->logger->info('Payment method does not support online refunds for transaction: ' . $transactionId);
+            return new Response('methodDoesNotSupportRefund', Response::HTTP_BAD_REQUEST);
+        }
         
         if ($refund === null) {
             return new Response('refundExceedsAmount', Response::HTTP_BAD_REQUEST);
@@ -179,7 +190,13 @@ class RefundController extends AbstractController
         $apiClient = $settings->getApiClient();
         
         $transaction = $apiClient->getTransactionService()->read($settings->getSpaceId(), $transactionId);
-        $this->refundService->createPartialRefund($transaction, $context, $lineItemId, $refundableAmount);
+        
+        try {
+            $refund = $this->refundService->createPartialRefund($transaction, $context, $lineItemId, $refundableAmount);
+        } catch (RefundNotSupportedException $exception) {
+            $this->logger->info('Payment method does not support online refunds for transaction: ' . $transactionId);
+            return new Response('methodDoesNotSupportRefund', Response::HTTP_BAD_REQUEST);
+        }
         
         return new Response(null, Response::HTTP_NO_CONTENT);
     }

src/Core/Api/Refund/Service/RefundService.php

@@ -17,13 +17,15 @@ use VRPayment\Sdk\{
   Model\EntityQueryFilter,
   Model\EntityQueryFilterType,
   Model\EntityQuery,
+  ApiException
 };
 use VRPaymentPayment\Core\{
   Api\Refund\Entity\RefundEntity,
   Api\Transaction\Entity\TransactionEntity,
   Api\Transaction\Entity\TransactionEntityDefinition,
   Settings\Service\SettingsService,
-  Util\Payload\RefundPayload
+  Util\Payload\RefundPayload,
+  Util\Exception\RefundNotSupportedException
 };
 
 /**
@@ -103,6 +105,12 @@ class RefundService
                 $this->upsert($refund, $context);
                 return $refund;
             }
+        } catch (ApiException $exception) {
+            $message = $exception->getMessage();
+            $this->logger->critical($message);
+            if ($exception->getCode() === 442 && str_contains($message, 'does not support online refunds')) {
+                throw new RefundNotSupportedException($message, 0, $exception);
+            }
         } catch (\Exception $exception) {
             $this->logger->critical($exception->getMessage());
         }
@@ -138,6 +146,12 @@ class RefundService
                 $this->upsert($refund, $context);
                 return $refund;
             }
+        } catch (ApiException $exception) {
+            $message = $exception->getMessage();
+            $this->logger->critical($message);
+            if ($exception->getCode() === 442 && str_contains($message, 'does not support online refunds')) {
+                throw new RefundNotSupportedException($message, 0, $exception);
+            }
         } catch (\Exception $exception) {
             $this->logger->critical($exception->getMessage());
         }
@@ -174,6 +188,12 @@ class RefundService
                 $this->upsert($refund, $context);
                 return $refund;
             }
+        } catch (ApiException $exception) {
+            $message = $exception->getMessage();
+            $this->logger->critical($message);
+            if ($exception->getCode() === 442 && str_contains($message, 'does not support online refunds')) {
+                throw new RefundNotSupportedException($message, 0, $exception);
+            }
         } catch (\Exception $exception) {
             $this->logger->critical($exception->getMessage());
         }

src/Core/Api/Transaction/Service/TransactionService.php

@@ -313,8 +313,8 @@ class TransactionService
     public function upsert(
         Transaction $transaction,
         Context     $context,
-        string      $paymentMethodId = null,
-        string      $salesChannelId = null
+        ?string     $paymentMethodId = null,
+        ?string     $salesChannelId = null
     ): void {
         try {
 
@@ -328,6 +328,13 @@ class TransactionService
             $orderId = $transactionMetaData[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID];
             $orderTransactionId = $transactionMetaData[TransactionPayload::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID];
 
+            if (!$paymentMethodId) {
+                $criteria = new Criteria([$orderTransactionId]);
+                $criteria->addAssociation('order');
+                $orderTransaction = $this->container->get('order_transaction.repository')->search($criteria, $context)->first();
+                $paymentMethodId = $orderTransaction->getPaymentMethodId();
+            }
+
             $dataParamValue = json_decode(strval($transaction), true);
             $brandName = '';
             if (isset($dataParamValue['paymentConnectorConfiguration'])) {

src/Core/Api/WebHooks/Controller/WebHookController.php

@@ -486,7 +486,7 @@ class WebHookController extends AbstractController {
 			$transaction = $this->settings->getApiClient()
 										  ->getTransactionService()
 										  ->read($callBackData->getSpaceId(), $callBackData->getEntityId());
-			$orderId     = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID];
+			$orderId = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID] ?? null;
 			if(!empty($orderId) && !$transaction->getParent()) {
 				$this->executeLocked($orderId, $context, function () use ($orderId, $transaction, $context, $callBackData) {
 					$this->transactionService->upsert($transaction, $context);

src/Core/Api/WebHooks/Strategy/WebHookRefundStrategy.php

@@ -64,7 +64,7 @@ class WebHookRefundStrategy extends WebHookStrategyBase implements WebhookStrate
 	/**
 	 * @inheritDoc
 	 */
-	public function getOrderIdByTransaction($transaction): string
+	public function getOrderIdByTransaction($transaction): string|null
 	{
 		/** @var \VRPayment\Sdk\Model\Refund $transaction */
 		return $transaction->getTransaction()

src/Core/Api/WebHooks/Strategy/WebHookTransactionInvoiceStrategy.php

@@ -63,10 +63,10 @@ class WebHookTransactionInvoiceStrategy extends WebHookStrategyBase implements W
 	/**
 	 * @inheritDoc
 	 */
-	public function getOrderIdByTransaction($transaction): string
+	public function getOrderIdByTransaction($transactionInvoice): string|null
 	{
 		/** @var \VRPayment\Sdk\Model\TransactionInvoice $transaction */
-		return $transaction->getCompletion()
+		return $transactionInvoice->getCompletion()
 			->getLineItemVersion()
 			->getTransaction()
 			->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID];

src/Core/Api/WebHooks/Strategy/WebHookTransactionStrategy.php

@@ -61,7 +61,7 @@ class WebHookTransactionStrategy extends WebHookStrategyBase implements WebhookS
 	/**
 	 * @inheritDoc
 	 */
-	public function getOrderIdByTransaction(Transaction $transaction): string
+	public function getOrderIdByTransaction(Transaction $transaction): string|null
 	{
 		/** @var \VRPayment\Sdk\Model\Transaction $transaction */
 		return $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID];
@@ -116,10 +116,12 @@ class WebHookTransactionStrategy extends WebHookStrategyBase implements WebhookS
 			/** @var \Shopware\Core\Checkout\Order\OrderEntity $order */
 			$transaction = $this->getTransaction($request);
             $token = $transaction->getToken();
-			$orderId = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID];
+			$orderId = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_ID] ?? null;
 			if (!empty($orderId) && !$transaction->getParent()) {
 				$this->executeLocked($orderId, $context, function () use ($orderId, $transaction, $context, $request, $token) {
-					$this->transactionService->upsert($transaction, $context);
+					if ($this->allowUpsert($transaction, $orderId, $context)) {
+						$this->transactionService->upsert($transaction, $context);
+					}
 					$orderTransactionId = $transaction->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID];
 					$orderTransaction   = $this->getOrderTransaction($orderId, $context);
 					$this->logger->info("OrderId: {orderId} Current state: {state}", [
@@ -178,4 +180,26 @@ class WebHookTransactionStrategy extends WebHookStrategyBase implements WebhookS
 
 		return new JsonResponse(['data' => $request->jsonSerialize()], $status);
 	}
+
+	/**
+	 * Checks the incoming transaction ID against the current transaction ID of the order.
+	 * If they don’t match, the saved transaction in the database remains unchanged.
+	 *
+	 * @param Transaction $transaction The transaction data retrieved from the portal.
+	 * @param string $orderId The order ID of the current transaction.
+	 * @param Context $context The operational context providing settings and environment for transaction processing.
+	 * @return bool Returns a value that determines whether to upsert the transaction into the database.
+	 */
+	private function allowUpsert(Transaction $transaction, string $orderId, Context $context): bool
+	{
+		try {
+			$transactionEntity = $this->transactionService->getByOrderId($orderId, $context);
+			if ($transactionEntity->getTransactionId() !== $transaction->getId()) {
+				return false;
+			}
+		} catch (\Throwable $e) {
+
+		}
+		return true;
+	}
 }

src/Core/Api/WebHooks/Strategy/WebhookStrategyActionsInterface.php

@@ -57,5 +57,5 @@ interface WebhookStrategyActionsInterface {
 	 * @param Transaction|TransactionInvoiceState|Refund|mixed $transaction The transaction object from which the order ID should be extracted.
 	 * @return string The order ID as a string.
 	 */
-	public function getOrderIdByTransaction(Transaction $transaction): string;
+	public function getOrderIdByTransaction(Transaction $transaction): string|null;
 }

src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php

@@ -25,7 +25,7 @@ use Shopware\Core\{
     Framework\Struct\Struct,
     Framework\Validation\DataBag\RequestDataBag,
     System\StateMachine\Aggregation\StateMachineState\StateMachineStateEntity,
-    System\SalesChannel\Context\SalesChannelContextService,
+    System\SalesChannel\Context\SalesChannelContextServiceInterface,
     System\SalesChannel\Context\SalesChannelContextServiceParameters
 };
 use Shopware\Core\Framework\Util\Random;
@@ -71,7 +71,7 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
      */
     private $orderTransactionStateHandler;
 
-    protected SalesChannelContextService $salesChannelContextService;
+    protected SalesChannelContextServiceInterface $salesChannelContextService;
 
     protected EntityRepository $orderTransactionRepository;
 
@@ -84,7 +84,7 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
         CustomCartPersister $cartPersister,
         PluginTransactionService $pluginTransactionService,
         OrderTransactionStateHandler $orderTransactionStateHandler,
-        SalesChannelContextService $salesChannelContextService,
+        SalesChannelContextServiceInterface $salesChannelContextService,
         EntityRepository $orderTransactionRepository,
         ?EntityRepository $subscriptionRepository,
     ) {

src/Core/Checkout/PaymentMethod/SalesChannel/PaymentMethodRouteDecorator.php

@@ -76,7 +76,7 @@ class PaymentMethodRouteDecorator extends AbstractPaymentMethodRoute
         $response = $this->decorated->load($request, $context, $criteria);
 
         $currentRoute = $request->attributes->get('_route');
-        if ($currentRoute === 'frontend.checkout.finish.page') {
+        if ($currentRoute === 'frontend.checkout.finish.page' || !$this->allowFilterPaymentMethods($request)) {
             return $response;
         }
 
@@ -100,4 +100,22 @@ class PaymentMethodRouteDecorator extends AbstractPaymentMethodRoute
             )
         );
     }
+
+    /**
+     * We prevent filtering methods unless onlyAvailable is true.
+     * This is because the filterPaymentMethods() function creates unnecessary pending transactions in the
+     * portal when logged-in users navigate between pages.
+     * The onlyAvailable flag applies rule-based filtering of payment methods and is usually true on checkout pages,
+     * so we apply filterPaymentMethods() only when relevant.
+     *
+     * @param Request $request
+     * @return bool
+     */
+    private function allowFilterPaymentMethods(Request $request): bool
+    {
+        if ($request->query->getBoolean('onlyAvailable') || $request->request->getBoolean('onlyAvailable')) {
+            return true;
+        }
+        return false;
+    }
 }

src/Core/Checkout/Service/PaymentMethodFilterService.php

@@ -262,7 +262,7 @@ class PaymentMethodFilterService
                 new EqualsFilter('salesChannels.id', $salesChannelContext->getSalesChannelId())
             );
             $criteria->addSorting(new FieldSorting('position', FieldSorting::ASCENDING));
-
+            $criteria->addAssociation('media');
             // Re-fetch the entities to ensure we have valid objects with all associations.
             $result = $this->paymentMethodRepository->search($criteria, $salesChannelContext->getContext());
             /** @var \Shopware\Core\Checkout\Payment\PaymentMethodEntity $method */

src/Core/Storefront/Account/Controller/AccountOrderController.php

@@ -6,7 +6,7 @@ namespace VRPaymentPayment\Core\Storefront\Account\Controller;
 
 use Psr\Log\LoggerInterface;
 use Shopware\Core\{
-  Checkout\Cart\Exception\CustomerNotLoggedInException,
+  Checkout\Cart\CartException,
   Checkout\Customer\CustomerEntity,
   PlatformRequest,
   System\SalesChannel\SalesChannelContext
@@ -133,14 +133,14 @@ class AccountOrderController extends StorefrontController
    * Helper to retrieve the currently logged-in customer.
    *
    * @return CustomerEntity
-   * @throws CustomerNotLoggedInException
+   * @throws CartException
    */
   protected function getLoggedInCustomer(): CustomerEntity
   {
     $request = $this->requestStack->getCurrentRequest();
 
     if (!$request) {
-      throw new CustomerNotLoggedInException();
+      throw CartException::customerNotLoggedIn();
     }
 
     /** @var SalesChannelContext|null $context */
@@ -150,6 +150,6 @@ class AccountOrderController extends StorefrontController
       return $context->getCustomer();
     }
 
-    throw new CustomerNotLoggedInException();
+    throw CartException::customerNotLoggedIn();
   }
 }

src/Core/Util/Analytics/Analytics.php

@@ -26,7 +26,7 @@ class Analytics {
 			self::SHOP_SYSTEM             => 'shopware',
 			self::SHOP_SYSTEM_VERSION     => '6',
 			self::SHOP_SYSTEM_AND_VERSION => 'shopware-6',
-			self::PLUGIN_SYSTEM_VERSION   => '7.3.0',
+			self::PLUGIN_SYSTEM_VERSION   => '7.3.2',
 		];
 	}
 

src/Core/Util/Exception/RefundNotSupportedException.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+
+namespace VRPaymentPayment\Core\Util\Exception;
+
+class RefundNotSupportedException extends \LogicException{
+
+}

src/Core/Util/Payload/TransactionPayload.php

@@ -197,7 +197,7 @@ class TransactionPayload extends AbstractPayload
             'merchant_reference' => $this->fixLength($this->order->getOrderNumber(), 100),
             'meta_data' => [
                 self::VRPAYMENT_METADATA_ORDER_ID => $this->order->getId(),
-                self::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID => $this->order->getTransactions()->first()->getId(),
+                self::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID => $this->transaction->getOrderTransactionId(),
                 self::VRPAYMENT_METADATA_SALES_CHANNEL_ID => $this->salesChannelContext->getSalesChannel()->getId(),
                 self::VRPAYMENT_METADATA_CUSTOMER_NAME => $customerName,
             ],
@@ -378,7 +378,7 @@ class TransactionPayload extends AbstractPayload
                 $rate = $calculatedTax->getTaxRate();
                 $amount = $this->calculateDiscountAmount($calculatedTax);
 
-                $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
+                $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate, $discount->getId());
             }
         } else {
             $taxRules = $calculatedPrice->getTaxRules();
@@ -387,12 +387,12 @@ class TransactionPayload extends AbstractPayload
                 foreach ($taxRules as $taxRule) {
                     $rate = $taxRule->getTaxRate();
                     $amount = $calculatedPrice->getTotalPrice();
-                    $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
+                    $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate, $discount->getId());
                 }
             } else {
                 $rate = $this->getDefaultTaxRate();
                 $amount = $calculatedPrice->getTotalPrice();
-                $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate);
+                $lineItems[] = $this->createDiscountLineItem($discountName, $amount, $rate, $discount->getId());
             }
         }
     }
@@ -403,7 +403,7 @@ class TransactionPayload extends AbstractPayload
      * @param float $rate
      * @return LineItemCreate
      */
-    private function createDiscountLineItem(string $discountName, float $amount, float $rate): LineItemCreate
+    private function createDiscountLineItem(string $discountName, float $amount, float $rate, string $discountId): LineItemCreate
     {
         $lineItem = new LineItemCreate();
 
@@ -422,7 +422,7 @@ class TransactionPayload extends AbstractPayload
             ->setShippingRequired(false)
             ->setSku($discountSkuName, 200)
             ->setType(LineItemType::DISCOUNT)
-            ->setUniqueId('coupon-' . $discountSkuName);
+            ->setUniqueId('coupon-' . $discountSkuName . '-' . $discountId);
 
         $taxRate = new TaxCreate([
             'title' => 'Discount Tax: ' . $rate,

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-refund-by-amount/index.js

@@ -79,6 +79,9 @@ Component.register('vrpayment-order-action-refund-by-amount', {
 						case 'refundExceedsAmount':
 							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messageRefundAmountExceedsAvailableBalance');
 						break;
+						case 'methodDoesNotSupportRefund':
+							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messagePaymentMethodDoesNotSupportRefund');
+						break;
 						default:
 							errorMessage = errorResponse.response.data.errors[0].detail;
 					}

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-refund-partial/index.js

@@ -71,9 +71,18 @@ Component.register('vrpayment-order-action-refund-partial', {
 				});
 			}).catch((errorResponse) => {
 				try {
+					var errorTitle = errorResponse?.response?.data?.errors?.[0]?.title ?? this.$tc('vrpayment-order.refundAction.refundCreateError.errorTitle')
+					var errorMessage;
+					switch(errorResponse.response.data) {
+						case 'methodDoesNotSupportRefund':
+							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messagePaymentMethodDoesNotSupportRefund');
+						break;
+						default:
+							errorMessage = errorResponse.response.data.errors[0].detail;
+					}
 					this.createNotificationError({
-						title: errorResponse.response.data.errors[0].title,
-						message: errorResponse.response.data.errors[0].detail,
+						title: errorTitle,
+						message: errorMessage,
 						autoClose: false
 					});
 				} catch (e) {

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-refund-selected/index.js

@@ -70,9 +70,18 @@ Component.register('vrpayment-order-action-refund-selected', {
 				});
 			}).catch((errorResponse) => {
 				try {
+					var errorTitle = errorResponse?.response?.data?.errors?.[0]?.title ?? this.$tc('vrpayment-order.refundAction.refundCreateError.errorTitle')
+					var errorMessage;
+					switch(errorResponse.response.data) {
+						case 'methodDoesNotSupportRefund':
+							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messagePaymentMethodDoesNotSupportRefund');
+						break;
+						default:
+							errorMessage = errorResponse.response.data.errors[0].detail;
+					}
 					this.createNotificationError({
-						title: errorResponse.response.data.errors[0].title,
-						message: errorResponse.response.data.errors[0].detail,
+						title: errorTitle,
+						message: errorMessage,
 						autoClose: false
 					});
 				} catch (e) {

src/Resources/app/administration/src/module/vrpayment-order/component/vrpayment-order-action-refund/index.js

@@ -77,6 +77,9 @@ Component.register('vrpayment-order-action-refund', {
 						case 'refundExceedsQuantity':
 							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messageRefundQuantityExceedsAvailableBalance');
 						break;
+						case 'methodDoesNotSupportRefund':
+							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messagePaymentMethodDoesNotSupportRefund');
+						break;
 						default:
 							errorMessage = errorResponse.response.data.errors[0].detail;
 					}

src/Resources/app/administration/src/module/vrpayment-order/page/vrpayment-order-detail/index.html.twig

@@ -98,7 +98,7 @@
                         <template #actions="{ item }">
                             <sw-context-menu-item
                                     :disabled="transaction.state != 'FULFILL' || item.refundableQuantity != item.quantity || item.refundableAmount == 0 || item.itemRefundedAmount > 0 || item.itemRefundedQuantity > 0"
-                                    @click="lineItemRefund(item.uniqueId)">
+                                    @click="lineItemRefund(item.uniqueId, item.quantity)">
                                 {{ $tc('vrpayment-order.buttons.label.refund-whole-line-item') }}
                             </sw-context-menu-item>
 

src/Resources/app/administration/src/module/vrpayment-order/page/vrpayment-order-detail/index.js

@@ -332,12 +332,12 @@ Component.register('vrpayment-order-detail', {
 			this.modalType = '';
 		},
 
-		lineItemRefund(lineItemId) {
+		lineItemRefund(lineItemId, itemQuantity) {
 			this.isLoading = true;
 			this.VRPaymentRefundService.createRefund(
 				this.transactionData.transactions[0].metaData.salesChannelId,
 				this.transactionData.transactions[0].id,
-				0,
+				itemQuantity,
 				lineItemId
 			).then(() => {
 				this.createNotificationSuccess({
@@ -351,9 +351,18 @@ Component.register('vrpayment-order-detail', {
                 });
 			}).catch((errorResponse) => {
 				try {
+					var errorTitle = errorResponse?.response?.data?.errors?.[0]?.title ?? this.$tc('vrpayment-order.refundAction.refundCreateError.errorTitle')
+					var errorMessage;
+					switch(errorResponse.response.data) {
+						case 'methodDoesNotSupportRefund':
+							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messagePaymentMethodDoesNotSupportRefund');
+						break;
+						default:
+							errorMessage = errorResponse.response.data.errors[0].detail;
+					}
 					this.createNotificationError({
-						title: errorResponse.response.data.errors[0].title,
-						message: errorResponse.response.data.errors[0].detail,
+						title: errorTitle,
+						message: errorMessage,
 						autoClose: false
 					});
 				} catch (e) {
@@ -385,7 +394,7 @@ Component.register('vrpayment-order-detail', {
                 // Force the DOM to update before proceeding with the asynchronous operations
                 this.$nextTick(() => {
                     const refundPromises = this.selectedItems.map((item) => {
-                        return this.lineItemRefundBulk(item.uniqueId); // Simulated refund action with delay
+                        return this.lineItemRefundBulk(item.uniqueId, item.quantity); // Simulated refund action with delay
                     });
 
                     // Wait for all refund promises to complete
@@ -399,6 +408,10 @@ Component.register('vrpayment-order-detail', {
                             });
                         })
                         .catch((error) => {
+							if (error?.response?.data === 'methodDoesNotSupportRefund') {
+								this.isLoading = false;
+								return;
+							}
                             // Handle any errors during the refund process
                             this.createNotificationError({
                                 title: 'Error',
@@ -410,12 +423,12 @@ Component.register('vrpayment-order-detail', {
                 });
             }
         },
-        lineItemRefundBulk(lineItemId) {
+        lineItemRefundBulk(lineItemId, itemQuantity) {
             return new Promise((resolve, reject) => {
                 this.VRPaymentRefundService.createRefund(
                     this.transactionData.transactions[0].metaData.salesChannelId,
                     this.transactionData.transactions[0].id,
-                    0,
+                    itemQuantity,
                     lineItemId
                 )
                 .then(() => {
@@ -427,11 +440,20 @@ Component.register('vrpayment-order-detail', {
                 })
                 .catch((errorResponse) => {
                     try {
-                        this.createNotificationError({
-                            title: errorResponse.response.data.errors[0].title,
-                            message: errorResponse.response.data.errors[0].detail,
-                            autoClose: false
-                        });
+                        var errorTitle = errorResponse?.response?.data?.errors?.[0]?.title ?? this.$tc('vrpayment-order.refundAction.refundCreateError.errorTitle')
+						var errorMessage;
+						switch(errorResponse.response.data) {
+							case 'methodDoesNotSupportRefund':
+								errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messagePaymentMethodDoesNotSupportRefund');
+							break;
+							default:
+								errorMessage = errorResponse.response.data.errors[0].detail;
+						}
+						this.createNotificationError({
+							title: errorTitle,
+							message: errorMessage,
+							autoClose: false
+						});
                     } catch (e) {
                         this.createNotificationError({
                             title: errorResponse.title,
@@ -439,7 +461,7 @@ Component.register('vrpayment-order-detail', {
                             autoClose: false
                         });
                     } finally {
-                        reject();
+                        reject(errorResponse);
                     }
                 });
             });

src/Resources/app/administration/src/module/vrpayment-order/snippet/de-DE.json

@@ -83,7 +83,8 @@
 		"messageRefundAmountExceedsAvailableBalance": "Der Rückerstattungsbetrag übersteigt das verfügbare Guthaben.",
 		"messageRefundAmountIsZero": "Der Rückerstattungsbetrag muss größer als 0 sein.",
 		"messageRefundQuantityExceedsAvailableBalance": "Rückerstattung nach Menge überschreitet die maximal verfügbare Anzahl an Artikeln zur Rückerstattung.",
-		"messageRefundQuantityIsZero": "Rückerstattung nach Menge muss größer als 0 sein."
+		"messageRefundQuantityIsZero": "Rückerstattung nach Menge muss größer als 0 sein.",
+		"messagePaymentMethodDoesNotSupportRefund": "Die Zahlungsmethode unterstützt keine Online-Rückerstattungen."
 	  }
 	},
 	"transactionHistory": {

src/Resources/app/administration/src/module/vrpayment-order/snippet/en-GB.json

@@ -83,7 +83,8 @@
 		"messageRefundAmountExceedsAvailableBalance": "Refund amount exceeds available balance.",
 		"messageRefundAmountIsZero": "Refund amount must be greater than 0.",
 		"messageRefundQuantityExceedsAvailableBalance": "Refund by quantity exceeds maximum available items to refund.",
-		"messageRefundQuantityIsZero": "Refund by quantity must be greater than 0."
+		"messageRefundQuantityIsZero": "Refund by quantity must be greater than 0.",
+		"messagePaymentMethodDoesNotSupportRefund": "Payment method does not support online refunds."
 	  }
 	},
 	"transactionHistory": {

src/Resources/app/administration/src/module/vrpayment-order/snippet/fr-FR.json

@@ -83,7 +83,8 @@
 		"messageRefundAmountExceedsAvailableBalance": "Le montant du remboursement dépasse le solde disponible.",
 		"messageRefundAmountIsZero": "Le montant du remboursement doit être supérieur à 0.",
 		"messageRefundQuantityExceedsAvailableBalance": "Le remboursement par quantité dépasse le nombre maximal d’articles remboursables.",
-		"messageRefundQuantityIsZero": "Le remboursement par quantité doit être supérieur à 0."
+		"messageRefundQuantityIsZero": "Le remboursement par quantité doit être supérieur à 0.",
+		"messagePaymentMethodDoesNotSupportRefund": "Le mode de paiement ne prend pas en charge les remboursements en ligne."
 	  }
 	},
 	"transactionHistory": {

src/Resources/app/administration/src/module/vrpayment-order/snippet/it-IT.json

@@ -83,7 +83,8 @@
 		"messageRefundAmountExceedsAvailableBalance": "LL'importo del rimborso supera il saldo disponibile.",
 		"messageRefundAmountIsZero": "L'importo del rimborso deve essere superiore a 0.",
 		"messageRefundQuantityExceedsAvailableBalance": "Il rimborso per quantità supera il numero massimo di articoli rimborsabili.",
-		"messageRefundQuantityIsZero": "Il rimborso per quantità deve essere maggiore di 0."
+		"messageRefundQuantityIsZero": "Il rimborso per quantità deve essere maggiore di 0.",
+		"messagePaymentMethodDoesNotSupportRefund": "Il metodo di pagamento non supporta i rimborsi online."
 	  }
 	},
 	"transactionHistory": {

src/Resources/public/administration/.vite/entrypoints.json

@@ -7,7 +7,7 @@
       ],
       "dynamic": [],
       "js": [
-        "/bundles/vrpaymentpayment/administration/assets/v-r-payment-payment-BV391wJu.js"
+        "/bundles/vrpaymentpayment/administration/assets/v-r-payment-payment-D_mm2NL2.js"
       ],
       "legacy": false,
       "preload": []

src/Resources/public/administration/.vite/manifest.json

@@ -1,6 +1,6 @@
 {
   "main.js": {
-    "file": "assets/v-r-payment-payment-BV391wJu.js",
+    "file": "assets/v-r-payment-payment-D_mm2NL2.js",
     "name": "v-r-payment-payment",
     "src": "main.js",
     "isEntry": true,