Release 6.1.12

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

@@ -213,8 +213,7 @@ class PaymentMethodConfigurationService {
 	{
 		// Configuration
 		$settings = $this->settingsService->getSettings($this->getSalesChannelId());
-		$this->setSpaceId($settings->getSpaceId())
-			 ->setApiClient($settings->getApiClient());
+		$this->setSpaceId($settings->getSpaceId())->setApiClient($settings->getApiClient());
 
 		$this->disablePaymentMethodConfigurations($context);
 		$this->enablePaymentMethodConfigurations($context);
@@ -254,9 +253,14 @@ class PaymentMethodConfigurationService {
 		$paymentMethodData             = [];
 		$salesChannelPaymentMethodData = [];
 
-		$criteria = (new Criteria())->addFilter(new EqualsFilter('spaceId', $this->getSpaceId()));
+		$criteria = (new Criteria())->addFilter(new EqualsFilter('state', 'ACTIVE'));
 
-		$paymentMethodConfigurationEntities = $this->vRPaymentPaymentMethodConfigurationRepository
+		/**
+		 * @var $vRPaymentPMConfigurationRepository
+		 */
+		$vRPaymentPMConfigurationRepository = $this->container->get(PaymentMethodConfigurationEntityDefinition::ENTITY_NAME . '.repository');
+
+		$paymentMethodConfigurationEntities = $vRPaymentPMConfigurationRepository
 			->search($criteria, $context)
 			->getEntities();
 
@@ -275,16 +279,11 @@ class PaymentMethodConfigurationService {
 					'id'     => $paymentMethodConfigurationEntity->getId(),
 					'active' => false,
 				];
-
-				$salesChannelPaymentMethodData[] = [
-					'paymentMethodId' => $paymentMethodConfigurationEntity->getId(),
-				];
 			}
 
 			try {
 				$this->vRPaymentPaymentMethodConfigurationRepository->update($data, $context);
 				$this->paymentMethodRepository->update($paymentMethodData, $context);
-				$this->salesChannelPaymentRepository->delete($salesChannelPaymentMethodData, $context);
 			} catch (\Exception $exception) {
 				$this->logger->critical($exception->getMessage());
 			}
@@ -369,7 +368,13 @@ class PaymentMethodConfigurationService {
 			];
 
 			$this->upsertPaymentMethod($id, $paymentMethodConfiguration, $context);
-			$this->vRPaymentPaymentMethodConfigurationRepository->upsert([$data], $context);
+
+            try {
+                $this->container->get(PaymentMethodConfigurationEntityDefinition::ENTITY_NAME . '.repository')->upsert([$data], $context);
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage(), [$e->getTraceAsString()]);
+            }
+
 		}
 	}
 
@@ -500,7 +505,12 @@ class PaymentMethodConfigurationService {
 
 		$data = array_filter($data);
 
-		$this->paymentMethodRepository->upsert([$data], $context);
+        try {
+            $this->paymentMethodRepository->upsert([$data], $context);
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), [$e->getTraceAsString()]);
+        }
+
 	}
 
 	/**

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

@@ -132,13 +132,12 @@ class TransactionService
         $settings = $this->settingsService->getSettings($salesChannelId);
         $apiClient = $settings->getApiClient();
 
-        $failedStates = [
-            TransactionState::DECLINE,
-            TransactionState::FAILED,
-            TransactionState::VOIDED,
-        ];
-        $pendingTransaction = $this->read($_SESSION['transactionId'], $salesChannelId);
-        if (in_array($pendingTransaction->getState(), $failedStates)) {
+        $transactionId = $_SESSION['transactionId'] ?? null;
+        if ($transactionId !== null) {
+            $pendingTransaction = $this->read($_SESSION['transactionId'], $salesChannelId);
+        }
+
+        if ($transactionId === null || $pendingTransaction === null || $pendingTransaction->getState() !== TransactionState::PENDING) {
             unset($_SESSION['transactionId']);
             $pendingTransactionId = $this->createPendingTransaction($salesChannelContext);
             $pendingTransaction = $this->read($pendingTransactionId, $salesChannelId);

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

@@ -638,25 +638,46 @@ class WebHookController extends AbstractController {
 	private function unholdDelivery(string $orderId, Context $context): void
 	{
 		try {
-			/**
-			 * @var OrderDeliveryStateHandler $orderDeliveryStateHandler
-			 */
-			$order = $this->getOrderEntity($orderId, $context);
-			/**
-			 * @var OrderDeliveryEntity $orderDelivery
-			 */
+			$criteria = new Criteria([$orderId]);
+			$criteria->addAssociation('deliveries.stateMachineState');
+			$order = $this->container->get('order.repository')
+			  ->search($criteria, $context)
+			  ->first();
+
+			if (!$order) {
+				$this->logger->info('Order not found: ' . $orderId);
+				return;
+			}
+
+			/** @var OrderDeliveryEntity|null $orderDelivery */
 			$orderDelivery = $order->getDeliveries()?->last();
