mirror of
https://github.com/discourse/discourse-subscriptions.git
synced 2025-07-08 15:22:46 +00:00
merge in master
This commit is contained in:
commit
bde208ecb6
@ -1,13 +1,14 @@
|
|||||||
import { ajax } from "discourse/lib/ajax";
|
import { ajax } from "discourse/lib/ajax";
|
||||||
|
|
||||||
const Plan = Discourse.Model.extend({
|
const Plan = Discourse.Model.extend({
|
||||||
destroy() { }
|
destroy() {}
|
||||||
});
|
});
|
||||||
|
|
||||||
Plan.reopenClass({
|
Plan.reopenClass({
|
||||||
find() {
|
find() {
|
||||||
return ajax("/patrons/admin/plans", { method: "get" })
|
return ajax("/patrons/admin/plans", { method: "get" }).then(result =>
|
||||||
.then(result => result.plans.map(plan => Plan.create(plan)));
|
result.plans.map(plan => Plan.create(plan))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -5,12 +5,10 @@
|
|||||||
{{cook-text siteSettings.discourse_patrons_payment_page}}
|
{{cook-text siteSettings.discourse_patrons_payment_page}}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
{{#if siteSettings.discourse_patrons_enabled}}
|
<div class="donations-page-payment">
|
||||||
<div class="donations-page-payment">
|
|
||||||
{{donation-form
|
{{donation-form
|
||||||
billing=model
|
billing=model
|
||||||
paymentSuccessHandler=(action "paymentSuccessHandler")
|
paymentSuccessHandler=(action "paymentSuccessHandler")
|
||||||
stripePaymentHandler=(action "stripePaymentHandler")
|
stripePaymentHandler=(action "stripePaymentHandler")
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# name: discourse-patrons
|
# name: discourse-patrons
|
||||||
# about: Integrates Stripe into Discourse to allow visitors to make payments and Subscribe
|
# 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
|
# url: https://github.com/rimian/discourse-patrons
|
||||||
# authors: Rimian Perkins
|
# authors: Rimian Perkins
|
||||||
|
|
||||||
@ -32,7 +32,7 @@ end
|
|||||||
|
|
||||||
after_initialize do
|
after_initialize do
|
||||||
::Stripe.api_version = "2019-08-14"
|
::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",
|
"../lib/discourse_patrons/engine",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user