From f0e5ed5bd04fee62919e8467e5e0e14e7704ae54 Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Thu, 31 Oct 2024 07:40:29 +0100 Subject: [PATCH 1/2] [PayumBundle] remove payment_state processing to confirm orders --- src/CoreShop/Bundle/PayumBundle/Action/ConfirmOrderAction.php | 3 +-- .../Bundle/PayumBundle/Extension/UpdateOrderStateExtension.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CoreShop/Bundle/PayumBundle/Action/ConfirmOrderAction.php b/src/CoreShop/Bundle/PayumBundle/Action/ConfirmOrderAction.php index 20ae57bb94..eee4cf6525 100644 --- a/src/CoreShop/Bundle/PayumBundle/Action/ConfirmOrderAction.php +++ b/src/CoreShop/Bundle/PayumBundle/Action/ConfirmOrderAction.php @@ -37,8 +37,7 @@ public function execute($request): void $payment = $request->getFirstModel(); $order = $payment->getOrder(); if ($payment->getState() === PaymentInterface::STATE_COMPLETED || - $payment->getState() === PaymentInterface::STATE_AUTHORIZED || - $payment->getState() === PaymentInterface::STATE_PROCESSING + $payment->getState() === PaymentInterface::STATE_AUTHORIZED ) { $this->stateMachineApplier->apply($order, OrderTransitions::IDENTIFIER, OrderTransitions::TRANSITION_CONFIRM); diff --git a/src/CoreShop/Bundle/PayumBundle/Extension/UpdateOrderStateExtension.php b/src/CoreShop/Bundle/PayumBundle/Extension/UpdateOrderStateExtension.php index 813be9e076..41b3cb6027 100644 --- a/src/CoreShop/Bundle/PayumBundle/Extension/UpdateOrderStateExtension.php +++ b/src/CoreShop/Bundle/PayumBundle/Extension/UpdateOrderStateExtension.php @@ -92,8 +92,7 @@ public function onPostExecute(Context $context): void } if ($value === PaymentInterface::STATE_COMPLETED || - $value === PaymentInterface::STATE_AUTHORIZED || - $value === PaymentInterface::STATE_PROCESSING + $value === PaymentInterface::STATE_AUTHORIZED ) { $order = $payment->getOrder(); $this->confirmOrderState($order); From 16d53c456d48bc1fa179797347b9d67dde8571bc Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Mon, 11 Nov 2024 13:08:21 +0100 Subject: [PATCH 2/2] [Release] 3.2.15 --- CHANGELOG-3.2.x.md | 3 +++ src/CoreShop/Bundle/CoreBundle/Application/Version.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-3.2.x.md b/CHANGELOG-3.2.x.md index bf24adc9c5..50f1e6bb71 100644 --- a/CHANGELOG-3.2.x.md +++ b/CHANGELOG-3.2.x.md @@ -1,3 +1,6 @@ +# 3.2.15 +* [PayumBundle] remove payment_state processing to confirm orders by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2743 + # 3.2.14 * [Pimcore] introduce LocalizedFallbackHelper by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2723 * [Translations] add missing translations by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2721 diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php index 1f9253f8b6..ba5da0bf3e 100644 --- a/src/CoreShop/Bundle/CoreBundle/Application/Version.php +++ b/src/CoreShop/Bundle/CoreBundle/Application/Version.php @@ -24,7 +24,7 @@ final class Version public const MINOR_VERSION = '2'; - public const RELEASE_VERSION = '14'; + public const RELEASE_VERSION = '15'; public const EXTRA_VERSION = '';