diff --git a/assets/javascripts/discourse/controllers/s-show.js.es6 b/assets/javascripts/discourse/controllers/s-show.js.es6 index a00371d..fb27598 100644 --- a/assets/javascripts/discourse/controllers/s-show.js.es6 +++ b/assets/javascripts/discourse/controllers/s-show.js.es6 @@ -92,8 +92,13 @@ export default Ember.Controller.extend({ bootbox.alert(result.error.message || result.error); } else { this.alert(`${type}.success`); + + const success_route = this.planTypeIsSelected + ? "user.subscriptions" + : "userActivity.payments"; + this.transitionToRoute( - "user.subscriptions", + success_route, Discourse.User.current().username.toLowerCase() ); } diff --git a/assets/javascripts/discourse/payments-activity-route-map.js.es6 b/assets/javascripts/discourse/payments-activity-route-map.js.es6 new file mode 100644 index 0000000..9a5fbc7 --- /dev/null +++ b/assets/javascripts/discourse/payments-activity-route-map.js.es6 @@ -0,0 +1,6 @@ +export default { + resource: "user.userActivity", + map() { + this.route("payments"); + } +}; diff --git a/assets/javascripts/discourse/routes/user-activity-payments.js.es6 b/assets/javascripts/discourse/routes/user-activity-payments.js.es6 new file mode 100644 index 0000000..928619c --- /dev/null +++ b/assets/javascripts/discourse/routes/user-activity-payments.js.es6 @@ -0,0 +1,7 @@ +import Route from "@ember/routing/route"; + +export default Route.extend({ + model() { + console.log(999); + } +}); diff --git a/assets/javascripts/discourse/templates/connectors/user-activity-bottom/payments-list.hbs b/assets/javascripts/discourse/templates/connectors/user-activity-bottom/payments-list.hbs new file mode 100644 index 0000000..692fd18 --- /dev/null +++ b/assets/javascripts/discourse/templates/connectors/user-activity-bottom/payments-list.hbs @@ -0,0 +1,3 @@ +{{#link-to 'userActivity.payments'}} + {{d-icon "credit-card"}} {{i18n 'discourse_subscriptions.navigation.user_activity.payments'}} +{{/link-to}} diff --git a/assets/javascripts/discourse/templates/user-activity-payments.hbs b/assets/javascripts/discourse/templates/user-activity-payments.hbs new file mode 100644 index 0000000..19063b9 --- /dev/null +++ b/assets/javascripts/discourse/templates/user-activity-payments.hbs @@ -0,0 +1,3 @@ + + +PAYMENTS diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 56799e9..870a702 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -21,7 +21,8 @@ en: navigation: subscriptions: Subscriptions subscribe: Subscribe - billing: Billing + user_activity: + payments: Payments plans: purchase: Purchase a subscription select: Select subscription plan diff --git a/config/routes.rb b/config/routes.rb index e901a36..b6e6208 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,5 +24,6 @@ DiscourseSubscriptions::Engine.routes.draw do resources :products, only: [:index, :show] resources :subscriptions, only: [:create] + get '/' => 'patrons#index' get '/:id' => 'patrons#index' end diff --git a/test/javascripts/components/payment-options-test.js.es6 b/test/javascripts/components/payment-options-test.js.es6 index 435d032..c12f2d0 100644 --- a/test/javascripts/components/payment-options-test.js.es6 +++ b/test/javascripts/components/payment-options-test.js.es6 @@ -1,5 +1,4 @@ import componentTest from "helpers/component-test"; -import EmberObject from "@ember/object"; moduleForComponent("payment-options", { integration: true });