Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Commit

Permalink
Merge branch 'trunk' into fix/11293-pattern-tt4-footer-with-2-menus-dark
Browse files Browse the repository at this point in the history
  • Loading branch information
danieldudzic authored Nov 2, 2023
2 parents 881fa94 + 500c46f commit d7e0321
Show file tree
Hide file tree
Showing 7 changed files with 292 additions and 12 deletions.
123 changes: 123 additions & 0 deletions docs/internal-developers/testing/releases/1142.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
# Testing notes and ZIP for release 11.4.2

Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-blocks/files/13179867/woocommerce-gutenberg-products-block.zip)

## WooCommerce Core

### Enhancements

#### Improve the button size on the "Product Collection 4 Column" pattern. [11433](https://github.com/woocommerce/woocommerce-blocks/pull/11433)

1. Create a new page or post.
2. Insert the `Product Collection 4 Column` pattern.
3. Check the `Add to cart` buttons look like in the after screenshot below.

| Before | After |
| ------ | ----- |
| <img width="1201" alt="Screenshot 2023-10-24 at 15 53 25" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/cc60d499-51b9-4a12-8f11-6c346eb41ce8"> | <img width="1197" alt="Screenshot 2023-10-24 at 15 53 01" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/a1735c13-f701-46e4-bbe0-b2b2eff275bf"> |

#### Improve the "Minimal header" pattern spacing and title. [11434](https://github.com/woocommerce/woocommerce-blocks/pull/11434)

1. Create a new page or post and insert the `Minimal header` pattern.
2. Check it matches the screenshot below.

| Mobile |
| ------ |
| <img width="405" alt="Screenshot 2023-10-24 at 16 50 08" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/5e124511-6098-4bc2-a381-9714e254a692"> |

| Desktop |
| ------ |
| <img width="1374" alt="Screenshot 2023-10-24 at 16 49 43" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/2c58a2ca-d270-4145-b1f6-19aa9a884a52"> |

### Improve the Testimonials 3 columns pattern. [11430](https://github.com/woocommerce/woocommerce-blocks/pull/11430)

1. Create a new page or post.
2. Insert the `Testimonials 3 columns` pattern.
3. Check the reviewer names are not duplicated.

| Before | After |
| ------ | ----- |
| <img width="1207" alt="Screenshot 2023-10-24 at 14 38 29" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/7c4a1f75-4eb1-4d7a-a38c-6e30d5649c18">| <img width="1201" alt="Screenshot 2023-10-24 at 14 37 42" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/8a967999-b16a-47f5-96ce-3d3b4c92a67e"> |

### Add overlay to the "Featured Category Triple" pattern. [11428](https://github.com/woocommerce/woocommerce-blocks/pull/11428)

1. Create a new page or post.
2. Insert the `Featured Category Triple` pattern.
3. Check each of the images have an overlay with 30% opacity.

| Before | After |
| ------ | ----- |
| <img width="967" alt="Screenshot 2023-10-24 at 14 14 29" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/91f35822-4ca3-4f11-9402-ba93ae80db5e"> | <img width="969" alt="Screenshot 2023-10-24 at 14 14 09" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/f460edf5-7659-4cc0-8d10-b4ae12dd1cd3"> |

### Improve the "Footer with 3 Menus" pattern. [11379](https://github.com/woocommerce/woocommerce-blocks/pull/11379)

1. Create a new page or post.
2. Insert the `Footer with 3 menus` pattern.
3. Check that it looks like the design.

| Desktop |
| ------ |
| <img width="1397" alt="Screenshot 2023-10-23 at 16 32 48" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/747643d2-7548-41d9-8ce1-8f91bcd1c171">|

| Mobile |
| ------ |
|<img width="334" alt="CleanShot 2023-10-23 at 16 33 30@2x" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/1d94f1ed-dad7-4b9b-ad9c-432acb16c2c2"> |

### Update the "Large footer" pattern. [11413](https://github.com/woocommerce/woocommerce-blocks/pull/11413)

1. Create a new page or post.
2. Insert the `Large Footer` pattern.
3. Check that it looks like the design.

