From 4a812ceff612f63ee072955eff59ffc90efb1a97 Mon Sep 17 00:00:00 2001
From: Rimian Perkins <hello@rimian.com.au>
Date: Wed, 6 Nov 2019 20:43:16 +1100
Subject: [PATCH] toggle the subscribe button

---
 .../javascripts/discourse/helpers/show-extra-nav.js.es6  | 5 +++++
 assets/javascripts/discourse/models/subscription.js.es6  | 1 -
 .../templates/connectors/extra-nav-item/subscribe.hbs    | 9 +++++----
 config/locales/client.en.yml                             | 4 ++--
 config/settings.yml                                      | 9 +++------
 5 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 assets/javascripts/discourse/helpers/show-extra-nav.js.es6

diff --git a/assets/javascripts/discourse/helpers/show-extra-nav.js.es6 b/assets/javascripts/discourse/helpers/show-extra-nav.js.es6
new file mode 100644
index 0000000..448d203
--- /dev/null
+++ b/assets/javascripts/discourse/helpers/show-extra-nav.js.es6
@@ -0,0 +1,5 @@
+import { registerUnbound } from "discourse-common/lib/helpers";
+
+export default registerUnbound("show-extra-nav", function(model) {
+  return Discourse.SiteSettings.discourse_patrons_extra_nav_subscribe;
+});
diff --git a/assets/javascripts/discourse/models/subscription.js.es6 b/assets/javascripts/discourse/models/subscription.js.es6
index fc4c355..41faddb 100644
--- a/assets/javascripts/discourse/models/subscription.js.es6
+++ b/assets/javascripts/discourse/models/subscription.js.es6
@@ -1,6 +1,5 @@
 import computed from "ember-addons/ember-computed-decorators";
 import { ajax } from "discourse/lib/ajax";
-import Plan from "discourse/plugins/discourse-patrons/discourse/models/plan";
 
 const Subscription = Discourse.Model.extend({
   @computed("status")
diff --git a/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs b/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs
index 9cca7e6..b3a03e5 100644
--- a/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs
+++ b/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs
@@ -1,4 +1,5 @@
-
-{{#link-to 'patrons.subscribe' class='discourse-patrons-subscribe'}}
-  {{i18n 'discourse_patrons.navigation.subscribe'}}
-{{/link-to}}
+{{#if (show-extra-nav)}}
+  {{#link-to 'patrons.subscribe' class='discourse-patrons-subscribe'}}
+    {{i18n 'discourse_patrons.navigation.subscribe'}}
+  {{/link-to}}
+{{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a73705f..ad40492 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1,9 +1,9 @@
 en:
   site_settings:
-    discourse_patrons_enabled: "Enable the Discourse Patrons plugin."
+    discourse_patrons_enabled: Enable the Discourse Patrons plugin.
+    discourse_patrons_extra_nav_subscribe: Show the subscribe button in the primary navigation
     discourse_patrons_secret_key: Stripe Secret Key
     discourse_patrons_public_key: Stripe Public Key
-    discourse_patrons_subscription_group: The name of the group the user is added to when successfully subscribed
     discourse_patrons_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"
diff --git a/config/settings.yml b/config/settings.yml
index 92fb8b0..1335476 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,18 +1,15 @@
 plugins:
   discourse_patrons_enabled:
     default: false
+  discourse_patrons_extra_nav_subscribe:
+    default: false
+    client: true
   discourse_patrons_public_key:
     default: ''
     client: true
   discourse_patrons_secret_key:
     default: ''
     client: false
-  discourse_patrons_subscription_group:
-    default: ''
-    client: true
-  discourse_patrons_subscription_group_landing_page:
-    default: ''
-    client: true
   discourse_patrons_payment_page:
     client: true
     default: ''