add: reward system

Backend/Features/Loyalty/LoyaltyController.cs

@@ -36,11 +36,7 @@ namespace Backend.Features.Loyalty
                 return NotFound("Loyalty account not found.");
             }
 
-            return Ok(new
-            {
-                currentBalance = account.CurrentBalance,
-                tier = account.Tier
-            });
+            return Ok(account);
         }
 
         [HttpGet("my-redemptions")]
@@ -52,7 +48,7 @@ namespace Backend.Features.Loyalty
                 return Unauthorized();
             }
 
-            var redemptions = await _loyaltyService.GetUserRedemptionsAsync(userIdStr);
+            var redemptions = await _loyaltyService.GetRedemptionsHistoryAsync();
             return Ok(redemptions);
         }
 
@@ -107,12 +103,15 @@ namespace Backend.Features.Loyalty
             bool membershipGranted = false;
             if (int.TryParse(redemption.ExternalUserId?.Trim(), out int userId))
             {
+                System.Diagnostics.Debug.WriteLine($"Fulfilling redemption {id} for user {userId}. RewardId: '{redemption.RewardId}'");
                 membershipGranted = await _subscriptionService.HandleLoyaltyRedemptionAsync(userId, redemption.RewardId, redemption.Id);
             }
 
             if (!membershipGranted)
             {
-                return BadRequest(new { message = $"Redemption fulfilled in loyalty system, but failed to grant library membership. The Reward ID '{redemption.RewardId}' may not be correctly mapped in the library system, or the user already has this membership." });
+                var errorMsg = $"Redemption fulfilled in loyalty system, but failed to grant library membership. The Reward ID '{redemption.RewardId}' (Redemption ID: {id}) may not be correctly mapped in the library system, or the user already has researchers this membership.";
+                System.Diagnostics.Debug.WriteLine(errorMsg);
+                return BadRequest(new { message = errorMsg });
             }
 
             return Ok(new { message = $"Redemption fulfilled and {redemption.RewardName} membership granted successfully." });

Backend/Features/Loyalty/LoyaltyModels.cs

@@ -11,20 +11,36 @@ namespace Backend.Features.Loyalty
         [JsonPropertyName("rewardId")]
         public string RewardId { get; set; } = string.Empty;
 
+        // Fallback for snake_case from external API
+        [JsonPropertyName("reward_id")]
+        public string? RewardIdSnakeCase { get => RewardId; set => RewardId = string.IsNullOrEmpty(value) ? RewardId : value; }
+
         [JsonPropertyName("rewardName")]
         public string RewardName { get; set; } = string.Empty;
+        
+        [JsonPropertyName("reward_name")]
+        public string? RewardNameSnakeCase { get => RewardName; set => RewardName = string.IsNullOrEmpty(value) ? RewardName : value; }
 
         [JsonPropertyName("pointsSpent")]
         public double PointsSpent { get; set; }
 
+        [JsonPropertyName("points_spent")]
+        public double? PointsSpentSnakeCase { set => PointsSpent = value ?? PointsSpent; }
+
         [JsonPropertyName("status")]
         public string Status { get; set; } = string.Empty;
 
         [JsonPropertyName("externalUserId")]
         public string ExternalUserId { get; set; } = string.Empty;
 
+        [JsonPropertyName("external_user_id")]
+        public string? ExternalUserIdSnakeCase { get => ExternalUserId; set => ExternalUserId = string.IsNullOrEmpty(value) ? ExternalUserId : value; }
+
         [JsonPropertyName("createdAt")]
         public DateTime CreatedAt { get; set; }
+
+        [JsonPropertyName("created_at")]
+        public DateTime? CreatedAtSnakeCase { set => CreatedAt = value ?? CreatedAt; }
     }
 
     public class ClaimRewardRequestDto

Backend/Features/Loyalty/LoyaltyService.cs

@@ -16,8 +16,8 @@ namespace Backend.Features.Loyalty
         Task<bool> ProcessEventAsync(string externalUserId, string eventKey, double eventValue, string referenceId, string description, string email, string mobile);
         Task<AccountLookupResponse?> GetUserAccountAsync(string externalUserId);
         Task<(bool Success, string Message)> ClaimRewardAsync(string externalUserId, string rewardId, string notes);
