@dhyasama/totem-models 7.52.0 → 7.53.0

package/lib/Financials.js

@@ -259,10 +259,6 @@ module.exports = function(mongoose, config) {
         var hasSendOnLessThanNow = snapshot.notifications.company.initial.sendOn < now;
         var hasNotBeenSentTo = !snapshot.notifications.company.initial.sentOn;
 
-        //console.log(hasRecipients);
-        //console.log(hasSendOnLessThanNow);
-        //console.log(hasNotBeenSentTo);
-
         return hasRecipients && hasSendOnLessThanNow && hasNotBeenSentTo;
 
       });
@@ -496,14 +492,12 @@ module.exports = function(mongoose, config) {
         snapshot.action = null;
       }
       
-      else if(!_.isEmpty(snapshot.notifications.company.sendOn)) {
+      else if(!_.isEmpty(snapshot.notifications.company)) {
 
-        var earliestSendOn = _.min(snapshot.notifications.company.sendOn, function(s) { return new Date(s.sendOn); }); 
-        var latestSendOn = _.max(snapshot.notifications.company.sendOn, function(s) { return new Date(s.sendOn); });
-        var latestSentOn = _.max(snapshot.notifications.company.sentOn, function(s) { return new Date(s.sentOn); })
+        var latestReminder = _.max(snapshot.notifications.company.reminders, function(r) { return new Date(r.sendOn); });
 
-        var isScheduled = earliestSendOn.sendOn && moment().isBefore(moment(earliestSendOn.sendOn));
-        var isOverdue = latestSendOn.sendOn && moment().subtract(14, 'd').isAfter(moment(latestSendOn.sendOn));
+        var isScheduled = snapshot.notifications.company.initial.sendOn && moment().isBefore(moment(snapshot.notifications.company.initial.sendOn));
+        var isOverdue = latestReminder.sendOn && moment().subtract(14, 'd').isAfter(moment(latestReminder.sendOn));
 
         if(isScheduled) {
           snapshot.status = 'Scheduled';
@@ -519,7 +513,8 @@ module.exports = function(mongoose, config) {
           snapshot.status = 'In Progress';
           if(isManagedServices && isSubmitted && !isRejected) snapshot.action = 'Review';
           else if(isManagedServices && isSubmitted && isRejected) snapshot.action = 'Rejected';
-          else if(latestSentOn.status) snapshot.action = latestSentOn.status;
+          else if(latestReminder.sentOn) snapshot.action = latestReminder.status;
+          else snapshot.action = snapsot.notifications.company.initial.status;
         }
 
       }

package/package.json

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