Merge pull request #45 from NicolasBarbey/master_rework_webhook

Set order status with webhooks

Author: lopes-vincent

Config/module.xml

@@ -20,7 +20,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <authors>
         <author>
             <name>gbarral</name>

Controller/PayPalResponseController.php

@@ -830,10 +830,6 @@ protected function executePayment(PaypalOrder $payPalOrder, $paymentId, $payerId
         $payPalOrderEvent = new PayPalOrderEvent($payPalOrder);
         $this->dispatch(PayPalEvents::PAYPAL_ORDER_UPDATE, $payPalOrderEvent);
 
-        $event = new OrderEvent($payPalOrder->getOrder());
-        $event->setStatus(OrderStatusQuery::getPaidStatus()->getId());
-        $this->dispatch(TheliaEvents::ORDER_UPDATE_STATUS, $event);
-
         $response = $this->getPaymentSuccessPageUrl($payPalOrder->getId());
 
         PayPalLoggerService::log(

Controller/PayPalWebHookController.php

@@ -239,9 +239,22 @@ protected function getParamsForSale($paymentId = null, $params = [], $eventType
             $params['order_id'] = $payPalOrder->getId();
             $params['customer_id'] = $payPalOrder->getOrder()->getCustomerId();
 
-            if ($eventType === self::HOOK_PAYMENT_SALE_DENIED) {
+            $newStatus = null;
+
+            switch ($eventType){
+                case self::HOOK_PAYMENT_SALE_DENIED :
+                    $newStatus = OrderStatusQuery::getCancelledStatus()->getId();
+                    break;
+                case self::HOOK_PAYMENT_SALE_COMPLETED :
+                    $newStatus = OrderStatusQuery::getPaidStatus()->getId();
+                    break;
+                default :
+                    break;
+            }
+
+            if (null !== $newStatus){
                 $event = new OrderEvent($payPalOrder->getOrder());
-                $event->setStatus(OrderStatusQuery::getCancelledStatus()->getId());
+                $event->setStatus($newStatus);
                 $this->dispatch(TheliaEvents::ORDER_UPDATE_STATUS, $event);
             }
         }