Merge branch 'master' into development_tri/implementasi_raja_ongkir

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx

2 files changed, 17 insertions, 1 deletions

diff --git a/src/core/api/searchSpellApi.js b/src/core/api/searchSpellApi.js
new file mode 100644
index 00000000..4794c3e1
--- /dev/null
+++ b/src/core/api/searchSpellApi.js
@@ -0,0 +1,14 @@
+import axios from 'axios'
+
+const searchSpellApi = async ({ query }) => {
+  const dataSearchSpell = await axios(
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/spell?q=${query.trim()}`
+  )
+  return dataSearchSpell
+}
+
+searchSpellApi.defaultProps = {
+  query: ''
+}
+
+export default searchSpellApi
diff --git a/src/core/api/searchSuggestApi.js b/src/core/api/searchSuggestApi.js
index 3dabfbd6..c65405e3 100644
--- a/src/core/api/searchSuggestApi.js
+++ b/src/core/api/searchSuggestApi.js
@@ -1,8 +1,10 @@
 import axios from 'axios'
 
 const searchSuggestApi = async ({ query }) => {
+  query = query.replace('&', '').trim()
+  if (!query) return {}
   const dataSearchSuggest = await axios(
-    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/suggest?q=${query.trim()}`
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/suggest?q=${query}`
   )
   return dataSearchSuggest
 }