Merge branch 'develop' into fun/permissions-facade

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

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 {
@@ -1050,18 +1133,18 @@ a.give-delete {
 }
 // copied from wp built-in .menu-counter
 .givewp-beta-icon {
-    display: inline-block;
-    vertical-align: top;
-    box-sizing: border-box;
-    margin: 1px 0 -1px 2px;
-    padding: 0 5px;
-    min-width: 18px;
-    height: 18px;
-    border-radius: 9px;
+    display: flex;
+	justify-content: center;
+	align-items: center;
+    margin: 2px 0 0px 0px;
+    padding: 2px 8px;
+    border-radius: 0.75rem;
     background-color: #F29718;
     color: #fff;
     font-size: 11px;
-    line-height: 1.6;
+	font-weight: 600;
+	font-family: 'Inter' ,sans-serif;
+    line-height: 0.9625rem;
     text-align: center;
     z-index: 26;
 }
@@ -1072,8 +1155,17 @@ a.give-delete {
 
 .give-admin-beta-features-message {
     background-color: #fff;
-    padding: 0.5rem;
+    padding: 1rem;
     border: 1px solid #F29718;
+	display: flex;
+	align-items: flex-start;
+	gap: 0.5rem;
+	border-radius: 2px;
+	color: #0E0E0E;
+	font-size: 0.875rem;
+	font-family: 'Inter' ,sans-serif;
+	font-weight: 400;
+	line-height: 1.5rem;
 }
 
 .give-admin-beta-features-feedback-link {

composer.json

@@ -10,8 +10,6 @@
         "stripe/stripe-php": "^7.97.0",
         "paypal/paypal-checkout-sdk": "^1.0",
         "kjohnson/format-object-list": "^0.1.0",
-        "fakerphp/faker": "^1.9",
-        "myclabs/php-enum": "^1.6",
         "symfony/http-foundation": "^v3.4.47",
         "moneyphp/money": "v3.3.1",
         "stellarwp/field-conditions": "^1.1",
@@ -22,6 +20,7 @@
         "ext-json": "*"
     },
     "require-dev": {
+        "fakerphp/faker": "^1.9",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
         "phpcompatibility/phpcompatibility-wp": "*",
         "phpcompatibility/php-compatibility": "^9.3",
@@ -80,7 +79,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.2"
+            "php": "7.2.24"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
@@ -94,7 +93,6 @@
             "classmap_prefix": "Give_Vendors_",
             "constant_prefix": "GIVE_VENDORS_",
             "packages": [
-                "fakerphp/faker",
                 "stellarwp/validation",
                 "stellarwp/field-conditions",
                 "symfony/polyfill-ctype",