-        Task<IEnumerable<LoyaltyRedemptionDto>> GetUserRedemptionsAsync(string externalUserId);
         Task<IEnumerable<LoyaltyRedemptionDto>> GetPendingRedemptionsAsync();
+        Task<IEnumerable<LoyaltyRedemptionDto>> GetRedemptionsHistoryAsync();
         Task<bool> UpdateRedemptionStatusAsync(string redemptionId, string status);
     }
 
@@ -31,7 +31,10 @@ namespace Backend.Features.Loyalty
         {
             _httpClient = httpClient;
             _logger = logger;
-            _httpClient.DefaultRequestHeaders.Add("x-system-id", SystemId);
+            if (!_httpClient.DefaultRequestHeaders.Contains("x-system-id"))
+            {
+                _httpClient.DefaultRequestHeaders.Add("x-system-id", SystemId);
+            }
         }
 
         public async Task<bool> RegisterUserAsync(string externalUserId, string email, string mobile)
@@ -175,8 +178,11 @@ namespace Backend.Features.Loyalty
                 var response = await _httpClient.GetAsync("/api/v1/admin/redemptions/pending");
                 if (response.IsSuccessStatusCode)
                 {
+                    var rawJson = await response.Content.ReadAsStringAsync();
+                    _logger.LogInformation($"Raw Pending Redemptions JSON: {rawJson}");
+                    
                     var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
-                    return await response.Content.ReadFromJsonAsync<IEnumerable<LoyaltyRedemptionDto>>(options) ?? Enumerable.Empty<LoyaltyRedemptionDto>();
+                    return JsonSerializer.Deserialize<IEnumerable<LoyaltyRedemptionDto>>(rawJson, options) ?? Enumerable.Empty<LoyaltyRedemptionDto>();
                 }
                 return Enumerable.Empty<LoyaltyRedemptionDto>();
             }
@@ -187,6 +193,25 @@ namespace Backend.Features.Loyalty
             }
         }
 
+        public async Task<IEnumerable<LoyaltyRedemptionDto>> GetRedemptionsHistoryAsync()
+        {
+            try
+            {
+                var response = await _httpClient.GetAsync("/api/v1/admin/redemptions/history");
+                if (response.IsSuccessStatusCode)
+                {
+                    var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
+                    return await response.Content.ReadFromJsonAsync<IEnumerable<LoyaltyRedemptionDto>>(options) ?? Enumerable.Empty<LoyaltyRedemptionDto>();
+                }
+                return Enumerable.Empty<LoyaltyRedemptionDto>();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error fetching redemptions history.");
+                return Enumerable.Empty<LoyaltyRedemptionDto>();
+            }
+        }
+
         public async Task<bool> UpdateRedemptionStatusAsync(string redemptionId, string status)
         {
             try

Backend/Features/Subscriptions/SubscriptionModels.cs

@@ -11,7 +11,7 @@ namespace Backend.Features.Subscriptions
         public decimal Price { get; set; }
         public string Currency { get; set; } = "MMK";
         public int DurationMonths { get; set; }
-        public string? LoyaltyRewardId { get; set; }
+        public string? RewardId { get; set; }
     }
 
     public class SubscriptionDto

Backend/Features/Subscriptions/SubscriptionService.cs

@@ -35,7 +35,7 @@ namespace Backend.Features.Subscriptions
                     BorrowingDays = m.BorrowingDays,
                     Price = m.Price,
                     DurationMonths = m.DurationMonths,
-                    LoyaltyRewardId = m.LoyaltyRewardId
+                    RewardId = m.RewardId
                 }).ToListAsync();
         }
 
