Skip to content

Commit

Permalink
Merge branch 'release/3.12.1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
pauloiankoski committed Jun 5, 2024
2 parents c1b7ae5 + 194dd53 commit 09d06dd
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 19 deletions.
4 changes: 2 additions & 2 deletions give.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.0
* Version: 3.12.1
* Requires at least: 6.3
* Requires PHP: 7.2
* Text Domain: give
Expand Down Expand Up @@ -404,7 +404,7 @@ private function setup_constants()
{
// Plugin version.
if (!defined('GIVE_VERSION')) {
define('GIVE_VERSION', '3.12.0');
define('GIVE_VERSION', '3.12.1');
}

// Plugin Root File.
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/tools/export/export-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ function give_do_ajax_export() {
* Note: This function is for internal purposes only.
* Use filter "give_export_donors_get_default_columns" instead.
*
* @unreleased add donor_phone_number column.
* @since 3.12.1 add donor_phone_number column.
* @since 2.2.6
*
* @return array
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public function csv_cols() {
/**
* CSV file columns.
*
* @unreleased add phone column.
* @since 3.12.1 add phone column.
* @since 2.1
*
* @param array $columns
Expand Down Expand Up @@ -318,7 +318,7 @@ public function get_donation_argument( $args = array() ) {
*
* @access public
*
* @unreleased add donor phone.
* @since 3.12.1 add donor phone.
* @since 2.1
*
* @global object $wpdb Used to query the database using the WordPress database API.
Expand Down Expand Up @@ -683,7 +683,7 @@ public function print_csv_rows() {
* Escapes CSV cell data to protect against CSV injection.
* @link https://owasp.org/www-community/attacks/CSV_Injection
*
* @unreleased sanitize + prefix
* @since 3.12.1 sanitize + prefix
* @since 2.25.2
*
* @param mixed|string $cellData
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ function give_export_donation_form_search_args( $args ) {
/**
* Add Donation standard fields in export donation page
*
* @unreleased add Donor Phone Number to donor fields.
* @since 3.12.1 add Donor Phone Number to donor fields.
* @since 2.1
*/
function give_export_donation_standard_fields() {
Expand Down
8 changes: 7 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.0
Stable tag: 3.12.1
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -262,6 +262,12 @@ 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.12.1: June 5th, 2024 =
* Fix: Resolved an issue where the Donor Phone field was not included in the donor export
* Fix: Resolved an issue where the Billing Address field was not saved in Stripe
* Security: Added additional escaping to Stripe onboarding
* Dev: Added a new filter `givewp_log_source_view` to allow customization of the log source column

= 3.12.0: May 15th, 2024 =
* New: Updated the donation amount block with options for donation amount level description in the visual form builder
* New: Updated form goal settings with options for start and end dates in the visual form builder
Expand Down
2 changes: 1 addition & 1 deletion src/API/Endpoints/Logs/GetLogs.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public function getSchema()
}

/**
* @unreleased Add 'givewp_log_source_view' filter
* @since 3.12.1 Add 'givewp_log_source_view' filter
*
* @param WP_REST_Request $request
*
Expand Down
2 changes: 1 addition & 1 deletion src/DonationForms/Repositories/DonationFormRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ private function validateProperties(DonationForm $donationForm)
}

/**
* @unreleased Prevent returning forms without the "formBuilderSettings" and "formBuilderFields" meta keys
* @since 3.12.1 Prevent returning forms without the "formBuilderSettings" and "formBuilderFields" meta keys
* @since 3.0.0
*
* @return ModelQueryBuilder<DonationForm>
Expand Down
4 changes: 2 additions & 2 deletions src/Exports/DonorsExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function set_properties($request)
}

/**
* @unreleased Include donor phone.
* @since 3.12.1 Include donor phone.
* @since 2.29.0 Include donor created date
* @since 2.21.2
* @since 3.3.0 Filter donors by form ID
Expand Down Expand Up @@ -157,7 +157,7 @@ protected function filterExportData(array $exportData): array
}

/**
* @unreleased Include donor_phone_number col.
* @since 3.12.1 Include donor_phone_number col.
* @since 2.29.0 Include donor created col
* @since 2.21.2
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function formSettings(int $formId): array
}

/**
* @unreleased updated to send billing address details to Stripe
* @since 3.12.1 updated to send billing address details to Stripe
* @since 3.0.0
* @inheritDoc
* @throws ApiErrorException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ interface StripeGateway extends Gateway {
}

/**
* @unreleased updated afterCreatePayment response type to include billing details address
* @since 3.12.1 updated afterCreatePayment response type to include billing details address
* @since 3.0.0
*/
const stripePaymentElementGateway: StripeGateway = {
Expand Down Expand Up @@ -161,7 +161,7 @@ const stripePaymentElementGateway: StripeGateway = {
line2?: string;
postal_code?: string;
state?: string;
}
};
};
};
}): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function getRedirectUrl( $sessionId, $formId )
}

/**
* @unreleased add esc_attr to $session_id
* @since 3.12.1 add esc_attr to $session_id
* @since 2.5.5
* @since 2.19.0 Migrated from the legacy Give_Stripe_Checkout::redirect_to_checkout implementation of the Stripe Checkout Gateway.
* @return void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function testFormSettingsShouldReturnData()
}

/**
* @unreleased updated to send billing address details to Stripe
* @since 3.12.1 updated to send billing address details to Stripe
* @since 3.0.0
*
* @throws \Give\Framework\Exceptions\Primitives\Exception
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ public function testShouldGetTotalRevenueFromSubscriptions(): void
}

/**
* @unreleased
* @since 3.12.1
*
* @throws Exception
*/
Expand All @@ -393,7 +393,7 @@ public function testShouldNotReturnDonationFormWithoutSettingsMetaKey()
}

/**
* @unreleased
* @since 3.12.1
*
* @throws Exception
*/
Expand Down

0 comments on commit 09d06dd

Please sign in to comment.