Merge pull request #19 from appinlet/release/2.5.4

= 2.5.4 - July 04, 2024 =

Author: bruce-atkinson

README.md

@@ -1,6 +1,6 @@
 # PayWeb_Gravity_Forms
 
-## Paygate Gravity Forms plugin v2.5.3 for Gravity Forms v2.8.3, WordPress v6.4
+## Paygate Gravity Forms plugin v2.5.4 for Gravity Forms v2.8.13, WordPress v6.5
 
 This is the Paygate plugin for Gravity Forms. Please feel free to contact the Payfast support team at
 support@payfast.help should you require any assistance.
@@ -10,9 +10,8 @@ support@payfast.help should you require any assistance.
 [![How To Setup Paygate for Gravity Forms](https://appinlet.com/wp-content/uploads/2021/01/How-To-Setup-PayGate-PayWeb-for-Gravity-Forms.jpg)](https://www.youtube.com/watch?v=r5nx1EfyOlo "How To Setup Paygate for Gravity Forms")
 
 Please navigate to the [releases page](https://github.com/PayGate/PayWeb_Gravity_Forms/releases), download the latest
-release (v2.5.3) and unzip. You will then be able to follow the integration guide PDF which is included in the zip.
+release (v2.5.4) and unzip. You will then be able to follow the integration guide PDF which is included in the zip.
 
 ## Collaboration
 
 Please submit pull requests with any tweaks, features or fixes you would like to share.
-

changelog.txt

@@ -1,3 +1,12 @@
+=====================================
+Version	: Date : Description
+=====================================
+
+= 2.5.4 - July 04, 2024 =
+* Test Wordpress 6.5.5 and Gravity Forms 2.8.13.
+* Improve compatibility with other gateways.
+* Fix issue where active feeds would not run as expected.
+
 = 2.5.3 - February 23, 2024 =
 * Test Wordpress 6.4.3 and Gravity Forms 2.8.4.
 * Update for PHP 8.1.

paygate.php

@@ -4,8 +4,8 @@
  * Plugin Name: Gravity Forms Paygate Add-On
  * Plugin URI: https://github.com/PayGate/PayWeb_Gravity_Forms
  * Description: Integrates Gravity Forms with Paygate, a South African payment gateway.
- * Version: 2.5.3
- * Tested: 6.4
+ * Version: 2.5.4
+ * Tested: 6.5
  * Author: Payfast (Pty) Ltd
  * Author URI: https://payfast.io/
  * Developer: App Inlet (Pty) Ltd
@@ -83,8 +83,8 @@ function change_message($message, $form)
 {
     if (
         isset($_SESSION['trans_failed']) && !empty($_SESSION['trans_failed']) && strlen(
-            $_SESSION['trans_failed']
-        ) > 0
+                                                                                     $_SESSION['trans_failed']
+                                                                                 ) > 0
     ) {
         $err_msg = $_SESSION['trans_failed'];
 

src/PayGateGF.php

@@ -46,7 +46,7 @@ class PayGateGF extends \GFPaymentAddOn
     protected $_capabilities_uninstall = 'gravityforms_paygate_uninstall';
     protected $_enable_rg_autoupgrade = false;
 
-    private const H6_TAG = '<h6>';
+    private const H6_TAG         = '<h6>';
     private const H6_TAG_CLOSING = '</h6>';
 
     public static function get_instance()
@@ -187,7 +187,7 @@ public static function maybe_thankyou_page()
 
     public static function notify_handler()
     {
-        if (isset($_GET["page"])) {
+        if (isset($_POST['PAY_REQUEST_ID']) && isset($_GET["page"])) {
             // Notify paygate that the request was successful
             echo "OK   ";
 
@@ -333,7 +333,7 @@ public static function get_config($form_id)
         $paygate = PayGateGF::get_instance();
         $feed    = $paygate->get_feeds($form_id);
 
-        // Ignore ITN messages from forms that are no longer configured with the PayGate add-on
+        // Ignore ITN messages from forms that are no longer configured with the Paygate add-on
         if (!$feed) {
             return false;
         }
@@ -435,9 +435,9 @@ public function feed_settings_fields()
                 'required' => true,
                 'tooltip'  => self::H6_TAG .
                               __('Paygate ID', 'gravityformspaygate') .
-                              self::H6_TAG_CLOSING.
+                              self::H6_TAG_CLOSING .
                               __(
-                                  'This is the PayGate ID, received from PayGate.',
+                                  'This is the Paygate ID, received from Paygate.',
                                   'gravityformspaygate'
                               ),
             ),
@@ -447,10 +447,10 @@ public function feed_settings_fields()
                 'type'     => 'text',
                 'class'    => 'medium',
                 'required' => true,
-                'tooltip'  => self::H6_TAG  .
+                'tooltip'  => self::H6_TAG .
                               __('Paygate Merchant Key', 'gravityformspaygate') .
                               self::H6_TAG_CLOSING .
-                              __('This is the Encryption Key set in the PayGate Back Office.', 'gravityformspaygate'),
+                              __('This is the Encryption Key set in the Paygate Back Office.', 'gravityformspaygate'),
             ),
             array(
                 'name'          => 'testmode',
@@ -470,11 +470,11 @@ public function feed_settings_fields()
                 ),
                 'horizontal'    => true,
                 'default_value' => 'no',
-                'tooltip'       => self::H6_TAG  .
+                'tooltip'       => self::H6_TAG .
                                    __('Mode', 'gravityformspaygate') .
                                    self::H6_TAG_CLOSING .
                                    __(
-                                       'Uses a PayGate test account. Request test cards from PayGate',
+                                       'Uses a Paygate test account. Request test cards from Paygate',
                                        'gravityformspaygate'
                                    ),
             ),
@@ -496,7 +496,7 @@ public function feed_settings_fields()
                 ),
                 'horizontal'    => true,
                 'default_value' => 'no',
-                'tooltip'       => self::H6_TAG  .
+                'tooltip'       => self::H6_TAG .
                                    __('Disable IPN', 'gravityformspaygate') .
                                    self::H6_TAG_CLOSING .
                                    __(
@@ -518,7 +518,7 @@ public function feed_settings_fields()
                 ),
                 'horizontal'    => true,
                 'default_value' => 'yes',
-                'tooltip'       => self::H6_TAG  .
+                'tooltip'       => self::H6_TAG .
                                    __(
                                        'Use Custom Confirmation Page',
                                        'gravityformspaygate'
@@ -532,7 +532,7 @@ public function feed_settings_fields()
                 'label'   => __('Successful Page Url', 'gravityformspaygate'),
                 'type'    => 'text',
                 'class'   => 'medium',
-                'tooltip' => self::H6_TAG  .
+                'tooltip' => self::H6_TAG .
                              __('Successful Page Url', 'gravityformspaygate') .
                              self::H6_TAG_CLOSING .
                              __('Enter a thank you page url when a transaction is successful.', 'gravityformspaygate'),
@@ -542,7 +542,7 @@ public function feed_settings_fields()
                 'label'   => __('Failed Page Url', 'gravityformspaygate'),
                 'type'    => 'text',
                 'class'   => 'medium',
-                'tooltip' => self::H6_TAG  .
+                'tooltip' => self::H6_TAG .
                              __('Failed Page Url', 'gravityformspaygate') .
                              self::H6_TAG_CLOSING .
                              __(
@@ -942,7 +942,8 @@ public function redirect_url($feed, $submission_data, $form, $entry)
         unset($fields['CHECKSUM']);
         $checksum = md5(implode('', $fields) . $merchant_key);
         print $payGate->getPaygatePostForm($fields['PAY_REQUEST_ID'], $checksum);
-        exit;
+
+        return "";
     }
 
     public function get_product_query_string($submission_data, $entry_id)
@@ -1372,7 +1373,7 @@ public function temporary_plugin_page()
     {
         ?>
         <script type="text/javascript">
-          function dismissMenu () {
+          function dismissMenu() {
             jQuery('#gf_spinner').show();
             jQuery.post(ajaxurl, {
                 action: 'gf_dismiss_paygate_menu'