nodebb-plugin-niki-loyalty 1.3.2 → 1.3.4

package/library.js

@@ -319,37 +319,112 @@ Plugin.init = async function (params) {
     }
   });
 
-  // 3) KASA HISTORY - BASİT VERSİYON
+  // 3) KASA HISTORY - GELİŞMİŞ VERSİYON (Filtre + İstatistik)
   router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (req, res) => {
     try {
       const isAdmin = await user.isAdministrator(req.uid);
       const isMod = await user.isGlobalModerator(req.uid);
-      if (!isAdmin && !isMod) return res.status(403).json([]);
+      if (!isAdmin && !isMod) return res.status(403).json({ error: 'Yetkisiz' });
+
+      // Query parametreleri
+      const { startDate, endDate, search, rewardType, exportAll } = req.query;
 
       const raw = await db.getListRange('niki:kasa:history', 0, -1);
-      const rows = (raw || []).map(safeParseMaybeJson).filter(Boolean).reverse();
+      let rows = (raw || []).map(safeParseMaybeJson).filter(Boolean).reverse();
+
+      // Personel bilgilerini de al
+      const staffUids = [...new Set(rows.map(r => parseInt(r.staff, 10)).filter(n => Number.isFinite(n) && n > 0))];
+      const custUids = rows.map(r => parseInt(r.cuid, 10)).filter(n => Number.isFinite(n) && n > 0);
+      const allUids = [...new Set([...staffUids, ...custUids])];
 
-      const uids = rows.map(r => parseInt(r.cuid, 10)).filter(n => Number.isFinite(n) && n > 0);
-      const users = await user.getUsersFields(uids, ['uid', 'username', 'userslug', 'picture', 'icon:bgColor']);
+      const usersData = await user.getUsersFields(allUids, ['uid', 'username', 'userslug', 'picture', 'icon:bgColor']);
       const userMap = {};
-      (users || []).forEach(u => userMap[u.uid] = u);
+      (usersData || []).forEach(u => userMap[u.uid] = u);
 
       const rp = nconf.get('relative_path') || '';
-      const enriched = rows.map(r => {
-        const u = userMap[r.cuid] || {};
+
+      // Zenginleştir
+      let enriched = rows.map(r => {
+        const custUser = userMap[r.cuid] || {};
+        const staffUser = userMap[r.staff] || {};
         return {
           ...r,
-          cust: u.username || r.cust || 'Bilinmeyen',
-          picture: u.picture || '',
-          iconBg: u['icon:bgColor'] || '#4b5563',
-          profileUrl: u.userslug ? `${rp}/user/${u.userslug}` : '',
-          reward: r.reward || 'İşlem'
+          cust: custUser.username || r.cust || 'Bilinmeyen',
+          picture: custUser.picture || '',
+          iconBg: custUser['icon:bgColor'] || '#4b5563',
+          profileUrl: custUser.userslug ? `${rp}/user/${custUser.userslug}` : '',
+          reward: r.reward || 'İşlem',
+          staffName: staffUser.username || 'Personel',
+          staffPicture: staffUser.picture || '',
+          date: new Date(r.ts).toISOString().slice(0, 10) // YYYY-MM-DD
         };
       });
-      return res.json(enriched);
+
+      // FİLTRELEME
+      // 1. Tarih aralığı
+      if (startDate) {
+        const start = new Date(startDate).getTime();
+        enriched = enriched.filter(r => r.ts >= start);
+      }
+      if (endDate) {
+        const end = new Date(endDate).getTime() + 86400000; // gün sonu
+        enriched = enriched.filter(r => r.ts < end);
+      }
+
+      // 2. Arama (kullanıcı adı)
+      if (search && search.trim()) {
+        const q = search.toLowerCase().trim();
+        enriched = enriched.filter(r =>
+          (r.cust && r.cust.toLowerCase().includes(q)) ||
+          (r.staffName && r.staffName.toLowerCase().includes(q))
+        );
+      }
+
+      // 3. Ödül tipi
+      if (rewardType && rewardType !== 'all') {
+        enriched = enriched.filter(r => r.reward === rewardType);
+      }
+
+      // İSTATİSTİKLER
+      const stats = {
+        totalTransactions: enriched.length,
+        totalPoints: enriched.reduce((sum, r) => sum + (parseFloat(r.amt) || 0), 0),
+        byReward: {},
+        byStaff: {},
+        byDate: {}
+      };
+
+      enriched.forEach(r => {
+        // Ödül bazında
+        stats.byReward[r.reward] = (stats.byReward[r.reward] || 0) + 1;
+        // Personel bazında
+        stats.byStaff[r.staffName] = (stats.byStaff[r.staffName] || 0) + 1;
+        // Gün bazında (son 7 gün için chart)
+        stats.byDate[r.date] = (stats.byDate[r.date] || 0) + 1;
+      });
+
+      // Benzersiz ödül tipleri (filter dropdown için)
+      const rewardTypes = [...new Set(rows.map(r => r.reward || 'İşlem'))];
+
+      // Export all için sayfalama yok
+      if (exportAll === 'true') {
+        return res.json({
+          data: enriched,
+          stats,
+          rewardTypes
+        });
+      }
+
+      // Normal görünüm (son 100 işlem)
+      return res.json({
+        data: enriched.slice(0, 100),
+        stats,
+        rewardTypes,
+        hasMore: enriched.length > 100
+      });
     } catch (e) {
       console.error('[Niki-Loyalty] Kasa history error:', e);
-      return res.status(500).json([]);
+      return res.status(500).json({ error: 'Sunucu hatası' });
     }
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-niki-loyalty",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Niki The Cat Coffee Loyalty System - Earn points while studying on IEU Forum.",
   "main": "library.js",
   "nbbpm": {

package/static/lib/client.js

@@ -487,5 +487,5 @@ $(document).ready(function () {
             });
         });
     }
-
 });
+