summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--server/lib/schemas/Subscription.js6
-rw-r--r--server/lib/schemas/User.js1
-rw-r--r--server/lib/views/subscription.js50
3 files changed, 7 insertions, 50 deletions
diff --git a/server/lib/schemas/Subscription.js b/server/lib/schemas/Subscription.js
index 8315009..8ec557d 100644
--- a/server/lib/schemas/Subscription.js
+++ b/server/lib/schemas/Subscription.js
@@ -17,6 +17,12 @@ var SubscriptionSchema = new mongoose.Schema({
monthly: { type: Boolean },
}],
+ history: [{
+ action: { type: String },
+ plan_id: { type: String },
+ created_at: { type: Date, default: Date.now },
+ }],
+
created_at: { type: Date, default: Date.now },
updated_at: { type: Date, default: Date.now },
})
diff --git a/server/lib/schemas/User.js b/server/lib/schemas/User.js
index 180a140..19b5ede 100644
--- a/server/lib/schemas/User.js
+++ b/server/lib/schemas/User.js
@@ -62,6 +62,7 @@ var UserSchema = new mongoose.Schema({
twitterName: { type: String, default: "" },
facebookUrl: { type: String, default: "" },
isStaff: { type: Boolean, default: false },
+ subscription_id: { type: mongoose.Schema.ObjectId },
created_at: { type: Date },
updated_at: { type: Date },
last_seen: { type: Date },
diff --git a/server/lib/views/subscription.js b/server/lib/views/subscription.js
deleted file mode 100644
index ba54bb4..0000000
--- a/server/lib/views/subscription.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* jshint node: true */
-
-var User = require('../schemas/User'),
- Subscription = require('../schemas/Subscription'),
- config = require('../../../config'),
- middleware = require('../middleware'),
- util = require('../util'),
- _ = require('lodash'),
- moment = require('moment');
-
-var subscription = module.exports = {
-
- fields: {
- user: "_id username displayName photo created_at updated_at last_seen created_ip last_ip",
- },
-
- defaults: {
- user: {
- _id: "", username: "", displayName: "",
- created_at: "", updated_at: "", created_ip: "", last_ip: "",
- },
- },
-
- middleware: {
- },
-
- helpers: {
- project: function(project){
- project = project.toObject()
- project.date = moment( project.updated_at || project.created_at ).format("M/DD/YYYY hh:mm a")
- project.user = {}
- return project
- },
- },
-
- route: function(app){
- app.get('/staff',
- middleware.ensureAuthenticated,
- middleware.ensureIsStaff,
-
- staff.middleware.ensureRecentUsers,
- staff.middleware.ensureUsersCount,
- staff.middleware.ensureProjectsCount,
- staff.middleware.ensureMediaCount,
-
- staff.index
- );
- },
-
-}