Merge pull request #641 from PAWECOGmbH/staging

Staging to production

Author: ptruessel

.gitignore

@@ -10,4 +10,7 @@ config.cfm
 
 ### Log files ###
 www/logs
-.history
+.history
+
+### NGINX files ###
+config/nginx

compose-dev.yml

@@ -12,6 +12,7 @@ services:
     volumes:
       - ./www:/var/www
       - ./config/nginx/conf.d:/etc/nginx/conf.d
+      - ./config/nginx/custom.conf:/etc/nginx/custom.conf
       - userdata_volume:/var/www/userdata
     networks:
       - saaster_net

compose.yml

@@ -12,6 +12,7 @@ services:
     volumes:
       - ./www:/var/www
       - ./config/nginx/conf.d:/etc/nginx/conf.d
+      - ./config/nginx/custom.conf:/etc/nginx/custom.conf
       - userdata_volume:/var/www/userdata
     networks:
       - npm_network

config/nginx/conf.d/default.conf config/example.base.confconfig/nginx/conf.d/default.conf renamed to config/example.base.conf

@@ -36,11 +36,13 @@ server {
     }
 
     location @lucee {
+
         proxy_pass http://tomcat_backend;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
+
     }
 
 }

config/example.custom.conf

@@ -42,8 +42,12 @@ mv config/example.env .env
 ```
 Update the ```.env``` file with your configuration. You can also adopt the suggestions for the local environment.<br><br>
 
+<b>5. Copy the NGINX base settings</b><br>
+```
+mv config/example.base.conf config/nginx/base.conf
+```
 
-<b>5. Set up the application configuration</b><br>
+<b>6. Set up the application configuration</b><br>
 Copy the example configuration file and make any necessary changes:
 ```
 mv config/example.config_dev.cfm www/config.cfm
@@ -54,24 +58,24 @@ Note: If you change the ```config.cfm``` file after the first start of the appli
 
 <br>
 
-<b>6. Start the containers</b><br>
+<b>7. Start the containers</b><br>
 Use Docker Compose to start the development environment:
 ```
 docker compose -f compose-dev.yml up
 ```
 
-<b>7. Configure Lucee</b><br>
+<b>8. Configure Lucee</b><br>
 Access the Lucee admin interface:
 
 + <b>URL:</b> ```http://localhost:8080/lucee/admin/server.cfm```
 + <b>Steps:</b>
-  + Set up the database connection (<b>important:</b> Make sure to enable 'Allow Multiple Queries.') 
+  + Set up the database connection (<b>important:</b> Make sure to enable 'Allow Multiple Queries.')
   + Configure SMTP (you can use Inbucket for local email handling).
   + Adjust any additional settings required for your development setup.
- 
+
 <br>
 
-<b>8. Set up Saaster</b><br>
+<b>9. Set up Saaster</b><br>
 Run the setup script to initialize Saaster:
 
 + <b>URL:</b> ```http://localhost:8080/setup/index.cfm```
@@ -147,7 +151,7 @@ We welcome contributions from developers to help improve Saaster. Whether it's f
    	Implement your changes and commit them with a clear and concise commit message:<br>
   	```git add .```<br>
   	```git commit -m "Add feature description"```
-  	
+
 5.	<b>Push your branch</b><br>
 	Push your branch to your forked repository:<br>
 	```git push origin feature/your-feature-name```