-			
+
 			if (null === $orderDelivery) {
+				$this->logger->info('No deliveries found for order: ' . $orderId);
 				return;
 			}
-			if ($orderDelivery->getStateMachineState()?->getTechnicalName() !== OrderDeliveryStateHandler::STATE_HOLD){
+
+			$orderDeliveryState = $orderDelivery->getStateMachineState();
+			if (!$orderDeliveryState) {
+				$this->logger->info('Order delivery state is null for order: ' . $orderId);
 				return;
 			}
+
+			$technicalName = $orderDeliveryState->getTechnicalName();
+			$this->logger->info('Order delivery state: ' . $technicalName);
+
+			if ($technicalName !== OrderDeliveryStateHandler::STATE_HOLD) {
+				$this->logger->info('Order delivery is not on hold, skipping unhold process.');
+				return;
+			}
+
+			/** @var OrderDeliveryStateHandler $orderDeliveryStateHandler */
 			$orderDeliveryStateHandler = $this->container->get(OrderDeliveryStateHandler::class);
 			$orderDeliveryStateHandler->unhold($orderDelivery->getId(), $context);
+
+			$this->logger->info('Successfully unheld order delivery for order: ' . $orderId);
 		} catch (\Exception $exception) {
-			$this->logger->info($exception->getMessage(), $exception->getTrace());
+			$this->logger->error('Error unholding order delivery: ' . $exception->getMessage(), $exception->getTrace());
 		}
 	}
 