@@ -54,27 +54,25 @@ namespace Backend.Features.Subscriptions
 
         public async Task<bool> HandleLoyaltyRedemptionAsync(int userId, string rewardId, string id)
         {
-            // externalUserId matches how other loyalty calls identify users
-            string externalUserId = userId.ToString();
-
             try
             {
-                // Attempt to claim the reward via the loyalty service
-                var (success, message) = await _loyaltyService.ClaimRewardAsync(externalUserId, rewardId, id);
+                // 1. Find the local membership that corresponds to this loyalty reward
+                var membership = await _context.Memberships
+                    .FirstOrDefaultAsync(m => m.RewardId == rewardId);
 
-                if (!success)
+                if (membership == null)
                 {
+                    // If no membership matches this rewardId, we can't fulfill it automatically
                     return false;
                 }
 
-                // Optionally update the redemption status in the loyalty system
-                await _loyaltyService.UpdateRedemptionStatusAsync(id, "CLAIMED");
+                // 2. Grant the membership to the user (will be queued if they already have one)
+                await SubscribeUserAsync(userId, membership.Id);
 
                 return true;
             }
             catch
             {
-                // Swallow exceptions to maintain interface contract; caller can handle false result
                 return false;
             }
         }
@@ -84,29 +82,34 @@ namespace Backend.Features.Subscriptions
             var membership = await _context.Memberships.FindAsync(membershipId);
             if (membership == null) throw new Exception("Membership plan not found.");
 
-            // Deactivate any existing active subscriptions for this user
-            var activeSubscriptions = await _context.UserSubscriptions
+            // Find the latest expiry date for this user to enable queuing
+            // We look at all active or future subscriptions
+            var latestSubscription = await _context.UserSubscriptions
                 .Where(s => s.UserId == userId && s.IsActive)
-                .ToListAsync();
+                .OrderByDescending(s => s.ExpiryDate)
+                .FirstOrDefaultAsync();
 
-            foreach (var s in activeSubscriptions)
+            DateTime startDate = DateTime.UtcNow;
+            
+            // If there's an existing subscription that expires in the future, start after it
+            if (latestSubscription != null && latestSubscription.ExpiryDate > startDate)
             {
-                s.IsActive = false;
+                startDate = latestSubscription.ExpiryDate;
             }
 
             var subscription = new UserSubscription
             {
                 UserId = userId,
                 MembershipId = membershipId,
-                StartDate = DateTime.UtcNow,
-                ExpiryDate = DateTime.UtcNow.AddMonths(membership.DurationMonths),
+                StartDate = startDate,
+                ExpiryDate = startDate.AddMonths(membership.DurationMonths),
                 IsActive = true
             };
 
             _context.UserSubscriptions.Add(subscription);
             await _context.SaveChangesAsync();
 
-            // Explicitly load the membership data for the DTO mapping
+            // Explicitly load context for DTO
             await _context.Entry(subscription).Reference(s => s.Membership).LoadAsync();
             await _context.Entry(subscription).Reference(s => s.User).LoadAsync();
 

Database/Models/Membership.cs

@@ -16,7 +16,7 @@ public partial class Membership
     public decimal Price { get; set; }
 
     public int DurationMonths { get; set; }
-    public string? LoyaltyRewardId { get; set; }
+    public string? RewardId { get; set; }
 
     public virtual ICollection<UserSubscription> UserSubscriptions { get; set; } = new List<UserSubscription>();
 }

Database/remove_total_membership.sql

