@dhyasama/totem-models 6.11.5 → 6.11.7

package/lib/Deal.js

@@ -21,15 +21,15 @@ module.exports = function(mongoose, config) {
 
     reminder: { type: Date },
 
-    sources: [{
-      person: { type: Schema.ObjectId, ref: 'Person', required: true },
-      type: { type: String, trim: true, required: true }
-    }],
+    source: {
+      person: { type: Schema.ObjectId, ref: 'Person' },
+      type: { type: String, trim: true }
+    },
 
-    referrers: [{
-      person: { type: Schema.ObjectId, ref: 'Person', required: true },
-      type: { type: String, enum: ['Founder', 'Investor', 'Service Provider', 'Friends & Family', 'Limited Partner', 'Other'], required: true }
-    }],
+    referrer: {
+      person: { type: Schema.ObjectId, ref: 'Person' },
+      type: { type: String, trim: true }
+    },
 
     documents: [ { type: Schema.ObjectId, ref: 'Document' } ],
 

package/lib/Organization.js

@@ -206,77 +206,14 @@ module.exports = function(mongoose, config) {
 
           active: { type: Boolean, default: false },
 
-          statuses: [{
+          stages: [{
             name: { type: String, trim: true },
             order: { type: Number },
             active: { type: Boolean, default: true },
             color: { type: String, trim: true }
           }],
 
-          sourceTypes: [ { type: String, trim: true } ],
-
-          standardFields: {
-
-            // Standard fields are always "on" in the system
-            // They can be configured in how they work on the deal list page
-            // order for standard fields only sets the order on the list page. their position is fixed on the org page deal section and edit form.
-            // order is co-mingled with order for custom fields
-            // colspan is for the number of columns the field should take up on the list page
-            // showOnFilter controls whether values are extracted and used in filtering options on list page
-            // showOnList controls if the field will be on deal list page
-
-            action: {
-              order: { type: Number, default: 99 },
-              colspan: { type: Number, default: 1 },
-              showOnFilter: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: true }
-            },
-
-            raise: {
-              order: { type: Number, default: 99 },
-              colspan: { type: Number, default: 1 },
-              showOnFilter: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: true }
-            },
-
-            valuation: {
-              order: { type: Number, default: 99 },
-              colspan: { type: Number, default: 1 },
-              showOnFilter: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: true }
-            },
-
-            sources: {
-              order: { type: Number, default: 99 },
-              colspan: { type: Number, default: 1 },
-              showOnFilter: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: true }
-            },
-
-            sourceTypes: {
-              order: { type: Number, default: 99 },
-              colspan: { type: Number, default: 1 },
-              showOnFilter: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: true }
-            },
-
-            referrers: {
-              order: { type: Number, default: 99 },
-              colspan: { type: Number, default: 1 },
-              showOnFilter: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: true }
-            },
-
-            chairs: {
-              order: { type: Number, default: 99 },
-              colspan: { type: Number, default: 1 },
-              showOnFilter: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: true }
-            }
-
-          },
-
-          customFields: [{
+          fields: [{
 
             // Data stored on deals will be accessed with this key
             // It must follow standard js variable naming rules
@@ -285,6 +222,9 @@ module.exports = function(mongoose, config) {
             // Changing it after data is in the system will make data on deal inaccessible
             key: { type: String, trim: true },
 
+            // this sets whether the field is a custom field
+            isStandard: false,
+
             // User friendly text, will be displayed
             label: { type: String, trim: true },
 
@@ -316,13 +256,12 @@ module.exports = function(mongoose, config) {
               // colspan is for the number of columns the field should take up on the list page
               colspan: { type: Number, default: 1 },
 
+              // showOnList controls if the field will be on deal list page
+              showOnList: { type: Boolean, default: true },
+
               // showOnFilter controls whether values are extracted and used in filtering options on list page
               showOnFilter: { type: Boolean, default: true },
 
-              // showOnList controls if the field will be on deal list page
-              // fields are always shown on org pages and in edit forms
-              showOnList: { type: Boolean, default: true }
-
             }
 
           }]
@@ -511,151 +450,12 @@ module.exports = function(mongoose, config) {
     // Deals aren't on for customer
     else if (!self.customer.deals.active) return [];
 
-    // Get active status names and sort them
-    var statuses = _.filter(self.customer.deals.statuses, function(s) { return s.active; });
-    statuses = _.sortBy(statuses, 'order');
-    statuses = _.pluck(statuses, 'name');
-
-    return statuses;
-
-  });
-
-  Organization.virtual('customer.deals.fields').get(function () {
-
-    // Combine standard fields and custom fields into a single list and sort by column order
-    // Fundraise is actually two fields, so multiply the order by ten to make room for the extra field
-
-    var self = this;
-
-    var standardFields = self.customer.deals.standardFields;
-
-    // Defaulting to off so it will be immediately apparent the customer hasn't been properly configured
-    standardFields = standardFields || {
-      fundraise: {
-        showOnList: false
-      },
-      sources: {
-        showOnList: false
-      },
-      referrers: {
-        showOnList: false
-      }
-    };
-
-    var customFields = self.customer.deals.customFields;
-    var result = [];
-
-    // Add standard fields
-    if (standardFields.action.showOnList) {
-      result.push({
-        name: 'Next Steps',
-        type: 'Text',
-        key: 'action',
-        isStandard: true,
-        order: standardFields.action.order * 10,
-        colspan: standardFields.action.colspan || 1,
-        showOnFilter: standardFields.action.showOnFilter === true ? true : false
-      });
-    }
-
-    if (standardFields.raise.showOnList) {
-      result.push({
-        name: 'Raise',
-        type: 'Money',
-        key: 'fundraise.amount',
-        isStandard: true,
-        order: standardFields.raise.order * 10,
-        colspan: standardFields.raise.colspan || 1,
-        showOnFilter: standardFields.raise.showOnFilter === true ? true : false
-      });
-    }
-
-    if(standardFields.valuation.showOnList) {
-      result.push({
-        name: 'Valuation',
-        type: 'Money',
-        key: 'fundraise.valuation',
-        isStandard: true,
-        order: standardFields.valuation.order * 10 + 1,
-        colspan: standardFields.valuation.colspan || 1,
-        showOnFilter: standardFields.valuation.showOnFilter === true ? true : false
-      });
-    }
-
-    if (standardFields.sources.showOnList) {
-      result.push({
-        name: 'Sources',
-        type: 'Reference',
-        key: 'sources',
-        isStandard: true,
-        order: standardFields.sources.order * 10,
-        colspan: standardFields.sources.colspan || 1,
-        showOnFilter: standardFields.sources.showOnFilter === true ? true : false
-      });
-    }
-
-    if (standardFields.sourceTypes.showOnList) {
-      result.push({
-        name: 'Source Types',
-        type: 'Single Select',
-        key: 'sourceTypes',
-        isStandard: true,
-        order: standardFields.sourceTypes.order * 10,
-        colspan: standardFields.sourceTypes.colspan || 1,
-        showOnFilter: standardFields.sourceTypes.showOnFilter === true ? true : false
-      });
-    }
+    // Get active stage names and sort them
+    var stages = _.filter(self.customer.deals.stages, function(s) { return s.active; });
+    stages = _.sortBy(stages, 'order');
+    stages = _.pluck(stages, 'name');
 
-    if (standardFields.referrers.showOnList) {
-      result.push({
-        name: 'Referrers',
-        type: 'Reference',
-        key: 'referrers',
-        isStandard: true,
-        order: standardFields.referrers.order * 10,
-        colspan: standardFields.referrers.colspan || 1,
-        showOnFilter: standardFields.referrers.showOnFilter === true ? true : false
-      });
-    }
-
-    if (standardFields.chairs.showOnList) {
-      result.push({
-        name: 'Leads',
-        type: 'Reference',
-        key: 'organization.chairs',
-        isStandard: true,
-        order: standardFields.chairs.order * 10,
-        colspan: standardFields.chairs.colspan || 1,
-        showOnFilter: standardFields.chairs.showOnFilter === true ? true : false
-      });
-    }
-
-    // Add custom fields
-    _.each(customFields, function(field) {
-      if (field.display.showOnList) {
-        result.push({
-          name: field.label,
-          type: field.type,
-          isStandard: false,
-          key: field.key,
-          options: field.options,
-          order: field.display.order * 10,
-          colspan: field.display.colspan || 1,
-          showOnFilter: field.display.showOnFilter === true ? true : false
-        });
-      }
-    });
-
-    // Sort the combined standard and custom fields
-    result = _.sortBy(result, function(item) { return item.order; });
-
-    // Now that we have all fields combined and ordered, make column order zero-indexed and gap-free
-    result = _.map(result, function(item, index) {
-      item.order = index;
-      return item;
-    });
-
-    return result;
+    return stages;
 
   });
 
@@ -955,10 +755,10 @@ module.exports = function(mongoose, config) {
         if (err) return callback(err, null);
         else if (!org) return callback(new Error('Customer not found'), null);
 
-        var statuses = org.customer.deals.activeStatuses;
+        var stages = org.customer.deals.activeStatuses;
 
-        var match = _.find(statuses, function(status) {
-          return status == previous.deal.stage;
+        var match = _.find(stages, function(stage) {
+          return stage == previous.deal.stage;
         });
 
         if (!match) return callback(new Error('This stage is not valid for this customer'), null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "6.11.5",
+  "version": "6.11.7",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",