Release 7.1.6

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 7.1.6
+- Improved rounding handling to force 2 decimal places
+- Removed references to unused classes
+- Fixed some type errors
+- Further improved 0 amount transaction; state transitions
+
+# 7.1.5
+- Improved analytics
+- Improved error handling for refunding amount 0 and too many items
+
+# 7.1.4
+- Updated SDK to 4.8.1
+
 # 7.1.3
 - Fixed issue with radio button/switch settings not saving
 - Fixed issue with error screen sporadically happening after failed payments

CHANGELOG_de-DE.md

@@ -1,3 +1,16 @@
+# 7.1.6
+- Verbesserte Rundungsbehandlung für zwei Dezimalstellen
+- Entfernte Verweise auf ungenutzte Klassen
+- Behebung einiger Typfehler
+- Weitere Verbesserung von Transaktionen mit dem Betrag 0 und Zustandsübergängen
+
+# 7.1.5
+- Verbesserte Analysefunktionen
+- Verbesserte Fehlerbehandlung bei Rückerstattungen von 0 Beträgen und zu vielen Artikeln
+
+# 7.1.4
+- Aktualisiertes SDK - 4.8.1
+
 # 7.1.3
 – Problem behoben, bei dem die Einstellungen von Optionsfeldern/Schaltern nicht gespeichert wurden.
 – Problem behoben, bei dem nach fehlgeschlagenen Zahlungen sporadisch ein Fehlerbildschirm angezeigt wurde.

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.1.3/docs/en/documentation.html)
-- Für die deutsche Dokumentation klicken Sie [hier](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.3/docs/de/documentation.html)
-- Pour la documentation Française, cliquez [ici](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.3/docs/fr/documentation.html)
-- Per la documentazione in tedesco, clicca [qui](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.3/docs/it/documentation.html)
+- For English documentation click [here](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.6/docs/en/documentation.html)
+- Für die deutsche Dokumentation klicken Sie [hier](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.6/docs/de/documentation.html)
+- Pour la documentation Française, cliquez [ici](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.6/docs/fr/documentation.html)
+- Per la documentazione in tedesco, clicca [qui](https://docs.plugin-documentation.vr-payment.de/vr-payment/shopware-6/7.1.6/docs/it/documentation.html)
 
 ## Installation
 

composer.json

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

docs/de/documentation.html

@@ -23,7 +23,7 @@
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.3/">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.6/">
 			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.1.3/">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.6/">
 			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.1.3/">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.6/">
 			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.1.3/">
+		<a href="https://github.com/vr-payment/shopware-6/releases/tag/7.1.6/">
 			Source
 		</a>
 	</li>

src/Core/Api/PaymentMethodConfiguration/Service/PaymentMethodConfigurationService.php

@@ -661,6 +661,13 @@ class PaymentMethodConfigurationService {
 			], $context);
 
 			// Media insert/update
+
+			// detect if collision, return existing id
+			$existingId = $this->checkMediaAlreadyExists($paymentMethodConfiguration->getResolvedImageUrl(), $context);
+			if ($existingId) {
+				return $existingId;
+			}
+
 			$mediaDefinition = $this->container->get(MediaDefinition::class);
 			$this->mediaSerializer->setRegistry($this->serializerRegistry);
 
@@ -681,6 +688,22 @@ class PaymentMethodConfigurationService {
 		}
 	}
 
+	private function checkMediaAlreadyExists($paymentMethodUrl, $context) {
+		// detect if collision, return existing id
+		if (preg_match('#/([^/]+)\.[^/.]+$#', $paymentMethodUrl, $matches)) {
+			$filename = $matches[1];
+		}
+		$criteria = new Criteria();
+		$criteria->addFilter(new EqualsFilter('fileName', $filename));
+
+		$existing = $this->mediaRepository->search($criteria, $context)->first();
+
+		if ($existing) {
+			return $existing->getId();
+		}
+		return false;
+	}
+
 	/**
 	 * Retrieves media default folder for a given payment method configuration.
 	 *

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

@@ -13,6 +13,7 @@ use Symfony\Component\{
 };
 use VRPaymentPayment\Core\{
   Api\Refund\Service\RefundService,
+  Api\Transaction\Service\TransactionService,
   Settings\Service\SettingsService
 };
 
@@ -41,16 +42,23 @@ class RefundController extends AbstractController
      */
     protected $logger;
 
