Merge branch 'master' into upgrade-stripe-gem
This commit is contained in:
commit
d2f85f1a97
|
@ -11,3 +11,30 @@
|
||||||
onCompleteTransation=(action "stripeTransationCompleteCtr")
|
onCompleteTransation=(action "stripeTransationCompleteCtr")
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="donations-page-donations">
|
||||||
|
<h3>{{i18n 'discourse_donations.donations.title'}}</h3>
|
||||||
|
{{#if loadingDonations}}
|
||||||
|
<span>{{i18n 'discourse_donations.donations.loading'}}</span>
|
||||||
|
{{loading-spinner size='small'}}
|
||||||
|
{{else}}
|
||||||
|
{{#if currentUser}}
|
||||||
|
{{#if hasDonations}}
|
||||||
|
{{donation-list charges=charges subscriptions=subscriptions customer=customer}}
|
||||||
|
{{else}}
|
||||||
|
{{i18n 'discourse_donations.donations.none'}}
|
||||||
|
{{/if}}
|
||||||
|
{{else}}
|
||||||
|
{{#if hasDonations}}
|
||||||
|
{{donation-list charges=charges subscriptions=subscriptions customer=customer}}
|
||||||
|
{{else}}
|
||||||
|
{{#if hasEmailResult}}
|
||||||
|
{{i18n 'discourse_donations.donations.none_email' email=email}}
|
||||||
|
{{else}}
|
||||||
|
{{input value=email placeholder=(i18n 'email')}}
|
||||||
|
{{d-button action='loadDonations' label='discourse_donations.donations.load' disabled=loadDonationsDisabled}}
|
||||||
|
{{/if}}
|
||||||
|
{{/if}}
|
||||||
|
{{/if}}
|
||||||
|
{{/if}}
|
||||||
|
</div>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# name: discourse-donations
|
# name: discourse-donations
|
||||||
# about: Integrates Stripe into Discourse to allow visitors to make donations
|
# about: Integrates Stripe into Discourse to allow visitors to make donations
|
||||||
# version: 1.12.1
|
# version: 1.12.2
|
||||||
# url: https://github.com/rimian/discourse-donations
|
# url: https://github.com/rimian/discourse-donations
|
||||||
# authors: Rimian Perkins, Chris Beach, Angus McLeod
|
# authors: Rimian Perkins, Chris Beach, Angus McLeod
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue