From 80b721ddd84ce6fb03fa6eb535d7e447c4350cdc Mon Sep 17 00:00:00 2001 From: Rimian Perkins Date: Wed, 4 Dec 2019 11:53:05 +1100 Subject: [PATCH] rename some settings --- app/controllers/concerns/stripe.rb | 2 +- app/controllers/patrons_controller.rb | 2 +- .../discourse/components/stripe-card.js.es6 | 2 +- .../discourse/controllers/s-subscribe-show.js.es6 | 2 +- .../discourse/helpers/format-curency.js.es6 | 2 +- .../discourse/helpers/show-extra-nav.js.es6 | 2 +- ...ourse-subscriptions-products-show-plans-show.js.es6 | 2 +- config/locales/client.en.yml | 10 +++++----- config/settings.yml | 10 +++++----- plugin.rb | 2 +- .../discourse_patrons/patrons_controller_spec.rb | 4 ++-- test/javascripts/acceptance/plugin-outlets-test.js.es6 | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/controllers/concerns/stripe.rb b/app/controllers/concerns/stripe.rb index 2b072ba..107309e 100644 --- a/app/controllers/concerns/stripe.rb +++ b/app/controllers/concerns/stripe.rb @@ -5,7 +5,7 @@ module DiscourseSubscriptions extend ActiveSupport::Concern def set_api_key - ::Stripe.api_key = SiteSetting.discourse_patrons_secret_key + ::Stripe.api_key = SiteSetting.discourse_subscriptions_secret_key end end end diff --git a/app/controllers/patrons_controller.rb b/app/controllers/patrons_controller.rb index 33f3ebf..8fedefe 100644 --- a/app/controllers/patrons_controller.rb +++ b/app/controllers/patrons_controller.rb @@ -22,7 +22,7 @@ module DiscourseSubscriptions response = ::Stripe::PaymentIntent.create( amount: param_currency_to_number, - currency: SiteSetting.discourse_patrons_currency, + currency: SiteSetting.discourse_subscriptions_currency, payment_method_types: ['card'], payment_method: params[:payment_method_id], description: SiteSetting.discourse_patrons_payment_description, diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6 index b72938a..2d1e492 100644 --- a/assets/javascripts/discourse/components/stripe-card.js.es6 +++ b/assets/javascripts/discourse/components/stripe-card.js.es6 @@ -8,7 +8,7 @@ export default Ember.Component.extend({ cardError: false, color: jQuery("body").css("color"), backgroundColor: jQuery("body").css("background-color"), - stripe: Stripe(settings.discourse_patrons_public_key) + stripe: Stripe(settings.discourse_subscriptions_public_key) }); }, diff --git a/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6 b/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6 index d042d64..c492876 100644 --- a/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6 +++ b/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6 @@ -5,7 +5,7 @@ export default Ember.Controller.extend({ this._super(...arguments); this.set( "stripe", - Stripe(Discourse.SiteSettings.discourse_patrons_public_key) + Stripe(Discourse.SiteSettings.discourse_subscriptions_public_key) ); const elements = this.get("stripe").elements(); diff --git a/assets/javascripts/discourse/helpers/format-curency.js.es6 b/assets/javascripts/discourse/helpers/format-curency.js.es6 index 5ea65d7..7614daa 100644 --- a/assets/javascripts/discourse/helpers/format-curency.js.es6 +++ b/assets/javascripts/discourse/helpers/format-curency.js.es6 @@ -2,7 +2,7 @@ export default Ember.Helper.helper(function(params) { let currencySign; - switch (Discourse.SiteSettings.discourse_patrons_currency) { + switch (Discourse.SiteSettings.discourse_subscriptions_currency) { case "EUR": currencySign = "€"; break; diff --git a/assets/javascripts/discourse/helpers/show-extra-nav.js.es6 b/assets/javascripts/discourse/helpers/show-extra-nav.js.es6 index 2c80cb2..a7a7ef6 100644 --- a/assets/javascripts/discourse/helpers/show-extra-nav.js.es6 +++ b/assets/javascripts/discourse/helpers/show-extra-nav.js.es6 @@ -1,5 +1,5 @@ import { registerUnbound } from "discourse-common/lib/helpers"; export default registerUnbound("show-extra-nav", function() { - return Discourse.SiteSettings.discourse_patrons_extra_nav_subscribe; + return Discourse.SiteSettings.discourse_subscriptions_extra_nav_subscribe; }); diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show-plans-show.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show-plans-show.js.es6 index ed1a3ee..e33c800 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show-plans-show.js.es6 +++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show-plans-show.js.es6 @@ -13,7 +13,7 @@ export default Discourse.Route.extend({ plan = AdminPlan.create({ active: true, isNew: true, - currency: Discourse.SiteSettings.discourse_patrons_currency, + currency: Discourse.SiteSettings.discourse_subscriptions_currency, product: product.get("id") }); } else { diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 19a151b..33b5bdb 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1,10 +1,10 @@ en: site_settings: - discourse_patrons_enabled: Enable the Discourse Subscriptions plugin. - discourse_patrons_extra_nav_subscribe: Show the subscribe button in the primary navigation - discourse_patrons_public_key: Stripe Publishable Key - discourse_patrons_secret_key: Stripe Secret Key - discourse_patrons_currency: Default Currency Code. This can be overridden when creating a subscription plan + discourse_subscriptions_enabled: Enable the Discourse Subscriptions plugin. + discourse_subscriptions_extra_nav_subscribe: Show the subscribe button in the primary navigation + discourse_subscriptions_public_key: Stripe Publishable Key + discourse_subscriptions_secret_key: Stripe Secret Key + discourse_subscriptions_currency: Default Currency Code. This can be overridden when creating a subscription plan discourse_patrons_zip_code: "Show Zip Code" discourse_patrons_billing_address: "Collect billing address" discourse_patrons_payment_page: "Text to be added to enter payments page. Markdown is supported." diff --git a/config/settings.yml b/config/settings.yml index 1335476..25d7e36 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -1,13 +1,13 @@ plugins: - discourse_patrons_enabled: + discourse_subscriptions_enabled: default: false - discourse_patrons_extra_nav_subscribe: + discourse_subscriptions_extra_nav_subscribe: default: false client: true - discourse_patrons_public_key: + discourse_subscriptions_public_key: default: '' client: true - discourse_patrons_secret_key: + discourse_subscriptions_secret_key: default: '' client: false discourse_patrons_payment_page: @@ -25,7 +25,7 @@ plugins: default: '1.00|2.00|5.00|10.00|20.00|50.00|100.00' regex: "^([0-9]+.[0-9]{2}\\|)+[0-9]+.[0-9]{2}$" regex_error: "site_settings.errors.discourse_patrons_amount_must_be_currency" - discourse_patrons_currency: + discourse_subscriptions_currency: client: true default: "USD" type: enum diff --git a/plugin.rb b/plugin.rb index d90fc90..ba3c567 100644 --- a/plugin.rb +++ b/plugin.rb @@ -6,7 +6,7 @@ # url: https://github.com/rimian/discourse-subscriptions # authors: Rimian Perkins -enabled_site_setting :discourse_patrons_enabled +enabled_site_setting :discourse_subscriptions_enabled gem 'stripe', '5.11.0' diff --git a/spec/controllers/discourse_patrons/patrons_controller_spec.rb b/spec/controllers/discourse_patrons/patrons_controller_spec.rb index e8d9b24..970c9dd 100644 --- a/spec/controllers/discourse_patrons/patrons_controller_spec.rb +++ b/spec/controllers/discourse_patrons/patrons_controller_spec.rb @@ -42,8 +42,8 @@ module DiscourseSubscriptions end before do - SiteSetting.stubs(:discourse_patrons_currency).returns('AUD') - SiteSetting.stubs(:discourse_patrons_secret_key).returns('xyz-678') + SiteSetting.stubs(:discourse_subscriptions_currency).returns('AUD') + SiteSetting.stubs(:discourse_subscriptions_secret_key).returns('xyz-678') controller.stubs(:current_user).returns(current_user) end diff --git a/test/javascripts/acceptance/plugin-outlets-test.js.es6 b/test/javascripts/acceptance/plugin-outlets-test.js.es6 index 46a1fd2..931c8aa 100644 --- a/test/javascripts/acceptance/plugin-outlets-test.js.es6 +++ b/test/javascripts/acceptance/plugin-outlets-test.js.es6 @@ -2,7 +2,7 @@ import { acceptance } from "helpers/qunit-helpers"; acceptance("Discourse Patrons", { settings: { - discourse_patrons_extra_nav_subscribe: true + discourse_subscriptions_extra_nav_subscribe: true } });