Use the state machine to apply the create transition before authorizi…

…ng payment.
coopcycle · Apr 16, 2018 · f558b06 · f558b06
1 parent d192144
commit f558b06
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/app/config/state_machine.yml b/app/config/state_machine.yml
@@ -38,6 +38,10 @@ winzou_state_machine:
                     do: ["@sylius.order_number_assigner", "assignNumber"]
                     args: ["object"]
             after:
+                after_create_create_payment:
+                    on: ["create"]
+                    do: ["@sm.callback.cascade_transition", "apply"]
+                    args: ["object.getLastPayment('cart')", "event", "'create'", "'sylius_payment'"]
                 after_create_authorize_payment:
                     on: "create"
                     do: ["@coopcycle.order_manager", "authorizePayment"]

diff --git a/src/AppBundle/Service/OrderManager.php b/src/AppBundle/Service/OrderManager.php
@@ -51,17 +51,8 @@ public function pay(OrderInterface $order, $stripeToken)
 
     public function create(OrderInterface $order)
     {
-        $orderStateMachine = $this->stateMachineFactory->get($order, OrderTransitions::GRAPH);
-        $stripePayment = $order->getLastPayment(PaymentInterface::STATE_CART);
-        $paymentStateMachine = $this->stateMachineFactory->get($stripePayment, PaymentTransitions::GRAPH);
-        $paymentStateMachine->apply(PaymentTransitions::TRANSITION_CREATE);
-
-        // apply the order transition after because we need the payment in state new in the create order hook
-        $orderStateMachine->apply(OrderTransitions::TRANSITION_CREATE);
-
-        $stripePayment = $order->getLastPayment(PaymentInterface::STATE_CART);
-        $paymentStateMachine = $this->stateMachineFactory->get($stripePayment, PaymentTransitions::GRAPH);
-        $paymentStateMachine->apply(PaymentTransitions::TRANSITION_CREATE);
+        $stateMachine = $this->stateMachineFactory->get($order, OrderTransitions::GRAPH);
+        $stateMachine->apply(OrderTransitions::TRANSITION_CREATE);
     }
 
     public function accept(OrderInterface $order)