@b2y/ecommerce-common 1.2.4 → 1.2.6

package/controller/SubscriptionAbstractController.js

@@ -21,6 +21,7 @@ const getAllSubscriptionPlans = (
           "Currency",
           "TrialPeriodDays",
           "IsActive",
+          "SortOrder"
         ],
         include: [
           {

package/controller/TenantAbstractController.js

@@ -402,7 +402,7 @@ const getTenantById = (
               {
                 model: SubscriptionPlan,
                 as: "SubscriptionPlan",
-                attributes: ["SubscriptionPlanID", "PlanName", "PlanCode"],
+                attributes: ["SubscriptionPlanID", "PlanName", "PlanCode", "BillingCycle"],
               },
             ],
           },
@@ -462,6 +462,7 @@ const getTenantById = (
         TenantLogo: logo,
         SubscriptionPlanID: tenant.CurrentSubscription?.SubscriptionPlan?.SubscriptionPlanID,
         PlanName: tenant.CurrentSubscription?.SubscriptionPlan?.PlanName,
+        BillingCycle: tenant.CurrentSubscription?.SubscriptionPlan?.BillingCycle,
         TenantSubscriptionStatus: tenant.CurrentSubscription?.Status,
         StartDate: tenant.CurrentSubscription?.StartDate,
         EndDate: tenant.CurrentSubscription?.EndDate,

package/controller/TenantSettingsAbstractController.js

@@ -94,7 +94,7 @@ return async (req, res) => {
     }
   }}
 
-  const updateTenantSettings = (TenantSettings, multer, upload, FileUploadUtil, FILE_PATHS, UpdatedBy, sequelize, logger) => {
+  const updateTenantSettings = (TenantSettings, multer, upload, FileUploadUtil, FILE_PATHS, reqUpdatedBy, sequelize, logger) => {
     return async (req, res) => {
     upload(req, res, async (err) => {
         if (err instanceof multer.MulterError || err) {
@@ -171,12 +171,14 @@ return async (req, res) => {
             // Update tenant settings
             const updatePayload = {};
             if (ThemeColour !== undefined) updatePayload.ThemeColour = ThemeColour;
-            if(UpdatedBy) {
-             updatePayload.UpdatedBy = UpdatedBy;
+            let updatedBy = null
+            if(reqUpdatedBy) {
+             updatedBy = reqUpdatedBy;
             }
             else {
-             updatePayload.UpdatedBy = req.user.UserID
+             updatedBy = req.user.UserID
             }
+            updatePayload.UpdatedBy = updatedBy
             updatePayload.UpdatedAt = new Date();
 
             await existingSettings.update(updatePayload, { transaction });
@@ -190,7 +192,7 @@ return async (req, res) => {
                     EntityTypeEnum.TENANT_SETTINGS,
                     existingSettings.TenantSettingID,
                     existingSettings.TenantID,
-                    UpdatedBy,
+                    updatedBy,
                     transaction
                 );
             }

package/model/SubscriptionPlan.js

@@ -40,6 +40,10 @@ module.exports = (sequelize) => {
         type: DataTypes.BOOLEAN,
         defaultValue: true,
       },
+      SortOrder: {
+        type: DataTypes.INTEGER,
+        allowNull: false
+      },
       CreatedBy: {
         type: DataTypes.UUID,
         allowNull: false,

package/package.json

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