Skip to content

Commit

Permalink
Allow coupons Memberships gifts and coupons CPT types and metas (#40541)
Browse files Browse the repository at this point in the history
* whitelist coupons and gifts cpt types and metas
* Changelogs
* Gift and coupons CPT setup
* Update class-jetpack-memberships.php

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

Upstream-Ref: Automattic/jetpack@d349c0a
  • Loading branch information
millerf authored and matticbot committed Dec 12, 2024
1 parent 2eb7581 commit 62e1860
Show file tree
Hide file tree
Showing 11 changed files with 130 additions and 127 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"automattic/jetpack-search": "^0.47.4-alpha",
"automattic/jetpack-stats": "^0.14.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.1.0"
"automattic/jetpack-sync": "^4.1.1-alpha"
},
"require-dev": {
"automattic/jetpack-changelogger": "^5.1.0",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.1.0",
"automattic/jetpack-sync": "^4.1.1-alpha",
"automattic/jetpack-protect-status": "^0.4.0"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.2",
"automattic/jetpack-connection": "^6.2.1-alpha",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-sync": "^4.1.0",
"automattic/jetpack-sync": "^4.1.1-alpha",
"automattic/jetpack-protect-models": "^0.4.1",
"automattic/jetpack-plans": "^0.5.1"
},
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-search/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-config": "^3.0.0",
"automattic/jetpack-my-jetpack": "^5.1.2-alpha",
"automattic/jetpack-sync": "^4.1.0"
"automattic/jetpack-sync": "^4.1.1-alpha"
},
"require-dev": {
"automattic/jetpack-changelogger": "^5.1.0",
Expand Down
5 changes: 5 additions & 0 deletions jetpack_vendor/automattic/jetpack-sync/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [4.1.1-alpha] - unreleased

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

## [4.1.0] - 2024-12-09
### Added
- WordPress.com Features: add Holiday Snow functionality. [#40478]
Expand Down Expand Up @@ -1355,6 +1359,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Packages: Move sync to a classmapped package

[4.1.1-alpha]: https://github.com/Automattic/jetpack-sync/compare/v4.1.0...v4.1.1-alpha
[4.1.0]: https://github.com/Automattic/jetpack-sync/compare/v4.0.2...v4.1.0
[4.0.2]: https://github.com/Automattic/jetpack-sync/compare/v4.0.1...v4.0.2
[4.0.1]: https://github.com/Automattic/jetpack-sync/compare/v4.0.0...v4.0.1
Expand Down
2 changes: 0 additions & 2 deletions jetpack_vendor/automattic/jetpack-sync/src/class-defaults.php
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,6 @@ public static function get_callable_whitelist() {
'wp_log', // WP Logging Plugin.
'wpephpcompat_jobs',
'wprss_feed_item',
'memberships_coupon',
'memberships_gift',
'tribe-ea-record', // The Events Calendar Plugin - Store Event Aggregator record information.
'wphb_minify_group', // Hummingbird Plugin - Used internally to keep data about assets minification.
'bigcommerce_task', // BigCommerce Plugin - Store import queue.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '4.1.0';
const PACKAGE_VERSION = '4.1.1-alpha';

const PACKAGE_SLUG = 'sync';

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 @@ -74,7 +74,7 @@
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
'ver' => '4.1.0',
'ver' => '4.1.1-alpha1734001941',
),
),
);
66 changes: 33 additions & 33 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": "f6d4da7c829bc1f469c0dad94077f4488676f589"
"reference": "d120962f7eb5b62fc085227f52ed40d08203b9aa"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "e01dfbb81866ac087cd0c32b7c31b191d8870a3c"
"reference": "bb3b55d5aae16bc57348c420c701f6f51084fe4a"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "b4dcb63add7e5045e112ddb34e2dfab8156b4219"
"reference": "b7d0a9bf4ab16b2571629da11cd6620b79e61cf4"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -203,7 +203,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "e6e2c981c36348de26c138bcd1672b42706d4480"
"reference": "cbe630b68531f899576c32bed37db168191dbbca"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -274,7 +274,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "bd0ceb6dece2524a3cd8bc6c07ebf5f2e4ac67c0"
"reference": "bc45699750dfacbe1777fb0f4866c7759df30198"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -345,7 +345,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "912022f1126a5b6f79734ba1ca7c5d05b760f1dc"
"reference": "0956c8f436d2f9476da3b2e80cc5284e60f075d1"
},
"require": {
"automattic/jetpack-boost-core": "^0.3.2",
Expand Down Expand Up @@ -424,7 +424,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "81a3bcca7c5672501c4e1dd9a5ec6fa659c39d39"
"reference": "3934553cbabafd09e66a607df723b50f45445cca"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -487,7 +487,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "301cff4bfe76196a8b81fa20fa7627db3d65ee14"
"reference": "182c857aaf55e82fbd201727f1e35e61757c5b43"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -562,7 +562,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "56ef16c6226ff100bcbeb4f3d788ed4c7ddfc2f2"
"reference": "8f6e0811d51ebec51d6c9e9d3c3a6e2e520c6ebd"
},
"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": "94ff7c0209910efcf059239e497bc35dfc74210a"
"reference": "04bee248b54a04663c038e1ed951d1aafdf7c6bb"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -712,7 +712,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "8008247dd2896fefb71edb835c509614e2ce8ab9"
"reference": "02fa09d1528e4be911dc7ed868f8470c0283b837"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -768,7 +768,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "1df80c414c8c4515502ca5aae3f5093f922ec85b"
"reference": "fe1654aea289824c721c32f5606aa6d9db4dc586"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -846,7 +846,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "ca60bff2d8d9e37481ff79291c87c93f252fa1a7"
"reference": "bdcf5be7c4f29aaa34fa6064b8f91dc75fea5696"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -907,7 +907,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "7efd16b11520f0942ef11135b6589c407ff88655"
"reference": "8513adf449f8a29fb0ec1d213366e3b5ea1beb23"
},
"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": "dc60aea526c5d9b3eccad4a27989fda00dfde638"
"reference": "a6b201e8d79315d4a95774d646f6a68852e879cb"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -1050,7 +1050,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "595fe1a1e62b772adaaab660fe6c45d33a72736a"
"reference": "9c5df8330724dfadee6504fa788e05e65a02eef2"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1106,7 +1106,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "c3720b27038c6f88fd5d6d4f9217ac8af7929772"
"reference": "790d57ca893e55721772d028f615699be524f158"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.1",
Expand All @@ -1122,7 +1122,7 @@
"automattic/jetpack-protect-status": "^0.4.0",
"automattic/jetpack-redirect": "^3.0.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.1.0",
"automattic/jetpack-sync": "^4.1.1-alpha",
"php": ">=7.2"
},
"require-dev": {
Expand Down Expand Up @@ -1211,7 +1211,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "d133e274f6db4fb364845a330a6e1574c30107bc"
"reference": "98ead5b9b8d87ca6bb8eae540975a8d2874ade1d"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1275,7 +1275,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "9ab70aa553889524c75390879575dbd72771426e"
"reference": "a2bb2df0a0e6dc93b2991636f651b94e34e46005"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -1346,7 +1346,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "d43d778e6c17415d181a0ff1a951c0e5698821f3"
"reference": "2e7d0adaf0c5a05c18b48292f1d447bb49c1a2de"
},
"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": "dd84f24de61ee87bdaf098f696b2569af55e3bf7"
"reference": "4729270c3c5d89f81095b9895f99805abc3f963e"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1478,14 +1478,14 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "0a891ba21cf4c19e7d493a9fe19dcaff17b68d47"
"reference": "8eb5d0c741e9d645b0623649dc92198faaf33d6d"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-protect-models": "^0.4.1",
"automattic/jetpack-sync": "^4.1.0",
"automattic/jetpack-sync": "^4.1.1-alpha",
"php": ">=7.2"
},
"require-dev": {
Expand Down Expand Up @@ -1556,7 +1556,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "ebba06dec550abec81ce148515528fe9c29db3f1"
"reference": "d4ce3390fd7beab5f3b958c07c8a36b6819d89ce"
},
"require": {
"automattic/jetpack-status": "^5.0.1",
Expand Down Expand Up @@ -1614,7 +1614,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "3b0ae188df87f2fe6cc5ff4cb66c670173b08b1e"
"reference": "5d7523847a98845bf2c9f6e3846cf49400b0087f"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1671,7 +1671,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-search",
"reference": "343ea1297f8dea877941ba6b0c27a9db3c406f8b"
"reference": "007d8c044efc9bb63c4fc0fe7a97c8636a1346f1"
},
"require": {
"automattic/jetpack-assets": "^4.0.2-alpha",
Expand All @@ -1680,7 +1680,7 @@
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-my-jetpack": "^5.1.2-alpha",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.1.0",
"automattic/jetpack-sync": "^4.1.1-alpha",
"php": ">=7.2"
},
"require-dev": {
Expand Down Expand Up @@ -1762,7 +1762,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
"reference": "30b799d86aa45f589bc8a20571ae89c8234bc826"
"reference": "4f98881ac1525491781d23ccc2eae0af49f73ce7"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down Expand Up @@ -1832,7 +1832,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "7887ade7aff3338bc75e0823afd97652da44cc80"
"reference": "d1319a7fb86e673331808de803f774e6c2bfbd5b"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -1894,12 +1894,12 @@
},
{
"name": "automattic/jetpack-sync",
"version": "4.1.0",
"version_normalized": "4.1.0.0",
"version": "4.1.1-alpha.1734001941",
"version_normalized": "4.1.1.0-alpha1734001941",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "bdae8673c4e16c9c95e0587608d90f00e32acbf7"
"reference": "e6f1c33e488768d3b07f90f132a1b0e4be153b0b"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down
Loading

0 comments on commit 62e1860

Please sign in to comment.