From 4b334a69b593b01eca5cb843e7bdc56bf09dd27c Mon Sep 17 00:00:00 2001
From: Rimian Perkins <hello@rimian.com.au>
Date: Fri, 13 Dec 2019 11:54:32 +1100
Subject: [PATCH] remove subscribe index

---
 .../discourse/controllers/s-index.js.es6      | 25 +------------------
 ...{s-subscribe-show.js.es6 => s-show.js.es6} |  0
 ...s-discourse-subscriptions-dashboard.js.es6 |  3 ++-
 ...discourse-subscriptions-plans-index.js.es6 |  3 ++-
 ...ugins-discourse-subscriptions-plans.js.es6 |  4 ++-
 ...course-subscriptions-products-index.js.es6 |  3 ++-
 ...scriptions-products-show-plans-show.js.es6 |  3 ++-
 ...scourse-subscriptions-products-show.js.es6 |  3 ++-
 ...ns-discourse-subscriptions-products.js.es6 |  4 ++-
 ...scourse-subscriptions-subscriptions.js.es6 |  3 ++-
 ...min-plugins-discourse-subscriptions.js.es6 |  4 ++-
 .../{s-subscribe.js.es6 => s-index.js.es6}    |  3 ++-
 ...{s-subscribe-show.js.es6 => s-show.js.es6} |  3 ++-
 assets/javascripts/discourse/routes/s.js.es6  | 23 ++---------------
 .../discourse/routes/user-billing.js.es6      |  3 ++-
 .../routes/user-subscriptions.js.es6          |  3 ++-
 .../discourse/subscriptions-route-map.js.es6  |  4 +--
 .../templates/components/product-list.hbs     |  2 +-
 .../connectors/extra-nav-item/subscribe.hbs   |  2 +-
 .../templates/{s/subscribe.hbs => s.hbs}      |  0
 .../discourse/templates/s/index.hbs           | 14 ++---------
 .../templates/s/{subscribe => }/show.hbs      |  0
 .../discourse/templates/s/subscribe/index.hbs |  4 ---
 spec/requests/payments_controller_spec.rb     |  7 +++++-
 24 files changed, 43 insertions(+), 80 deletions(-)
 rename assets/javascripts/discourse/controllers/{s-subscribe-show.js.es6 => s-show.js.es6} (100%)
 rename assets/javascripts/discourse/routes/{s-subscribe.js.es6 => s-index.js.es6} (66%)
 rename assets/javascripts/discourse/routes/{s-subscribe-show.js.es6 => s-show.js.es6} (84%)
 rename assets/javascripts/discourse/templates/{s/subscribe.hbs => s.hbs} (100%)
 rename assets/javascripts/discourse/templates/s/{subscribe => }/show.hbs (100%)
 delete mode 100644 assets/javascripts/discourse/templates/s/subscribe/index.hbs

diff --git a/assets/javascripts/discourse/controllers/s-index.js.es6 b/assets/javascripts/discourse/controllers/s-index.js.es6
index e66b79e..2d3f960 100644
--- a/assets/javascripts/discourse/controllers/s-index.js.es6
+++ b/assets/javascripts/discourse/controllers/s-index.js.es6
@@ -1,24 +1 @@
-import { ajax } from "discourse/lib/ajax";
-
-export default Ember.Controller.extend({
-  actions: {
-    stripePaymentHandler(data) {
-      return ajax("/s/patrons", {
-        data,
-        method: "post"
-      }).catch(() => {
-        return { error: "An error occured while submitting the form." };
-      });
-    },
-
-    paymentSuccessHandler(/* paymentIntentId */) {
-      bootbox.alert(
-        I18n.t("discourse_subscriptions.transactions.payment.success")
-      );
-      this.transitionToRoute(
-        "user.billing",
-        Discourse.User.current().username.toLowerCase()
-      );
-    }
-  }
-});
+export default Ember.Controller.extend({});
diff --git a/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6 b/assets/javascripts/discourse/controllers/s-show.js.es6
similarity index 100%
rename from assets/javascripts/discourse/controllers/s-subscribe-show.js.es6
rename to assets/javascripts/discourse/controllers/s-show.js.es6
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-dashboard.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-dashboard.js.es6
index 275e792..628b127 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-dashboard.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-dashboard.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import { ajax } from "discourse/lib/ajax";
 