@@ -1,72 +0,0 @@
--- EXTREMELY AGGRESSIVE script to remove TotalMembership and ALL its dependencies
-USE LibraryManagement;
-GO
-
-PRINT 'Starting aggressive cleanup of TotalMembership column...';
-
--- 1. Specifically drop the constraint the user mentioned if it exists
-IF EXISTS (SELECT * FROM sys.objects WHERE name = 'DF__UserSubsc__Total__5DCAEF64' AND type = 'D')
-BEGIN
-    PRINT 'Explicitly dropping known constraint DF__UserSubsc__Total__5DCAEF64';
-    ALTER TABLE UserSubscriptions DROP CONSTRAINT DF__UserSubsc__Total__5DCAEF64;
-END
-
--- 2. Dynamically find and drop ALL other default constraints on this column
-DECLARE @SQL nvarchar(MAX) = '';
-SELECT @SQL += 'ALTER TABLE UserSubscriptions DROP CONSTRAINT ' + d.name + ';' + CHAR(13)
-FROM sys.default_constraints d
-INNER JOIN sys.columns c ON d.parent_column_id = c.column_id AND d.parent_object_id = c.object_id
-WHERE c.object_id = OBJECT_ID('UserSubscriptions')
-AND c.name = 'TotalMembership';
-
-IF @SQL <> ''
-BEGIN
-    PRINT 'Dropping additional dynamic constraints...';
-    EXEC sp_executesql @SQL;
-END
-
--- 3. Find and drop any Indexes that use this column
-SET @SQL = '';
-SELECT @SQL += 'DROP INDEX ' + i.name + ' ON UserSubscriptions;' + CHAR(13)
-FROM sys.indexes i
-INNER JOIN sys.index_columns ic ON i.object_id = ic.object_id AND i.index_id = ic.index_id
-INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id
-WHERE i.object_id = OBJECT_ID('UserSubscriptions')
-AND c.name = 'TotalMembership';
-
-IF @SQL <> ''
-BEGIN
-    PRINT 'Dropping dependent indexes...';
-    EXEC sp_executesql @SQL;
-END
-
--- 4. Check for and drop foreign keys if they somehow depend on this (rare for this name but possible)
-SET @SQL = '';
-SELECT @SQL += 'ALTER TABLE UserSubscriptions DROP CONSTRAINT ' + fk.name + ';' + CHAR(13)
-FROM sys.foreign_keys fk
-INNER JOIN sys.foreign_key_columns fkc ON fk.object_id = fkc.constraint_object_id
-INNER JOIN sys.columns c ON fkc.parent_object_id = c.object_id AND fkc.parent_column_id = c.column_id
-WHERE fk.parent_object_id = OBJECT_ID('UserSubscriptions')
-AND c.name = 'TotalMembership';
-
-IF @SQL <> ''
-BEGIN
-    PRINT 'Dropping dependent foreign keys...';
-    EXEC sp_executesql @SQL;
-END
-
--- 5. Finally, drop the column
-IF EXISTS (
-    SELECT * FROM sys.columns 
-    WHERE object_id = OBJECT_ID('UserSubscriptions') 
-    AND name = 'TotalMembership'
-)
-BEGIN
-    ALTER TABLE UserSubscriptions DROP COLUMN TotalMembership;
-    PRINT 'SUCCESS: Dropped column TotalMembership from UserSubscriptions.';
-END
-ELSE
-BEGIN
-    PRINT 'Done: Column TotalMembership does not exist in UserSubscriptions.';
-END
-GO

Frontend/Controllers/BorrowingsController.cs

@@ -93,5 +93,17 @@ namespace Frontend.Controllers
             
             return RedirectToAction(nameof(Index));
         }
+        [HttpPost]
+        public async Task<IActionResult> Redeem(string rewardId)
+        {
+            var (success, message) = await _apiClient.ClaimRewardAsync(rewardId, "Redeemed via Library Rewards Page");
+            
+            if (success)
+            {
+                return Json(new { success = true, message });
+            }
+            
+            return Json(new { success = false, message });
+        }
     }
 }

Frontend/Controllers/MembershipController.cs

@@ -25,16 +25,17 @@ namespace Frontend.Controllers
             var memberships = await _apiClient.GetMembershipsAsync();
             var redemptions = await _apiClient.GetMyRedemptionsAsync();
             var loyaltyAccount = await _apiClient.GetMyLoyaltyAccountAsync();
+            var activeRewards = await _apiClient.GetActiveRewardsAsync();
 
             // Filter redemptions to only show memberships that are Pending (Queued)
             // We use LoyaltyRewardId to identify which redemptions are memberships
             var membershipRewardIds = memberships
-                .Where(m => !string.IsNullOrEmpty(m.LoyaltyRewardId))
-                .Select(m => m.LoyaltyRewardId)
+                .Where(m => !string.IsNullOrEmpty(m.RewardId))
+                .Select(m => m.RewardId)
                 .ToList();
             
             var queuedMemberships = redemptions
