Merge pull request #677 from PAWECOGmbH/development

Dev to Staging

Author: ptruessel

www/backend/core/com/sysadmin.cfc

@@ -332,11 +332,35 @@ component displayname="sysadmin" output="false" {
 
         local.entries = 10;
 
+        // Sorting logic dependent on arguments.sort
+        switch (arguments.sort){
+            case "strCompanyName ASC":
+                local.orderClause = "
+                    CASE
+                        WHEN customers.strCompanyName IS NULL OR customers.strCompanyName = '' THEN 1
+                        ELSE 0
+                    END,
+                    customers.strCompanyName ASC";
+                break;
+
+                case "strCompanyName DESC":
+                    local.orderClause = "
+                        CASE
+                            WHEN customers.strCompanyName IS NULL OR customers.strCompanyName = '' THEN 1
+                            ELSE 0
+                        END,
+                        customers.strCompanyName DESC";
+                    break;
+
+            default:
+                local.orderClause = arguments.sort;
+        }
+
         local.qCustomers = queryExecute(
             options = {datasource = application.datasource},
             sql = "
                 SELECT DISTINCT customers.intCustomerID, customers.strCompanyName, customers.strContactPerson,
-                customers.strCity, customers.strEmail, customers.strLogo, customers.strPhone
+                customers.strCity, customers.strEmail, customers.strLogo, customers.strPhone, customers.dtmInsertDate
                 FROM customers
 
                 INNER JOIN users
@@ -353,31 +377,58 @@ component displayname="sysadmin" output="false" {
                     customers.strEmail
                 )
                 #arguments.search#
-                ORDER BY #arguments.sort#
+                ORDER BY #local.orderClause#
                 LIMIT #arguments.start#, #local.entries#
             "
         );
 
         return local.qCustomers;
+
     }
 
     public query function getCustomer(required numeric start, required string sort){
 
         local.entries = 10;
 
+        // Sorting logic dependent on arguments.sort
+        switch (arguments.sort){
+            case "strCompanyName ASC":
+                local.orderClause = "
+                    CASE
+                        WHEN customers.strCompanyName IS NULL OR customers.strCompanyName = '' THEN 1
+                        ELSE 0
+                    END,
+                    customers.strCompanyName ASC";
+                break;
+
+                case "strCompanyName DESC":
+                    local.orderClause = "
+                        CASE
+                            WHEN customers.strCompanyName IS NULL OR customers.strCompanyName = '' THEN 1
+                            ELSE 0
+                        END,
+                        customers.strCompanyName DESC";
+                    break;
+
+            default:
+                local.orderClause = arguments.sort;
+        }
+
         local.qCustomers = queryExecute(
             options = {datasource = application.datasource},
             sql = "
                 SELECT customers.*, countries.strCountryName
                 FROM customers
-                LEFT JOIN countries ON countries.intCountryID = customers.intCountryID
+                LEFT JOIN countries
+                ON countries.intCountryID = customers.intCountryID
                 WHERE customers.blnActive = 1
-                ORDER BY #arguments.sort#
+                ORDER BY #local.orderClause#
                 LIMIT #arguments.start#, #local.entries#
             "
         );
 
         return local.qCustomers;
+
     }
 
     public query function getTotalInvoicesSearch(required string search, required string term, required numeric start, required string status, required string sort){

www/backend/core/views/sysadmin/customers.cfm

@@ -1,6 +1,6 @@
 <cfscript>
     param name="session.cust_search" default="" type="string";
-    param name="session.cust_sort" default="intPrio" type="string";
+    param name="session.cust_sort" default="strCompanyName ASC" type="string";
     param name="session.customers_page" default=1 type="numeric";
 
     objSysadmin = new backend.core.com.sysadmin();
@@ -111,7 +111,7 @@
                             <div class="col-lg-4">
                                 <label class="form-label">Search for customer:</label>
                                 <div class="input-group mb-2">
-                                    <input type="text" name="search" class="form-control" minlength="1" placeholder="Search for…">
+                                    <input type="text" name="search" class="form-control" minlength="3" placeholder="Search for…">
                                     <button class="btn bg-green-lt" type="submit">Go!</button>
                                     <cfif len(trim(searchTerm))>
                                         <button class="btn bg-red-lt" name="delete" type="submit" data-bs-toggle="tooltip" data-bs-placement="top" title="Delete search">
@@ -176,7 +176,7 @@
                                                                     <cfif len(trim(qCustomers.strCompanyName))>
                                                                         <div class="font-weight-medium">#qCustomers.strCompanyName# <cfif qCustomers.intCustomerID eq session.customer_id>(SysAdmin)</cfif></div>
                                                                     <cfelse>
-                                                                        <div class="font-weight-medium">#qCustomers.strContactPerson# (Private)</div>
+                                                                        <div class="font-weight-medium">-</div>
                                                                     </cfif>
                                                                 </div>
                                                             </a>