Merge branch 'develop' into feature/convertkit-form-migration-GIVE-455

impress-org · Apr 23, 2024 · 2eb9de8 · 2eb9de8
2 parents a3d98d5 + abc1aa7
commit 2eb9de8
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 48 deletions.
diff --git a/give.php b/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.8.0
+ * Version: 3.9.0
  * Requires at least: 6.3
  * 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.8.0');
+            define('GIVE_VERSION', '3.9.0');
         }
 
         // Plugin Root File.

diff --git a/includes/admin/payments/view-payment-details.php b/includes/admin/payments/view-payment-details.php
@@ -31,7 +31,7 @@
 /**
  * View donation details page
  *
- * @unreleased Add donor phone number to the view
+ * @since 3.9.0 Add donor phone number to the view
  * @since 1.0
  * @return void
  */

diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Tags: donation, donate, recurring donations, fundraising, crowdfunding
 Requires at least: 6.3
 Tested up to: 6.5
 Requires PHP: 7.2
-Stable tag: 3.8.0
+Stable tag: 3.9.0
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -262,6 +262,10 @@ 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.9.0: April 24th, 2024 =
+* New: Added a donor phone number block to the form builder to collect donor phone numbers on donation forms
+* Enhancement: Updated form field inputs to have a single border color when selected 
+
 = 3.8.0: April 17th, 2024 =
 * New: Added pre-requisite form builder compatibility for upcoming double the donation add-on release
 * Enhancement: Updated the form builder tour to highlight where to find the guided tour again 

diff --git a/src/DonationForms/Actions/ConvertDonationFormBlocksToFieldsApi.php b/src/DonationForms/Actions/ConvertDonationFormBlocksToFieldsApi.php
@@ -129,7 +129,7 @@ protected function convertInnerBlockToNode(BlockModel $block, int $blockIndex)
     }
 
     /**
-     * @unreleased Add "givewp/donor-phone" block
+     * @since 3.9.0 Add "givewp/donor-phone" block
      * @since 3.0.0
      *
      * @return Node|null

diff --git a/src/DonationForms/Actions/GetOrCreateDonor.php b/src/DonationForms/Actions/GetOrCreateDonor.php
@@ -13,7 +13,7 @@ class GetOrCreateDonor
     public $donorCreated = false;
 
     /**
-     * @unreleased Add support to "phone" property
+     * @since 3.9.0 Add support to "phone" property
      * @since 3.2.0
      *
      * @throws Exception

diff --git a/src/DonationForms/Controllers/DonateController.php b/src/DonationForms/Controllers/DonateController.php
@@ -159,7 +159,7 @@ public function donate(DonateControllerData $formData, PaymentGateway $gateway)
     }
 
     /**
-     * @unreleased Add support for "phone" property
+     * @since 3.9.0 Add support for "phone" property
      * @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
      *

diff --git a/src/DonationForms/DataTransferObjects/DonateControllerData.php b/src/DonationForms/DataTransferObjects/DonateControllerData.php
@@ -130,7 +130,7 @@ class DonateControllerData
     public $comment;
 
     /**
-     * @unreleased Added phone property
+     * @since 3.9.0 Added phone property
      * @since 3.2.0 added honorific property
      * @since 3.0.0
      */
@@ -159,7 +159,7 @@ public function toDonation(int $donorId): Donation
     }
 
     /**
-     * @unreleased Added phone property
+     * @since 3.9.0 Added phone property
      * @since 3.0.0
      */
     public function toInitialSubscriptionDonation(int $donorId, int $subscriptionId): Donation

diff --git a/src/DonationForms/Properties/FormSettings.php b/src/DonationForms/Properties/FormSettings.php
@@ -237,7 +237,7 @@ class FormSettings implements Arrayable, Jsonable
     public $formExcerpt;
 
     /**
-     * @unreleased
+     * @since 3.9.0
      * @var array
      */
     public $currencySwitcherSettings;

