Merge pull request #541 from PAWECOGmbH/development

From dev to staging

.gitignore

@@ -2,7 +2,7 @@
 www/test.*
 
 ### Userdata folder ###
-www/userdata/**
+www/userdata
 
 ### Config files ###
 config.cfm

config/db/dev/create-notifications.sql

@@ -3,27 +3,27 @@ SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
 INSERT INTO notifications (intCustomerID, intUserID, dtmCreated, strTitleVar, strDescrVar, strLink, strLinkTextVar, dtmRead)
-VALUES (1, 1, NOW(), 'txtInformation', 'errSystemStoppedFixProblem', 'account-settings/company', 'btnActivate', NULL);
+VALUES (1, 1, NOW(), 'txtInformation', 'errSystemStoppedFixProblem', '/account-settings/company', 'btnActivate', NULL);
 
 INSERT INTO notifications (intCustomerID, intUserID, dtmCreated, strTitleVar, strDescrVar, strLink, strLinkTextVar, dtmRead)
-VALUES (1, 1, NOW(), 'formInvoiceInfo', 'errSystemStoppedFixProblem', 'account-settings/tenants', 'btnActivate', NULL);
+VALUES (1, 1, NOW(), 'formInvoiceInfo', 'errSystemStoppedFixProblem', '/account-settings/tenants', 'btnActivate', NULL);
 
 INSERT INTO notifications (intCustomerID, intUserID, dtmCreated, strTitleVar, strDescrVar, strLink, strLinkTextVar, dtmRead)
-VALUES (1, 1, NOW(), 'txtNetwork', 'errSystemStoppedFixProblem', 'account-settings/users', 'btnActivate', NULL);
+VALUES (1, 1, NOW(), 'txtNetwork', 'errSystemStoppedFixProblem', '/account-settings/users', 'btnActivate', NULL);
 
 INSERT INTO notifications (intCustomerID, intUserID, dtmCreated, strTitleVar, strDescrVar, strLink, strLinkTextVar, dtmRead)
-VALUES (1, 1, NOW(), 'titTimezone', 'errSystemStoppedFixProblem', 'account-settings/reset-password', 'btnActivate', NULL);
+VALUES (1, 1, NOW(), 'titTimezone', 'errSystemStoppedFixProblem', '/account-settings/reset-password', 'btnActivate', NULL);
 
 INSERT INTO notifications (intCustomerID, intUserID, dtmCreated, strTitleVar, strDescrVar, strLink, strLinkTextVar, dtmRead)
-VALUES (1, 1, NOW(), 'titDowngrade', 'errSystemStoppedFixProblem', 'account-settings', 'btnActivate', NULL);
+VALUES (1, 1, NOW(), 'titDowngrade', 'errSystemStoppedFixProblem', '/account-settings', 'btnActivate', NULL);
 
 INSERT INTO notifications (intCustomerID, intUserID, dtmCreated, strTitleVar, strDescrVar, strLink, strLinkTextVar, dtmRead)
-VALUES (1, 1, NOW(), 'titModule', 'errSystemStoppedFixProblem', 'account-settings/modules', 'btnActivate', NULL);
+VALUES (1, 1, NOW(), 'titModule', 'errSystemStoppedFixProblem', '/account-settings/modules', 'btnActivate', NULL);
 
 INSERT INTO notifications (intCustomerID, intUserID, dtmCreated, strTitleVar, strDescrVar, strLink, strLinkTextVar, dtmRead)
-VALUES (1, 1, NOW(), 'titNotifications', 'errSystemStoppedFixProblem', 'account-settings', 'btnActivate', NULL);
+VALUES (1, 1, NOW(), 'titNotifications', 'errSystemStoppedFixProblem', '/account-settings', 'btnActivate', NULL);
 
 INSERT INTO notifications (intCustomerID, intUserID, dtmCreated, strTitleVar, strDescrVar, strLink, strLinkTextVar, dtmRead)
-VALUES (1, 1, NOW(), 'titStatus', 'errSystemStoppedFixProblem', 'account-settings', 'btnActivate', NULL);
+VALUES (1, 1, NOW(), 'titStatus', 'errSystemStoppedFixProblem', '/account-settings', 'btnActivate', NULL);
 
 SET FOREIGN_KEY_CHECKS = 1;

www/Application.cfc

@@ -19,7 +19,7 @@ component displayname="Application" output="false" extends="backend.myapp.ownApp
 
     // Load java files
     this.javaSettings = {
-        loadPaths = [expandPath("/dist/java")],
+        loadPaths = [expandPath("/assets/java")],
         reloadOnChange = true
     };
 

www/backend/core/com/invoices.cfc

@@ -1627,7 +1627,7 @@ component displayname="invoices" output="false" {
             local.qrDataSet['qrSize'] = "300";
 
             // Path to the swiss cross logo (if desired)
-            local.qrDataSet['qrLogo'] = "/dist/img/ch-cross.png";
+            local.qrDataSet['qrLogo'] = "/assets/img/ch-cross.png";
 
             // Set all the needed data
             local.qrDataSet['billerIBAN'] = application.objSysAdmin.getSystemSetting('settingIBANnumber').strDefaultValue;

www/backend/core/com/layout.cfc

@@ -20,7 +20,7 @@ component displayname="layout" output="false" {
         local.struct['layoutDivEnd'] = '';
         local.struct['horizontal'] = '';
 
-    
+
         switch(arguments.layoutValue){
             case "horizontal":
                 local.struct['layoutString'] = 'horizontal';
@@ -30,7 +30,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row order-md-last';
                 local.struct['layoutNav'] = 'navbar navbar-light';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-xl';
@@ -45,7 +45,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row order-md-last';
                 local.struct['layoutNav'] = 'navbar navbar-light';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-xl';
@@ -59,7 +59,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row d-lg-none';
                 local.struct['layoutClass'] = 'class="d-md-none"';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-xl';
@@ -73,7 +73,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row d-lg-none';
                 local.struct['layoutClass'] = 'class="d-md-none"';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo-withe.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo-withe.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-xl';
@@ -87,7 +87,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row d-lg-none';
                 local.struct['layoutClass'] = 'class="d-md-none"';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-xl';
@@ -101,7 +101,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row order-md-last';
                 local.struct['layoutNav'] = 'navbar navbar-light';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-xl';
@@ -115,7 +115,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row d-lg-none';
                 local.struct['layoutClass'] = 'class="d-md-none"';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo-withe.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo-withe.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-xl';
@@ -129,7 +129,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row order-md-last';
                 local.struct['layoutNav'] = 'navbar navbar-light';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo-withe.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo-withe.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-xl';
@@ -143,7 +143,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row order-md-last';
                 local.struct['layoutNav'] = 'navbar navbar-light';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-xl';
@@ -159,7 +159,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row order-md-last';
                 local.struct['layoutNav'] = 'navbar navbar-light';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo-withe.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo-withe.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none text-white';
                 local.struct['layoutPageFooter'] = 'container-xl';
@@ -173,7 +173,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row order-md-last';
                 local.struct['layoutNav'] = 'navbar navbar-light';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo.svg';
                 local.struct['layoutPage'] = 'container-fluid';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-fluid';
@@ -187,7 +187,7 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row d-lg-none';
                 local.struct['layoutClass'] = 'class="d-md-none"';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo-withe.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo-withe.svg';
                 local.struct['layoutPage'] = 'container-fluid';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-fluid';
@@ -201,14 +201,14 @@ component displayname="layout" output="false" {
                 local.struct['layoutTitel'] = 'navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3';
                 local.struct['layoutDiv'] = 'navbar-nav flex-row order-md-last';
                 local.struct['layoutNav'] = 'navbar navbar-light';
-                local.struct['layoutLogo'] = '#application.mainURL#/dist/img/logo.svg';
+                local.struct['layoutLogo'] = '/assets/img/logo.svg';
                 local.struct['layoutPage'] = 'container-xl';
                 local.struct['layoutPageHeader'] = 'page-header d-print-none';
                 local.struct['layoutPageFooter'] = 'container-xl';
                 local.struct['horizontal'] = 'checked';
                 break;
         }
-        
+
         return local.struct;
     }
 }

www/backend/core/com/user.cfc

@@ -696,7 +696,7 @@ component displayname="user" output="false" {
                 UUID: {type: "varchar", value: arguments.mfaUUID}
             },
             sql = "
-                SELECT intmfaCode, dtmMfaDateTime, intUserID
+                SELECT intmfaCode, dtmMfaDateTime, intUserID, intCustomerID
                 FROM users
                 WHERE strUUID = :UUID
             "
@@ -713,7 +713,8 @@ component displayname="user" output="false" {
                 local.argsReturnValue['uuid'] = arguments.mfaUUID;
                 local.argsReturnValue['success'] = false;
             } else {
-                local.argsReturnValue['userid'] = local.qGetUserMfa.intUserID;
+                local.argsReturnValue['userID'] = local.qGetUserMfa.intUserID;
+                local.argsReturnValue['customerID'] = local.qGetUserMfa.intCustomerID;
                 local.argsReturnValue['success'] = true;
             }
 

www/backend/core/views/css.cfm

@@ -1,10 +1,20 @@
-<link rel="stylesheet" type="text/css" href="/dist/css/dropify.min.css" />
+<!--- Main Tabler CSS --->
 <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta17/dist/css/tabler.min.css" />
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta17/dist/css/tabler-flags.min.css" />
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta17/dist/css/tabler-payments.min.css" />
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta17/dist/css/tabler-vendors.min.css" />
-<link rel="stylesheet" type="text/css" href="/dist/fontawesome/css/all.css" />
-<link rel="stylesheet" type="text/css" href="/dist/css/sweetalert.css" />
-<link rel="stylesheet" type="text/css" href="/dist//trumbowyg/ui/trumbowyg.min.css" />
-<link rel="stylesheet" type="text/css" href="/dist/css/custom.css" />
+
+<!--- Dropify --->
+<link rel="stylesheet" type="text/css" href="/backend/dist/css/dropify.min.css" />
+
+<!--- Fontawesome Plugin --->
+<link rel="stylesheet" type="text/css" href="/backend/dist/fontawesome/css/all.css" />
+
+<!--- Sweetalert --->
+<link rel="stylesheet" type="text/css" href="/backend/dist/css/sweetalert.css" />
+
+<!--- Trumbowyg Plugin --->
+<link rel="stylesheet" type="text/css" href="/backend/dist/trumbowyg/ui/trumbowyg.min.css" />
+
+<!--- Customized CSS --->
+<link rel="stylesheet" type="text/css" href="/backend/dist/css/backend.css" />
+
+<!--- Dynamic CSS for Primary and Secondary Button color --->
 <link rel="stylesheet" type="text/css" href="/backend/core/views/color.cfm" />

www/backend/core/views/customer/payment.cfm

@@ -86,7 +86,7 @@
                                 <cfloop query="getWebhook">
                                     <div class="row align-items-center mb-4">
                                         <div class="col-lg-2 mb-2">
-                                            <img src="/dist/img/payments/card_#lcase(replace(getWebhook.strPaymentBrand,' ', '-', 'all'))#.svg" class="avatar-lg">
+                                            <img src="/assets/img/payments/card_#lcase(replace(getWebhook.strPaymentBrand,' ', '-', 'all'))#.svg" class="avatar-lg">
                                         </div>
                                         <div class="col-lg-2 mb-3">
                                             <div class="font-weight-medium">#getWebhook.strPaymentBrand#</div>

www/backend/core/views/head.cfm

@@ -15,16 +15,16 @@
 
 <!--- Display for sysAdmin --->
 <cfif structKeyExists(session, "sysadmin") and session.sysadmin and !findNoCase("frontend", thiscontent.thisPath)>
-    <div class="text-center col-lg-12 bg-red py-2"><b>SysAdmin</b> (the sysadmin part is only available in english)</div>
+    <div class="text-center col-lg-12 bg-red py-2 text-white"><b>SysAdmin</b> (the sysadmin part is only available in english)</div>
 </cfif>
 
 <!--- Test plan running? --->
 <cfif structKeyExists(session, "currentPlan") and session.currentPlan.recurring eq "test" and !findNoCase("frontend", thiscontent.thisPath)>
     <cfoutput>
     <cfif dateformat(now(), 'yyyy-mm-dd') lte dateformat(session.currentPlan.endDate, 'yyyy-mm-dd')>
-        <div class="text-center col-lg-12 bg-blue py-2">#getTrans('txtTestUntil')#: #lsDateFormat(getTime.utc2local(utcDate=session.currentPlan.endDate))#</div>
+        <div class="text-center col-lg-12 bg-blue py-2 text-white">#getTrans('txtTestUntil')#: #lsDateFormat(getTime.utc2local(utcDate=session.currentPlan.endDate))#</div>
     <cfelse>
-        <div class="text-center col-lg-12 bg-red py-2">#getTrans('txtTestTimeExpired')#</div>
+        <div class="text-center col-lg-12 bg-red py-2 text-white">#getTrans('txtTestTimeExpired')#</div>
     </cfif>
     </cfoutput>
 </cfif>

www/backend/core/views/header.cfm

@@ -1,6 +1,6 @@
 <cfscript>
     usersImgStruct = application.objUser.getUserImage(session.user_id);
-    getSysadminData = application.objSysadmin.getSysAdminData(); 
+    getSysadminData = application.objSysadmin.getSysAdminData();
 </cfscript>
 
 <cfoutput>
@@ -21,7 +21,7 @@
             <h1 class="#getLayout.layoutTitel#">
                 <cfif len(trim(getSysadminData.logo))>
                     <a href="#application.mainURL#/dashboard" class="navbar-brand navbar-brand-autodark">
-                        <img src="#application.mainURL#/userdata/images/logos/#getSysadminData.logo#" class="navbar-brand-image" alt="Logo">
+                        <img src="/userdata/images/logos/#getSysadminData.logo#" class="navbar-brand-image" alt="Logo">
                     </a>
                 <cfelse>
                     <a href="#application.mainURL#/dashboard">

www/backend/core/views/invoices/invoice.cfm

@@ -78,9 +78,9 @@
                         </div>
                         <div class="col-12 mt-5">
                             <cfif len(trim(sysAdminData.logo))>
-                                <img alt="Logo" src="#application.mainURL#/userdata/images/logos/#sysAdminData.logo#" style="display: block; max-width: 250px; float: right;" border="0">
+                                <img alt="Logo" src="/userdata/images/logos/#sysAdminData.logo#" style="display: block; max-width: 250px; float: right;" border="0">
                             <cfelse>
-                                <img alt="Logo" src="#application.mainURL#/dist/img/logo.png" style="display: block; max-width: 250px; float: right;" border="0">
+                                <img alt="Logo" src="/assets/img/logo.png" style="display: block; max-width: 250px; float: right;" border="0">
                             </cfif>
                         </div>
                         <div class="col-6">
@@ -210,6 +210,6 @@
             </div>
         </div>
     </cfoutput>
-    
+
 
 </div>