Fixed non working sandbox mode

thelia-modules · Jul 12, 2023 · d3ce196 · d3ce196
1 parent 37518fd
commit d3ce196
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 24 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -5,11 +5,6 @@
     <fullnamespace>PayPal\PayPal</fullnamespace>
     <descriptive locale="en_US">
         <title>PayPal</title>
-        <!--
-        <subtitle></subtitle>
-        <description></description>
-        <postscriptum></postscriptum>
-        -->
     </descriptive>
     <descriptive locale="fr_FR">
         <title>PayPal</title>
@@ -20,22 +15,14 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>4.0.4</version>
+    <version>4.0.5</version>
     <authors>
         <author>
             <name>gbarral</name>
             <email>[email protected]</email>
         </author>
     </authors>
     <type>classic</type>
-    <!--
-    module dependencies
-    <required>
-        <module version="&gt;=0.1">Front</module>
-        <module version="~1.0">HookCart</module>
-        <module version="&gt;0.2">HookSearch</module>
-    </required>
-    -->
     <thelia>2.4.0</thelia>
     <stability>other</stability>
 </module>
diff --git a/Service/Base/PayPalBaseService.php b/Service/Base/PayPalBaseService.php
@@ -356,7 +356,7 @@ public static function getApiContext()
      */
     public static function getLogin()
     {
-        if ((bool)PayPal::getConfigValue('sandbox') === 1) {
+        if ((bool)PayPal::getConfigValue('sandbox') === true) {
             $login = PayPal::getConfigValue('sandbox_login');
         } else {
             $login = PayPal::getConfigValue('login');
@@ -370,7 +370,7 @@ public static function getLogin()
      */
     public static function getPassword()
     {
-        if ((bool)PayPal::getConfigValue('sandbox') === 1) {
+        if ((bool)PayPal::getConfigValue('sandbox') === true) {
             $password = PayPal::getConfigValue('sandbox_password');
         } else {
             $password = PayPal::getConfigValue('password');
@@ -384,7 +384,7 @@ public static function getPassword()
      */
     public static function getMerchantId()
     {
-        if ((bool)PayPal::getConfigValue('sandbox') === 1) {
+        if ((bool)PayPal::getConfigValue('sandbox') === true) {
             $login = PayPal::getConfigValue('sandbox_merchant_id');
         } else {
             $login = PayPal::getConfigValue('merchant_id');
@@ -398,7 +398,7 @@ public static function getMerchantId()
      */
     public static function getMode()
     {
-        if ((bool)PayPal::getConfigValue('sandbox') === 1) {
+        if ((bool)PayPal::getConfigValue('sandbox') === true) {
             $mode = 'sandbox';
         } else {
             $mode = 'live';
@@ -407,12 +407,8 @@ public static function getMode()
         return $mode;
     }
 
-    public static function isSandboxMode()
+    public static function isSandboxMode(): bool
     {
-        if (self::getMode() === 'live') {
-            return false;
-        }
-
-        return true;
+        return self::getMode() === 'sandbox';
     }
 }