Skip to content

Commit

Permalink
chore(release): merge in release v1.75.1
Browse files Browse the repository at this point in the history
  • Loading branch information
matticbot committed Sep 28, 2023
2 parents 55e4be3 + 868c89c commit 814932e
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 8 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## [1.75.1](https://github.com/Automattic/newspack-blocks/compare/v1.75.0...v1.75.1) (2023-09-28)


### Bug Fixes

* **checkout-button:** handle 10+ product variations ([#1536](https://github.com/Automattic/newspack-blocks/issues/1536)) ([5df5065](https://github.com/Automattic/newspack-blocks/commit/5df5065011d6779a689358844212628757b6b5b9))
* query for CAP terms ([#1535](https://github.com/Automattic/newspack-blocks/issues/1535)) ([49406b9](https://github.com/Automattic/newspack-blocks/commit/49406b9bf1075897939cad2e4c30f34efcf841da))

# [1.75.0](https://github.com/Automattic/newspack-blocks/compare/v1.74.2...v1.75.0) (2023-09-25)


Expand Down
9 changes: 8 additions & 1 deletion includes/class-newspack-blocks.php
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,7 @@ function ( $acc, $block ) use ( $block_name ) {
if ( $authors && count( $authors ) ) {
$co_authors_names = [];
$author_names = [];
$author_emails = [];

if ( $is_co_authors_plus_active ) {
$co_authors_guest_authors = new CoAuthors_Guest_Authors();
Expand Down Expand Up @@ -736,7 +737,8 @@ function ( $acc, $block ) use ( $block_name ) {
unset( $authors[ $index ] );
}
} else {
$author_names[] = $author_data->user_login;
$author_names[] = $author_data->user_login;
$author_emails[] = $author_data->user_email;
}
}
}
Expand Down Expand Up @@ -771,6 +773,11 @@ function ( $acc, $block ) use ( $block_name ) {
'taxonomy' => 'author',
'terms' => $author_names,
],
[
'field' => 'name',
'taxonomy' => 'author',
'terms' => $author_emails,
],
],
];
}
Expand Down
4 changes: 2 additions & 2 deletions newspack-blocks.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
* Author URI: https://newspack.blog/
* Text Domain: newspack-blocks
* Domain Path: /languages
* Version: 1.75.0
* Version: 1.75.1
*
* @package Newspack_Blocks
*/

define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
define( 'NEWSPACK_BLOCKS__VERSION', '1.75.0' );
define( 'NEWSPACK_BLOCKS__VERSION', '1.75.1' );

require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automattic/newspack-blocks",
"version": "1.75.0",
"version": "1.75.1",
"author": "Automattic",
"devDependencies": {
"@rushstack/eslint-patch": "^1.3.3",
Expand Down
2 changes: 1 addition & 1 deletion src/blocks/checkout-button/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function CheckoutButtonEdit( props ) {
// Handle product variation data.
if ( data?.variations?.length ) {
setAttributes( { is_variable: true } );
apiFetch( { path: `/wc/v2/products/${ data.id }/variations` } )
apiFetch( { path: `/wc/v2/products/${ data.id }/variations?per_page=100` } )
.then( res => setVariations( res ) )
.catch( () => setVariations( [] ) );
} else {
Expand Down
4 changes: 3 additions & 1 deletion src/modal-checkout/modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
opacity: 0.5;
position: absolute;
top: 50%;
transform: translate(-50%, -50%);
transform: translate( -50%, -50% );
width: 100%;
> span {
animation: spin 1s infinite linear;
Expand Down Expand Up @@ -84,6 +84,8 @@
.newspack-blocks-variation-modal {
&__content {
padding: 32px;
overflow: auto;
border-radius: 5px;
h3 {
margin: 0 0 1em;
}
Expand Down

0 comments on commit 814932e

Please sign in to comment.