Merge branch 'develop' into fix/duplicate-meta-keys

assets/src/js/frontend/paypal-commerce/AdvancedCardFields.js

@@ -243,7 +243,7 @@ class AdvancedCardFields extends PaymentMethod {
 	/**
 	 * Handle PayPal payment on approve event.
 	 *
-     * @since 3.1.2 Hide processing state upon error.
+     * @since 3.2.0 Hide processing state upon error.
 	 * @since 2.9.0
 	 *
 	 * @param {object} payload PayPal response object after payment completion.
@@ -413,7 +413,7 @@ class AdvancedCardFields extends PaymentMethod {
 	/**
 	 * Handle hosted fields on submit errors.
 	 *
-     * @since 3.1.2 Handle custom error.
+     * @since 3.2.0 Handle custom error.
 	 * @since 2.9.0
 	 *
 	 * @param {object} error Collection of hosted field on submit error

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.1.2
+ * Version: 3.2.0
  * Requires at least: 6.0
  * Requires PHP: 7.2
  * Text Domain: give
@@ -391,7 +391,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '3.1.2');
+            define('GIVE_VERSION', '3.2.0');
         }
 
         // 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.1.2
+Stable tag: 3.2.0
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -27,15 +27,15 @@ Free donor tools also help keep your donors happy. The donor dashboard helps you
 
 **[Powerful Donation Forms](https://go.givewp.com/features-forms "See how powerful our fundraising forms can be")**
 
-GiveWP has taken inspiration from Gutenberg blocks to create an even better form-building experience. The Visual Donation Form Builder uses sections and blocks to provide a more intuitive way to build and configure your donation forms. 
+GiveWP has taken inspiration from Gutenberg blocks to create an even better form-building experience. The Visual Donation Form Builder uses sections and blocks to provide a more intuitive way to build and configure your donation forms.
 
-In this builder, you’ll see your design in real time. Watch as your form takes shape as you select custom colors, fields, elements, and more. For those with a flair for customization, you can add Custom CSS directly into the builder. 
+In this builder, you’ll see your design in real time. Watch as your form takes shape as you select custom colors, fields, elements, and more. For those with a flair for customization, you can add Custom CSS directly into the builder.
 
 * Build custom donation forms in your WordPress admin
 * Customize donation form templates without any code
 * Add goals, multiple giving amounts, custom amounts, terms and conditions and more with just a couple clicks
 
-Never used blocks before? No worries - [we’ve got you covered with our guide](https://go.givewp.com/visual-builder). 
+Never used blocks before? No worries - [we’ve got you covered with our guide](https://go.givewp.com/visual-builder).
 
 **[Actionable Fundraising Reporting](https://go.givewp.com/features-reports "See our gorgeous and helpful reports dashboards")**
 
@@ -67,8 +67,8 @@ With more than 100,000+ active installs of GiveWP, we hear more and more success
 * [A local neighborhood watch program](https://go.givewp.com/memstory) switched from using GoFundMe to GiveWP and raised $40,000 in five days for a memorial fundraiser.
 * [Fans of Ivan the Gorilla have kept his memory alive](https://go.givewp.com/readivan) by fundraising for a conservancy program in his name.
 * [A hospital raised money](https://go.givewp.com/twiststory) through a community-wide virtual dance party during the pandemic.
-* [Quiltlove](https://go.givewp.com/quiltlove), which provides personalized quilts for different life events (like new babies, extended hospital stays, and more), uses GiveWP to create a sustainable business model. 
-* [Niels Vink, a Dutch wheelchair tennis player](https://go.givewp.com/niels-vink), uses GiveWP to raise money to train, travel, and participate in competitions. At the 2021 Tokyo Paralympics, Vink earned a gold medal in doubles and a bronze medal in singles. 
+* [Quiltlove](https://go.givewp.com/quiltlove), which provides personalized quilts for different life events (like new babies, extended hospital stays, and more), uses GiveWP to create a sustainable business model.
+* [Niels Vink, a Dutch wheelchair tennis player](https://go.givewp.com/niels-vink), uses GiveWP to raise money to train, travel, and participate in competitions. At the 2021 Tokyo Paralympics, Vink earned a gold medal in doubles and a bronze medal in singles.
 
 In addition to nonprofit organizations, GiveWP is widely used for individual or creative purposes. We’ve seen tip jars for blogs or musicians, live streams, and more. Our [Donation Upsells for WooCommerce Add-on](https://go.givewp.com/wooread) is even used in some eCommerce stores to collect donations for a cause, or ask for tips in the cart or checkout.
 
@@ -167,8 +167,8 @@ Here’s a few ways you can contribute to GiveWP:
 
 = Minimum Requirements =
 
-* WordPress 5.0 or greater
-* PHP version 7.0 or greater
+* WordPress 6.0 or greater
+* PHP version 7.2 or greater
 * MySQL version 5.7 or greater
 * MariaDB version 10 or later
 * Some payment gateways require fsockopen support (for IPN access)
@@ -262,15 +262,22 @@ 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.1.2: November 27th, 2023 =
+= 3.2.0: Dec 6th, 2023 =
+* New: Embed form button added to the Visual Donation Form Builder
+* New: Pre-publish confirmation panel added to the Visual Donation Form Builder
 * Enhancement: Updated parts of the Form Builder text areas to Text Editors to provide more formatting options
 * Enhancement: Improved compatibility with the donation block and Visual Builder forms
 * Enhancement: All donors are connected with a user for improved security and caching compatibility
+* Enhancement: Improve the Name, and Terms and Conditions blocks with global settings
 * Fix: Resolved some strange behaviors when using the Amount Levels setting in the Form Builder
 * Fix: Removed WP_Background_Process and WP_Async_Request to avoid conflicts with other plugins
 * Fix: Donor honorific (Mr, Mrs, etc) is now properly saved as part of the donor record
-* Fix: PayPal Donations displays a helpful error message when incorrect credit card information is entered 
-* Fix: Visual Donation Form Builder loading is improved by preventing the formBuilderSettings meta from becoming too large 
+* Fix: PayPal Donations displays a helpful error message when incorrect credit card information is entered
+* Fix: Visual Donation Form Builder loading is improved by preventing the formBuilderSettings meta from becoming too large
+* Fix: Resolved an issue where some donations list tables were failing to load due to missing donation mode meta
+* Fix: Resolved an issue where the donation forms list tables were resulting in duplicate forms
+* Fix: Resolved an issue where PayPal smart buttons were not being displayed on embedded forms using legacy template
+* Fix: Resolved an issue with PayPal donations and fee recovery where the fee was not being added to the donation total
 
 = 3.1.1: November 3rd, 2023 =
 * Fix: Embedded forms created with the Visual Builder now redirect to the confirmation page after a completed donation.
@@ -331,8 +338,8 @@ The 2% fee on Stripe donations only applies to donations taken via our free Stri
 
 = 2.33.0: August 28th, 2023 =
 * New: Admins can now select standard or advanced connection type during setup
-* New: Added a new SubscriptionSynced command class 
-* New: Added PayPal Standard to PayPal Donations migration information banners 
+* New: Added a new SubscriptionSynced command class
+* New: Added PayPal Standard to PayPal Donations migration information banners
 * Security: Remove uses of payment intent secret and existing meta
 
 = 2.32.0: August 11th, 2023 =

src/DonationForms/Actions/GetOrCreateDonor.php

@@ -6,14 +6,14 @@
 use Give\Donors\Models\Donor;
 
 /**
- * @since 3.1.2
+ * @since 3.2.0
  */
 class GetOrCreateDonor
 {
     public $donorCreated = false;
 
     /**
-     * @since 3.1.2
+     * @since 3.2.0
      *
      * @throws Exception
      */

src/DonationForms/Blocks/DonationFormBlock/Controllers/BlockRenderController.php

@@ -13,7 +13,7 @@
 class BlockRenderController
 {
     /**
-     * @since 3.1.2 include form url for new tab format.
+     * @since 3.2.0 include form url for new tab format.
      * @since 3.0.0
      *
      * @return string|null

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

@@ -11,7 +11,7 @@ type ModalFormProps = {
 };
 
 /**
- * @since 3.1.2 include types. update BEM classnames.
+ * @since 3.2.0 include types. update BEM classnames.
  * @since 3.0.0
  */
 export default function ModalForm({dataSrc, embedId, openFormButton}: ModalFormProps) {

src/DonationForms/Blocks/DonationFormBlock/resources/app/index.tsx

@@ -13,7 +13,7 @@ type DonationFormBlockAppProps = {
 };
 
 /**
- * @since 3.1.2 replace form format reveal with new tab.
+ * @since 3.2.0 replace form format reveal with new tab.
  * @since 3.0.0
  */
 function DonationFormBlockApp({formFormat, dataSrc, embedId, openFormButton, formUrl}: DonationFormBlockAppProps) {

src/DonationForms/Blocks/DonationFormBlock/resources/editor/Edit.tsx

@@ -10,7 +10,7 @@ import DonationFormBlockPreview from './components/DonationFormBlockPreview';
 import './styles/index.scss';
 
 /**
- * @since 3.1.2 updated to handle v2 forms.
+ * @since 3.2.0 updated to handle v2 forms.
  * @since 3.0.0
  */
 export default function Edit({attributes, isSelected, setAttributes, className, clientId}: BlockEditProps<any>) {

src/DonationForms/Blocks/DonationFormBlock/resources/editor/components/DonationFormBlockControls.tsx

@@ -13,7 +13,7 @@ interface DonationFormBlockControls {
 }
 
 /**
- * @since 3.1.2
+ * @since 3.2.0
  */
 export default function DonationFormBlockControls({
     attributes,

src/DonationForms/Blocks/DonationFormBlock/resources/editor/components/DonationFormBlockPreview.tsx

@@ -13,7 +13,7 @@ interface BlockPreviewProps {
 }
 
 /**
- * @since 3.1.2 replace reveal for newTab display.
+ * @since 3.2.0 replace reveal for newTab display.
  * @since 3.0.0
  */
 export default function DonationFormBlockPreview({

src/DonationForms/Blocks/DonationFormBlock/resources/editor/components/DonationFormSelector.tsx

@@ -12,7 +12,7 @@ import '../styles/index.scss';
 const savePost = () => dispatch('core/editor').savePost();
 
 /**
- * @since 3.1.2
+ * @since 3.2.0
  */
 export default function DonationFormSelector({formOptions, isResolving, handleSelect}) {
     const [selectedForm, setSelectedForm] = useState(null);

src/DonationForms/Blocks/DonationFormBlock/resources/editor/components/ModalPreview.tsx

@@ -11,7 +11,7 @@ type ModalPreviewProps = {
 };
 
 /**
- * @since 3.1.2 updated BEM classnames and included button component.
+ * @since 3.2.0 updated BEM classnames and included button component.
  * @since 3.0.0
  */
 export default function ModalPreview({enableIframe, formId, openFormButton}: ModalPreviewProps) {

src/DonationForms/Controllers/DonateController.php

@@ -20,7 +20,7 @@ class DonateController
     /**
      * First we create a donation and/or subscription, then move on to the gateway processing
      *
-     * @since 3.1.2 Pass the form ID to match updated signature for getOrCreateDonor().
+     * @since 3.2.0 Pass the form ID to match updated signature for getOrCreateDonor().
      * @since 3.0.0
      *
      * @return void
@@ -79,7 +79,7 @@ public function donate(DonateControllerData $formData, PaymentGateway $gateway)
     }
 
     /**
-     * @since 3.1.2 Added $formId to the signature for passing to do_action hooks. Added honorific and use GetOrCreateDonor action
+     * @since 3.2.0 Added $formId to the signature for passing to do_action hooks. Added honorific and use GetOrCreateDonor action
      * @since 3.0.0
      *
      * @throws Exception
@@ -104,7 +104,7 @@ private function getOrCreateDonor(
 
          if ($getOrCreateDonorAction->donorCreated) {
             /**
-             * @since 3.1.2 Add a new do_action hook to differentiate when a v3 form creates a new donor.
+             * @since 3.2.0 Add a new do_action hook to differentiate when a v3 form creates a new donor.
              * @param Donor $donor
              * @param int $formId
              */

src/DonationForms/DataTransferObjects/DonateControllerData.php

@@ -126,7 +126,7 @@ class DonateControllerData
     public $comment;
 
     /**
-     * @unreleased added honorific property
+     * @since 3.2.0 added honorific property
      * @since 3.0.0
      */
     public function toDonation(int $donorId): Donation

src/DonationForms/Migrations/CleanMultipleSlashesOnDB.php

@@ -7,12 +7,12 @@
 use Give\Framework\Migrations\Contracts\Migration;
 
 /**
- * @since 3.1.2
+ * @since 3.2.0
  */
 class CleanMultipleSlashesOnDB extends Migration
 {
     /**
-     * @since 3.1.2
+     * @since 3.2.0
      */
     public function run()
     {
@@ -65,7 +65,7 @@ public static function timestamp()
     }
 
     /**
-     * @since 3.1.2
+     * @since 3.2.0
      */
     public function cleanMultipleSlashes($var)
     {

src/DonationForms/Properties/FormSettings.php

@@ -8,7 +8,7 @@
 use Give\Framework\Support\Contracts\Jsonable;
 
 /**
- * @since 3.1.2 Remove addSlashesRecursive method
+ * @since 3.2.0 Remove addSlashesRecursive method
  * @since      3.0.0
  */
 class FormSettings implements Arrayable, Jsonable
@@ -66,7 +66,7 @@ class FormSettings implements Arrayable, Jsonable
      */
     public $goalAmount;
     /**
-     * @since 3.1.2 Added registrationNotification property.
+     * @since 3.2.0 Added registrationNotification property.
      * @var string
      */
     public $registrationNotification;
@@ -179,7 +179,7 @@ class FormSettings implements Arrayable, Jsonable
     public $pdfSettings;
 
     /**
-     * @since 3.1.2 Added registrationNotification
+     * @since 3.2.0 Added registrationNotification
      * @since 3.0.0
      */
     public static function fromArray(array $array): self
@@ -275,7 +275,7 @@ public function toArray(): array
     }
 
     /**
-     * @since 3.1.2 Remove call to addSlashesRecursive method for emailTemplateOptions in favor of SanitizeDonationFormPreviewRequest class
+     * @since 3.2.0 Remove call to addSlashesRecursive method for emailTemplateOptions in favor of SanitizeDonationFormPreviewRequest class
      * @since 3.0.0
      */
     public function toJson($options = 0): string

src/DonationForms/Shortcodes/GiveFormShortcode.php

@@ -13,7 +13,7 @@ class GiveFormShortcode
     public static $instance = 0;
 
     /**
-     * @since 3.1.2 include v3 block attributes for shortcode.
+     * @since 3.2.0 include v3 block attributes for shortcode.
      * @since 3.1.1 use static instance ID to simulate blockId attribute
      * @since 3.0.0
      */

src/DonationForms/V2/DonationFormsAdminPage.php

@@ -125,7 +125,7 @@ public function loadScripts()
 
     /**
      * Load migration onboarding scripts
-     * @unreleased
+     * @since 3.2.0
      *
      * @return void
      */

src/DonationForms/V2/Endpoints/ListDonationForms.php

@@ -149,7 +149,7 @@ public function handleRequest(WP_REST_Request $request): WP_REST_Response
     }
 
     /**
-     * @unreleased added distinct() to the query
+     * @since 3.2.0 added distinct() to the query
      * @since 2.24.0 Refactor to query through the ModelQueryBuilder
      *
      * @return array

src/Donations/DataTransferObjects/DonationQueryData.php

@@ -15,7 +15,7 @@
 /**
  * Class DonationData
  *
- * @unreleased added honorific property
+ * @since 3.2.0 added honorific property
  * @since 2.23.0 remove parentId property
  * @since 2.19.6
  */
@@ -129,7 +129,7 @@ final class DonationQueryData
     /**
      * Convert data from object to Donation
      *
-     * @unreleased add fallback for donation mode
+     * @since 3.2.0 add fallback for donation mode
      * @since 2.23.0 remove parentId property
      * @since 2.22.0 add support for company field
      * @since 2.20.0 update for new amount property, fee amount recovered, and exchange rate

src/Donations/Endpoints/ListDonations.php

@@ -209,7 +209,7 @@ public function getTotalDonationsCount(): int
     }
 
     /**
-     * @unreleased Updated query to account for possible null and empty values for _give_payment_mode meta
+     * @since 3.2.0 Updated query to account for possible null and empty values for _give_payment_mode meta
      * @since 2.24.0 Remove joins as it uses ModelQueryBuilder and change clauses to use attach_meta
      * @since      2.21.0
      *

src/Donations/Repositories/DonationRepository.php

@@ -316,7 +316,7 @@ public function delete(Donation $donation): bool
     }
 
     /**
-     * @unreleased added meta for honorific property
+     * @since 3.2.0 added meta for honorific property
      * @since 2.20.0 update amount to use new type, and add currency and exchange rate
      * @since 2.19.6
      */

src/Donations/ValueObjects/DonationMetaKeys.php

@@ -6,7 +6,7 @@
 use Give\Framework\Support\ValueObjects\EnumInteractsWithQueryBuilder;
 
 /**
- * @unreleased added HONORIFIC
+ * @since 3.2.0 added HONORIFIC
  * @since 2.20.0 add fee amount recovered and exchange rate
  * @since 2.19.6
  *

src/Donors/Actions/CreateUserFromDonor.php

@@ -6,7 +6,7 @@
 use Give\Donors\Models\Donor;
 
 /**
- * @since 3.1.2
+ * @since 3.2.0
  */
 class CreateUserFromDonor
 {

src/Donors/Actions/SendDonorUserRegistrationNotification.php

@@ -6,7 +6,7 @@
 use Give_Donor_Register_Email;
 
 /**
- * @since 3.1.2
+ * @since 3.2.0
  */
 class SendDonorUserRegistrationNotification
 {