discourse/discourse-subscriptions
1
0
Fork 0
mirror of https://github.com/discourse/discourse-subscriptions.git synced 2025-07-08 15:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Discourse.Model was removed. Use EmberObject instead (#10)

Browse Source
This commit is contained in:
Roman Rizzi 2020-05-06 19:06:14 -03:00 committed by GitHub
parent 3d9fe5fdce
commit 7ba08ab7da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/javascripts/discourse/helpers/format-unix-date.js.es6
View File

@ -1,11 +1,12 @@
import { registerUnbound } from "discourse-common/lib/helpers"; import { registerUnbound } from "discourse-common/lib/helpers";
import { autoUpdatingRelativeAge } from "discourse/lib/formatter"; import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
import { htmlSafe } from "@ember/template";
registerUnbound("format-unix-date", function(timestamp) { registerUnbound("format-unix-date", function(timestamp) {
if (timestamp) { if (timestamp) {
const date = new Date(moment.unix(timestamp).format()); const date = new Date(moment.unix(timestamp).format());
return new Handlebars.SafeString( return new htmlSafe(
autoUpdatingRelativeAge(date, { autoUpdatingRelativeAge(date, {
format: "medium", format: "medium",
title: true, title: true,

3
assets/javascripts/discourse/models/admin-product.js.es6
View File

@ -1,6 +1,7 @@
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import EmberObject from "@ember/object";
const AdminProduct = Discourse.Model.extend({ const AdminProduct = EmberObject.extend({
isNew: false, isNew: false,
metadata: {}, metadata: {},

3
assets/javascripts/discourse/models/admin-subscription.js.es6
View File

@ -1,7 +1,8 @@
import computed from "ember-addons/ember-computed-decorators"; import computed from "ember-addons/ember-computed-decorators";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import EmberObject from "@ember/object";
const AdminSubscription = Discourse.Model.extend({ const AdminSubscription = EmberObject.extend({
@computed("status") @computed("status")
canceled(status) { canceled(status) {
return status === "canceled"; return status === "canceled";

3
assets/javascripts/discourse/models/customer.js.es6
View File

@ -1,6 +1,7 @@
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import EmberObject from "@ember/object";
const Customer = Discourse.Model.extend({ const Customer = EmberObject.extend({
save() { save() {
const data = { const data = {
source: this.source source: this.source

3
assets/javascripts/discourse/models/group.js.es6
View File

@ -1,6 +1,7 @@
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import EmberObject from "@ember/object";
const Group = Discourse.Model.extend({}); const Group = EmberObject.extend({});
Group.reopenClass({ Group.reopenClass({
subscriptionGroup: subscriptionGroup:

3
assets/javascripts/discourse/models/invoice.js.es6
View File

@ -1,6 +1,7 @@
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import EmberObject from "@ember/object";
const Invoice = Discourse.Model.extend({}); const Invoice = EmberObject.extend({});
Invoice.reopenClass({ Invoice.reopenClass({
findAll() { findAll() {

3
assets/javascripts/discourse/models/subscription.js.es6
View File

@ -1,7 +1,8 @@
import computed from "ember-addons/ember-computed-decorators"; import computed from "ember-addons/ember-computed-decorators";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import EmberObject from "@ember/object";
const Subscription = Discourse.Model.extend({ const Subscription = EmberObject.extend({
@computed("status") @computed("status")
canceled(status) { canceled(status) {
return status === "canceled"; return status === "canceled";

2
test/javascripts/models/plan-test.js.es6
View File

@ -11,7 +11,7 @@ QUnit.test("subscriptionRate", assert => {
assert.equal( assert.equal(
plan.get("subscriptionRate"), plan.get("subscriptionRate"),
"$23.99 AUD / month", "23.99 AUD / month",
"it returns the formatted subscription rate" "it returns the formatted subscription rate"
); );
}); });