-export default Discourse.Route.extend({
+export default Route.extend({
   queryParams: {
     order: {
       refreshModel: true
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-plans-index.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-plans-index.js.es6
index bfca7c4..65fe714 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-plans-index.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-plans-index.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import AdminPlan from "discourse/plugins/discourse-subscriptions/discourse/models/admin-plan";
 
-export default Discourse.Route.extend({
+export default Route.extend({
   model() {
     return AdminPlan.findAll();
   }
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-plans.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-plans.js.es6
index 55af882..f7f5da2 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-plans.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-plans.js.es6
@@ -1 +1,3 @@
-export default Discourse.Route.extend({});
+import Route from "@ember/routing/route";
+
+export default Route.extend({});
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6
index 19e24c3..6a07b1e 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import AdminProduct from "discourse/plugins/discourse-subscriptions/discourse/models/admin-product";
 
-export default Discourse.Route.extend({
+export default Route.extend({
   model() {
     return AdminProduct.findAll();
   },
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 e33c800..5186fce 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
@@ -1,7 +1,8 @@
+import Route from "@ember/routing/route";
 import AdminPlan from "discourse/plugins/discourse-subscriptions/discourse/models/admin-plan";
 import Group from "discourse/models/group";
 
-export default Discourse.Route.extend({
+export default Route.extend({
   model(params) {
     const id = params["plan-id"];
     const product = this.modelFor(
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6
index a679e95..79d64d0 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6
@@ -1,7 +1,8 @@
+import Route from "@ember/routing/route";
 import AdminProduct from "discourse/plugins/discourse-subscriptions/discourse/models/admin-product";
 import AdminPlan from "discourse/plugins/discourse-subscriptions/discourse/models/admin-plan";
 
-export default Discourse.Route.extend({
+export default Route.extend({
   model(params) {
     const product_id = params["product-id"];
     let product;
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products.js.es6
index 55af882..f7f5da2 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products.js.es6
@@ -1 +1,3 @@
-export default Discourse.Route.extend({});
+import Route from "@ember/routing/route";
+
+export default Route.extend({});
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6
index c04ae6b..0110cef 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import AdminSubscription from "discourse/plugins/discourse-subscriptions/discourse/models/admin-subscription";
 
-export default Discourse.Route.extend({
+export default Route.extend({
   model() {
     return AdminSubscription.find();
   },
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions.js.es6
index 55af882..f7f5da2 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions.js.es6
@@ -1 +1,3 @@
-export default Discourse.Route.extend({});
+import Route from "@ember/routing/route";
+
+export default Route.extend({});
diff --git a/assets/javascripts/discourse/routes/s-subscribe.js.es6 b/assets/javascripts/discourse/routes/s-index.js.es6
similarity index 66%
rename from assets/javascripts/discourse/routes/s-subscribe.js.es6
rename to assets/javascripts/discourse/routes/s-index.js.es6
index 42f0abc..453e125 100644
--- a/assets/javascripts/discourse/routes/s-subscribe.js.es6
+++ b/assets/javascripts/discourse/routes/s-index.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import Product from "discourse/plugins/discourse-subscriptions/discourse/models/product";
 
-export default Discourse.Route.extend({
+export default Route.extend({
   model() {
     return Product.findAll();
   }
diff --git a/assets/javascripts/discourse/routes/s-subscribe-show.js.es6 b/assets/javascripts/discourse/routes/s-show.js.es6
similarity index 84%
rename from assets/javascripts/discourse/routes/s-subscribe-show.js.es6
rename to assets/javascripts/discourse/routes/s-show.js.es6
index 82e92d9..9547e21 100644
--- a/assets/javascripts/discourse/routes/s-subscribe-show.js.es6
+++ b/assets/javascripts/discourse/routes/s-show.js.es6
@@ -1,7 +1,8 @@
+import Route from "@ember/routing/route";
 import Product from "discourse/plugins/discourse-subscriptions/discourse/models/product";
 import Plan from "discourse/plugins/discourse-subscriptions/discourse/models/plan";
 
-export default Discourse.Route.extend({
+export default Route.extend({
   model(params) {
     const product_id = params["subscription-id"];
 
diff --git a/assets/javascripts/discourse/routes/s.js.es6 b/assets/javascripts/discourse/routes/s.js.es6
index 29d9224..0051f5c 100644
--- a/assets/javascripts/discourse/routes/s.js.es6
+++ b/assets/javascripts/discourse/routes/s.js.es6
@@ -1,22 +1,3 @@
-import { ajax } from "discourse/lib/ajax";
+import Route from "@ember/routing/route";
 
-export default Discourse.Route.extend({
-  model() {
-    const user = Ember.Object.create({
-      name: "",
-      email: "",
-      phone: ""
-    });
-
-    return ajax("/s", {
-      method: "get"
-    })
-      .then(result => {
-        user.set("email", result.email);
-        return user;
-      })
-      .catch(() => {
-        return user;
-      });
-  }
-});
+export default Route.extend();
diff --git a/assets/javascripts/discourse/routes/user-billing.js.es6 b/assets/javascripts/discourse/routes/user-billing.js.es6
index 3a6899d..569ecf8 100644
--- a/assets/javascripts/discourse/routes/user-billing.js.es6
+++ b/assets/javascripts/discourse/routes/user-billing.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import Invoice from "discourse/plugins/discourse-subscriptions/discourse/models/invoice";
 
-export default Discourse.Route.extend({
+export default Route.extend({
   model() {
     return Invoice.findAll();
   },
diff --git a/assets/javascripts/discourse/routes/user-subscriptions.js.es6 b/assets/javascripts/discourse/routes/user-subscriptions.js.es6
index 74dc343..a667cf8 100644
--- a/assets/javascripts/discourse/routes/user-subscriptions.js.es6
+++ b/assets/javascripts/discourse/routes/user-subscriptions.js.es6
@@ -1,6 +1,7 @@
+import Route from "@ember/routing/route";
 import UserSubscription from "discourse/plugins/discourse-subscriptions/discourse/models/user-subscription";
 
-export default Discourse.Route.extend({
+export default Route.extend({
   model() {
     return UserSubscription.findAll();
   },
diff --git a/assets/javascripts/discourse/subscriptions-route-map.js.es6 b/assets/javascripts/discourse/subscriptions-route-map.js.es6
index e7496fe..9d21e65 100644
--- a/assets/javascripts/discourse/subscriptions-route-map.js.es6
+++ b/assets/javascripts/discourse/subscriptions-route-map.js.es6
@@ -1,7 +1,5 @@
 export default function() {
   this.route("s", function() {
-    this.route("subscribe", function() {
-      this.route("show", { path: "/:subscription-id" });
-    });
+    this.route("show", { path: "/:subscription-id" });
   });
 }
diff --git a/assets/javascripts/discourse/templates/components/product-list.hbs b/assets/javascripts/discourse/templates/components/product-list.hbs
index fbef764..87b09ed 100644
--- a/assets/javascripts/discourse/templates/components/product-list.hbs
+++ b/assets/javascripts/discourse/templates/components/product-list.hbs
@@ -9,7 +9,7 @@
 
     {{#if currentUser}}
       <div class="pull-right">
-        {{#link-to "s.subscribe.show" product.id disabled=product.subscribed class="btn btn-primary"}}
+        {{#link-to "s.show" product.id disabled=product.subscribed class="btn btn-primary"}}
           {{i18n 'discourse_subscriptions.subscribe.title'}}
         {{/link-to}}
       </div>
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 d3182ec..09a5afe 100644
--- a/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs
+++ b/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs
@@ -1,5 +1,5 @@
 {{#if (show-extra-nav)}}
-  {{#link-to 's.subscribe' class='discourse-patrons-subscribe'}}
+  {{#link-to 's' class='discourse-patrons-subscribe'}}
     {{i18n 'discourse_subscriptions.navigation.subscribe'}}
   {{/link-to}}
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/s/subscribe.hbs b/assets/javascripts/discourse/templates/s.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/s/subscribe.hbs
rename to assets/javascripts/discourse/templates/s.hbs
diff --git a/assets/javascripts/discourse/templates/s/index.hbs b/assets/javascripts/discourse/templates/s/index.hbs
index 58967eb..b5c9636 100644
--- a/assets/javascripts/discourse/templates/s/index.hbs
+++ b/assets/javascripts/discourse/templates/s/index.hbs
@@ -1,14 +1,4 @@
 
-<h3>{{i18n 'discourse_subscriptions.one_time.heading.payment' site_name=siteSettings.title}}</h3>
-
-<p>
-  {{cook-text siteSettings.discourse_subscriptions_payment_page}}
-</p>
-
-<div class="donations-page-payment">
-  {{donation-form
-    billing=model
-    paymentSuccessHandler=(action "paymentSuccessHandler")
-    stripePaymentHandler=(action "stripePaymentHandler")
-  }}
+<div id="product-list">
+  {{product-list products=model}}
 </div>
diff --git a/assets/javascripts/discourse/templates/s/subscribe/show.hbs b/assets/javascripts/discourse/templates/s/show.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/s/subscribe/show.hbs
rename to assets/javascripts/discourse/templates/s/show.hbs
diff --git a/assets/javascripts/discourse/templates/s/subscribe/index.hbs b/assets/javascripts/discourse/templates/s/subscribe/index.hbs
deleted file mode 100644
index b5c9636..0000000
--- a/assets/javascripts/discourse/templates/s/subscribe/index.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<div id="product-list">
-  {{product-list products=model}}
-</div>
diff --git a/spec/requests/payments_controller_spec.rb b/spec/requests/payments_controller_spec.rb
index bac66ab..5323d14 100644
--- a/spec/requests/payments_controller_spec.rb
+++ b/spec/requests/payments_controller_spec.rb
@@ -7,7 +7,12 @@ module DiscourseSubscriptions
     context "not authenticated" do
       it "does not create a payment intent" do
         ::Stripe::PaymentIntent.expects(:create).never
-        post "/s/payments.json", params: { }
+
+        post "/s/payments.json", params: {
+          payment_method: 'pm_123',
+          amount: 999,
+          currency: 'gdp'
+        }
       end
     end