Merge pull request Sylius#9437 from JakobTolkemit/payment_authorized_…

…state_transition

[Payment] Support for authorized state

src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/authorized.html.twig

@@ -0,0 +1,4 @@
+<span class="ui yellow{% if attached is defined and attached == true %} top attached{% endif %} label">
+    <i class="check icon"></i>
+    {{ value|trans }}
+</span>

src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/partially_authorized.html.twig

@@ -0,0 +1,4 @@
+<span class="ui yellow{% if attached is defined and attached == true %} top attached{% endif %} label">
+    <i class="check icon"></i>
+    {{ value|trans }}
+</span>

src/Sylius/Bundle/CoreBundle/Resources/config/app/state_machine/sylius_order_payment.yml

@@ -7,6 +7,8 @@ winzou_state_machine:
         states:
             cart: ~
             awaiting_payment: ~
+            partially_authorized: ~
+            authorized: ~
             partially_paid: ~
             cancelled: ~
             paid: ~
@@ -16,14 +18,20 @@ winzou_state_machine:
             request_payment:
                 from: [cart]
                 to: awaiting_payment
+            partially_authorize:
+                from: [awaiting_payment, partially_authorized]
+                to: partially_authorized
+            authorize:
+                from: [awaiting_payment, partially_authorized]
+                to: authorized
             partially_pay:
-                from: [awaiting_payment, partially_paid]
+                from: [awaiting_payment, partially_paid, partially_authorized]
                 to: partially_paid
             cancel:
-                from: [awaiting_payment]
+                from: [awaiting_payment, authorized, partially_authorized]
                 to: cancelled
             pay:
-                from: [awaiting_payment, partially_paid]
+                from: [awaiting_payment, partially_paid, authorized]
                 to: paid
             partially_refund:
                 from: [paid, partially_paid, partially_refunded]

src/Sylius/Bundle/CoreBundle/Resources/config/app/state_machine/sylius_payment.yml

@@ -8,6 +8,7 @@ winzou_state_machine:
             cart: ~
             new: ~
             processing: ~
+            authorized: ~
             completed: ~
             failed: ~
             cancelled: ~
@@ -19,14 +20,17 @@ winzou_state_machine:
             process:
                 from: [new]
                 to: processing
-            complete:
+            authorize:
                 from: [new, processing]
+                to: authorized
+            complete:
+                from: [new, processing, authorized]
                 to: completed
             fail:
                 from: [new, processing]
                 to: failed
             cancel:
-                from: [new, processing]
+                from: [new, processing, authorized]
                 to: cancelled
             refund:
                 from: [completed]
@@ -38,6 +42,6 @@ winzou_state_machine:
                     do: ["@sylius.order_processing.order_payment_processor.after_checkout", "process"]
                     args: ["object.getOrder()"]
                 sylius_resolve_state:
-                    on: ["complete", "refund"]
+                    on: ["complete", "refund", "authorize"]
                     do: ["@sylius.state_resolver.order_payment", "resolve"]
                     args: ["object.getOrder()"]

src/Sylius/Bundle/PaymentBundle/Resources/translations/flashes.en.yml

@@ -3,6 +3,7 @@
 
 sylius:
     payment:
+        authorized: 'Payment has been authorized.'
         cancelled: 'Payment has been cancelled.'
         completed: 'Payment has been completed.'
         failed: 'Payment has failed.'

src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml

@@ -68,6 +68,8 @@ sylius:
         assortment: 'Assortment'
         attributes: 'Attributes'
         author: 'Author'
+        authorized: 'Authorized'
+        authorized_payment: 'Authorized payment'
         availability: 'Availability'
         available_for_channels: 'Available for channels'
         available_on: 'Available on'
@@ -582,6 +584,7 @@ sylius:
         pages: 'Pages'
         paid: 'Paid'
         parent: 'Parent'
+        partially_authorized: 'Partially authorized'
         partially_paid: 'Partially paid'
         partially_shipped: 'Partially shipped'
         password: 'Password'

src/Sylius/Component/Core/OrderPaymentStates.php

@@ -17,6 +17,8 @@ final class OrderPaymentStates
 {
     public const STATE_CART = 'cart';
     public const STATE_AWAITING_PAYMENT = 'awaiting_payment';
+    public const STATE_PARTIALLY_AUTHORIZED = 'partially_authorized';
+    public const STATE_AUTHORIZED = 'authorized';
     public const STATE_PARTIALLY_PAID = 'partially_paid';
     public const STATE_CANCELLED = 'cancelled';
     public const STATE_PAID = 'paid';

src/Sylius/Component/Core/OrderPaymentTransitions.php

@@ -18,6 +18,8 @@ final class OrderPaymentTransitions
     public const GRAPH = 'sylius_order_payment';
 
     public const TRANSITION_REQUEST_PAYMENT = 'request_payment';
+    public const TRANSITION_PARTIALLY_AUTHORIZE = 'partially_authorize';
+    public const TRANSITION_AUTHORIZE = 'authorize';
     public const TRANSITION_PARTIALLY_PAY = 'partially_pay';
     public const TRANSITION_CANCEL = 'cancel';
     public const TRANSITION_PAY = 'pay';

src/Sylius/Component/Core/StateResolver/OrderPaymentStateResolver.php

@@ -105,6 +105,21 @@ private function getTargetTransition(OrderInterface $order): ?string
             return OrderPaymentTransitions::TRANSITION_PARTIALLY_PAY;
         }
 
