Discource-C
/
discourse-subscriptions
mirror of https://github.com/discourse/discourse-subscriptions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge master

This commit is contained in:
Rimian Perkins 2019-10-08 11:48:31 +11:00
parent bee940e672 40924d0e98
commit 48af25b707
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/javascripts/discourse/templates/patrons/index.hbs
View File

@ -5,10 +5,12 @@
{{cook-text siteSettings.discourse_patrons_payment_page}} {{cook-text siteSettings.discourse_patrons_payment_page}}
</p> </p>
<div class="donations-page-payment"> {{#if siteSettings.discourse_patrons_enabled}}
<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}}

6
plugin.rb
View File

@ -2,13 +2,13 @@
# 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.1 # version: 1.2.2
# url: https://github.com/rimian/discourse-patrons # url: https://github.com/rimian/discourse-patrons
# authors: Rimian Perkins # authors: Rimian Perkins
enabled_site_setting :discourse_patrons_enabled enabled_site_setting :discourse_patrons_enabled
gem 'stripe', '5.2.0' gem 'stripe', '5.6.0'
register_asset "stylesheets/common/discourse-patrons.scss" register_asset "stylesheets/common/discourse-patrons.scss"
register_asset "stylesheets/mobile/discourse-patrons.scss" register_asset "stylesheets/mobile/discourse-patrons.scss"
@ -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.1', url: 'https://github.com/rimian/discourse-patrons') ::Stripe.set_app_info('Discourse Patrons', version: '1.2.2', url: 'https://github.com/rimian/discourse-patrons')
[ [
"../lib/discourse_patrons/engine", "../lib/discourse_patrons/engine",