Merge pull request #13 from appinlet/release/1.0.7

= 1.0.7 - April 29, 2024 =

README.md

@@ -1,10 +1,10 @@
 # DPO_Gravity_Forms
-## DPO Pay plugin v1.0.6 for Gravity Forms v2.6.9, WordPress v6.1
+## DPO Pay plugin v1.0.7 for Gravity Forms v2.8.8, WordPress v6.5.2
 
 This is the DPO Pay plugin for Gravity Forms. Please feel free to contact the [DPO Pay support team](https://dpogroup.com/contact-us/) should you require any assistance.
 
 ## Installation
-Please navigate to the [releases page](https://github.com/DPO-Group/DPO_Gravity_Forms/releases), download the latest release (v1.0.6) and unzip. You will then be able to follow the integration guide which is included in the zip.
+Please navigate to the [releases page](https://github.com/DPO-Group/DPO_Gravity_Forms/releases), download the latest release (v1.0.7) and unzip. You will then be able to follow the integration guide which is included in the zip.
 
 ## Collaboration
 

changelog.txt

@@ -1,13 +1,18 @@
+= 1.0.7 - April 29, 2024 =
+* Test WordPress 6.5.2 and Gravity Forms 2.8.8.
+* Update for PHP 8.1.
+* Bug fixes and improvements.
+
 = 1.0.6 - March 3, 2023 =
 * Improve error display to user.
 
 = 1.0.5 - January 27, 2023 =
-* Test Wordpress 6.1.1 and Gravity Forms 2.6.9.
+* Test WordPress 6.1.1 and Gravity Forms 2.6.9.
 * Add support for Payment Complete event.
 * Bug fixes and improvements.
 
 = 1.0.4 - October 12, 2022 =
-* Test Wordpress 6.0 and Gravity Forms 2.6.7.
+* Test WordPress 6.0 and Gravity Forms 2.6.7.
 * Update for PHP 8.0.
 * Bug fixes and improvements.
 

class-gf-dpo-group.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2023 DPO Group
+ * Copyright (c) 2024 DPO Group
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -24,7 +24,7 @@ class GF_DPO_Group extends GFPaymentAddOn
     protected $_slug = 'gravity-forms-dpo-group-plugin';
     protected $_path = 'gravity-forms-dpo-group-plugin/dpo-group.php';
     protected $_full_path = __FILE__;
-    protected $_url = 'http://www.gravityforms.com';
+    protected $_url = 'https://www.gravityforms.com';
     protected $_title = 'Gravity Forms DPO Pay Add-On';
     protected $_short_title = 'DPO Pay';
     // Permissions
@@ -578,7 +578,7 @@ public function field_map_title()
 
     public function settings_trial_period($field, $echo = true)
     {
-        // Use the parent billing cycle function to make the drop down for the number and type
+        // Use the parent billing cycle function to make the dropdown for the number and type
         return parent::settings_billing_cycle($field);
     }
 
@@ -780,7 +780,7 @@ public function redirect_url($feed, $submission_data, $form, $entry)
         $reference = 'DPO_Group_Form_' . date('Y-m-d_H:i:s');
 
         /**
-         * Setup the order info to pass to dpo_grouppay
+         * Set up the order info to pass to dpo_grouppay
          */
         $data                      = [];
         $data['companyToken']      = $dpo_grouppay->getCompanyToken();
@@ -1139,7 +1139,7 @@ public function get_entry($custom_field): bool
         // Allow the user to do some other kind of validation of the hash
         $hash_matches = apply_filters('gform_dpo_group_hash_matches', $hash_matches, $entry_id, $hash, $custom_field);
 
-        // Validates that Entry Id wasn't tampered with
+        // Validates that Entry ID wasn't tampered with
         if ( ! rgpost('test_itn') && ! $hash_matches) {
             $this->log_error(
                 __METHOD__ . "(): Entry Id verification failed. Hash does not match. Custom field: {$custom_field}. Aborting."
@@ -1923,7 +1923,7 @@ private function get_pending_reason($code)
 
     private function is_valid_initial_payment_amount($entry_id, $amount_paid): bool
     {
-        // Get amount initially sent to paypfast
+        // Get amount initially sent to DPO Pay
         $amount_sent = gform_get_meta($entry_id, 'payment_amount');
         if (empty($amount_sent)) {
             return true;

dpo-group.php

@@ -3,18 +3,18 @@
 /**
  * Plugin Name: Gravity Forms DPO Pay Add-On
  * Plugin URI: https://github.com/DPO-Group/DPO_Gravity_Forms
- * Description: Integrates Gravity Forms with DPO Pay, a An African payment gateway.
- * Version: 1.0.6
+ * Description: Integrates Gravity Forms with DPO Pay, an African payment gateway.
+ * Version: 1.0.7
  * Minimum Gravity Forms Version: 2.2.5
- * Tested Gravity Forms Version: 2.6.9
+ * Tested Gravity Forms Version: 2.8.8
  * Author: DPO Group
  * Author URI: https://www.dpogroup.com/africa/
  * Developer: App Inlet (Pty) Ltd
  * Developer URI: https://www.appinlet.com/
  * Text Domain: gravity-forms-dpo-group
  * Domain Path: /languages
  *
- * Copyright: © 2023 DPO Group
+ * Copyright: © 2024 DPO Group
  * License: GNU General Public License v3.0
  * License URI: http://www.gnu.org/licenses/gpl-3.0.html
  */

includes/CountriesArray.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2023 DPO Group
+ * Copyright (c) 2024 DPO Group
  *
  * Author: App Inlet (Pty) Ltd
  *

includes/dpo-group-pay.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2023 DPO Group
+ * Copyright (c) 2024 DPO Group
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -219,7 +219,7 @@ public function verifyToken($data): bool|array|string
             $err  = null;
             $curl = curl_init();
             curl_setopt_array($curl, array(
-                CURLOPT_URL            => $this->dpo_groupUrl . "/API/v6/",
+                CURLOPT_URL            => $this->dpo_groupUrl . "/API/v7/",
                 CURLOPT_RETURNTRANSFER => true,
                 CURLOPT_ENCODING       => "",
                 CURLOPT_MAXREDIRS      => 10,

includes/dpo-group-tools.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2023 DPO Group
+ * Copyright (c) 2024 DPO Group
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -101,10 +101,10 @@ public function logData($msg = '', $close = false): void
 /**
  * Gravity Forms Post Content Merge Tags
  *
- * Adds support for using Gravity Form merge tags in your post content. This functionality requires that the entry ID is
+ * Adds support for using Gravity Form merge tags in your post content. This functionality requires that the entry ID
  * is passed to the post via the "eid" parameter.
  *
- * Setup your confirmation page (requires GFv1.8) or confirmation URL "Redirect Query String" setting to
+ * Set up your confirmation page (requires GFv1.8) or confirmation URL "Redirect Query String" setting to
  * include this parameter: 'eid={entry_id}'. You can then use any entry-based merge tag in your post content.
  *
  */

includes/updater.class.php

@@ -53,7 +53,7 @@ class WP_GitHub_Updater_DPO_Group
     public $missing_config;
 
     /**
-     *  temporiraly store the data fetched from GitHub, allows us to only load the data once per class instance
+     *  temporarily store the data fetched from GitHub, allows us to only load the data once per class instance
      * @access private
      */
     private $github_data;
@@ -126,7 +126,7 @@ public function has_minimum_config()
     }
 
     /**
-     * Check wether or not the transients need to be overruled and API needs to be called for every single page load
+     * Check whether or not the transients need to be overruled and API needs to be called for every single page load
      *
      * @return bool overrule or not
      */
@@ -239,22 +239,22 @@ public function http_request_sslverify($args, $url)
      */
     public function get_icons()
     {
-        $assest_url = $this->config['raw_url'] . '/assets/images/';
+        $asset_url = $this->config['raw_url'] . '/assets/images/';
 
         return array(
-            'default' => $assest_url . 'icon-128x128.png',
-            '1x'      => $assest_url . 'icon-128x128.png',
-            '2x'      => $assest_url . 'icon-256x256.png',
+            'default' => $asset_url . 'icon-128x128.png',
+            '1x'      => $asset_url . 'icon-128x128.png',
+            '2x'      => $asset_url . 'icon-256x256.png',
         );
     }
 
     /**
      * Get Raw Response from GitHub
      *
-     * @return array|int $raw_response the raw response
+     * @return mixed $raw_response the raw response
      * @since 1.7
      */
-    public function get_raw_response(): array|int
+    public function get_raw_response(): mixed
     {
         return $this->remote_get(trailingslashit($this->config['raw_url']) . basename($this->config['slug']));
     }
@@ -527,12 +527,14 @@ public function get_plugin_info($response): bool|stdClass
      * Upgrader/Updater
      * Move & activate the plugin, echo the update message
      *
+     * @param bool $true - don't remove, it breaks the updates
+     * @param mixed $hookExtra - don't remove, it breaks the updates
      * @param array $result the result of the move
      *
      * @return array $result the result of the move
      * @since 1.0
      */
-    public function upgrader_post_install(array $result): array
+    public function upgrader_post_install(bool $true, mixed $hookExtra, array $result): array
     {
         global $wp_filesystem;