diff --git a/src/DonationForms/Rules/PhoneIntlInputRule.php b/src/DonationForms/Rules/PhoneIntlInputRule.php
@@ -7,20 +7,20 @@
 use Give\Vendors\StellarWP\Validation\Contracts\ValidationRule;
 
 /**
- * @unreleased
+ * @since 3.9.0
  */
 class PhoneIntlInputRule implements ValidationRule
 {
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function id(): string
     {
         return 'intl-input';
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function fromString(string $options = null): ValidationRule
     {
@@ -37,7 +37,7 @@ public static function fromString(string $options = null): ValidationRule
      *
      * @see https://intl-tel-input.com/examples/validation.html
      *
-     * @unreleased
+     * @since 3.9.0
      */
     public function __invoke($value, Closure $fail, string $key, array $values)
     {

diff --git a/src/DonationForms/resources/registrars/templates/fields/Phone.tsx b/src/DonationForms/resources/registrars/templates/fields/Phone.tsx
@@ -5,7 +5,7 @@ import 'intl-tel-input/build/css/intlTelInput.css';
 import InputMask from 'react-input-mask';
 
 /**
- * @unreleased
+ * @since 3.9.0
  */
 export default function Phone({
     Label,

diff --git a/src/Donations/DataTransferObjects/DonationQueryData.php b/src/Donations/DataTransferObjects/DonationQueryData.php
@@ -133,7 +133,7 @@ final class DonationQueryData
     /**
      * Convert data from object to Donation
      *
-     * @unreleased Add support for "phone" property
+     * @since 3.9.0 Add support for "phone" property
      * @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

diff --git a/src/Donations/Models/Donation.php b/src/Donations/Models/Donation.php
@@ -24,7 +24,7 @@
 /**
  * Class Donation
  *
- * @unreleased Add phone property
+ * @since 3.9.0 Add phone property
  * @since 2.23.0 add type property; remove parentId property
  * @since 2.20.0 update amount type, fee recovered, and exchange rate
  * @since 2.19.6

diff --git a/src/Donations/Repositories/DonationRepository.php b/src/Donations/Repositories/DonationRepository.php
@@ -316,7 +316,7 @@ public function delete(Donation $donation): bool
     }
 
     /**
-     * @unreleased Added meta for phone property
+     * @since 3.9.0 Added meta for phone 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

diff --git a/src/Donations/ValueObjects/DonationMetaKeys.php b/src/Donations/ValueObjects/DonationMetaKeys.php
@@ -6,7 +6,7 @@
 use Give\Framework\Support\ValueObjects\EnumInteractsWithQueryBuilder;
 
 /**
- * @unreleased added PHONE
+ * @since 3.9.0 added PHONE
  * @since 3.2.0 added HONORIFIC
  * @since 2.20.0 add fee amount recovered and exchange rate
  * @since 2.19.6

diff --git a/src/FormBuilder/ViewModels/FormBuilderViewModel.php b/src/FormBuilder/ViewModels/FormBuilderViewModel.php
@@ -21,7 +21,7 @@
 class FormBuilderViewModel
 {
     /**
-     * @unreleased Add support to intlTelInputSettings key in the returned array
+     * @since 3.9.0 Add support to intlTelInputSettings key in the returned array
      * @since      3.7.0 Add support to isExcerptEnabled key in the returned array
      * @since 3.2.0 Add nameTitlePrefixes key to the returned array
      * @since 3.0.0

diff --git a/src/FormBuilder/resources/js/form-builder/src/blocks/fields/index.ts b/src/FormBuilder/resources/js/form-builder/src/blocks/fields/index.ts
@@ -15,7 +15,7 @@ import anonymous from './anonymous';
 import phone from './phone';
 
 /**
- * @unreleased Add phone block
+ * @since 3.9.0 Add phone block
  * @note Blocks in the appender are listed in the order that the blocks are registered.
  */
 const FieldBlocks: FieldBlock[] = [

diff --git a/src/FormBuilder/resources/js/form-builder/src/blocks/fields/phone/Edit.tsx b/src/FormBuilder/resources/js/form-builder/src/blocks/fields/phone/Edit.tsx
@@ -9,7 +9,7 @@ import {getFormBuilderWindowData} from '@givewp/form-builder/common/getWindowDat
 import {useEffect} from 'react';
 
 /**
- * @unreleased
+ * @since 3.9.0
  */
 export default function Edit({attributes: {label, required}, setAttributes}: BlockEditProps<any>) {
     const {intlTelInputSettings} = getFormBuilderWindowData();

diff --git a/src/FormBuilder/resources/js/form-builder/src/blocks/fields/phone/index.tsx b/src/FormBuilder/resources/js/form-builder/src/blocks/fields/phone/index.tsx
@@ -3,7 +3,7 @@ import settings from './settings';
 import {FieldBlock} from '@givewp/form-builder/types';
 
 /**
- * @unreleased
+ * @since 3.9.0
  */
 const phone: FieldBlock = {
     name: 'givewp/donor-phone',

diff --git a/src/FormBuilder/resources/js/form-builder/src/blocks/fields/phone/settings.tsx b/src/FormBuilder/resources/js/form-builder/src/blocks/fields/phone/settings.tsx
@@ -6,7 +6,7 @@ import {Icon} from '@wordpress/icons';
 import {Path, SVG} from '@wordpress/components';
 
 /**
- * @unreleased
+ * @since 3.9.0
  */
 const settings: FieldBlock['settings'] = {
     ...defaultSettings,

diff --git a/src/FormBuilder/resources/js/form-builder/src/common/getWindowData.ts b/src/FormBuilder/resources/js/form-builder/src/common/getWindowData.ts
@@ -19,7 +19,7 @@ type GoalTypeOption = {
 };
 
 /**
- * @unreleased Added intlTelInputSettings
+ * @since 3.9.0 Added intlTelInputSettings
  * @since 3.7.0 Added isExcerptEnabled
  * @since 3.0.0
  */

diff --git a/src/Framework/FieldsAPI/Phone.php b/src/Framework/FieldsAPI/Phone.php
@@ -43,7 +43,7 @@ public function phoneFormat(string $phoneFormat): self
      *
      * @see https://github.com/jackocnr/intl-tel-input
      *
-     * @unreleased
+     * @since 3.9.0
      */
     public function setIntlTelInputSettings(array $intlTelInputSettings): self
     {

diff --git a/src/Framework/Receipts/Actions/GenerateConfirmationPageReceipt.php b/src/Framework/Receipts/Actions/GenerateConfirmationPageReceipt.php
@@ -165,7 +165,7 @@ private function fillDonationDetails(DonationReceipt $receipt)
     }
 
     /**
-     * @unreleased Add phone number to donor details
+     * @since 3.9.0 Add phone number to donor details
      * @since 3.0.0
      *
      * @return void

diff --git a/src/Helpers/IntlTelInput.php b/src/Helpers/IntlTelInput.php
@@ -3,38 +3,38 @@
 namespace Give\Helpers;
 
 /**
- * @unreleased
+ * @since 3.9.0
  *
  * @see https://github.com/jackocnr/intl-tel-input
  */
 class IntlTelInput
 {
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getCssUrl(): string
     {
         return 'https://cdn.jsdelivr.net/npm/[email protected]/build/css/intlTelInput.css';
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getScriptUrl(): string
     {
         return 'https://cdn.jsdelivr.net/npm/[email protected]/build/js/intlTelInput.min.js';
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getUtilsScriptUrl(): string
     {
         return 'https://cdn.jsdelivr.net/npm/[email protected]/build/js/utils.js';
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getI18n(): array
     {
@@ -62,7 +62,7 @@ public static function getI18n(): array
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getErrorMap(): array
     {
@@ -76,39 +76,39 @@ public static function getErrorMap(): array
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getInitialCountry(): string
     {
         return strtolower(give_get_country());
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getShowSelectedDialCode(): bool
     {
         return true;
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getStrictMode(): bool
     {
         return true;
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getUseFullscreenPopup(): bool
     {
         return false;
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getSettings(): array
     {
@@ -126,7 +126,7 @@ public static function getSettings(): array
     }
 
     /**
-     * @unreleased
+     * @since 3.9.0
      */
     public static function getHtmlInput(string $value, string $id, string $class = '', string $name = ''): string
     {

diff --git a/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php b/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
@@ -49,7 +49,7 @@ public function getLegacyFormFieldMarkup(
     /**
      * First we create a payment, then move on to the gateway processing
      *
-     * @unreleased Add support to "phone" property
+     * @since 3.9.0 Add support to "phone" property
      * @since 3.2.0  Capture exceptions when get gateway data.
      * @since 3.0.0 Catch and handle errors from the gateway here
      * @since 2.30.0  Add success, cancel and failed URLs to gateway data.  This will be used in both v2 and v3 forms so gateways can just refer to the gateway data.
@@ -326,7 +326,7 @@ private function setSession($donationId)
     }
 
     /**
-     * @unreleased Add support to "phone" property
+     * @since 3.9.0 Add support to "phone" property
      * @since 3.4.0 add $formId and do_action
      * @since 3.2.0 add honorific and use GetOrCreateDonor action
      * @since 2.21.0

diff --git a/tests/Unit/DataTransferObjects/DonateControllerDataTest.php b/tests/Unit/DataTransferObjects/DonateControllerDataTest.php
@@ -24,7 +24,7 @@ class DonateControllerDataTest extends TestCase
 {
 
     /**
-     * @unreleased Add phone support
+     * @since 3.9.0 Add phone support
      * @since 3.2.0 added honorific property
      * @since 3.0.0
      */