Merge branch 'new-release' into Feature/pengajuan-tempo

# Conflicts:
#	src/core/components/elements/Navbar/NavbarDesktop.jsx

2 files changed, 10 insertions, 3 deletions

diff --git a/src/pages/api/flashsale-header.js b/src/pages/api/flashsale-header.js
index 21cb9c9d..578801ae 100644
--- a/src/pages/api/flashsale-header.js
+++ b/src/pages/api/flashsale-header.js
@@ -20,13 +20,19 @@ export default async function handler(req, res) {
     let cachedData = await client.get(cacheKey);
 
     if (cachedData) {
-      const data = JSON.parse(cachedData); 
+      const data = JSON.parse(cachedData);
 
       // Periksa apakah data adalah array dan panjangnya 0
       if (!data || (Array.isArray(data) && data.length === 0)) {
         await client.del(cacheKey); // Hapus kunci jika data kosong
         return res.status(200).json({ data: [] });
       }
+      // Periksa apakah end_date lebih besar dari waktu saat ini
+      const currentTime = new Date();
+      if (data[0].endDate && new Date(data[0].endDate) < currentTime) {
+        await client.del(cacheKey); // Hapus kunci jika end_date lebih kecil dari waktu saat ini
+        return res.status(200).json({ data: [] });
+      }
       return res.status(200).json({ data });
     } else {
       const flashSale = await odooApi('GET', `/api/v1/flashsale/header`);
@@ -37,11 +43,11 @@ export default async function handler(req, res) {
           cacheKey,
           JSON.stringify(flashSale),
           'EX',
-          flashSale.duration 
+          flashSale.duration
         );
 
         cachedData = await client.get(cacheKey);
-        const data = JSON.parse(cachedData); 
+        const data = JSON.parse(cachedData);
         return res.status(200).json({ data });
       }
     }
diff --git a/src/pages/api/shop/midtrans-payment.js b/src/pages/api/shop/midtrans-payment.js
index 12aaa51f..f90e9e81 100644
--- a/src/pages/api/shop/midtrans-payment.js
+++ b/src/pages/api/shop/midtrans-payment.js
@@ -3,6 +3,7 @@ import camelcaseObjectDeep from 'camelcase-object-deep'
 import midtransClient from 'midtrans-client'
 
 export default async function handler(req, res) {
+  const PPN = process.env.NEXT_PUBLIC_PPN
   const { transactionId = null } = req.query
 
   if (!transactionId) {