diff --git a/ghost/admin/app/components/gh-member-settings-form-cp.hbs b/ghost/admin/app/components/gh-member-settings-form-cp.hbs index dd12711738..1bfedc69e2 100644 --- a/ghost/admin/app/components/gh-member-settings-form-cp.hbs +++ b/ghost/admin/app/components/gh-member-settings-form-cp.hbs @@ -135,71 +135,119 @@ {{/unless}} {{#each this.products as |product|}} -
-
+
+

{{product.name}} - {{#unless (eq product.subscriptions.length 1)}} + {{#if (gt product.subscriptions.length 1)}} {{product.subscriptions.length}} subscriptions - {{/unless}} + {{/if}}

+ {{#each product.subscriptions as |sub|}}
- {{sub.price.nickname}} - – - {{sub.price.currencySymbol}}{{sub.price.nonDecimalAmount}}/{{sub.price.interval}} - – - {{#if sub.cancel_at_period_end}} - Has access until {{sub.validUntil}} - Cancelled - {{else}} - Renews {{sub.validUntil}} - Active - {{/if}} -
- {{#if sub.cancellationReason}} -
Cancellation reason: {{sub.cancellationReason}}
- {{/if}} -
Created on {{sub.startDate}}
- - - - - {{svg-jar "dotdotdot"}} - - - - -
  • - - View Stripe customer - -
  • -
  • -
  • - - View Stripe subscription - -
  • -
  • +
    + {{sub.price.nickname}} + – {{#if sub.cancel_at_period_end}} - + Has access until {{sub.validUntil}} + Cancelled {{else}} - + Renews {{sub.validUntil}} + Active {{/if}} -
  • -
    -
    +
    + {{#if sub.cancellationReason}} +
    Cancellation reason: {{sub.cancellationReason}}
    + {{/if}} +
    Created on {{sub.startDate}}
    +
    + +
    +
    +
    + {{sub.price.currencySymbol}} + {{sub.price.nonDecimalAmount}} +
    +
    {{if (eq sub.price.interval "year") "yearly" "monthly"}}
    +
    + + + + + {{svg-jar "dotdotdot"}} + + + + +
  • + + View Stripe customer + +
  • +
  • +
  • + + View Stripe subscription + +
  • +
  • + {{#if sub.cancel_at_period_end}} + + {{else}} + + {{/if}} +
  • +
    +
    +
    {{/each}} + + {{#if (and (feature "multipleProducts") (eq product.subscriptions.length 0))}} +
    +
    +
    + Complimentary + Active +
    +
    Created on
    +
    +
    +
    +
    + $ + 0 +
    +
    yearly
    +
    + + + + {{svg-jar "dotdotdot"}} + + + + +
  • + +
  • +
    +
    +
    +
    + {{/if}} + {{#if (not (feature "multipleProducts"))}} {{#if this.isAddComplimentaryAllowed}} -