From affe6743e5171be4d6c54508d98f855a4c61940f Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Wed, 11 May 2022 18:11:54 +0100 Subject: [PATCH] Renamed products to tiers (#2372) refs: https://github.com/TryGhost/Team/issues/1145 - this should allow us to remove the /products endpoint in v5 It avoids: - `kg-product-card`, that really is meant to say product - `product-cadence` on offers Co-authored-by: Rishabh --- ghost/admin/.lint-todo | 48 ++++ .../app/adapters/{product.js => tier.js} | 3 +- .../components/dashboard/members-graphs.js | 6 +- .../admin/app/components/gh-benefit-item.hbs | 2 +- .../gh-launch-wizard/connect-stripe.js | 20 +- .../components/gh-launch-wizard/finalise.js | 18 +- .../gh-launch-wizard/set-pricing.js | 28 +-- .../components/gh-member-settings-form.hbs | 82 +++---- .../app/components/gh-member-settings-form.js | 60 ++--- .../gh-members-list-item-column.hbs | 4 +- .../components/gh-members-list-item-column.js | 6 +- .../app/components/gh-members-list-item.hbs | 4 +- .../app/components/gh-members-list-item.js | 10 +- .../components/gh-members-payments-setting.js | 22 +- .../components/gh-members-recipient-select.js | 22 +- .../components/gh-members-segment-select.js | 26 +- ...lpha.hbs => gh-membership-tiers-alpha.hbs} | 28 +-- ...-alpha.js => gh-membership-tiers-alpha.js} | 34 +-- .../admin/app/components/gh-portal-links.hbs | 100 ++++---- ghost/admin/app/components/gh-portal-links.js | 50 ++-- .../visibility-segment-select.js | 44 ++-- ghost/admin/app/components/gh-product-card.js | 52 ---- .../{gh-product-card.hbs => gh-tier-card.hbs} | 70 +++--- ghost/admin/app/components/gh-tier-card.js | 52 ++++ ...d.hbs => gh-tiers-price-billingperiod.hbs} | 0 ...iod.js => gh-tiers-price-billingperiod.js} | 2 +- .../app/components/members/filter-value.hbs | 6 +- .../app/components/members/filter-value.js | 6 +- ghost/admin/app/components/members/filter.js | 22 +- .../modal-free-membership-settings.hbs | 2 +- ...mber-product.hbs => modal-member-tier.hbs} | 22 +- ...member-product.js => modal-member-tier.js} | 38 +-- .../app/components/modal-portal-settings.hbs | 14 +- .../app/components/modal-portal-settings.js | 80 +++---- ...product-price.hbs => modal-tier-price.hbs} | 6 +- ...l-product-price.js => modal-tier-price.js} | 2 +- .../{modal-product.hbs => modal-tier.hbs} | 100 ++++---- .../{modal-product.js => modal-tier.js} | 70 +++--- .../app/components/modals/tiers/archive.hbs | 2 +- .../app/components/modals/tiers/archive.js | 14 +- .../app/components/modals/tiers/unarchive.hbs | 4 +- .../app/components/modals/tiers/unarchive.js | 12 +- .../settings/members-default-post-access.hbs | 2 +- .../settings/members-default-post-access.js | 6 +- .../settings/members/archive-tier.hbs | 4 +- .../settings/members/archive-tier.js | 16 +- .../newsletters/newsletter-management.hbs | 2 +- .../app/components/tiers/segment-select.js | 44 ++-- ghost/admin/app/controllers/member.js | 2 +- ghost/admin/app/controllers/members.js | 10 +- ghost/admin/app/controllers/offer.js | 42 ++-- ghost/admin/app/controllers/offers.js | 12 +- .../app/controllers/settings/membership.js | 100 ++++---- .../settings/{product.js => tier.js} | 18 +- .../settings/{products.js => tiers.js} | 4 +- ghost/admin/app/mixins/validation-engine.js | 8 +- .../{member-product.js => member-tier.js} | 4 +- ghost/admin/app/models/member.js | 2 +- ghost/admin/app/models/post.js | 4 +- ghost/admin/app/models/setting.js | 2 +- ...t-benefit-item.js => tier-benefit-item.js} | 2 +- .../admin/app/models/{product.js => tier.js} | 4 +- ghost/admin/app/routes/member.js | 2 +- ghost/admin/app/routes/settings/product.js | 67 ------ .../admin/app/routes/settings/product/new.js | 6 - ghost/admin/app/routes/settings/products.js | 16 -- ghost/admin/app/routes/settings/tier/new.js | 6 + .../app/serializers/{product.js => tier.js} | 2 +- ghost/admin/app/services/dashboard-stats.js | 40 ++-- ghost/admin/app/services/members-utils.js | 10 +- ghost/admin/app/styles/app-dark.css | 8 +- ghost/admin/app/styles/app.css | 2 +- .../app/styles/components/filter-builder.css | 4 +- .../app/styles/components/power-select.css | 6 +- ghost/admin/app/styles/layouts/members.css | 82 +++---- .../layouts/{products.css => tiers.css} | 226 +++++++++--------- .../app/templates/settings/membership.hbs | 34 +-- .../admin/app/templates/settings/product.hbs | 158 ------------ .../admin/app/templates/settings/products.hbs | 48 ---- .../{member-product.js => member-tier.js} | 7 +- .../{product-benefits.js => tier-benefits.js} | 6 +- ...t-benefit-item.js => tier-benefit-item.js} | 0 .../app/validators/{product.js => tier.js} | 0 ghost/admin/mirage/config.js | 4 +- ghost/admin/mirage/config/members.js | 40 ++-- ghost/admin/mirage/config/offers.js | 4 +- ghost/admin/mirage/config/products.js | 44 ---- ghost/admin/mirage/config/tiers.js | 44 ++++ .../mirage/factories/{product.js => tier.js} | 6 +- ghost/admin/mirage/fixtures/settings.js | 2 +- .../mirage/fixtures/{products.js => tiers.js} | 4 +- ghost/admin/mirage/models/member.js | 2 +- ghost/admin/mirage/models/subscription.js | 2 +- .../{product-benefit.js => tier-benefit.js} | 2 +- .../mirage/models/{product.js => tier.js} | 2 +- .../admin/mirage/serializers/subscription.js | 4 +- .../{product-benefit.js => tier-benefit.js} | 0 .../serializers/{product.js => tier.js} | 4 +- .../tests/acceptance/members/details-test.js | 82 +++---- .../tests/acceptance/members/filter-test.js | 18 +- ghost/admin/tests/acceptance/offers-test.js | 8 +- .../acceptance/settings/membership-test.js | 54 ++--- 102 files changed, 1148 insertions(+), 1389 deletions(-) rename ghost/admin/app/adapters/{product.js => tier.js} (91%) rename ghost/admin/app/components/{gh-membership-products-alpha.hbs => gh-membership-tiers-alpha.hbs} (70%) rename ghost/admin/app/components/{gh-membership-products-alpha.js => gh-membership-tiers-alpha.js} (64%) delete mode 100644 ghost/admin/app/components/gh-product-card.js rename ghost/admin/app/components/{gh-product-card.hbs => gh-tier-card.hbs} (55%) create mode 100644 ghost/admin/app/components/gh-tier-card.js rename ghost/admin/app/components/{gh-products-price-billingperiod.hbs => gh-tiers-price-billingperiod.hbs} (100%) rename ghost/admin/app/components/{gh-products-price-billingperiod.js => gh-tiers-price-billingperiod.js} (90%) rename ghost/admin/app/components/{modal-member-product.hbs => modal-member-tier.hbs} (76%) rename ghost/admin/app/components/{modal-member-product.js => modal-member-tier.js} (72%) rename ghost/admin/app/components/{modal-product-price.hbs => modal-tier-price.hbs} (95%) rename ghost/admin/app/components/{modal-product-price.js => modal-tier-price.js} (98%) rename ghost/admin/app/components/{modal-product.hbs => modal-tier.hbs} (78%) rename ghost/admin/app/components/{modal-product.js => modal-tier.js} (78%) rename ghost/admin/app/controllers/settings/{product.js => tier.js} (92%) rename ghost/admin/app/controllers/settings/{products.js => tiers.js} (91%) rename ghost/admin/app/models/{member-product.js => member-tier.js} (55%) rename ghost/admin/app/models/{product-benefit-item.js => tier-benefit-item.js} (91%) rename ghost/admin/app/models/{product.js => tier.js} (87%) delete mode 100644 ghost/admin/app/routes/settings/product.js delete mode 100644 ghost/admin/app/routes/settings/product/new.js delete mode 100644 ghost/admin/app/routes/settings/products.js create mode 100644 ghost/admin/app/routes/settings/tier/new.js rename ghost/admin/app/serializers/{product.js => tier.js} (85%) rename ghost/admin/app/styles/layouts/{products.css => tiers.css} (70%) delete mode 100644 ghost/admin/app/templates/settings/product.hbs delete mode 100644 ghost/admin/app/templates/settings/products.hbs rename ghost/admin/app/transforms/{member-product.js => member-tier.js} (80%) rename ghost/admin/app/transforms/{product-benefits.js => tier-benefits.js} (80%) rename ghost/admin/app/validators/{product-benefit-item.js => tier-benefit-item.js} (100%) rename ghost/admin/app/validators/{product.js => tier.js} (100%) delete mode 100644 ghost/admin/mirage/config/products.js create mode 100644 ghost/admin/mirage/config/tiers.js rename ghost/admin/mirage/factories/{product.js => tier.js} (77%) rename ghost/admin/mirage/fixtures/{products.js => tiers.js} (91%) rename ghost/admin/mirage/models/{product-benefit.js => tier-benefit.js} (69%) rename ghost/admin/mirage/models/{product.js => tier.js} (86%) rename ghost/admin/mirage/serializers/{product-benefit.js => tier-benefit.js} (100%) rename ghost/admin/mirage/serializers/{product.js => tier.js} (79%) diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo index 8bf26b94c1..2101b31341 100644 --- a/ghost/admin/.lint-todo +++ b/ghost/admin/.lint-todo @@ -1088,3 +1088,51 @@ add|ember-template-lint|require-valid-alt-text|3|44|3|44|a7f0566c430150bae4153e0 add|ember-template-lint|require-valid-alt-text|8|20|8|20|9d0c591086dc9139ff38a7b385c3367a83438786|1652054400000|1662422400000|1665014400000|lib/koenig-editor/addon/components/koenig-card-embed/nft.hbs add|ember-template-lint|require-input-label|10|12|10|12|8c3c0ea315ff4da828363989a45fa11256a78796|1652054400000|1662422400000|1665014400000|lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.hbs remove|ember-template-lint|require-valid-alt-text|5|4|5|4|527936d4c6b3d34855a99669f0b8ae690094bc8e|1652054400000|1662422400000|1665014400000|app/components/gh-member-avatar.hbs +add|ember-template-lint|no-action|38|107|38|107|79d2eeaed67e929e989261416abd3cd2dbbf4861|1652140800000|1662508800000|1667692800000|app/components/gh-membership-tiers-alpha.hbs +add|ember-template-lint|no-action|125|48|125|48|01f579966c325cf66d3a87799e8cea7dd1fded81|1652140800000|1662508800000|1667692800000|app/components/gh-portal-links.hbs +add|ember-template-lint|no-action|148|54|148|54|884d0df74365d794c99bb098e72dc267bd0fbc46|1652140800000|1662508800000|1667692800000|app/components/gh-portal-links.hbs +add|ember-template-lint|no-action|175|54|175|54|b51c80e0c3de828988f74017ab7e383552f48648|1652140800000|1662508800000|1667692800000|app/components/gh-portal-links.hbs +remove|ember-template-lint|no-action|125|48|125|48|c4ecbbcf9092307d8bb2cd5c9e386d2e549a9f26|1652054400000|1662422400000|1665014400000|app/components/gh-portal-links.hbs +remove|ember-template-lint|no-action|148|54|148|54|e7798f471d8eb8d396fa02de55fc9710ad783158|1652054400000|1662422400000|1665014400000|app/components/gh-portal-links.hbs +remove|ember-template-lint|no-action|175|54|175|54|0f158251c4558c601318d60d1237d5e2c3d2bd60|1652054400000|1662422400000|1665014400000|app/components/gh-portal-links.hbs +add|ember-template-lint|no-invalid-interactive|28|24|28|24|42a29ae16e22270f0590c9ce5caa7bfec541ca0b|1652140800000|1662508800000|1667692800000|app/components/modal-member-tier.hbs +add|ember-template-lint|no-action|88|77|88|77|437199817818c66e4539bbc8501bd73148b521fd|1652140800000|1662508800000|1667692800000|app/components/modal-portal-settings.hbs +remove|ember-template-lint|no-action|88|77|88|77|9e5e50275cb198c163f5da82335957b69255ac1a|1652054400000|1662422400000|1665014400000|app/components/modal-portal-settings.hbs +add|ember-template-lint|no-action|4|55|4|55|141d456b03124abca146e58e4ae15825fdd040bb|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-action|4|79|4|79|d465b362b15b90cf42a093e72895155f49cdf6f2|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-action|16|27|16|27|64b13853afb27bd49f8fc782b7d19786a502e8d1|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-action|26|27|26|27|8291585f81599303bc73e45cb65d725f054ae414|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-action|41|35|41|35|0d52869a7137b90cd482896151c974aff53287f8|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-action|56|35|56|35|9d61f56816a4b85a97cf9ba7af28bbcf08f29d05|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-action|65|34|65|34|40e7337ccf8501ef3b2fea94812d4de8435286da|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-action|78|71|78|71|141d456b03124abca146e58e4ae15825fdd040bb|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-action|80|8|80|8|d465b362b15b90cf42a093e72895155f49cdf6f2|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-down-event-binding|4|112|4|112|b3e87879e52edc06bb07f1ad0becc6ec762bbb39|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-down-event-binding|80|41|80|41|b3e87879e52edc06bb07f1ad0becc6ec762bbb39|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-passed-in-event-handlers|16|20|16|20|22bf28ec6b8ce5c52ffdb872a465b684319bb7c3|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-passed-in-event-handlers|26|20|26|20|4b2258e98403a4296a1796a6c7f2639f8bb5fb9c|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-passed-in-event-handlers|41|28|41|28|c74704c059987f5454146dd0efc9cbc9e0279b7c|1652140800000|1662508800000|1667692800000|app/components/modal-tier-price.hbs +add|ember-template-lint|no-action|21|39|21|39|c1c116347fcaf9f69d60fa7ae58d746e9994cdbd|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|36|39|36|39|7307d2c5d78fa732b959ced6823b3d82dcc07446|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|45|39|45|39|7307d2c5d78fa732b959ced6823b3d82dcc07446|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|73|52|73|52|fa36149ee581ce634903cef877ccfdc133aa67ec|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|85|47|85|47|dcc09bb23a476d5b83b273b693cd8cb2aba68365|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|95|47|95|47|a80dd18e18dda6fb6f1f97d87bef2b8c2ce3d847|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|135|47|135|47|73ac7d3892fcbcf15c3d5c44fca14dd21016daea|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|141|53|141|53|c76b92d7bdb6ed498238b647928748aa4146dc24|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|142|55|142|55|02efc45b808f4cfdbe5f7b72b784337aef4e98a7|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|143|56|143|56|4227b643fe44a6c343b819bbee7eecdfb7916ccc|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|144|57|144|57|115cc8adc4c0f98e2d93a59ff8efbee711541336|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|152|41|152|41|c76b92d7bdb6ed498238b647928748aa4146dc24|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|153|44|153|44|4227b643fe44a6c343b819bbee7eecdfb7916ccc|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|154|45|154|45|115cc8adc4c0f98e2d93a59ff8efbee711541336|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|269|71|269|71|141d456b03124abca146e58e4ae15825fdd040bb|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|271|8|271|8|d465b362b15b90cf42a093e72895155f49cdf6f2|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-down-event-binding|271|41|271|41|b3e87879e52edc06bb07f1ad0becc6ec762bbb39|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-passed-in-event-handlers|21|32|21|32|f69395e36c890a23e3f603ad3fd2cb384932af93|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-passed-in-event-handlers|36|32|36|32|86b5983929a27ca8d458ff051c95a50a406fbe57|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-passed-in-event-handlers|45|32|45|32|86b5983929a27ca8d458ff051c95a50a406fbe57|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-passed-in-event-handlers|85|40|85|40|dcb4785647a50814bcfce82f8d68ac8dd8f54ec2|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-passed-in-event-handlers|95|40|95|40|70487c008d7dda453fef82f0140699ee93c0055c|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|style-concatenation|205|54|205|54|23293f0c3838b23432d2b2daaf04b34504896d91|1652140800000|1662508800000|1667692800000|app/components/modal-tier.hbs +add|ember-template-lint|no-action|12|16|12|16|40e7337ccf8501ef3b2fea94812d4de8435286da|1652227200000|1662595200000|1667779200000|app/components/gh-tiers-price-billingperiod.hbs diff --git a/ghost/admin/app/adapters/product.js b/ghost/admin/app/adapters/tier.js similarity index 91% rename from ghost/admin/app/adapters/product.js rename to ghost/admin/app/adapters/tier.js index b6e0927956..52f48ec6bc 100644 --- a/ghost/admin/app/adapters/product.js +++ b/ghost/admin/app/adapters/tier.js @@ -2,7 +2,8 @@ import ApplicationAdapter from 'ghost-admin/adapters/application'; import classic from 'ember-classic-decorator'; @classic -export default class Product extends ApplicationAdapter { + +export default class Tier extends ApplicationAdapter { queryRecord(store, type, query) { if (query && query.id) { let {id} = query; diff --git a/ghost/admin/app/components/dashboard/members-graphs.js b/ghost/admin/app/components/dashboard/members-graphs.js index ef4a360f52..8393045a7f 100644 --- a/ghost/admin/app/components/dashboard/members-graphs.js +++ b/ghost/admin/app/components/dashboard/members-graphs.js @@ -31,16 +31,16 @@ export default class DashboardMembersGraphs extends Component { } async loadMRRStats() { - const products = await this.store.query('product', { + const tiers = await this.store.query('tier', { filter: 'type:paid', include: 'monthly_price,yearly_price', limit: 'all' }); - const defaultProduct = products?.firstObject; + const defaultTier = tiers?.firstObject; this.mrrStatsLoading = true; this.membersStats.fetchMRR().then((stats) => { this.mrrStatsLoading = false; const statsData = stats.data || []; - const defaultCurrency = defaultProduct?.monthlyPrice?.currency || 'usd'; + const defaultCurrency = defaultTier?.monthlyPrice?.currency || 'usd'; let currencyStats = statsData.find((stat) => { return stat.currency === defaultCurrency; }); diff --git a/ghost/admin/app/components/gh-benefit-item.hbs b/ghost/admin/app/components/gh-benefit-item.hbs index 64b6300c16..cf1d14dc99 100644 --- a/ghost/admin/app/components/gh-benefit-item.hbs +++ b/ghost/admin/app/components/gh-benefit-item.hbs @@ -16,7 +16,7 @@ > Subscriptions - {{#unless this.products}} + {{#unless this.tiers}}
-
+
{{#unless this.isCreatingComplimentary}}
{{svg-jar "no-data-subscription"}} @@ -119,8 +119,8 @@ {{else}}
{{/unless}} - {{#each this.products as |product|}} -
-
-

- {{product.name}} - {{#if (gt product.subscriptions.length 1)}} - {{product.subscriptions.length}} subscriptions + {{#each this.tiers as |tier|}} +
+
+

+ {{tier.name}} + {{#if (gt tier.subscriptions.length 1)}} + {{tier.subscriptions.length}} subscriptions {{/if}}

- {{#each product.subscriptions as |sub index|}} -
+ {{#each tier.subscriptions as |sub index|}} +
- {{sub.price.nickname}} + {{sub.price.nickname}} – {{#if (eq sub.status "canceled")}} - Ended {{sub.validUntil}} + Ended {{sub.validUntil}} Cancelled {{else if sub.cancel_at_period_end}} - Has access until {{sub.validUntil}} + Has access until {{sub.validUntil}} Cancelled {{else}} - Renews {{sub.validUntil}} + Renews {{sub.validUntil}} Active {{/if}}
{{#if sub.cancellationReason}} -
Cancellation reason: {{sub.cancellationReason}}
+
Cancellation reason: {{sub.cancellationReason}}
{{/if}} {{#if sub.offer}}
- {{sub.offer.name}} + {{sub.offer.name}} offer {{#if (eq sub.offer.type 'fixed')}} ({{currency-symbol sub.offer.currency}}{{gh-price-amount sub.offer.amount}} off) @@ -173,13 +173,13 @@ applied to subscription
{{/if}} -
+
Created on {{sub.startDate}}
-
-
+
+
{{sub.price.currencySymbol}} {{sub.price.nonDecimalAmount}} @@ -203,12 +203,12 @@
    • {{/each}} - {{#if (eq product.subscriptions.length 0)}} -
    + {{#if (eq tier.subscriptions.length 0)}} +
    - Complimentary + Complimentary Active
    -
    Created on
    +
    Created on
    -
    +
    $ 0 @@ -280,9 +280,9 @@ - +
  • -
    • @@ -295,15 +295,15 @@
    {{/each}} - {{#if (and this.products this.isAddComplimentaryAllowed)}} -
    + {{#if (and this.tiers this.isAddComplimentaryAllowed)}} +
    {{#if this.isCreatingComplimentary}} {{else}}
    -{{#if this.showMemberProductModal}} - - + + @confirm={{this.addTier}} + @closeModal={{this.closeMemberTierModal}} /> {{/if}} diff --git a/ghost/admin/app/components/gh-member-settings-form.js b/ghost/admin/app/components/gh-member-settings-form.js index d1c8e31dd1..56c230b24c 100644 --- a/ghost/admin/app/components/gh-member-settings-form.js +++ b/ghost/admin/app/components/gh-member-settings-form.js @@ -20,8 +20,8 @@ export default class extends Component { this.scratchMember = this.args.scratchMember; } - @tracked showMemberProductModal = false; - @tracked productsList; + @tracked showMemberTierModal = false; + @tracked tiersList; @tracked newslettersList; get canShowStripeInfo() { @@ -37,16 +37,16 @@ export default class extends Component { return false; } - if (this.member.get('products')?.length > 0) { + if (this.member.get('tiers')?.length > 0) { return false; } - // complimentary subscriptions are assigned to products so it only + // complimentary subscriptions are assigned to tiers so it only // makes sense to show the "add complimentary" buttons when there's a - // product to assign the complimentary subscription to - const hasAnActivePaidProduct = !!this.productsList?.length; + // tier to assign the complimentary subscription to + const hasAnActivePaidTier = !!this.tiersList?.length; - return hasAnActivePaidProduct; + return hasAnActivePaidTier; } get hasSingleNewsletter() { @@ -64,15 +64,15 @@ export default class extends Component { return this.args.isSaveRunning; } - get products() { + get tiers() { let subscriptions = this.member.get('subscriptions') || []; - // Create the products from `subscriptions.price.product` - let products = subscriptions - .map(subscription => (subscription.tier || subscription.price.product)) + // Create the tiers from `subscriptions.price.tier` + let tiers = subscriptions + .map(subscription => (subscription.tier || subscription.price.tier)) .filter((value, index, self) => { // Deduplicate by taking the first object by `id` - return typeof value.id !== 'undefined' && self.findIndex(element => (element.product_id || element.id) === (value.product_id || value.id)) === index; + return typeof value.id !== 'undefined' && self.findIndex(element => (element.tier_id || element.id) === (value.tier_id || value.id)) === index; }); let subscriptionData = subscriptions.filter((sub) => { @@ -91,13 +91,13 @@ export default class extends Component { isComplimentary: !sub.id }; }); - return products.map((product) => { - let productSubscriptions = subscriptionData.filter((subscription) => { - return subscription?.price?.product?.product_id === (product.product_id || product.id); + return tiers.map((tier) => { + let tierSubscriptions = subscriptionData.filter((subscription) => { + return subscription?.price?.tier?.tier_id === (tier.tier_id || tier.id); }); return { - ...product, - subscriptions: productSubscriptions + ...tier, + subscriptions: tierSubscriptions }; }); } @@ -131,7 +131,7 @@ export default class extends Component { @action setup() { - this.fetchProducts.perform(); + this.fetchTiers.perform(); if (this.feature.get('multipleNewsletters')) { this.fetchNewsletters.perform(); } @@ -153,8 +153,8 @@ export default class extends Component { } @action - closeMemberProductModal() { - this.showMemberProductModal = false; + closeMemberTierModal() { + this.showMemberTierModal = false; } @action @@ -163,8 +163,8 @@ export default class extends Component { } @action - removeComplimentary(productId) { - this.removeComplimentaryTask.perform(productId); + removeComplimentary(tierId) { + this.removeComplimentaryTask.perform(tierId); } @action @@ -187,20 +187,20 @@ export default class extends Component { } @task({drop: true}) - *removeComplimentaryTask(productId) { + *removeComplimentaryTask(tierId) { let url = this.ghostPaths.url.api(`members/${this.member.get('id')}`); - let products = this.member.get('products') || []; + let tiers = this.member.get('tiers') || []; - const updatedProducts = products - .filter(product => product.id !== productId) - .map(product => ({id: product.id})); + const updatedTiers = tiers + .filter(tier => tier.id !== tierId) + .map(tier => ({id: tier.id})); let response = yield this.ajax.put(url, { data: { members: [{ id: this.member.get('id'), email: this.member.get('email'), - products: updatedProducts + tiers: updatedTiers }] } }); @@ -224,8 +224,8 @@ export default class extends Component { } @task({drop: true}) - *fetchProducts() { - this.productsList = yield this.store.query('product', {filter: 'type:paid+active:true', include: 'monthly_price,yearly_price'}); + *fetchTiers() { + this.tiersList = yield this.store.query('tier', {filter: 'type:paid+active:true', include: 'monthly_price,yearly_price'}); } @task({drop: true}) diff --git a/ghost/admin/app/components/gh-members-list-item-column.hbs b/ghost/admin/app/components/gh-members-list-item-column.hbs index 844f5c27ac..e9e5565c12 100644 --- a/ghost/admin/app/components/gh-members-list-item-column.hbs +++ b/ghost/admin/app/components/gh-members-list-item-column.hbs @@ -3,9 +3,9 @@ {{this.labels}} -{{else if (eq @filterColumn 'product')}} +{{else if (eq @filterColumn 'tier')}} - {{this.products}} + {{this.tiers}} {{else if (eq @filterColumn 'status')}} diff --git a/ghost/admin/app/components/gh-members-list-item-column.js b/ghost/admin/app/components/gh-members-list-item-column.js index d43a20c3ac..9f829af9d4 100644 --- a/ghost/admin/app/components/gh-members-list-item-column.js +++ b/ghost/admin/app/components/gh-members-list-item-column.js @@ -12,9 +12,9 @@ export default class GhMembersListItemColumn extends Component { return labelData.map(label => label.name).join(', '); } - get products() { - const productData = get(this.args.member, 'products') || []; - return productData.map(product => product.name).join(', '); + get tiers() { + const tierData = get(this.args.member, 'tiers') || []; + return tierData.map(tier => tier.name).join(', '); } get mostRecentSubscription() { diff --git a/ghost/admin/app/components/gh-members-list-item.hbs b/ghost/admin/app/components/gh-members-list-item.hbs index 314fab8c1e..5afc8b329e 100644 --- a/ghost/admin/app/components/gh-members-list-item.hbs +++ b/ghost/admin/app/components/gh-members-list-item.hbs @@ -23,14 +23,14 @@
    {{#if (feature "membersTableStatus")}} - {{#if this.hasMultipleProducts}} + {{#if this.hasMultipleTiers}} {{#if (not (is-empty @member.status))}} {{capitalize @member.status}} {{else}} - {{/if}} -
    {{this.products}}
    +
    {{this.tiers}}
     {{else}} diff --git a/ghost/admin/app/components/gh-members-list-item.js b/ghost/admin/app/components/gh-members-list-item.js index a1a8e0d8a0..9330a59c51 100644 --- a/ghost/admin/app/components/gh-members-list-item.js +++ b/ghost/admin/app/components/gh-members-list-item.js @@ -9,12 +9,12 @@ export default class GhMembersListItem extends Component { super(...args); } - get hasMultipleProducts() { - return this.store.peekAll('product')?.length > 1; + get hasMultipleTiers() { + return this.store.peekAll('tier')?.length > 1; } - get products() { - const productData = get(this.args.member, 'products') || []; - return productData.map(product => product.name).join(', '); + get tiers() { + const tierData = get(this.args.member, 'tiers') || []; + return tierData.map(tier => tier.name).join(', '); } } diff --git a/ghost/admin/app/components/gh-members-payments-setting.js b/ghost/admin/app/components/gh-members-payments-setting.js index 6c7a0510c5..7822e75d2c 100644 --- a/ghost/admin/app/components/gh-members-payments-setting.js +++ b/ghost/admin/app/components/gh-members-payments-setting.js @@ -250,12 +250,12 @@ export default Component.extend({ }); }, - saveProduct: task(function* () { - const products = yield this.store.query('product', {filter: 'type:paid', include: 'monthly_price, yearly_price'}); - this.product = products.firstObject; - if (this.product) { + saveTier: task(function* () { + const tiers = yield this.store.query('tier', {filter: 'type:paid', include: 'monthly_price, yearly_price'}); + this.tier = tiers.firstObject; + if (this.tier) { const yearlyDiscount = this.calculateDiscount(5, 50); - this.product.set('monthlyPrice', { + this.tier.set('monthlyPrice', { nickname: 'Monthly', amount: 500, active: 1, @@ -264,7 +264,7 @@ export default Component.extend({ interval: 'month', type: 'recurring' }); - this.product.set('yearlyPrice', { + this.tier.set('yearlyPrice', { nickname: 'Yearly', amount: 5000, active: 1, @@ -275,13 +275,13 @@ export default Component.extend({ }); let pollTimeout = 0; - /** To allow Stripe config to be ready in backend, we poll the save product request */ + /** To allow Stripe config to be ready in backend, we poll the save tier request */ while (pollTimeout < RETRY_PRODUCT_SAVE_MAX_POLL) { yield timeout(RETRY_PRODUCT_SAVE_POLL_LENGTH); try { - const updatedProduct = yield this.product.save(); - return updatedProduct; + const updatedTier = yield this.tier.save(); + return updatedTier; } catch (error) { if (error.payload?.errors && error.payload.errors[0].code === 'STRIPE_NOT_CONFIGURED') { pollTimeout += RETRY_PRODUCT_SAVE_POLL_LENGTH; @@ -293,7 +293,7 @@ export default Component.extend({ } } } - return this.product; + return this.tier; }), saveStripeSettings: task(function* () { @@ -303,7 +303,7 @@ export default Component.extend({ try { let response = yield this.settings.save(); - yield this.saveProduct.perform(); + yield this.saveTier.perform(); this.settings.set('portalPlans', ['free', 'monthly', 'yearly']); response = yield this.settings.save(); diff --git a/ghost/admin/app/components/gh-members-recipient-select.js b/ghost/admin/app/components/gh-members-recipient-select.js index 61839f155b..158badcda8 100644 --- a/ghost/admin/app/components/gh-members-recipient-select.js +++ b/ghost/admin/app/components/gh-members-recipient-select.js @@ -151,26 +151,26 @@ export default class GhMembersRecipientSelect extends Component { options.push(labelsGroup); } - // fetch all products w̶i̶t̶h̶ c̶o̶u̶n̶t̶s̶ + // fetch all tiers w̶i̶t̶h̶ c̶o̶u̶n̶t̶s̶ // TODO: add `include: 'count.members` to query once API supports - const products = yield this.store.query('product', {filter: 'type:paid', limit: 'all'}); + const tiers = yield this.store.query('tier', {filter: 'type:paid', limit: 'all'}); - if (products.length > 1) { - const productsGroup = { + if (tiers.length > 1) { + const tiersGroup = { groupName: 'Tiers', options: [] }; - products.forEach((product) => { - productsGroup.options.push({ - name: product.name, - segment: `product:${product.slug}`, - count: product.count?.members, - class: 'segment-product' + tiers.forEach((tier) => { + tiersGroup.options.push({ + name: tier.name, + segment: `tier:${tier.slug}`, + count: tier.count?.members, + class: 'segment-tier' }); }); - options.push(productsGroup); + options.push(tiersGroup); } this.specificOptions = options; diff --git a/ghost/admin/app/components/gh-members-segment-select.js b/ghost/admin/app/components/gh-members-segment-select.js index 8c545571af..27daeef372 100644 --- a/ghost/admin/app/components/gh-members-segment-select.js +++ b/ghost/admin/app/components/gh-members-segment-select.js @@ -74,28 +74,28 @@ export default class GhMembersSegmentSelect extends Component { } if (this.feature.get('multipleProducts')) { - // fetch all products w̶i̶t̶h̶ c̶o̶u̶n̶t̶s̶ + // fetch all tiers w̶i̶t̶h̶ c̶o̶u̶n̶t̶s̶ // TODO: add `include: 'count.members` to query once API supports - const products = yield this.store.query('product', {filter: 'type:paid', limit: 'all', include: 'monthly_price,yearly_price,benefits'}); + const tiers = yield this.store.query('tier', {filter: 'type:paid', limit: 'all', include: 'monthly_price,yearly_price,benefits'}); - if (products.length > 0) { - const productsGroup = { + if (tiers.length > 0) { + const tiersGroup = { groupName: 'Tiers', options: [] }; - products.forEach((product) => { - productsGroup.options.push({ - name: product.name, - segment: `product:${product.slug}`, - count: product.count?.members, - class: 'segment-product' + tiers.forEach((tier) => { + tiersGroup.options.push({ + name: tier.name, + segment: `tier:${tier.slug}`, + count: tier.count?.members, + class: 'segment-tier' }); }); - options.push(productsGroup); - if (this.args.selectDefaultProduct && !this.args.segment) { - this.args.onChange?.(productsGroup.options[0].segment); + options.push(tiersGroup); + if (this.args.selectDefaultTier && !this.args.segment) { + this.args.onChange?.(tiersGroup.options[0].segment); } } } diff --git a/ghost/admin/app/components/gh-membership-products-alpha.hbs b/ghost/admin/app/components/gh-membership-tiers-alpha.hbs similarity index 70% rename from ghost/admin/app/components/gh-membership-products-alpha.hbs rename to ghost/admin/app/components/gh-membership-tiers-alpha.hbs index d641e70920..b4b2755122 100644 --- a/ghost/admin/app/components/gh-membership-products-alpha.hbs +++ b/ghost/admin/app/components/gh-membership-tiers-alpha.hbs @@ -18,37 +18,37 @@
    -
    +
    {{#if this.isEmptyList}} -
    +

    You have no {{this.selectedType.value}} tiers.

    {{/if}} - {{#each this.products as |product|}} - {{/each}} {{#if (eq this.type "active" )}} -
    -
    {{/if}}
    -{{#if this.showProductModal}} +{{#if this.showTierModal}} + @confirm={{this.confirmTierSave}} + @close={{this.closeTierModal}} + @modifier="edit-tier action wide" /> {{/if}} diff --git a/ghost/admin/app/components/gh-membership-products-alpha.js b/ghost/admin/app/components/gh-membership-tiers-alpha.js similarity index 64% rename from ghost/admin/app/components/gh-membership-products-alpha.js rename to ghost/admin/app/components/gh-membership-tiers-alpha.js index 7b8c8f597c..9b4af16e5f 100644 --- a/ghost/admin/app/components/gh-membership-products-alpha.js +++ b/ghost/admin/app/components/gh-membership-tiers-alpha.js @@ -18,16 +18,16 @@ export default class extends Component { @service store; @service config; - @tracked showProductModal = false; - @tracked productModel = null; + @tracked showTierModal = false; + @tracked tierModel = null; @tracked type = 'active'; - get products() { - return this.args.products.filter((product) => { + get tiers() { + return this.args.tiers.filter((tier) => { if (this.type === 'active') { - return !!product.active; + return !!tier.active; } else if (this.type === 'archived') { - return !product.active; + return !tier.active; } }); } @@ -43,7 +43,7 @@ export default class extends Component { } get isEmptyList() { - return this.products.length === 0; + return this.tiers.length === 0; } @action @@ -52,9 +52,9 @@ export default class extends Component { } @action - async openEditProduct(product) { - this.productModel = product; - this.showProductModal = true; + async openEditTier(tier) { + this.tierModel = tier; + this.showTierModal = true; } @action @@ -69,18 +69,18 @@ export default class extends Component { } @action - async openNewProduct() { - this.productModel = this.store.createRecord('product'); - this.showProductModal = true; + async openNewTier() { + this.tierModel = this.store.createRecord('tier'); + this.showTierModal = true; } @action - closeProductModal() { - this.showProductModal = false; + closeTierModal() { + this.showTierModal = false; } @action - confirmProductSave() { - this.args.confirmProductSave(); + confirmTierSave() { + this.args.confirmTierSave(); } } diff --git a/ghost/admin/app/components/gh-portal-links.hbs b/ghost/admin/app/components/gh-portal-links.hbs index 20a09d38bd..d236a18087 100644 --- a/ghost/admin/app/components/gh-portal-links.hbs +++ b/ghost/admin/app/components/gh-portal-links.hbs @@ -1,4 +1,4 @@ -
    +

    Links

    Use these {{if this.isLink "links" "data attributes"}} in your theme to show pages of Portal.

    @@ -24,14 +24,14 @@
    {{#if this.isLink}} {{else}} {{/if}} @@ -55,13 +55,13 @@
    {{#if this.isLink}} {{else}} @@ -82,13 +82,13 @@
    {{#if this.isLink}} {{else}} @@ -103,7 +103,7 @@
    - {{#if (and (feature "multipleProducts") (gt this.products.length 1))}} + {{#if (and (feature "multipleProducts") (gt this.tiers.length 1))}}
    @@ -116,13 +116,13 @@ tabindex="0" > {{svg-jar "arrow-down-small"}} @@ -134,19 +134,19 @@
    {{#if this.isLink}} {{else}} {{/if}} - {{#if this.showArchiveOption}}
  • @@ -92,8 +92,8 @@
    • {{else}} -
    - @@ -171,22 +171,22 @@
    {{/if}}
    -
    - {{#if this.product.name}} -

    {{this.product.name}}

    +
    + {{#if this.tier.name}} +

    {{this.tier.name}}

    {{else}} -

    Bronze

    +

    Bronze

    {{/if}} -
    - {{#if this.isFreeProduct}} -
    +
    + {{#if this.isFreeTier}} +
    {{currency-symbol this.currency}} 0
    {{else}} {{#if this.stripeYearlyAmount}} -
    +
    {{currency-symbol this.currency}} {{#if (eq this.previewCadence "monthly")}} @@ -206,7 +206,7 @@ {{this.discountValue}}% discount {{/if}} {{else}} -
    +
    {{currency-symbol this.currency}} 0 /year @@ -217,36 +217,36 @@
    -
    -
    - {{#if this.product.description}} -
    {{this.product.description}}
    +
    +
    + {{#if this.tier.description}} +
    {{this.tier.description}}
    {{else}} - {{#if this.isFreeProduct}} -
    Free preview of {{this.settings.title}}
    + {{#if this.isFreeTier}} +
    Free preview of {{this.settings.title}}
    {{else}} -
    Full access to premium content
    +
    Full access to premium content
    {{/if}} {{/if}} {{#if this.benefits}} -
    +
    {{#each this.benefits as |benefitItem|}} -
    {{svg-jar "check-2"}} +
    {{svg-jar "check-2"}}
    {{benefitItem.name}}
    {{/each}}
    {{else}} -
    - {{#if this.isFreeProduct}} -
    {{svg-jar "check-2"}} +
    + {{#if this.isFreeTier}} +
    {{svg-jar "check-2"}}
    Access to all public posts
    {{else}} -
    +
    {{svg-jar "check-2"}}
    Expert analysis
    @@ -272,10 +272,10 @@ > Cancel - + @class="gh-btn {{if this.isExistingTier "gh-btn-black" "gh-btn-green"}} gh-btn-icon" + data-test-button="save-tier" />
    diff --git a/ghost/admin/app/components/modal-product.js b/ghost/admin/app/components/modal-tier.js similarity index 78% rename from ghost/admin/app/components/modal-product.js rename to ghost/admin/app/components/modal-tier.js index a644785687..b870bea1b7 100644 --- a/ghost/admin/app/components/modal-product.js +++ b/ghost/admin/app/components/modal-tier.js @@ -1,6 +1,6 @@ import EmberObject, {action} from '@ember/object'; import ModalBase from 'ghost-admin/components/modal-base'; -import ProductBenefitItem from '../models/product-benefit-item'; +import TierBenefitItem from '../models/tier-benefit-item'; import classic from 'ember-classic-decorator'; import {currencies, getCurrencyOptions, getSymbol} from 'ghost-admin/utils/currency'; import {A as emberA} from '@ember/array'; @@ -20,11 +20,11 @@ const CURRENCIES = currencies.map((currency) => { // TODO: update modals to work fully with Glimmer components @classic -export default class ModalProductPrice extends ModalBase { +export default class ModalTierPrice extends ModalBase { @service settings; @service config; @tracked model; - @tracked product; + @tracked tier; @tracked periodVal; @tracked stripeMonthlyAmount = 5; @tracked stripeYearlyAmount = 50; @@ -41,22 +41,22 @@ export default class ModalProductPrice extends ModalBase { confirm() {} - get isFreeProduct() { - return this.product.type === 'free'; + get isFreeTier() { + return this.tier.type === 'free'; } get allCurrencies() { return getCurrencyOptions(); } - get productCurrency() { - if (this.isFreeProduct) { - const firstPaidProduct = this.model.products?.find((product) => { - return product.type === 'paid'; + get tierCurrency() { + if (this.isFreeTier) { + const firstPaidTier = this.model.tiers?.find((tier) => { + return tier.type === 'paid'; }); - return firstPaidProduct?.monthlyPrice?.currency || 'usd'; + return firstPaidTier?.monthlyPrice?.currency || 'usd'; } else { - return this.product?.monthlyPrice?.currency; + return this.tier?.monthlyPrice?.currency; } } @@ -66,18 +66,18 @@ export default class ModalProductPrice extends ModalBase { init() { super.init(...arguments); - this.product = this.model.product; - const monthlyPrice = this.product.get('monthlyPrice'); - const yearlyPrice = this.product.get('yearlyPrice'); + this.tier = this.model.tier; + const monthlyPrice = this.tier.get('monthlyPrice'); + const yearlyPrice = this.tier.get('yearlyPrice'); if (monthlyPrice) { this.stripeMonthlyAmount = (monthlyPrice.amount / 100); } if (yearlyPrice) { this.stripeYearlyAmount = (yearlyPrice.amount / 100); } - this.currency = this.productCurrency || 'usd'; - this.benefits = this.product.get('benefits') || emberA([]); - this.newBenefit = ProductBenefitItem.create({ + this.currency = this.tierCurrency || 'usd'; + this.benefits = this.tier.get('benefits') || emberA([]); + this.newBenefit = TierBenefitItem.create({ isNew: true, name: '' }); @@ -97,9 +97,9 @@ export default class ModalProductPrice extends ModalBase { if (this.welcomePageURL.href.startsWith(siteUrl)) { const path = this.welcomePageURL.href.replace(siteUrl, ''); - this.model.product.welcomePageURL = path; + this.model.tier.welcomePageURL = path; } else { - this.model.product.welcomePageURL = this.welcomePageURL.href; + this.model.tier.welcomePageURL = this.welcomePageURL.href; } } @@ -109,12 +109,12 @@ export default class ModalProductPrice extends ModalBase { // eslint-disable-next-line no-dupe-class-members get welcomePageURL() { - return this.model.product.welcomePageURL; + return this.model.tier.welcomePageURL; } get title() { - if (this.isExistingProduct) { - if (this.isFreeProduct) { + if (this.isExistingTier) { + if (this.isFreeTier) { return `Edit free membership`; } return `Edit tier`; @@ -122,8 +122,8 @@ export default class ModalProductPrice extends ModalBase { return 'New tier'; } - get isExistingProduct() { - return !this.model.product.isNew; + get isExistingTier() { + return !this.model.tier.isNew; } @action @@ -143,13 +143,13 @@ export default class ModalProductPrice extends ModalBase { } reset() { - this.newBenefit = ProductBenefitItem.create({isNew: true, name: ''}); - const savedBenefits = this.product.benefits?.filter(benefit => !!benefit.id) || emberA([]); - this.product.set('benefits', savedBenefits); + this.newBenefit = TierBenefitItem.create({isNew: true, name: ''}); + const savedBenefits = this.tier.benefits?.filter(benefit => !!benefit.id) || emberA([]); + this.tier.set('benefits', savedBenefits); } @task({drop: true}) - *saveProduct() { + *saveTier() { this.validatePrices(); if (!isEmpty(this.errors) && Object.keys(this.errors).length > 0) { return; @@ -162,10 +162,10 @@ export default class ModalProductPrice extends ModalBase { yield this.send('addBenefit', this.newBenefit); } - if (!this.isFreeProduct) { + if (!this.isFreeTier) { const monthlyAmount = Math.round(this.stripeMonthlyAmount * 100); const yearlyAmount = Math.round(this.stripeYearlyAmount * 100); - this.product.set('monthlyPrice', { + this.tier.set('monthlyPrice', { nickname: 'Monthly', amount: monthlyAmount, active: true, @@ -173,7 +173,7 @@ export default class ModalProductPrice extends ModalBase { interval: 'month', type: 'recurring' }); - this.product.set('yearlyPrice', { + this.tier.set('yearlyPrice', { nickname: 'Yearly', amount: yearlyAmount, active: true, @@ -182,8 +182,8 @@ export default class ModalProductPrice extends ModalBase { type: 'recurring' }); } - this.product.set('benefits', this.benefits.filter(benefit => !benefit.get('isBlank'))); - yield this.product.save(); + this.tier.set('benefits', this.benefits.filter(benefit => !benefit.get('isBlank'))); + yield this.tier.save(); yield this.confirm(); this.send('closeModal'); @@ -208,7 +208,7 @@ export default class ModalProductPrice extends ModalBase { item.set('isNew', false); this.benefits.pushObject(item); - this.newBenefit = ProductBenefitItem.create({isNew: true, name: ''}); + this.newBenefit = TierBenefitItem.create({isNew: true, name: ''}); } calculateDiscount() { @@ -254,7 +254,7 @@ export default class ModalProductPrice extends ModalBase { this.benefits.removeObject(item); }, reorderItems() { - this.product.set('benefits', this.benefits); + this.tier.set('benefits', this.benefits); }, updateLabel(label, benefitItem) { if (!benefitItem) { diff --git a/ghost/admin/app/components/modals/tiers/archive.hbs b/ghost/admin/app/components/modals/tiers/archive.hbs index 8e40e45023..638b4bbad8 100644 --- a/ghost/admin/app/components/modals/tiers/archive.hbs +++ b/ghost/admin/app/components/modals/tiers/archive.hbs @@ -7,7 +7,7 @@

    - Members will no longer be able to subscribe to {{@data.product.name}} and it will be removed from the list of available tiers in portal. + Members will no longer be able to subscribe to {{@data.tier.name}} and it will be removed from the list of available tiers in portal.

    Existing members on this tier will remain unchanged. diff --git a/ghost/admin/app/components/modals/tiers/archive.js b/ghost/admin/app/components/modals/tiers/archive.js index a5423c37d5..72598cff8b 100644 --- a/ghost/admin/app/components/modals/tiers/archive.js +++ b/ghost/admin/app/components/modals/tiers/archive.js @@ -7,20 +7,20 @@ export default class ArchiveTierModal extends Component { @service router; get isActive() { - const {product} = this.args.data; - return !!product.active; + const {tier} = this.args.data; + return !!tier.active; } @task({drop: true}) *archiveTierTask() { - const {product, onArchive} = this.args.data; - product.active = false; - product.visibility = 'none'; + const {tier, onArchive} = this.args.data; + tier.active = false; + tier.visibility = 'none'; try { - yield product.save(); + yield tier.save(); onArchive?.(); - return product; + return tier; } catch (error) { if (error) { this.notifications.showAPIError(error, {key: 'tier.archive.failed'}); diff --git a/ghost/admin/app/components/modals/tiers/unarchive.hbs b/ghost/admin/app/components/modals/tiers/unarchive.hbs index 4dbb89918c..3e26677118 100644 --- a/ghost/admin/app/components/modals/tiers/unarchive.hbs +++ b/ghost/admin/app/components/modals/tiers/unarchive.hbs @@ -7,10 +7,10 @@

    - Reactivating {{@data.product.name}} will re-enable it as an option in portal and allow new members to subscribe to this tier. + Reactivating {{@data.tier.name}} will re-enable it as an option in portal and allow new members to subscribe to this tier.

    - Existing members will remain unchanged. + Existing members will remain unchanged.

    diff --git a/ghost/admin/app/components/modals/tiers/unarchive.js b/ghost/admin/app/components/modals/tiers/unarchive.js index f81155c25d..a0b8aa14e5 100644 --- a/ghost/admin/app/components/modals/tiers/unarchive.js +++ b/ghost/admin/app/components/modals/tiers/unarchive.js @@ -7,19 +7,19 @@ export default class UnarchiveTierModal extends Component { @service router; get isActive() { - const {product} = this.args.data; - return !!product.active; + const {tier} = this.args.data; + return !!tier.active; } @task({drop: true}) *unarchiveTask() { - const {product, onUnarchive} = this.args.data; - product.active = true; + const {tier, onUnarchive} = this.args.data; + tier.active = true; try { - yield product.save(); + yield tier.save(); onUnarchive?.(); - return product; + return tier; } catch (error) { if (error) { this.notifications.showAPIError(error, {key: 'tier.unarchive.failed'}); diff --git a/ghost/admin/app/components/settings/members-default-post-access.hbs b/ghost/admin/app/components/settings/members-default-post-access.hbs index b522d3c506..b944df7f2a 100644 --- a/ghost/admin/app/components/settings/members-default-post-access.hbs +++ b/ghost/admin/app/components/settings/members-default-post-access.hbs @@ -26,7 +26,7 @@ {{#if this.hasVisibilityFilter}}
    { - return product.id; + const tierIds = segment?.map((tier) => { + return tier.id; }); this.settings.set('defaultContentVisibility', 'tiers'); - this.settings.set('defaultContentVisibilityTiers', productIds); + this.settings.set('defaultContentVisibilityTiers', tierIds); this.showSegmentError = false; } else { this.settings.set('defaultContentVisibility', ''); diff --git a/ghost/admin/app/components/settings/members/archive-tier.hbs b/ghost/admin/app/components/settings/members/archive-tier.hbs index 48185189dc..320f1104b7 100644 --- a/ghost/admin/app/components/settings/members/archive-tier.hbs +++ b/ghost/admin/app/components/settings/members/archive-tier.hbs @@ -1,5 +1,5 @@ -{{#if this.product.active}} - {{#unless this.product.isNew}} +{{#if this.tier.active}} + {{#unless this.tier.isNew}} - {{/unless}} - {{else}} - You need to to add prices - {{/if}} -
    - - - {{/unless}} - {{#each this.stripePrices as |price|}} -
  • -
    -

    - {{price.nickname}} - {{#unless price.active}} - Archived - {{/unless}} -

    -

    - {{price.description}} -

    -
    - -
    - {{currency-symbol price.currency}}{{price.amount}} / {{price.interval}} -
    - -
    -
    - - {{#if price.active}} - - {{else}} - - {{/if}} -
    -
    -
    • - {{/each}} - - - {{#if this.stripePrices}} - {{#unless this.product.isNew}} - - {{/unless}} - {{/if}} -
    -
    - - {{#if this.showPriceModal}} - - {{/if}} - - {{#if this.showUnsavedChangesModal}} - - {{/if}} - \ No newline at end of file diff --git a/ghost/admin/app/templates/settings/products.hbs b/ghost/admin/app/templates/settings/products.hbs deleted file mode 100644 index 0359a9a04d..0000000000 --- a/ghost/admin/app/templates/settings/products.hbs +++ /dev/null @@ -1,48 +0,0 @@ -
    - -

    - Settings - {{svg-jar "arrow-right"}} - Products -

    -     - -
    -
    -
    - {{svg-jar "members"}} -

    - Free membership -

    -

    - {{this.settings.membersFreePriceDescription}} -

    - - Customize - -
    - - {{#each this.products as |product|}} -
    -
    -

    - {{product.name}} -

    -

    - {{product.description}} -

    - - Customize - -
    - {{/each}} -
    -
    -
    - -{{#if this.showFreeMembershipModal}} - -{{/if}} diff --git a/ghost/admin/app/transforms/member-product.js b/ghost/admin/app/transforms/member-tier.js similarity index 80% rename from ghost/admin/app/transforms/member-product.js rename to ghost/admin/app/transforms/member-tier.js index 3436212b1d..3e38eb4446 100644 --- a/ghost/admin/app/transforms/member-product.js +++ b/ghost/admin/app/transforms/member-tier.js @@ -1,14 +1,14 @@ -import MemberProduct from 'ghost-admin/models/member-product'; +import MemberTier from 'ghost-admin/models/member-tier'; import Transform from '@ember-data/serializer/transform'; import {A as emberA, isArray as isEmberArray} from '@ember/array'; -export default class MemberProductTransform extends Transform { +export default class MemberTierTransform extends Transform { deserialize(serialized) { let subscriptions, subscriptionArray; subscriptionArray = serialized || []; - subscriptions = subscriptionArray.map(itemDetails => MemberProduct.create(itemDetails)); + subscriptions = subscriptionArray.map(itemDetails => MemberTier.create(itemDetails)); return emberA(subscriptions); } @@ -27,4 +27,3 @@ export default class MemberProductTransform extends Transform { return subscriptionArray; } } - diff --git a/ghost/admin/app/transforms/product-benefits.js b/ghost/admin/app/transforms/tier-benefits.js similarity index 80% rename from ghost/admin/app/transforms/product-benefits.js rename to ghost/admin/app/transforms/tier-benefits.js index eb7880b0b2..020ab0b806 100644 --- a/ghost/admin/app/transforms/product-benefits.js +++ b/ghost/admin/app/transforms/tier-benefits.js @@ -1,15 +1,15 @@ -import ProductBenefitItem from '../models/product-benefit-item'; +import TierBenefitItem from '../models/tier-benefit-item'; import Transform from '@ember-data/serializer/transform'; import {A as emberA, isArray as isEmberArray} from '@ember/array'; -export default class ProductBenefits extends Transform { +export default class TierBenefits extends Transform { deserialize(serialized) { let benefitsItems, benefitsArray; benefitsArray = serialized || []; benefitsItems = benefitsArray.map((itemDetails) => { - return ProductBenefitItem.create(itemDetails); + return TierBenefitItem.create(itemDetails); }); return emberA(benefitsItems); diff --git a/ghost/admin/app/validators/product-benefit-item.js b/ghost/admin/app/validators/tier-benefit-item.js similarity index 100% rename from ghost/admin/app/validators/product-benefit-item.js rename to ghost/admin/app/validators/tier-benefit-item.js diff --git a/ghost/admin/app/validators/product.js b/ghost/admin/app/validators/tier.js similarity index 100% rename from ghost/admin/app/validators/product.js rename to ghost/admin/app/validators/tier.js diff --git a/ghost/admin/mirage/config.js b/ghost/admin/mirage/config.js index 5ad51cd4af..6b10ec5f8e 100644 --- a/ghost/admin/mirage/config.js +++ b/ghost/admin/mirage/config.js @@ -12,7 +12,6 @@ import mockNewsletters from './config/newsletters'; import mockOffers from './config/offers'; import mockPages from './config/pages'; import mockPosts from './config/posts'; -import mockProducts from './config/products'; import mockRoles from './config/roles'; import mockSettings from './config/settings'; import mockSite from './config/site'; @@ -20,6 +19,7 @@ import mockSlugs from './config/slugs'; import mockSnippets from './config/snippets'; import mockTags from './config/tags'; import mockThemes from './config/themes'; +import mockTiers from './config/tiers'; import mockUploads from './config/uploads'; import mockUsers from './config/users'; import mockWebhooks from './config/webhooks'; @@ -77,7 +77,7 @@ export function testConfig() { mockUploads(this); mockUsers(this); mockWebhooks(this); - mockProducts(this); + mockTiers(this); mockOffers(this); mockSnippets(this); mockNewsletters(this); diff --git a/ghost/admin/mirage/config/members.js b/ghost/admin/mirage/config/members.js index f3a498fe99..377041e93c 100644 --- a/ghost/admin/mirage/config/members.js +++ b/ghost/admin/mirage/config/members.js @@ -81,8 +81,8 @@ export default function mockMembers(server) { replacement: 'labels.slug' }, { - key: 'product', - replacement: 'products.slug' + key: 'tier', + replacement: 'tiers.slug' } ] }); @@ -97,7 +97,7 @@ export default function mockMembers(server) { }); // similar deal for associated models - ['labels', 'products', 'subscriptions', 'newsletters'].forEach((association) => { + ['labels', 'tiers', 'subscriptions', 'newsletters'].forEach((association) => { serializedMember[association] = []; member[association].models.forEach((associatedModel) => { @@ -177,22 +177,22 @@ export default function mockMembers(server) { }); }); - server.put('/members/:id/', function ({members, products, subscriptions}, {params}) { + server.put('/members/:id/', function ({members, tiers, subscriptions}, {params}) { const attrs = this.normalizedRequestAttrs(); const member = members.find(params.id); - // API accepts `products: [{id: 'x'}]` which isn't handled natively by mirage - if (attrs.products.length > 0) { - attrs.products.forEach((p) => { - const product = products.find(p.id); + // API accepts `tiers: [{id: 'x'}]` which isn't handled natively by mirage + if (attrs.tiers.length > 0) { + attrs.tiers.forEach((p) => { + const tier = tiers.find(p.id); - if (!member.products.includes(product)) { - // TODO: serialize products through _active_ subscriptions - member.products.add(product); + if (!member.tiers.includes(tier)) { + // TODO: serialize tiers through _active_ subscriptions + member.tiers.add(tier); subscriptions.create({ member, - product, + tier, comped: true, plan: { id: '', @@ -215,9 +215,9 @@ export default function mockMembers(server) { interval: 'year', type: 'recurring', currency: 'USD', - product: { + tier: { id: '', - product_id: product.id + tier_id: tier.id } }, offer: null @@ -228,20 +228,20 @@ export default function mockMembers(server) { }); } - const productIds = (attrs.products || []).map(p => p.id); + const tierIds = (attrs.tiers || []).map(p => p.id); - member.products.models.forEach((product) => { - if (!productIds.includes(product.id)) { - member.subscriptions.models.filter(sub => sub.product.id === product.id).forEach((sub) => { + member.tiers.models.forEach((tier) => { + if (!tierIds.includes(tier.id)) { + member.subscriptions.models.filter(sub => sub.tier.id === tier.id).forEach((sub) => { member.subscriptions.remove(sub); }); - member.products.remove(product); + member.tiers.remove(tier); } }); // these are read-only properties so make sure we don't overwrite data - delete attrs.products; + delete attrs.tiers; delete attrs.subscriptions; return member.update(attrs); diff --git a/ghost/admin/mirage/config/offers.js b/ghost/admin/mirage/config/offers.js index 6dc4a8b23a..b84ae46385 100644 --- a/ghost/admin/mirage/config/offers.js +++ b/ghost/admin/mirage/config/offers.js @@ -7,9 +7,9 @@ export default function mockOffers(server) { server.get('/offers/:id/', function ({offers}, {params}) { let {id} = params; - let product = offers.find(id); + let tier = offers.find(id); - return product || new Response(404, {}, { + return tier || new Response(404, {}, { errors: [{ type: 'NotFoundError', message: 'Offer not found.' diff --git a/ghost/admin/mirage/config/products.js b/ghost/admin/mirage/config/products.js deleted file mode 100644 index be05be1b97..0000000000 --- a/ghost/admin/mirage/config/products.js +++ /dev/null @@ -1,44 +0,0 @@ -import {paginatedResponse} from '../utils'; - -export default function mockProducts(server) { - server.post('/products/'); - - server.get('/products/', paginatedResponse('products')); - - server.get('/products/:id/', function ({products}, {params}) { - let {id} = params; - let product = products.find(id); - - return product || new Response(404, {}, { - errors: [{ - type: 'NotFoundError', - message: 'Product not found.' - }] - }); - }); - - server.put('/products/:id/', function ({products, productBenefits}, {params}) { - const attrs = this.normalizedRequestAttrs(); - const product = products.find(params.id); - - const benefitAttrs = attrs.benefits; - delete attrs.benefits; - - product.update(attrs); - - benefitAttrs.forEach((benefit) => { - if (benefit.id) { - const productBenefit = productBenefits.find(benefit.id); - productBenefit.product = product; - productBenefit.save(); - } else { - product.createProductBenefit(benefit); - product.save(); - } - }); - - return product.save(); - }); - - server.del('/products/:id/'); -} diff --git a/ghost/admin/mirage/config/tiers.js b/ghost/admin/mirage/config/tiers.js new file mode 100644 index 0000000000..a6cbc559ea --- /dev/null +++ b/ghost/admin/mirage/config/tiers.js @@ -0,0 +1,44 @@ +import {paginatedResponse} from '../utils'; + +export default function mockTiers(server) { + server.post('/tiers/'); + + server.get('/tiers/', paginatedResponse('tiers')); + + server.get('/tiers/:id/', function ({tiers}, {params}) { + let {id} = params; + let tier = tiers.find(id); + + return tier || new Response(404, {}, { + errors: [{ + type: 'NotFoundError', + message: 'Tier not found.' + }] + }); + }); + + server.put('/tiers/:id/', function ({tiers, tierBenefits}, {params}) { + const attrs = this.normalizedRequestAttrs(); + const tier = tiers.find(params.id); + + const benefitAttrs = attrs.benefits; + delete attrs.benefits; + + tier.update(attrs); + + benefitAttrs.forEach((benefit) => { + if (benefit.id) { + const tierBenefit = tierBenefits.find(benefit.id); + tierBenefit.tier = tier; + tierBenefit.save(); + } else { + tier.createTierBenefit(benefit); + tier.save(); + } + }); + + return tier.save(); + }); + + server.del('/tiers/:id/'); +} diff --git a/ghost/admin/mirage/factories/product.js b/ghost/admin/mirage/factories/tier.js similarity index 77% rename from ghost/admin/mirage/factories/product.js rename to ghost/admin/mirage/factories/tier.js index ad9cb28b99..f2f89c670c 100644 --- a/ghost/admin/mirage/factories/product.js +++ b/ghost/admin/mirage/factories/tier.js @@ -1,10 +1,10 @@ import {Factory} from 'miragejs'; export default Factory.extend({ - name(i) { return `Product ${i}`; }, - description(i) { return `Description for product ${i}`; }, + name(i) { return `Tier ${i}`; }, + description(i) { return `Description for tier ${i}`; }, active: true, - slug(i) { return `product-${i}`;}, + slug(i) { return `tier-${i}`;}, type: 'paid', visibility: 'none', monthly_price() { diff --git a/ghost/admin/mirage/fixtures/settings.js b/ghost/admin/mirage/fixtures/settings.js index 2978fda7fb..6d2b8f3c55 100644 --- a/ghost/admin/mirage/fixtures/settings.js +++ b/ghost/admin/mirage/fixtures/settings.js @@ -177,7 +177,7 @@ export default [ id: 23, group: 'members', key: 'members_subscription_settings', - value: '{"allowSelfSignup":true,"fromAddress":"noreply","paymentProcessors":[{"adapter":"stripe","config":{"secret_token":"","public_token":"","product":{"name":"Ghost Subscription"},"plans":[{"name":"Monthly","currency":"usd","interval":"month","amount":""},{"name":"Yearly","currency":"usd","interval":"year","amount":""}]}}]}', + value: '{"allowSelfSignup":true,"fromAddress":"noreply","paymentProcessors":[{"adapter":"stripe","config":{"secret_token":"","public_token":"","tier":{"name":"Ghost Subscription"},"plans":[{"name":"Monthly","currency":"usd","interval":"month","amount":""},{"name":"Yearly","currency":"usd","interval":"year","amount":""}]}}]}', created_at: '2019-10-09T09:49:00.000Z', created_by: 1, updated_at: '2019-10-09T09:49:00.000Z', diff --git a/ghost/admin/mirage/fixtures/products.js b/ghost/admin/mirage/fixtures/tiers.js similarity index 91% rename from ghost/admin/mirage/fixtures/products.js rename to ghost/admin/mirage/fixtures/tiers.js index d6908a45a0..e2c199082a 100644 --- a/ghost/admin/mirage/fixtures/products.js +++ b/ghost/admin/mirage/fixtures/tiers.js @@ -22,8 +22,8 @@ export default [ createdAt: '2022-02-04T13:11:40.000Z', description: null, monthlyPrice: null, - name: 'Default Product', - slug: 'default-product', + name: 'Default Tier', + slug: 'default-tier', type: 'paid', visibility: 'public', updatedAt: '2022-02-04T13:11:40.000Z', diff --git a/ghost/admin/mirage/models/member.js b/ghost/admin/mirage/models/member.js index d1ca4c1bb1..16210f5611 100644 --- a/ghost/admin/mirage/models/member.js +++ b/ghost/admin/mirage/models/member.js @@ -3,7 +3,7 @@ import {Model, hasMany} from 'miragejs'; export default Model.extend({ labels: hasMany(), emailRecipients: hasMany(), - products: hasMany(), + tiers: hasMany(), newsletters: hasMany(), subscriptions: hasMany() }); diff --git a/ghost/admin/mirage/models/subscription.js b/ghost/admin/mirage/models/subscription.js index f72d475892..521d7daff6 100644 --- a/ghost/admin/mirage/models/subscription.js +++ b/ghost/admin/mirage/models/subscription.js @@ -2,5 +2,5 @@ import {Model, belongsTo} from 'miragejs'; export default Model.extend({ member: belongsTo(), - product: belongsTo() + tier: belongsTo() }); diff --git a/ghost/admin/mirage/models/product-benefit.js b/ghost/admin/mirage/models/tier-benefit.js similarity index 69% rename from ghost/admin/mirage/models/product-benefit.js rename to ghost/admin/mirage/models/tier-benefit.js index cbfe0bfd43..065ac9c60d 100644 --- a/ghost/admin/mirage/models/product-benefit.js +++ b/ghost/admin/mirage/models/tier-benefit.js @@ -1,5 +1,5 @@ import {Model, belongsTo} from 'miragejs'; export default Model.extend({ - product: belongsTo('product') + tier: belongsTo('tier') }); diff --git a/ghost/admin/mirage/models/product.js b/ghost/admin/mirage/models/tier.js similarity index 86% rename from ghost/admin/mirage/models/product.js rename to ghost/admin/mirage/models/tier.js index 15451bba13..84bf22c4b1 100644 --- a/ghost/admin/mirage/models/product.js +++ b/ghost/admin/mirage/models/tier.js @@ -3,6 +3,6 @@ import {Model, hasMany} from 'miragejs'; export default Model.extend({ // ran into odd relationship bugs when called `benefits` // serializer will rename to `benefits` - productBenefits: hasMany(), + tierBenefits: hasMany(), members: hasMany() }); diff --git a/ghost/admin/mirage/serializers/subscription.js b/ghost/admin/mirage/serializers/subscription.js index adf4751015..bede70ffeb 100644 --- a/ghost/admin/mirage/serializers/subscription.js +++ b/ghost/admin/mirage/serializers/subscription.js @@ -7,13 +7,13 @@ export default BaseSerializer.extend({ include(/*request*/) { let includes = []; - includes.push('product'); + includes.push('tier'); return includes; }, keyForEmbeddedRelationship(relationshipName) { - if (relationshipName === 'product') { + if (relationshipName === 'tier') { return 'tier'; } diff --git a/ghost/admin/mirage/serializers/product-benefit.js b/ghost/admin/mirage/serializers/tier-benefit.js similarity index 100% rename from ghost/admin/mirage/serializers/product-benefit.js rename to ghost/admin/mirage/serializers/tier-benefit.js diff --git a/ghost/admin/mirage/serializers/product.js b/ghost/admin/mirage/serializers/tier.js similarity index 79% rename from ghost/admin/mirage/serializers/product.js rename to ghost/admin/mirage/serializers/tier.js index 3f4c659d62..d663c41905 100644 --- a/ghost/admin/mirage/serializers/product.js +++ b/ghost/admin/mirage/serializers/tier.js @@ -7,13 +7,13 @@ export default BaseSerializer.extend({ include(/*request*/) { let includes = []; - includes.push('productBenefits'); + includes.push('tierBenefits'); return includes; }, keyForEmbeddedRelationship(relationshipName) { - if (relationshipName === 'productBenefits') { + if (relationshipName === 'tierBenefits') { return 'benefits'; } diff --git a/ghost/admin/tests/acceptance/members/details-test.js b/ghost/admin/tests/acceptance/members/details-test.js index 29d36a87a6..0695ec12a8 100644 --- a/ghost/admin/tests/acceptance/members/details-test.js +++ b/ghost/admin/tests/acceptance/members/details-test.js @@ -13,7 +13,7 @@ describe('Acceptance: Member details', function () { setupMirage(hooks); let clock; - let product; + let tier; beforeEach(async function () { this.server.loadFixtures('configs'); @@ -25,8 +25,8 @@ describe('Acceptance: Member details', function () { enableStripe(this.server); enableNewsletters(this.server, true); - // add a default product that complimentary plans can be assigned to - product = this.server.create('product', { + // add a default tier that complimentary plans can be assigned to + tier = this.server.create('tier', { id: '6213b3f6cb39ebdb03ebd810', name: 'Ghost Subscription', slug: 'ghost-subscription', @@ -82,17 +82,17 @@ describe('Acceptance: Member details', function () { interval: 'month', type: 'recurring', currency: 'USD', - product: { + tier: { id: 'prod_LFmAAmCnnbzrvL', name: 'Ghost Subscription', - product_id: product.id + tier_id: tier.id } }, offer: null }), this.server.create('subscription', { id: 'sub_1KZGi6EGb07FFvyNDjZq98g8', - product, + tier, customer: { id: 'cus_LFmGicpX4BkQKH', name: '123', @@ -119,17 +119,17 @@ describe('Acceptance: Member details', function () { interval: 'month', type: 'recurring', currency: 'USD', - product: { + tier: { id: 'prod_LFmAAmCnnbzrvL', name: 'Ghost Subscription', - product_id: product.id + tier_id: tier.id } }, offer: null }) ], - products: [ - product + tiers: [ + tier ] }); @@ -149,7 +149,7 @@ describe('Acceptance: Member details', function () { subscriptions: [ this.server.create('subscription', { id: 'sub_1KZGcmEGb07FFvyN9jwrwbKu', - product, + tier, customer: { id: 'cus_LFmBWoSkB84lnr', name: 'test', @@ -176,16 +176,16 @@ describe('Acceptance: Member details', function () { interval: 'month', type: 'recurring', currency: 'USD', - product: { + tier: { id: 'prod_LFmAAmCnnbzrvL', name: 'Ghost Subscription', - product_id: '6213b3f6cb39ebdb03ebd810' + tier_id: '6213b3f6cb39ebdb03ebd810' } }, offer: null }) ], - products: [] + tiers: [] }); await visit(`/members/${member.id}`); @@ -205,17 +205,17 @@ describe('Acceptance: Member details', function () { .to.equal(1); await click('[data-test-button="add-complimentary"]'); - expect(find('[data-test-modal="member-product"]'), 'select product modal').to.exist; + expect(find('[data-test-modal="member-tier"]'), 'select tier modal').to.exist; expect(find('[data-test-text="select-tier-desc"]')).to.contain.text('Comp Member Test'); expect(find('[data-test-tier-option="6213b3f6cb39ebdb03ebd810"]')).to.have.exist; expect(find('[data-test-tier-option="6213b3f6cb39ebdb03ebd810"]')).to.have.class('active'); - await click('[data-test-button="save-comp-product"]'); + await click('[data-test-button="save-comp-tier"]'); expect(findAll('[data-test-subscription]').length, '# of subscription blocks - after add comped') .to.equal(1); - await click('[data-test-product="6213b3f6cb39ebdb03ebd810"] [data-test-button="subscription-actions"]'); - await click('[data-test-product="6213b3f6cb39ebdb03ebd810"] [data-test-button="remove-complimentary"]'); + await click('[data-test-tier="6213b3f6cb39ebdb03ebd810"] [data-test-button="subscription-actions"]'); + await click('[data-test-tier="6213b3f6cb39ebdb03ebd810"] [data-test-button="remove-complimentary"]'); expect(findAll('[data-test-subscription]').length, '# of subscription blocks - after remove comped') .to.equal(0); @@ -226,13 +226,13 @@ describe('Acceptance: Member details', function () { name: 'Comped for canceled sub test', subscriptions: [ this.server.create('subscription', { - // product, // _Not_ included as `tier` when subscription is canceled + // tier, // _Not_ included as `tier` when subscription is canceled status: 'canceled', price: { id: 'price_1', - product: { + tier: { id: 'prod_1', - product_id: product.id + tier_id: tier.id } } }) @@ -245,7 +245,7 @@ describe('Acceptance: Member details', function () { .to.equal(1); await click('[data-test-button="add-complimentary"]'); - await click('[data-test-button="save-comp-product"]'); + await click('[data-test-button="save-comp-tier"]'); expect(findAll('[data-test-subscription]').length, '# of subscription blocks - after add comped') .to.equal(2); @@ -253,10 +253,10 @@ describe('Acceptance: Member details', function () { .to.equal(0); }); - it('handles multiple products', async function () { - const product2 = this.server.create('product', { - name: 'Second product', - slug: 'second-product', + it('handles multiple tiers', async function () { + const tier2 = this.server.create('tier', { + name: 'Second tier', + slug: 'second-tier', created_at: '2022-02-21T16:47:02.000Z', updated_at: '2022-03-03T15:37:02.000Z', description: null, @@ -267,32 +267,32 @@ describe('Acceptance: Member details', function () { welcome_page_url: '/' }); - const member = this.server.create('member', {name: 'Multiple product test'}); + const member = this.server.create('member', {name: 'Multiple tier test'}); - this.server.create('subscription', {member, product, status: 'canceled', price: {id: '1', product: {product_id: product.id}}}); - this.server.create('subscription', {member, product, status: 'canceled', price: {id: '1', product: {product_id: product.id}}}); - this.server.create('subscription', {member, product: product2, status: 'canceled', price: {id: '1', product: {product_id: product2.id}}}); + this.server.create('subscription', {member, tier, status: 'canceled', price: {id: '1', tier: {tier_id: tier.id}}}); + this.server.create('subscription', {member, tier, status: 'canceled', price: {id: '1', tier: {tier_id: tier.id}}}); + this.server.create('subscription', {member, tier: tier2, status: 'canceled', price: {id: '1', tier: {tier_id: tier2.id}}}); await visit(`/members/${member.id}`); - // all products and subscriptions are shown - expect(findAll('[data-test-product]').length, '# of product blocks').to.equal(2); + // all tiers and subscriptions are shown + expect(findAll('[data-test-tier]').length, '# of tier blocks').to.equal(2); - const p1 = `[data-test-product="${product.id}"]`; - const p2 = `[data-test-product="${product2.id}"]`; + const p1 = `[data-test-tier="${tier.id}"]`; + const p2 = `[data-test-tier="${tier2.id}"]`; - expect(find(`${p1} [data-test-text="product-name"]`)).to.contain.text('Ghost Subscription'); - expect(findAll(`${p1} [data-test-subscription]`).length, '# of product 1 subscription blocks').to.equal(2); + expect(find(`${p1} [data-test-text="tier-name"]`)).to.contain.text('Ghost Subscription'); + expect(findAll(`${p1} [data-test-subscription]`).length, '# of tier 1 subscription blocks').to.equal(2); - expect(find(`${p2} [data-test-text="product-name"]`)).to.contain.text('Second product'); - expect(findAll(`${p2} [data-test-subscription]`).length, '# of product 2 subscription blocks').to.equal(1); + expect(find(`${p2} [data-test-text="tier-name"]`)).to.contain.text('Second tier'); + expect(findAll(`${p2} [data-test-subscription]`).length, '# of tier 2 subscription blocks').to.equal(1); // can add complimentary expect(findAll('[data-test-button="add-complimentary"]').length, '# of add-complimentary buttons').to.equal(1); await click('[data-test-button="add-complimentary"]'); - await click(`[data-test-tier-option="${product2.id}"]`); - await click('[data-test-button="save-comp-product"]'); + await click(`[data-test-tier-option="${tier2.id}"]`); + await click('[data-test-button="save-comp-tier"]'); - expect(findAll(`${p2} [data-test-subscription]`).length, '# of product 2 subscription blocks after comp added').to.equal(2); + expect(findAll(`${p2} [data-test-subscription]`).length, '# of tier 2 subscription blocks after comp added').to.equal(2); }); }); diff --git a/ghost/admin/tests/acceptance/members/filter-test.js b/ghost/admin/tests/acceptance/members/filter-test.js index e3315a039f..cb40c49ad8 100644 --- a/ghost/admin/tests/acceptance/members/filter-test.js +++ b/ghost/admin/tests/acceptance/members/filter-test.js @@ -116,11 +116,11 @@ describe('Acceptance: Members filtering', function () { it('can filter by tier', async function () { // add some labels to test the selection dropdown const newsletter = this.server.create('newsletter', {status: 'active'}); - this.server.createList('product', 4); + this.server.createList('tier', 4); // add a labelled member so we can test the filter includes correctly - const product = this.server.create('product'); - this.server.createList('member', 3, {products: [product], newsletters: [newsletter]}); + const tier = this.server.create('tier'); + this.server.createList('member', 3, {tiers: [tier], newsletters: [newsletter]}); // add some non-labelled members so we can see the filter excludes correctly this.server.createList('member', 4, {newsletters: [newsletter]}); @@ -133,7 +133,7 @@ describe('Acceptance: Members filtering', function () { const filterSelector = `[data-test-members-filter="0"]`; - await fillIn(`${filterSelector} [data-test-select="members-filter"]`, 'product'); + await fillIn(`${filterSelector} [data-test-select="members-filter"]`, 'tier'); // has the right operators const operatorOptions = findAll(`${filterSelector} [data-test-select="members-filter-operator"] option`); @@ -146,14 +146,14 @@ describe('Acceptance: Members filtering', function () { expect(findAll(`${filterSelector} [data-test-tiers-segment]`).length, '# of label options').to.equal(5); // selecting a value updates table - await selectChoose(`${filterSelector} .gh-tier-token-input`, product.name); + await selectChoose(`${filterSelector} .gh-tier-token-input`, tier.name); - expect(findAll('[data-test-list="members-list-item"]').length, `# of filtered member rows - ${product.name}`) + expect(findAll('[data-test-list="members-list-item"]').length, `# of filtered member rows - ${tier.name}`) .to.equal(3); // table shows labels column+data - expect(find('[data-test-table-column="product"]')).to.exist; - expect(findAll('[data-test-table-data="product"]').length).to.equal(3); - expect(find('[data-test-table-data="product"]')).to.contain.text(product.name); + expect(find('[data-test-table-column="tier"]')).to.exist; + expect(findAll('[data-test-table-data="tier"]').length).to.equal(3); + expect(find('[data-test-table-data="tier"]')).to.contain.text(tier.name); // can delete filter await click('[data-test-delete-members-filter="0"]'); diff --git a/ghost/admin/tests/acceptance/offers-test.js b/ghost/admin/tests/acceptance/offers-test.js index f5bdac3f75..edcbceb22c 100644 --- a/ghost/admin/tests/acceptance/offers-test.js +++ b/ghost/admin/tests/acceptance/offers-test.js @@ -33,7 +33,7 @@ describe('Acceptance: Offers', function () { describe('as owner', function () { beforeEach(async function () { - this.server.loadFixtures('products'); + this.server.loadFixtures('tiers'); let role = this.server.create('role', {name: 'Owner'}); this.server.create('user', {roles: [role]}); @@ -42,9 +42,9 @@ describe('Acceptance: Offers', function () { }); it('it renders, can be navigated, can edit offer', async function () { - const product = this.server.create('product'); - let offer1 = this.server.create('offer', {tier: {id: product.id}, createdAt: moment.utc().subtract(1, 'day').valueOf()}); - this.server.create('offer', {tier: {id: product.id}, createdAt: moment.utc().subtract(2, 'day').valueOf()}); + const tier = this.server.create('tier'); + let offer1 = this.server.create('offer', {tier: {id: tier.id}, createdAt: moment.utc().subtract(1, 'day').valueOf()}); + this.server.create('offer', {tier: {id: tier.id}, createdAt: moment.utc().subtract(2, 'day').valueOf()}); await visit('/offers'); diff --git a/ghost/admin/tests/acceptance/settings/membership-test.js b/ghost/admin/tests/acceptance/settings/membership-test.js index 1290cac709..7efd52e3f3 100644 --- a/ghost/admin/tests/acceptance/settings/membership-test.js +++ b/ghost/admin/tests/acceptance/settings/membership-test.js @@ -18,7 +18,7 @@ describe('Acceptance: Settings - Membership', function () { beforeEach(async function () { this.server.loadFixtures('configs'); - this.server.loadFixtures('products'); + this.server.loadFixtures('tiers'); this.server.db.configs.update(1, {blogUrl: 'http://localhost:2368'}); @@ -160,10 +160,10 @@ describe('Acceptance: Settings - Membership', function () { await click('[data-test-default-post-access-tiers] .ember-basic-dropdown-trigger'); // paid tiers are available in tiers input - expect(find('[data-test-default-post-access-tiers] [data-test-visibility-segment-option="Default Product"]')).to.exist; + expect(find('[data-test-default-post-access-tiers] [data-test-visibility-segment-option="Default Tier"]')).to.exist; // select tier - await click('[data-test-default-post-access-tiers] [data-test-visibility-segment-option="Default Product"]'); + await click('[data-test-default-post-access-tiers] [data-test-visibility-segment-option="Default Tier"]'); // save await click('[data-test-button="save-settings"]'); @@ -200,7 +200,7 @@ describe('Acceptance: Settings - Membership', function () { await blur('[data-test-input="free-welcome-page"]'); await click('[data-test-button="save-settings"]'); - expect(this.server.db.products.findBy({slug: 'free'}).welcomePageUrl) + expect(this.server.db.tiers.findBy({slug: 'free'}).welcomePageUrl) .to.equal('/not%20a%20url'); // re-rendering will insert full URL in welcome page input @@ -214,22 +214,22 @@ describe('Acceptance: Settings - Membership', function () { // it can manage free tier description and benefits // initial free tier details are as expected - expect(find('[data-test-product-card="free"]')).to.exist; - expect(find('[data-test-product-card="free"] [data-test-name]')).to.contain.text('Free'); - expect(find('[data-test-product-card="free"] [data-test-description]')).to.contain.text('No description'); - expect(find('[data-test-product-card="free"] [data-test-benefits]')).to.contain.text('No benefits'); - expect(find('[data-test-product-card="free"] [data-test-free-price]')).to.exist; + expect(find('[data-test-tier-card="free"]')).to.exist; + expect(find('[data-test-tier-card="free"] [data-test-name]')).to.contain.text('Free'); + expect(find('[data-test-tier-card="free"] [data-test-description]')).to.contain.text('No description'); + expect(find('[data-test-tier-card="free"] [data-test-benefits]')).to.contain.text('No benefits'); + expect(find('[data-test-tier-card="free"] [data-test-free-price]')).to.exist; // open modal - await click('[data-test-product-card="free"] [data-test-button="edit-product"]'); + await click('[data-test-tier-card="free"] [data-test-button="edit-tier"]'); // initial modal state is as expected - const modal = '[data-test-modal="edit-product"]'; + const modal = '[data-test-modal="edit-tier"]'; expect(find(modal)).to.exist; - expect(find(`${modal} [data-test-input="product-name"]`)).to.not.exist; - expect(find(`${modal} [data-test-input="product-description"]`)).to.not.exist; - expect(find(`${modal} [data-test-input="free-product-description"]`)).to.exist; - expect(find(`${modal} [data-test-input="free-product-description"]`)).to.have.value(''); + expect(find(`${modal} [data-test-input="tier-name"]`)).to.not.exist; + expect(find(`${modal} [data-test-input="tier-description"]`)).to.not.exist; + expect(find(`${modal} [data-test-input="free-tier-description"]`)).to.exist; + expect(find(`${modal} [data-test-input="free-tier-description"]`)).to.have.value(''); expect(find(`${modal} [data-test-formgroup="prices"]`)).to.not.exist; expect(find(`${modal} [data-test-benefit-item="new"]`)).to.exist; expect(findAll(`${modal} [data-test-benefit-item]`).length).to.equal(1); @@ -240,7 +240,7 @@ describe('Acceptance: Settings - Membership', function () { expect(find(`${modal} [data-test-tierpreview-price]`).textContent).to.match(/\$\s+0/); // can change description - await fillIn(`${modal} [data-test-input="free-product-description"]`, 'Test description'); + await fillIn(`${modal} [data-test-input="free-tier-description"]`, 'Test description'); expect(find(`${modal} [data-test-tierpreview-description]`)).to.contain.text('Test description'); // can manage benefits @@ -278,20 +278,20 @@ describe('Acceptance: Settings - Membership', function () { const secondBenefitItem = `${modal} [data-test-benefit-item="1"]`; await fillIn(`${secondBenefitItem} [data-test-input="benefit-label"]`, ''); - await click('[data-test-button="save-product"]'); + await click('[data-test-button="save-tier"]'); expect(find(`${modal}`)).to.not.exist; - expect(find('[data-test-product-card="free"] [data-test-name]')).to.contain.text('Free'); - expect(find('[data-test-product-card="free"] [data-test-description]')).to.contain.text('Test description'); - expect(find('[data-test-product-card="free"] [data-test-benefits]')).to.contain.text('Benefits (1)'); - expect(find('[data-test-product-card="free"] [data-test-benefits] li:nth-of-type(1)')).to.contain.text('Second benefit'); - expect(findAll(`[data-test-product-card="free"] [data-test-benefits] li`).length).to.equal(1); + expect(find('[data-test-tier-card="free"] [data-test-name]')).to.contain.text('Free'); + expect(find('[data-test-tier-card="free"] [data-test-description]')).to.contain.text('Test description'); + expect(find('[data-test-tier-card="free"] [data-test-benefits]')).to.contain.text('Benefits (1)'); + expect(find('[data-test-tier-card="free"] [data-test-benefits] li:nth-of-type(1)')).to.contain.text('Second benefit'); + expect(findAll(`[data-test-tier-card="free"] [data-test-benefits] li`).length).to.equal(1); - const freeProduct = this.server.db.products.findBy({slug: 'free'}); - expect(freeProduct.description).to.equal('Test description'); - expect(freeProduct.welcomePageUrl).to.equal('/not%20a%20url'); - expect(freeProduct.productBenefitIds.length).to.equal(1); - const benefits = this.server.db.productBenefits.find(freeProduct.productBenefitIds); + const freeTier = this.server.db.tiers.findBy({slug: 'free'}); + expect(freeTier.description).to.equal('Test description'); + expect(freeTier.welcomePageUrl).to.equal('/not%20a%20url'); + expect(freeTier.tierBenefitIds.length).to.equal(1); + const benefits = this.server.db.tierBenefits.find(freeTier.tierBenefitIds); expect(benefits[0].name).to.equal('Second benefit'); }); });