+    /**
+     * @var \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService
+     */
+    protected $transactionService;
+    
     /**
      * RefundController constructor.
      *
      * @param \VRPaymentPayment\Core\Api\Refund\Service\RefundService $refundService
      * @param \VRPaymentPayment\Core\Settings\Service\SettingsService $settingsService
+     * @param \VRPaymentPayment\Core\Api\Transaction\Service\TransactionService $transactionService
      */
-    public function __construct(RefundService $refundService, SettingsService $settingsService)
+    public function __construct(RefundService $refundService, SettingsService $settingsService, TransactionService $transactionService)
     {
         $this->settingsService = $settingsService;
         $this->refundService = $refundService;
+        $this->transactionService = $transactionService;
     }
     
     /**
@@ -82,11 +90,23 @@ class RefundController extends AbstractController
         $quantity = (int)$request->request->get('quantity');
         $lineItemId = $request->request->get('lineItemId');
 
+        if ($quantity === null || $quantity <= 0) {
+            return new Response('refundQuantityZero', Response::HTTP_BAD_REQUEST);
+        }        
+        
         $settings = $this->settingsService->getSettings($salesChannelId);
         $apiClient = $settings->getApiClient();
         
         $transaction = $apiClient->getTransactionService()->read($settings->getSpaceId(), $transactionId);
+
+        $maxQuantity = $this->refundService->getMaxRefundableQuantity($transaction, $context, $lineItemId);
+
+        if ($quantity > $maxQuantity) {
+            return new Response('refundExceedsQuantity', Response::HTTP_BAD_REQUEST);
+        }
+
         $refund = $this->refundService->create($transaction, $context, $lineItemId, $quantity);
+
         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);
         }
@@ -111,10 +131,23 @@ class RefundController extends AbstractController
         $transactionId = $request->request->get('transactionId');
         $refundableAmount = $request->request->get('refundableAmount');
 
+        if ($refundableAmount === null || $refundableAmount <= 0.0) {
+            return new Response('refundAmountZero', Response::HTTP_BAD_REQUEST);
+        }
+        
         $settings = $this->settingsService->getSettings($salesChannelId);
         $apiClient = $settings->getApiClient();
         
         $transaction = $apiClient->getTransactionService()->read($settings->getSpaceId(), $transactionId);
+        
+        $completed = (float) $transaction->getCompletedAmount();
+        $refunded  = (float) $transaction->getRefundedAmount();
+        $maxRefund = round($completed - $refunded, 2);
+
+        if ($refundableAmount > $maxRefund) {
+            return new Response('refundExceedsAmount', Response::HTTP_BAD_REQUEST);
+        }
+        
         $refund = $this->refundService->createRefundByAmount($transaction, $refundableAmount, $context);
         
         if ($refund === null) {

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

@@ -12,7 +12,11 @@ use Shopware\Core\{
 };
 use VRPayment\Sdk\{
   Model\Refund,
-  Model\Transaction
+  Model\Transaction,
+  Model\CriteriaOperator,
+  Model\EntityQueryFilter,
+  Model\EntityQueryFilterType,
+  Model\EntityQuery,
 };
 use VRPaymentPayment\Core\{
   Api\Refund\Entity\RefundEntity,
@@ -241,4 +245,67 @@ class RefundService
           ->first();
     }
     
+    /**
+     * Get total refunded quantity for transaction's line item by lineItemId.
+     *
+     * @param \VRPayment\Sdk\Model\Transaction $transaction
+     * @param \Shopware\Core\Framework\Context $context
+     * @param string $lineItemId
+     *
+     * @return int
+     */
+    public function getRefundedQuantity(Transaction $transaction, Context $context, string $lineItemId): int {
+        $transactionEntity = $this->getTransactionEntityByTransactionId($transaction->getId(), $context);
+        $settings = $this->settingsService->getSettings($transactionEntity->getSalesChannel()->getId());
+        $apiClient = $settings->getApiClient();
+
+        $entityQueryFilter = (new EntityQueryFilter())
+            ->setType(EntityQueryFilterType::LEAF)
+            ->setOperator(CriteriaOperator::EQUALS)
+            ->setFieldName('transaction.id')
+            ->setValue($transaction->getId());
+
+        $query = (new EntityQuery())->setFilter($entityQueryFilter);
+
+        $refunds = $apiClient->getRefundService()->search($settings->getSpaceId(), $query);
+
+        $refundedQuantity = 0;
+
+        foreach ($refunds as $refund) {
+            foreach ($refund->getReductions() as $reduction) {
+                if ($reduction->getLineItemUniqueId() === $lineItemId) {
+                    $refundedQuantity += (int) $reduction->getQuantityReduction();
+                }
+            }
+        }
+
+        return $refundedQuantity;
+    }
+
+    /**
+     * Get maximum quantity of available items to refund for line item.
+     *
+     * @param \VRPayment\Sdk\Model\Transaction $transaction
+     * @param \Shopware\Core\Framework\Context $context
+     * @param string $lineItemId
+     *
+     * @return int
+     */
+    public function getMaxRefundableQuantity(Transaction $transaction, Context $context, string $lineItemId): int {
+
+        $originalQuantity = 0;
+
+        foreach ($transaction->getLineItems() as $lineItem) {
+            if ($lineItem->getUniqueId() === $lineItemId) {
+                $originalQuantity = (int) $lineItem->getQuantity();
+                break;
+            }
+        }
+
+        $refundedQuantity = $this->getRefundedQuantity($transaction, $context, $lineItemId);
+
+        $maxQuantity = $originalQuantity - $refundedQuantity;
+
+        return $maxQuantity;
+    }
 }

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