@@ -689,7 +710,7 @@ class WebHookController extends AbstractController {
 			 * @var OrderDeliveryEntity $orderDelivery
 			 */
 			$orderDelivery = $order->getDeliveries()?->last();
-			
+
 			if (null === $orderDelivery) {
 				return;
 			}

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

@@ -125,41 +125,21 @@ class WebHookRefundStrategy extends WebHookStrategyBase implements WebhookStrate
 			$orderId = $this->getOrderIdByTransaction($refund);
 
 			if(!empty($orderId)) {
-
 				$this->executeLocked($orderId, $context, function () use ($orderId, $refund, $context, $request) {
+					if ($request->getListenerEntityTechnicalName() == WebHookRequest::REFUND && $request->getState() == RefundState::SUCCESSFUL) {
+						$this->refundService->upsert($refund, $context);
+						$orderTransactionId = $refund->getTransaction()->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID];
+						$orderTransaction   = $this->getOrderTransaction($orderId, $context);
 
-					$this->refundService->upsert($refund, $context);
-
-					$orderTransactionId = $refund->getTransaction()->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID];
-					$orderTransaction   = $this->getOrderTransaction($orderId, $context);
-					if (
-						in_array(
-							$orderTransaction->getStateMachineState()?->getTechnicalName(),
-							[
-								OrderTransactionStates::STATE_PAID,
-								OrderTransactionStates::STATE_PARTIALLY_PAID,
-							]
-						) &&
-						($request->getState() == RefundState::SUCCESSFUL)
-					) {
-						if ($refund->getAmount() == $orderTransaction->getAmount()->getTotalPrice()) {
-							$this->orderTransactionStateHandler->refund($orderTransactionId, $context);
-						} else {
-							if ($refund->getAmount() < $orderTransaction->getAmount()->getTotalPrice()) {
-								$this->orderTransactionStateHandler->refundPartially($orderTransactionId, $context);
-							}
-						}
-					} elseif ($orderTransaction->getStateMachineState()?->getTechnicalName() ===
-						OrderTransactionStates::STATE_PARTIALLY_REFUNDED &&
-						($request->getState() == RefundState::SUCCESSFUL)
-					) {
 						$transactionByOrderTransactionId = $this->transactionService->getByOrderTransactionId($orderTransactionId, $context);
 						$totalRefundedAmount  = $this->getTotalRefundedAmount($transactionByOrderTransactionId->getTransactionId(), $context);
-						if (floatval($orderTransaction->getAmount()->getTotalPrice()) - $totalRefundedAmount <= 0) {
+						$leftToRefund = floatval($orderTransaction->getAmount()->getTotalPrice()) - $totalRefundedAmount;
+						if ($leftToRefund > 0) {
+							$this->orderTransactionStateHandler->refundPartially($orderTransactionId, $context);
+						} elseif ($leftToRefund === floatval(0)) { // This trick is used, because it's float type and 0 is int
 							$this->orderTransactionStateHandler->refund($orderTransactionId, $context);
 						}
 					}
-
 				});
 			}
 

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

@@ -306,6 +306,14 @@ abstract class WebHookStrategyBase implements WebHookStrategyInterface {
 		return $this->getOrderEntity($orderId, $context)->getTransactions()->last();
 	}
 
+	/**
+	 * Unholds the delivery of an order.
+	 *
+	 * This method changes the state of an order's last delivery from 'held' to 'released', allowing further processing like shipping.
+	 *
+	 * @param string $orderId The unique identifier of the order.
+	 * @param Context $context The context of the current operation, including scope and permissions.
+	 */
 	/**
 	 * Unholds the delivery of an order.
 	 *
@@ -317,22 +325,46 @@ abstract class WebHookStrategyBase implements WebHookStrategyInterface {
 	protected function unholdDelivery(string $orderId, Context $context): void
 	{
 		try {
-			$order = $this->getOrderEntity($orderId, $context);
-			/** @var OrderDeliveryEntity $orderDelivery */
-			$orderDelivery = $order->getDeliveries()?->last();
-			
-			if (null === $orderDelivery) {
+			$criteria = new Criteria([$orderId]);
+			$criteria->addAssociation('deliveries.stateMachineState');
+			$order = $this->container->get('order.repository')
+			  ->search($criteria, $context)
+			  ->first();
+
+			if (!$order) {
+				$this->logger->info('Order not found: ' . $orderId);
 				return;
 			}
 
-			if ($orderDelivery->getStateMachineState()?->getTechnicalName() !== OrderDeliveryStateHandler::STATE_HOLD){
+			/** @var OrderDeliveryEntity|null $orderDelivery */
+			$orderDelivery = $order->getDeliveries()?->last();
+
+			if (null === $orderDelivery) {
+				$this->logger->info('No deliveries found for order: ' . $orderId);
 				return;
 			}
+
+			$orderDeliveryState = $orderDelivery->getStateMachineState();
+			if (!$orderDeliveryState) {
+				$this->logger->info('Order delivery state is null for order: ' . $orderId);
+				return;
+			}
+
+			$technicalName = $orderDeliveryState->getTechnicalName();
+			$this->logger->info('Order delivery state: ' . $technicalName);
+
+			if ($technicalName !== OrderDeliveryStateHandler::STATE_HOLD) {
+				$this->logger->info('Order delivery is not on hold, skipping unhold process.');
+				return;
+			}
+
 			/** @var OrderDeliveryStateHandler $orderDeliveryStateHandler */
 			$orderDeliveryStateHandler = $this->container->get(OrderDeliveryStateHandler::class);
 			$orderDeliveryStateHandler->unhold($orderDelivery->getId(), $context);
+
+			$this->logger->info('Successfully unheld order delivery for order: ' . $orderId);
 		} catch (\Exception $exception) {
-			$this->logger->info($exception->getMessage(), $exception->getTrace());
+			$this->logger->error('Error unholding order delivery: ' . $exception->getMessage(), $exception->getTrace());
 		}
 	}
 
@@ -362,7 +394,7 @@ abstract class WebHookStrategyBase implements WebHookStrategyInterface {
 			$orderDeliveryStateHandler = $this->container->get(OrderDeliveryStateHandler::class);
 			/** @var OrderDeliveryEntity $orderDelivery */
 			$orderDelivery = $order->getDeliveries()?->last();
-			
+
 			if (null === $orderDelivery) {
 				return;
 			}

src/Core/Util/Payload/TransactionPayload.php

@@ -209,7 +209,7 @@ class TransactionPayload extends AbstractPayload
 
         return $transactionPayload;
     }
-    
+
     /**
      * Get transaction line items
      *
@@ -220,30 +220,30 @@ class TransactionPayload extends AbstractPayload
     {
         $lineItems = [];
         $items = $this->transaction->getOrder()->getLineItems();
-        
+
         foreach ($items as $shopLineItem) {
             if ($this->shouldSkipLineItem($shopLineItem)) {
                 continue;
             }
-            
+
             if ($this->isCustomProductOption($shopLineItem)) {
                 $shopLineItem = $this->updateCustomProductOptionLabel($shopLineItem);
             }
-            
+
             $lineItem = $this->createLineItem($shopLineItem);
             $this->validateLineItem($lineItem);
-            
+
             $lineItems[] = $lineItem;
         }
-        
+
         $this->processDiscounts($items, $lineItems);
         $this->sortLineItemsByName($lineItems);
-        
+
         $this->addOptionalLineItems($lineItems);
-        
+
         return $lineItems;
     }
-    
+
     /**
      * Determine if a line item should be skipped.
      */
@@ -272,7 +272,7 @@ class TransactionPayload extends AbstractPayload
         $shopLineItem->setLabel($customProductOptionParentLabel . ': ' . $shopLineItem->getLabel());
         return $shopLineItem;
     }
