Merge branch 'release/3.17.1' into develop

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.17.0
+ * Version: 3.17.1
  * Requires at least: 6.4
  * Requires PHP: 7.2
  * Text Domain: give
@@ -408,7 +408,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '3.17.0');
+            define('GIVE_VERSION', '3.17.1');
         }
 
         // Plugin Root File.

includes/admin/class-admin-settings.php

@@ -68,7 +68,7 @@ public static function get_settings_pages() {
 			 * For example: if you register a setting page with give-settings menu slug
 			 *              then filter will be give-settings_get_settings_pages
 			 *
-			 * @unreleased cast to array
+			 * @since 3.17.1 cast to array
 			 * @since 1.8
 			 *
 			 * @param array $settings Array of settings class object.

readme.txt

@@ -5,7 +5,7 @@ Tags: donation, donate, recurring donations, fundraising, crowdfunding
 Requires at least: 6.4
 Tested up to: 6.6
 Requires PHP: 7.2
-Stable tag: 3.17.0
+Stable tag: 3.17.1
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -266,6 +266,12 @@ You can report security bugs through the Patchstack Vulnerability Disclosure Pro
 10. Use almost any payment gateway integration with GiveWP through our add-ons or by creating your own add-on.
 
 == Changelog ==
+= 3.17.1: October 22nd, 2024 =
+* Fix: Resolved an issue with PayPal donation buttons where clicking the GiveWP donate button was causing an error.
+* Fix: Resolved an issue where the donation amount level descriptions option was not visible in the form builder.
+* Fix: Resolved an issue with the "Update Subscription" button being always disabled for Stripe in the donor dashboard.
+* Fix: Resolved a styling issue in the donor dashboard with Stripe subscription amount fields.
+
 = 3.17.0: October 16th, 2024 =
 * New: Added new security tab with option to enable a honeypot field for visual builder forms
 * Fix: Resolved an issue with the donor name prefix block not saving correctly 

src/DonationForms/resources/app/form/Header.tsx

@@ -27,7 +27,7 @@ export default function Header({form}: {form: DonationForm}) {
     return (
         <DonationFormErrorBoundary>
             <HeaderTemplate
-                isMultiStep={form.design.isMultiStep}
+                isMultiStep={form.design?.isMultiStep}
                 HeaderImage={() =>
                     form.settings?.designSettingsImageUrl && (
                         <HeaderImageTemplate

src/DonorDashboards/resources/js/app/components/subscription-manager/amount-control/index.js

@@ -105,7 +105,6 @@ const AmountControl = ({currency, onChange, value, options, min, max}) => {
                         value={selectValue}
                         onChange={setSelectValue}
                     />
-                <div>
                     {selectValue === CUSTOM_AMOUNT && (
                         <div className="give-donor-dashboard-currency-control">
                             <label
@@ -133,7 +132,6 @@ const AmountControl = ({currency, onChange, value, options, min, max}) => {
                             </div>
                         </div>
                     )}
-                </div>
             </FieldRow>
             {validationError && (
                 <FieldRow>

src/DonorDashboards/resources/js/app/components/subscription-manager/amount-control/style.scss

@@ -10,24 +10,26 @@ $errorColor: #c91f1f;
 }
 
 .give-donor-dashboard-amount-inputs {
+    flex: 1;
     display: flex;
     flex-direction: column;
 
-
     .give-donor-dashboard-field-row {
+        flex: 1;
         display: flex;
+        align-items: center;
         padding: 0;
 
         .give-donor-dashboard-select-control {
             display: flex;
-            min-width: 100%;
+            width: 100%;
             margin: 0;
         }
     }
 }
 
 .give-donor-dashboard-currency-control {
-    margin-top: 10px;
+    margin-bottom: 2px;
 
     .give-donor-dashboard-currency-control__label {
         font-family: Montserrat, Arial, Helvetica, sans-serif;
@@ -47,10 +49,10 @@ $errorColor: #c91f1f;
         outline: 0 !important;
         min-width: 190px;
         width: 100%;
-        margin-top: 8px;
+        margin-top: 6px;
         border: 1px solid #b8b8b8;
         overflow: hidden;
-        padding: 0;
+        padding: 1px;
         box-shadow: 0 0 0 0 var(--give-donor-dashboard-accent-color);
         transition: box-shadow 0.1s ease;
 

src/DonorDashboards/resources/js/app/components/subscription-manager/index.tsx

@@ -10,7 +10,6 @@ import {updateSubscriptionWithAPI} from './utils';
 import PauseDurationDropdown from './pause-duration-dropdown';
 import DashboardLoadingSpinner from '../dashboard-loading-spinner';
 import usePauseSubscription from './hooks/pause-subscription';
-import {cancelSubscriptionWithAPI} from '../subscription-cancel-modal/utils';
 
 import './style.scss';
 import SubscriptionCancelModal from '../subscription-cancel-modal';
@@ -36,7 +35,7 @@ const SubscriptionManager = ({id, subscription}) => {
     const [updated, setUpdated] = useState(false);
     const {handlePause, handleResume, loading} = usePauseSubscription(id);
 
-    const subscriptionStatus = subscription.payment.status.id;
+    const subscriptionStatus = subscription.payment.status?.id || subscription.payment.status.label.toLowerCase();
 
     const showPausingControls =
         subscription.gateway.can_pause && !['Quarterly', 'Yearly'].includes(subscription.payment.frequency);

src/PaymentGateways/Gateways/PayPalCommerce/payPalCommerceGateway.tsx

@@ -663,7 +663,7 @@ import {PayPalSubscriber} from './types';
         },
 
         /**
-         * @unreleased Hide submit button when PayPal Commerce is selected.
+         * @since 3.17.1 Hide submit button when PayPal Commerce is selected.
          */
         Fields() {
             const {useWatch} = window.givewp.form.hooks;

src/Settings/Security/Actions/RegisterSettings.php

@@ -38,6 +38,7 @@ protected function getSettings(): array
     }
 
     /**
+     * @since 3.17.1 enable by default
      * @since 3.17.0
      */
     public function getHoneypotSettings(): array
@@ -50,7 +51,7 @@ public function getHoneypotSettings(): array
             ),
             'id' => 'givewp_donation_forms_honeypot_enabled',
             'type' => 'radio_inline',
-            'default' => 'disabled',
+            'default' => 'enabled',
             'options' => [
                 'enabled' => __('Enabled', 'give'),
                 'disabled' => __('Disabled', 'give'),