Merge pull request #2628 from dpfaffenbauer/issue/2615

[Payment] when payment is authorized or paid, order get's confirmed

features/domain/order/order_payment.feature

@@ -22,28 +22,34 @@ Feature: Create a new order and add a payment
     Given I create a payment for my order with payment provider "Bankwire" and amount 1800
     And I apply payment transition "fail" to latest order payment
     Then the order payment state should be "awaiting_payment"
+    And the order state should be "new"
 
   Scenario: Create cancelled payment
     Given I create a payment for my order with payment provider "Bankwire" and amount 1800
     And I apply payment transition "cancel" to latest order payment
     Then the order payment state should be "awaiting_payment"
+    And the order state should be "new"
 
   Scenario: Create fully paid payment
     Given I create a payment for my order with payment provider "Bankwire" and amount 2400
     And I apply payment transition "complete" to latest order payment
     Then the order payment state should be "paid"
+    And the order state should be "confirmed"
 
   Scenario: Create partially paid payment
     Given I create a payment for my order with payment provider "Bankwire" and amount 1800
     And I apply payment transition "complete" to latest order payment
     Then the order payment state should be "partially_paid"
+    And the order state should be "confirmed"
 
   Scenario: Create fully authorized payment
     Given I create a payment for my order with payment provider "Bankwire" and amount 2400
     And I apply payment transition "authorize" to latest order payment
     Then the order payment state should be "authorized"
+    And the order state should be "confirmed"
 
   Scenario: Create partially authorized payment
     Given I create a payment for my order with payment provider "Bankwire" and amount 1800
     And I apply payment transition "authorize" to latest order payment
     Then the order payment state should be "partially_authorized"
+    And the order state should be "confirmed"

features/domain/order/order_workflow.feature

@@ -20,17 +20,15 @@ Feature: Create a new order and add a invoice
   Scenario: Create order with payment and shipment which still is new
     Given I create an order from my cart
     And I create a payment for my order with payment provider "Bankwire" and amount 2400
-    And I apply payment transition "complete" to latest order payment
     And I create a shipment for my order
     And I apply order shipment transition "request_shipment" to my order
     And I apply shipment transition "ship" to latest order shipment
     Then the order shipping state should be "shipped"
-    And the order payment state should be "paid"
+    And the order payment state should be "awaiting_payment"
     And the order state should be "new"
 
   Scenario: Create order with payment and shipment which still is completed
     Given I create an order from my cart
-    And I apply transition "confirm" to my order
     And I create a payment for my order with payment provider "Bankwire" and amount 2400
     And I apply payment transition "complete" to latest order payment
     And I create a shipment for my order

src/CoreShop/Bundle/OrderBundle/Resources/config/pimcore/workflow/coreshop_order_payment.yml

@@ -57,6 +57,6 @@ core_shop_workflow:
             callbacks:
                 after:
                     resolve_state:
-                        on: ['pay']
+                        on: ['partially_authorize', 'authorize', 'partially_pay', 'pay']
                         do: ['@CoreShop\Bundle\OrderBundle\StateResolver\OrderStateResolver', 'resolve']
                         args: ['object']

src/CoreShop/Bundle/OrderBundle/StateResolver/OrderStateResolver.php

@@ -37,11 +37,26 @@ public function __construct(
     public function resolve(OrderInterface $order): void
     {
         $stateMachine = $this->stateMachineManager->get($order, 'coreshop_order');
+
+        if ($this->canOrderBeConfirmed($order) && $stateMachine->can($order, OrderTransitions::TRANSITION_CONFIRM)) {
+            $stateMachine->apply($order, OrderTransitions::TRANSITION_CONFIRM);
+        }
+
         if ($this->canOrderBeComplete($order) && $stateMachine->can($order, OrderTransitions::TRANSITION_COMPLETE)) {
             $stateMachine->apply($order, OrderTransitions::TRANSITION_COMPLETE);
         }
     }
 
+    private function canOrderBeConfirmed(OrderInterface $order): bool
+    {
+        return in_array($order->getPaymentState(), [
+            OrderPaymentStates::STATE_PAID,
+            OrderPaymentStates::STATE_PARTIALLY_PAID,
+            OrderPaymentStates::STATE_AUTHORIZED,
+            OrderPaymentStates::STATE_PARTIALLY_AUTHORIZED,
+        ], true);
+    }
+
     private function canOrderBeComplete(OrderInterface $order): bool
     {
         $coreStates = OrderPaymentStates::STATE_PAID === $order->getPaymentState() &&

src/CoreShop/Bundle/PayumBundle/Resources/config/services/extension.yml

@@ -8,8 +8,3 @@ services:
         tags:
             - { name: payum.extension, all: true, prepend: true }
 
-    CoreShop\Bundle\PayumBundle\Extension\UpdateOrderStateExtension:
-        arguments:
-            - '@CoreShop\Bundle\WorkflowBundle\Manager\StateMachineManagerInterface'
-        tags:
-            - { name: payum.extension, all: true, prepend: true }