@@ -177,12 +181,3 @@ For more information or if you're unsure about something, feel free to open an i
 - [taffy](https://github.com/atuttle/Taffy)
 
 
-
-
-
-
-
-
-
-
-

config/nginx/conf.d/custom.conf

@@ -320,10 +320,10 @@ component displayname="plans" output="false" {
 
             "
         )
-        
+
         local.arrPlan = arrayNew(1);
 
-        if (local.getPlan.recordCount) {
+        if (local.getPlan.recordCount and local.getPlan.intPlanID gt 0) {
 
             cfloop( query = local.getPlan ) {
 
@@ -419,7 +419,7 @@ component displayname="plans" output="false" {
 
                 // Get all the included modules of the current plan
                 structAppend(local.structPlan, getModulesIncluded(local.getPlan.intPlanID));
-                
+
 
                 local.objPrices = new backend.core.com.prices(
                     vat=local.getPlan.decVat,
@@ -759,6 +759,11 @@ component displayname="plans" output="false" {
                 // Get all the included modules of the current plan
                 structAppend(local.planStruct, getModulesIncluded(local.qCurrentPlan.intPlanID));
 
+            } else {
+
+                // If we do not have any plans, set maxUsers to 99999 (unlimited)
+                local.planStruct['maxUsers'] = 99999;
+
             }
 
         }

readme.md

@@ -17,7 +17,7 @@
         param name="form.billing_address" default="";
         param name="form.billing_info" default="";
 
-        // Check whether the email is valid 
+        // Check whether the email is valid
         checkEmail = application.objGlobal.checkEmail(form.email);
         if (!checkEmail) {
             getAlert('alertEnterEmail', 'warning');
@@ -45,6 +45,7 @@
 
     }
 
+    // Edit user
     if (structKeyExists(form, "edit_user")) {
         param name="form.customer_id" default="";
         param name="form.user_id " default="";
@@ -115,4 +116,116 @@
 
         location url="#application.mainURL#/sysadmin/customers/details/#form.customer_id#" addtoken="false";
     }
+
+    // Add new customer
+    if (structKeyExists(form, "add_customer")) {
+
+        customerStruct = {};
+        customerStruct['strCompanyName'] = form.company;
+        customerStruct['strFirstName'] = form.first_name;
+        customerStruct['strLastName'] = form.last_name;
+        customerStruct['strEmail'] = form.email;
+        customerStruct['strLanguage'] = form.language;
+        customerStruct['password'] = form.password;
+
+        checkEmail = application.objGlobal.checkEmail(form.email);
+
+        if (checkEmail) {
+
+            // Check for already registered email
+            qCheckDouble = queryExecute(
+                options = {datasource = application.datasource},
+                params = {
+                    strEmail = {type: "nvarchar", value: form.email}
+                },
+                sql = "
+                    SELECT intUserID
+                    FROM users
+                    WHERE strEmail = :strEmail
+                "
+            );
+
+            if (qCheckDouble.recordCount) {
+                getAlert('This e-mail address is already in use!', 'warning');
+                location url="#application.mainURL#/sysadmin/customers" addtoken="false";
+            }
+
+            // Hash and salt the password
+            hashedStruct = application.objGlobal.generateHash(form.password);
+            customerStruct['hash'] = hashedStruct.thisHash;
+            customerStruct['salt'] = hashedStruct.thisSalt;
+
+            // Save the customer into the db
+            objRegister = new frontend.core.com.register();
+            insertCustomer = objRegister.insertCustomer(customerStruct);
+            if (insertCustomer.success) {
+
+                qNewUser = queryExecute(
+                    options = {datasource = application.datasource},
+                    params = {
+                        strEmail = {type: "nvarchar", value: form.email}
+                    },
+                    sql = "
+                        SELECT intCustomerID
+                        FROM users
+                        WHERE strEmail = :strEmail
+                    "
+                );
+
+                newCustomerID = qNewUser.intCustomerID;
+
+                // Update country or timezone
+                if (structKeyExists(form, "countryID") and isNumeric(form.countryID)) {
+
+                    queryExecute(
+                        options = {datasource = application.datasource},
+                        params = {
+                            intCustomerID: {type: "numeric", value: newCustomerID},
+                            intCountryID: {type: "numeric", value: form.countryID}
+                        },
+                        sql = "
+                            UPDATE customers
+                            SET intCountryID = :intCountryID
+                            WHERE intCustomerID = :intCustomerID
+                        "
+                    )
+
+                } else {
+
+                    queryExecute(
+                        options = {datasource = application.datasource},
+                        params = {
+                            intCustomerID: {type: "numeric", value: newCustomerID},
+                            intTimeZoneID: {type: "numeric", value: form.timezoneID}
+                        },
+                        sql = "
+                            UPDATE customers
+                            SET intTimeZoneID = :intTimeZoneID
+                            WHERE intCustomerID = :intCustomerID
+                        "
+                    )
+
+                }
+
+                getAlert('The new customer has been added.', 'success');
+
+
+            } else {
+
+                getAlert(insertCustomer.message, 'danger');
+
+            }
+
+            location url="#application.mainURL#/sysadmin/customers" addtoken="false";
+
+
+
+        }
+
+
+
+    }
+
+
+
 </cfscript>