Merge pull request #675 from PAWECOGmbH/development

Dev to staging

Author: ptruessel

config/db/core/V11__module-runtime.sql

@@ -0,0 +1,7 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+ALTER TABLE `modules`
+ADD COLUMN `intDurationDays` int NULL DEFAULT 0 AFTER `intNumTestDays`;
+
+SET FOREIGN_KEY_CHECKS = 1;

config/db/core/V12__reorganize-mappings.sql

@@ -0,0 +1,8 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+INSERT INTO system_mappings (strMapping, strPath, blnOnlyAdmin, blnOnlySuperAdmin, blnOnlySysAdmin)
+VALUES
+('sysadmin/mapping/edit', 'backend/core/views/sysadmin/mapping_edit.cfm', 0, 0, 1);
+
+SET FOREIGN_KEY_CHECKS = 1;

config/db/core/V13__new-registration-email.sql

@@ -0,0 +1,8 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+INSERT INTO system_settings (strSettingVariable, strDefaultValue, strDescription)
+VALUES
+('settingMailNewRegistrations', '1', 'Would you like to be notified about new registrations by email?');
+
+SET FOREIGN_KEY_CHECKS = 1;

config/db/dev/create-modules.sql

@@ -66,18 +66,20 @@ CREATE TABLE `modules`  (
   `strPicture` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
   `blnBookable` tinyint NOT NULL,
   `intNumTestDays` int NOT NULL,
+  `intDurationDays` int NOT NULL DEFAULT 0,
   `strSettingPath` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
   `blnFree` tinyint NULL DEFAULT 0,
+  `strRedirectPath` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
   `intPrio` int NOT NULL,
   PRIMARY KEY (`intModuleID`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of modules
 -- ----------------------------
-INSERT INTO `modules` VALUES (1, 'Free Todo list app', 'Let your tasks be done', '<p>With this small but powerful tool for task management, you always have all your tasks under control. Simply click on \"Activate\" and get started :-)<br></p>', 1, 'todo', '', 1, 0, 'backend/modules/todo/settings', 1, 1);
-INSERT INTO `modules` VALUES (2, 'Easy ERP', 'Manage your contacts using Easy CRM', '<p>Manage your contacts easily with Easy ERP. Many features are included here, such as:<br><br>- Create and manage contacts<br>- Customer history<br>- Acquisition<br>- Appointment management<br>- and much more...<br></p>', 1, 'easyerp', '', 1, 30, 'backend/modules/easyerp/settings', 0, 2);
-INSERT INTO `modules` VALUES (3, 'MailChimp API', 'Automatically transfer your customers to MailChimp', '<p>With the newsletter marketing tool MailChimp, you serve all your customers with a newsletter. Connect your account with MailChimp and let this module take care of the synchronisation.</p>', 1, 'mailchimp', '', 1, 10, 'backend/modules/mailchimp/settings', 0, 3);
+INSERT INTO `modules` VALUES (1, 'Free Todo list app', 'Let your tasks be done', '<p>With this small but powerful tool for task management, you always have all your tasks under control. Simply click on \"Activate\" and get started :-)<br></p>', 1, 'todo', '', 1, 0, 0, 'backend/modules/todo/settings', 1, '', 1);
+INSERT INTO `modules` VALUES (2, 'Easy ERP', 'Manage your contacts using Easy CRM', '<p>Manage your contacts easily with Easy ERP. Many features are included here, such as:<br><br>- Create and manage contacts<br>- Customer history<br>- Acquisition<br>- Appointment management<br>- and much more...<br></p>', 1, 'easyerp', '', 1, 30, 0, 'backend/modules/easyerp/settings', 0, '', 2);
+INSERT INTO `modules` VALUES (3, 'MailChimp API', 'Automatically transfer your customers to MailChimp', '<p>With the newsletter marketing tool MailChimp, you serve all your customers with a newsletter. Connect your account with MailChimp and let this module take care of the synchronisation.</p>', 1, 'mailchimp', '', 1, 10, 0, 'backend/modules/mailchimp/settings', 0, '', 3);
 
 
 -- ----------------------------

config/db/dev/create-plans.sql

@@ -106,6 +106,7 @@ CREATE TABLE `plans`  (
   `strDescription` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
   `strButtonName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
   `strBookingLink` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
+  `strRedirectPath` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
   `blnRecommended` tinyint NULL DEFAULT 0,
   `intMaxUsers` int NULL DEFAULT NULL,
   `intNumTestDays` int NULL DEFAULT 0,
@@ -121,10 +122,10 @@ CREATE TABLE `plans`  (
 -- ----------------------------
 -- Records of plans
 -- ----------------------------
-INSERT INTO `plans` VALUES (1, 1, 'Free', '3 users + 0 guests\r\nBest for small, personal projects', '<ul><li>1 project</li><li>3 users</li><li>60 task limit</li></ul>', 'Try free', '', 0, 3, 0, 0, 1, 0, 1);
-INSERT INTO `plans` VALUES (2, 1, 'Standard', 'Up to 10 users\r\nFor teams that need planning and collaboration features.', '<p><strong>Try free for 30 days. Cancel anytime.</strong></p><ul><li>Unlimited projects</li><li>Unlimited tasks</li><li>Add users as needed</li><li>Collaboration and planning features</li></ul>', 'Try standard', '', 1, 10, 30, 0, 0, 0, 2);
-INSERT INTO `plans` VALUES (3, 1, 'Advanced', 'Up to 30 users\r\nFor teams that need planning and collaboration, + tracking workloads by hours, and advanced project reporting. ', '<p><strong>Including all from Basic plan and:</strong></p><ul><li>Advanced reporting</li><li>Track workloads by hours</li></ul><ul></ul>', 'Try advanced', '', 0, 30, 30, 0, 0, 0, 3);
-INSERT INTO `plans` VALUES (4, 1, 'Enterprise', 'Bis business for large companies.\r\nUp to 500 users or more - pleas ask for offer', '<ul><li>Unlimited projects</li><li>Unlimited tasks</li><li>Add users as needed no limits</li><li>and much more<br></li></ul>', 'Contact', 'contact/enterprise', 0, 0, 30, 0, 0, 0, 4);
+INSERT INTO `plans` VALUES (1, 1, 'Free', '3 users + 0 guests\r\nBest for small, personal projects', '<ul><li>1 project</li><li>3 users</li><li>60 task limit</li></ul>', 'Try free', '', '', 0, 3, 0, 0, 1, 0, 1);
+INSERT INTO `plans` VALUES (2, 1, 'Standard', 'Up to 10 users\r\nFor teams that need planning and collaboration features.', '<p><strong>Try free for 30 days. Cancel anytime.</strong></p><ul><li>Unlimited projects</li><li>Unlimited tasks</li><li>Add users as needed</li><li>Collaboration and planning features</li></ul>', 'Try standard', '', '', 1, 10, 30, 0, 0, 0, 2);
+INSERT INTO `plans` VALUES (3, 1, 'Advanced', 'Up to 30 users\r\nFor teams that need planning and collaboration, + tracking workloads by hours, and advanced project reporting. ', '<p><strong>Including all from Basic plan and:</strong></p><ul><li>Advanced reporting</li><li>Track workloads by hours</li></ul><ul></ul>', 'Try advanced', '', '', 0, 30, 30, 0, 0, 0, 3);
+INSERT INTO `plans` VALUES (4, 1, 'Enterprise', 'Bis business for large companies.\r\nUp to 500 users or more - pleas ask for offer', '<ul><li>Unlimited projects</li><li>Unlimited tasks</li><li>Add users as needed no limits</li><li>and much more<br></li></ul>', 'Contact', 'contact/enterprise', '', 0, 0, 30, 0, 0, 0, 4);
 
 -- ----------------------------
 -- Table structure for plans_trans

www/Application.cfc

@@ -56,6 +56,7 @@ component displayname="Application" output="false" extends="backend.myapp.ownApp
         application.objNotifications = new backend.core.com.notifications();
         application.objSysadmin = new backend.core.com.sysadmin();
         application.objMeta = new backend.core.com.meta();
+        application.objModules = new backend.core.com.modules();
         application.objCoreUtil = new frontend.core.com.coreutility();
 
         // Save all choosable languages into a list
@@ -119,11 +120,11 @@ component displayname="Application" output="false" extends="backend.myapp.ownApp
 
         // For local development only,
         // automatically reinitialize the application without using the reinit URL parameter
-        /* if (variables.environment eq "dev") {
+        if (variables.environment eq "dev") {
             structClear(APPLICATION);
             onApplicationStart();
             application.langStruct = application.objLanguage.initLanguages();
-        } */
+        }
 
         // Check if the user is logged in as a sysadmin
         if (structKeyExists(session, "sysadmin") and session.sysadmin) {
@@ -174,6 +175,7 @@ component displayname="Application" output="false" extends="backend.myapp.ownApp
 
 
     public boolean function onRequest(required string TargetPage) {
+
         // Create SEF URL
         thiscontent = application.objGlobal.getSEF(replace(cgi.path_info,'/','','one'));
 

www/backend/core/com/book.cfc

@@ -86,7 +86,7 @@ component displayname="book" output="false" {
 
         local.modulesIncluded = arrayNew(1);
 
-        local.objPrices = new backend.core.com.prices(vat=bookingData.vat, vat_type=bookingData.vatType, isnet=bookingData.isNet);
+        local.objPrices = new backend.core.com.prices(vat=local.bookingData.vat, vat_type=local.bookingData.vatType, isnet=local.bookingData.isNet);
 
 
         if (structKeyExists(local.bookingData, "currencyID") and isNumeric(local.bookingData.currencyID)) {
@@ -183,11 +183,11 @@ component displayname="book" output="false" {
                 // Is it a free product?
                 if (local.bookingData.itsFree) {
 
-                        local.recurring = "onetime";
-                        local.status = "free";
+                    local.recurring = "onetime";
+                    local.status = "free";
 
-                        // Set the end time to a date that will probably never be reached
-                        local.endDate = dateFormat(createDate(3000, 1, 1), "yyyy-mm-dd");
+                    // Set the end time to a date that will probably never be reached
+                    local.endDate = dateFormat(createDate(3000, 1, 1), "yyyy-mm-dd");
 
                 } else {
 
@@ -199,13 +199,22 @@ component displayname="book" output="false" {
                         local.endDate = dateFormat(dateAdd("yyyy", 1, local.startDate), "yyyy-mm-dd");
                         local.priceBeforeVat = local.bookingData.priceYearly;
                     } else if (local.recurring eq "onetime") {
-                        // Set the end time to a date that will probably never be reached
-                        local.endDate = dateFormat(createDate(3000, 1, 1), "yyyy-mm-dd");
-                        if (structKeyExists(local.bookingData, "priceOnetime")) {
-                            local.priceBeforeVat = local.bookingData.priceOnetime;
+
+                        // If its a limited product (only modules)
+                        if (structKeyExists(local.bookingData, "durationDays") and local.bookingData.durationDays gt 0) {
+
+                            // Define the end date
+                            local.endDate = dateFormat(dateAdd("d", local.bookingData.durationDays, local.startDate), "yyyy-mm-dd");
+
                         } else {
-                            local.priceBeforeVat = 0;
+
+                            // Set the end time to a date that will probably never be reached
+                            local.endDate = dateFormat(createDate(3000, 1, 1), "yyyy-mm-dd");
+
                         }
+
+                        local.priceBeforeVat = local.bookingData.priceOnetime ?: 0;
+
                     }
 
                     local.amountToPay = local.objPrices.getPriceData(local.priceBeforeVat).priceAfterVAT;
@@ -276,13 +285,22 @@ component displayname="book" output="false" {
                         local.endDate = dateFormat(dateAdd("yyyy", 1, local.startDate), "yyyy-mm-dd");
                         local.priceBeforeVat = local.bookingData.priceYearly;
                     } else if (local.recurring eq "onetime") {
-                        // Set the end time to a date that will probably never be reached
-                        local.endDate = dateFormat(createDate(3000, 1, 1), "yyyy-mm-dd");
-                        if (structKeyExists(local.bookingData, "priceOnetime")) {
-                            local.priceBeforeVat = local.bookingData.priceOnetime;
+
+                        // If its a limited product (only modules)
+                        if (structKeyExists(local.bookingData, "durationDays") and local.bookingData.durationDays gt 0) {
+
+                            // Define the end date
+                            local.endDate = dateFormat(dateAdd("d", local.bookingData.durationDays, local.startDate), "yyyy-mm-dd");
+
                         } else {
-                            local.priceBeforeVat = 0;
+
+                            // Set the end time to a date that will probably never be reached
+                            local.endDate = dateFormat(createDate(3000, 1, 1), "yyyy-mm-dd");
+
                         }
+
+                        local.priceBeforeVat = local.bookingData.priceOnetime ?: 0;
+
                     }
 
                     local.amountToPay = local.objPrices.getPriceData(local.priceBeforeVat).priceAfterVAT;
@@ -391,7 +409,6 @@ component displayname="book" output="false" {
                     }
 
 
-
                 } else {
 
 

www/backend/core/com/cancel.cfc

@@ -104,25 +104,36 @@ component displayname="cancel" output="false" {
 
     }
 
-    // Delete module (only possible via SysAdmin)
+    // Withdraw module (only possible via SysAdmin)
     public boolean function delete(required numeric bookingID, required numeric moduleID, required numeric customerID) {
 
+        // First, set intBookingID in invoices to 0
         queryExecute(
             options = {datasource = application.datasource},
             params = {
                 bookingID: {type: "numeric", value: arguments.bookingID},
-                moduleID: {type: "numeric", value: arguments.moduleID},
                 customerID: {type: "numeric", value: arguments.customerID}
             },
             sql = "
+                UPDATE invoices
+                SET intBookingID = 0
+                WHERE intBookingID = :bookingID
+                AND intCustomerID = :customerID
+            "
+        )
 
+        // Then delete the booking
+        queryExecute(
+            options = {datasource = application.datasource},
+            params = {
+                bookingID: {type: "numeric", value: arguments.bookingID},
+                moduleID: {type: "numeric", value: arguments.moduleID},
+                customerID: {type: "numeric", value: arguments.customerID}
+            },
+            sql = "
                 DELETE FROM bookings
                 WHERE intCustomerID = :customerID
-                AND intModuleID = :moduleID;
-
-                DELETE FROM invoices
-                WHERE intBookingID = :bookingID;
-
+                AND intModuleID = :moduleID
             "
         )
 

www/backend/core/com/global.cfc

@@ -30,15 +30,15 @@ component displayname="globalFunctions" output="false" {
                     strMapping: {type: "nvarchar", value: local.sefString}
                 },
                 sql = "
-                    SELECT strPath, blnOnlyAdmin, blnOnlySuperAdmin, blnOnlySysAdmin, 0 as itsFrontend
+                    SELECT strPath, blnOnlyAdmin, blnOnlySuperAdmin, blnOnlySysAdmin, 0 as itsFrontend, 0 as intModuleID
                     FROM system_mappings
                     WHERE strMapping = :strMapping
                     UNION
-                    SELECT strPath, blnOnlyAdmin, blnOnlySuperAdmin, blnOnlySysAdmin, 0 as itsFrontend
+                    SELECT strPath, blnOnlyAdmin, blnOnlySuperAdmin, blnOnlySysAdmin, 0 as itsFrontend, intModuleID
                     FROM custom_mappings
                     WHERE strMapping = :strMapping
                     UNION
-                    SELECT strPath, 0, 0, 0, 1 as itsFrontend
+                    SELECT strPath, 0, 0, 0, 1 as itsFrontend, 0 as intModuleID
                     FROM frontend_mappings
                     WHERE strMapping = :strMapping
                     UNION
@@ -47,14 +47,37 @@ component displayname="globalFunctions" output="false" {
                         SELECT strPath
                         FROM frontend_mappings
                         WHERE intFrontendMappingsID = frontend_mappings_trans.intFrontendMappingsID
-                    ) as strPath, 0, 0, 0, 1 as itsFrontend
+                    ) as strPath, 0, 0, 0, 1 as itsFrontend, 0 as intModuleID
                     FROM frontend_mappings_trans
                     WHERE strMapping = :strMapping
                     LIMIT 1
                 "
             )
 
             if (local.qCheckSEF.recordCount) {
+
+                // Check if the path is coming from a module
+                if (local.qCheckSEF.intModuleID gt 0 and structKeyExists(session, "customer_id") and session.customer_id gt 0) {
+
+                    // We have to check if the module is active for the current customer
+                    local.moduleStatus = application.objModules.getModuleStatus(session.customer_id, local.qCheckSEF.intModuleID);
+
+                    // Overwrite the flag 'noaccess' generally to true (if its not a SysAdmin)
+                    if (!session.sysadmin) {
+                        local.returnStruct['noaccess'] = true;
+                    }
+
+                    // If the module is active, we can set 'noaccess' to false
+                    if (isStruct(local.moduleStatus) and !structIsEmpty(local.moduleStatus)) {
+                        if (structKeyExists(local.moduleStatus, "status")) {
+                            if (local.moduleStatus.status eq "free" or local.moduleStatus.status eq "test" or local.moduleStatus.status eq "active") {
+                                local.returnStruct['noaccess'] = false;
+                            }
+                        }
+                    }
+
+                }
+
                 if (local.qCheckSEF.itsFrontend) {
                     local.returnStruct['thisPath'] = "frontend/" & application.activeTheme & "/" & local.qCheckSEF.strPath;
                 } else {

www/backend/core/com/mappings.cfc

@@ -116,8 +116,8 @@ component displayname="mappings" output="false" {
         if (structKeyExists(arguments.mappingData, "metaDescription") and len(trim(arguments.mappingData.metaDescription))) {
             local.metaDescription = application.objGlobal.cleanUpText(arguments.mappingData.metaDescription, 3000);
         }
-        if (structKeyExists(arguments.mappingData, "metaHTML") and len(trim(arguments.mappingData.metaHTML))) {
-            local.metaHTML = application.objGlobal.cleanUpText(arguments.mappingData.metaHTML, 3000);
+        if (structKeyExists(arguments.mappingData, "htmlcodes") and len(trim(arguments.mappingData.htmlcodes))) {
+            local.metaHTML = arguments.mappingData.htmlcodes;
         }
 
         // If stringForUrlSlug is specified, we generate the URL slug from it