Release 4.0.6

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 4.0.6
+- Fix for delivery state change error
+
 # 4.0.5
 - Fixed plugin uninstall action
 

CHANGELOG_de-DE.md

@@ -1,3 +1,6 @@
+# 4.0.6
+- Fehler beim Ändern des Lieferstatus behoben
+
 # 4.0.5
 - Deinstallation Aktion des Plugins behoben
 

README.md

@@ -61,7 +61,7 @@ tail -f var/log/postfinancecheckout_payment*.log
 
 ## Documentation
 
-[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/4.0.5/docs/en/documentation.html)
+[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/4.0.6/docs/en/documentation.html)
 
 ## License
 

composer.json

@@ -54,5 +54,5 @@
         "postfinancecheckout/sdk": "3.0.1"
     },
     "type": "shopware-platform-plugin",
-    "version": "4.0.5"
+    "version": "4.0.6"
 }

docs/en/documentation.html

@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/shopware-6/releases/tag/4.0.5/">
+		<a href="https://github.com/pfpayments/shopware-6/releases/tag/4.0.6/">
 			Source
 		</a>
 	</li>

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

@@ -8,6 +8,7 @@
 use Psr\Log\LoggerInterface;
 use Shopware\Core\{
 	Checkout\Cart\Exception\OrderNotFoundException,
+	Checkout\Order\Aggregate\OrderDelivery\OrderDeliveryEntity,
 	Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity,
 	Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler,
 	Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStates,
@@ -531,6 +532,7 @@ public function updateTransactionInvoice(WebHookRequest $callBackData, Context $
 							case TransactionInvoiceState::NOT_APPLICABLE:
 							case TransactionInvoiceState::PAID:
 								$this->orderTransactionStateHandler->paid($orderTransactionId, $context);
+								$this->unholdDelivery($orderTransactionId, $context);
 								break;
 							default:
 								break;
@@ -564,9 +566,16 @@ private function unholdDelivery(string $orderId, Context $context): void
 			/**
 			 * @var OrderDeliveryStateHandler $orderDeliveryStateHandler
 			 */
-			$order                     = $this->getOrderEntity($orderId, $context);
+			$order = $this->getOrderEntity($orderId, $context);
+			/**
+			 * @var OrderDeliveryEntity $orderDelivery
+			 */
+			$orderDelivery = $order->getDeliveries()->last();
+			if ($orderDelivery->getStateMachineState()->getTechnicalName() !== OrderDeliveryStateHandler::STATE_HOLD){
+				return;
+			}
 			$orderDeliveryStateHandler = $this->container->get(OrderDeliveryStateHandler::class);
-			$orderDeliveryStateHandler->unhold($order->getDeliveries()->last()->getId(), $context);
+			$orderDeliveryStateHandler->unhold($orderDelivery->getId(), $context);
 		} catch (\Exception $exception) {
 			$this->logger->info($exception->getMessage(), $exception->getTrace());
 		}
@@ -597,12 +606,18 @@ private function unholdAndCancelDelivery(string $orderId, Context $context): voi
 			 * @var OrderDeliveryStateHandler $orderDeliveryStateHandler
 			 */
 			$orderDeliveryStateHandler = $this->container->get(OrderDeliveryStateHandler::class);
-			$orderDeliveryId           = $order->getDeliveries()->last()->getId();
+			/**
+			 * @var OrderDeliveryEntity $orderDelivery
+			 */
+			$orderDelivery = $order->getDeliveries()->last();
+			if ($orderDelivery->getStateMachineState()->getTechnicalName() !== OrderDeliveryStateHandler::STATE_HOLD){
+				return;
+			}
+			$orderDeliveryId = $orderDelivery->getId();
 			$orderDeliveryStateHandler->unhold($orderDeliveryId, $context);
 			$orderDeliveryStateHandler->cancel($orderDeliveryId, $context);
 		} catch (\Exception $exception) {
 			$this->logger->info($exception->getMessage(), $exception->getTrace());
 		}
 	}
-
-}
+}