-                .Where(r => (r.Status == "Pending" || r.Status == "PENDING") && membershipRewardIds.Contains(r.LoyaltyRewardId))
+                .Where(r => (r.Status == "Pending" || r.Status == "PENDING" || r.Status == "Fulfilled" || r.Status == "FULFILLED") && membershipRewardIds.Contains(r.RewardId))
                 .ToList();
 
             var viewModel = new MembershipViewModel
@@ -42,10 +43,24 @@ namespace Frontend.Controllers
                 CurrentSubscription = subscription,
                 AvailableMemberships = memberships.ToList(),
                 QueuedMemberships = queuedMemberships,
-                LoyaltyAccount = loyaltyAccount
+                LoyaltyAccount = loyaltyAccount,
+                RewardPointCosts = activeRewards.ToDictionary(r => r.Id, r => r.PointCost)
             };
 
             return View(viewModel);
         }
+
+        [HttpPost]
+        public async Task<IActionResult> Redeem(string rewardId)
+        {
+            var (success, message) = await _apiClient.ClaimRewardAsync(rewardId, "Redeemed via Library Membership Page");
+            
+            if (success)
+            {
+                return Json(new { success = true, message });
+            }
+            
+            return Json(new { success = false, message });
+        }
     }
 }

Frontend/Controllers/SubscriptionsController.cs

@@ -8,7 +8,7 @@ using System.Linq;
 
 namespace Frontend.Controllers
 {
-    [Authorize(Roles = "Admin")]
+    [Authorize(Roles = "Admin,Librarian")]
     public class SubscriptionsController : Controller
     {
         private readonly LibraryApiClient _apiClient;
@@ -31,6 +31,25 @@ namespace Frontend.Controllers
 
             return View(viewModel);
         }
+        public async Task<IActionResult> Rewards()
+        {
+            var pendingClaims = await _apiClient.GetPendingRedemptionsAsync();
+            return View("LoyaltyClaims", pendingClaims.ToList());
+        }
 
+        [HttpPost]
+        public async Task<IActionResult> FulfillRedemption(string id)
+        {
+            var (success, message) = await _apiClient.FulfillRedemptionAsync(id);
+            if (success)
+            {
+                TempData["Success"] = message;
+            }
+            else
+            {
+                TempData["Error"] = message;
+            }
+            return RedirectToAction("Rewards");
+        }
     }
 }

Frontend/Models/Dtos/LibraryDtos.cs

@@ -102,7 +102,7 @@ namespace Frontend.Models.Dtos
         public int BorrowingDays { get; set; }
         public decimal Price { get; set; }
         public int DurationMonths { get; set; }
-        public string? LoyaltyRewardId { get; set; }
+        public string? RewardId { get; set; }
     }
 
     public class SubscriptionDto
@@ -170,6 +170,12 @@ namespace Frontend.Models.Dtos
         public bool IsActive { get; set; }
     }
 
+    public class ClaimRewardRequestDto
+    {
+        public string RewardId { get; set; } = string.Empty;
+        public string? Notes { get; set; }
+    }
+
     // User DTOs
     public class UserDto
     {

Frontend/Models/Dtos/LoyaltyRedemptionDto.cs

@@ -1,15 +1,29 @@
 using System;
+using System.Text.Json.Serialization;
 
 namespace Frontend.Models.Dtos
 {
     public class LoyaltyRedemptionDto
     {
-        public Guid Id { get; set; }
+        [JsonPropertyName("id")]
+        public string Id { get; set; } = string.Empty;
+
+        [JsonPropertyName("externalUserId")]
         public string ExternalUserId { get; set; } = string.Empty;
+
+        [JsonPropertyName("rewardName")]
         public string RewardName { get; set; } = string.Empty;
-        public string? LoyaltyRewardId { get; set; }
-        public int PointsSpent { get; set; }
+
+        [JsonPropertyName("rewardId")]
+        public string? RewardId { get; set; }
+
+        [JsonPropertyName("pointsSpent")]
+        public double PointsSpent { get; set; }
+
+        [JsonPropertyName("status")]
         public string Status { get; set; } = string.Empty;
+
+        [JsonPropertyName("createdAt")]
         public DateTime CreatedAt { get; set; }
     }
 }

Frontend/Models/MembershipViewModel.cs

@@ -9,5 +9,6 @@ namespace Frontend.Models
         public List<MembershipDto> AvailableMemberships { get; set; } = new List<MembershipDto>();
         public List<LoyaltyRedemptionDto> QueuedMemberships { get; set; } = new List<LoyaltyRedemptionDto>();
         public LoyaltyAccountDto? LoyaltyAccount { get; set; }
+        public Dictionary<string, double> RewardPointCosts { get; set; } = new Dictionary<string, double>();
     }
 }

Frontend/Services/LibraryApiClient.cs

@@ -201,6 +201,40 @@ namespace Frontend.Services
             return response.IsSuccessStatusCode;
         }
 
+        public async Task<(bool Success, string Message)> ClaimRewardAsync(string rewardId, string? notes = null)
+        {
+            try
+            {
+                var request = new ClaimRewardRequestDto { RewardId = rewardId, Notes = notes };
+                var response = await _httpClient.PostAsJsonAsync("api/Loyalty/claim", request);
+                
+                if (response.IsSuccessStatusCode)
+                {
+                    var result = await response.Content.ReadFromJsonAsync<JsonDocument>();
+                    string msg = "Reward claimed successfully!";
+                    if (result != null && result.RootElement.TryGetProperty("message", out var msgElement))
+                    {
+                        msg = msgElement.GetString() ?? msg;
+                    }
+                    return (true, msg);
+                }
+                else
+                {
+                    var error = await response.Content.ReadFromJsonAsync<JsonDocument>();
+                    string msg = "Failed to claim reward.";
+                    if (error != null && error.RootElement.TryGetProperty("message", out var msgElement))
+                    {
+                        msg = msgElement.GetString() ?? msg;
+                    }
+                    return (false, msg);
+                }
+            }
+            catch (Exception ex)
+            {
+                return (false, $"An error occurred: {ex.Message}");
+            }
+        }
+
         public async Task<IEnumerable<LoyaltyRewardDto>> GetActiveRewardsAsync()
         {
             try {
@@ -251,5 +285,44 @@ namespace Frontend.Services
             return response.IsSuccessStatusCode;
         }
         #endregion
+        public async Task<IEnumerable<LoyaltyRedemptionDto>> GetPendingRedemptionsAsync()
+        {
+            try {
+                var response = await _httpClient.GetAsync("api/Loyalty/admin/redemptions/pending");
+                if (response.IsSuccessStatusCode)
+                {
+                    var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
+                    return await response.Content.ReadFromJsonAsync<IEnumerable<LoyaltyRedemptionDto>>(options) ?? Enumerable.Empty<LoyaltyRedemptionDto>();
+                }
+                return Enumerable.Empty<LoyaltyRedemptionDto>();
+            } catch { return Enumerable.Empty<LoyaltyRedemptionDto>(); }
+        }
+
+        public async Task<(bool Success, string Message)> FulfillRedemptionAsync(string id)
+        {
+            try {
+                var response = await _httpClient.PostAsync($"api/Loyalty/admin/redemptions/{id}/fulfill", null);
+                if (response.IsSuccessStatusCode)
+                {
+                    var result = await response.Content.ReadFromJsonAsync<JsonDocument>();
+                    string msg = "Redemption fulfilled successfully!";
+                    if (result != null && result.RootElement.TryGetProperty("message", out var msgElement))
+                    {
+                        msg = msgElement.GetString() ?? msg;
+                    }
+                    return (true, msg);
+                }
+                else
+                {
+                    var error = await response.Content.ReadFromJsonAsync<JsonDocument>();
+                    string msg = "Failed to fulfill redemption.";
+                    if (error != null && error.RootElement.TryGetProperty("message", out var msgElement))
+                    {
+                        msg = msgElement.GetString() ?? msg;
+                    }
+                    return (false, msg);
+                }
+            } catch (Exception ex) { return (false, $"Error: {ex.Message}"); }
+        }
     }
 }