-    
+
     /**
      * Validate the created line item.
      */
@@ -283,7 +283,7 @@ class TransactionPayload extends AbstractPayload
             throw new InvalidPayloadException('LineItem payload invalid: ' . json_encode($lineItem->listInvalidProperties()));
         }
     }
-    
+
     /**
      * Process discounts from the order items and add them to the line items array.
      */
@@ -293,12 +293,14 @@ class TransactionPayload extends AbstractPayload
         $discounts = array_filter($itemsArray, function ($orderItem) {
             return $orderItem->getType() === 'promotion';
         });
-        
+
         if ($discounts) {
-            $this->addDiscountLineItem(current($discounts), $lineItems);
+            foreach ($discounts as $discount) {
+                $this->addDiscountLineItem($discount, $lineItems);
+            }
         }
     }
-    
+
     /**
      * Add discount line item.
      */
@@ -306,23 +308,24 @@ class TransactionPayload extends AbstractPayload
     {
         $calculatedPrice = $discount->getPrice();
         $calculatedTaxesCollection = $calculatedPrice->getCalculatedTaxes();
-        
+
         foreach ($calculatedTaxesCollection as $calculatedTax) {
             $rate = $calculatedTax->getTaxRate();
             $lineItem = new LineItemCreate();
             $amount = $this->calculateDiscountAmount($calculatedTax);
-            
+
+            $discountName = $discount->getLabel();
             $lineItem->setAmountIncludingTax($amount)
               ->setName(sprintf('DISCOUNT: %s (%s%% tax)', $discount->getLabel(), $rate))
               ->setQuantity(1)
               ->setShippingRequired(false)
-              ->setSku('sku-discount-' . $rate, 200)
+              ->setSku('sku-discount-' . $rate . '-' . $discountName, 200)
               ->setType(LineItemType::DISCOUNT)
-              ->setUniqueId('coupon-sku-discount-' . $rate . '-' . $rate);
-            
+              ->setUniqueId('coupon-sku-discount-' . $rate . '-' . $rate . '-' . $discountName);
+
             $taxRate = new TaxCreate(['title' => 'Discount Tax: ' . $rate, 'rate' => $rate]);
             $lineItem->setTaxes([$taxRate]);
-            
+
             $lineItems[] = $lineItem;
         }
     }
