diff --git a/app/controllers/admin/plans_controller.rb b/app/controllers/admin/plans_controller.rb index 818156e..d9132df 100644 --- a/app/controllers/admin/plans_controller.rb +++ b/app/controllers/admin/plans_controller.rb @@ -27,6 +27,7 @@ module DiscoursePatrons product: params[:product], trial_period_days: params[:trial_period_days], currency: SiteSetting.discourse_patrons_currency, + active: params[:active], metadata: { group_name: params[:metadata][:group_name] } ) @@ -54,6 +55,7 @@ module DiscoursePatrons params[:id], nickname: params[:nickname], trial_period_days: params[:trial_period_days], + active: params[:active], metadata: { group_name: params[:metadata][:group_name] } ) diff --git a/assets/javascripts/discourse/models/admin-plan.js.es6 b/assets/javascripts/discourse/models/admin-plan.js.es6 index 10ed2b2..6895bd0 100644 --- a/assets/javascripts/discourse/models/admin-plan.js.es6 +++ b/assets/javascripts/discourse/models/admin-plan.js.es6 @@ -36,6 +36,7 @@ const AdminPlan = Discourse.Model.extend({ trial_period_days: this.parseTrialPeriodDays, product: this.product, metadata: this.metadata, + active: this.active }; return ajax("/patrons/admin/plans", { method: "post", data }); @@ -46,6 +47,7 @@ const AdminPlan = Discourse.Model.extend({ nickname: this.nickname, trial_period_days: this.parseTrialPeriodDays, metadata: this.metadata, + active: this.active }; return ajax(`/patrons/admin/plans/${this.id}`, { method: "patch", data }); diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-products-show-plans-show.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-products-show-plans-show.js.es6 index 73cebf3..3698b51 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-products-show-plans-show.js.es6 +++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-products-show-plans-show.js.es6 @@ -8,7 +8,7 @@ export default Discourse.Route.extend({ let plan; if(id === 'new') { - plan = AdminPlan.create({ isNew: true, product: product.get('id') }); + plan = AdminPlan.create({ active: true, isNew: true, product: product.get('id') }); } else { plan = AdminPlan.find(id); diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show-plans-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show-plans-show.hbs index 76a1b90..371404b 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show-plans-show.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show-plans-show.hbs @@ -40,6 +40,12 @@ {{combo-box valueAttribute="value" content=model.plan.intervals value=model.plan.interval}}
++ + {{input type="checkbox" name="active" checked=model.plan.active}} +