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 dd33f19 commit 98e9ac2
Show file tree
Hide file tree
Showing 10 changed files with 128 additions and 125 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-publicize": "^0.56.5-alpha",
"automattic/jetpack-connection": "^6.2.1-alpha",
"automattic/jetpack-my-jetpack": "^5.1.2-alpha",
"automattic/jetpack-sync": "^4.1.0",
"automattic/jetpack-sync": "^4.1.1-alpha",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-post-list": "^0.7.2-alpha"
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
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',
),
),
);
64 changes: 32 additions & 32 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": "382e93846b7595c2c3a12d9ba4765007ab475720"
"reference": "2b7db2d3ede6eb515dcdd6081431a9c10e5f9f44"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "9e3a53674d5557c27b69d2e81d624617f04fc7fd"
"reference": "3f2daf55e1bb369c224502a3ed964d00b8e0d8ce"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "e84cc0f15465a3a703124898133ff7b8b6407545"
"reference": "994311bcead6449b5bfdbd2d048af9a9b6f8394a"
},
"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": "05e7fae11de326fc041f79b1b566f89e3b9d8095"
"reference": "b8e44cc8147b3fe82df4a7a87bad9a5fd29ae9e3"
},
"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": "c6fe62a4101541d5407094e09c409481faf9ae66"
"reference": "066541b0e4a1a0ee2f4262217be15a530d3408df"
},
"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": "6edc0f337781f6a885d14b82d224a7d7c000f3e4"
"reference": "bb95fa161cd1ec4a60ea465ba0f43ca8c699d2f7"
},
"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": "03e52963dcd1d8c23227ddeab2f14657feed6927"
"reference": "f72c7156a81d1afb0b2c0464134322cac2beb6eb"
},
"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": "196848536efdda1537a2721fb49271ec6b1661b2"
"reference": "4c8ab395b85da4b2b5f4418241643e452d9879ca"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -562,7 +562,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "b5d43e8e5365748d8c817e660f44970e87eaa734"
"reference": "cd56127429185573fc90c364564c4bcbbd58afa6"
},
"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": "e2a1bbe0ef28d737db411cab248f2f0e244194f8"
"reference": "cb6b7689adfe78315f60eefbaf6ee5b7c4094b97"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -712,7 +712,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "d807ac1661ac43872f69a5b31c30c18f4c75eb57"
"reference": "e98230d461d28422d86324851daa28042b6e39dd"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -768,7 +768,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "7fd93ecfb62018fa67855dc3205af47d56c7f0ec"
"reference": "9f8756566f2d16e245b9cb6a068ae5340eaa93e7"
},
"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": "0c08f51cb6033fc26822a387fc5504383a53b0f8"
"reference": "443c1951613c6d2ad9af78f46610efa9fb35a696"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -907,7 +907,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "df6a0fd1cfcb12e78011e8046024eb094d43caea"
"reference": "f1911494183223dd91bf267af0e72d113c1b2794"
},
"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": "bdb2f3aac1b8e6f4c61f4f1443c4569158d0b8fc"
"reference": "fbdfd7f9ad218cd50e0a3f70c3a046989d349f25"
},
"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": "078d5a6497566eb46194bbe2c5c7c04707a1d004"
"reference": "2d73b27d1ccd609dbcf9b227ed1d7785e06f59a6"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1106,7 +1106,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "021b510db6d4f7309bfbdff247dce72c03fe593c"
"reference": "32206c1e4ead3093fab9e7be037fb69b943b7e89"
},
"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": "dee2eb79b1a32e26d96a6ef4aa09d03c9ebc37e6"
"reference": "922335b2226df2866a76fdc56c5ec57bd18de881"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1275,7 +1275,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "0558a4758ba8546d950704bf72b2dd7cfbc84f9c"
"reference": "1bc9ccdb279bdfe6929af7bbd677e10b00feaf30"
},
"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": "bf76d3aa32f361a39a3898c4c5036e4f43c1dcdc"
"reference": "4ec39c05fc4ce4a26830d9f6c83f18a84ee021a4"
},
"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-post-list",
"reference": "bdacf128831026e2fff84d3a89538195cf32a16f"
"reference": "8e83eb2f123f50f7ffb1b654e4c160a79423f60b"
},
"require": {
"automattic/jetpack-assets": "^4.0.2-alpha",
Expand Down Expand Up @@ -1473,7 +1473,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "655cefab6a9016b887ab3666467e60473d63b0fd"
"reference": "e0099d990eea14a8d94229e9a3ffd47cd031b72b"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1546,14 +1546,14 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "503ad1e33167acd07540002be2850f5a66f93d6b"
"reference": "c665b008a5fcd1bb17bc8d8c728032e27ee103ff"
},
"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 @@ -1624,7 +1624,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-publicize",
"reference": "08261d8ced2a8f085caf869814213ea8fd0f40df"
"reference": "c8dc4681d7db3cd5f3a72d2a71e0ddc66bd9894e"
},
"require": {
"automattic/jetpack-assets": "^4.0.2-alpha",
Expand Down Expand Up @@ -1709,7 +1709,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "c4c0f13076614548cc95463977d23b3b3563040d"
"reference": "25c70f98fdf63bcea0caec1dcd6f75e4d7a9d158"
},
"require": {
"automattic/jetpack-status": "^5.0.1",
Expand Down Expand Up @@ -1767,7 +1767,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "3eb457a87f49927f408cbf477fb93afd20f83f22"
"reference": "ff799c3ed7b4060776be8592687bc4ade9c5e0c5"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1824,7 +1824,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "e8e76b0f146084883443ae7153ab83652bfcf222"
"reference": "016530e48cf06c321801d6534f9d5ecdd7d726b0"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -1886,12 +1886,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": "aa70b71793a9e2a732b300c105c930e56b6fd976"
"reference": "1b05bde14f4a4fc108e123b0e99c2d2d4c993155"
},
"require": {
"automattic/jetpack-connection": "^6.2.1-alpha",
Expand Down
Loading

0 comments on commit 98e9ac2

Please sign in to comment.