refs #49333 not use authorize mode for mx/br

202ecommerce · Dec 10, 2024 · a4f2313 · a4f2313
1 parent 14fe751
commit a4f2313
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 17 deletions.
diff --git a/classes/AbstractMethodPaypal.php b/classes/AbstractMethodPaypal.php
@@ -77,6 +77,8 @@
 
 abstract class AbstractMethodPaypal extends AbstractMethod
 {
+    const AUTHORIZE = 'AUTHORIZE';
+    const SALE = 'CAPTURE';
     /** @var bool */
     protected $isSandbox;
 

diff --git a/classes/Form/CheckoutForm.php b/classes/Form/CheckoutForm.php
@@ -109,7 +109,7 @@ public function getDescription()
             ];
         }
 
-        if (in_array($this->method, ['EC', 'MB'])) {
+        if (in_array($this->method, ['EC'])) {
             $fields[PaypalConfigurations::INTENT] = [
                 'type' => 'select',
                 'label' => $this->module->l('Payment action', 'AdminPayPalSetupController'),

diff --git a/classes/MethodEC.php b/classes/MethodEC.php
@@ -42,10 +42,6 @@
  */
 class MethodEC extends AbstractMethodPaypal
 {
-    const AUTHORIZE = 'AUTHORIZE';
-
-    const SALE = 'CAPTURE';
-
     /** @var bool pay with card without pp account */
     public $credit_card;
 

diff --git a/classes/MethodMB.php b/classes/MethodMB.php
@@ -454,7 +454,7 @@ public function getPaypalPartnerId()
 
     public function getIntent()
     {
-        return Configuration::get('PAYPAL_API_INTENT') == 'sale' ? 'CAPTURE' : 'AUTHORIZE';
+        return self::SALE;
     }
 
     public function getMerchantId()

diff --git a/classes/MethodPPP.php b/classes/MethodPPP.php
@@ -278,7 +278,7 @@ public function getSecret($sandbox = null)
 
     public function getIntent()
     {
-        return 'CAPTURE';
+        return self::SALE;
     }
 
     public function getReturnUrl()

diff --git a/services/StatusMapping.php b/services/StatusMapping.php
@@ -30,7 +30,6 @@
 use Configuration;
 use MethodEC;
 use MethodMB;
-use MethodPPP;
 use PaypalAddons\classes\AbstractMethodPaypal;
 use PaypalAddons\classes\Constants\PaypalConfigurations;
 use PaypalAddons\classes\Constants\WebHookType;
@@ -182,15 +181,7 @@ public function isModeSale($method = null)
             $method = AbstractMethodPaypal::load();
         }
 
-        if ($method instanceof MethodPPP) {
-            return true;
-        }
-
-        if ($method instanceof MethodMB) {
-            return true;
-        }
-
-        return Configuration::get('PAYPAL_API_INTENT') == 'sale';
+        return $method->getIntent() === AbstractMethodPaypal::SALE;
     }
 
     /**