-
{{model.group.full_name}}
-
- {{{model.group.bio_cooked}}}
-
+
+
+
+ {{i18n 'discourse_patrons.subscribe.title'}}
+
-
- {{combo-box valueAttribute="id" content=model.plans value=model.subscription.plan}}
- {{#d-button
- action="stripePaymentHandler"
- class="btn btn-primary btn-payment btn-discourse-patrons"}}
- {{i18n 'discourse_patrons.subscribe.buttons.subscribe'}}
- {{/d-button}}
+
-
-
-
{{i18n 'discourse_patrons.subscribe.card.title'}}
- {{subscribe-card cardElement=cardElement}}
-
-
-
{{i18n 'discourse_patrons.subscribe.customer.title'}}
-
- {{i18n 'discourse_patrons.subscribe.customer.empty'}}
-
-
-
+ {{outlet}}
diff --git a/assets/javascripts/discourse/templates/patrons/subscribe/index.hbs b/assets/javascripts/discourse/templates/patrons/subscribe/index.hbs
new file mode 100644
index 0000000..c836cc6
--- /dev/null
+++ b/assets/javascripts/discourse/templates/patrons/subscribe/index.hbs
@@ -0,0 +1,17 @@
+
+
+{{#each model as |product|}}
+
+
{{product.name}}
+
+
+ {{product.description}}
+
+
+
+ {{#link-to "patrons.subscribe.show" product.id class="btn btn-primary"}}
+ {{i18n 'discourse_patrons.subscribe.title'}}
+ {{/link-to}}
+
+
+{{/each}}
diff --git a/assets/javascripts/discourse/templates/patrons/subscribe/show.hbs b/assets/javascripts/discourse/templates/patrons/subscribe/show.hbs
new file mode 100644
index 0000000..fbd4e47
--- /dev/null
+++ b/assets/javascripts/discourse/templates/patrons/subscribe/show.hbs
@@ -0,0 +1,32 @@
+
+
+
+
+ {{model.product.name}}
+
+
+ {{model.product.description}}
+
+
+
+ {{combo-box valueAttribute="id" content=model.plans value=model.product.plan}}
+
+ {{#d-button
+ action="stripePaymentHandler"
+ class="btn btn-primary btn-payment btn-discourse-patrons"}}
+ {{i18n 'discourse_patrons.subscribe.buttons.subscribe'}}
+ {{/d-button}}
+
+
+
+
{{i18n 'discourse_patrons.subscribe.card.title'}}
+ {{subscribe-card cardElement=cardElement}}
+
+ {{!--
+
{{i18n 'discourse_patrons.subscribe.customer.title'}}
+
+ {{i18n 'discourse_patrons.subscribe.customer.empty'}}
+
+
--}}
+
+
diff --git a/config/routes.rb b/config/routes.rb
index 17d3ff6..ca478bb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -13,16 +13,17 @@ DiscoursePatrons::Engine.routes.draw do
end
namespace :user do
- resources :subscriptions, only: [:index]
+ resources :subscriptions, only: [:index, :destroy]
end
resources :customers, only: [:create]
resources :invoices, only: [:index]
resources :patrons, only: [:index, :create]
resources :plans, only: [:index]
- resources :products, only: [:index]
- resources :subscriptions, only: [:index, :create, :destroy]
+ resources :products, only: [:index, :show]
+ resources :subscriptions, only: [:create]
get '/' => 'patrons#index'
get '/subscribe' => 'patrons#index'
+ get '/subscribe/:id' => 'patrons#index'
end
diff --git a/spec/requests/admin/products_controller_spec.rb b/spec/requests/admin/products_controller_spec.rb
index 358c5df..78c2a01 100644
--- a/spec/requests/admin/products_controller_spec.rb
+++ b/spec/requests/admin/products_controller_spec.rb
@@ -81,7 +81,7 @@ module DiscoursePatrons
it 'has a description' do
::Stripe::Product.expects(:create).with(has_entry(metadata: { description: 'Oi, I think he just said bless be all the bignoses!' }))
- post "/patrons/admin/products.json", params: { metadata: { description: 'Oi, I think he just said bless be all the bignoses!' }}
+ post "/patrons/admin/products.json", params: { metadata: { description: 'Oi, I think he just said bless be all the bignoses!' } }
end
end
diff --git a/spec/requests/plans_controller_spec.rb b/spec/requests/plans_controller_spec.rb
index 61a2e09..b0b5b2c 100644
--- a/spec/requests/plans_controller_spec.rb
+++ b/spec/requests/plans_controller_spec.rb
@@ -10,6 +10,11 @@ module DiscoursePatrons
get "/patrons/plans.json"
end
+ it "lists the active plans for a product" do
+ ::Stripe::Plan.expects(:list).with(active: true, product: 'prod_3765')
+ get "/patrons/plans.json", params: { product_id: 'prod_3765' }
+ end
+
it "orders and serialises the plans" do
::Stripe::Plan.expects(:list).returns(
data: [
diff --git a/spec/requests/products_controller_spec.rb b/spec/requests/products_controller_spec.rb
index b9fc776..3e77075 100644
--- a/spec/requests/products_controller_spec.rb
+++ b/spec/requests/products_controller_spec.rb
@@ -4,10 +4,41 @@ require 'rails_helper'
module DiscoursePatrons
RSpec.describe ProductsController do
+ let(:product) do
+ {
+ id: "prodct_23456",
+ name: "Very Special Product",
+ metadata: {
+ description: "Many people listened to my phone call with the Ukrainian President while it was being made"
+ },
+ otherstuff: true,
+ }
+ end
+
describe "index" do
- it "lists the active products" do
- ::Stripe::Product.expects(:list).with(active: true)
+ it "gets products" do
+ ::Stripe::Product.expects(:list).with(active: true).returns(data: [product])
+
get "/patrons/products.json"
+
+ expect(JSON.parse(response.body)).to eq([{
+ "id" => "prodct_23456",
+ "name" => "Very Special Product",
+ "description" => "Many people listened to my phone call with the Ukrainian President while it was being made"
+ }])
+ end
+ end
+
+ describe 'show' do
+ it 'retrieves the product' do
+ ::Stripe::Product.expects(:retrieve).with('prod_walterwhite').returns(product)
+ get "/patrons/products/prod_walterwhite.json"
+
+ expect(JSON.parse(response.body)).to eq(
+ "id" => "prodct_23456",
+ "name" => "Very Special Product",
+ "description" => "Many people listened to my phone call with the Ukrainian President while it was being made"
+ )
end
end
end
diff --git a/spec/requests/subscriptions_controller_spec.rb b/spec/requests/subscriptions_controller_spec.rb
index b66c8d8..8e45aa0 100644
--- a/spec/requests/subscriptions_controller_spec.rb
+++ b/spec/requests/subscriptions_controller_spec.rb
@@ -10,11 +10,6 @@ module DiscoursePatrons
::Stripe::Subscription.expects(:create).never
post "/patrons/subscriptions.json", params: { plan: 'plan_1234', customer: 'cus_1234' }
end
-
- it "does not destroy a subscription" do
- ::Stripe::Subscription.expects(:delete).never
- patch "/patrons/subscriptions/sub_12345.json"
- end
end
context "authenticated" do
@@ -24,30 +19,6 @@ module DiscoursePatrons
sign_in(user)
end
- describe "index" do
- let(:customers) do
- {
- data: [{
- id: "cus_23456",
- subscriptions: {
- data: [{ id: "sub_1234" }, { id: "sub_4567" }]
- },
- }]
- }
- end
-
- it "gets subscriptions" do
- ::Stripe::Customer.expects(:list).with(
- email: user.email,
- expand: ['data.subscriptions']
- ).returns(customers)
-
- get "/patrons/subscriptions.json"
-
- expect(JSON.parse(response.body)).to eq([{ "id" => "sub_1234" }, { "id" => "sub_4567" }])
- end
- end
-
describe "create" do
it "creates a subscription" do
::Stripe::Plan.expects(:retrieve).returns(metadata: { group_name: 'awesome' })
@@ -58,7 +29,7 @@ module DiscoursePatrons
post "/patrons/subscriptions.json", params: { plan: 'plan_1234', customer: 'cus_1234' }
end
- it "creates a customer" do
+ it "creates a customer model" do
::Stripe::Plan.expects(:retrieve).returns(metadata: {})
::Stripe::Subscription.expects(:create).returns(status: 'active')
@@ -66,15 +37,6 @@ module DiscoursePatrons
post "/patrons/subscriptions.json", params: { plan: 'plan_1234', customer: 'cus_1234' }
}.to change { DiscoursePatrons::Customer.count }
end
-
- it "does not create a customer id one existeth" do
- ::Stripe::Plan.expects(:retrieve).returns(metadata: {})
- ::Stripe::Subscription.expects(:create).returns(status: 'active')
- DiscoursePatrons::Customer.create(user_id: user.id, customer_id: 'cus_1234')
-
- DiscoursePatrons::Customer.expects(:create).never
- post "/patrons/subscriptions.json", params: { plan: 'plan_1234', customer: 'cus_1234' }
- end
end
describe "user groups" do
@@ -135,13 +97,6 @@ module DiscoursePatrons
end
end
end
-
- describe "delete" do
- it "deletes a subscription" do
- ::Stripe::Subscription.expects(:delete).with('sub_12345')
- delete "/patrons/subscriptions/sub_12345.json"
- end
- end
end
end
end
diff --git a/spec/requests/user/subscriptions_controller_spec.rb b/spec/requests/user/subscriptions_controller_spec.rb
index b99aa60..be9d321 100644
--- a/spec/requests/user/subscriptions_controller_spec.rb
+++ b/spec/requests/user/subscriptions_controller_spec.rb
@@ -13,6 +13,11 @@ module DiscoursePatrons
::Stripe::Customer.expects(:list).never
get "/patrons/user/subscriptions.json"
end
+
+ it "does not destroy a subscription" do
+ ::Stripe::Subscription.expects(:delete).never
+ patch "/patrons/user/subscriptions/sub_12345.json"
+ end
end
context "authenticated" do
@@ -45,6 +50,13 @@ module DiscoursePatrons
expect(JSON.parse(response.body)).to eq([{ "id" => "sub_1234" }, { "id" => "sub_4567" }])
end
end
+
+ describe "delete" do
+ it "deletes a subscription" do
+ ::Stripe::Subscription.expects(:delete).with('sub_12345')
+ delete "/patrons/user/subscriptions/sub_12345.json"
+ end
+ end
end
end
end