@@ -45,7 +45,8 @@ use VRPaymentPayment\Core\{
     Settings\Service\SettingsService,
     Util\LocaleCodeProvider,
     Util\Payload\CustomProducts\CustomProductsLineItemTypes,
-    Util\Payload\TransactionPayload
+    Util\Payload\TransactionPayload,
+    Util\Analytics\Analytics
 };
 use Shopware\Core\Checkout\Order\Aggregate\OrderLineItem\OrderLineItemEntity;
 use Shopware\Core\Framework\Struct\ArrayEntity;
@@ -221,9 +222,14 @@ class TransactionService
             $spaceId = $settings->getSpaceId();
         }
 
-        $sdkTransaction = $settings->getApiClient()->getTransactionService()->create($spaceId, $sdkTransactionCreate);
+        $apiClient = $settings->getApiClient();
+        Analytics::addHeaders($apiClient, [
+            Analytics::SUBSCRIPTION_TRANSACTION => true
+        ]);
+
+        $sdkTransaction = $apiClient->getTransactionService()->create($spaceId, $sdkTransactionCreate);
         if ($sdkTransaction->valid()) {
-            return $settings->getApiClient()->getTransactionService()->processWithoutUserInteraction($spaceId, $sdkTransaction->getId());
+            return $apiClient->getTransactionService()->processWithoutUserInteraction($spaceId, $sdkTransaction->getId());
         }
 
         throw new \Exception("The transacion is not valid and could not be created.");
@@ -381,7 +387,7 @@ class TransactionService
      *
      * @return \Shopware\Core\Checkout\Order\OrderEntity
      */
