Skip to content

Commit

Permalink
Lastest cafe changes 5.0.20.p
Browse files Browse the repository at this point in the history
  • Loading branch information
Pebblo committed Jun 17, 2024
1 parent 6bdc59f commit a0490d3
Show file tree
Hide file tree
Showing 425 changed files with 42,637 additions and 3,284 deletions.
60 changes: 60 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,52 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Releases

### [5.0.20]

#### Added
- [Integrate Easy Digital Downloads into Core & Add-ons (#487)](https://github.com/eventespresso/cafe/pull/487)
- [Reimplement Registration Form Session Countdown Timer (#1283)](https://github.com/eventespresso/cafe/pull/1283)
- [Add Extra HTML5 Input Types to Form Inputs (#1279)](https://github.com/eventespresso/cafe/pull/1279)
- [NEW Add-ons (#487)](https://github.com/eventespresso/cafe/pull/487)
- [Reimplement Registration Form Session Countdown Timer (#1283)](https://github.com/eventespresso/cafe/pull/1283)
- [Add Extra HTML5 Input Types to Form Inputs (#1279)](https://github.com/eventespresso/cafe/pull/1279)

#### Fixed
- [Fix Event Editor Width (#1194)](https://github.com/eventespresso/cafe/pull/1194)
- [Add Events List Template Setting to Filter Out Events with Expired Tickets (#1179)](https://github.com/eventespresso/cafe/pull/1179)
- [Allow Null Value for Order Props in EE_Events_Archive_Config (#1201)](https://github.com/eventespresso/cafe/pull/1201)
- [Fix Promotions Admin Pagination (#1196)](https://github.com/eventespresso/cafe/pull/1196)
- [Add User Proofing when Creating New Default Ticket Price (#1202)](https://github.com/eventespresso/cafe/pull/1202)
- [Fix Model Extension Activation Error (#1209)](https://github.com/eventespresso/cafe/pull/1209)
- [Fix Message Shortcode Parser Types (#1207)](https://github.com/eventespresso/cafe/pull/1207)
- [Fix Default Registration Status Options in EDTR + UI Fixes (#1227)](https://github.com/eventespresso/cafe/pull/1227)
- [Exit Editor Early If Invalid Event Identified (#1247)](https://github.com/eventespresso/cafe/pull/1247)
- [Type Cast Post Content for Shortcodes (#1249)](https://github.com/eventespresso/cafe/pull/1249)
- [Cant Reset an Empty Array (#1253)](https://github.com/eventespresso/cafe/pull/1253)
- [Fix Registration Form Admin Page UI Issues (#1248)](https://github.com/eventespresso/cafe/pull/1248)
- [Fix Reg Admin Session Errors (#1245)](https://github.com/eventespresso/cafe/pull/1245)
- [Fix Missing Price Type Error (#1258)](https://github.com/eventespresso/cafe/pull/1258)
- [Fix REM Filter Dates List HTML Error (#1259)](https://github.com/eventespresso/cafe/pull/1259)
- [Fix config having empty value when using manual offsets (#1273)](https://github.com/eventespresso/cafe/pull/1273)
- [Verify Session Exists in EspressoCancelled Shortcode (#1269)](https://github.com/eventespresso/cafe/pull/1269)
- [Fix Line Item Type Error (#1296)](https://github.com/eventespresso/cafe/pull/1296)

#### Changed
- [Build Machine 5.0.19.p changes (#1170)](https://github.com/eventespresso/cafe/pull/1170)
- [Extract package @eventespresso/types (Barista #1298) (#1221)](https://github.com/eventespresso/cafe/pull/1221)
- [Create package @eventespresso/config (Barista#1302) (#1213)](https://github.com/eventespresso/cafe/pull/1213)
- [Add Show All Option to Pagination Component (Barista#1280) (#1218)](https://github.com/eventespresso/cafe/pull/1218)
- [Update README.md for GraphQL API README.md (#1212)](https://github.com/eventespresso/cafe/pull/1212)
- [Extract Reg Status Constants into New Class - [Fix Feature Flags Admin (Barista#1308) (#1257)](https://github.com/eventespresso/cafe/pull/1257)
- [Filter Value of Verify SSL Parameter for Remote Requests (#1286)](https://github.com/eventespresso/cafe/pull/1286)
- [PUE to EDD Tweaks (#1268)](https://github.com/eventespresso/cafe/pull/1268)
- MOD Add Hooks for Filtering Reg Status (#1193)](https://github.com/eventespresso/cafe/pull/1193)
- [Fix Feature Flags Admin (Barista#1308) (#1257)](https://github.com/eventespresso/cafe/pull/1257)
- [Add ItemCount to Datetime Registrations Link (Barista#1309) (#1260)](https://github.com/eventespresso/cafe/pull/1260)
- [Filter Value of Verify SSL Parameter for Remote Requests (#1286)](https://github.com/eventespresso/cafe/pull/1286)
- [PUE to EDD Tweaks (#1268)](https://github.com/eventespresso/cafe/pull/1268)
- MOD

### [5.0.19]

#### Fixed
Expand Down Expand Up @@ -47,6 +93,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [PPC. Update order status/error messages (#1162)](https://github.com/eventespresso/cafe/pull/1162)
- [Prevent fatal error from get_edit_post_link returning null (#1166)](https://github.com/eventespresso/cafe/pull/1166)
- [Remove Serialized Objects from Registration Report Requests (#1154)](https://github.com/eventespresso/cafe/pull/1154)
- [Build Machine 5.0.19.p changes (#1170)](https://github.com/eventespresso/cafe/pull/1170)
- [Extract package @eventespresso/types (Barista #1298) (#1221)](https://github.com/eventespresso/cafe/pull/1221)
- [Create package @eventespresso/config (Barista#1302) (#1213)](https://github.com/eventespresso/cafe/pull/1213)
- [Add Show All Option to Pagination Component (Barista#1280) (#1218)](https://github.com/eventespresso/cafe/pull/1218)
- [Update README.md for GraphQL API README.md (#1212)](https://github.com/eventespresso/cafe/pull/1212)
- [Extract Reg Status Constants into New Class - [Fix Feature Flags Admin (Barista#1308) (#1257)](https://github.com/eventespresso/cafe/pull/1257)
- [Add ItemCount to Datetime Registrations Link (Barista#1309) (#1260)](https://github.com/eventespresso/cafe/pull/1260)
- [Filter Value of Verify SSL Parameter for Remote Requests (#1286)](https://github.com/eventespresso/cafe/pull/1286)
- [PUE to EDD Tweaks (#1268)](https://github.com/eventespresso/cafe/pull/1268)
- MOD Add Hooks for Filtering Reg Status (#1193)](https://github.com/eventespresso/cafe/pull/1193)
- [Fix Feature Flags Admin (Barista#1308) (#1257)](https://github.com/eventespresso/cafe/pull/1257)
- [Add ItemCount to Datetime Registrations Link (Barista#1309) (#1260)](https://github.com/eventespresso/cafe/pull/1260)
- [Filter Value of Verify SSL Parameter for Remote Requests (#1286)](https://github.com/eventespresso/cafe/pull/1286)
- [PUE to EDD Tweaks (#1268)](https://github.com/eventespresso/cafe/pull/1268)
- MOD Plugins (#1136)](https://github.com/eventespresso/cafe/pull/1136)


Expand Down
14 changes: 14 additions & 0 deletions PaymentMethods/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,18 @@ public static function usePayPalCommerceNotice()
)
. '</p></div>';
}


/**
* @return bool
* @since $VID:$
*/
public static function verifySSL(): bool
{
static $verify_ssl = null;
if ($verify_ssl === null) {
$verify_ssl = (bool) apply_filters('FHEE__EventEspresso_PaymentMethods_Manager__verifySSL', true);
}
return (bool) $verify_ssl;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use EventEspresso\core\services\loaders\LoaderFactory;
use EventEspresso\core\services\request\DataType;
use EventEspresso\core\services\request\RequestInterface;
use EventEspresso\PaymentMethods\Manager;
use EventEspresso\PaymentMethods\PayPalCommerce\api\partners\TrackSellerOnboarding;
use EventEspresso\PaymentMethods\PayPalCommerce\api\PayPalApi;
use EventEspresso\PaymentMethods\PayPalCommerce\domain\Domain;
Expand Down Expand Up @@ -406,7 +407,7 @@ public static function requestPartnerAccessToken(EE_Payment_Method $paypal_pm):
],
];
if (defined('LOCAL_MIDDLEMAN_SERVER')) {
$post_args['sslverify'] = false;
$post_args['sslverify'] = Manager::verifySSL();
}
$post_url = EED_PayPalOnboard::getMiddlemanBaseUrl($paypal_pm) . 'get_token';
$response = EED_PayPalOnboard::sendRequest($paypal_pm, $post_url, $post_args);
Expand Down
25 changes: 15 additions & 10 deletions admin_pages/about/templates/credits.template.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,17 @@
'name' => 'Nazar Kolivoshka',
'desc' => esc_html__('Core Developer', 'event_espresso'),
],
'hossein-rafiei' => [
'email' => 'hossein@eventespresso.com',
'name' => 'Hossein Rafiei',
'alex' => [
'email' => 'alex@eventespresso.com',
'name' => 'Alexander Kucheryuk',
'desc' => esc_html__('Core Developer', 'event_espresso'),
],
],
esc_html__('Support Staff', 'event_espresso') => [
'tony-warwick' => [
'email' => '[email protected]',
'name' => 'Tony Warwick',
'desc' => esc_html__('Support', 'event_espresso'),
],
'lorenzo-caum' => [
'email' => '[email protected]',
'name' => 'Lorenzo Caum',
'desc' => esc_html__('Sales & Support', 'event_espresso'),
'desc' => esc_html__('Support Lead', 'event_espresso'),
],
'janice-gutierrez' => [
'email' => '[email protected]',
Expand All @@ -48,10 +43,20 @@
'name' => 'Chinny Love Verana',
'desc' => esc_html__('Sales & Support', 'event_espresso'),
],
'kimiko-catherine-sy' => [
'email' => '[email protected]',
'name' => 'Kimiko Catherine Sy',
'desc' => esc_html__('Sales & Support', 'event_espresso'),
],
'sam' => [
'email' => '[email protected]',
'name' => 'Sam',
'desc' => esc_html__('Sales & Support', 'event_espresso'),
'desc' => esc_html__('Support & QA', 'event_espresso'),
],
'rio-michael-miranda' => [
'email' => '[email protected]',
'name' => 'Rio Michael Miranda',
'desc' => esc_html__('Support & QA', 'event_espresso'),
],
],
];
Expand Down
3 changes: 2 additions & 1 deletion admin_pages/events/Events_Admin_List_Table.class.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php

use EventEspresso\core\domain\services\registration\RegStatus;
use EventEspresso\core\exceptions\InvalidDataTypeException;
use EventEspresso\core\exceptions\InvalidInterfaceException;

Expand Down Expand Up @@ -463,7 +464,7 @@ public function column_attendees(EE_Event $event): string
$attendees_query_args = [
'action' => 'default',
'event_id' => $event->ID(),
'_reg_status' => EEM_Registration::status_id_approved,
'_reg_status' => RegStatus::APPROVED,
];
$attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
$registered_attendees = EEM_Registration::instance()->get_event_registration_count($event->ID());
Expand Down
39 changes: 23 additions & 16 deletions admin_pages/events/Events_Admin_Page.core.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use EventEspresso\core\domain\entities\custom_post_types\EspressoPostType;
use EventEspresso\core\domain\services\admin\events\default_settings\AdvancedEditorAdminFormSection;
use EventEspresso\core\domain\services\admin\events\editor\ui\TicketSelectorShortcodeButton;
use EventEspresso\core\domain\services\registration\RegStatus;
use EventEspresso\core\exceptions\InvalidDataTypeException;
use EventEspresso\core\exceptions\InvalidInterfaceException;
use EventEspresso\core\services\orm\tree_traversal\NodeGroupDao;
Expand Down Expand Up @@ -1075,7 +1076,7 @@ protected function _insert_update_cpt_item($post_id, $post)
$success = $this->_event_model()->update_by_ID($event_values, $post_id);
// get event_object for other metaboxes...
// though it would seem to make sense to just use $this->_event_model()->get_one_by_ID( $post_id )..
// i have to setup where conditions to override the filters in the model
// i have to set up where conditions to override the filters in the model
// that filter out auto-draft and inherit statuses so we GET the inherit id!
/** @var EE_Event $event */
$event = $this->_event_model()->get_one(
Expand All @@ -1093,6 +1094,10 @@ protected function _insert_update_cpt_item($post_id, $post)
]
);

if (! $event instanceof EE_Event) {
return;
}

// the following are default callbacks for event attachment updates
// that can be overridden by caffeinated functionality and/or addons.
$event_update_callbacks = [];
Expand Down Expand Up @@ -1362,7 +1367,7 @@ protected function _default_tickets_update(EE_Event $event, array $data): array
[
'STS_ID' => [
'NOT IN',
[EEM_Registration::status_id_incomplete],
[RegStatus::INCOMPLETE],
],
],
]
Expand Down Expand Up @@ -1553,19 +1558,19 @@ private function _generate_publish_box_extra_content()
$approved_query_args = [
[
'REG_deleted' => 0,
'STS_ID' => EEM_Registration::status_id_approved,
'STS_ID' => RegStatus::APPROVED,
],
];
$not_approved_query_args = [
[
'REG_deleted' => 0,
'STS_ID' => EEM_Registration::status_id_not_approved,
'STS_ID' => RegStatus::AWAITING_REVIEW,
],
];
$pending_payment_query_args = [
[
'REG_deleted' => 0,
'STS_ID' => EEM_Registration::status_id_pending_payment,
'STS_ID' => RegStatus::PENDING_PAYMENT,
],
];
// publish box
Expand All @@ -1574,7 +1579,7 @@ private function _generate_publish_box_extra_content()
[
'action' => 'default',
'event_id' => $this->_cpt_model_obj->ID(),
'_reg_status' => EEM_Registration::status_id_approved,
'_reg_status' => RegStatus::APPROVED,
'use_filters' => true,
],
REG_ADMIN_URL
Expand All @@ -1583,7 +1588,7 @@ private function _generate_publish_box_extra_content()
[
'action' => 'default',
'event_id' => $this->_cpt_model_obj->ID(),
'_reg_status' => EEM_Registration::status_id_not_approved,
'_reg_status' => RegStatus::AWAITING_REVIEW,
'use_filters' => true,
],
REG_ADMIN_URL
Expand All @@ -1592,7 +1597,7 @@ private function _generate_publish_box_extra_content()
[
'action' => 'default',
'event_id' => $this->_cpt_model_obj->ID(),
'_reg_status' => EEM_Registration::status_id_pending_payment,
'_reg_status' => RegStatus::PENDING_PAYMENT,
'use_filters' => true,
],
REG_ADMIN_URL
Expand Down Expand Up @@ -1855,9 +1860,9 @@ public function registration_options_meta_box()
];
$default_reg_status_values = EEM_Registration::reg_status_array(
[
EEM_Registration::status_id_cancelled,
EEM_Registration::status_id_declined,
EEM_Registration::status_id_incomplete,
RegStatus::CANCELLED,
RegStatus::DECLINED,
RegStatus::INCOMPLETE,
],
true
);
Expand Down Expand Up @@ -2501,10 +2506,10 @@ protected function _default_event_settings_form(): EE_Form_Section_Proper
$registration_stati_for_selection = EEM_Registration::reg_status_array(
// exclude
[
EEM_Registration::status_id_cancelled,
EEM_Registration::status_id_declined,
EEM_Registration::status_id_incomplete,
EEM_Registration::status_id_wait_list,
RegStatus::CANCELLED,
RegStatus::DECLINED,
RegStatus::INCOMPLETE,
RegStatus::WAIT_LIST,
],
true
);
Expand Down Expand Up @@ -2540,7 +2545,7 @@ protected function _default_event_settings_form(): EE_Form_Section_Proper
$registration_stati_for_selection
)
? sanitize_text_field($registration_config->default_STS_ID)
: EEM_Registration::status_id_pending_payment,
: RegStatus::PENDING_PAYMENT,
'html_label_text' => esc_html__('Default Registration Status', 'event_espresso')
. EEH_Template::get_help_tab_link(
'default_settings_status_help_tab'
Expand All @@ -2549,6 +2554,7 @@ protected function _default_event_settings_form(): EE_Form_Section_Proper
'This setting allows you to preselect what the default registration status setting is when creating an event. Note that changing this setting does NOT retroactively apply it to existing events.',
'event_espresso'
),
'html_class' => 'ee-input-width--small',
]
),
'default_max_tickets' => new EE_Integer_Input(
Expand All @@ -2566,6 +2572,7 @@ protected function _default_event_settings_form(): EE_Form_Section_Proper
'This setting allows you to indicate what will be the default for the maximum number of tickets per order when creating new events.',
'event_espresso'
),
'html_class' => 'ee-input-width--tiny',
]
),
]
Expand Down
Loading

0 comments on commit a0490d3

Please sign in to comment.