shopizer-uncached
Details
diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index a207961..5fe0c2b 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Tue Dec 13 12:59:24 EST 2016
+#Wed Dec 14 12:06:42 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-search
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 42d5f93..fef2b9c 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ
sm-shop/SALESMANAGER.lock.db 4(+2 -2)
diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index 48fb796..d7f832a 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
#FileLock
-#Tue Dec 13 13:02:26 EST 2016
-id=158f95987f02ea226ffd7ef82cc4c1e7d545fa5b89e
+#Wed Dec 14 12:45:30 EST 2016
+id=158fe70653288f6998dd9dac22124d12030c61fff69
method=file
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/SearchController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/SearchController.java
index a13235e..37a50d9 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/SearchController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/SearchController.java
@@ -86,10 +86,8 @@ public class SearchController {
*/
@RequestMapping(value="/services/public/search/{store}/{language}/autocomplete.json", produces="application/json;charset=UTF-8")
@ResponseBody
- public ResponseEntity<String> autocomplete(@RequestParam("q") String query, @PathVariable String store, @PathVariable final String language, Model model, HttpServletRequest request, HttpServletResponse response) {
- //public String autocomplete(@RequestParam("q") String query, @PathVariable String store, @PathVariable final String language, Model model, HttpServletRequest request, HttpServletResponse response) {
- final HttpHeaders httpHeaders= new HttpHeaders();
- httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
+ public String autocomplete(@RequestParam("q") String query, @PathVariable String store, @PathVariable final String language, Model model, HttpServletRequest request, HttpServletResponse response) {
+
MerchantStore merchantStore = (MerchantStore)request.getAttribute(Constants.MERCHANT_STORE);
if(merchantStore!=null) {
@@ -113,9 +111,8 @@ public class SearchController {
AutoCompleteRequest req = new AutoCompleteRequest(store,language);
/** formatted toJSONString because of te specific field names required in the UI **/
SearchKeywords keywords = searchService.searchForKeywords(req.getCollectionName(), req.toJSONString(query), AUTOCOMPLETE_ENTRIES_COUNT);
- //return keywords.toJSONString();
- return new ResponseEntity<String>(keywords.toJSONString(),httpHeaders,HttpStatus.OK);
- //return new ResponseEntity<String>(keywords.toJSONString(),HttpStatus.OK);
+ return keywords.toJSONString();
+
} catch (Exception e) {
LOGGER.error("Exception while autocomplete " + e);
@@ -139,7 +136,7 @@ public class SearchController {
* @return
* @throws Exception
*/
- @RequestMapping("/services/public/search/{store}/{language}/{start}/{max}/term.html")
+ @RequestMapping(value="/services/public/search/{store}/{language}/{start}/{max}/term.html", method=RequestMethod.POST)
@ResponseBody
public SearchProductList search(@RequestBody String json, @PathVariable String store, @PathVariable final String language, @PathVariable int start, @PathVariable int max, Model model, HttpServletRequest request, HttpServletResponse response) {
diff --git a/sm-shop/src/main/webapp/pages/shop/templates/bootstrap/sections/navbar.jsp b/sm-shop/src/main/webapp/pages/shop/templates/bootstrap/sections/navbar.jsp
index 4a293ea..b2e166c 100644
--- a/sm-shop/src/main/webapp/pages/shop/templates/bootstrap/sections/navbar.jsp
+++ b/sm-shop/src/main/webapp/pages/shop/templates/bootstrap/sections/navbar.jsp
@@ -36,12 +36,12 @@ $(document).ready(function() {
console.log(parsedResponse);
// do whatever processing you need here
- return parsedResponse;
+ return JSON.parse(parsedResponse);
}
},
template: [
'<p class="name">{{name}}</p>',
- '<p class="description">{{value}}</p>'
+ '<p class="description">{{description}}</p>'
].join(''),
engine: Hogan
});
diff --git a/sm-shop/src/main/webapp/pages/shop/templates/bootstrap3/sections/navbar.jsp b/sm-shop/src/main/webapp/pages/shop/templates/bootstrap3/sections/navbar.jsp
index 4d747fa..85959f3 100644
--- a/sm-shop/src/main/webapp/pages/shop/templates/bootstrap3/sections/navbar.jsp
+++ b/sm-shop/src/main/webapp/pages/shop/templates/bootstrap3/sections/navbar.jsp
@@ -39,8 +39,16 @@ $(document).ready(function() {
prefetch: '<c:out value="${requestScope.CONFIGS['defaultSearchConfigPath'][requestScope.LANGUAGE.code]}"/>',
</c:if>
</c:if>
- remote: '<c:url value="/services/public/search/${requestScope.MERCHANT_STORE.code}/${requestScope.LANGUAGE.code}/autocomplete"/>?q=%QUERY'
-
+ remote: {
+ url: '<c:url value="/services/public/search/${requestScope.MERCHANT_STORE.code}/${requestScope.LANGUAGE.code}/autocomplete.json"/>?q=%QUERY',
+ filter: function (parsedResponse) {
+ // parsedResponse is the array returned from your backend
+ console.log(parsedResponse);
+
+ // do whatever processing you need here
+ return JSON.parse(parsedResponse);
+ }
+ }
});
searchElements.initialize();
diff --git a/sm-shop/src/main/webapp/pages/shop/templates/exoticamobilia/sections/header.jsp b/sm-shop/src/main/webapp/pages/shop/templates/exoticamobilia/sections/header.jsp
index 5f1cf6f..150cfb4 100644
--- a/sm-shop/src/main/webapp/pages/shop/templates/exoticamobilia/sections/header.jsp
+++ b/sm-shop/src/main/webapp/pages/shop/templates/exoticamobilia/sections/header.jsp
@@ -52,8 +52,16 @@ $(document).ready(function() {
prefetch: '<c:out value="${requestScope.CONFIGS['defaultSearchConfigPath'][requestScope.LANGUAGE.code]}"/>',
</c:if>
</c:if>
- remote: '<c:url value="/services/public/search/${requestScope.MERCHANT_STORE.code}/${requestScope.LANGUAGE.code}/autocomplete"/>?q=%QUERY'
+ remote: {
+ url: '<c:url value="/services/public/search/${requestScope.MERCHANT_STORE.code}/${requestScope.LANGUAGE.code}/autocomplete.json"/>?q=%QUERY',
+ filter: function (parsedResponse) {
+ // parsedResponse is the array returned from your backend
+ console.log(parsedResponse);
+ // do whatever processing you need here
+ return JSON.parse(parsedResponse);
+ }
+ }
});
searchElements.initialize();
diff --git a/sm-shop/src/main/webapp/resources/js/shop-functions.js b/sm-shop/src/main/webapp/resources/js/shop-functions.js
index 338ec43..21415a3 100644
--- a/sm-shop/src/main/webapp/resources/js/shop-functions.js
+++ b/sm-shop/src/main/webapp/resources/js/shop-functions.js
@@ -81,15 +81,12 @@ function searchProducts(url,divProductsContainer,q,filter) {
$.ajax({
cache: false,
type:"POST",
- dataType:"json",
+ //dataType:"json",
url:url,
data:query,
- contentType:"application/json;charset=UTF-8",
+ //contentType:"application/json;charset=UTF-8",
success: function(productList) {
-
callBackSearchProducts(productList);
-
-
},
error: function(jqXHR,textStatus,errorThrown) {
$(divProductsContainer).hideLoading();
diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index fd116bb..b4d79ca 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Tue Dec 13 12:59:27 EST 2016
+#Wed Dec 14 12:06:44 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-shop