Dispatch option event only if payment is valide

thelia-modules · Mar 21, 2024 · 86148ec · 86148ec
1 parent b84c2b5
commit 86148ec
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/Controller/Front/PaymentController.php b/Controller/Front/PaymentController.php
@@ -105,22 +105,27 @@ protected function getPaymentModule(
             TheliaEvents::MODULE_PAYMENT_IS_VALID
         );
 
-        $paymentModuleOptionEvent = new PaymentModuleOptionEvent($paymentModule, $cart);
-
-        $dispatcher->dispatch(
-            $paymentModuleOptionEvent,
-            OpenApiEvents::MODULE_PAYMENT_GET_OPTIONS
-        );
-
         /** @var PaymentModule $paymentModule */
-        $paymentModule = $modelFactory->buildModel('PaymentModule', $paymentModule);
+        $paymentModuleApi = $modelFactory->buildModel('PaymentModule', $paymentModule);
 
-        $paymentModule->setValid($isValidPaymentEvent->isValidModule())
+        $paymentModuleApi->setValid($isValidPaymentEvent->isValidModule())
             ->setCode($moduleInstance->getCode())
             ->setMinimumAmount($isValidPaymentEvent->getMinimumAmount())
-            ->setMaximumAmount($isValidPaymentEvent->getMaximumAmount())
-            ->setOptionGroups($paymentModuleOptionEvent->getPaymentModuleOptionGroups());
+            ->setMaximumAmount($isValidPaymentEvent->getMaximumAmount());
+
+        if ($isValidPaymentEvent->isValidModule()) {
+            $paymentModuleOptionEvent = new PaymentModuleOptionEvent($paymentModule, $cart);
+
+            $dispatcher->dispatch(
+                $paymentModuleOptionEvent,
+                OpenApiEvents::MODULE_PAYMENT_GET_OPTIONS
+            );
+
+            $paymentModuleApi
+                ->setOptionGroups($paymentModuleOptionEvent->getPaymentModuleOptionGroups());
+
+        }
 
-        return $paymentModule;
+        return $paymentModuleApi;
     }
 }