Merge pull request #6 from bluem-development/fix-gravity-forms

bluem-development · Dec 5, 2023 · e0daff1 · e0daff1
2 parents 887fddc + aeb8b4e
commit e0daff1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/bluem.php b/bluem.php
@@ -102,13 +102,12 @@ function is_contactform7_activated() {
  * Check if Gravity Forms is activated
  */
 if ( ! function_exists( 'is_gravityforms_activated' ) ) {
-    function is_gravityforms_activated() {
+    function is_gravityforms_activated(): bool
+    {
         $active_plugins = get_option( 'active_plugins' );
 
-        if ( in_array('gravityforms', $active_plugins) ) {
-            return true;
-        }
-        return false;
+        return in_array('gravityforms', $active_plugins, true)
+            || in_array('gravityforms/gravityforms.php', $active_plugins, true);
     }
 }
 

diff --git a/gateways/Bluem_Mandates_Payment_Gateway.php b/gateways/Bluem_Mandates_Payment_Gateway.php
@@ -269,7 +269,11 @@ private function _checkExistingMandate($order)
      */
     public function payment_fields()
     {
-        $BICs = $this->bluem->retrieveBICsForContext("Mandates");
+        if($this->bluem === null) {
+            return;
+        }
+
+        $BICs = $this->bluem->retrieveBICsForContext( "Mandates" );
 
         $description = $this->get_description();
 
@@ -309,7 +313,7 @@ public function validate_fields()
      *
      * @param String $order_id
      *
-     * @return void
+     * @return array
      */
     public function process_payment($order_id)
     {

diff --git a/gateways/Bluem_iDEAL_Payment_Gateway.php b/gateways/Bluem_iDEAL_Payment_Gateway.php
@@ -34,7 +34,11 @@ public function __construct()
      */
     public function payment_fields()
     {
-        $BICs = $this->bluem->retrieveBICsForContext("Payments");
+        if($this->bluem === null) {
+            return;
+        }
+
+        $BICs = $this->bluem->retrieveBICsForContext( "Payments" );
 
         $description = $this->get_description();