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

FIX: Properly show information on saved plans

This commit is contained in:
Justin DiRose 2020-07-28 11:56:58 -05:00
parent 0a244111bc
commit 954beeb094
No known key found for this signature in database
GPG Key ID: 4B811FB264021800
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/javascripts/discourse/components/payment-options.js.es6
View File

@ -10,6 +10,6 @@ export default Component.extend({
actions: { actions: {
clickPlan(plan) { clickPlan(plan) {
this.set("selectedPlan", plan.id); this.set("selectedPlan", plan.id);
}, }
}, }
}); });

7
assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show-plans-show.js.es6
View File

@ -22,8 +22,11 @@ export default Route.extend({
product: product.get("id") product: product.get("id")
}); });
} else { } else {
plan = AdminPlan.find(id); plan = AdminPlan.find(id).then(result => {
plan.isRecurring = plan.type === "recurring"; result.isRecurring = result.type === "recurring";
return result;
});
} }
const groups = Group.findAll({ ignore_automatic: true }); const groups = Group.findAll({ ignore_automatic: true });

7
assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs
View File

@ -44,7 +44,12 @@
{{i18n 'discourse_subscriptions.admin.plans.plan.recurring'}} {{i18n 'discourse_subscriptions.admin.plans.plan.recurring'}}
</label> </label>
{{#if planFieldDisabled}} {{#if planFieldDisabled}}
{{input disabled=true value=model.plan.isRecurring}} {{input
type="checkbox"
name="recurring"
checked=model.plan.isRecurring
disabled=true
}}
{{else}} {{else}}
{{input {{input
type="checkbox" type="checkbox"