Merge branch 'develop' into feature/donation-summary-hook-store

impress-org · Nov 22, 2024 · af2bb33 · af2bb33
2 parents 44a2ddd + d056e04
commit af2bb33
Show file tree

Hide file tree

Showing 32 changed files with 1,065 additions and 388 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,6 +29,11 @@ If you would like to submit a pull request, please follow the steps below:
  *  When committing, reference your issue (if present) and include a note about the fix
 * Push the changes to your fork and [submit a pull request](https://help.github.com/articles/creating-a-pull-request) to the 'master' branch of the GiveWP repository
 
+## Security Considerations
+
+* When integrating with payment gateways make sure that all data relevent to the gateway is going directly to the gateway an nowhere else, especially credit card data
+* Under no circumstances should the payment method details (i.e. credit card deatails) be stored on the server
+
 ## Code Documentation
 
 * We ensure that every GiveWP function is documented well and follows the standards set by phpDoc

diff --git a/assets/src/css/admin/settings.scss b/assets/src/css/admin/settings.scss
@@ -383,6 +383,89 @@ div.give-field-description {
     }
 }
 
+.give_option_based_form_editor_notice {
+	display: flex;
+    margin: -2rem 0 0.5rem 0;
+	gap: 0.3rem;
+	padding: 0.5rem;
+	background-color: #fffaf2;
+	border-radius: 4px;
+	border: 1px solid #f29718;
+	border-left-width: 4px;
+	font-size: 0.875rem;
+	font-weight: 500;
+	color: #1a0f00;
+	line-height: 1.25rem;
+	max-width: 60rem;
+	width: 100%;
+
+	svg {
+		margin: 0.4rem 0.3rem;
+		height: 1.25rem;
+		width: 1.25rem;
+	}
+}
+
+.give-setting-tab-body-general,
+.give-setting-tab-body-display,
+.give-settings-advanced-tab {
+	label {
+        display: flex;
+        position: relative;
+
+		.give-settings-section-group-helper {
+            padding-left: 0.2rem;
+			--popout-display: none;
+			display: flex;
+			cursor: help;
+
+			img {
+				max-width: 18.9px;
+			}
+
+			&:hover {
+				--popout-display: block;
+			}
+
+			&__popout {
+				background-color: #fff;
+				border: 1px solid #e6e6e6;
+				border-radius: 4px;
+				box-shadow: 0 4px 8px 0 #0000000D;
+				color: #404040;
+				display: var(--popout-display, none);
+				left: 100%;
+				overflow: hidden;
+				position: absolute;
+				top: 0;
+				transform: translateX(10px);
+				z-index: 9999;
+
+				img {
+					max-width: initial;
+					display: block;
+				}
+
+				h5 {
+					font-size: 0.875rem;
+					font-weight: 700;
+					line-height: 1.5;
+					margin: 0;
+					padding: 1rem 1.5rem 0.5rem;
+				}
+
+				p {
+					font-size: 0.75rem;
+					font-weight: 500;
+					line-height: 1.5;
+					margin: 0;
+					padding: 0 1.5rem 1.5rem;
+				}
+			}
+		}
+	}
+}
+
 .give-payment-gateways-settings {
     &.give-settings-section-content {
         .give-settings-section-group-menu {
@@ -917,7 +1000,6 @@ a.give-delete {
 	}
 
 	img {
-        object-fit: contain;
 		width: 100%;
 	}
 

diff --git a/give.php b/give.php
@@ -6,8 +6,8 @@
  * Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
  * Author: GiveWP
  * Author URI: https://givewp.com/
- * Version: 3.17.2
- * Requires at least: 6.4
+ * Version: 3.18.0
+ * Requires at least: 6.5
  * Requires PHP: 7.2
  * Text Domain: give
  * Domain Path: /languages
@@ -242,7 +242,8 @@ final class Give
         Give\BetaFeatures\ServiceProvider::class,
         Give\FormTaxonomies\ServiceProvider::class,
         Give\DonationSpam\ServiceProvider::class,
-        Give\Settings\ServiceProvider::class
+        Give\Settings\ServiceProvider::class,
+        Give\FeatureFlags\OptionBasedFormEditor\ServiceProvider::class,
     ];
 
     /**
@@ -408,7 +409,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '3.17.2');
+            define('GIVE_VERSION', '3.18.0');
         }
 
         // Plugin Root File.

diff --git a/includes/admin/class-admin-settings.php b/includes/admin/class-admin-settings.php
@@ -949,7 +949,9 @@ class="give-input-field<?php echo( empty( $value['class'] ) ? '' : ' ' . esc_att
 					?>
 					<tr valign="top" <?php echo $wrapper_class; ?>>
 						<th scope="row" class="titledesc">
-							<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_attr( self::get_field_title( $value ) ); ?></label>
+                            <label for="<?php
+                            echo esc_attr($value['id']); ?>"><?php
+                                echo wp_kses_post(self::get_field_title($value)); ?></label>
 						</th>
 						<td class="give-forminp give-forminp-<?php echo esc_attr( $value['type'] ); ?>">
 							<select