Merge branch 'master' into develop

changelog.txt

@@ -1,4 +1,7 @@
 == Changelog ==
+= 3.6.1: March 21st, 2024 =
+* Fix: Resolved an issue with PayPal donations and currency switcher on donation forms using the visual form builder
+
 = 3.6.0: March 13th, 2024 =
 * New: Introduced a new beta feature called "Event Tickets" that is open for feedback! If enabled, you can create events and sell tickets on your donation forms.
 * New: Added a new form builder layout called "Two Panel" that offers a side-by-side appearance and a multi-step donation experience.

give.php

@@ -6,7 +6,7 @@
  * Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
  * Author: GiveWP
  * Author URI: https://givewp.com/
- * Version: 3.6.0
+ * Version: 3.6.1
  * Requires at least: 6.0
  * Requires PHP: 7.2
  * Text Domain: give
@@ -404,7 +404,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '3.6.0');
+            define('GIVE_VERSION', '3.6.1');
         }
 
         // Plugin Root File.

readme.txt

@@ -5,7 +5,7 @@ Tags: donation, donate, recurring donations, fundraising, crowdfunding
 Requires at least: 6.0
 Tested up to: 6.4
 Requires PHP: 7.2
-Stable tag: 3.6.0
+Stable tag: 3.6.1
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -262,6 +262,9 @@ The 2% fee on Stripe donations only applies to donations taken via our free Stri
 10. Use almost any payment gateway integration with GiveWP through our add-ons or by creating your own add-on.
 
 == Changelog ==
+= 3.6.1: March 21st, 2024 =
+* Fix: Resolved an issue with PayPal donations and currency switcher on donation forms using the visual form builder
+
 = 3.6.0: March 13th, 2024 =
 * New: Introduced a new beta feature called "Event Tickets" that is open for feedback! If enabled, you can create events and sell tickets on your donation forms.
 * New: Added a new form builder layout called "Two Panel" that offers a side-by-side appearance and a multi-step donation experience.

src/DonationForms/Blocks/DonationFormBlock/resources/app/Components/ModalForm.tsx

@@ -13,7 +13,7 @@ type ModalFormProps = {
 };
 
 /**
- * @unreleased
+ * @since 3.6.1
  * @since 3.4.0
  * @since 3.2.0 include types. update BEM classnames.
  * @since 3.0.0

src/DonationForms/Blocks/DonationFormBlock/resources/common/FormModal/index.tsx

@@ -10,7 +10,7 @@ type FormModalProps = {
 };
 
 /**
- * @unreleased
+ * @since 3.6.1
  */
 export default function FormModal({openFormButton, children, onChange, isOpen}: FormModalProps) {
     return (

src/PaymentGateways/Gateways/PayPalCommerce/payPalCommerceGateway.tsx

@@ -48,6 +48,8 @@ import {PayPalSubscriber} from './types';
     let updateOrderAmount = false;
     let orderCreated = false;
 
+    let currency;
+
     const buttonsStyle = {
         color: 'gold' as 'gold' | 'blue' | 'silver' | 'white' | 'black',
         label: 'paypal' as 'paypal' | 'checkout' | 'buynow' | 'pay' | 'installment' | 'subscribe' | 'donate',
@@ -100,6 +102,7 @@ import {PayPalSubscriber} from './types';
     /**
      * Get amount with fee (if any).
      *
+     * @since 3.6.1 Append 'give-cs-form-currency' to formData
      * @since 3.2.0
      * @return {number} Amount with fee.
      */
@@ -139,6 +142,11 @@ import {PayPalSubscriber} from './types';
             formData.append('billing_country', country);
         }
 
+        /**
+         * Ensure the proper currency will be used when using the Currency Switcher add-on.
+         */
+        formData.append('give-cs-form-currency', currency);
+
         return formData;
     };
 
@@ -266,6 +274,8 @@ import {PayPalSubscriber} from './types';
         postalCode = useWatch({name: 'zip'});
         country = useWatch({name: 'country'});
 
+        currency = useWatch({name: 'currency'});
+
         useEffect(() => {
             if (orderCreated) {
                 updateOrderAmount = true;
@@ -277,7 +287,6 @@ import {PayPalSubscriber} from './types';
 
     const SmartButtonsContainer = () => {
         const {useWatch, useFormState} = window.givewp.form.hooks;
-        const currency = useWatch({name: 'currency'});
         const donationType = useWatch({name: 'donationType'});
         const {isSubmitting, isSubmitSuccessful} = useFormState();
         const {useFormContext} = window.givewp.form.hooks;
@@ -451,7 +460,6 @@ import {PayPalSubscriber} from './types';
 
     function PaymentMethodsWrapper() {
         const {useWatch} = window.givewp.form.hooks;
-        const currency = useWatch({name: 'currency'});
         const donationType = useWatch({name: 'donationType'});
         const [{options}, dispatch] = usePayPalScriptReducer();