From 4d4e04ea65041de8a6f5fee9c8359621b8a52c57 Mon Sep 17 00:00:00 2001 From: Fabien O'Carroll Date: Tue, 9 Nov 2021 11:22:04 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20offers=20remaining?= =?UTF-8?q?=20after=20subscription=20change?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refs https://github.com/TryGhost/Team/issues/1092 This ensures that when a subscription is changed by a Member that the Offer is removed and will no longer apply. --- package.json | 2 +- yarn.lock | 40 ++++++++++++++++++++++++---------------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 5b58b73ec5..4f750c0fea 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "@tryghost/limit-service": "1.0.0", "@tryghost/logging": "1.0.0", "@tryghost/magic-link": "1.0.14", - "@tryghost/members-api": "2.7.2", + "@tryghost/members-api": "2.7.4", "@tryghost/members-csv": "1.1.8", "@tryghost/members-importer": "0.3.4", "@tryghost/members-offers": "0.10.1", diff --git a/yarn.lock b/yarn.lock index f2a2d72196..f089e3604a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1567,10 +1567,10 @@ "@tryghost/domain-events" "^0.1.3" "@tryghost/member-events" "^0.3.1" -"@tryghost/members-api@2.7.2": - version "2.7.2" - resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-2.7.2.tgz#0402f71458762e333b0ac70b9664aafa1ed1e735" - integrity sha512-wlKfJ6RDClCOeWV2PSPt1PjYDgT+JDqaPGTDuN7+xnizynvm4g7xbTc975OJ63XyerwWu9x45upNgPoxny4+8A== +"@tryghost/members-api@2.7.4": + version "2.7.4" + resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-2.7.4.tgz#0941f8d892fb72c15f820947b2ac444bd570cd6d" + integrity sha512-C7w/aKRzDwR3Aol0mVborOQAv6mE8cVV4G0J2L757BjhyKuMeVAOb6X+uCYBLNhe0zabiKow6GwN+f1M/qXp4A== dependencies: "@tryghost/debug" "^0.1.2" "@tryghost/domain-events" "^0.1.3" @@ -1580,8 +1580,8 @@ "@tryghost/member-analytics-service" "^0.1.4" "@tryghost/member-events" "^0.3.1" "@tryghost/members-analytics-ingress" "^0.1.5" - "@tryghost/members-payments" "^0.1.3" - "@tryghost/members-stripe-service" "^0.4.0" + "@tryghost/members-payments" "^0.1.4" + "@tryghost/members-stripe-service" "^0.5.0" "@tryghost/tpl" "^0.1.2" "@types/jsonwebtoken" "^8.5.1" bluebird "^3.5.4" @@ -1615,7 +1615,7 @@ "@tryghost/tpl" "^0.1.3" moment-timezone "0.5.23" -"@tryghost/members-offers@0.10.1", "@tryghost/members-offers@^0.10.1": +"@tryghost/members-offers@0.10.1": version "0.10.1" resolved "https://registry.yarnpkg.com/@tryghost/members-offers/-/members-offers-0.10.1.tgz#40b8498b2827a5be436f323235e433903178b380" integrity sha512-jndpQXLSLL0gWP4QHTDfdE282w5B/7iMULzTfjyK9Vzz87Ja3dYu5iWeTiWVhpITAOQm3bY/bgntYfgBB7UzZA== @@ -1623,13 +1623,21 @@ "@nexes/mongo-utils" "^0.3.1" "@tryghost/string" "^0.1.20" -"@tryghost/members-payments@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@tryghost/members-payments/-/members-payments-0.1.3.tgz#2fbd7669cc31938a6c45ae84bdbe9df74dd7fcdb" - integrity sha512-Ri1/GO1+AfB2gltO/2MlUT0hB5gdTKCe29Qkw0MlHiU9MUIiYdekYhOK7hZxRscnmMpMCgS86HwGaoQPKI+ETg== +"@tryghost/members-offers@^0.10.2": + version "0.10.2" + resolved "https://registry.yarnpkg.com/@tryghost/members-offers/-/members-offers-0.10.2.tgz#5716e9be902ef924c3fb9fad48a7ab38cd58b7c0" + integrity sha512-LL+Rrn5VHwGf8cMnIVCFhkkBI6Eg1CkVjLa3qi0/NRncy28IhVn0jjg1aJa6hoicCWZLg1/efT2RhI5RvC4Gzw== + dependencies: + "@nexes/mongo-utils" "^0.3.1" + "@tryghost/string" "^0.1.20" + +"@tryghost/members-payments@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@tryghost/members-payments/-/members-payments-0.1.4.tgz#613e588b354a3e432f159f9179c946d90388bf85" + integrity sha512-0fA0uLRV5zPaZgEl7XuQYqtLZjJWWJVUXZq2xiKNi5jw4/koCPKjVicBOuMtRWBK0Nn5Mma6B9uBvhkMGUMqgw== dependencies: "@tryghost/domain-events" "^0.1.3" - "@tryghost/members-offers" "^0.10.1" + "@tryghost/members-offers" "^0.10.2" "@tryghost/members-ssr@1.0.15": version "1.0.15" @@ -1644,10 +1652,10 @@ jsonwebtoken "^8.5.1" lodash "^4.17.11" -"@tryghost/members-stripe-service@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@tryghost/members-stripe-service/-/members-stripe-service-0.4.0.tgz#cf5b63bf223c7066605524deb7fe92ecf03d4b32" - integrity sha512-zVyzGKdaUSPcrAFiUayafhC2rJsaKQbudSFsYkJ4rNdLXII4SGRGnGBZ6rbCA7n+ewkZkoqhdKVefF0SyGT8IA== +"@tryghost/members-stripe-service@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@tryghost/members-stripe-service/-/members-stripe-service-0.5.0.tgz#38f9c68c6f80b11026e4fbf3578ae625cc0fb699" + integrity sha512-ssQlh6LaWs9vElnXFFCtvLi9OUUGTvy9ok5mLtQTneBOLTE5v/7qANmERpdTwiy9M9iBLvGPnRjNBjzt3HiwSw== dependencies: "@tryghost/debug" "^0.1.4" "@tryghost/errors" "^0.2.13" From 8d958fc16750eb0836f7add4c3907c2038dd0689 Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Wed, 10 Nov 2021 12:56:23 +0000 Subject: [PATCH 2/3] Updated Admin to v4.22.1 --- core/client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/client b/core/client index 209c06c22b..ef915476a1 160000 --- a/core/client +++ b/core/client @@ -1 +1 @@ -Subproject commit 209c06c22b431fa030be42073209a03024bdc427 +Subproject commit ef915476a14b98ab7a91689abe69cba22bb3c524 From 8fe425e1766ffa22468be45eb243aa7a979e0751 Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Wed, 10 Nov 2021 12:56:23 +0000 Subject: [PATCH 3/3] v4.22.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f750c0fea..c912da4f02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghost", - "version": "4.22.0", + "version": "4.22.1", "description": "The professional publishing platform", "author": "Ghost Foundation", "homepage": "https://ghost.org",