@b2y/ecommerce-common 1.0.8 → 1.1.0

package/constants/AppConstants.js

@@ -1,4 +1,7 @@
 const AppConstants = {
-    DASHBOARD_DEFAULT_DAYS : 7
+    DASHBOARD_DEFAULT_DAYS : 7,
+    LAST_30DAYS: 'LAST30DAYS',
+    LAST_6MONTHS: 'LAST6MONTHS',
+    OLDER: 'OLDER',
 }
 module.exports = AppConstants;

package/enum/AccessModeEnum.js

@@ -1,7 +1,8 @@
 const AccessModeEnum = Object.freeze({
   FULL: "Full",
   READ_ONLY: "Read Only",
-  BLOCKED: "Blocked"
+  BLOCKED: "Blocked",
+  PAYMENT_REQUIRED: "Payment Required"
 });
 
 module.exports = AccessModeEnum;

package/model/SubscriptionPlan.js

@@ -31,6 +31,11 @@ module.exports = (sequelize) => {
         type: DataTypes.STRING(10),
         allowNull: false,
       },
+      TrialPeriodDays: {
+       type: DataTypes.INTEGER,
+       allowNull: false,
+       defaultValue: 0
+      },
       IsActive: {
         type: DataTypes.BOOLEAN,
         defaultValue: true,

package/model/TenantSubscription.js

@@ -24,22 +24,28 @@ module.exports = (sequelize) => {
       },
       StartDate: {
         type: DataTypes.DATE,
-        allowNull: false,
-        defaultValue: DataTypes.NOW,
+        allowNull: false
       },
       EndDate: {
         type: DataTypes.DATE,
         allowNull: false,
-        defaultValue: DataTypes.NOW,
       },
       GraceEndDate: {
         type: DataTypes.DATE,
+        allowNull: true,
+      },
+      TrialEndDate: {
+        type: DataTypes.DATE,
+        allowNull: true
+      },
+      IsTrial: {
+        type: DataTypes.BOOLEAN,
         allowNull: false,
-        defaultValue: DataTypes.NOW,
+        defaultValue: false
       },
       AutoRenew: {
         type: DataTypes.BOOLEAN,
-        defaultValue: true,
+        defaultValue: false,
       },
       CreatedBy: {
         type: DataTypes.UUID,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b2y/ecommerce-common",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "E-commerce common library",
   "main": "index.js",
   "scripts": {

package/utility/OrderTimeFilterUtil.js

@@ -1,3 +1,4 @@
+const AppConstants = require('../constants/AppConstants');
 class OrderTimeFilterUtil {
     static getDateRange(filter) {
         if (!filter) return null;

package/utility/QueryUtil.js

@@ -51,7 +51,7 @@ class QueryUtil {
         { StoreName: { [Sequelize.Op.iLike]: `%${searchText}%` } },
         { AddressLine1: { [Sequelize.Op.iLike]: `%${searchText}%` } },
         { AddressLine2: { [Sequelize.Op.iLike]: `%${searchText}%` } },
-        { "$City.CityName$": { [Sequelize.Op.iLike]: `%${searchText}%` } },
+        { CityName: { [Sequelize.Op.iLike]: `%${searchText}%` } },
       ];
     }
 

package/utility/ResolveAccessMode.js

@@ -5,21 +5,35 @@ function ResolveAccessMode(subscription) {
  
   if (!subscription) return AccessModeEnum.BLOCKED; 
  
-  if (Object.values(SubscriptionStatusEnum).includes(subscription.Status)) { 
+  if ([SubscriptionStatusEnum.CANCELLED, SubscriptionStatusEnum.EXPIRED, SubscriptionStatusEnum.SUSPENDED].includes(subscription.Status)) { 
     return AccessModeEnum.BLOCKED; 
   } 
- 
-  if (now <= new Date(subscription.EndDate)) { 
-    return AccessModeEnum.FULL; 
-  } 
- 
-  if ( 
-    subscription.GraceEndDate && 
-    now <= new Date(subscription.GraceEndDate) 
-  ) { 
-    return AccessModeEnum.READ_ONLY; 
-  } 
- 
+
+  if (subscription.Status === SubscriptionStatusEnum.ACTIVE) {
+    if (subscription.IsTrial === true) {
+      const trialEndDate = subscription.TrialEndDate
+        ? new Date(subscription.TrialEndDate)
+        : null;
+      if (trialEndDate && now < trialEndDate) {
+        return AccessModeEnum.FULL;
+      }
+      return AccessModeEnum.PAYMENT_REQUIRED;
+    }
+    const endDate = new Date(subscription.EndDate);
+    const graceEndDate = subscription.GraceEndDate
+      ? new Date(subscription.GraceEndDate)
+      : null;
+    // Still in the paid period
+    if (now < endDate) {
+      return AccessModeEnum.FULL;
+    }
+    // Past EndDate, but within Grace Period
+    if (graceEndDate && now <= graceEndDate) {
+      return AccessModeEnum.READ_ONLY;
+    }
+    // Past both EndDate and Grace Period
+    return AccessModeEnum.BLOCKED;
+  }
   return AccessModeEnum.BLOCKED; 
 }; 
 module.exports = ResolveAccessMode;