Merge branch 'release' into feature/step_approval

# Conflicts:
#	src-migrate/modules/product-detail/components/PriceAction.tsx
#	src/lib/transaction/components/Transaction.jsx
#	src/pages/index.jsx

1 files changed, 23 insertions, 3 deletions

diff --git a/next.config.js b/next.config.js
index 8e1ceda3..12aa2f3e 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,9 +1,9 @@
 /** @type {import('next').NextConfig} */
 const withPWA = require('next-pwa')({
   dest: 'public',
-    register: true,
-    disable: process.env.NODE_ENV === 'development',
-    skipWaiting: true
+  register: true,
+  disable: process.env.NODE_ENV === 'development',
+  skipWaiting: true
 })
 
 const nextConfig = {
@@ -30,6 +30,26 @@ const nextConfig = {
         hostname: 'erp.indoteknik.com'
       }
     ]
+  },
+  async rewrites() {
+    return [
+      {
+        source: '/solr/:path*',
+        destination: 'http://34.101.189.218:8983/solr/:path*' // Proxy to Solr
+      }
+    ]
+  },
+  async headers() {
+    return [
+      {
+        source: '/solr/:path*',
+        headers: [
+          { key: 'Access-Control-Allow-Origin', value: '*' },
+          { key: 'Access-Control-Allow-Methods', value: 'GET, POST, OPTIONS, PUT, DELETE' },
+          { key: 'Access-Control-Allow-Headers', value: '*' }
+        ]
+      }
+    ]
   }
 }