RELEASE: 5.0.48

Author: eeteamcodebase

CHANGELOG.md

@@ -6,6 +6,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Releases
 
+### 5.0.48
+
+#### Added
+ - [Implement Square Partner Fees (#1995)](https://github.com/eventespresso/cafe/pull/1995)
+ - [New Thank You Page Hook (#2004)](https://github.com/eventespresso/cafe/pull/2004)
+
+#### Fixed
+ - [Fix CSV reports on SSL redirects (#2010)](https://github.com/eventespresso/cafe/pull/2010)
+
+#### Changed
+ - [Require ee_advanced_event_editor Cap to Duplicate Event (#1889)](https://github.com/eventespresso/cafe/pull/1889)
+ - [Skip Session Save Path Filesystem Checks for open_basedir Violations (#2005)](https://github.com/eventespresso/cafe/pull/2005)
+ - [Relax Restrictions Generator Action Type (#2008)](https://github.com/eventespresso/cafe/pull/2008)
+ - [Allow for dynamic shortcode parameters within the message system (#2012)](https://github.com/eventespresso/cafe/pull/2012)
+
+
+
+
+
+
 ### [5.0.47]
 
 #### Fixed

PaymentMethods/PayPalCommerce/PayPalCheckout/forms/SettingsForm.php

@@ -11,7 +11,6 @@
 use EE_Select_Input;
 use EE_Checkbox_Multi_Input;
 use EED_PayPalOnboard;
-use EEH_Array;
 use EEH_HTML;
 use EventEspresso\PaymentMethods\PayPalCommerce\domain\Domain;
 use EventEspresso\PaymentMethods\PayPalCommerce\tools\extra_meta\PayPalExtraMetaManager;
@@ -70,13 +69,6 @@ public function __construct(EE_PMT_PayPalCheckout $payment_method, EE_Payment_Me
         parent::__construct($form_parameters);
         // Add a form for PayPal Onboard.
         $this->addOnboardingForm($payment_method, $pm_instance);
-        // Add a form for PayPal Onboard.
-        add_filter(
-            'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
-            [__CLASS__, 'addFeesNotice'],
-            10,
-            2
-        );
         // Add the clear data button.
         $this->clearMetadataButton($pm_instance);
         // Disable inputs if needed.
@@ -108,62 +100,6 @@ public function addOnboardingForm(EE_PMT_PayPalCheckout $payment_method, EE_Paym
     }
 
 
-    /**
-     * Add fees notice.
-     *
-     * @param array             $subsections
-     * @param EE_Payment_Method $payment_method
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function addFeesNotice(array $subsections, EE_Payment_Method $payment_method): array
-    {
-        // We want to be able to disable fees. Also check if this is PayPal PM.
-        if ((defined('EE_PPC_USE_PAYMENT_FEES') && ! EE_PPC_USE_PAYMENT_FEES)
-            || $payment_method->slug() !== 'paypalcheckout'
-        ) {
-            return $subsections;
-        }
-        return EEH_Array::insert_into_array(
-            $subsections,
-            [
-                'partner_fees_notice' => new EE_Form_Section_HTML(
-                    EEH_HTML::tr(
-                        EEH_HTML::th()
-                        . EEH_HTML::thx()
-                        . EEH_HTML::td(
-                            EEH_HTML::div(
-                                EEH_HTML::strong(
-                                    esc_html__(
-                                        'PayPal Partner Commission Fees are based upon the status of your Support License:',
-                                        'event_espresso'
-                                    )
-                                )
-                                . EEH_HTML::ul()
-                                . EEH_HTML::li(
-                                    esc_html__('- Active licenses commission fees: 0%', 'event_espresso')
-                                )
-                                . EEH_HTML::li(
-                                    esc_html__('- Expired license commission fees: 3%', 'event_espresso')
-                                )
-                                . EEH_HTML::ulx()
-                                . esc_html__(
-                                    'Keep your support license active for: lower fees, up-to-date software and have access to our support team. By connecting and processing payments you agree to these terms.',
-                                    'event_espresso'
-                                ),
-                                '',
-                                'ee-status-outline ee-status-bg--info'
-                            )
-                        )
-                    )
-                ),
-            ],
-            'fine_print'
-        );
-    }
-
-
     /**
      * Add a checkout type select.
      *

VERSION

@@ -1 +1 @@
-5.0.47
+5.0.48

admin_pages/events/Events_Admin_Page.core.php

@@ -1726,7 +1726,7 @@ public function ticket_metabox()
          */
         /** @var EEM_Datetime $datetime_model */
         $datetime_model = EE_Registry::instance()->load_model('Datetime');
-        /** @var EEM_Ticket $datetime_model */
+        /** @var EEM_Ticket $ticket_model */
         $ticket_model = EE_Registry::instance()->load_model('Ticket');
         $times        = $datetime_model->get_all_event_dates($event_id);
         /** @type EE_Datetime $first_datetime */
@@ -1754,13 +1754,11 @@ public function ticket_metabox()
                 }
             } else {
                 $template_args['total_ticket_rows'] = 1;
-                /** @type EE_Ticket $ticket */
                 $ticket                       = $ticket_model->create_default_object();
                 $template_args['ticket_rows'] .= $this->_get_ticket_row($ticket);
             }
         } else {
             $template_args['time'] = $times[0];
-            /** @type EE_Ticket[] $tickets */
             $tickets                      = $ticket_model->get_all_default_tickets();
             $template_args['ticket_rows'] .= $this->_get_ticket_row($tickets[1]);
             // NOTE: we're just sending the first default row

admin_pages/payments/Payments_Admin_Page.core.php

@@ -5,6 +5,7 @@
 use EventEspresso\core\services\database\TableAnalysis;
 use EventEspresso\core\services\database\TableManager;
 use EventEspresso\core\services\loaders\LoaderFactory;
+use EventEspresso\core\services\payments\PaymentProcessorFees;
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
 /**
@@ -543,6 +544,7 @@ protected function _generate_payment_method_settings_form(
                 'update'                  => $this->_update_payment_method_button($payment_method),
                 'deactivate'              => $this->_deactivate_payment_method_button($payment_method),
                 'fine_print'              => $this->_fine_print(),
+                'partner_fees_notice'     => $this->partnerFeesNotice($payment_method),
             ],
             $payment_method
         );
@@ -885,6 +887,31 @@ protected function _fine_print(): EE_Form_Section_HTML
     }
 
 
+    /**
+     * partnerFeesNotice
+     *
+     * @access protected
+     * @param  EE_Payment_Method $payment_method
+     * @return ?EE_Form_Section_HTML
+     */
+    protected function partnerFeesNotice(EE_Payment_Method $payment_method): ?EE_Form_Section_HTML
+    {
+        /** @var PaymentProcessorFees $payment_proc_fees */
+        $payment_proc_fees = LoaderFactory::getLoader()->getShared(
+            'EventEspresso\core\services\payments\PaymentProcessorFees'
+        );
+        try {
+            $pm_name = $payment_method->name();
+        } catch (EE_Error|ReflectionException $e) {
+            return null;
+        }
+        if (! $payment_proc_fees->isPartnerGateway($pm_name)) {
+            return null;
+        }
+        return $payment_proc_fees->getFeesNotice($pm_name);
+    }
+
+
     /**
      * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
      *

caffeinated/admin/extend/events/Extend_Events_Admin_Page.core.php

@@ -4,6 +4,7 @@
 use EventEspresso\core\domain\services\admin\events\editor\ui\DuplicateEventButton;
 use EventEspresso\core\domain\services\admin\events\editor\ui\TicketSelectorShortcodeButton;
 use EventEspresso\core\domain\services\cache\TemplateCacheAdmin;
+use EventEspresso\core\domain\services\capabilities\FeatureFlag;
 use EventEspresso\core\domain\services\registration\RegStatus;
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 use EventEspresso\core\exceptions\InvalidInterfaceException;
@@ -208,9 +209,12 @@ protected function _set_page_config()
         // legend item
         add_filter('FHEE__Events_Admin_Page___event_legend_items__items', [$this, 'additional_legend_items']);
         add_action('admin_init', [$this, 'admin_init']);
-        // this is a filter that allows the addition of extra html after the permalink field on the wp post edit-form
-        // add_filter('get_sample_permalink_html', [DuplicateEventButton::class, 'addButton'], 8, 2);
-        DuplicateEventButton::addEventEditorPermalinkButton(8);
+
+        if ($this->feature->allowed(FeatureFlag::USE_ADVANCED_EVENT_EDITOR)) {
+            // this is a filter that allows the addition of extra html after the permalink field on the wp post edit-form
+            // add_filter('get_sample_permalink_html', [DuplicateEventButton::class, 'addButton'], 8, 2);
+            DuplicateEventButton::addEventEditorPermalinkButton(8);
+        }
     }
 
 
@@ -264,8 +268,11 @@ public function extra_permalink_field_buttons(
         ?string $new_title,
         ?string $new_slug
     ): string {
-        $return = DuplicateEventButton::addButton($return, $id, $new_title, $new_slug);
-        return TicketSelectorShortcodeButton::addButton($return, $id, $new_title, $new_slug);
+
+        if ($this->feature->allowed(FeatureFlag::USE_ADVANCED_EVENT_EDITOR)) {
+            $return = DuplicateEventButton::addButton($return, $id);
+        }
+        return TicketSelectorShortcodeButton::addButton($return, $id);
     }
 
 

core/admin/assets/ee-admin-base.css

@@ -773,9 +773,7 @@
 .wp-core-ui .espresso-notices.notice,
 .wp-core-ui .espresso-notices.error,
 .wp-core-ui .espresso-notices.updated {
-    align-items: center;
-    display: flex;
-    flex-direction: row-reverse;
+    display: block;
     padding: calc(.5 * var(--ee-base-ui-scale)) var(--ee-base-ui-scale);
 }
 
@@ -790,7 +788,9 @@
 }
 
 .wp-core-ui .espresso-notices.notice.ee-nag-notice {
-    display: block;
+    align-items: center;
+    display: flex;
+    flex-direction: row-reverse;
     padding-block: var(--ee-padding-default);
     padding-inline: var(--ee-padding-big);
     position: relative;

core/admin/assets/ee-admin-page.css

@@ -5835,29 +5835,46 @@ body.espresso-admin #contextual-help-wrap strong {
     width: var(--ee-font-size-2xl);
 }
 
+.espresso-admin.wp-core-ui .dashicons.dashicons--tiny,
+.espresso-admin.wp-core-ui .dashicons.dashicons--tiny:before,
+.espresso-admin.wp-core-ui .button--tiny:not(.button--icon-only) .dashicons,
+.espresso-admin.wp-core-ui .button--tiny:not(.button--icon-only) .dashicons:before {
+    font-size: var(--ee-font-size-default);
+    height: var(--ee-font-size-default);
+    width: var(--ee-font-size-default);
+}
+
 .espresso-admin.wp-core-ui .dashicons.dashicons--small,
-.espresso-admin.wp-core-ui .dashicons.dashicons--small:before {
+.espresso-admin.wp-core-ui .dashicons.dashicons--small:before,
+.espresso-admin.wp-core-ui .button--small:not(.button--icon-only) .dashicons,
+.espresso-admin.wp-core-ui .button--small:not(.button--icon-only) .dashicons:before {
     font-size: var(--ee-font-size-bigger);
     height: var(--ee-font-size-bigger);
     width: var(--ee-font-size-bigger);
 }
 
 .espresso-admin.wp-core-ui .dashicons.dashicons--big,
-.espresso-admin.wp-core-ui .dashicons.dashicons--big:before {
+.espresso-admin.wp-core-ui .dashicons.dashicons--big:before,
+.espresso-admin.wp-core-ui .button--big:not(.button--icon-only) .dashicons,
+.espresso-admin.wp-core-ui .button--big:not(.button--icon-only) .dashicons:before {
     font-size: var(--ee-font-size-4xl);
     height: var(--ee-font-size-4xl);
     width: var(--ee-font-size-4xl);
 }
 
 .espresso-admin.wp-core-ui .dashicons.dashicons--bigger,
-.espresso-admin.wp-core-ui .dashicons.dashicons--bigger:before {
+.espresso-admin.wp-core-ui .dashicons.dashicons--bigger:before,
+.espresso-admin.wp-core-ui .button--big:not(.button--icon-only) .dashicons,
+.espresso-admin.wp-core-ui .button--big:not(.button--icon-only) .dashicons:before {
     font-size: var(--ee-font-size-7xl);
     height: var(--ee-font-size-7xl);
     width: var(--ee-font-size-7xl);
 }
 
 .espresso-admin.wp-core-ui .dashicons.dashicons--huge,
-.espresso-admin.wp-core-ui .dashicons.dashicons--huge:before {
+.espresso-admin.wp-core-ui .dashicons.dashicons--huge:before,
+.espresso-admin.wp-core-ui .button--big:not(.button--icon-only) .dashicons,
+.espresso-admin.wp-core-ui .button--big:not(.button--icon-only) .dashicons:before {
     font-size: var(--ee-font-size-9xl);
     height: var(--ee-font-size-9xl);
     width: var(--ee-font-size-9xl);

core/db_classes/EE_CSV.class.php

@@ -371,7 +371,7 @@ public function write_metadata_to_csv($filehandle)
                 'version'        => espresso_version(),
                 'timezone'       => EEH_DTT_Helper::get_timezone(),
                 'time_of_export' => current_time('mysql'),
-                'site_url'       => site_url(),
+                'site_url'       => is_ssl() ? str_replace('http://', 'https://', site_url()) : site_url(),
             ),
         );
         $this->write_data_array_to_csv($filehandle, $meta_data);

core/db_models/EEM_Base.model.php

@@ -3070,11 +3070,11 @@ public function get_one_conflicting($obj_or_fields_array, $include_primary_key =
      * Like count, but is optimized and returns a boolean instead of an int
      *
      * @param array $query_params
-     * @return boolean
+     * @return bool
      * @throws EE_Error
      * @throws ReflectionException
      */
-    public function exists($query_params)
+    public function exists(array $query_params): bool
     {
         $query_params['limit'] = 1;
         return $this->count($query_params) > 0;