-    protected function getOrderEntity(string $orderId, Context $context): OrderEntity
+    public function getOrderEntity(string $orderId, Context $context): OrderEntity
     {
         try {
             $criteria = (new Criteria([$orderId]))->addAssociations(['deliveries']);
@@ -715,18 +721,20 @@ class TransactionService
 	{
 		$lineItem = new LineItemCreate();
 
+		$roundedPrice = $this->round($productData->getPrice()->getUnitPrice());
+
 		if ($productData instanceof LineItem) {
 			$lineItem->setName($productData->getLabel());
 			$lineItem->setUniqueId($productData->getId());
 			$lineItem->setSku($productData->getReferencedId() ?? $productData->getId());
 			$lineItem->setQuantity($productData->getQuantity());
-			$lineItem->setAmountIncludingTax($productData->getPrice()->getUnitPrice());
+			$lineItem->setAmountIncludingTax($roundedPrice);
 		} elseif ($productData instanceof OrderLineItemEntity) {
 			$lineItem->setName($productData->getLabel());
 			$lineItem->setUniqueId($productData->getId());
 			$lineItem->setSku($productData->getProductId() ?? $productData->getIdentifier() ?? $productData->getId());
 			$lineItem->setQuantity($productData->getQuantity());
-			$lineItem->setAmountIncludingTax($productData->getUnitPrice());
+			$lineItem->setAmountIncludingTax($roundedPrice);
 		} else {
 			throw new \InvalidArgumentException('Unsupported line item type: ' . get_class($productData));
 		}
@@ -800,4 +808,14 @@ class TransactionService
         }
         return false;
     }
+
+    /**
+	 * @param     $amount
+	 * @param int $precision
+	 *
+	 * @return float
+	 */
+    private function round($value, $precision = 2): float {
+        return \round($value, $precision);
+    }
 }

src/Core/Checkout/PaymentHandler/VRPaymentPaymentHandler.php

@@ -125,7 +125,9 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
             $orderTransactionId = $transaction->getOrderTransactionId();
             $orderTransaction = $this->orderTransactionRepository->search(
                 (new Criteria([$orderTransactionId]))
-                    ->addAssociation('order'), $context
+                    ->addAssociation('order')
+                    ->addAssociation('stateMachineState'),
+                    $context
             )->getEntities()->first();
 
             $contextSource = $context->getSource();
@@ -133,20 +135,9 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
                 $salesChannelContextId = $contextSource->getSalesChannelId();
             }
 
-            $orderCustomer = $orderTransaction->getOrder()?->getOrderCustomer();
+            $contextToken = $this->getContextToken($request);
+            $parameters = new SalesChannelContextServiceParameters($salesChannelContextId, $contextToken, originalContext: $context);
 
-            if ($orderCustomer) {
-                $customerId = $orderCustomer->getCustomerId();
-            } else {
-                $customerId = null;
-            }
-
-            $parameters = new SalesChannelContextServiceParameters(
-                $salesChannelContextId, 
-                $request->getSession()->get("sw-context-token", Random::getAlphanumericString(32)), 
-                originalContext: $context,
-                customerId: $customerId
-            );
             $salesChannelContext = $this->salesChannelContextService->get($parameters);
             $redirectUrl = $transaction->getReturnUrl();
 
@@ -162,7 +153,10 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
             $request->getSession()->remove('transactionId');
             $errorMessage = 'An error occurred during the communication with external payment gateway : ' . $e->getMessage();
             $this->logger->critical($errorMessage);
-            throw PaymentException::customerCanceled($orderTransactionId, $errorMessage);
+            if ($orderTransaction->getState()?->getTechnicalName() === OrderTransactionStates::STATE_CANCELLED) {
+                throw PaymentException::asyncFinalizeInterrupted($orderTransaction->getOrder()->getId(), $errorMessage);
+            }
+            throw PaymentException::customerCanceled($transaction->getOrderTransactionId(), $errorMessage);
         }
     }
 