+        $authorizedPaymentTotal = 0;
+        $authorizedPayments = $this->getPaymentsWithState($order, PaymentInterface::STATE_AUTHORIZED);
+
+        foreach ($authorizedPayments as $payment) {
+            $authorizedPaymentTotal += $payment->getAmount();
+        }
+
+        if (0 < $authorizedPayments->count() && $authorizedPaymentTotal >= $order->getTotal()) {
+            return OrderPaymentTransitions::TRANSITION_AUTHORIZE;
+        }
+
+        if ($authorizedPaymentTotal < $order->getTotal() && 0 < $authorizedPaymentTotal) {
+            return OrderPaymentTransitions::TRANSITION_PARTIALLY_AUTHORIZE;
+        }
+
         return null;
     }
 

src/Sylius/Component/Core/spec/StateResolver/OrderPaymentStateResolverSpec.php

@@ -144,7 +144,7 @@ function it_marks_an_order_as_paid_if_fully_paid_even_if_previous_payment_was_fa
         $this->resolve($order);
     }
 
-    function it_marks_an_order_as_partially_refunded_if_one_of_the_payment_is_completed(
+    function it_marks_an_order_as_partially_refunded_if_one_of_the_payment_is_refunded(
         FactoryInterface $stateMachineFactory,
         StateMachineInterface $stateMachine,
         OrderInterface $order,
@@ -218,4 +218,54 @@ function it_marks_an_order_as_partially_paid_if_one_of_the_payment_is_processing
 
         $this->resolve($order);
     }
+
+    function it_marks_an_order_as_authorized_if_all_its_payments_are_authorized(
+        FactoryInterface $stateMachineFactory,
+        StateMachineInterface $stateMachine,
+        OrderInterface $order,
+        PaymentInterface $firstPayment,
+        PaymentInterface $secondPayment
+    ): void {
+        $firstPayment->getAmount()->willReturn(6000);
+        $firstPayment->getState()->willReturn(PaymentInterface::STATE_AUTHORIZED);
+        $secondPayment->getAmount()->willReturn(4000);
+        $secondPayment->getState()->willReturn(PaymentInterface::STATE_AUTHORIZED);
+
+        $order
+            ->getPayments()
+            ->willReturn(new ArrayCollection([$firstPayment->getWrappedObject(), $secondPayment->getWrappedObject()]))
+        ;
+        $order->getTotal()->willReturn(10000);
+
+        $stateMachineFactory->get($order, OrderPaymentTransitions::GRAPH)->willReturn($stateMachine);
+        $stateMachine->can(OrderPaymentTransitions::TRANSITION_AUTHORIZE)->willReturn(true);
+        $stateMachine->apply(OrderPaymentTransitions::TRANSITION_AUTHORIZE)->shouldBeCalled();
+
+        $this->resolve($order);
+    }
+
+    function it_marks_an_order_as_partially_authorized_if_one_of_the_payments_is_processing_and_one_of_the_payments_is_authorized(
+        FactoryInterface $stateMachineFactory,
+        StateMachineInterface $stateMachine,
+        OrderInterface $order,
+        PaymentInterface $firstPayment,
+        PaymentInterface $secondPayment
+    ): void {
+        $firstPayment->getAmount()->willReturn(6000);
+        $firstPayment->getState()->willReturn(PaymentInterface::STATE_PROCESSING);
+        $secondPayment->getAmount()->willReturn(4000);
+        $secondPayment->getState()->willReturn(PaymentInterface::STATE_AUTHORIZED);
+
+        $order
+            ->getPayments()
+            ->willReturn(new ArrayCollection([$firstPayment->getWrappedObject(), $secondPayment->getWrappedObject()]))
+        ;
+        $order->getTotal()->willReturn(10000);
+
+        $stateMachineFactory->get($order, OrderPaymentTransitions::GRAPH)->willReturn($stateMachine);
+        $stateMachine->can(OrderPaymentTransitions::TRANSITION_PARTIALLY_AUTHORIZE)->willReturn(true);
+        $stateMachine->apply(OrderPaymentTransitions::TRANSITION_PARTIALLY_AUTHORIZE)->shouldBeCalled();
+
+        $this->resolve($order);
+    }
 }