Merge pull request #23 from AppInlet/release/2.6.1

[2.6.1]

Author: bruce-atkinson

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [2.6.1](https://github.com/Paygate/PayWeb_Gravity_Forms/releases/tag/v2.6.1)
+
+### Fixed
+
+- Resolved issue with Gravity Forms Multi Currency Add-on.
+
 ## [2.6.0](https://github.com/Paygate/PayWeb_Gravity_Forms/releases/tag/v2.6.0)
 
 ### Added

README.md

@@ -1,6 +1,6 @@
 # PayWeb_Gravity_Forms
 
-## Paygate Gravity Forms Plugin v2.6.0 for Gravity Forms v2.9.1
+## Paygate Gravity Forms Plugin v2.6.1 for Gravity Forms v2.9.1
 
 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.
@@ -9,7 +9,7 @@ support@payfast.help should you require any assistance.
 
 1. **Download the Latest Release**
     - Visit the [releases page](https://github.com/Paygate/PayWeb_Gravity_Forms/releases) and
-      download [gravity-forms-paygate-plugin.zip](https://github.com/Paygate/PayWeb_Gravity_Forms/releases/download/v2.6.0/gravity-forms-paygate-plugin.zip).
+      download [gravity-forms-paygate-plugin.zip](https://github.com/Paygate/PayWeb_Gravity_Forms/releases/download/v2.6.1/gravity-forms-paygate-plugin.zip).
 
 2. **Install the Plugina**
     - Log in to your WordPress Admin panel.

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.6.0
- * Tested: 6.7
+ * Version: 2.6.1
+ * Tested: 6.8
  * Author: Payfast (Pty) Ltd
  * Author URI: https://payfast.io/
  * Developer: App Inlet (Pty) Ltd

src/PayGateGF.php

@@ -784,6 +784,8 @@ public function redirect_url($feed, $submission_data, $form, $entry)
             $country_code3 = 'ZAF'; // Default value
         }
 
+        $currency = rgar( $entry, 'currency' ) ?? GFCommon::get_currency();
+
         $fields = [
             'REFERENCE'        => $entry['id'],
             'AMOUNT'           => number_format(
@@ -792,7 +794,7 @@ public function redirect_url($feed, $submission_data, $form, $entry)
                 '',
                 ''
             ),
-            'CURRENCY'         => GFCommon::get_currency(),
+            'CURRENCY'         => $currency,
             'RETURN_URL'       => $return_url,
             'TRANSACTION_DATE' => date('Y-m-d H:m:s'),
             'LOCALE'           => 'en-za',
@@ -806,7 +808,7 @@ public function redirect_url($feed, $submission_data, $form, $entry)
 
         $fields['USER1'] = $entry['created_by'];
         $fields['USER2'] = get_bloginfo('admin_email');
-        $fields['USER3'] = 'gravityforms-v2.5.2';
+        $fields['USER3'] = 'gravityforms-v2.6.1';
 
         $paymentRequest = new PaymentRequest($merchant_id, $merchant_key);
         $paygate = new PayGate();