Discource-C
/
discourse-subscriptions
mirror of https://github.com/discourse/discourse-subscriptions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

show product and plan nickname in admin

This commit is contained in:
Rimian Perkins 2019-11-26 12:55:49 +11:00
parent 7340bf5bc5
commit 3e4fd76891
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/subscriptions_controller.rb
View File

@ -9,7 +9,7 @@ module DiscoursePatrons
def index def index
begin begin
subscriptions = ::Stripe::Subscription.list subscriptions = ::Stripe::Subscription.list(expand: ['data.plan.product'])
render_json_dump subscriptions render_json_dump subscriptions
rescue ::Stripe::InvalidRequestError => e rescue ::Stripe::InvalidRequestError => e

4
assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs
View File

@ -4,6 +4,7 @@
<tr> <tr>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.user'}}</th> <th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.user'}}</th>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.customer'}}</th> <th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.customer'}}</th>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.product'}}</th>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.plan'}}</th> <th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.plan'}}</th>
<th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.status'}}</th> <th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.status'}}</th>
<th class="td-right">{{i18n 'discourse_patrons.admin.subscriptions.subscription.created_at'}}</th> <th class="td-right">{{i18n 'discourse_patrons.admin.subscriptions.subscription.created_at'}}</th>
@ -20,7 +21,8 @@
{{/if}} {{/if}}
</td> </td>
<td>{{subscription.customer}}</td> <td>{{subscription.customer}}</td>
<td>{{subscription.plan.id}}</td> <td>{{subscription.plan.product.name}}</td>
<td>{{subscription.plan.nickname}}</td>
<td>{{subscription.status}}</td> <td>{{subscription.status}}</td>
<td class="td-right">{{format-unix-date subscription.created}}</td> <td class="td-right">{{format-unix-date subscription.created}}</td>
<td class="td-right"> <td class="td-right">

1
config/locales/client.en.yml
View File

@ -126,6 +126,7 @@ en:
user: User user: User
subscription_id: Subscription ID subscription_id: Subscription ID
customer: Customer customer: Customer
product: Product
plan: Plan plan: Plan
status: Status status: Status
created_at: Created created_at: Created

4
spec/requests/admin/subscriptions_controller_spec.rb
View File

@ -27,8 +27,8 @@ module DiscoursePatrons
before { sign_in(admin) } before { sign_in(admin) }
describe "index" do describe "index" do
it "gets the subscriptions" do it "gets the subscriptions and products" do
::Stripe::Subscription.expects(:list) ::Stripe::Subscription.expects(:list).with(expand: ['data.plan.product'])
get "/patrons/admin/subscriptions.json" get "/patrons/admin/subscriptions.json"
expect(response.status).to eq(200) expect(response.status).to eq(200)
end end