Skip to content

Commit

Permalink
Merge branch 'release/T25.imp' into fix/TEC-5322-wp-67-packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Camwyn authored Jan 7, 2025
2 parents 00e6f16 + 29c88ef commit 4101a0f
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

### [5.18.0.1] 2025-01-07

* Fix - Resolves problem related to duplication of attendees while using Stripe webhooks with Tickets Commerce. [ET-2279]

### [5.18.0] 2024-12-17

* Feature - Added option to detach assigned seating tickets from layout and revert them to regular tickets. [SL-214]
Expand Down
2 changes: 1 addition & 1 deletion event-tickets.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Event Tickets
* Plugin URI: https://evnt.is/1acb
* Description: Event Tickets allows you to sell basic tickets and collect RSVPs from any post, page, or event.
* Version: 5.18.0
* Version: 5.18.0.1
* Requires at least: 6.5
* Requires PHP: 7.4
* Author: The Events Calendar
Expand Down
6 changes: 5 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Contributors: theeventscalendar, brianjessee, camwynsp, redscar, tribalmike, rafsuntaskin, aguseo, bordoni, borkweb, jentheo, leahkoerper, lucatume, neillmcshea, vicskf, zbtirrell
Tags: tickets, event registration, RSVP, ticket sales, attendee management
Stable tag: 5.18.0
Stable tag: 5.18.0.1
Requires at least: 6.5
Tested up to: 6.7.1
Requires PHP: 7.4
Expand Down Expand Up @@ -199,6 +199,10 @@ Check out our extensive [knowledgebase](https://evnt.is/18wm) for articles on us

== Changelog ==

= [5.18.0.1] 2025-01-07 =

* Fix - Resolves problem related to duplication of attendees while using Stripe webhooks with Tickets Commerce. [ET-2279]

= [5.18.0] 2024-12-17 =

* Feature - Added option to detach assigned seating tickets from layout and revert them to regular tickets. [SL-214]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ protected static function get_payment_intent_data( array $event ): array {
* Checks if the payment intent contained in the event received has already been processed.
*
* @since 5.3.0
* @since 5.16.0 Remove deprecation notice.
* @since 5.18.0 Only check matching payment intent ids if they are not pending or action required.
* @since 5.16.0 Remove deprecation notice.
* @since 5.18.0 Only check matching payment intent ids if they are not pending or action required.
* @since 5.18.0.1 Removed the check for the payment intent status for pending or action required.
*
* @param array $payment_intent_received The payment intent data received
* @param array[] $payment_intents_stored The payment intent data stored from each update, keyed by status.
Expand All @@ -135,11 +136,6 @@ public static function should_payment_intent_be_updated( $payment_intent_receive
}

foreach ( $payment_intents_stored as $status => $intents ) {
// Skip if the status is pending or action required.
if ( in_array( $status, [ Pending::SLUG, Action_Required::SLUG ], true ) ) {
continue;
}

foreach( $intents as $intent ) {
// This payment intent has already been processed and updated.
if ( $payment_intent_received['id'] === $intent['id'] ) {
Expand Down
2 changes: 1 addition & 1 deletion src/Tribe/Main.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Tribe__Tickets__Main {
/**
* Current version of this plugin.
*/
const VERSION = '5.18.0';
const VERSION = '5.18.0.1';

/**
* Used to store the version history.
Expand Down
2 changes: 1 addition & 1 deletion tests/_data/ft_smoketest.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1157,4 +1157,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2024-12-20 15:44:21
-- Dump completed on 2025-01-06 12:37:04

0 comments on commit 4101a0f

Please sign in to comment.