| Desktop |
| ------ |
| <img width="1382" alt="Screenshot 2023-10-23 at 14 52 19" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/3ff9a4ff-f051-4023-9cb7-faf13da68062"> |

| Mobile |
| ------ |
| <img width="342" alt="Screenshot 2023-10-23 at 14 54 43" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/2926804a-8616-4d67-ae1c-e1340c814030"> |

### Improve the "Essential Header". [11449](https://github.com/woocommerce/woocommerce-blocks/pull/11449)

1. Create a new page or post and insert the `Essential Header`.
2. Check it looks like the video below.

<video src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/fc3ba66b-1f9e-4cd2-96b1-c59f2aba1e80" />

### Improve the mobile view for the Minimal header pattern. [11463](https://github.com/woocommerce/woocommerce-blocks/pull/11463)

1. Create a new page or post and insert the `Minimal header` pattern.
2. Check the mobile view looks like the after screenshot below.

| Before | After |
| ------ | ----- |
| <img width="376" alt="Screenshot 2023-10-26 at 11 47 05" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/c1caac6a-c8d6-4144-8978-fe8c75fdd915"> | <img width="379" alt="Screenshot 2023-10-26 at 11 46 46" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/232cc433-a4ba-49b8-912f-bb53e2124713"> |

### Update the Footer with simple menu and cart pattern. [11409](https://github.com/woocommerce/woocommerce-blocks/pull/11409)

1. Create a new page or post.
2. Insert the `Footer with simple menu and cart` pattern.
3. Check that it looks like the design.

<img width="1752" alt="Screenshot 2023-10-24 at 10 50 05" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/a4118ee8-4c86-49d7-bd69-2402a000a4e2">
<img width="537" alt="Screenshot 2023-10-24 at 10 51 13" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/28f69a93-41d0-4272-8766-5fda5a15e0b6">
<img width="383" alt="Screenshot 2023-10-24 at 10 51 21" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/2e762e03-1928-4325-97fa-910408029cb2">



## Should be tested by the development team exclusively

### Update the patterns content after a plugin update. [11210](https://github.com/woocommerce/woocommerce-blocks/pull/11210)

