Development

.github/workflows/deploy-stagging.yml

@@ -8,6 +8,7 @@ on:
 jobs:
     deploy:
         runs-on: ubuntu-latest
+        if: ${{ github.repository_owner == 'Codeinwp' }} # Disable on forks
         env:
             SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
             SSH_KEY: ${{ secrets.SSH_KEY }}

.gitignore

@@ -11,4 +11,5 @@ todo.md
 artifacts
 *.results.json
 trace.json
-license.json
+license.json
+.fleet

.wp-env.override.json

@@ -6,22 +6,23 @@
   "config": {
     "WP_DEBUG": true,
     "WP_DEBUG_DISPLAY": true,
-    "FS_METHOD": "direct"
+    "FS_METHOD": "direct",
+    "WP_DEFAULT_THEME": "twentytwentythree"
   },
   "env": {
-    "development": {
-      "themes": [
-        "./one-theme"
-      ]
-    },
     "tests": {
+      "config": {
+        "WP_DEBUG": false,
+        "WP_DEBUG_DISPLAY": false
+      },
       "plugins": [
         "."
       ],
       "mappings": {
-				"wp-content/mu-plugins": "./node_modules/@wordpress/e2e-tests/mu-plugins",
-				"wp-content/plugins/gutenberg-test-plugins": "./node_modules/@wordpress/e2e-tests/plugins"
-			}
+          "wp-content/mu-plugins": "./node_modules/@wordpress/e2e-tests/mu-plugins",
+          "wp-content/plugins/gutenberg-test-plugins": "./node_modules/@wordpress/e2e-tests/plugins",
+          "wp-content/themes/gutenberg-test-themes/twentytwentythree": "https://downloads.wordpress.org/theme/twentytwentythree.1.0.zip"
+		}
     }
   }
-}
+}

blocks.json

@@ -99,6 +99,12 @@
 	"form-file": {
 		"block": "blocks/blocks/form/file/block.json"
 	},
+	"form-hidden-field": {
+		"block": "blocks/blocks/form/hidden-field/block.json"
+	},
+	"form-stripe-field": {
+		"block": "blocks/blocks/form/stripe-field/block.json"
+	},
 	"google-map": {
 		"block": "blocks/blocks/google-map/block.json",
 		"assets": {
@@ -272,5 +278,8 @@
 	"product-upsells": {
 		"isPro": true,
 		"block": "pro/woocommerce/upsells/block.json"
+	},
+	"content-generator": {
+		"block": "blocks/blocks/content-generator/block.json"
 	}
 }

composer.json

@@ -62,6 +62,6 @@
 		"tubalmartin/cssmin": "^4.1",
 		"wptt/webfont-loader": "^1.1",
 		"sabberworm/php-css-parser": "^8.4",
-		"stripe/stripe-php": "^10.4"
+		"stripe/stripe-php": "^12.1"
 	}
 }

inc/class-main.php

@@ -74,6 +74,7 @@ public function autoload_classes() {
 			'\ThemeIsle\GutenbergBlocks\Integration\Form_Providers',
 			'\ThemeIsle\GutenbergBlocks\Integration\Form_Email',
 			'\ThemeIsle\GutenbergBlocks\Server\Form_Server',
+			'\ThemeIsle\GutenbergBlocks\Server\Prompt_Server',
 		);
 
 		$classnames = apply_filters( 'otter_blocks_autoloader', $classnames );

inc/class-pro.php

@@ -159,6 +159,10 @@ public static function should_show_upsell() {
 	 * @access  public
 	 */
 	public function should_show_dashboard_upsell() {
+		if ( defined( 'OTTER_PRO_VERSION' ) ) {
+			return;
+		}
+
 		$show_upsell = false;
 
 		$installed     = get_option( 'otter_blocks_install' );
@@ -398,6 +402,11 @@ public function reset_dashboard_notice() {
 	 * @access public
 	 */
 	public function add_pro_link( $links ) {
+
+		if ( defined( 'OTTER_PRO_VERSION' ) ) {
+			return $links;
+		}
+
 		$links[] = sprintf(
 			'<a href="%s" target="_blank" style="color:#ed6f57;font-weight:bold;">%s</a>',
 			esc_url_raw( tsdk_utmify( self::get_url(), 'pluginspage', 'action' ) ),

inc/class-registration.php

@@ -498,16 +498,17 @@ function() {
 					'root'               => esc_url_raw( rest_url() ),
 					'nonce'              => wp_create_nonce( 'wp_rest' ),
 					'messages'           => array(
-						'submission'         => __( 'Form submission from', 'otter-blocks' ),
-						'captcha-not-loaded' => __( 'Captcha is not loaded. Please check your browser plugins to allow the Google reCaptcha.', 'otter-blocks' ),
-						'check-captcha'      => __( 'Please check the captcha.', 'otter-blocks' ),
-						'invalid-email'      => __( 'The email address is invalid!', 'otter-blocks' ),
-						'already-registered' => __( 'The email was already registered!', 'otter-blocks' ),
-						'try-again'          => __( 'Error. Something is wrong with the server! Try again later.', 'otter-blocks' ),
-						'privacy'            => __( 'I have read and agreed the privacy statement.', 'otter-blocks' ),
-						'too-many-files'     => __( 'Too many files loaded. Maximum is: ', 'otter-blocks' ),
-						'big-file'           => __( 'File size is to big. The limit is: ', 'otter-blocks' ),
-						'invalid-file'       => __( 'Invalid files type. The submitted files could not be processed.', 'otter-blocks' ),
+						'submission'           => __( 'Form submission from', 'otter-blocks' ),
+						'captcha-not-loaded'   => __( 'Captcha is not loaded. Please check your browser plugins to allow the Google reCaptcha.', 'otter-blocks' ),
+						'check-captcha'        => __( 'Please check the captcha.', 'otter-blocks' ),
+						'invalid-email'        => __( 'The email address is invalid!', 'otter-blocks' ),
+						'already-registered'   => __( 'The email was already registered!', 'otter-blocks' ),
+						'try-again'            => __( 'Error. Something is wrong with the server! Try again later.', 'otter-blocks' ),
+						'privacy'              => __( 'I have read and agreed the privacy statement.', 'otter-blocks' ),
+						'too-many-files'       => __( 'Too many files loaded. Maximum is: ', 'otter-blocks' ),
+						'big-file'             => __( 'File size is to big. The limit is: ', 'otter-blocks' ),
+						'invalid-file'         => __( 'Invalid files type. The submitted files could not be processed.', 'otter-blocks' ),
+						'confirmingSubmission' => __( 'Confirming submission', 'otter-blocks' ),
 					),
 				)
 			);

inc/css/blocks/class-shared-css.php

@@ -275,6 +275,14 @@ public static function section_shared() {
 						'value'   => 'boxShadowColor',
 						'default' => '#000',
 						'format'  => function( $value, $attrs ) {
+							if ( ! isset( $attrs['boxShadowColorOpacity'] ) ) {
+								return $value;
+							}
+
+							if ( 100 === $attrs['boxShadowColorOpacity'] ) {
+								return $value;
+							}
+
 							$opacity = ( isset( $attrs['boxShadowColorOpacity'] ) ? $attrs['boxShadowColorOpacity'] : 50 ) / 100;
 							return Base_CSS::hex2rgba( $value, $opacity );
 						},