Merge pull request #91 from NicolasBarbey/main

fix payment options
thelia-modules · Jun 11, 2024 · 5897230 · 5897230
2 parents 9df0a55 + f93f177
commit 5897230
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -19,7 +19,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>2.2.24</version>
+    <version>2.2.25</version>
     <authors>
         <author>
             <name>Vincent Lopes-Vicente</name>

diff --git a/Model/Api/Checkout.php b/Model/Api/Checkout.php
@@ -81,6 +81,14 @@ class Checkout extends BaseApiModel
      */
     protected $paymentOptionChoices = [];
 
+    /**
+     * @var bool
+     * @OA\Property(
+     *    type="boolean"
+     * )
+     */
+    protected $mustSelectPaymentOption = false;
+
     /**
      * @var bool
      * @OA\Property(
@@ -127,6 +135,10 @@ public function getIsComplete()
             return false;
         }
 
+        if ($this->isMustSelectPaymentOption() && empty($this->getPaymentOptionChoices())) {
+            return false;
+        }
+
         return true;
     }
 
@@ -145,7 +157,7 @@ public function checkIsValid(): void
             );
         }
 
-        if (null === $this->getPaymentModuleId()) {
+        if (null === $this->getPaymentModuleId() || ($this->isMustSelectPaymentOption() && empty($this->getPaymentOptionChoices()))) {
             throw new \Exception(
                 Translator::getInstance()->trans(
                     'You must choose a payment module',
@@ -326,4 +338,23 @@ public function setPaymentOptionChoices(?array $paymentOptionChoices = []): Chec
         $this->paymentOptionChoices = $paymentOptionChoices;
         return $this;
     }
+
+    /**
+     * @return bool
+     */
+    public function isMustSelectPaymentOption(): bool
+    {
+        return $this->mustSelectPaymentOption;
+    }
+
+    /**
+     * @param bool $mustSelectPaymentOption
+     */
+    public function setMustSelectPaymentOption(?bool $mustSelectPaymentOption = false): Checkout
+    {
+        $this->mustSelectPaymentOption = $mustSelectPaymentOption;
+        return $this;
+    }
+
+
 }