Frontend/Views/Borrowings/Rewards.cshtml

@@ -53,7 +53,8 @@
                     <span class="text-[10px] font-bold text-slate-400 uppercase tracking-widest">Stock</span>
                     <span class="text-sm font-bold text-slate-700">@reward.StockQuantity available</span>
                 </div>
-                <button class="bg-slate-900 text-white px-5 py-2.5 rounded-xl text-xs font-bold hover:bg-slate-800 hover:shadow-lg transition-all active:scale-95">
+                <button onclick="redeemReward('@reward.Id', '@reward.Name', @reward.PointCost)" 
+                        class="bg-slate-900 text-white px-5 py-2.5 rounded-xl text-xs font-bold hover:bg-slate-800 hover:shadow-lg transition-all active:scale-95">
                     Redeem Reward
                 </button>
             </div>
@@ -82,3 +83,33 @@
     <div class="absolute -right-10 -bottom-10 w-64 h-64 bg-amber-400/10 rounded-full blur-3xl"></div>
     <div class="absolute -left-10 -top-10 w-48 h-48 bg-blue-400/5 rounded-full blur-3xl"></div>
 </div>
+
+<script>
+    async function redeemReward(rewardId, rewardName, cost) {
+        if (!confirm(`Are you sure you want to redeem ${rewardName} for ${cost.toLocaleString()} points?`)) {
+            return;
+        }
+
+        try {
+            const response = await fetch('/Borrowings/Redeem', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                },
+                body: new URLSearchParams({ rewardId: rewardId })
+            });
+
+            const result = await response.json();
+            
+            if (result.success) {
+                alert(result.message);
+                window.location.reload();
+            } else {
+                alert('Error: ' + result.message);
+            }
+        } catch (error) {
+            console.error('Redemption error:', error);
+            alert('An unexpected error occurred. Please try again.');
+        }
+    }
+</script>

Frontend/Views/Membership/Index.cshtml

@@ -189,14 +189,23 @@
                             <div class="h-5 w-5 rounded-full bg-slate-100 flex items-center justify-center text-slate-900">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"/></svg>
                             </div>
-                            <span class="text-slate-600 font-medium font-bold">@plan.MaxBooks Books limit</span>
+                            <span class="text-slate-600 font-bold">@plan.MaxBooks Books limit</span>
                         </li>
                         <li class="flex items-center gap-3 text-sm">
                             <div class="h-5 w-5 rounded-full bg-slate-100 flex items-center justify-center text-slate-900">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"/></svg>
                             </div>
-                            <span class="text-slate-600 font-medium font-bold">@plan.BorrowingDays Days keep</span>
+                            <span class="text-slate-600 font-bold">@plan.BorrowingDays Days keep</span>
                         </li>
+                        @if (!string.IsNullOrEmpty(plan.RewardId) && Model.RewardPointCosts.TryGetValue(plan.RewardId, out var pointCost))
+                        {
+                            <li class="flex items-center gap-3 text-sm text-amber-600 font-black">
+                                <div class="h-5 w-5 rounded-full bg-amber-100 flex items-center justify-center text-amber-600">
+                                    <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"><circle cx="8" cy="8" r="6"/><path d="M18.09 10.37A6 6 0 1 1 10.34 18"/></svg>
+                                </div>
+                                <span>@pointCost.ToString("N0") Points</span>
+                            </li>
+                        }
                     </ul>
 
                     @if (isCurrent)
@@ -205,7 +214,17 @@
                     }
                     else
                     {
-                        <a href="#" class="block w-full py-4 rounded-2xl bg-white border-2 border-slate-900 text-slate-900 text-center font-bold text-sm transition-all duration-200 group-hover:bg-slate-900 group-hover:text-white">Select Plan</a>
+                        <div class="space-y-3">
+                            <a href="#" class="block w-full py-4 rounded-2xl bg-white border-2 border-slate-900 text-slate-900 text-center font-bold text-sm transition-all duration-200 hover:bg-slate-900 hover:text-white">Pay Cash</a>
+                            
+                            @if (!string.IsNullOrEmpty(plan.RewardId) && Model.RewardPointCosts.ContainsKey(plan.RewardId))
+                            {
+                                <button onclick="redeemMembership('@plan.RewardId', '@plan.Type', @(Model.RewardPointCosts[plan.RewardId]))" 
+                                        class="w-full py-4 rounded-2xl bg-amber-400 text-slate-900 font-black text-sm hover:bg-amber-500 transition-all shadow-lg shadow-amber-400/20">
+                                    Redeem with Points
+                                </button>
+                            }
+                        </div>
                     }
                 </div>
             }
