Skip to content

Commit

Permalink
Update remove creator card and handle growth bundle on applicable pro…
Browse files Browse the repository at this point in the history
…duct classes (#40192)

* Remove creator card and update checks for paid plans to include growth

* Add changelog

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11920479562

Upstream-Ref: Automattic/jetpack@9af0c49
  • Loading branch information
CodeyGuyDylan authored and matticbot committed Nov 19, 2024
1 parent 1b5ddb4 commit 2f0323f
Show file tree
Hide file tree
Showing 9 changed files with 111 additions and 100 deletions.
3 changes: 3 additions & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

This is an alpha version! The changes listed here are not final.

### Changed
- Remove creator card and update paid plan checks to account for growth

## [5.0.1] - 2024-11-18
### Changed
- Update dependencies. [#38910]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'db398117c2c37674d62a');
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'd26b372214e521ebacbe');
12 changes: 6 additions & 6 deletions jetpack_vendor/automattic/jetpack-my-jetpack/build/index.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ public static function has_paid_plan_for_product() {
'jetpack_business',
'jetpack_premium',
'jetpack_personal',
'jetpack_growth',
);
// For atomic sites, do a feature check to see if the republicize feature is available
// This feature is available by default on all Jetpack sites
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,10 @@ public static function is_upgradable() {
if ( ! is_wp_error( $purchases_data ) && is_array( $purchases_data ) && ! empty( $purchases_data ) ) {
foreach ( $purchases_data as $purchase ) {
// Jetpack complete includes Stats commercial & cannot be upgraded
if ( str_starts_with( $purchase->product_slug, 'jetpack_complete' ) ) {
if (
str_starts_with( $purchase->product_slug, 'jetpack_complete' ) ||
str_starts_with( $purchase->product_slug, 'jetpack_growth' )
) {
return false;
} elseif (
// Stats commercial purchased with highest tier cannot be upgraded.
Expand Down Expand Up @@ -229,7 +232,11 @@ public static function has_paid_plan_for_product() {
if ( is_array( $purchases_data ) && ! empty( $purchases_data ) ) {
foreach ( $purchases_data as $purchase ) {
// Stats is available as standalone product and as part of the Complete plan.
if ( strpos( $purchase->product_slug, 'jetpack_stats' ) !== false || str_starts_with( $purchase->product_slug, 'jetpack_complete' ) ) {
if (
strpos( $purchase->product_slug, 'jetpack_stats' ) !== false ||
str_starts_with( $purchase->product_slug, 'jetpack_complete' ) ||
str_starts_with( $purchase->product_slug, 'jetpack_growth' )
) {
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '5.0.2-alpha1731961756',
'ver' => '5.0.2-alpha1732045171',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
60 changes: 30 additions & 30 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "7830793f1318a6a6dc6006b8d25e90f1e02c150d"
"reference": "df932d01e5402de88a7af298476c10be393b7e17"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "887ddd7285c6c98d012a1fe2ed76c8898720c860"
"reference": "a8a8ea7b2e5dd471900c144758653fa218b7dfc2"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "005152ba43588c8839ae83c990263a0e24b2e845"
"reference": "21ac44ef7b2ca61902aa36e12c8987076ee4051c"
},
"require": {
"automattic/jetpack-constants": "^3.0.0",
Expand Down Expand Up @@ -203,7 +203,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "c1d722a198fda7ca0f2175033a1f1db09329f9c0"
"reference": "f13d5e7c4f45c993945043d9b7502e36d40f8db0"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0",
Expand Down Expand Up @@ -274,7 +274,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "01b7798fcbe71ac996285d5307f899b0e28372a3"
"reference": "87bb3dee78e83ce6f81db9bbaff1988024616202"
},
"require": {
"automattic/jetpack-connection": "^6.1.0-alpha",
Expand Down Expand Up @@ -345,7 +345,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "cf52ea9ed82f9d130c8259c29cc4f1833b8963fd"
"reference": "55ac737da7cb1eaddab3d48f606b95da00d9c80d"
},
"require": {
"automattic/jetpack-boost-core": "^0.3.0",
Expand Down Expand Up @@ -424,7 +424,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "c3f706ce0e5950ce92f57866033c512ebab334c3"
"reference": "035087df97eb7f9f5175d714afbe080835fb6beb"
},
"require": {
"composer-plugin-api": "^2.1.0",
Expand Down Expand Up @@ -487,7 +487,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "03777ea848f0ab19e1c7cf4e84ef0b5a849c6582"
"reference": "b3e236240ef255107e0af9d3a538a9a4e0f37602"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -562,7 +562,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "23c0d62ad7dfd108b57e8f2608cc5371881de0bd"
"reference": "35eb104c20db098fedf53a170ef056f5e294ca86"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -655,7 +655,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "fb5ac92d38784c587b4e33f6c6b30dad10d672f2"
"reference": "97e10bc612989aa5adbd57a88f66e8f606bcfbfc"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -712,7 +712,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "4d7ce6a6b4a8ee5b66e4407f0a29df8a09381bd5"
"reference": "67494a72e035273d17302c81e8a2835d38251be1"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -768,7 +768,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "47d76f2a1941b4ff317ba4dfd89398c82cac85fc"
"reference": "9d829040ef707faba089e0a8e2d30c3a5fc7e630"
},
"require": {
"automattic/jetpack-connection": "^6.1.0-alpha",
Expand Down Expand Up @@ -846,7 +846,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "38320a253f423b9e1082939d27500b7570dafc73"
"reference": "5d9ba7162740fa949dc3a033b8bc6bbdf8c4b39e"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -907,7 +907,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "3b7e14aa5e9d637c69ac3e01685662efc54ea323"
"reference": "818b01c5bb553e383262de0dfab222c1043bacc7"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -985,7 +985,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "03e848a5c18e647fd3ea61fcbd240d5e0a130904"
"reference": "2b571ac61067850e0e0e95713e396ab635066d41"
},
"require": {
"automattic/jetpack-connection": "^6.1.0-alpha",
Expand Down Expand Up @@ -1050,7 +1050,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "ff40d53f277a4fabed7ad9f6bbde379bd18fb0ac"
"reference": "46cf4b6e4551fb8281b640ea861b6af71a65defb"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1101,12 +1101,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "5.0.2-alpha.1731961756",
"version_normalized": "5.0.2.0-alpha1731961756",
"version": "5.0.2-alpha.1732045171",
"version_normalized": "5.0.2.0-alpha1732045171",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "5971c23dfe1818ca50f7d52e7e9542722e3b14ee"
"reference": "f850325183632afa00dfb00d0b1b5eaa26293dc3"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.0",
Expand Down Expand Up @@ -1211,7 +1211,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "05a265990f8239a4a8608d8c7b143aafef0aee0e"
"reference": "3f980d2bedbf9edeaf527c3de0cd96c52c7aa7da"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1275,7 +1275,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "82f1513fc0d759ccee21de6bfb81e9ba66ace9ce"
"reference": "cba5b6aa106fbbd97b43fc5945d81b671777bf1c"
},
"require": {
"automattic/jetpack-connection": "^6.1.0-alpha",
Expand Down Expand Up @@ -1346,7 +1346,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "de1c37658ee0964190b834ff22d4dbdae343db16"
"reference": "074f49bdd41b0a522fd40f05c5bf586d4bab5e71"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1405,7 +1405,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "76a679d36adcd2b947a4819a2b60f92ce31725a1"
"reference": "2b87dbf2c4240b898ecdb0790281f125e2042ac4"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1478,7 +1478,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "1956d27a4ffc764a3ed3d4f1dce981d960acf84b"
"reference": "a67c0b8ca62a68e9de51c3501c51903082b8630e"
},
"require": {
"automattic/jetpack-connection": "^6.1.0-alpha",
Expand Down Expand Up @@ -1556,7 +1556,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "84fcb243c808187ba79d1bf7ac679489b1fb8996"
"reference": "1e9a0a9a517820700d2ae3cb53b6d64d2783183c"
},
"require": {
"automattic/jetpack-status": "^5.0.1-alpha",
Expand Down Expand Up @@ -1614,7 +1614,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "deb8a4ba38174e2c0b860b69f94dd51a800c89a9"
"reference": "a052cc9ea5b2da1325048d0bc82b028a48ae34f2"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1671,7 +1671,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-search",
"reference": "00100a880e6163ae627b21ee7f4d18e06df60999"
"reference": "f61eb2dbdfa8507c420ccc5fac6f97624e78fc0d"
},
"require": {
"automattic/jetpack-assets": "^4.0.0-alpha",
Expand Down Expand Up @@ -1762,7 +1762,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
"reference": "626a5c8793bc2e12ab83679aa4b88d40a7309da1"
"reference": "07ff56dff0e25bbde64c1e5ced3e75f07b1ca8be"
},
"require": {
"automattic/jetpack-connection": "^6.1.0-alpha",
Expand Down Expand Up @@ -1832,7 +1832,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "053b22be90640507aa1cc3d7d6e877d5acf982c6"
"reference": "718c762bbed67e2866e4589e146bd536d4427244"
},
"require": {
"automattic/jetpack-constants": "^3.0.0",
Expand Down Expand Up @@ -1899,7 +1899,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "04489fee95e3ea45348426c04ca3071fa83fbe18"
"reference": "7ee1d82531ec6d8ab6e111d5e475bbb40425ca5f"
},
"require": {
"automattic/jetpack-connection": "^6.1.0-alpha",
Expand Down
Loading

0 comments on commit 2f0323f

Please sign in to comment.