@@ -348,7 +351,7 @@ class TransactionPayload extends AbstractPayload
             return strcmp($lineItem1->getName(), $lineItem2->getName());
         });
     }
-    
+
     /**
      * Add optional shipping and adjustment line items.
      */
@@ -363,7 +366,7 @@ class TransactionPayload extends AbstractPayload
                 $lineItems = array_merge($lineItems, $multipleShippingLineItems);
             }
         }
-        
+
         if ($adjustmentLineItem = $this->getAdjustmentLineItem($lineItems)) {
             $lineItems[] = $adjustmentLineItem;
         }
@@ -554,7 +557,7 @@ class TransactionPayload extends AbstractPayload
         }
         return null;
     }
-    
+
     /**
      * @return array
      */
@@ -564,9 +567,9 @@ class TransactionPayload extends AbstractPayload
             if ($this->transaction->getOrder()->getShippingTotal() > 0) {
                 $lineItems = [];
                 $shippingName = $this->salesChannelContext->getShippingMethod()->getName() ?? $this->translator->trans('vrpayment.payload.shipping.name');
-                
+
                 $isFirst = true;
-                
+
                 foreach ($this->transaction->getOrder()->getShippingCosts()->getCalculatedTaxes() as $taxItem) {
                     $amount = self::round($taxItem->getPrice());
                     if ($this->transaction->getOrder()->getTaxStatus() === 'net') {
@@ -576,7 +579,7 @@ class TransactionPayload extends AbstractPayload
                     $tax = (new TaxCreate())
                       ->setRate($taxRate)
                       ->setTitle('Tax rate: '.$taxRate);
-                    
+
                     $name = $taxRate . '%-' . $shippingName;
                     $lineItem = (new LineItemCreate())
                       ->setAmountIncludingTax($amount)
@@ -586,18 +589,18 @@ class TransactionPayload extends AbstractPayload
                       ->setSku($this->fixLength($name . '-Shipping', 200))
                       ->setType($isFirst ? LineItemType::SHIPPING : LineItemType::FEE) // First item as SHIPPING, rest as FEE
                       ->setUniqueId($this->fixLength($name . '-Shipping', 200));
-                    
+
                     if (!$lineItem->valid()) {
                         $this->logger->critical('Shipping LineItem payload invalid:', $lineItem->listInvalidProperties());
                         throw new InvalidPayloadException('Shipping LineItem payload invalid:' . json_encode($lineItem->listInvalidProperties()));
                     }
-                    
+
                     $lineItems[] = $lineItem;
                     $isFirst = false;
                 }
                 return $lineItems;
             }
-            
+
         } catch (\Exception $exception) {
             $this->logger->critical(__CLASS__ . ' : ' . __FUNCTION__ . ' : ' . $exception->getMessage());
         }