@@ -213,6 +232,37 @@
     </section>
 </div>
 
+<!-- Modal / Toast Scripts -->
+<script>
+    async function redeemMembership(rewardId, planName, cost) {
+        if (!confirm(`Are you sure you want to redeem ${planName} for ${cost.toLocaleString()} points?`)) {
+            return;
+        }
+
+        try {
+            const response = await fetch('/Membership/Redeem', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                },
+                body: new URLSearchParams({ rewardId: rewardId })
+            });
+
+            const result = await response.json();
+            
+            if (result.success) {
+                alert(result.message);
+                window.location.reload();
+            } else {
+                alert('Error: ' + result.message);
+            }
+        } catch (error) {
+            console.error('Redemption error:', error);
+            alert('An unexpected error occurred. Please try again.');
+        }
+    }
+</script>
+
 <style>
     body {
         background-color: #f8fafc;

Frontend/Views/Shared/_Layout.cshtml

@@ -75,10 +75,13 @@
                             <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="flex-shrink-0 mr-3"><path d="M4 19.5v-15A2.5 2.5 0 0 1 6.5 2H20v20H6.5a2.5 2.5 0 0 1 0-5H20"/></svg>
                             Books Catalog
                         </a>
-                        <a href="/Borrowings" class="nav-link nav-link-inactive">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="flex-shrink-0 mr-3"><path d="m21 21-6-6m6 6v-4.8m0 4.8h-4.8"/><path d="M3 16.2V21m0 0h4.8M3 21l6-6"/><path d="M21 7.8V3m0 0h-4.8M21 3l-6 6"/><path d="M3 7.8V3m0 0h4.8M3 3l6 6"/></svg>
-                            Active Loans
-                        </a>
+                        @if (User.Identity?.IsAuthenticated != true || !User.IsInRole("Librarian"))
+                        {
+                            <a href="/Borrowings" class="nav-link nav-link-inactive">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="flex-shrink-0 mr-3"><path d="m21 21-6-6m6 6v-4.8m0 4.8h-4.8"/><path d="M3 16.2V21m0 0h4.8M3 21l6-6"/><path d="M21 7.8V3m0 0h-4.8M21 3l-6 6"/><path d="M3 7.8V3m0 0h4.8M3 3l6 6"/></svg>
+                                Active Loans
+                            </a>
+                        }
                         @if (User.Identity?.IsAuthenticated == true && !User.IsInRole("Librarian"))
                         {
                             <a asp-controller="Membership" asp-action="Index" class="nav-link @(ViewContext.RouteData.Values["Controller"]?.ToString() == "Membership" ? "nav-link-active" : "nav-link-inactive")">
@@ -98,9 +101,9 @@
                                 Manage Borrowings
                             </a>
 
-                            <a href="/Subscriptions" class="nav-link @(ViewContext.RouteData.Values["Controller"]?.ToString() == "Subscriptions" ? "nav-link-active" : "nav-link-inactive")">
-                                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="flex-shrink-0 mr-3"><rect width="20" height="14" x="2" y="5" rx="2"/><line x1="2" x2="22" y1="10" y2="10"/></svg>
-                                Memberships
+                            <a asp-controller="Subscriptions" asp-action="Rewards" class="nav-link @(ViewContext.RouteData.Values["Controller"]?.ToString() == "Subscriptions" && ViewContext.RouteData.Values["Action"]?.ToString() == "Rewards" ? "nav-link-active" : "nav-link-inactive")">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="flex-shrink-0 mr-3"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg>
+                                Rewards
                             </a>
                         }