diff --git a/app/models/member.js b/app/models/member.js index 6e8dc7351b..abaabc6498 100644 --- a/app/models/member.js +++ b/app/models/member.js @@ -9,5 +9,6 @@ export default Model.extend(ValidationEngine, { note: attr('string'), createdAtUTC: attr('moment-utc'), stripe: attr('member-subscription'), - subscribed: attr('boolean', {defaultValue: true}) + subscribed: attr('boolean', {defaultValue: true}), + comped: attr('boolean', {defaultValue: false}) }); diff --git a/app/styles/layouts/members.css b/app/styles/layouts/members.css index 316ef2775c..267d594b45 100644 --- a/app/styles/layouts/members.css +++ b/app/styles/layouts/members.css @@ -162,19 +162,19 @@ p.gh-members-list-email { .gh-members-chart-summary { flex-direction: row; } - + .gh-members-chart-summary div { flex-basis: 33%; border-bottom: none; justify-content: flex-start; } - + .gh-members-chart-summary > div:nth-of-type(1), .gh-members-chart-summary > div:nth-of-type(2) { border-right: 1px solid var(--whitegrey); } } - + @media (max-width: 900px) { .members-list .gh-list-header, .gh-list-hidecell-m { display: none; @@ -306,7 +306,8 @@ textarea.gh-member-details-textarea { width: 200px; } -.gh-members-subscribed-checkbox { +.gh-members-subscribed-checkbox, +.gh-members-comped-checkbox { max-width: 100%; } diff --git a/app/styles/patterns/forms.css b/app/styles/patterns/forms.css index 4eed15c862..ad5b9b323e 100644 --- a/app/styles/patterns/forms.css +++ b/app/styles/patterns/forms.css @@ -68,7 +68,7 @@ input { .form-group p { margin: 4px 0 0 0; color: var(--midgrey); - font-size: 1.25rem; + font-size: 1.3rem; font-weight: 400; } diff --git a/app/templates/components/gh-member-settings-form.hbs b/app/templates/components/gh-member-settings-form.hbs index 6e2eddc7b0..c25a6aa683 100644 --- a/app/templates/components/gh-member-settings-form.hbs +++ b/app/templates/components/gh-member-settings-form.hbs @@ -67,6 +67,7 @@ +{{#unless this.member.isNew}}

Stripe info

{{#if this.isLoading}} @@ -76,8 +77,8 @@ {{else}} - {{#if this.subscriptions}} -
+
+ {{#if this.subscriptions}} {{#if this.hasMultipleSubscriptions}}
{{svg-jar "info" class="gh-member-info-icon mr2 fill-darkgrey"}} Member has multiple Stripe subscriptions @@ -176,10 +177,27 @@
{{/each}} + {{else}} +
+

Member doesn't have an active Stripe subscription

+
+ {{/if}} +
+ +
+
+

Complimentary premium plan

+

If enabled, member will be placed onto a free of charge premium subscription

+
+
+ +
+
+
- {{else}} -
-

Member doesn't have an active Stripe subscription

-
- {{/if}} +
{{/if}} +{{/unless}}