@@ -186,7 +180,9 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
         $orderTransactionId = $transaction->getOrderTransactionId();
         $orderTransaction = $this->orderTransactionRepository->search(
             (new Criteria([$orderTransactionId]))
-                ->addAssociation('order'), $context
+                ->addAssociation('order')
+                ->addAssociation('stateMachineState'),
+                $context
         )->getEntities()->first();
 
         if ($orderTransaction->getOrder()->getAmountTotal() > 0) {
@@ -215,7 +211,11 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
 
         $token = $request->getSession()->get('sw-context-token');
         if ($token) {
-            $salesChannelId = $transactionEntity->getSalesChannelId();
+            $orderEntity = $this->pluginTransactionService->getOrderEntity(
+                $orderTransaction->getOrder()->getId(),
+                $context
+            );
+            $salesChannelId = $orderEntity->getSalesChannelId();
             $parameters = new SalesChannelContextServiceParameters($salesChannelId, $token, originalContext: $context);
             $salesChannelContext = $this->salesChannelContextService->get($parameters);
 
@@ -432,7 +432,9 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
     {
         $lineItemCreate = new \VRPayment\Sdk\Model\LineItemCreate();
 
-        $lineItemCreate->setAmountIncludingTax($lineItem->getAmountIncludingTax());
+        $roundedPrice = $this->round($lineItem->getAmountIncludingTax());
+
+        $lineItemCreate->setAmountIncludingTax($roundedPrice);
 
         $attributes = $lineItem->getAttributes();
         $attributesCreate = [];
@@ -469,4 +471,28 @@ class VRPaymentPaymentHandler extends AbstractPaymentHandler
 
         return $lineItemCreate;
     }
+
+    /**
+	 * @param     $amount
+	 * @param int $precision
+	 *
+	 * @return float
+	 */
+    private function round($value, $precision = 2): float {
+        return \round($value, $precision);
+    }
+    
+    private function getContextToken(Request $request): string
+    {
+        $headerContextToken = $request->headers->get('sw-context-token');
+        if ($headerContextToken) {
+            return $headerContextToken;
+        }
+
+        $sessionContextToken = $request->getSession()->get("sw-context-token");
+        if (!$sessionContextToken) {
+            return $sessionContextToken;
+        }
+        return Random::getAlphanumericString(32);
+    }
 }

src/Core/Util/Analytics/Analytics.php

@@ -15,6 +15,7 @@ class Analytics {
 	public const SHOP_SYSTEM_VERSION     = 'x-meta-shop-system-version';
 	public const SHOP_SYSTEM_AND_VERSION = 'x-meta-shop-system-and-version';
 	public const PLUGIN_SYSTEM_VERSION   = 'x-meta-plugin-version';
+	public const SUBSCRIPTION_TRANSACTION = 'x-meta-subscription-transaction';
 
 	/**
 	 * @return array
@@ -25,16 +26,17 @@ class Analytics {
 			self::SHOP_SYSTEM             => 'shopware',
 			self::SHOP_SYSTEM_VERSION     => '6',
 			self::SHOP_SYSTEM_AND_VERSION => 'shopware-6',
-			self::PLUGIN_SYSTEM_VERSION   => '7.1.3',
+			self::PLUGIN_SYSTEM_VERSION   => '7.1.6',
 		];
 	}
 
 	/**
 	 * @param \VRPayment\Sdk\ApiClient $apiClient
 	 */
-	public static function addHeaders(ApiClient &$apiClient)
+	public static function addHeaders(ApiClient &$apiClient, array $additionalHeaders = [])
 	{
 		$data = self::getDefaultData();
+		$data = array_merge($data, $additionalHeaders);
 		foreach ($data as $key => $value) {
 			$apiClient->addDefaultHeader($key, $value);
 		}

src/Core/Util/Payload/TransactionPayload.php

@@ -397,7 +397,9 @@ class TransactionPayload extends AbstractPayload
             $discountTitle = sprintf('DISCOUNT: %s', $discountName);
         }
 
-        $lineItem->setAmountIncludingTax($amount)
+        $roundedAmount = self::round($amount);
+
+        $lineItem->setAmountIncludingTax($roundedAmount)
             ->setName($discountTitle)
             ->setQuantity(1)
             ->setShippingRequired(false)
@@ -520,12 +522,14 @@ class TransactionPayload extends AbstractPayload
             $amount = self::round($amount + $shopLineItem->getPrice()->getCalculatedTaxes()->getAmount());
         }
 
+        $roundedAmount = self::round($amount);
+
         $lineItem = (new LineItemCreate())
             ->setName($this->fixLength($shopLineItem->getLabel(), 150))
             ->setUniqueId($uniqueId)
             ->setSku($sku)
             ->setQuantity($shopLineItem->getQuantity() ?? 1)
-            ->setAmountIncludingTax($amount);
+            ->setAmountIncludingTax($roundedAmount);
 
 
         if (!empty($shopLineItem->getType()) && $shopLineItem->getType() == CustomProductsLineItemTypes::LINE_ITEM_TYPE_CUSTOMIZED_PRODUCTS) {
@@ -644,9 +648,10 @@ class TransactionPayload extends AbstractPayload
                     $amount = self::round($amount + $this->order->getShippingCosts()->getCalculatedTaxes()->getAmount());
                 }
 
+                $roundedAmount = self::round($amount);
 
                 $lineItem = (new LineItemCreate())
-                    ->setAmountIncludingTax($amount)
+                    ->setAmountIncludingTax($roundedAmount)
                     ->setName($this->fixLength($shippingName . ' ' . $this->translator->trans('vrpayment.payload.shipping.lineItem'), 150))
                     ->setQuantity($this->order->getShippingCosts()->getQuantity() ?? 1)
                     ->setSku($this->fixLength($shippingName . '-Shipping', 200))
@@ -694,9 +699,11 @@ class TransactionPayload extends AbstractPayload
                       ->setRate($taxRate)
                       ->setTitle('Tax rate: '.$taxRate);
 
+                    $roundedAmount = self::round($amount);
+
                     $name = $taxRate . '%-' . $shippingName;
                     $lineItem = (new LineItemCreate())
-                      ->setAmountIncludingTax($amount)
+                      ->setAmountIncludingTax($roundedAmount)
                       ->setName($this->fixLength($name . ' ' . $this->translator->trans('vrpayment.payload.shipping.lineItem'), 150))
                       ->setQuantity($this->order->getShippingCosts()->getQuantity() ?? 1)
                       ->setSku($this->fixLength($name . '-Shipping', 200))
@@ -768,7 +775,8 @@ class TransactionPayload extends AbstractPayload
                     ->setSku('Adjustment-Line-Item')
                     ->setQuantity(1);
                 /** @noinspection PhpParamsInspection */
-                $lineItem->setAmountIncludingTax($adjustmentPrice)
+                $roundedAdjustmentPrice = self::round($adjustmentPrice);
+                $lineItem->setAmountIncludingTax($roundedAdjustmentPrice)
                     ->setType(($adjustmentPrice > 0) ? LineItemType::FEE : LineItemType::DISCOUNT);
 
                 if (!$lineItem->valid()) {

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

@@ -70,13 +70,16 @@ Component.register('vrpayment-order-action-refund-by-amount', {
 				});
 			}).catch((errorResponse) => {
 				try {
-					var errorTitle;
+					var errorTitle = errorResponse?.response?.data?.errors?.[0]?.title ?? this.$tc('vrpayment-order.refundAction.refundCreateError.errorTitle')
 					var errorMessage;
-					if (errorResponse.response.data == 'refundExceedsAmount') {
-						errorTitle = this.$tc('vrpayment-order.refundAction.refundExceedsTotalError.title');
-						errorMessage = this.$tc('vrpayment-order.refundAction.refundExceedsTotalError.messageRefundAmountExceedsAvailableBalance');
-					} else {
-						errorTitle = errorResponse.response.data.errors[0].title;
+					switch(errorResponse.response.data) {
+						case 'refundAmountZero':
+							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messageRefundAmountIsZero');
+						break;
+						case 'refundExceedsAmount':
+							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messageRefundAmountExceedsAvailableBalance');
+						break;
+						default:
 							errorMessage = errorResponse.response.data.errors[0].detail;
 					}
 					this.createNotificationError({

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

@@ -9,6 +9,7 @@
 			:max="this.$parent.$parent.itemRefundableQuantity"
 			:min="0"
 			 v-model="refundQuantity"
+			number-type="int"
 			 :label="$tc('vrpayment-order.refund.refundQuantity.label')">
 		</mt-number-field>
 

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

@@ -68,9 +68,21 @@ Component.register('vrpayment-order-action-refund', {
 				});
 			}).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 'refundQuantityZero':
+							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messageRefundQuantityIsZero');
+						break;
+						case 'refundExceedsQuantity':
+							errorMessage = this.$tc('vrpayment-order.refundAction.refundCreateError.messageRefundQuantityExceedsAvailableBalance');
+						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/snippet/de-DE.json

@@ -78,9 +78,12 @@
 	  "successTitle": "Erfolg",
 	  "maxAvailableItemsToRefund": "Maximal Verfügbare Artikel zum Erstatten",
 	  "maxAvailableAmountToRefund": "Maximal verfügbarer Erstattungsbetrag",
-	  "refundExceedsTotalError": {
-		"title": "Fehler beim Erstellen der Rückerstattung.",
-		"messageRefundAmountExceedsAvailableBalance": "Der Rückerstattungsbetrag übersteigt das verfügbare Guthaben."
+	  "refundCreateError": {
+		"errorTitle": "Fehler beim Erstellen der Rückerstattung.",
+		"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."
 	  }
 	},
 	"transactionHistory": {

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

@@ -9,7 +9,6 @@
 		"void": "Cancel authorization",
 	    "refund-whole-line-item": "Refund whole line item",
 	    "refund-line-item-by-quantity": "Refund by quantity",
-	    "refund-line-item-selected": "Rembourser sélectionnés",
 	    "refund-line-item-selected": "Refund selected",
 	    "refund-line-item-parial": "Partial refund"
 	  }
@@ -79,9 +78,12 @@
 	  "successTitle": "Success",
 	  "maxAvailableItemsToRefund": "Maximum available items to refund",
 	  "maxAvailableAmountToRefund": "Maximum available amount to refund",
-	  "refundExceedsTotalError": {
-		"title": "Error while creating the refund.",
-		"messageRefundAmountExceedsAvailableBalance": "Refund amount exceeds available balance."
+	  "refundCreateError": {
+		"errorTitle": "Error while creating the refund.",
+		"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."
 	  }
 	},
 	"transactionHistory": {

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

@@ -78,9 +78,12 @@
 	  "successTitle": "Succès",
 	  "maxAvailableItemsToRefund": "Nombre maximum d'articles disponibles pour le remboursement",
 	  "maxAvailableAmountToRefund": "Montant maximal disponible pour le remboursement",
-	  "refundExceedsTotalError": {
-		"title": "Erreur lors de la création du remboursement.",
-		"messageRefundAmountExceedsAvailableBalance": "Le montant du remboursement dépasse le solde disponible."
+	  "refundCreateError": {
+		"errorTitle": "Erreur lors de la création du remboursement.",
+		"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."
 	  }
 	},
 	"transactionHistory": {

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

@@ -78,9 +78,12 @@
 	  "successTitle": "Successo",
 	  "maxAvailableItemsToRefund": "Numero massimo di articoli disponibili da rimborsare",
 	  "maxAvailableAmountToRefund": "Importo massimo disponibile per il rimborso",
-	  "refundExceedsTotalError": {
-		"title": "Errore durante la creazione del rimborso.",
-		"messageRefundAmountExceedsAvailableBalance": "LL'importo del rimborso supera il saldo disponibile."
+	  "refundCreateError": {
+		"errorTitle": "Errore durante la creazione del rimborso.",
+		"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."
 	  }
 	},
 	"transactionHistory": {

src/Resources/config/services/core/api/refund.xml

@@ -10,6 +10,7 @@
 		<service id="VRPaymentPayment\Core\Api\Refund\Controller\RefundController" public="true">
 			<argument type="service" id="VRPaymentPayment\Core\Api\Refund\Service\RefundService"/>
 			<argument type="service" id="VRPaymentPayment\Core\Settings\Service\SettingsService"/>
+			<argument type="service" id="VRPaymentPayment\Core\Api\Transaction\Service\TransactionService"/>
 			<call method="setLogger">
 				<argument type="service" id="monolog.logger.vrpayment_payment"/>
 			</call>

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

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

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

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