merge in master

This commit is contained in:
Rimian Perkins 2019-10-09 09:11:02 +11:00
commit bde208ecb6
3 changed files with 13 additions and 14 deletions

View File

@ -6,8 +6,9 @@ const Plan = Discourse.Model.extend({
Plan.reopenClass({
find() {
return ajax("/patrons/admin/plans", { method: "get" })
.then(result => result.plans.map(plan => Plan.create(plan)));
return ajax("/patrons/admin/plans", { method: "get" }).then(result =>
result.plans.map(plan => Plan.create(plan))
);
}
});

View File

@ -5,7 +5,6 @@
{{cook-text siteSettings.discourse_patrons_payment_page}}
</p>
{{#if siteSettings.discourse_patrons_enabled}}
<div class="donations-page-payment">
{{donation-form
billing=model
@ -13,4 +12,3 @@
stripePaymentHandler=(action "stripePaymentHandler")
}}
</div>
{{/if}}

View File

@ -2,7 +2,7 @@
# name: discourse-patrons
# about: Integrates Stripe into Discourse to allow visitors to make payments and Subscribe
# version: 1.2.2
# version: 1.2.3
# url: https://github.com/rimian/discourse-patrons
# authors: Rimian Perkins
@ -32,7 +32,7 @@ end
after_initialize do
::Stripe.api_version = "2019-08-14"
::Stripe.set_app_info('Discourse Patrons', version: '1.2.2', url: 'https://github.com/rimian/discourse-patrons')
::Stripe.set_app_info('Discourse Patrons', version: '1.2.3', url: 'https://github.com/rimian/discourse-patrons')
[
"../lib/discourse_patrons/engine",