testing 101

Signed-off-by: Kenneth Obsequio <k80308392@gmail.com>

controllers/client/course_purchases.controller.js

@@ -1,7 +1,7 @@
 'use strict';
 const mdl_CoursePurchase = require('../../models/courses/course_purchases.mdl');
 const mdl_Product        = require('../../models/courses/products.mdl');
-const paypal             = require('../../services/paypal.service');
+const paymentSvc         = require('../../services/payment.service');
 const R                  = require('../../utils/response.util');
 
 // ─── CREATE ORDER ─────────────────────────────────────────────────────────────
@@ -14,7 +14,6 @@ exports.createCourseOrder = async (req, res) => {
     const product = await mdl_Product.findOne({ where: { id: product_id, is_active: true } });
     if (!product) return R.error(res, 'Product not found or inactive.', 404);
 
-    // Block if user already has an active completed purchase for this product
     const existing = await mdl_CoursePurchase.findOne({
       where: { user_id: req.user.user_id, product_id, status: 'completed' },
     });
@@ -23,7 +22,7 @@ exports.createCourseOrder = async (req, res) => {
       if (stillActive) return R.error(res, 'You already have active access to this course.', 409);
     }
 
-    const ppOrder = await paypal.createOrder({
+    const ppOrder = await paymentSvc.createOrder('paypal', {
       amount:      Number(product.price).toFixed(2),
       currency:    product.currency,
       referenceId: `user_${req.user.user_id}_product_${product_id}`,
@@ -69,7 +68,7 @@ exports.captureCourseOrder = async (req, res) => {
     if (!order_id) return R.error(res, 'order_id is required.', 400);
 
     const purchase = await mdl_CoursePurchase.findOne({
-      where:   { user_id: req.user.user_id, status: 'pending', provider: 'paypal' },
+      where:   { user_id: req.user.user_id, status: 'pending' },
       include: [{ model: mdl_Product, as: 'product' }],
       order:   [['createdAt', 'DESC']],
     });
@@ -79,13 +78,13 @@ exports.captureCourseOrder = async (req, res) => {
 
     let captureData;
     try {
-      captureData = await paypal.captureOrder(order_id);
+      captureData = await paymentSvc.captureOrder(purchase.provider, order_id);
     } catch (ppErr) {
       await purchase.update({
-        status: 'failed',
+        status:           'failed',
         provider_payload: { ...purchase.provider_payload, error: ppErr?.response?.data ?? {} },
       });
-      return R.error(res, 'PayPal capture failed.', 402);
+      return R.error(res, 'Payment capture failed.', 402);
     }
 
     const capture = captureData.purchase_units?.[0]?.payments?.captures?.[0];
@@ -120,7 +119,7 @@ exports.cancelCourseOrder = async (req, res) => {
     if (!order_id) return R.error(res, 'order_id is required.', 400);
 
     const purchase = await mdl_CoursePurchase.findOne({
-      where: { user_id: req.user.user_id, status: 'pending', provider: 'paypal' },
+      where: { user_id: req.user.user_id, status: 'pending' },
       order: [['createdAt', 'DESC']],
     });
 

controllers/client/courses.controller.js

@@ -124,6 +124,7 @@ const COURSE_LIST_ATTRS = [
   "course_id", "uuid", "title", "description",
   "course_code", "level", "subscription",
   "duration_seconds", "order_index",
+  "badge_color", "badge_asset_id", "badge_image_url",
 ];
 
 // Strip correct-answer data before sending quiz questions to the client.
@@ -149,6 +150,22 @@ async function getActiveTier(user_id) {
   });
 }
 
+// ─── COURSE CATEGORIES (public list for filter chips) ─────────────────────────
+
+exports.getCategories = async (req, res) => {
+  try {
+    const rows = await mdl_Category.findAll({
+      where: { is_active: true },
+      attributes: ['id', 'name', 'slug'],
+      order: [['name', 'ASC']],
+    });
+    return R.success(res, 'Categories retrieved.', rows);
+  } catch (err) {
+    console.error('[CLIENT][COURSES][CATEGORIES]', err);
+    return R.error(res, 'Could not retrieve categories.', 500);
+  }
+};
+
 // ─── COURSES (all visible, is_locked per user tier) ───────────────────────────
 
 exports.getCourses = async (req, res) => {
@@ -276,6 +293,11 @@ exports.getCourse = async (req, res) => {
             "is_required", "passing_score",
             "time_limit_minutes", "max_questions",
           ],
+          include: [{
+            model: QuizQuestion, as: "questions",
+            attributes: ["question_id"],
+            required: false,
+          }],
         },
       ],
       order: [
@@ -313,7 +335,13 @@ exports.getCourse = async (req, res) => {
         where: { assessment_id: plain.assessment.assessment_id, user_id: req.user.user_id, passed: true },
       });
       is_completed = !!passedAttempt;
-      plain.assessment = { ...plain.assessment, has_passed: is_completed };
+      const questionCount = plain.assessment.questions?.length ?? 0;
+      plain.assessment = {
+        ...plain.assessment,
+        has_passed:     is_completed,
+        question_count: questionCount,
+        questions:      undefined,
+      };
     }
     plain.is_completed = is_completed;
 
@@ -957,7 +985,7 @@ exports.getCourseByUuid = async (req, res) => {
     const { uuid } = req.params;
     const course = await Course.findOne({
       where: { uuid, ...notDeleted },
-      attributes: ["course_id", "uuid", "title", "description", "level", "subscription"],
+      attributes: ["course_id", "uuid", "title", "description", "level", "subscription", "badge_color", "badge_asset_id", "badge_image_url"],
     });
     if (!course) return R.error(res, "Course not found.", 404);
 

controllers/client/media.controller.js

@@ -122,6 +122,11 @@ function pipeRemoteStream(remoteUrl, req, res) {
 //
 // S3 assets only — Chibisafe assets use their raw file_url directly.
 // Returns: { token, provider: "s3", file_type }
+//
+// TOKEN HITS: If a consumer (e.g. ClientNav badge) re-fetches unexpectedly,
+// the fix lives on the frontend — not here. Use a useRef cache key by
+// asset_id on the consumer side so this endpoint is called exactly once per
+// asset per session. The 4h token TTL makes ref-caching safe within a session.
 
 exports.issueToken = async (req, res) => {
   try {

controllers/client/profile.controller.js

@@ -66,6 +66,23 @@ exports.updateProfile = async (req, res) => {
   }
 };
 
+// ─── PATCH preferred currency ──────────────────────────────────────────────────
+
+exports.updateCurrency = async (req, res) => {
+  try {
+    const { currency } = req.body;
+    if (!currency || typeof currency !== 'string' || currency.length !== 3)
+      return R.error(res, 'A valid 3-letter ISO 4217 currency code is required.', 400);
+
+    const user = await mdl_Users.findByPk(req.user.user_id);
+    await user.update({ preferred_currency: currency.toUpperCase() });
+    return R.success(res, 'Currency preference updated.', { preferred_currency: user.preferred_currency });
+  } catch (err) {
+    console.error('[CLIENT] updateCurrency error:', err);
+    return R.error(res, 'Could not update currency preference.', 500);
+  }
+};
+
 // ─── GET own sessions ──────────────────────────────────────────────────────────
 
 exports.getSessions = async (req, res) => {

controllers/client/task_download.controller.js

@@ -36,7 +36,7 @@ const isMember = async (userId, groupId) => {
 // Strips "{S3_PUBLIC_URL}/{S3_BUCKET}/" prefix, leaving e.g. "images/uuid.jpg"
 const deriveStorageKey = (fileUrl) => {
     const publicUrl = (process.env.S3_PUBLIC_URL || '').replace(/\/$/, '');
-    const bucket    = process.env.S3_BUCKET || 'philproperties';
+    const bucket    = process.env.S3_BUCKET;
     const prefix    = `${publicUrl}/${bucket}/`;
 
     if (fileUrl && fileUrl.startsWith(prefix)) {

controllers/client/task_upload.controller.js

@@ -71,7 +71,7 @@ const resolveOwnerType = (mimetype = '') => {
 //
 // Returns:
 // {
-//   file_url  : "https://garage.philproperties.com/philproperties/documents/uuid.pdf",
+//   file_url  : "https://cdn.yourdomain.com/your-bucket/documents/uuid.pdf",
 //   file_name : "social_media_slides.pdf",
 //   file_size : 2400000,
 //   mime_type : "application/pdf",

controllers/client/tiers.controller.js

@@ -4,47 +4,29 @@
  * Description: User-facing tier and payment endpoints.
  *              - View active tier + history
  *              - Browse active plans (with courses per plan)
- *              - PayPal redirect checkout (create order → capture → cancel)
+ *              - Promo code validation (server-side)
+ *              - PayPal redirect checkout (create order → capture → cancel → refund)
  *              - View own payment history
  * Author: rgrgogu
  * Date Created: Jun. 6, 2026
- * Modified: Jun. 9, 2026
+ * Modified: Jun. 29, 2026
  ***********************************************************************************************************************************************************************/
 const mdl_TierCategories = require('../../models/tiers/tier_categories.mdl');
 const mdl_TierPlans      = require('../../models/tiers/tier_plans.mdl');
+const mdl_PlanPrices     = require('../../models/tiers/plan_prices.mdl');
 const mdl_UserTiers      = require('../../models/tiers/user_tiers.mdl');
 const mdl_Payments       = require('../../models/tiers/payments.mdl');
 const mdl_SystemBadges   = require('../../models/system_badges/system_badges.mdl');
 const Asset              = require('../../models/assets/assets.mdl');
+const UserNotification   = require('../../models/notifications/user_notification.mdl');
 const { onTierActivated } = require('../../services/achievements.service');
-const { Course } = require('../../models/courses/courses.mdl');
-const paypal = require('../../services/paypal.service');
-const R = require('../../utils/response.util');
+const { Course }         = require('../../models/courses/courses.mdl');
+const paymentSvc         = require('../../services/payment.service');
+const R                  = require('../../utils/response.util');
+const { NOTIFICATION_REGISTRY } = require('../../data/notifications.data');
 
 require('../../models/tiers/tier.associations');
 
-// ─── Promo codes ──────────────────────────────────────────────────────────────
-
-const PROMO_CODES = {
-  PHIL10: 10, // $10 flat discount
-};
-
-const calculateCheckoutAmount = (price, promoCode) => {
-  const subtotalCents = Math.round(Number(price) * 100);
-  const normalizedCode = promoCode?.trim?.().toUpperCase?.() ?? null;
-  const discountCents = normalizedCode && PROMO_CODES[normalizedCode]
-    ? Math.min(PROMO_CODES[normalizedCode] * 100, subtotalCents)
-    : 0;
-  const totalCents = Math.max(subtotalCents - discountCents, 0);
-
-  return {
-    promoCode: discountCents > 0 ? normalizedCode : null,
-    subtotal: (subtotalCents / 100).toFixed(2),
-    discount: (discountCents / 100).toFixed(2),
-    total: (totalCents / 100).toFixed(2),
-  };
-};
-
 // ─── MY TIER ──────────────────────────────────────────────────────────────────
 
 exports.getMyTier = async (req, res) => {
@@ -59,27 +41,39 @@ exports.getMyTier = async (req, res) => {
           model:    mdl_TierCategories,
           as:       'category',
           required: false,
-          include:  [{ model: Asset, as: 'badgeAsset', attributes: ['asset_id', 'file_url', 'display_name'], required: false }],
+          include:  [{ model: Asset, as: 'badgeAsset', attributes: ['asset_id', 'storage_provider', 'file_url', 'display_name'], required: false }],
         }],
       }],
       order: [['createdAt', 'DESC']],
     });
 
+    // ── Inline safety net: expire between cron ticks ──────────────────────────
+    if (tier && tier.expires_at && new Date(tier.expires_at) <= new Date()) {
+      await tier.update({ status: 'expired' });
+      UserNotification.create({
+        user_id: req.user.user_id,
+        ...NOTIFICATION_REGISTRY.tier_expired.build({
+          tier:  tier.tier,
+          label: tier.plan?.label ?? null,
+        }),
+      }).catch(() => {});
+      return R.success(res, 'Active tier retrieved.', {
+        tier: 'free', status: 'active', category: null, just_expired: true,
+      });
+    }
+
     if (!tier) {
-      // Free users with no user_tier row: look up free category badge
       const freeCategory = await mdl_TierCategories.findOne({
         where:   { slug: 'free' },
-        include: [{ model: Asset, as: 'badgeAsset', attributes: ['asset_id', 'file_url', 'display_name'], required: false }],
+        include: [{ model: Asset, as: 'badgeAsset', attributes: ['asset_id', 'storage_provider', 'file_url', 'display_name'], required: false }],
       });
       return R.success(res, 'Active tier retrieved.', { tier: 'free', status: 'active', category: freeCategory ?? null });
     }
 
-    // Supplement with the tier category badge even when the user's tier slug doesn't come via a plan
-    // (e.g., manually granted tiers that only store a slug, not a plan_id)
     if (!tier.plan?.category) {
       const category = await mdl_TierCategories.findOne({
         where:   { slug: tier.tier },
-        include: [{ model: Asset, as: 'badgeAsset', attributes: ['asset_id', 'file_url', 'display_name'], required: false }],
+        include: [{ model: Asset, as: 'badgeAsset', attributes: ['asset_id', 'storage_provider', 'file_url', 'display_name'], required: false }],
       });
       const plain = tier.toJSON();
       plain.category = category?.toJSON() ?? null;
@@ -106,20 +100,26 @@ exports.getMyTierHistory = async (req, res) => {
   }
 };
 
-// ─── PLANS (with courses) ─────────────────────────────────────────────────────
+// ─── PLANS ────────────────────────────────────────────────────────────────────
 
 exports.getPlans = async (req, res) => {
   try {
     const plans = await mdl_TierPlans.findAll({
-      where: { is_active: true },
-      order: [['tier', 'ASC'], ['duration_days', 'ASC']],
-      attributes: ['plan_id', 'tier', 'label', 'duration_days', 'price', 'currency'],
-      include: [{
-        model: Course,
-        as: 'courses',
-        attributes: ['course_id', 'uuid', 'title', 'course_code', 'level', 'duration_seconds'],
-        through: { attributes: [] },
-      }],
+      order:      [['tier', 'ASC'], ['duration_days', 'ASC']],
+      attributes: ['plan_id', 'tier', 'label', 'description', 'duration_days', 'duration_unit', 'price', 'currency', 'is_active'],
+      include:    [
+        {
+          model:      Course,
+          as:         'courses',
+          attributes: ['course_id', 'uuid', 'title', 'course_code', 'level', 'duration_seconds'],
+          through:    { attributes: [] },
+        },
+        {
+          model:      mdl_PlanPrices,
+          as:         'prices',
+          attributes: ['currency', 'price'],
+        },
+      ],
     });
 
     const result = plans.map((p) => {
@@ -135,57 +135,109 @@ exports.getPlans = async (req, res) => {
   }
 };
 
-// ─── PAYPAL CHECKOUT ──────────────────────────────────────────────────────────
+// ─── PROMO CODE VALIDATION ────────────────────────────────────────────────────
+
+exports.validatePromo = async (req, res) => {
+  try {
+    const { plan_id, code, currency } = req.body;
+    if (!plan_id || !code) return R.error(res, 'plan_id and code are required.', 400);
+
+    const plan = await mdl_TierPlans.findOne({ where: { plan_id, is_active: true } });
+    if (!plan) return R.error(res, 'Plan not found or inactive.', 404);
+
+    // Resolve localized price if a preferred currency was sent
+    let effectivePrice = null;
+    if (currency && currency !== plan.currency) {
+      const priceEntry = await mdl_PlanPrices.findOne({ where: { plan_id, currency } });
+      if (priceEntry) effectivePrice = priceEntry.price;
+    }
+
+    const policy = await paymentSvc.getPolicyForPlan(plan_id);
+    const result = await paymentSvc.evaluatePromo(policy, plan, code, effectivePrice);
+
+    return R.success(res, result.valid ? 'Promo code is valid.' : result.reason, result);
+  } catch (err) {
+    console.error('[CLIENT][VALIDATE PROMO]', err);
+    return R.error(res, 'Could not validate promo code.', 500);
+  }
+};
+
+// ─── CHECKOUT ─────────────────────────────────────────────────────────────────
 
 exports.createOrder = async (req, res) => {
   try {
-    const { plan_id, promo_code } = req.body;
+    const { plan_id, promo_code, currency: requestedCurrency } = req.body;
     if (!plan_id) return R.error(res, 'plan_id is required.', 400);
 
     const plan = await mdl_TierPlans.findOne({ where: { plan_id, is_active: true } });
     if (!plan) return R.error(res, 'Plan not found or inactive.', 404);
 
-    const checkout = calculateCheckoutAmount(plan.price, promo_code);
-    if (Number(checkout.total) <= 0)
+    // Resolve localized price — falls back to plan base price when no override exists
+    let effectivePrice    = Number(plan.price);
+    let effectiveCurrency = plan.currency;
+    if (requestedCurrency && requestedCurrency !== plan.currency) {
+      const priceEntry = await mdl_PlanPrices.findOne({ where: { plan_id, currency: requestedCurrency } });
+      if (priceEntry) {
+        effectivePrice    = Number(priceEntry.price);
+        effectiveCurrency = priceEntry.currency;
+      }
+    }
+
+    const policy = await paymentSvc.getPolicyForPlan(plan_id);
+
+    let promoResult = { valid: false, code: null, discount: 0 };
+    if (promo_code) {
+      promoResult = await paymentSvc.evaluatePromo(policy, plan, promo_code, effectivePrice);
+      if (!promoResult.valid)
+        return R.error(res, promoResult.reason ?? 'Invalid promo code.', 400);
+    }
+
+    const subtotal = effectivePrice;
+    const discount = promoResult.discount ?? 0;
+    const total    = Math.max(subtotal - discount, 0).toFixed(2);
+
+    if (Number(total) <= 0)
       return R.error(res, 'PayPal checkout requires a payable amount.', 400);
 
-    const ppOrder = await paypal.createOrder({
-      amount: checkout.total,
-      currency: plan.currency,
+    const provider  = (policy?.allowed_providers?.[0]) ?? 'paypal';
+    const ppOrder   = await paymentSvc.createOrder(provider, {
+      amount:      total,
+      currency:    effectiveCurrency,
       referenceId: `user_${req.user.user_id}_plan_${plan_id}`,
     });
 
-    // Extract PayPal approval URL from links array
     const approvalUrl = ppOrder.links?.find((l) => l.rel === 'approve')?.href ?? null;
 
     const payment = await mdl_Payments.create({
-      user_id: req.user.user_id,
+      user_id:          req.user.user_id,
       plan_id,
-      status: 'pending',
-      amount: checkout.total,
-      currency: plan.currency,
-      promo_code: checkout.promoCode,
-      discount: checkout.discount,
-      provider: 'paypal',
+      status:           'pending',
+      amount:           total,
+      currency:         effectiveCurrency,
+      promo_code:       promoResult.code,
+      discount:         discount.toFixed(2),
+      provider,
       provider_payload: {
-        order_id: ppOrder.id,
+        order_id:     ppOrder.id,
         approval_url: approvalUrl,
         checkout: {
-          subtotal: checkout.subtotal,
-          discount: checkout.discount,
-          promo_code: checkout.promoCode,
+          subtotal:      subtotal.toFixed(2),
+          discount:      discount.toFixed(2),
+          promo_code:    promoResult.code,
+          base_price:    Number(plan.price).toFixed(2),
+          base_currency: plan.currency,
         },
       },
     });
 
     return R.success(res, 'Order created.', {
-      payment_id: payment.payment_id,
-      order_id: ppOrder.id,
+      payment_id:   payment.payment_id,
+      order_id:     ppOrder.id,
       approval_url: approvalUrl,
-      amount: checkout.total,
-      currency: plan.currency,
-      promo_code: checkout.promoCode,
-      discount: checkout.discount,
+      amount:       total,
+      currency:     effectiveCurrency,
+      promo_code:   promoResult.code,
+      discount:     discount.toFixed(2),
     }, 201);
   } catch (err) {
     console.error('[CLIENT][CREATE ORDER]', err);
@@ -199,70 +251,75 @@ exports.captureOrder = async (req, res) => {
     if (!order_id) return R.error(res, 'order_id is required.', 400);
 
     const payment = await mdl_Payments.findOne({
-      where: {
-        status: 'pending',
-        provider: 'paypal',
-        user_id: req.user.user_id,
-      },
+      where:   { status: 'pending', user_id: req.user.user_id },
       include: [{ model: mdl_TierPlans, as: 'plan' }],
-      order: [['createdAt', 'DESC']],
+      order:   [['createdAt', 'DESC']],
     });
 
-    // Match by order_id inside provider_payload
     if (!payment || payment.provider_payload?.order_id !== order_id)
       return R.error(res, 'Pending payment not found.', 404);
 
-    let captureData;
-    try {
-      captureData = await paypal.captureOrder(order_id);
-    } catch (ppErr) {
+    // Guard: plan was deactivated while user was on PayPal's approval page
+    if (!payment.plan?.is_active) {
       await payment.update({
-        status: 'failed',
+        status:           'cancelled',
         provider_payload: {
           ...payment.provider_payload,
-          error: ppErr?.response?.data ?? {},
+          cancelled_at:    new Date().toISOString(),
+          cancelled_by:    'system',
+          cancel_reason:   'plan_deactivated',
         },
       });
-      return R.error(res, 'PayPal capture failed.', 402);
+      return R.error(res, 'This plan is no longer available. No payment was taken.', 409);
+    }
+
+    let captureData;
+    try {
+      captureData = await paymentSvc.captureOrder(payment.provider, order_id);
+    } catch (ppErr) {
+      await payment.update({
+        status:           'failed',
+        provider_payload: { ...payment.provider_payload, error: ppErr?.response?.data ?? {} },
+      });
+      return R.error(res, 'Payment capture failed.', 402);
     }
 
     const capture = captureData.purchase_units?.[0]?.payments?.captures?.[0];
 
-    // Expire current active tier
     await mdl_UserTiers.update(
       { status: 'expired' },
       { where: { user_id: req.user.user_id, status: 'active' } }
     );
 
-    const startsAt = new Date();
+    const startsAt  = new Date();
     const expiresAt = new Date(startsAt.getTime() + payment.plan.duration_days * 86400000);
 
     const newTier = await mdl_UserTiers.create({
-      user_id: req.user.user_id,
-      tier: payment.plan.tier,
-      plan_id: payment.plan_id,
-      status: 'active',
+      user_id:   req.user.user_id,
+      tier:      payment.plan.tier,
+      plan_id:   payment.plan_id,
+      status:    'active',
       starts_at: startsAt,
       expires_at: expiresAt,
       granted_by: null,
     });
 
     await payment.update({
-      status: 'completed',
-      tier_id: newTier.tier_id,
-      paid_at: new Date(),
+      status:           'completed',
+      tier_id:          newTier.tier_id,
+      paid_at:          new Date(),
       provider_payload: {
         ...payment.provider_payload,
         capture_id: capture?.id,
-        payer_id: captureData.payer?.payer_id,
-        capture: captureData,
+        payer_id:   captureData.payer?.payer_id,
+        capture:    captureData,
       },
     });
-    // await grantAchievement(req.user.user_id, payment.plan.tier);
+
     await onTierActivated(req.user.user_id, newTier.tier);
 
     return R.success(res, 'Payment successful. Tier activated.', {
-      tier: newTier.tier,
+      tier:       newTier.tier,
       expires_at: newTier.expires_at,
     });
   } catch (err) {
@@ -277,7 +334,7 @@ exports.cancelOrder = async (req, res) => {
     if (!order_id) return R.error(res, 'order_id is required.', 400);
 
     const payment = await mdl_Payments.findOne({
-      where: { user_id: req.user.user_id, status: 'pending', provider: 'paypal' },
+      where: { user_id: req.user.user_id, status: 'pending' },
       order: [['createdAt', 'DESC']],
     });
 
@@ -285,7 +342,7 @@ exports.cancelOrder = async (req, res) => {
       return R.error(res, 'Pending payment not found.', 404);
 
     await payment.update({
-      status: 'cancelled',
+      status:           'cancelled',
       provider_payload: {
         ...payment.provider_payload,
         cancelled_at: new Date().toISOString(),
@@ -300,15 +357,87 @@ exports.cancelOrder = async (req, res) => {
   }
 };
 
+exports.refundOrder = async (req, res) => {
+  try {
+    const user_id = req.user.user_id;
+
+    const activeTier = await mdl_UserTiers.findOne({
+      where: { user_id, status: 'active' },
+      order: [['createdAt', 'DESC']],
+    });
+    if (!activeTier) return R.error(res, 'No active tier to refund.', 404);
+
+    const payment = await mdl_Payments.findOne({
+      where: { user_id, tier_id: activeTier.tier_id, status: 'completed' },
+      order: [['paid_at', 'DESC']],
+    });
+    if (!payment) return R.error(res, 'No completed payment found for this tier.', 404);
+
+    // Load plan's payment policy to get the configured refund window
+    const policy = await paymentSvc.getPolicyForPlan(payment.plan_id);
+
+    if (!paymentSvc.isRefundAllowed(policy))
+      return R.error(res, 'Refunds are not available for this plan.', 403);
+
+    const windowMs = paymentSvc.getRefundWindowMs(policy);
+    if (!payment.paid_at || Date.now() - new Date(payment.paid_at).getTime() > windowMs) {
+      const rp = policy?.refund_policy ?? {};
+      const label = `${rp.window_value ?? 5} ${rp.window_unit ?? 'minutes'}`;
+      return R.error(res, `Refund window has expired. Refunds are only available within ${label} of payment.`, 403);
+    }
+
+    const captureId = payment.provider_payload?.capture_id;
+    if (!captureId) return R.error(res, 'Capture ID not found. Cannot process refund.', 400);
+
+    let refundData;
+    try {
+      refundData = await paymentSvc.refundCapture(payment.provider, captureId, payment.amount, payment.currency);
+    } catch (ppErr) {
+      console.error('[CLIENT][REFUND] provider error:', ppErr?.response?.data);
+      return R.error(res, 'Refund failed. Please try again.', 402);
+    }
+
+    await payment.update({
+      status:           'refunded',
+      provider_payload: {
+        ...payment.provider_payload,
+        refund:      refundData,
+        refunded_at: new Date().toISOString(),
+      },
+    });
+
+    const now = new Date();
+    await activeTier.update({ status: 'revoked', expires_at: now, revoked_at: now });
+
+    await mdl_UserTiers.create({
+      user_id,
+      tier:       'free',
+      status:     'active',
+      starts_at:  now,
+      expires_at: null,
+      granted_by: null,
+      notes:      'Auto-downgrade after refund.',
+    });
+
+    return R.success(res, 'Refund processed successfully. Your access has been revoked.', {
+      refund_id: refundData.id,
+      status:    refundData.status,
+    });
+  } catch (err) {
+    console.error('[CLIENT][REFUND]', err);
+    return R.error(res, 'Could not process refund.', 500);
+  }
+};
+
 // ─── MY PAYMENTS ──────────────────────────────────────────────────────────────
 
 exports.getMyPayments = async (req, res) => {
   try {
     const payments = await mdl_Payments.findAll({
-      where: { user_id: req.user.user_id },
-      include: [{ model: mdl_TierPlans, as: 'plan', attributes: ['label', 'tier', 'duration_days'] }],
+      where:      { user_id: req.user.user_id },
+      include:    [{ model: mdl_TierPlans, as: 'plan', attributes: ['label', 'tier', 'duration_days'] }],
       attributes: { exclude: ['provider_payload'] },
-      order: [['createdAt', 'DESC']],
+      order:      [['createdAt', 'DESC']],
     });
     return R.success(res, 'Payment history retrieved.', payments);
   } catch (err) {
@@ -317,14 +446,14 @@ exports.getMyPayments = async (req, res) => {
   }
 };
 
-// ─── SYSTEM BADGES (read-only for client profile) ────────────────────────────
+// ─── TIER CATEGORIES + SYSTEM BADGES ─────────────────────────────────────────
 
 exports.getCategories = async (req, res) => {
   try {
     const categories = await mdl_TierCategories.findAll({
       where:      { is_active: true },
-      attributes: ['tier_category_id', 'slug', 'name', 'rank', 'color', 'badge_label', 'is_default'],
-      include:    [{ model: Asset, as: 'badgeAsset', attributes: ['file_url', 'display_name'], required: false }],
+      attributes: ['tier_category_id', 'slug', 'name', 'rank', 'color', 'badge_icon', 'badge_label', 'is_default'],
+      include:    [{ model: Asset, as: 'badgeAsset', attributes: ['asset_id', 'storage_provider', 'file_url', 'display_name'], required: false }],
       order:      [['rank', 'ASC']],
     });
     return R.success(res, 'Tier categories retrieved.', categories);
@@ -347,81 +476,3 @@ exports.getSystemBadges = async (req, res) => {
     return R.error(res, 'Could not retrieve system badges.', 500);
   }
 };
-
-// — add refundOrder export ────────────────
-
-const REFUND_WINDOW_MS = 5 * 60 * 1000; // 5 minutes from paid_at
-
-exports.refundOrder = async (req, res) => {
-  try {
-    const user_id = req.user.user_id;
-
-    // Get the active tier
-    const activeTier = await mdl_UserTiers.findOne({
-      where: { user_id, status: 'active' },
-      order: [['createdAt', 'DESC']],
-    });
-    if (!activeTier) return R.error(res, 'No active tier to refund.', 404);
-
-    // Get the completed payment for this tier
-    const payment = await mdl_Payments.findOne({
-      where: { user_id, tier_id: activeTier.tier_id, status: 'completed' },
-      order: [['paid_at', 'DESC']],
-    });
-    if (!payment) return R.error(res, 'No completed payment found for this tier.', 404);
-
-    // Enforce 5-minute refund window
-    if (!payment.paid_at || Date.now() - new Date(payment.paid_at).getTime() > REFUND_WINDOW_MS)
-      return R.error(res, 'Refund window has expired. Refunds are only available within 5 minutes of payment.', 403);
- 
-    // Get capture_id from provider_payload
-    const captureId = payment.provider_payload?.capture_id;
-    if (!captureId) return R.error(res, 'Capture ID not found. Cannot process refund.', 400);
- 
-    // Call PayPal refund API
-    let refundData;
-    try {
-      refundData = await paypal.refundCapture(captureId, payment.amount, payment.currency);
-    } catch (ppErr) {
-      console.error('[CLIENT][REFUND] PayPal error:', ppErr?.response?.data);
-      return R.error(res, 'PayPal refund failed. Please try again.', 402);
-    }
- 
-    // Update payment status to refunded
-    await payment.update({
-      status:           'refunded',
-      provider_payload: {
-        ...payment.provider_payload,
-        refund: refundData,
-        refunded_at: new Date().toISOString(),
-      },
-    });
- 
-    // Immediately terminate access — cut expires_at to now and revoke
-    const now = new Date();
-    await activeTier.update({
-      status:     'revoked',
-      expires_at: now,
-      revoked_at: now,
-    });
-
-    // Drop user back to free immediately
-    await mdl_UserTiers.create({
-      user_id,
-      tier:      'free',
-      status:    'active',
-      starts_at: now,
-      expires_at: null,
-      granted_by: null,
-      notes:     'Auto-downgrade after refund.',
-    });
-
-    return R.success(res, 'Refund processed successfully. Your access has been revoked.', {
-      refund_id: refundData.id,
-      status:    refundData.status,
-    });
-  } catch (err) {
-    console.error('[CLIENT][REFUND]', err);
-    return R.error(res, 'Could not process refund.', 500);
-  }
-};