Skip to content

A platform for community discussion. Free, open, simple.

DEV: modernize admin nav (#42183)

Kris837bd271fd8b
diff --git a/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/components/subscriptions-admin-plugin-actions.gjs b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/components/subscriptions-admin-plugin-actions.gjs
new file mode 100644
index 00000000000..4b698d13489
--- /dev/null
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/components/subscriptions-admin-plugin-actions.gjs
@@ -0,0 +1,94 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import { trustHTML } from "@ember/template";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { not } from "discourse/truth-helpers";
+import { i18n } from "discourse-i18n";
+
+export default class SubscriptionsAdminPluginActions extends Component {
+ @service dialog;
+ @service router;
+ @service site;
+ @service siteSettings;
+
+ @tracked loading = false;
+
+ get stripeConfigured() {
+ return this.site.discourse_subscriptions_stripe_configured;
+ }
+
+ get campaignEnabled() {
+ return this.siteSettings.discourse_subscriptions_campaign_enabled;
+ }
+
+ get campaignProductSet() {
+ return !!this.siteSettings.discourse_subscriptions_campaign_product;
+ }
+
+ @action
+ async triggerManualRefresh() {
+ try {
+ await ajax("/s/admin/refresh", { method: "post" });
+ this.dialog.alert(i18n("discourse_subscriptions.campaign.refresh_page"));
+ } catch (error) {
+ popupAjaxError(error);
+ }
+ }
+
+ @action
+ createOneClickCampaign() {
+ this.dialog.yesNoConfirm({
+ title: i18n("discourse_subscriptions.campaign.confirm_creation_title"),
+ message: trustHTML(
+ i18n("discourse_subscriptions.campaign.confirm_creation")
+ ),
+ didConfirm: async () => {
+ this.loading = true;
+
+ try {
+ await ajax("/s/admin/create-campaign", { method: "post" });
+
+ this.dialog.confirm({
+ message: i18n("discourse_subscriptions.campaign.created"),
+ shouldDisplayCancel: false,
+ didConfirm: () => this.showSettings(),
+ didCancel: () => this.showSettings(),
+ });
+ } catch (error) {
+ popupAjaxError(error);
+ } finally {
+ this.loading = false;
+ }
+ },
+ });
+ }
+
+ showSettings() {
+ this.router.transitionTo(
+ "adminPlugins.show.settings",
+ "discourse-subscriptions"
+ );
+ }
+
+ <template>
+ {{#if this.stripeConfigured}}
+ {{#if this.campaignEnabled}}
+ <@actions.Default
+ @label="discourse_subscriptions.campaign.refresh_campaign"
+ @icon="rotate"
+ @action={{this.triggerManualRefresh}}
+ />
+ {{else if (not this.campaignProductSet)}}
+ <@actions.Default
+ @label="discourse_subscriptions.campaign.one_click_campaign"
+ @icon="square-plus"
+ @action={{this.createOneClickCampaign}}
+ @isLoading={{this.loading}}
+ />
+ {{/if}}
+ {{/if}}
+ </template>
+}
diff --git a/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/components/subscriptions-stripe-unconfigured.gjs b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/components/subscriptions-stripe-unconfigured.gjs
new file mode 100644
index 00000000000..66650595825
--- /dev/null
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/components/subscriptions-stripe-unconfigured.gjs
@@ -0,0 +1,17 @@
+import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";
+import { i18n } from "discourse-i18n";
+
+const SubscriptionsStripeUnconfigured = <template>
+ <AdminConfigAreaEmptyList
+ @emptyLabelTranslated={{i18n
+ "discourse_subscriptions.admin.unconfigured"
+ url="https://meta.discourse.org/t/-/140818/"
+ }}
+ @ctaLabel="discourse_subscriptions.admin.configure_stripe"
+ @ctaRoute="adminPlugins.show.settings"
+ @ctaRouteModels="discourse-subscriptions"
+ class="discourse-subscriptions-unconfigured"
+ />
+</template>;
+
+export default SubscriptionsStripeUnconfigured;
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/coupons.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-coupons.js
similarity index 100%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/coupons.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-coupons.js
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-products.js
similarity index 100%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-products.js
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/index.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-products/index.js
similarity index 100%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/index.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-products/index.js
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/show.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-products/show.js
similarity index 78%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/show.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-products/show.js
index ee8c4a32834..80820f193cd 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/show.js
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-products/show.js
@@ -11,7 +11,9 @@ export default class AdminPluginsDiscourseSubscriptionsProductsShowController ex
@action
cancelProduct() {
- this.router.transitionTo("adminPlugins.discourse-subscriptions.products");
+ this.router.transitionTo(
+ "adminPlugins.show.discourse-subscriptions-products"
+ );
}
@action
@@ -20,7 +22,7 @@ export default class AdminPluginsDiscourseSubscriptionsProductsShowController ex
.save()
.then((product) => {
this.router.transitionTo(
- "adminPlugins.discourse-subscriptions.products.show",
+ "adminPlugins.show.discourse-subscriptions-products.show",
product.id
);
})
@@ -33,7 +35,7 @@ export default class AdminPluginsDiscourseSubscriptionsProductsShowController ex
.update()
.then(() => {
this.router.transitionTo(
- "adminPlugins.discourse-subscriptions.products"
+ "adminPlugins.show.discourse-subscriptions-products"
);
})
.catch(popupAjaxError);
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/show/plans/show.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-products/show/plans/show.js
similarity index 100%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/show/plans/show.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-products/show/plans/show.js
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/subscriptions.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-subscriptions.js
similarity index 86%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/subscriptions.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-subscriptions.js
index f2d24bee383..f8ed027e70c 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/subscriptions.js
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-subscriptions-subscriptions.js
@@ -2,8 +2,8 @@ import Controller from "@ember/controller";
import { action } from "@ember/object";
import { service } from "@ember/service";
import { i18n } from "discourse-i18n";
-import AdminCancelSubscription from "../../../components/modal/admin-cancel-subscription";
-import AdminSubscription from "../../../models/admin-subscription";
+import AdminCancelSubscription from "discourse/plugins/discourse-subscriptions/discourse/components/modal/admin-cancel-subscription";
+import AdminSubscription from "discourse/plugins/discourse-subscriptions/discourse/models/admin-subscription";
export default class AdminPluginsDiscourseSubscriptionsSubscriptionsController extends Controller {
@service modal;
diff --git a/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/initializers/subscriptions-admin-plugin-configuration-nav.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/initializers/subscriptions-admin-plugin-configuration-nav.js
new file mode 100644
index 00000000000..648d64973a7
--- /dev/null
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/initializers/subscriptions-admin-plugin-configuration-nav.js
@@ -0,0 +1,38 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import SubscriptionsAdminPluginActions from "discourse/plugins/discourse-subscriptions/discourse/components/subscriptions-admin-plugin-actions";
+
+const PLUGIN_ID = "discourse-subscriptions";
+
+export default {
+ name: "subscriptions-admin-plugin-configuration-nav",
+
+ initialize(container) {
+ const currentUser = container.lookup("service:current-user");
+ if (!currentUser?.admin) {
+ return;
+ }
+
+ withPluginApi((api) => {
+ api.setAdminPluginIcon(PLUGIN_ID, "far-credit-card");
+ api.addAdminPluginConfigurationNav(PLUGIN_ID, [
+ {
+ label: "discourse_subscriptions.admin.products.title",
+ route: "adminPlugins.show.discourse-subscriptions-products",
+ },
+ {
+ label: "discourse_subscriptions.admin.coupons.title",
+ route: "adminPlugins.show.discourse-subscriptions-coupons",
+ },
+ {
+ label: "discourse_subscriptions.admin.subscriptions.title",
+ route: "adminPlugins.show.discourse-subscriptions-subscriptions",
+ },
+ ]);
+
+ api.registerPluginHeaderActionComponent(
+ PLUGIN_ID,
+ SubscriptionsAdminPluginActions
+ );
+ });
+ },
+};
diff --git a/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/lib/stripe-configured-route.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/lib/stripe-configured-route.js
new file mode 100644
index 00000000000..2ac1d7d5818
--- /dev/null
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/lib/stripe-configured-route.js
@@ -0,0 +1,36 @@
+import Route from "@ember/routing/route";
+import { service } from "@ember/service";
+
+const PLUGIN_ID = "discourse-subscriptions";
+const SHOW_ROUTE = "adminPlugins.show";
+
+export default class StripeConfiguredRoute extends Route {
+ @service router;
+ @service site;
+
+ beforeModel(transition) {
+ if (this.site.discourse_subscriptions_stripe_configured) {
+ return;
+ }
+
+ if (this.#cameFromThisPlugin(transition.from)) {
+ return;
+ }
+
+ this.router.replaceWith("adminPlugins.show.settings", PLUGIN_ID);
+ }
+
+ #cameFromThisPlugin(from) {
+ let routeInfo = from;
+
+ while (routeInfo) {
+ if (routeInfo.name === SHOW_ROUTE) {
+ return routeInfo.params?.plugin_id === PLUGIN_ID;
+ }
+
+ routeInfo = routeInfo.parent;
+ }
+
+ return false;
+ }
+}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/coupons.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-coupons.js
similarity index 66%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/coupons.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-coupons.js
index a8096a2d5a8..9db84711672 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/coupons.js
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-coupons.js
@@ -1,8 +1,8 @@
import { action } from "@ember/object";
-import Route from "@ember/routing/route";
+import StripeConfiguredRoute from "discourse/plugins/discourse-subscriptions/discourse/lib/stripe-configured-route";
import AdminCoupon from "discourse/plugins/discourse-subscriptions/discourse/models/admin-coupon";
-export default class AdminPluginsDiscourseSubscriptionsCouponsRoute extends Route {
+export default class AdminPluginsDiscourseSubscriptionsCouponsRoute extends StripeConfiguredRoute {
model() {
return AdminCoupon.list();
}
diff --git a/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products.js
new file mode 100644
index 00000000000..6b3d999d8ca
--- /dev/null
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products.js
@@ -0,0 +1,3 @@
+import StripeConfiguredRoute from "discourse/plugins/discourse-subscriptions/discourse/lib/stripe-configured-route";
+
+export default class AdminPluginsDiscourseSubscriptionsProductsRoute extends StripeConfiguredRoute {}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/index.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products/index.js
similarity index 93%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/index.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products/index.js
index 2db982252a8..52140d698f9 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/index.js
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products/index.js
@@ -22,7 +22,7 @@ export default class AdminPluginsDiscourseSubscriptionsProductsIndexRoute extend
.destroy()
.then(() => {
const controller = this.controllerFor(
- "adminPlugins.discourseSubscriptions.products.index"
+ "adminPlugins.show.discourse-subscriptions-products.index"
);
controller.set(
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/show.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products/show.js
similarity index 95%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/show.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products/show.js
index 577b65612f9..b91137a94a9 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/show.js
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products/show.js
@@ -36,7 +36,7 @@ export default class AdminPluginsDiscourseSubscriptionsProductsShowRoute extends
.destroy()
.then(() => {
const plans = this.controllerFor(
- "adminPlugins.discourseSubscriptions.products.show"
+ "adminPlugins.show.discourse-subscriptions-products.show"
).model.plans;
removeValueFromArray(plans, plan);
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/show/plans/show.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products/show/plans/show.js
similarity index 80%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/show/plans/show.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products/show/plans/show.js
index 3d21d238aaa..27c052b613f 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/show/plans/show.js
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-products/show/plans/show.js
@@ -7,7 +7,7 @@ export default class AdminPluginsDiscourseSubscriptionsProductsShowPlansShowRout
model(params) {
const id = params["plan-id"];
const product = this.modelFor(
- "adminPlugins.discourse-subscriptions.products.show"
+ "adminPlugins.show.discourse-subscriptions-products.show"
).product;
let plan;
@@ -39,12 +39,12 @@ export default class AdminPluginsDiscourseSubscriptionsProductsShowPlansShowRout
renderTemplate() {
this.render(
- "adminPlugins.discourse-subscriptions.products.show.plans.show",
+ "adminPlugins.show.discourse-subscriptions-products.show.plans.show",
{
- into: "adminPlugins.discourse-subscriptions.products",
+ into: "adminPlugins.show.discourse-subscriptions-products",
outlet: "main",
controller:
- "adminPlugins.discourse-subscriptions.products.show.plans.show",
+ "adminPlugins.show.discourse-subscriptions-products.show.plans.show",
}
);
}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/subscriptions.js b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-subscriptions.js
similarity index 59%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/subscriptions.js
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-subscriptions.js
index c45102e99a6..22e55cb9445 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/subscriptions.js
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-subscriptions-subscriptions.js
@@ -1,7 +1,7 @@
-import Route from "@ember/routing/route";
+import StripeConfiguredRoute from "discourse/plugins/discourse-subscriptions/discourse/lib/stripe-configured-route";
import AdminSubscription from "discourse/plugins/discourse-subscriptions/discourse/models/admin-subscription";
-export default class AdminPluginsDiscourseSubscriptionsSubscriptionsRoute extends Route {
+export default class AdminPluginsDiscourseSubscriptionsSubscriptionsRoute extends StripeConfiguredRoute {
model() {
return AdminSubscription.find();
}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/coupons.gjs b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-coupons.gjs
similarity index 87%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/coupons.gjs
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-coupons.gjs
index 500b4f8b161..bf4ded4e6cc 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/coupons.gjs
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-coupons.gjs
@@ -3,16 +3,12 @@ import { fn } from "@ember/helper";
import { on } from "@ember/modifier";
import DButton from "discourse/ui-kit/d-button";
import { i18n } from "discourse-i18n";
-import CreateCouponForm from "../../../components/create-coupon-form";
+import CreateCouponForm from "discourse/plugins/discourse-subscriptions/discourse/components/create-coupon-form";
+import SubscriptionsStripeUnconfigured from "../../../components/subscriptions-stripe-unconfigured";
export default <template>
{{#if @controller.model.unconfigured}}
- <p>{{i18n "discourse_subscriptions.admin.unconfigured"}}</p>
- <p>
- <a href="https://meta.discourse.org/t/discourse-subscriptions/140818/">
- {{i18n "discourse_subscriptions.admin.on_meta"}}
- </a>
- </p>
+ <SubscriptionsStripeUnconfigured />
{{else}}
{{#if @controller.model}}
<table class="table discourse-patrons-table">
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products.gjs b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-products.gjs
similarity index 100%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products.gjs
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-products.gjs
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/index.gjs b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-products/index.gjs
similarity index 83%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/index.gjs
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-products/index.gjs
index 9385308e4fa..1b7735cf697 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/index.gjs
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-products/index.gjs
@@ -3,20 +3,16 @@ import routeAction from "discourse/helpers/route-action";
import DButton from "discourse/ui-kit/d-button";
import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n";
-import formatUnixDate from "../../../../helpers/format-unix-date";
+import formatUnixDate from "discourse/plugins/discourse-subscriptions/discourse/helpers/format-unix-date";
+import SubscriptionsStripeUnconfigured from "../../../../components/subscriptions-stripe-unconfigured";
export default <template>
{{#if @controller.model.unconfigured}}
- <p>{{i18n "discourse_subscriptions.admin.unconfigured"}}</p>
- <p>
- <a href="https://meta.discourse.org/t/discourse-subscriptions/140818/">
- {{i18n "discourse_subscriptions.admin.on_meta"}}
- </a>
- </p>
+ <SubscriptionsStripeUnconfigured />
{{else}}
<p class="btn-right">
<LinkTo
- @route="adminPlugins.discourse-subscriptions.products.show"
+ @route="adminPlugins.show.discourse-subscriptions-products.show"
@model="new"
class="btn btn-primary"
>
@@ -55,7 +51,7 @@ export default <template>
<td class="td-right">
<div class="align-buttons">
<LinkTo
- @route="adminPlugins.discourse-subscriptions.products.show"
+ @route="adminPlugins.show.discourse-subscriptions-products.show"
@model={{product.id}}
class="btn no-text btn-icon"
>
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show.gjs b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-products/show.gjs
similarity index 92%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show.gjs
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-products/show.gjs
index bd9e16a472b..b03da4c8d82 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show.gjs
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-products/show.gjs
@@ -4,8 +4,8 @@ import { LinkTo } from "@ember/routing";
import DButton from "discourse/ui-kit/d-button";
import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n";
-import formatCurrency from "../../../../helpers/format-currency";
-import formatUnixDate from "../../../../helpers/format-unix-date";
+import formatCurrency from "discourse/plugins/discourse-subscriptions/discourse/helpers/format-currency";
+import formatUnixDate from "discourse/plugins/discourse-subscriptions/discourse/helpers/format-unix-date";
export default <template>
<h4>{{i18n "discourse_subscriptions.admin.products.title"}}</h4>
@@ -113,7 +113,7 @@ export default <template>
</th>
<th class="td-right">
<LinkTo
- @route="adminPlugins.discourse-subscriptions.products.show.plans.show"
+ @route="adminPlugins.show.discourse-subscriptions-products.show.plans.show"
@models={{array @controller.model.product.id "new"}}
class="btn"
>
@@ -135,7 +135,7 @@ export default <template>
</td>
<td class="td-right">
<LinkTo
- @route="adminPlugins.discourse-subscriptions.products.show.plans.show"
+ @route="adminPlugins.show.discourse-subscriptions-products.show.plans.show"
@models={{array @controller.model.product.id plan.id}}
class="btn no-text btn-icon"
>
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show/plans/show.gjs b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-products/show/plans/show.gjs
similarity index 100%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show/plans/show.gjs
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-products/show/plans/show.gjs
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/subscriptions.gjs b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-subscriptions.gjs
similarity index 91%
rename from plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/subscriptions.gjs
rename to plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-subscriptions.gjs
index 92ca983f96c..a6aae4e8ca1 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/subscriptions.gjs
+++ b/plugins/discourse-subscriptions/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-subscriptions-subscriptions.gjs
@@ -4,16 +4,12 @@ import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-s
import DLoadMore from "discourse/ui-kit/d-load-more";
import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";
import { i18n } from "discourse-i18n";
-import formatUnixDate from "../../../helpers/format-unix-date";
+import formatUnixDate from "discourse/plugins/discourse-subscriptions/discourse/helpers/format-unix-date";
+import SubscriptionsStripeUnconfigured from "../../../components/subscriptions-stripe-unconfigured";
export default <template>
{{#if @controller.model.unconfigured}}
- <p>{{i18n "discourse_subscriptions.admin.unconfigured"}}</p>
- <p>
- <a href="https://meta.discourse.org/t/discourse-subscriptions/140818/">
- {{i18n "discourse_subscriptions.admin.on_meta"}}
- </a>
- </p>
+ <SubscriptionsStripeUnconfigured />
{{else}}
<DLoadMore
@selector=".discourse-patrons-table tr"
diff --git a/plugins/discourse-subscriptions/app/controllers/concerns/stripe.rb b/plugins/discourse-subscriptions/app/controllers/concerns/stripe.rb
index bd4a18dbfe2..5ffed8211b9 100644
--- a/plugins/discourse-subscriptions/app/controllers/concerns/stripe.rb
+++ b/plugins/discourse-subscriptions/app/controllers/concerns/stripe.rb
@@ -8,13 +8,17 @@ module DiscourseSubscriptions
{ api_key: SiteSetting.discourse_subscriptions_secret_key }
end
+ def self.configured?
+ SiteSetting.discourse_subscriptions_public_key.present? &&
+ SiteSetting.discourse_subscriptions_secret_key.present?
+ end
+
def stripe_request_opts
DiscourseSubscriptions::Stripe.request_opts
end
def is_stripe_configured?
- SiteSetting.discourse_subscriptions_public_key.present? &&
- SiteSetting.discourse_subscriptions_secret_key.present?
+ DiscourseSubscriptions::Stripe.configured?
end
end
end
diff --git a/plugins/discourse-subscriptions/app/controllers/discourse_subscriptions/admin/coupons_controller.rb b/plugins/discourse-subscriptions/app/controllers/discourse_subscriptions/admin/coupons_controller.rb
index 7c6a7af1a11..a0c9fb159fd 100644
--- a/plugins/discourse-subscriptions/app/controllers/discourse_subscriptions/admin/coupons_controller.rb
+++ b/plugins/discourse-subscriptions/app/controllers/discourse_subscriptions/admin/coupons_controller.rb
@@ -9,8 +9,15 @@ module DiscourseSubscriptions
requires_plugin PLUGIN_NAME
def index
- promo_codes = ::Stripe::PromotionCode.list({ limit: 100 }, stripe_request_opts)[:data]
- promo_codes = promo_codes.select { |code| code[:coupon][:valid] == true }
+ promo_codes = nil
+
+ if is_stripe_configured?
+ promo_codes =
+ ::Stripe::PromotionCode.list({ limit: 100 }, stripe_request_opts)[
+ :data
+ ].select { |code| code[:coupon][:valid] == true }
+ end
+
render_json_dump promo_codes
rescue ::Stripe::InvalidRequestError => e
render_json_error e.message
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions.js
deleted file mode 100644
index f9769ae35cf..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import Controller from "@ember/controller";
-import { action, computed } from "@ember/object";
-import { service } from "@ember/service";
-import { trustHTML } from "@ember/template";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { i18n } from "discourse-i18n";
-
-export default class AdminPluginsDiscourseSubscriptionsController extends Controller {
- @service dialog;
-
- loading = false;
-
- @computed
- get stripeConfigured() {
- return !!this.siteSettings.discourse_subscriptions_public_key;
- }
-
- @computed
- get campaignEnabled() {
- return this.siteSettings.discourse_subscriptions_campaign_enabled;
- }
-
- @computed
- get campaignProductSet() {
- return !!this.siteSettings.discourse_subscriptions_campaign_product;
- }
-
- @action
- triggerManualRefresh() {
- ajax(`/s/admin/refresh`, {
- method: "post",
- }).then(() => {
- this.dialog.alert(i18n("discourse_subscriptions.campaign.refresh_page"));
- });
- }
-
- @action
- createOneClickCampaign() {
- this.dialog.yesNoConfirm({
- title: i18n("discourse_subscriptions.campaign.confirm_creation_title"),
- message: trustHTML(
- i18n("discourse_subscriptions.campaign.confirm_creation")
- ),
- didConfirm: () => {
- this.set("loading", true);
-
- ajax(`/s/admin/create-campaign`, {
- method: "post",
- })
- .then(() => {
- this.set("loading", false);
- this.dialog.confirm({
- message: i18n("discourse_subscriptions.campaign.created"),
- shouldDisplayCancel: false,
- didConfirm: () => this.send("showSettings"),
- didCancel: () => this.send("showSettings"),
- });
- })
- .catch(popupAjaxError);
- },
- });
- }
-}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/dashboard.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/dashboard.js
deleted file mode 100644
index 651532c1fcb..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/dashboard.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import Controller from "@ember/controller";
-import { action } from "@ember/object";
-
-export default class AdminPluginsDiscourseSubscriptionsDashboardController extends Controller {
- queryParams = ["order", "descending"];
- order = null;
- descending = true;
-
- @action
- loadMore() {}
-
- @action
- orderPayments(order) {
- if (order === this.get("order")) {
- this.toggleProperty("descending");
- }
-
- this.set("order", order);
- }
-}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/plans.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/plans.js
deleted file mode 100644
index f25271523df..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/plans.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Controller from "@ember/controller";
-
-export default class AdminPluginsDiscourseSubscriptionsPlansController extends Controller {}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/plans/index.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/plans/index.js
deleted file mode 100644
index 7289c985d0b..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/plans/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import DiscourseURL from "discourse/lib/url";
-
-export default class AdminPluginsDiscourseSubscriptionsPlansIndexController extends Controller {
- @action
- editPlan(id) {
- return DiscourseURL.redirectTo(
- `/admin/plugins/discourse-subscriptions/plans/${id}`
- );
- }
-}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/plans/show.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/plans/show.js
deleted file mode 100644
index 78286a90279..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/plans/show.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import { service } from "@ember/service";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-
-export default class AdminPluginsDiscourseSubscriptionsPlansShowController extends Controller {
- @service router;
-
- @action
- createPlan() {
- if (this.get("model.plan.product_id") === undefined) {
- const productID = this.get("model.products.firstObject.id");
- this.set("model.plan.product_id", productID);
- }
-
- this.get("model.plan")
- .save()
- .then(() => {
- this.router.transitionTo("adminPlugins.discourse-subscriptions.plans");
- })
- .catch(popupAjaxError);
- }
-}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/discourse-subscriptions-route-map.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/discourse-subscriptions-route-map.js
index 62d4c6dc1cd..ff2ed90bac2 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/discourse-subscriptions-route-map.js
+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/discourse-subscriptions-route-map.js
@@ -1,21 +1,26 @@
/* eslint-disable ember/routes-segments-snake-case */
export default {
- resource: "admin.adminPlugins",
- path: "/plugins",
+ resource: "admin.adminPlugins.show",
map() {
- this.route("discourse-subscriptions", function () {
- this.route("products", function () {
+ // Route names are shared across every plugin nested under the show route,
+ // so they are prefixed. The paths keep the URLs they had before.
+ this.route(
+ "discourse-subscriptions-products",
+ { path: "products" },
+ function () {
this.route("show", { path: "/:product-id" }, function () {
this.route("plans", function () {
this.route("show", { path: "/:plan-id" });
});
});
- });
+ }
+ );
- this.route("coupons");
+ this.route("discourse-subscriptions-coupons", { path: "coupons" });
- this.route("subscriptions");
+ this.route("discourse-subscriptions-subscriptions", {
+ path: "subscriptions",
});
},
};
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/initializers/subscriptions-admin-plugin-configuration-nav.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/initializers/subscriptions-admin-plugin-configuration-nav.js
deleted file mode 100644
index daea31a0c46..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/initializers/subscriptions-admin-plugin-configuration-nav.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { withPluginApi } from "discourse/lib/plugin-api";
-
-const PLUGIN_ID = "discourse-subscriptions";
-
-export default {
- name: "subscriptions-admin-plugin-configuration-nav",
-
- initialize(container) {
- const currentUser = container.lookup("service:current-user");
- if (!currentUser?.admin) {
- return;
- }
-
- withPluginApi((api) => {
- api.setAdminPluginIcon(PLUGIN_ID, "far-credit-card");
- });
- },
-};
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions.js
deleted file mode 100644
index 97e730d0e4b..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { action } from "@ember/object";
-import Route from "@ember/routing/route";
-import { service } from "@ember/service";
-
-export default class AdminPluginsDiscourseSubscriptionsRoute extends Route {
- @service router;
-
- @action
- showSettings() {
- const controller = this.controllerFor("adminSiteSettings");
- this.router
- .transitionTo("adminSiteSettingsCategory", "plugins")
- .then(() => {
- controller.set("filter", "plugin:discourse-subscriptions campaign");
- controller.set("_skipBounce", true);
- controller.filterContentNow("plugins");
- });
- }
-}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/plans.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/plans.js
deleted file mode 100644
index 1ed87d494a9..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/plans.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from "@ember/routing/route";
-
-export default class AdminPluginsDiscourseSubscriptionsPlansRoute extends Route {}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/plans/index.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/plans/index.js
deleted file mode 100644
index c9f09126a55..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/plans/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Route from "@ember/routing/route";
-import AdminPlan from "discourse/plugins/discourse-subscriptions/discourse/models/admin-plan";
-
-export default class AdminPluginsDiscourseSubscriptionsPlansIndexRoute extends Route {
- model() {
- return AdminPlan.findAll();
- }
-}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products.js
deleted file mode 100644
index eb98e34090a..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from "@ember/routing/route";
-
-export default class AdminPluginsDiscourseSubscriptionsProductsRoute extends Route {}
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions.gjs
deleted file mode 100644
index 1a51e85c9fe..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions.gjs
+++ /dev/null
@@ -1,59 +0,0 @@
-import DButton from "discourse/ui-kit/d-button";
-import DNavItem from "discourse/ui-kit/d-nav-item";
-import { i18n } from "discourse-i18n";
-
-export default <template>
- <h2>{{i18n
- "discourse_subscriptions.title"
- }}</h2>
-
- {{#if @controller.stripeConfigured}}
- <div class="discourse-subscriptions-buttons">
- {{#if @controller.campaignEnabled}}
- <DButton
- @label="discourse_subscriptions.campaign.refresh_campaign"
- @icon="rotate"
- @action={{@controller.triggerManualRefresh}}
- />
- {{else}}
- {{#unless @controller.campaignProductSet}}
- <DButton
- @label="discourse_subscriptions.campaign.one_click_campaign"
- @icon="square-plus"
- @action={{@controller.createOneClickCampaign}}
- @isLoading={{@controller.loading}}
- />
- {{/unless}}
- {{/if}}
- </div>
-
- <ul class="nav nav-pills">
- <DNavItem
- @route="adminPlugins.discourse-subscriptions.products"
- @label="discourse_subscriptions.admin.products.title"
- />
- <DNavItem
- @route="adminPlugins.discourse-subscriptions.coupons"
- @label="discourse_subscriptions.admin.coupons.title"
- />
- <DNavItem
- @route="adminPlugins.discourse-subscriptions.subscriptions"
- @label="discourse_subscriptions.admin.subscriptions.title"
- />
- </ul>
-
- <hr />
-
- <div id="discourse-subscriptions-admin">
- {{outlet}}
- </div>
- {{else}}
- <p>{{i18n "discourse_subscriptions.admin.unconfigured"}}</p>
- <p>
- <a href="https://meta.discourse.org/t/discourse-subscriptions/140818/">
- {{i18n "discourse_subscriptions.admin.on_meta"}}
- </a>
- </p>
- {{/if}}
-</template>
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/dashboard.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/dashboard.gjs
deleted file mode 100644
index 0c752ed44f6..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/dashboard.gjs
+++ /dev/null
@@ -1,79 +0,0 @@
-import { array, fn } from "@ember/helper";
-import { on } from "@ember/modifier";
-import { LinkTo } from "@ember/routing";
-import { trustHTML } from "@ember/template";
-import DLoadMore from "discourse/ui-kit/d-load-more";
-import dFormatDuration from "discourse/ui-kit/helpers/d-format-duration";
-import { i18n } from "discourse-i18n";
-
-export default <template>
- <h3>{{i18n "discourse_subscriptions.admin.dashboard.title"}}</h3>
-
- <DLoadMore
- @selector=".discourse-patrons-table tr"
- @action={{@controller.loadMore}}
- >
- {{#if @controller.model}}
- <table class="table discourse-patrons-table">
- <thead>
- <tr>
- <th>
- {{i18n "discourse_subscriptions.admin.dashboard.table.head.user"}}
- </th>
- <th>
- {{i18n
- "discourse_subscriptions.admin.dashboard.table.head.payment_intent"
- }}
- </th>
- <th>
- {{i18n
- "discourse_subscriptions.admin.dashboard.table.head.receipt_email"
- }}
- </th>
- <th
- {{on "click" (fn @controller.orderPayments "created_at")}}
- role="button"
- class="sortable"
- >
- {{i18n "created"}}
- </th>
- <th
- {{on "click" (fn @controller.orderPayments "amount")}}
- role="button"
- class="sortable amount"
- >
- {{i18n
- "discourse_subscriptions.admin.dashboard.table.head.amount"
- }}
- </th>
- </tr>
- </thead>
- <tbody>
- {{#each @controller.model as |payment|}}
- <tr>
- <td>
- <LinkTo
- @route="adminUser.index"
- @models={{array payment.user_id payment.username}}
- >
- {{payment.username}}
- </LinkTo>
- </td>
- <td>
- <LinkTo
- @route="patrons.show"
- @model={{payment.payment_intent_id}}
- >
- {{trustHTML payment.payment_intent_id}}
- </LinkTo>
- </td>
- <td>{{payment.receipt_email}}</td>
- <td>{{trustHTML (dFormatDuration payment.created_at_age)}}</td>
- <td class="amount">{{payment.amount_currency}}</td>
- </tr>
- {{/each}}
- </tbody>
- </table>
- {{/if}}
- </DLoadMore>
-</template>
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/plans/index.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/plans/index.gjs
deleted file mode 100644
index d8b9ef400b7..00000000000
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/plans/index.gjs
+++ /dev/null
@@ -1,41 +0,0 @@
-import { fn } from "@ember/helper";
-import routeAction from "discourse/helpers/route-action";
-import DButton from "discourse/ui-kit/d-button";
-import { i18n } from "discourse-i18n";
-
-export default <template>
- <table class="table discourse-patrons-table">
- <thead>
- <th>{{i18n "discourse_subscriptions.admin.plans.plan.plan_id"}}</th>
- <th>{{i18n
- "discourse_subscriptions.admin.plans.plan.nickname.title"
- }}</th>
- <th>{{i18n "discourse_subscriptions.admin.plans.plan.interval"}}</th>
- <th>{{i18n "discourse_subscriptions.admin.plans.plan.amount"}}</th>
- <th></th>
- </thead>
- <tbody>
- {{#each @controller.model as |plan|}}
- <tr>
- <td>{{plan.id}}</td>
- <td>{{plan.nickname}}</td>
- <td>{{plan.interval}}</td>
- <td>{{plan.unit_amount}}</td>
- <td class="td-right">
- <DButton
- @action={{fn @controller.editPlan plan.id}}
- @icon="far-pen-to-square"
- class="btn no-text btn-icon"
- />
- <DButton
- @action={{routeAction "destroyPlan"}}
- @actionParam={{plan}}
- @icon="trash-can"
- class="btn-danger btn no-text btn-icon"
- />
- </td>
- </tr>
- {{/each}}
- </tbody>
- </table>
-</template>
diff --git a/plugins/discourse-subscriptions/config/locales/client.en.yml b/plugins/discourse-subscriptions/config/locales/client.en.yml
index 43fb9b558c8..25fdfa5e46b 100644
--- a/plugins/discourse-subscriptions/config/locales/client.en.yml
+++ b/plugins/discourse-subscriptions/config/locales/client.en.yml
@@ -400,8 +400,8 @@ en:
confirm_payment: Confirm payment
success: Go back
admin:
- unconfigured: 'Stripe is not configured correctly. Please see Discourse Meta for information.'
- on_meta: Discourse Subscriptions on Meta
+ unconfigured: "Stripe is not configured correctly. Please see <a href='%{url}' target='_blank'>the documentation on Discourse Meta</a> for details."
+ configure_stripe: Go to settings
dashboard:
title: Dashboard
table:
diff --git a/plugins/discourse-subscriptions/plugin.rb b/plugins/discourse-subscriptions/plugin.rb
index 4e604e146c4..6b346389382 100644
--- a/plugins/discourse-subscriptions/plugin.rb
+++ b/plugins/discourse-subscriptions/plugin.rb
@@ -28,11 +28,11 @@ end
extend_content_security_policy(script_src: %w[https://js.stripe.com/v3/ https://hooks.stripe.com])
-add_admin_route "discourse_subscriptions.admin_navigation", "discourse-subscriptions.products"
+add_admin_route "discourse_subscriptions.admin_navigation",
+ "discourse-subscriptions",
+ use_new_show_route: true
Discourse::Application.routes.append do
- get "/admin/plugins/discourse-subscriptions" => "admin/plugins#index",
- :constraints => AdminConstraint.new
get "/admin/plugins/discourse-subscriptions/products" => "admin/plugins#index",
:constraints => AdminConstraint.new
get "/admin/plugins/discourse-subscriptions/products/:product_id" => "admin/plugins#index",
@@ -44,10 +44,6 @@ Discourse::Application.routes.append do
:constraints => AdminConstraint.new
get "/admin/plugins/discourse-subscriptions/subscriptions" => "admin/plugins#index",
:constraints => AdminConstraint.new
- get "/admin/plugins/discourse-subscriptions/plans" => "admin/plugins#index",
- :constraints => AdminConstraint.new
- get "/admin/plugins/discourse-subscriptions/plans/:plan_id" => "admin/plugins#index",
- :constraints => AdminConstraint.new
get "/admin/plugins/discourse-subscriptions/coupons" => "admin/plugins#index",
:constraints => AdminConstraint.new
get "u/:username/billing" => "users#show", :constraints => { username: RouteFormat.username }
@@ -93,6 +89,12 @@ after_initialize do
)
end
+ add_to_serializer(
+ :site,
+ :discourse_subscriptions_stripe_configured,
+ include_condition: -> { scope.is_admin? },
+ ) { DiscourseSubscriptions::Stripe.configured? }
+
add_to_serializer(:site, :show_campaign_banner) do
enabled = SiteSetting.discourse_subscriptions_enabled
campaign_enabled = SiteSetting.discourse_subscriptions_campaign_enabled
diff --git a/plugins/discourse-subscriptions/spec/requests/admin/coupons_controller_spec.rb b/plugins/discourse-subscriptions/spec/requests/admin/coupons_controller_spec.rb
index 8644b6f7681..c6a316b050a 100644
--- a/plugins/discourse-subscriptions/spec/requests/admin/coupons_controller_spec.rb
+++ b/plugins/discourse-subscriptions/spec/requests/admin/coupons_controller_spec.rb
@@ -24,6 +24,17 @@ RSpec.describe DiscourseSubscriptions::Admin::CouponsController do
end
describe "#index" do
+ before { SiteSetting.discourse_subscriptions_public_key = "public-key" }
+
+ it "returns nothing when Stripe is not configured" do
+ SiteSetting.discourse_subscriptions_public_key = ""
+
+ get "/s/admin/coupons.json"
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body).to be_nil
+ end
+
it "returns a list of promo codes" do
::Stripe::PromotionCode
.expects(:list)
diff --git a/plugins/discourse-subscriptions/spec/system/configure_subscriptions_plugin_spec.rb b/plugins/discourse-subscriptions/spec/system/configure_subscriptions_plugin_spec.rb
new file mode 100644
index 00000000000..c41c70d7f5b
--- /dev/null
+++ b/plugins/discourse-subscriptions/spec/system/configure_subscriptions_plugin_spec.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+describe "Configure subscriptions plugin", allow_network: ["js.stripe.com"] do
+ fab!(:admin)
+
+ let(:config_page) { PageObjects::Pages::AdminSubscriptionsConfig.new }
+ let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
+
+ before do
+ SiteSetting.discourse_subscriptions_enabled = true
+ SiteSetting.navigation_menu = "sidebar"
+ sign_in(admin)
+ end
+
+ it "takes the admin to the products tab, alongside the other tabs, once Stripe keys are set" do
+ SiteSetting.discourse_subscriptions_secret_key = "sk_test_51xuu"
+ SiteSetting.discourse_subscriptions_public_key = "pk_test_51xuu"
+ ::Stripe::Product.stubs(:list).returns({ data: [] })
+
+ config_page.visit
+
+ expect(page).to have_current_path("/admin/plugins/discourse-subscriptions/products")
+ expect(config_page).to have_tabs("Settings", "Products", "Coupons", "Subscriptions")
+ end
+
+ it "takes the admin to the settings tab when Stripe has not been set up yet" do
+ config_page.visit
+
+ expect(page).to have_current_path("/admin/plugins/discourse-subscriptions/settings")
+ expect(config_page).to have_tabs("Settings", "Products", "Coupons", "Subscriptions")
+ end
+
+ it "takes the admin to the settings tab when only the publishable key is set" do
+ SiteSetting.discourse_subscriptions_public_key = "pk_test_51xuu"
+
+ config_page.visit
+
+ expect(page).to have_current_path("/admin/plugins/discourse-subscriptions/settings")
+ end
+
+ it "takes the admin to the settings tab when only the secret key is set" do
+ SiteSetting.discourse_subscriptions_secret_key = "sk_test_51xuu"
+
+ config_page.visit
+
+ expect(page).to have_current_path("/admin/plugins/discourse-subscriptions/settings")
+ end
+
+ it "tells the admin why the products tab is empty rather than sending them back to settings" do
+ config_page.visit
+ config_page.click_tab("Products")
+
+ expect(page).to have_current_path("/admin/plugins/discourse-subscriptions/products")
+ expect(config_page).to have_stripe_unconfigured_notice
+ end
+
+ it "tells the admin why the products tab is empty when only the publishable key is set" do
+ SiteSetting.discourse_subscriptions_public_key = "pk_test_51xuu"
+
+ config_page.visit
+ config_page.click_tab("Products")
+
+ expect(page).to have_current_path("/admin/plugins/discourse-subscriptions/products")
+ expect(config_page).to have_stripe_unconfigured_notice
+ end
+
+ it "takes the admin to the settings tab when arriving from another plugin's page" do
+ visit("/admin/plugins/poll/settings")
+
+ sidebar.click_section_header("admin-plugins")
+ sidebar.click_link_in_section("admin-plugins", "admin_plugin_discourse-subscriptions")
+
+ expect(page).to have_current_path("/admin/plugins/discourse-subscriptions/settings")
+ end
+end
diff --git a/plugins/discourse-subscriptions/spec/system/page_objects/admin_subscriptions_config.rb b/plugins/discourse-subscriptions/spec/system/page_objects/admin_subscriptions_config.rb
new file mode 100644
index 00000000000..80114e19594
--- /dev/null
+++ b/plugins/discourse-subscriptions/spec/system/page_objects/admin_subscriptions_config.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module PageObjects
+ module Pages
+ class AdminSubscriptionsConfig < PageObjects::Pages::Base
+ def visit
+ page.visit("/admin/plugins/discourse-subscriptions")
+ self
+ end
+
+ def has_tabs?(*labels)
+ labels.all? { |label| has_css?(".admin-plugin-config-page__top-nav-item", text: label) }
+ end
+
+ def click_tab(label)
+ find(".admin-plugin-config-page__top-nav-item", text: label).click
+ end
+
+ def has_stripe_unconfigured_notice?
+ has_css?(
+ ".discourse-subscriptions-unconfigured .admin-config-area-empty-list__cta-button",
+ text: I18n.t("js.discourse_subscriptions.admin.configure_stripe"),
+ )
+ end
+ end
+ end
+end
diff --git a/plugins/discourse-subscriptions/test/javascripts/unit/routes/admin-plugins/discourse-subscriptions/products/index-test.js b/plugins/discourse-subscriptions/test/javascripts/unit/routes/admin-plugins/show/discourse-subscriptions-products/index-test.js
similarity index 80%
rename from plugins/discourse-subscriptions/test/javascripts/unit/routes/admin-plugins/discourse-subscriptions/products/index-test.js
rename to plugins/discourse-subscriptions/test/javascripts/unit/routes/admin-plugins/show/discourse-subscriptions-products/index-test.js
index 396f90c5de1..17a55aa37dc 100644
--- a/plugins/discourse-subscriptions/test/javascripts/unit/routes/admin-plugins/discourse-subscriptions/products/index-test.js
+++ b/plugins/discourse-subscriptions/test/javascripts/unit/routes/admin-plugins/show/discourse-subscriptions-products/index-test.js
@@ -3,7 +3,7 @@ import { module, test } from "qunit";
import pretender, { response } from "discourse/tests/helpers/create-pretender";
module(
- "Unit | Route | admin-plugins.discourse-subscriptions.products.index",
+ "Unit | Route | admin-plugins.show.discourse-subscriptions-products.index",
function (hooks) {
setupTest(hooks);
@@ -11,7 +11,7 @@ module(
pretender.get("/s/admin/products", () => response(null));
const route = this.owner.lookup(
- "route:admin-plugins.discourse-subscriptions.products.index"
+ "route:admin-plugins.show.discourse-subscriptions-products.index"
);
const model = await route.model();