diff --git a/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons-products-show.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons-products-show.js.es6 index d07d0d1..2f15386 100644 --- a/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons-products-show.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons-products-show.js.es6 @@ -1,7 +1,15 @@ import { popupAjaxError } from "discourse/lib/ajax-error"; export default Ember.Controller.extend({ + redirect() { + this.transitionToRoute("adminPlugins.discourse-patrons.products"); + }, + actions: { + cancelProduct() { + this.redirect(); + }, + createProduct() { // TODO: set default group name beforehand if (this.get("model.product.metadata.group_name") === undefined) { @@ -13,18 +21,14 @@ export default Ember.Controller.extend({ this.get("model.product") .save() - .then(() => { - this.transitionToRoute("adminPlugins.discourse-patrons.products"); - }) + .then(() => this.redirect()) .catch(popupAjaxError); }, updateProduct() { this.get("model.product") .update() - .then(() => { - this.transitionToRoute("adminPlugins.discourse-patrons.products"); - }) + .then(() => this.redirect()) .catch(popupAjaxError); } } diff --git a/assets/javascripts/discourse/models/admin-plan.js.es6 b/assets/javascripts/discourse/models/admin-plan.js.es6 index 3c632d9..1618657 100644 --- a/assets/javascripts/discourse/models/admin-plan.js.es6 +++ b/assets/javascripts/discourse/models/admin-plan.js.es6 @@ -1,3 +1,4 @@ +import computed from "ember-addons/ember-computed-decorators"; import { ajax } from "discourse/lib/ajax"; const AdminPlan = Discourse.Model.extend({ @@ -6,6 +7,11 @@ const AdminPlan = Discourse.Model.extend({ amount: 0, intervals: ["day", "week", "month", "year"], + @computed("created") + createdFormatted(created) { + return moment.unix(created).format(); + }, + destroy() { return ajax(`/patrons/admin/plans/${this.id}`, { method: "delete" }); }, diff --git a/assets/javascripts/discourse/models/admin-product.js.es6 b/assets/javascripts/discourse/models/admin-product.js.es6 index 2a6b358..9f1f68d 100644 --- a/assets/javascripts/discourse/models/admin-product.js.es6 +++ b/assets/javascripts/discourse/models/admin-product.js.es6 @@ -1,9 +1,15 @@ +import computed from "ember-addons/ember-computed-decorators"; import { ajax } from "discourse/lib/ajax"; const AdminProduct = Discourse.Model.extend({ isNew: false, metadata: {}, + @computed("created") + createdFormatted(created) { + return moment.unix(created).format(); + }, + destroy() { return ajax(`/patrons/admin/products/${this.id}`, { method: "delete" }); }, diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-index.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-index.hbs index 4393746..bf17fd4 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-index.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-index.hbs @@ -1,17 +1,24 @@ +
+ {{#link-to 'adminPlugins.discourse-patrons.products.show' 'new' class="btn btn-primary"}} + {{d-icon "plus"}} + {{i18n 'discourse_patrons.admin.products.operations.new'}} + {{/link-to}} +
+{{i18n 'discourse_patrons.admin.products.product.product_id'}} | {{i18n 'discourse_patrons.admin.products.product.name'}} | {{i18n 'discourse_patrons.admin.products.product.group'}} | +{{i18n 'discourse_patrons.admin.products.product.created_at'}} | {{i18n 'discourse_patrons.admin.products.product.active'}} | {{#each model as |product|}} | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
{{product.id}} | {{product.name}} | {{product.metadata.group_name}} | +{{format-date product.createdFormatted}} | {{product.active}} |
{{#link-to "adminPlugins.discourse-patrons.products.show" product.id class="btn no-text btn-icon"}}
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show.hbs
index 198c353..15171ec 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show.hbs
@@ -32,9 +32,9 @@
|