fix MySql strict broken ecommerce search and bs4/bs5 styling

Author: dleffler

framework/core/forms/controls/autocompletecontrol.php

@@ -28,7 +28,8 @@
 class autocompletecontrol extends formcontrol {
 
     var $placeholder = "";
-    var $wwidth = "320px";
+    var $wwidth = "320px";  // widget/input width
+    var $lwidth = "320px";  // dropdown list width
     var $controller = "";   // controller to call
     var $action = "";       // action to call
     var $searchmodel = "";  // model to search
@@ -44,7 +45,11 @@ function toHTML($label,$name) {
 	}
 
     function controlToHTML($name,$label) {
-        $html = '<div class="yui3-skin-sam" style="z-index: 999;">';
+        $html = "";
+        if (bs4() || bs5()) {
+            $html .= "<div class=\"col\">";
+        }
+        $html .= '<div class="yui3-skin-sam" style="z-index: 999;">';
         $ac_input = new genericcontrol();
         $ac_input->type = 'search';
         $ac_input->id = $name  . '_autoc';
@@ -53,12 +58,15 @@ function controlToHTML($name,$label) {
         $ac_input->placeholder = $this->placeholder;
         $html .= $ac_input->toHTML(null, "$name");
         $html .= '</div>';
+        if (bs4() || bs5()) {
+            $html .= '</div>';
+        }
 
         $script = "
         YUI(EXPONENT.YUI3_CONFIG).use('*', function (Y) {
             var autocomplete = Y.one('#".$name."_autoc');
             autocomplete.plug(Y.Plugin.AutoComplete, {
-                width:'".$this->wwidth."',
+                width:'".$this->lwidth."',
                 maxResults: ".$this->maxresults.",
                 resultListLocator: 'data',  // 'data' field of json response
                 resultTextLocator: 'title', // the field to place in the input after selection

framework/modules/ecommerce/controllers/storeController.php

@@ -1790,7 +1790,7 @@ public function search() {
         $search_type = ecomconfig::getConfig('ecom_search_results');
 
         // look for term in full text search
-        $sql = "SELECT DISTINCT(p.id) AS id, p.title, model, sef_url, f.id AS fileid, MATCH (p.title,p.model,p.body) AGAINST ('" . $this->params['query'] . "*' IN BOOLEAN MODE) AS score ";
+        $sql = "SELECT DISTINCT(p.id) AS id, ANY_VALUE(p.title) as title, ANY_VALUE(model) as model, ANY_VALUE(sef_url) as sef_url, ANY_VALUE(f.id) AS fileid, MATCH (p.title,p.model,p.body) AGAINST ('" . $this->params['query'] . "*' IN BOOLEAN MODE) AS score ";
         $sql .= "  FROM " . $db->tableStmt('product') . " AS p LEFT JOIN " .
             $db->tableStmt('content_expFiles') . " AS cef ON p.id=cef.content_id AND cef.content_type IN ('product','eventregistration','donation','giftcard') AND cef.subtype='mainimage' LEFT JOIN " . $db->tableStmt('expFiles') .
             " AS f ON cef.expFiles_id = f.id WHERE ";
@@ -1808,7 +1808,7 @@ public function search() {
         }
 
         // look for specific term in fields
-        $sql = "SELECT DISTINCT(p.id) AS id, p.title, model, sef_url, f.id AS fileid  FROM " . $db->tableStmt('product') . " AS p LEFT JOIN " .
+        $sql = "SELECT DISTINCT(p.id) AS id, ANY_VALUE(p.title) as title, ANY_VALUE(model) as model, ANY_VALUE(sef_url) as sef_url, ANY_VALUE(f.id) AS fileid  FROM " . $db->tableStmt('product') . " AS p LEFT JOIN " .
             $db->tableStmt('content_expFiles') . " AS cef ON p.id=cef.content_id AND cef.content_type IN ('product','eventregistration','donation','giftcard') AND cef.subtype='mainimage' LEFT JOIN " . $db->tableStmt('expFiles') .
             " AS f ON cef.expFiles_id = f.id WHERE ";
         if (!($user->isAdmin())) $sql .= '(p.active_type=0 OR p.active_type IS NULL OR p.active_type=1) AND ';
@@ -1825,7 +1825,7 @@ public function search() {
         }
 
         // look for begins with term in fields
-        $sql = "SELECT DISTINCT(p.id) AS id, p.title, model, sef_url, f.id AS fileid  FROM " . $db->tableStmt('product') . " AS p LEFT JOIN " .
+        $sql = "SELECT DISTINCT(p.id) AS id, ANY_VALUE(p.title) as title, ANY_VALUE(model) as model, ANY_VALUE(sef_url) as sef_url, ANY_VALUE(f.id) AS fileid  FROM " . $db->tableStmt('product') . " AS p LEFT JOIN " .
             $db->tableStmt('content_expFiles') . " AS cef ON p.id=cef.content_id AND cef.content_type IN ('product','eventregistration','donation','giftcard') AND cef.subtype='mainimage' LEFT JOIN " . $db->tableStmt('expFiles') .
             " AS f ON cef.expFiles_id = f.id WHERE ";
         if (!($user->isAdmin())) $sql .= '(p.active_type=0 OR p.active_type IS NULL OR p.active_type=1) AND ';
@@ -1859,7 +1859,8 @@ function sortSearch($a, $b) {
                 }
             }
         }
-        usort($res, 'sortSearch');
+        if (!empty($res))
+            usort($res, 'sortSearch');
 
         $ar = new expAjaxReply(200, gt('Here\'s the items you wanted'), $res);
         $ar->send();

framework/modules/ecommerce/views/store/ecomSearch.tpl

@@ -56,6 +56,6 @@
 
 <div class="module ecommerce ecom-search">
     {form id="autocompsearch" controller=search action=search}
-        {control type="autocomplete" controller="store" action="search" name="search_string" label=$moduletitle placeholder="Search title or SKU to locate item" schema="title,id,sef_url,expFile,model" searchmodel="product" searchoncol="title,model" maxresults=30 wwidth="80%" jsinject=$callbacks}
+        {control type="autocomplete" controller="store" action="search" name="search_string" label=$moduletitle placeholder="Search title or SKU to locate item" schema="title,id,sef_url,expFile,model" searchmodel="product" searchoncol="title,model" maxresults=30 wwidth="80%" lwidth="100%" jsinject=$callbacks}
     {/form}
 </div>