Development

.github/workflows/e2e-js.yml

@@ -10,11 +10,11 @@ jobs:
   e2e:
     runs-on: ubuntu-latest
     if: github.event.pull_request.draft == false && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
-    
+
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-      
+
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
@@ -40,11 +40,11 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-cache-
-      
+
       - name: npm ci
         run: |
           npm ci
-          
+
       - name: Make dev build
         run: |
           npm run build-dev
@@ -60,11 +60,11 @@ jobs:
       - name: Install Playwright
         run: |
           npm install -g playwright-cli
-          npx playwright install    
+          npx playwright install
 
-      - name: Playwright Blocks 
+      - name: Playwright Blocks
         run: |
-          npm run test:e2e:playwright    
+          npm run test:e2e:playwright
 
       # run the node.js puppeteer script (which takes the screenshots and controls chrome)
       - name: Performance check
@@ -80,9 +80,9 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: artifact
-          path: ./artifacts/tests/
+          path: ./artifacts
           retention-days: 1
-      
+
       - name: Print the results
         run: |
           echo "::set-output name=TYPING_AVG::$(jq '.summary.type.average' ./artifacts/performance.spec.performance-results.json)"
@@ -91,7 +91,7 @@ jobs:
           echo "::set-output name=TYPING_QR60::$(jq '.summary.type.quantileRank60' ./artifacts/performance.spec.performance-results.json)"
           echo "::set-output name=TYPING_ABOVE_60::$(jq -c '.summary.type.above60' ./artifacts/performance.spec.performance-results.json)"
           echo "::set-output name=TYPING_QR80::$(jq '.summary.type.quantileRank80' ./artifacts/performance.spec.performance-results.json)"
-        id: summary  
+        id: summary
 
       - name: Comment
         uses: NejcZdovc/comment-pr@v1
@@ -107,5 +107,5 @@ jobs:
           TYPING_QR80: ${{ steps.summary.outputs.TYPING_QR80 }}
           TYPING_ABOVE_60: ${{ steps.summary.outputs.TYPING_ABOVE_60 }}
 
-  
-  
+
+

composer.json

@@ -13,7 +13,7 @@
 		"yoast/phpunit-polyfills": "^2.0",
 		"phpstan/phpstan": "^1.10",
 		"szepeviktor/phpstan-wordpress": "^1.3",
-		"php-stubs/woocommerce-stubs": "^7.7",
+		"php-stubs/woocommerce-stubs": "^8.0",
 		"php-stubs/acf-pro-stubs": "^6.0",
 		"spaze/phpstan-stripe": "^2.4"
 	},

inc/class-blocks-css.php

@@ -123,7 +123,7 @@ function_exists( 'wp_is_block_theme' ) &&
 				$templates_parts = get_block_templates( array( 'slugs__in' => $slugs ), 'wp_template_part' );
 
 				foreach ( $templates_parts as $templates_part ) {
-					if ( isset( $templates_part->content ) && isset( $templates_part->slug ) && in_array( $templates_part->slug, $slugs ) ) {
+					if ( ! empty( $templates_part->content ) && ! empty( $templates_part->slug ) && in_array( $templates_part->slug, $slugs ) ) {
 						$content .= $templates_part->content;
 					}
 				}

inc/class-main.php

@@ -7,6 +7,7 @@
 
 namespace ThemeIsle\GutenbergBlocks;
 
+use ThemeIsle\GutenbergBlocks\Plugins\LimitedOffers;
 use ThemeIsle\GutenbergBlocks\Server\Dashboard_Server;
 
 /**
@@ -44,6 +45,7 @@ public function init() {
 		}
 
 		add_filter( 'otter_blocks_about_us_metadata', array( $this, 'about_page' ) );
+
 	}
 
 	/**

inc/class-pro.php

@@ -7,6 +7,8 @@
 
 namespace ThemeIsle\GutenbergBlocks;
 
+use ThemeIsle\GutenbergBlocks\Plugins\LimitedOffers;
+
 /**
  * Class Pro
  */
@@ -51,6 +53,8 @@ public function init_upsells() {
 		add_action( 'otter_montly_scheduled_events', array( $this, 'reset_dashboard_notice' ) );
 		add_action( 'admin_init', array( $this, 'should_show_dashboard_upsell' ), 11 );
 		add_filter( 'plugin_action_links_' . plugin_basename( OTTER_BLOCKS_BASEFILE ), array( $this, 'add_pro_link' ) );
+
+		add_action( 'admin_init', array( $this, 'load_offers' ), 11 );
 	}
 
 	/**
@@ -180,6 +184,12 @@ public function should_show_dashboard_upsell() {
 			$show_upsell = true;
 		}
 
+		$offers = new LimitedOffers();
+
+		if ( $offers->is_active() ) {
+			$show_upsell = false;
+		}
+
 		if ( $show_upsell ) {
 			add_action( 'admin_notices', array( $this, 'dashboard_upsell_notice' ) );
 			add_action( 'wp_ajax_dismiss_otter_notice', array( $this, 'dismiss_dashboard_notice' ) );
@@ -416,6 +426,20 @@ public function add_pro_link( $links ) {
 		return $links;
 	}
 
+	/**
+	 * Load offers.
+	 *
+	 * @return void
+	 */
+	public function load_offers() {
+		if ( ! self::is_pro_installed() ) {
+			$offer = new LimitedOffers();
+			if ( $offer->can_show_dashboard_banner() && $offer->is_active() ) {
+				$offer->load_dashboard_hooks();
+			}
+		}
+	}
+
 	/**
 	 * Singleton method.
 	 *