1. Create a Jurassic Ninja site with WooCommerce.
2. Connect JetPack.
3. Install the plugin zip from this PR (<https://wcblocks.wpcomstaging.com/wp-content/uploads/woocommerce-gutenberg-products-block-11210.zip>)
5. Install the [woo-ai](https://github.com/woocommerce/woocommerce-blocks/files/12882468/woo-ai.zip) plugin.
6. Go to your store `/wp-admin/admin.php?page=wc-settings&tab=advanced&section=features` and enter a description for your store (like `A store selling books and magazines`).

#### Simulating plugin update

1. Go to the file editor and in WooCommerce Blocks plugin, in the `woocommerce-gutenberg-products-block.php` file modify the `woocommerce-gutenberg-products-block.php` plugin file and change the `* Version: 11.4.0-dev` comment to some lower version `* Version: 10`.
2. Go to your store plugin's page, you should see the `WooCommerce Blocks` plugin with the version you just changed and a message to update the plugin.
3. Click on it to update the plugin.
4. Go to the Scheduled Actions and make sure a new `woocommerce_update_patterns_content` action is scheduled.
122 changes: 122 additions & 0 deletions docs/internal-developers/testing/releases/1143.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
# Testing notes and ZIP for release 11.4.3

Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-blocks/files/13217249/woocommerce-gutenberg-products-block.zip)

## WooCommerce Core

### Enhancements

#### Improve Hero Product Chessboard pattern [11423](https://github.com/woocommerce/woocommerce-blocks/pull/11423)

1. Add a new post.
2. Add the `Hero Product Chessbord` pattern.
3. Save the page.
4. Visit the saved page
5. Ensure that the pattern looks like in the images below.

| Desktop | Mobile |
|--------|--------|
|![locale local](https://github.com/woocommerce/woocommerce-blocks/assets/4463174/ab742211-4b4a-479d-87f9-75c0d1329e32)|!['Locale Galaxy Fold](https://github.com/woocommerce/woocommerce-blocks/assets/4463174/832ea72f-21ff-4070-bee6-341e3732fe65)|

#### Fix spacing on the "Minimal header" pattern. [11477](https://github.com/woocommerce/woocommerce-blocks/pull/11477)

1. Create a new page or post and insert the `Minimal header` pattern.
2. Make sure there's no space at the right of the navigation block, as in the after screenshot below (note the blue color was added just to make it easier to visualize the space).

| Before | After |
| ------ | ----- |
| <img width="1381" alt="Screenshot 2023-10-27 at 11 51 26" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/9037fbc8-cc75-4b36-8ab7-ebd089dc81bf"> | <img width="1370" alt="Screenshot 2023-10-27 at 11 51 36" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/76dba159-e330-4cb0-9d5a-2640e3dae639"> |


#### "Product Gallery" improvements: remove product summary and update margins. [11464](https://github.com/woocommerce/woocommerce-blocks/pull/11464)

1. Create a new page or post and insert the `Product Gallery` pattern.
2. Check it does not include the product summary and looks like the screenshot.
![CleanShot 2023-10-26 at 12 56 12@2x](https://github.com/woocommerce/woocommerce-blocks/assets/186112/5b9b708c-09c5-49ad-b7ad-9ccddb75b792)

#### "Product Collection X Columns" patterns: align "no reviews" text with the star. [11468](https://github.com/woocommerce/woocommerce-blocks/pull/11468)

1. Add a post.
2. Add the Product Collection 3 Columns pattern.
3. Ensure that the "no reviews" text is aligned with the star.

| Before | After |
| ------ | ----- |
|![image](https://github.com/woocommerce/woocommerce-blocks/assets/4463174/46d1bbff-cd70-49d2-9bab-eec6c192931d)|![image](https://github.com/woocommerce/woocommerce-blocks/assets/4463174/20ac9c8f-2976-4fb7-95e6-50547b659096)|

#### Enhance the Hero Product Split pattern. [11505](https://github.com/woocommerce/woocommerce-blocks/pull/11505)

1. Create a new post
2. Insert the Hero Product Split pattern
3. Make sure things are working as expected on the editor side
4. Save the post and access the frontend: make sure things are working as expected over there as well.

| Before | After |
| ------ | ----- |
| <img width="683" alt="Screenshot 2023-10-30 at 22 17 34" src="https://github.com/woocommerce/woocommerce-blocks/assets/15730971/56c6c94d-6151-4611-8db1-48da5412f857"> | <img width="683" alt="Screenshot 2023-10-30 at 22 17 50" src="https://github.com/woocommerce/woocommerce-blocks/assets/15730971/112c668f-b081-4d81-b9d4-c6072b67d838"> |

#### Simplify the Hero Product 3 Split pattern. [11495](https://github.com/woocommerce/woocommerce-blocks/pull/11495)

1. Create a new page or post and insert the `Hero Product 3 Split` pattern.
2. Save and check it looks good on desktop and mobile and looks like the screenshot below (ignore the broken image, it's due to how the screenshot was taken).

| Mobile |
| ------ |
| ![CleanShot 2023-10-30 at 15 35 45@2x](https://github.com/woocommerce/woocommerce-blocks/assets/186112/4db05bd6-5d6d-4ed8-8e6c-03816a6c9a4e) |

| Desktop |
|--------|
| <img width="1184" alt="Screenshot 2023-10-30 at 15 35 10" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/c6b5bdc5-589a-4790-8b1d-023c2610de74">|

#### Product Search Block: unify border-radius. [11515](https://github.com/woocommerce/woocommerce-blocks/pull/11515)

1. Add a new post.
2. Add the `Footer with Simple Menu`.
3. Save.
4. Ensure that the patterns look okay on desktop and mobile (and match with the screenshot).
5. Repeat 1-4 for each pattern that it is in the screenshot (use the title for searching the pattern in the inserter).


![img](https://github.com/woocommerce/woocommerce-blocks/assets/4463174/a3e36272-e84f-458b-886a-b5ebd1b1a880)

#### Improve the Centered Header Menu with Search pattern. [11304](https://github.com/woocommerce/woocommerce-blocks/pull/11304)

1. Create a new page or post.
2. Insert the `Centered Header Menu with Search` pattern.
3. Check it looks like the screenshot below.
4. Check all the elements are visible on mobile.

⚠️ In the next release, we will update the pattern name: <https://github.com/woocommerce/woocommerce-blocks/issues/11523>


| Desktop |
|--------|
|![image](https://github.com/woocommerce/woocommerce-blocks/assets/4463174/234ad207-3ef9-4034-92ff-c2ea56e11d46)|

| Mobile |
|--------|
|![image](https://github.com/woocommerce/woocommerce-blocks/assets/4463174/be183db3-f674-4a3f-b846-996c0b7fccbc)|

#### Large Header pattern: improve the layout on mobile view. [11490](https://github.com/woocommerce/woocommerce-blocks/pull/11490)

1. Add a new post.
2. Add the Large Header pattern.
3. Save the post.
4. Visit the saved post.
5. Ensure that the pattern looks okay.
6. Switch to the mobile view.
7. Ensure that the pattern looks okay.

![image](https://github.com/woocommerce/woocommerce-blocks/assets/4463174/518da445-dbff-4742-a741-94f76a018dc8)

### Mobile

![image](https://github.com/woocommerce/woocommerce-blocks/assets/4463174/131f41e0-a74e-4125-8492-47ae5981a1ad)

#### Improve the "Large footer" spacing. [11520](https://github.com/woocommerce/woocommerce-blocks/pull/11520)

1. Create a new page or post and insert the `Large footer` pattern.
2. Check there's no space.


<img width="707" alt="Screenshot 2023-10-31 at 12 56 33" src="https://github.com/woocommerce/woocommerce-blocks/assets/186112/fa4c0335-9c13-44e1-a599-36ee21663e2c">
2 changes: 2 additions & 0 deletions docs/internal-developers/testing/releases/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ Every release includes specific testing instructions for new features and bug fi
- [11.3.1](./1131.md)
- [11.4.0](./1140.md)
- [11.4.1](./1141.md)
- [11.4.2](./1142.md)
- [11.4.3](./1143.md)

<!-- FEEDBACK -->

Expand Down
35 changes: 34 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: gutenberg, woocommerce, woo commerce, products, blocks, woocommerce blocks
Requires at least: 6.3.2
Tested up to: 6.3.2
Requires PHP: 7.4
Stable tag: 11.4.1
Stable tag: 11.4.3
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -81,6 +81,39 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/

== Changelog ==

= 11.4.3 - 2023-10-30 =

#### Enhancements

- Improve Hero Product Chessboard pattern. [11423](https://github.com/woocommerce/woocommerce-blocks/pull/11423)
- Fix spacing on the "Minimal header" pattern. [11477](https://github.com/woocommerce/woocommerce-blocks/pull/11477)
- "Product Gallery" improvements: remove product summary and update margins. [11464](https://github.com/woocommerce/woocommerce-blocks/pull/11464)
- Patterns with Search Bar: improve style. [11478](https://github.com/woocommerce/woocommerce-blocks/pull/11478)
- "Product Collection X Columns" patterns: align "no reviews" text with the star. [11468](https://github.com/woocommerce/woocommerce-blocks/pull/11468)
- Rename the Footer with Simple Menu and Cart pattern. [11487](https://github.com/woocommerce/woocommerce-blocks/pull/11487)
- Enhance the Hero Product Split pattern. [11505](https://github.com/woocommerce/woocommerce-blocks/pull/11505)
- Simplify the Hero Product 3 Split pattern. [11495](https://github.com/woocommerce/woocommerce-blocks/pull/11495)
- Improve the Centered Header Menu with Search pattern. [11304](https://github.com/woocommerce/woocommerce-blocks/pull/11304)
- Large Header pattern: improve the layout on mobile view. [11490](https://github.com/woocommerce/woocommerce-blocks/pull/11490)
- Improve the "Large footer" spacing. [11520](https://github.com/woocommerce/woocommerce-blocks/pull/11520)

= 11.4.2 - 2023-10-25 =

#### Enhancements

- Improve the button size on the "Product Collection 4 Column" pattern. [11433](https://github.com/woocommerce/woocommerce-blocks/pull/11433)
- Update the patterns content after a plugin update. [11210](https://github.com/woocommerce/woocommerce-blocks/pull/11210)
- Improve the "Minimal header" pattern spacing and title. [11434](https://github.com/woocommerce/woocommerce-blocks/pull/11434)
- Store Customization > Ensure dummy products can have AI-generated content. [11155](https://github.com/woocommerce/woocommerce-blocks/pull/11155)
- Improve the Testimonials 3 columns pattern. [11430](https://github.com/woocommerce/woocommerce-blocks/pull/11430)
- Add overlay to the "Featured Category Triple" pattern. [11428](https://github.com/woocommerce/woocommerce-blocks/pull/11428)
- Improve the "Footer with 3 Menus" pattern. [11379](https://github.com/woocommerce/woocommerce-blocks/pull/11379)
- Update the "Large footer" pattern. [11413](https://github.com/woocommerce/woocommerce-blocks/pull/11413)
- Improve the "Essential Header". [11449](https://github.com/woocommerce/woocommerce-blocks/pull/11449)
- Improve the mobile view for the Minimal header pattern. [11463](https://github.com/woocommerce/woocommerce-blocks/pull/11463)
- Update the Footer with simple menu and cart pattern. [11409](https://github.com/woocommerce/woocommerce-blocks/pull/11409)
- Update the image provider for the Customize Your Store experience, migrating from Verticals to Pexels. [11280](https://github.com/woocommerce/woocommerce-blocks/pull/11280)

= 11.4.1 - 2023-10-25 =

#### Bug Fixes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ protected function email_verification_required( $order ) {
* the 'order received' or 'order pay' pages.
*
* @see \WC_Shortcode_Checkout::order_received()
* @since $VID:$
* @since 11.4.0
* @param int $grace_period Time in seconds after an order is placed before email verification may be required.
* @param \WC_Order $order The order for which this grace period is being assessed.
* @param string $context Indicates the context in which we might verify the email address. Typically 'order-pay' or 'order-received'.
Expand Down Expand Up @@ -195,7 +195,7 @@ protected function email_verification_required( $order ) {
* before we show information such as the order summary, or order payment page.
*
* @see \WC_Shortcode_Checkout::order_received()
* @since $VID:$
* @since 11.4.0
* @param bool $email_verification_required If email verification is required.
* @param WC_Order $order The relevant order.
* @param string $context The context under which we are performing this check.
Expand Down
8 changes: 4 additions & 4 deletions templates/parts/checkout-header.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!-- wp:group {"tagName":"header","area":"header","metadata":{"name":"Checkout Header"},"layout":{"type":"constrained"}} -->
<header class="wp-block-group">
<!-- wp:group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group">
<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|40"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
<div class="wp-block-group alignwide" style="padding-bottom:var(--wp--preset--spacing--40)">
<!-- wp:site-title {"level":0} /-->
</div>
<!-- /wp:group -->
</header>
<!-- /wp:group -->
</div>
<!-- /wp:group -->
10 changes: 5 additions & 5 deletions woocommerce-gutenberg-products-block.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
* Author: Automattic
* Author URI: https://woocommerce.com
* Text Domain: woo-gutenberg-products-block
* Requires at least: 6.3
* Requires PHP: 7.3
* WC requires at least: 7.9
* WC tested up to: 8.0
* Requires at least: 6.3.2
* Requires PHP: 7.4
* WC requires at least: 8.1
* WC tested up to: 8.2
*
* @package WooCommerce\Blocks
* @internal This file is only used when running as a feature plugin.
*/

defined( 'ABSPATH' ) || exit;

$minimum_wp_version = '6.3';
$minimum_wp_version = '6.3.2';

if ( ! defined( 'WC_BLOCKS_IS_FEATURE_PLUGIN' ) ) {
define( 'WC_BLOCKS_IS_FEATURE_PLUGIN', true );
Expand Down

0 comments on commit d7e0321

Please sign in to comment.