diff --git a/EstateManagementUI.BlazorServer.Tests/Pages/HomePageTests.cs b/EstateManagementUI.BlazorServer.Tests/Pages/HomePageTests.cs
index da475742..cc21d336 100644
--- a/EstateManagementUI.BlazorServer.Tests/Pages/HomePageTests.cs
+++ b/EstateManagementUI.BlazorServer.Tests/Pages/HomePageTests.cs
@@ -58,8 +58,8 @@ public void Home_RendersCorrectly()
         _mockAuthStateProvider.Setup(x => x.GetAuthenticationStateAsync()).Returns(authState);
         this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetComparisonDatesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockComparisonDates()));
         this._mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetMerchantKpiQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockMerchantKpi()));
-        this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetTodaysSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
-        this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetTodaysFailedSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
+        this._mockMediator.Setup(m => m.Send(It.IsAny<TransactionQueries.GetTodaysSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
+        this._mockMediator.Setup(m => m.Send(It.IsAny<TransactionQueries.GetTodaysFailedSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
         this._mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockRecentMerchants()));
 
         // Act
@@ -85,8 +85,8 @@ public void Home_HasCorrectPageTitle()
         _mockAuthStateProvider.Setup(x => x.GetAuthenticationStateAsync()).Returns(authState);
         this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetComparisonDatesQuery>())).ReturnsAsync(Result.Success( StubTestData.GetMockComparisonDates()));
         this._mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetMerchantKpiQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockMerchantKpi()));
-        this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetTodaysSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
-        this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetTodaysFailedSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
+        this._mockMediator.Setup(m => m.Send(It.IsAny<TransactionQueries.GetTodaysSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
+        this._mockMediator.Setup(m => m.Send(It.IsAny<TransactionQueries.GetTodaysFailedSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
         this._mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockRecentMerchants()));
 
 
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Home.razor.cs b/EstateManagementUI.BlazorServer/Components/Pages/Home.razor.cs
index bc0a9e33..7a1847a2 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Home.razor.cs
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Home.razor.cs
@@ -113,8 +113,8 @@ private async Task<Result> LoadDashboardData(CorrelationId correlationId, Guid e
 
             // Load all dashboard data in parallel
             var kpiTask = Mediator.Send(new MerchantQueries.GetMerchantKpiQuery(correlationId, estateId));
-            var salesTask = Mediator.Send(new Queries.GetTodaysSalesQuery(correlationId, estateId, comparisonDateResult.Data));
-            var failedSalesTask = Mediator.Send(new Queries.GetTodaysFailedSalesQuery(correlationId, estateId, LOW_CREDIT_RESPONSE_CODE, comparisonDateResult.Data));
+            var salesTask = Mediator.Send(new TransactionQueries.GetTodaysSalesQuery(correlationId, estateId, comparisonDateResult.Data));
+            var failedSalesTask = Mediator.Send(new TransactionQueries.GetTodaysFailedSalesQuery(correlationId, estateId, LOW_CREDIT_RESPONSE_CODE, comparisonDateResult.Data));
             var merchantsTask = Mediator.Send(new MerchantQueries.GetRecentMerchantsQuery(correlationId, estateId));
 
             await Task.WhenAll(kpiTask, salesTask, failedSalesTask, merchantsTask);
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Reporting/AnalyticalCharts.razor b/EstateManagementUI.BlazorServer/Components/Pages/Reporting/AnalyticalCharts.razor
index 9a79a48f..5979945d 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Reporting/AnalyticalCharts.razor
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Reporting/AnalyticalCharts.razor
@@ -257,7 +257,7 @@
             // Load all data in parallel
             var salesCountTask = Mediator.Send(new Queries.GetTodaysSalesCountByHourQuery(correlationId, accessToken, estateId, comparisonDate));
             var salesValueTask = Mediator.Send(new Queries.GetTodaysSalesValueByHourQuery(correlationId, accessToken, estateId, comparisonDate));
-            var todaysSalesTask = Mediator.Send(new Queries.GetTodaysSalesQuery(correlationId, estateId, comparisonDate));
+            var todaysSalesTask = Mediator.Send(new TransactionQueries.GetTodaysSalesQuery(correlationId, estateId, comparisonDate));
             var settlementTask = Mediator.Send(new Queries.GetTodaysSettlementQuery(correlationId, accessToken, estateId, comparisonDate));
 
             await Task.WhenAll(salesCountTask, salesValueTask, todaysSalesTask, settlementTask);
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Reporting/TransactionDetail.razor b/EstateManagementUI.BlazorServer/Components/Pages/Reporting/TransactionDetail.razor
index 1990d980..e72335f5 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Reporting/TransactionDetail.razor
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Reporting/TransactionDetail.razor
@@ -11,6 +11,7 @@
 @using OperatorDropDownModel = EstateManagementUI.BlazorServer.Models.OperatorModels.OperatorDropDownModel
 @using OperatorModel = EstateManagementUI.BlazorServer.Models.OperatorModels.OperatorModel
 @using TransactionDetailModel = EstateManagementUI.BlazorServer.Models.TransactionDetailModel
+@inherits AuthorizedComponentBase
 @inject IMediator Mediator
 @inject NavigationManager Navigation
 @inject ILogger<TransactionDetail> Logger
@@ -83,7 +84,7 @@
                                            Items="merchants"
                                            SelectedItems="_selectedMerchantIds"
                                            SelectedItemsChanged="OnMerchantSelectionChanged"
-                                           GetItemId="m => m.MerchantId.ToString()"
+                                           GetItemId="m => m.MerchantReportingId.ToString()"
                                            GetItemText="m => m.MerchantName ?? string.Empty"
                                            Placeholder="All Merchants"
                                            AriaLabel="Select one or more merchants" />
@@ -96,7 +97,7 @@
                                            Items="operators"
                                            SelectedItems="_selectedOperatorIds"
                                            SelectedItemsChanged="OnOperatorSelectionChanged"
-                                           GetItemId="o => o.OperatorId.ToString()"
+                                           GetItemId="o => o.OperatorReportingId.ToString()"
                                            GetItemText="o => o.OperatorName ?? string.Empty"
                                            Placeholder="All Operators"
                                            AriaLabel="Select one or more operators" />
@@ -111,7 +112,7 @@
                                            Items="products"
                                            SelectedItems="_selectedProductIds"
                                            SelectedItemsChanged="OnProductSelectionChanged"
-                                           GetItemId="p => p.ContractProductId.ToString()"
+                                           GetItemId="p => p.ContractProductReportingId.ToString()"
                                            GetItemText="p => p.ProductName ?? string.Empty"
                                            Placeholder="All Products"
                                            AriaLabel="Select one or more products" />
@@ -128,7 +129,7 @@
                     <button @onclick="ClearFilters" class="btn btn-secondary">
                         Clear Filters
                     </button>
-                    @if (detailData != null && detailData.Any())
+                    @if (detailData != null && detailData.Transactions.Any())
                     {
                         <button @onclick="ExportToCSV" class="btn btn-success ml-auto">
                             <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -196,16 +197,16 @@
         <div class="card">
             <div class="card-header flex justify-between items-center">
                 <h3 class="card-title">Transaction Details</h3>
-                @if (detailData != null && detailData.Any())
+                @if (detailData != null && detailData.Transactions.Any())
                 {
                     var pagedData = GetPagedData();
                     var startRecord = (_currentPage - 1) * _pageSize + 1;
-                    var endRecord = Math.Min(_currentPage * _pageSize, detailData.Count);
-                    <span class="text-sm text-gray-600">Showing @startRecord-@endRecord of @detailData.Count transaction(s)</span>
+                    var endRecord = Math.Min(_currentPage * _pageSize, detailData.Transactions.Count);
+                    <span class="text-sm text-gray-600">Showing @startRecord-@endRecord of @detailData.Transactions.Count transaction(s)</span>
                 }
             </div>
             <div class="card-body">
-                @if (detailData != null && detailData.Any())
+                @if (detailData != null && detailData.Transactions.Any())
                 {
                     var pagedData = GetPagedData();
                     <div class="overflow-x-auto">
@@ -249,24 +250,24 @@
                                 @foreach (var item in pagedData)
                                 {
                                     <tr>
-                                        <td class="font-mono text-xs">@GetShortId(item.TransactionId)</td>
-                                        <td class="text-sm">@item.TransactionDateTime.ToString("yyyy-MM-dd HH:mm:ss")</td>
-                                        <td class="font-medium">@item.MerchantName</td>
-                                        <td>@item.OperatorName</td>
-                                        <td>@item.ProductName</td>
+                                        <td class="font-mono text-xs">@GetShortId(item.Id)</td>
+                                        <td class="text-sm">@item.DateTime.ToString("yyyy-MM-dd HH:mm:ss")</td>
+                                        <td class="font-medium">@item.Merchant</td>
+                                        <td>@item.Operator</td>
+                                        <td>@item.Product</td>
                                         <td>
-                                            <span class="badge @GetTypeBadgeClass(item.TransactionType)">
-                                                @item.TransactionType
+                                            <span class="badge @GetTypeBadgeClass(item.Type)">
+                                                @item.Type
                                             </span>
                                         </td>
                                         <td>
-                                            <span class="badge @GetStatusBadgeClass(item.TransactionStatus)">
-                                                @item.TransactionStatus
+                                            <span class="badge @GetStatusBadgeClass(item.Status)">
+                                                @item.Status
                                             </span>
                                         </td>
-                                        <td class="text-right">@item.GrossAmount.ToString("C")</td>
-                                        <td class="text-right text-red-600">@item.FeesCommission.ToString("C")</td>
-                                        <td class="text-right font-medium">@item.NetAmount.ToString("C")</td>
+                                        <td class="text-right">@item.Value.ToString("C")</td>
+                                        <td class="text-right text-red-600">@item.TotalFees.ToString("C")</td>
+                                        @* <td class="text-right font-medium">@item.NetAmount.ToString("C")</td> *@
                                         <td class="text-sm text-gray-600">@(item.SettlementReference ?? "-")</td>
                                     </tr>
                                 }
@@ -323,407 +324,5 @@
 </div>
 
 @code {
-    private const string DEFAULT_ESTATE_ID = "11111111-1111-1111-1111-111111111111";
-    private const string DEFAULT_ACCESS_TOKEN = "stubbed-token";
     
-    private bool isLoading = true;
-    private string? errorMessage;
-    
-    // Filter states
-    private DateOnly _startDate = DateOnly.FromDateTime(DateTime.Now.AddDays(-7));
-    private DateOnly _endDate = DateOnly.FromDateTime(DateTime.Now);
-    private List<string> _selectedMerchantIds = new List<string>();
-    private List<string> _selectedOperatorIds = new List<string>();
-    private List<string> _selectedProductIds = new List<string>();
-    
-    // Data
-    private List<TransactionDetailModel>? detailData;
-    private List<MerchantDropDownModel>? merchants;
-    private List<OperatorDropDownModel>? operators;
-    private List<ContractProductModel>? products;
-    
-    // KPIs
-    private int totalTransactions = 0;
-    private decimal totalGrossAmount = 0;
-    private decimal totalFees = 0;
-    private decimal totalNetAmount = 0;
-    
-    // Sorting
-    private string? _currentSortColumn;
-    private bool _sortAscending = true;
-    
-    // Paging
-    private int _currentPage = 1;
-    private int _pageSize = 25;
-    private int _totalPages = 0;
-    
-    private List<TransactionDetailModel> GetPagedData()
-    {
-        if (detailData == null || !detailData.Any())
-            return new List<TransactionDetailModel>();
-        
-        _totalPages = (int)Math.Ceiling(detailData.Count / (double)_pageSize);
-        
-        return detailData
-            .Skip((_currentPage - 1) * _pageSize)
-            .Take(_pageSize)
-            .ToList();
-    }
-    
-    private void GoToPage(int page)
-    {
-        if (page < 1 || page > _totalPages)
-            return;
-        
-        _currentPage = page;
-    }
-    
-    private void NextPage()
-    {
-        if (_currentPage < _totalPages)
-            _currentPage++;
-    }
-    
-    private void PreviousPage()
-    {
-        if (_currentPage > 1)
-            _currentPage--;
-    }
-    
-    protected override async Task OnInitializedAsync()
-    {
-        // Check for query parameters (from drill-down)
-        var uri = new Uri(Navigation.Uri);
-        var query = System.Web.HttpUtility.ParseQueryString(uri.Query);
-        
-        if (!string.IsNullOrEmpty(query["merchantId"]))
-        {
-            _selectedMerchantIds = new List<string> { query["merchantId"] };
-        }
-        
-        if (!string.IsNullOrEmpty(query["startDate"]))
-        {
-            if (DateOnly.TryParse(query["startDate"], out var startDate))
-            {
-                _startDate = startDate;
-            }
-        }
-        
-        if (!string.IsNullOrEmpty(query["endDate"]))
-        {
-            if (DateOnly.TryParse(query["endDate"], out var endDate))
-            {
-                _endDate = endDate;
-            }
-        }
-        
-        await LoadData();
-    }
-    
-    private async Task LoadData()
-    {
-        try
-        {
-            isLoading = true;
-            errorMessage = null;
-            StateHasChanged();
-            
-            var correlationId = new CorrelationId(Guid.NewGuid());
-            var estateId = Guid.Parse(DEFAULT_ESTATE_ID);
-            var accessToken = DEFAULT_ACCESS_TOKEN;
-            
-            // Load filter options
-            var merchantsTask = Mediator.Send(new MerchantQueries.GetMerchantsForDropDownQuery(correlationId, estateId));
-            var operatorsTask = Mediator.Send(new OperatorQueries.GetOperatorsForDropDownQuery(correlationId, estateId));
-            var contractsTask = Mediator.Send(new ContractQueries.GetContractsQuery(correlationId, estateId));
-            
-            await Task.WhenAll(merchantsTask, operatorsTask, contractsTask);
-            
-            if (merchantsTask.Result.IsSuccess)
-                merchants = ModelFactory.ConvertFrom(merchantsTask.Result.Data);
-            
-            if (operatorsTask.Result.IsSuccess)
-                operators = ModelFactory.ConvertFrom(operatorsTask.Result.Data);
-            
-            if (contractsTask.Result.IsSuccess)
-            {
-                // Extract all products from all contracts
-                products = contractsTask.Result.Data
-                    ?.SelectMany(c => ModelFactory.ConvertFrom(c.Products) ?? new List<ContractProductModel>())
-                    .Where(p => !string.IsNullOrEmpty(p.ProductName))
-                    .DistinctBy(p => p.ProductName)
-                    .ToList();
-            }
-            
-            // Load detail data
-            await LoadDetailData();
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Failed to load data: {ex.Message}";
-            Logger.LogError(ex, "Error loading transaction detail data");
-        }
-        finally
-        {
-            isLoading = false;
-            StateHasChanged();
-        }
-    }
-    
-    private async Task LoadDetailData()
-    {
-        try
-        {
-            var correlationId = new CorrelationId(Guid.NewGuid());
-            var estateId = Guid.Parse(DEFAULT_ESTATE_ID);
-            var accessToken = DEFAULT_ACCESS_TOKEN;
-            
-            var startDate = _startDate.ToDateTime(TimeOnly.MinValue);
-            var endDate = _endDate.ToDateTime(TimeOnly.MaxValue);
-            
-            // Parse selected IDs with error handling
-            var merchantIds = ParseGuidList(_selectedMerchantIds);
-            var operatorIds = ParseGuidList(_selectedOperatorIds);
-            var productIds = ParseGuidList(_selectedProductIds);
-            
-            var result = await Mediator.Send(new Queries.GetTransactionDetailQuery(
-                correlationId, 
-                accessToken, 
-                estateId, 
-                startDate, 
-                endDate, 
-                merchantIds, 
-                operatorIds, 
-                productIds
-            ));
-            
-            if (result.IsSuccess && result.Data != null)
-            {
-                detailData = ModelFactory.ConvertFrom(result.Data);
-                CalculateKPIs();
-            }
-            else
-            {
-                errorMessage = result.Message ?? "Failed to load transaction detail data";
-            }
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Failed to load transaction detail data: {ex.Message}";
-            Logger.LogError(ex, "Error loading transaction detail data");
-        }
-    }
-    
-    private List<Guid>? ParseGuidList(List<string> stringIds)
-    {
-        if (!stringIds.Any()) return null;
-        
-        var guids = new List<Guid>();
-        foreach (var id in stringIds)
-        {
-            if (Guid.TryParse(id, out var guid))
-            {
-                guids.Add(guid);
-            }
-        }
-        return guids.Any() ? guids : null;
-    }
-    
-    private void CalculateKPIs()
-    {
-        if (detailData == null || !detailData.Any())
-        {
-            totalTransactions = 0;
-            totalGrossAmount = 0;
-            totalFees = 0;
-            totalNetAmount = 0;
-            return;
-        }
-        
-        totalTransactions = detailData.Count;
-        totalGrossAmount = detailData.Sum(t => t.GrossAmount);
-        totalFees = detailData.Sum(t => t.FeesCommission);
-        totalNetAmount = detailData.Sum(t => t.NetAmount);
-    }
-    
-    private async Task ApplyFilters()
-    {
-        _currentPage = 1; // Reset to first page when filters are applied
-        await LoadDetailData();
-    }
-    
-    private async Task ClearFilters()
-    {
-        _startDate = DateOnly.FromDateTime(DateTime.Now.AddDays(-7));
-        _endDate = DateOnly.FromDateTime(DateTime.Now);
-        _selectedMerchantIds = new List<string>();
-        _selectedOperatorIds = new List<string>();
-        _selectedProductIds = new List<string>();
-        _currentPage = 1; // Reset to first page when filters are cleared
-        await LoadDetailData();
-    }
-    
-    private void SortBy(string columnName)
-    {
-        if (detailData == null || !detailData.Any())
-            return;
-        
-        if (_currentSortColumn == columnName)
-        {
-            _sortAscending = !_sortAscending;
-        }
-        else
-        {
-            _currentSortColumn = columnName;
-            _sortAscending = true;
-        }
-        
-        _currentPage = 1; // Reset to first page when sorting changes
-        
-        detailData = columnName switch
-        {
-            nameof(TransactionDetailModel.TransactionId) => _sortAscending 
-                ? detailData.OrderBy(t => t.TransactionId).ToList()
-                : detailData.OrderByDescending(t => t.TransactionId).ToList(),
-            nameof(TransactionDetailModel.TransactionDateTime) => _sortAscending 
-                ? detailData.OrderBy(t => t.TransactionDateTime).ToList()
-                : detailData.OrderByDescending(t => t.TransactionDateTime).ToList(),
-            nameof(TransactionDetailModel.MerchantName) => _sortAscending 
-                ? detailData.OrderBy(t => t.MerchantName).ToList()
-                : detailData.OrderByDescending(t => t.MerchantName).ToList(),
-            nameof(TransactionDetailModel.OperatorName) => _sortAscending 
-                ? detailData.OrderBy(t => t.OperatorName).ToList()
-                : detailData.OrderByDescending(t => t.OperatorName).ToList(),
-            nameof(TransactionDetailModel.ProductName) => _sortAscending 
-                ? detailData.OrderBy(t => t.ProductName).ToList()
-                : detailData.OrderByDescending(t => t.ProductName).ToList(),
-            nameof(TransactionDetailModel.TransactionType) => _sortAscending 
-                ? detailData.OrderBy(t => t.TransactionType).ToList()
-                : detailData.OrderByDescending(t => t.TransactionType).ToList(),
-            nameof(TransactionDetailModel.TransactionStatus) => _sortAscending 
-                ? detailData.OrderBy(t => t.TransactionStatus).ToList()
-                : detailData.OrderByDescending(t => t.TransactionStatus).ToList(),
-            nameof(TransactionDetailModel.GrossAmount) => _sortAscending 
-                ? detailData.OrderBy(t => t.GrossAmount).ToList()
-                : detailData.OrderByDescending(t => t.GrossAmount).ToList(),
-            nameof(TransactionDetailModel.FeesCommission) => _sortAscending 
-                ? detailData.OrderBy(t => t.FeesCommission).ToList()
-                : detailData.OrderByDescending(t => t.FeesCommission).ToList(),
-            nameof(TransactionDetailModel.NetAmount) => _sortAscending 
-                ? detailData.OrderBy(t => t.NetAmount).ToList()
-                : detailData.OrderByDescending(t => t.NetAmount).ToList(),
-            _ => detailData
-        };
-        
-        CalculateKPIs();
-    }
-    
-    private string GetSortIcon(string columnName)
-    {
-        if (_currentSortColumn != columnName)
-            return "↕";
-        
-        return _sortAscending ? "↑" : "↓";
-    }
-    
-    private string GetShortId(Guid transactionId)
-    {
-        var idString = transactionId.ToString();
-        return idString.Length >= 8 ? $"{idString.Substring(0, 8)}..." : idString;
-    }
-    
-    private string GetTypeBadgeClass(string? type)
-    {
-        return type switch
-        {
-            "Sale" => "badge-primary",
-            "Refund" => "badge-warning",
-            "Reversal" => "badge-secondary",
-            _ => "badge-default"
-        };
-    }
-    
-    private string GetStatusBadgeClass(string? status)
-    {
-        return status switch
-        {
-            "Successful" => "badge-success",
-            "Failed" => "badge-danger",
-            "Reversed" => "badge-warning",
-            _ => "badge-default"
-        };
-    }
-    
-    private async Task ExportToCSV()
-    {
-        if (detailData == null || !detailData.Any())
-            return;
-        
-        try
-        {
-            var csv = new StringBuilder();
-            
-            // Header
-            csv.AppendLine("Transaction ID,Transaction Date & Time,Merchant,Operator,Product,Transaction Type,Transaction Status,Gross Amount,Fees/Commission,Net Amount,Settlement Reference");
-            
-            // Data rows
-            foreach (var item in detailData)
-            {
-                csv.AppendLine($"\"{item.TransactionId}\",\"{item.TransactionDateTime:yyyy-MM-dd HH:mm:ss}\",\"{item.MerchantName}\",\"{item.OperatorName}\",\"{item.ProductName}\",\"{item.TransactionType}\",\"{item.TransactionStatus}\",{item.GrossAmount},{item.FeesCommission},{item.NetAmount},\"{item.SettlementReference ?? ""}\"");
-            }
-            
-            var fileName = $"transaction-detail-{DateTime.Now:yyyyMMdd-HHmmss}.csv";
-            var bytes = Encoding.UTF8.GetBytes(csv.ToString());
-            var base64 = Convert.ToBase64String(bytes);
-            
-            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, base64);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex, "Error exporting to CSV");
-            errorMessage = "Failed to export data to CSV";
-        }
-    }
-    
-    private string GetBackUrl()
-    {
-        var uri = Navigation.Uri;
-        if (uri.Contains("returnUrl="))
-        {
-            var startIndex = uri.IndexOf("returnUrl=") + "returnUrl=".Length;
-            var endIndex = uri.IndexOf("&", startIndex);
-            var returnUrl = endIndex > 0 
-                ? uri.Substring(startIndex, endIndex - startIndex) 
-                : uri.Substring(startIndex);
-            return Uri.UnescapeDataString(returnUrl);
-        }
-        
-        return "/reporting";
-    }
-
-    private string GetBackButtonText()
-    {
-        var backUrl = GetBackUrl();
-        if (backUrl.Contains("transaction-summary-merchant"))
-        {
-            return "Back to Merchant Summary";
-        }
-        
-        return "Back to Reporting";
-    }
-    
-    private void OnMerchantSelectionChanged(List<string> selectedIds)
-    {
-        _selectedMerchantIds = selectedIds;
-    }
-    
-    private void OnOperatorSelectionChanged(List<string> selectedIds)
-    {
-        _selectedOperatorIds = selectedIds;
-    }
-    
-    private void OnProductSelectionChanged(List<string> selectedIds)
-    {
-        _selectedProductIds = selectedIds;
-    }
 }
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Reporting/TransactionDetail.razor.cs b/EstateManagementUI.BlazorServer/Components/Pages/Reporting/TransactionDetail.razor.cs
new file mode 100644
index 00000000..03ecc176
--- /dev/null
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Reporting/TransactionDetail.razor.cs
@@ -0,0 +1,406 @@
+using EstateManagementUI.BlazorServer.Factories;
+using EstateManagementUI.BlazorServer.Models;
+using EstateManagementUI.BlazorServer.Permissions;
+using EstateManagementUI.BusinessLogic.Requests;
+using Microsoft.JSInterop;
+using System.Text;
+using Shared.Results;
+using SimpleResults;
+
+namespace EstateManagementUI.BlazorServer.Components.Pages.Reporting
+{
+    public partial class TransactionDetail
+    {
+        private bool isLoading = true;
+        
+        // Filter states
+        private DateOnly _startDate = DateOnly.FromDateTime(DateTime.Now.AddDays(-7));
+        private DateOnly _endDate = DateOnly.FromDateTime(DateTime.Now);
+        private List<string> _selectedMerchantIds = new List<string>();
+        private List<string> _selectedOperatorIds = new List<string>();
+        private List<string> _selectedProductIds = new List<string>();
+
+        // Data
+        private TransactionModels.TransactionDetailReportResponse? detailData;
+        private List<MerchantModels.MerchantDropDownModel>? merchants;
+        private List<OperatorModels.OperatorDropDownModel>? operators;
+        private List<ContractModels.ContractProductModel>? products;
+
+        // KPIs
+        private int totalTransactions = 0;
+        private decimal totalGrossAmount = 0;
+        private decimal totalFees = 0;
+        private decimal totalNetAmount = 0;
+
+        // Sorting
+        private string? _currentSortColumn;
+        private bool _sortAscending = true;
+
+        // Paging
+        private int _currentPage = 1;
+        private int _pageSize = 25;
+        private int _totalPages = 0;
+
+        private List<TransactionModels.TransactionDetail> GetPagedData()
+        {
+            if (detailData.Transactions == null || detailData.Transactions.Any() == false)
+                return new List<TransactionModels.TransactionDetail>();
+
+            _totalPages = (int)Math.Ceiling(detailData.Transactions.Count / (double)_pageSize);
+
+            return detailData.Transactions
+                .Skip((_currentPage - 1) * _pageSize)
+                .Take(_pageSize)
+                .ToList();
+        }
+
+        private void GoToPage(int page)
+        {
+            if (page < 1 || page > _totalPages)
+                return;
+
+            _currentPage = page;
+        }
+
+        private void NextPage()
+        {
+            if (_currentPage < _totalPages)
+                _currentPage++;
+        }
+
+        private void PreviousPage()
+        {
+            if (_currentPage > 1)
+                _currentPage--;
+        }
+
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            if (!firstRender)
+            {
+                return;
+            }
+
+            // Check for query parameters (from drill-down)
+            var uri = new Uri(Navigation.Uri);
+            var query = System.Web.HttpUtility.ParseQueryString(uri.Query);
+
+            if (!string.IsNullOrEmpty(query["merchantId"]))
+            {
+                _selectedMerchantIds = new List<string> { query["merchantId"] };
+            }
+
+            if (!string.IsNullOrEmpty(query["startDate"]))
+            {
+                if (DateOnly.TryParse(query["startDate"], out var startDate))
+                {
+                    _startDate = startDate;
+                }
+            }
+
+            if (!string.IsNullOrEmpty(query["endDate"]))
+            {
+                if (DateOnly.TryParse(query["endDate"], out var endDate))
+                {
+                    _endDate = endDate;
+                }
+            }
+
+            Result result = await OnAfterRender(PermissionSection.Reporting, PermissionFunction.TransactionDetailReport, this.LoadData);
+            if (result.IsFailed)
+            {
+                return;
+            }
+
+            isLoading = false;
+            this.StateHasChanged();
+        }
+
+
+        private async Task<Result> LoadData() {
+            isLoading = true;
+            errorMessage = null;
+            StateHasChanged();
+
+            var correlationId = new CorrelationId(Guid.NewGuid());
+            var estateId = await this.GetEstateId();
+
+            // Load filter options
+            var merchantsTask = Mediator.Send(new MerchantQueries.GetMerchantsForDropDownQuery(correlationId, estateId));
+            var operatorsTask = Mediator.Send(new OperatorQueries.GetOperatorsForDropDownQuery(correlationId, estateId));
+            var contractsTask = Mediator.Send(new ContractQueries.GetContractsQuery(correlationId, estateId));
+
+            await Task.WhenAll(merchantsTask, operatorsTask, contractsTask);
+
+            if (merchantsTask.Result.IsSuccess)
+                merchants = ModelFactory.ConvertFrom(merchantsTask.Result.Data);
+
+            if (operatorsTask.Result.IsSuccess)
+                operators = ModelFactory.ConvertFrom(operatorsTask.Result.Data);
+
+            if (contractsTask.Result.IsSuccess) {
+                // Extract all products from all contracts
+                products = contractsTask.Result.Data?.SelectMany(c => ModelFactory.ConvertFrom(c.Products) ?? new List<ContractModels.ContractProductModel>()).Where(p => !string.IsNullOrEmpty(p.ProductName)).DistinctBy(p => p.ProductName).ToList();
+            }
+
+            // Load detail data
+            var result = await LoadDetailData();
+
+            if (result.IsFailed) {
+                errorMessage = "Failed to load transaction detail data";
+            }
+
+            isLoading = false;
+            StateHasChanged();
+
+            return Result.Success();
+        }
+
+        private async Task<Result> LoadDetailData() {
+            var correlationId = new CorrelationId(Guid.NewGuid());
+            var estateId = await this.GetEstateId();
+
+            // Parse selected IDs with error handling
+            var merchantIds = this.ParseInt32List(_selectedMerchantIds);
+            var operatorIds = this.ParseInt32List(_selectedOperatorIds);
+            var productIds = this.ParseInt32List(_selectedProductIds);
+
+            var result = await Mediator.Send(new TransactionQueries.GetTransactionDetailQuery(correlationId, estateId,
+                _startDate.ToDateTime(TimeOnly.MinValue), _endDate.ToDateTime(TimeOnly.MinValue), merchantIds, operatorIds, productIds));
+
+            if (result.IsFailed)
+                return ResultHelpers.CreateFailure(result);
+
+            detailData = ModelFactory.ConvertFrom(result.Data);
+            CalculateKPIs();
+            return Result.Success();
+        }
+
+        private List<Guid>? ParseGuidList(List<string> stringIds)
+        {
+            if (!stringIds.Any()) return null;
+
+            var guids = new List<Guid>();
+            foreach (var id in stringIds)
+            {
+                if (Guid.TryParse(id, out var guid))
+                {
+                    guids.Add(guid);
+                }
+            }
+            return guids.Any() ? guids : null;
+        }
+
+        private List<Int32>? ParseInt32List(List<string> stringIds)
+        {
+            if (!stringIds.Any()) return null;
+
+            var ints = new List<Int32>();
+            foreach (var id in stringIds)
+            {
+                if (Int32.TryParse(id, out var intValue))
+                {
+                    ints.Add(intValue);
+                }
+            }
+            return ints.Any() ? ints : null;
+        }
+
+        private void CalculateKPIs()
+        {
+            if (detailData.Summary == null) {
+                totalTransactions = 0;
+                totalGrossAmount = 0;
+                totalFees = 0;
+                totalNetAmount = 0;
+                return;
+            }
+
+            totalTransactions = detailData.Summary.TransactionCount;
+            totalGrossAmount = detailData.Summary.TotalValue;
+            totalFees = detailData.Summary.TotalFees;
+            totalNetAmount = detailData.Summary.TotalValue - this.detailData.Summary.TotalFees;
+        }
+
+        private async Task ApplyFilters()
+        {
+            _currentPage = 1; // Reset to first page when filters are applied
+            await LoadDetailData();
+        }
+
+        private async Task ClearFilters()
+        {
+            _startDate = DateOnly.FromDateTime(DateTime.Now.AddDays(-7));
+            _endDate = DateOnly.FromDateTime(DateTime.Now);
+            _selectedMerchantIds = new List<string>();
+            _selectedOperatorIds = new List<string>();
+            _selectedProductIds = new List<string>();
+            _currentPage = 1; // Reset to first page when filters are cleared
+            await LoadDetailData();
+        }
+
+        private void SortBy(string columnName)
+        {
+            if (detailData.Transactions == null || !detailData.Transactions.Any())
+                return;
+
+            if (_currentSortColumn == columnName)
+            {
+                _sortAscending = !_sortAscending;
+            }
+            else
+            {
+                _currentSortColumn = columnName;
+                _sortAscending = true;
+            }
+
+            _currentPage = 1; // Reset to first page when sorting changes
+
+            detailData.Transactions = columnName switch
+            {
+                nameof(TransactionDetailModel.TransactionId) => _sortAscending
+                    ? detailData.Transactions.OrderBy(t => t.Id).ToList()
+                    : detailData.Transactions.OrderByDescending(t => t.Id).ToList(),
+                nameof(TransactionDetailModel.TransactionDateTime) => _sortAscending
+                    ? detailData.Transactions.OrderBy(t => t.DateTime).ToList()
+                    : detailData.Transactions.OrderByDescending(t => t.DateTime).ToList(),
+                nameof(TransactionDetailModel.MerchantName) => _sortAscending
+                    ? detailData.Transactions.OrderBy(t => t.Merchant).ToList()
+                    : detailData.Transactions.OrderByDescending(t => t.Merchant).ToList(),
+                nameof(TransactionDetailModel.OperatorName) => _sortAscending
+                    ? detailData.Transactions.OrderBy(t => t.Operator).ToList()
+                    : detailData.Transactions.OrderByDescending(t => t.Operator).ToList(),
+                nameof(TransactionDetailModel.ProductName) => _sortAscending
+                    ? detailData.Transactions.OrderBy(t => t.Product).ToList()
+                    : detailData.Transactions.OrderByDescending(t => t.Product).ToList(),
+                nameof(TransactionDetailModel.TransactionType) => _sortAscending
+                    ? detailData.Transactions.OrderBy(t => t.Type).ToList()
+                    : detailData.Transactions.OrderByDescending(t => t.Type).ToList(),
+                nameof(TransactionDetailModel.TransactionStatus) => _sortAscending
+                    ? detailData.Transactions.OrderBy(t => t.Status).ToList()
+                    : detailData.Transactions.OrderByDescending(t => t.Status).ToList(),
+                nameof(TransactionDetailModel.GrossAmount) => _sortAscending
+                    ? detailData.Transactions.OrderBy(t => t.Value).ToList()
+                    : detailData.Transactions.OrderByDescending(t => t.Value).ToList(),
+                nameof(TransactionDetailModel.FeesCommission) => _sortAscending
+                    ? detailData.Transactions.OrderBy(t => t.TotalFees).ToList()
+                    : detailData.Transactions.OrderByDescending(t => t.TotalFees).ToList(),
+                //nameof(TransactionDetailModel.NetAmount) => _sortAscending
+                //    ? detailData.Transactions.OrderBy(t => t.NetAmount).ToList()
+                //    : detailData.Transactions.OrderByDescending(t => t.NetAmount).ToList(),
+                _ => detailData.Transactions
+            };
+
+            CalculateKPIs();
+        }
+
+        private string GetSortIcon(string columnName)
+        {
+            if (_currentSortColumn != columnName)
+                return "↕";
+
+            return _sortAscending ? "↑" : "↓";
+        }
+
+        private string GetShortId(Guid transactionId)
+        {
+            var idString = transactionId.ToString();
+            return idString.Length >= 8 ? $"{idString.Substring(0, 8)}..." : idString;
+        }
+
+        private string GetTypeBadgeClass(string? type)
+        {
+            return type switch
+            {
+                "Sale" => "badge-primary",
+                "Refund" => "badge-warning",
+                "Reversal" => "badge-secondary",
+                _ => "badge-default"
+            };
+        }
+
+        private string GetStatusBadgeClass(string? status)
+        {
+            return status switch
+            {
+                "Successful" => "badge-success",
+                "Failed" => "badge-danger",
+                "Reversed" => "badge-warning",
+                _ => "badge-default"
+            };
+        }
+
+        private async Task ExportToCSV()
+        {
+            if (detailData.Transactions == null || !detailData.Transactions.Any())
+                return;
+
+            try
+            {
+                var csv = new StringBuilder();
+
+                // Header
+                csv.AppendLine("Transaction ID,Transaction Date & Time,Merchant,Operator,Product,Transaction Type,Transaction Status,Gross Amount,Fees/Commission,Settlement Reference");
+
+                // Data rows
+                foreach (var item in detailData.Transactions)
+                {
+                    csv.AppendLine($"\"{item.Id}\",\"{item.DateTime:yyyy-MM-dd HH:mm:ss}\",\"{item.Merchant}\",\"{item.Operator}\",\"{item.Product}\",\"{item.Type}\",\"{item.Status}\",{item.Value},{item.TotalFees},\"{item.SettlementReference ?? ""}\"");
+                }
+
+                var fileName = $"transaction-detail-{DateTime.Now:yyyyMMdd-HHmmss}.csv";
+                var bytes = Encoding.UTF8.GetBytes(csv.ToString());
+                var base64 = Convert.ToBase64String(bytes);
+
+                await JSRuntime.InvokeVoidAsync("downloadFile", fileName, base64);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex, "Error exporting to CSV");
+                errorMessage = "Failed to export data to CSV";
+            }
+        }
+
+        private string GetBackUrl()
+        {
+            var uri = Navigation.Uri;
+            if (uri.Contains("returnUrl="))
+            {
+                var startIndex = uri.IndexOf("returnUrl=") + "returnUrl=".Length;
+                var endIndex = uri.IndexOf("&", startIndex);
+                var returnUrl = endIndex > 0
+                    ? uri.Substring(startIndex, endIndex - startIndex)
+                    : uri.Substring(startIndex);
+                return Uri.UnescapeDataString(returnUrl);
+            }
+
+            return "/reporting";
+        }
+
+        private string GetBackButtonText()
+        {
+            var backUrl = GetBackUrl();
+            if (backUrl.Contains("transaction-summary-merchant"))
+            {
+                return "Back to Merchant Summary";
+            }
+
+            return "Back to Reporting";
+        }
+
+        private void OnMerchantSelectionChanged(List<string> selectedIds)
+        {
+            _selectedMerchantIds = selectedIds;
+        }
+
+        private void OnOperatorSelectionChanged(List<string> selectedIds)
+        {
+            _selectedOperatorIds = selectedIds;
+        }
+
+        private void OnProductSelectionChanged(List<string> selectedIds)
+        {
+            _selectedProductIds = selectedIds;
+        }
+    }
+}
diff --git a/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs b/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs
index bae5540b..2c51a5f4 100644
--- a/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs
+++ b/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs
@@ -1,4 +1,5 @@
 using EstateManagementUI.BlazorServer.Models;
+using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
 using EstateManagementUI.BusinessLogic.Models;
 using TransactionProcessor.DataTransferObjects.Responses.Contract;
 using ComparisonDateModel = EstateManagementUI.BlazorServer.Models.ComparisonDateModel;
@@ -30,6 +31,7 @@
 using TodaysSalesValueByHourModel = EstateManagementUI.BlazorServer.Models.TodaysSalesValueByHourModel;
 using TodaysSettlementModel = EstateManagementUI.BlazorServer.Models.TodaysSettlementModel;
 using TransactionDetailModel = EstateManagementUI.BlazorServer.Models.TransactionDetailModel;
+using TransactionModels = EstateManagementUI.BlazorServer.Models.TransactionModels;
 
 namespace EstateManagementUI.BlazorServer.Factories {
     public static class ModelFactory {
@@ -408,6 +410,7 @@ private static RecentContractModel ConvertFrom(BusinessLogic.Models.ContractMode
             foreach (BusinessLogic.Models.MerchantModels.MerchantDropDownModel merchantDropDownModel in resultData) {
                 merchantList.Add(new MerchantDropDownModel {
                     MerchantId = merchantDropDownModel.MerchantId,
+                    MerchantReportingId = merchantDropDownModel.MerchantReportingId,
                     MerchantName = merchantDropDownModel.MerchantName
                 });
             }
@@ -493,11 +496,43 @@ public static List<ContractDropDownModel> ConvertFrom(List<BusinessLogic.Models.
                 operatorList.Add(new OperatorDropDownModel()
                 {
                     OperatorId = operatorDropDownModel.OperatorId,
+                    OperatorReportingId = operatorDropDownModel.OperatorReportingId,
                     OperatorName = operatorDropDownModel.OperatorName
                 });
             }
 
             return operatorList;
         }
+
+        public static TransactionModels.TransactionDetailReportResponse? ConvertFrom(BusinessLogic.Models.TransactionModels.TransactionDetailReportResponse resultData) {
+            TransactionModels.TransactionDetailReportResponse model = new();
+            model.Summary = new TransactionDetailSummary {
+                TotalFees = resultData.Summary.TotalFees,
+                TotalValue = resultData.Summary.TotalValue,
+                TransactionCount = resultData.Summary.TransactionCount
+            };
+            model.Transactions = new List<TransactionModels.TransactionDetail>();
+            foreach (BusinessLogic.Models.TransactionModels.TransactionDetail resultDataTransaction in resultData.Transactions) {
+                model.Transactions.Add(new TransactionModels.TransactionDetail {
+                    TotalFees = resultDataTransaction.TotalFees,
+                    Value = resultDataTransaction.Value,
+                    Status = resultDataTransaction.Status,
+                    Type = resultDataTransaction.Type,
+                    ProductReportingId = resultDataTransaction.ProductReportingId,
+                    ProductId = resultDataTransaction.ProductId,
+                    Product = resultDataTransaction.Product,
+                    OperatorReportingId = resultDataTransaction.OperatorReportingId,
+                    OperatorId = resultDataTransaction.OperatorId,
+                    Operator = resultDataTransaction.Operator,
+                    MerchantReportingId = resultDataTransaction.MerchantReportingId,
+                    MerchantId = resultDataTransaction.MerchantId,
+                    Merchant = resultDataTransaction.Merchant,
+                    DateTime = resultDataTransaction.DateTime,
+                    Id = resultDataTransaction.Id,
+                    SettlementReference = resultDataTransaction.SettlementReference
+                });
+            }
+            return model;
+        }
     }
 }
\ No newline at end of file
diff --git a/EstateManagementUI.BlazorServer/Models/ContractModels.cs b/EstateManagementUI.BlazorServer/Models/ContractModels.cs
index 0b0b0e84..a19b384a 100644
--- a/EstateManagementUI.BlazorServer/Models/ContractModels.cs
+++ b/EstateManagementUI.BlazorServer/Models/ContractModels.cs
@@ -24,6 +24,7 @@ public class ContractModel
     public class ContractProductModel
     {
         public Guid ContractProductId { get; set; }
+        public Int32 ContractProductReportingId { get; set; }
         public string? ProductName { get; set; }
         public string? DisplayText { get; set; }
         public ProductType ProductType { get; set; }
diff --git a/EstateManagementUI.BlazorServer/Models/MerchantModels.cs b/EstateManagementUI.BlazorServer/Models/MerchantModels.cs
index 94c7316d..52b95f66 100644
--- a/EstateManagementUI.BlazorServer/Models/MerchantModels.cs
+++ b/EstateManagementUI.BlazorServer/Models/MerchantModels.cs
@@ -67,6 +67,7 @@ public class MerchantDeviceModel
     public class MerchantDropDownModel
     {
         public Guid MerchantId { get; set; }
+        public Int32 MerchantReportingId { get; set; }
         public string? MerchantName { get; set; }
     }
 
diff --git a/EstateManagementUI.BlazorServer/Models/OperatorModels.cs b/EstateManagementUI.BlazorServer/Models/OperatorModels.cs
index 5a1a6933..7123932d 100644
--- a/EstateManagementUI.BlazorServer/Models/OperatorModels.cs
+++ b/EstateManagementUI.BlazorServer/Models/OperatorModels.cs
@@ -23,6 +23,7 @@ public record OperatorModel
     public class OperatorDropDownModel
     {
         public Guid OperatorId { get; set; }
+        public Int32 OperatorReportingId { get; set; }
         public string? OperatorName { get; set; }
     }
 
diff --git a/EstateManagementUI.BlazorServer/Models/TransactionModels.cs b/EstateManagementUI.BlazorServer/Models/TransactionModels.cs
new file mode 100644
index 00000000..8ad7daae
--- /dev/null
+++ b/EstateManagementUI.BlazorServer/Models/TransactionModels.cs
@@ -0,0 +1,32 @@
+using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
+
+namespace EstateManagementUI.BlazorServer.Models;
+
+public record TransactionModels
+{
+    public class TransactionDetailReportResponse
+    {
+        public List<TransactionDetail> Transactions { get; set; }
+        public TransactionDetailSummary Summary { get; set; }
+    }
+
+    public class TransactionDetail
+    {
+        public Guid Id { get; set; }
+        public DateTime DateTime { get; set; }
+        public String Merchant { get; set; }
+        public Guid MerchantId { get; set; }
+        public Int32 MerchantReportingId { get; set; }
+        public String Operator { get; set; }
+        public Guid OperatorId { get; set; }
+        public Int32 OperatorReportingId { get; set; }
+        public String Product { get; set; }
+        public Guid ProductId { get; set; }
+        public Int32 ProductReportingId { get; set; }
+        public String Type { get; set; }
+        public String Status { get; set; }
+        public Decimal Value { get; set; }
+        public Decimal TotalFees { get; set; }
+        public String SettlementReference { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EstateManagementUI.BlazorServer/Permissions/PermissionFunction.cs b/EstateManagementUI.BlazorServer/Permissions/PermissionFunction.cs
index 178d60a6..8dc8e4bd 100644
--- a/EstateManagementUI.BlazorServer/Permissions/PermissionFunction.cs
+++ b/EstateManagementUI.BlazorServer/Permissions/PermissionFunction.cs
@@ -9,6 +9,12 @@ public enum PermissionFunction
     Create,
     Edit,
     Delete,
+    List,
+
+    // Specific functions for certain sections
+    // Merchant
     MakeDeposit,
-    List
+
+    // Reporting
+    TransactionDetailReport,
 }
diff --git a/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetail.cs b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetail.cs
new file mode 100644
index 00000000..00c82777
--- /dev/null
+++ b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetail.cs
@@ -0,0 +1,39 @@
+using Newtonsoft.Json;
+
+namespace EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
+
+public class TransactionDetail
+{
+    [JsonProperty("id")]
+    public Guid Id { get; set; }
+    [JsonProperty("date_time")]
+    public DateTime DateTime { get; set; }
+    [JsonProperty("merchant")]
+    public String Merchant { get; set; }
+    [JsonProperty("merchant_id")]
+    public Guid MerchantId { get; set; }
+    [JsonProperty("merchant_reporting_id")]
+    public Int32 MerchantReportingId { get; set; }
+    [JsonProperty("operator")]
+    public String Operator { get; set; }
+    [JsonProperty("operator_id")]
+    public Guid OperatorId { get; set; }
+    [JsonProperty("operator_reporting_id")]
+    public Int32 OperatorReportingId { get; set; }
+    [JsonProperty("product")]
+    public String Product { get; set; }
+    [JsonProperty("product_id")]
+    public Guid ProductId { get; set; }
+    [JsonProperty("product_reporting_id")]
+    public Int32 ProductReportingId { get; set; }
+    [JsonProperty("type")]
+    public String Type { get; set; }
+    [JsonProperty("status")]
+    public String Status { get; set; }
+    [JsonProperty("value")]
+    public Decimal Value { get; set; }
+    [JsonProperty("total_fees")]
+    public Decimal TotalFees { get; set; }
+    [JsonProperty("settlement_reference")]
+    public String SettlementReference { get; set; }
+}
\ No newline at end of file
diff --git a/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetailReportRequest.cs b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetailReportRequest.cs
new file mode 100644
index 00000000..1af56515
--- /dev/null
+++ b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetailReportRequest.cs
@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+
+namespace EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
+
+public class TransactionDetailReportRequest
+{
+    [JsonProperty("operators")]
+    public List<Int32>? Operators { get; set; }
+    [JsonProperty("merchants")]
+    public List<Int32>? Merchants { get; set; }
+    [JsonProperty("products")]
+    public List<Int32>? Products { get; set; }
+    [JsonProperty("start_date")]
+    public DateTime StartDate { get; set; }
+    [JsonProperty("end_date")]
+    public DateTime EndDate { get; set; }
+}
\ No newline at end of file
diff --git a/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetailReportResponse.cs b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetailReportResponse.cs
new file mode 100644
index 00000000..98f40bba
--- /dev/null
+++ b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetailReportResponse.cs
@@ -0,0 +1,15 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects
+{
+    public class TransactionDetailReportResponse
+    {
+        [JsonProperty("transactions")]
+        public List<TransactionDetail> Transactions { get; set; }
+        [JsonProperty("summary")]
+        public TransactionDetailSummary Summary { get; set; }
+    }
+}
diff --git a/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetailSummary.cs b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetailSummary.cs
new file mode 100644
index 00000000..2825027d
--- /dev/null
+++ b/EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/TransactionDetailSummary.cs
@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
+
+public class TransactionDetailSummary
+{
+    [JsonProperty("total_value")]
+    public Decimal TotalValue { get; set; }
+    [JsonProperty("total_fees")]
+    public Decimal TotalFees { get; set; }
+    [JsonProperty("transaction_count")]
+    public Int32 TransactionCount { get; set; }
+}
\ No newline at end of file
diff --git a/EstateManagmentUI.BusinessLogic/BackendAPI/EstateReportingApiClient.cs b/EstateManagmentUI.BusinessLogic/BackendAPI/EstateReportingApiClient.cs
index 49fddd31..f89d6801 100644
--- a/EstateManagmentUI.BusinessLogic/BackendAPI/EstateReportingApiClient.cs
+++ b/EstateManagmentUI.BusinessLogic/BackendAPI/EstateReportingApiClient.cs
@@ -80,6 +80,11 @@ Task<Result<List<MerchantOperator>>> GetMerchantOperators(String accessToken,
                                                                   Guid estateId,
                                                                   Guid merchantId,
                                                                   CancellationToken cancellationToken);
+
+        Task<Result<TransactionDetailReportResponse>> GetTransactionDetailReport(String accessToken,
+                                               Guid estateId,
+                                               TransactionDetailReportRequest request,
+                                               CancellationToken cancellationToken);
     }
 
     public class EstateReportingApiClient : ClientProxyBase.ClientProxyBase, IEstateReportingApiClient {
@@ -427,10 +432,37 @@ public async Task<Result<List<MerchantOperator>>> GetMerchantOperators(String ac
             }
         }
 
+        public async Task<Result<TransactionDetailReportResponse>> GetTransactionDetailReport(String accessToken,
+                                                                                              Guid estateId,
+                                                                                              TransactionDetailReportRequest request,
+                                                                                              CancellationToken cancellationToken) {
+            String requestUri = this.BuildRequestUrl($"/api/transactions/transactionDetailReport");
+
+            try
+            {
+                List<(String headerName, String headerValue)> additionalHeaders = [
+                    (EstateIdHeaderName, estateId.ToString())
+                ];
+                Result<TransactionDetailReportResponse>? result = await this.SendHttpPostRequest<TransactionDetailReportRequest, TransactionDetailReportResponse>(requestUri, request, accessToken, additionalHeaders, cancellationToken);
+
+                if (result.IsFailed)
+                    return ResultHelpers.CreateFailure(result);
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                // An exception has occurred, add some additional information to the message
+                Exception exception = new Exception($"Error getting transaction detail report for estate {estateId}.", ex);
+
+                return Result.Failure(exception.Message);
+            }
+        }
+
         public async Task<Result<List<MerchantDevice>>> GetMerchantDevices(String accessToken,
-                                                                               Guid estateId,
-                                                                               Guid merchantId,
-                                                                               CancellationToken cancellationToken)
+                                                                           Guid estateId,
+                                                                           Guid merchantId,
+                                                                           CancellationToken cancellationToken)
         {
             String requestUri = this.BuildRequestUrl($"/api/merchants/{merchantId}/devices");
 
diff --git a/EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs b/EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs
index e78bbb06..2959ba1b 100644
--- a/EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs
+++ b/EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs
@@ -100,6 +100,35 @@ public static EstateModels.EstateModel ConvertFrom(Estate apiResultData) {
 
         return model;
     }
+
+    public static TransactionModels.TransactionDetailReportResponse ConvertFrom(TransactionDetailReportResponse apiResultData) {
+        TransactionModels.TransactionDetailReportResponse model = new();
+
+        model.Summary = new TransactionDetailSummary { TotalFees = apiResultData.Summary.TotalFees, TotalValue = apiResultData.Summary.TotalValue, TransactionCount = apiResultData.Summary.TransactionCount };
+        model.Transactions = new();
+
+        foreach (TransactionDetail transaction in apiResultData.Transactions) {
+            model.Transactions.Add(new TransactionModels.TransactionDetail {
+                Id = transaction.Id,
+                DateTime = transaction.DateTime,
+                Merchant = transaction.Merchant,
+                MerchantId = transaction.MerchantId,
+                MerchantReportingId = transaction.MerchantReportingId,
+                Operator = transaction.Operator,
+                OperatorId = transaction.OperatorId,
+                OperatorReportingId = transaction.OperatorReportingId,
+                Product = transaction.Product,
+                ProductId = transaction.ProductId,
+                ProductReportingId = transaction.ProductReportingId,
+                Type = transaction.Type,
+                Status = transaction.Status,
+                Value = transaction.Value,
+                TotalFees = transaction.TotalFees,
+                SettlementReference = transaction.SettlementReference
+            });
+        }
+        return model;
+    }
 }
 
 public  static class FactoryExtensions{
diff --git a/EstateManagmentUI.BusinessLogic/Client/StubTestData.cs b/EstateManagmentUI.BusinessLogic/Client/StubTestData.cs
index 1c17643d..e78c2902 100644
--- a/EstateManagmentUI.BusinessLogic/Client/StubTestData.cs
+++ b/EstateManagmentUI.BusinessLogic/Client/StubTestData.cs
@@ -711,7 +711,7 @@ private static List<TransactionDetailModel> GetDemoMerchantTransactions()
         return demoTransactions;
     }
 
-    public static List<TransactionDetailModel> GetMockTransactionDetails(Queries.GetTransactionDetailQuery query)
+    public static List<TransactionDetailModel> GetMockTransactionDetails(TransactionQueries.GetTransactionDetailQuery query)
     {
         var merchants = GetMockMerchants();
         var operators = GetMockOperators();
@@ -828,20 +828,20 @@ public static List<TransactionDetailModel> GetMockTransactionDetails(Queries.Get
         // Apply filters
         IEnumerable<TransactionDetailModel> filteredTransactions = transactions;
         
-        if (query.MerchantIds != null && query.MerchantIds.Any())
-        {
-            filteredTransactions = filteredTransactions.Where(t => query.MerchantIds.Contains(t.MerchantId));
-        }
-
-        if (query.OperatorIds != null && query.OperatorIds.Any())
-        {
-            filteredTransactions = filteredTransactions.Where(t => query.OperatorIds.Contains(t.OperatorId));
-        }
-
-        if (query.ProductIds != null && query.ProductIds.Any())
-        {
-            filteredTransactions = filteredTransactions.Where(t => query.ProductIds.Contains(t.ProductId));
-        }
+        //if (query.MerchantIds != null && query.MerchantIds.Any())
+        //{
+        //    filteredTransactions = filteredTransactions.Where(t => query.MerchantIds.Contains(t.MerchantId));
+        //}
+
+        //if (query.OperatorIds != null && query.OperatorIds.Any())
+        //{
+        //    filteredTransactions = filteredTransactions.Where(t => query.OperatorIds.Contains(t.OperatorId));
+        //}
+
+        //if (query.ProductIds != null && query.ProductIds.Any())
+        //{
+        //    filteredTransactions = filteredTransactions.Where(t => query.ProductIds.Contains(t.ProductId));
+        //}
 
         // Sort by transaction date descending (most recent first) and materialize
         return filteredTransactions.OrderByDescending(t => t.TransactionDateTime).ToList();
diff --git a/EstateManagmentUI.BusinessLogic/Client/TransactionMethods.cs b/EstateManagmentUI.BusinessLogic/Client/TransactionMethods.cs
index 9d1b56ef..74651cce 100644
--- a/EstateManagmentUI.BusinessLogic/Client/TransactionMethods.cs
+++ b/EstateManagmentUI.BusinessLogic/Client/TransactionMethods.cs
@@ -11,12 +11,13 @@ namespace EstateManagementUI.BusinessLogic.Client
 {
     public partial interface IApiClient
     {
-        Task<Result<TodaysSalesModel>> GetTodaysSales(Queries.GetTodaysSalesQuery request, CancellationToken cancellationToken);
-        Task<Result<TodaysSalesModel>> GetTodaysFailedSales(Queries.GetTodaysFailedSalesQuery request, CancellationToken cancellationToken);
+        Task<Result<TodaysSalesModel>> GetTodaysSales(TransactionQueries.GetTodaysSalesQuery request, CancellationToken cancellationToken);
+        Task<Result<TodaysSalesModel>> GetTodaysFailedSales(TransactionQueries.GetTodaysFailedSalesQuery request, CancellationToken cancellationToken);
+        Task<Result<TransactionModels.TransactionDetailReportResponse>> GetTransactionDetailReport(TransactionQueries.GetTransactionDetailQuery request, CancellationToken cancellationToken);
     }
 
     public partial class ApiClient : IApiClient {
-        public async Task<Result<TodaysSalesModel>> GetTodaysSales(Queries.GetTodaysSalesQuery request,
+        public async Task<Result<TodaysSalesModel>> GetTodaysSales(TransactionQueries.GetTodaysSalesQuery request,
                                                                    CancellationToken cancellationToken) {
             // Get a token here 
             var token = await this.GetToken(cancellationToken);
@@ -33,7 +34,7 @@ public async Task<Result<TodaysSalesModel>> GetTodaysSales(Queries.GetTodaysSale
             return Result.Success(todaysSalesModel);
         }
 
-        public async Task<Result<TodaysSalesModel>> GetTodaysFailedSales(Queries.GetTodaysFailedSalesQuery request,
+        public async Task<Result<TodaysSalesModel>> GetTodaysFailedSales(TransactionQueries.GetTodaysFailedSalesQuery request,
                                                                          CancellationToken cancellationToken)
         {
             // Get a token here 
@@ -50,5 +51,29 @@ public async Task<Result<TodaysSalesModel>> GetTodaysFailedSales(Queries.GetToda
 
             return Result.Success(todaysSalesModel);
         }
+
+        public async Task<Result<TransactionModels.TransactionDetailReportResponse>> GetTransactionDetailReport(TransactionQueries.GetTransactionDetailQuery request,
+                                                                                                                CancellationToken cancellationToken) {
+            Result<String> token = await this.GetToken(cancellationToken);
+            if (token.IsFailed)
+                return ResultHelpers.CreateFailure(token);
+
+            TransactionDetailReportRequest apiRequest = new TransactionDetailReportRequest {
+                EndDate = request.EndDate,
+                StartDate = request.StartDate,
+                Merchants = request.MerchantIds,
+                Operators = request.OperatorIds,
+                Products = request.ProductIds
+            };
+
+            Result<TransactionDetailReportResponse> apiResult = await this.EstateReportingApiClient.GetTransactionDetailReport(token.Data, request.EstateId, apiRequest, cancellationToken);
+
+            if (apiResult.IsFailed)
+                return ResultHelpers.CreateFailure(apiResult);
+
+            TransactionModels.TransactionDetailReportResponse transactionDetailReportResponseModel = APIModelFactory.ConvertFrom(apiResult.Data);
+
+            return Result.Success(transactionDetailReportResponseModel);
+        }
     }
 }
diff --git a/EstateManagmentUI.BusinessLogic/Models/ContractModels.cs b/EstateManagmentUI.BusinessLogic/Models/ContractModels.cs
index 851b649b..8ab2e778 100644
--- a/EstateManagmentUI.BusinessLogic/Models/ContractModels.cs
+++ b/EstateManagmentUI.BusinessLogic/Models/ContractModels.cs
@@ -17,6 +17,7 @@ public class ContractDropDownModel {
 
     public class ContractProductModel {
         public Guid ContractProductId { get; set; }
+        public Int32 ContractProductReportingId { get; set; }
         public string? ProductName { get; set; }
         public string? DisplayText { get; set; }
 
diff --git a/EstateManagmentUI.BusinessLogic/Models/MerchantModels.cs b/EstateManagmentUI.BusinessLogic/Models/MerchantModels.cs
index 638ac2b4..2f55fcc6 100644
--- a/EstateManagmentUI.BusinessLogic/Models/MerchantModels.cs
+++ b/EstateManagmentUI.BusinessLogic/Models/MerchantModels.cs
@@ -41,6 +41,7 @@ public class MerchantListModel {
 
         public class MerchantDropDownModel {
             public Guid MerchantId { get; set; }
+            public Int32 MerchantReportingId { get; set; }
             public string? MerchantName { get; set; }
         }
 
diff --git a/EstateManagmentUI.BusinessLogic/Models/OperatorModels.cs b/EstateManagmentUI.BusinessLogic/Models/OperatorModels.cs
index 21f53f77..7fa8fb69 100644
--- a/EstateManagmentUI.BusinessLogic/Models/OperatorModels.cs
+++ b/EstateManagmentUI.BusinessLogic/Models/OperatorModels.cs
@@ -10,6 +10,7 @@ public class OperatorModel {
 
         public class OperatorDropDownModel {
             public Guid OperatorId { get; set; }
+            public Int32 OperatorReportingId { get; set; }
             public string? OperatorName { get; set; }
         }
     }
diff --git a/EstateManagmentUI.BusinessLogic/Models/TransactionModels.cs b/EstateManagmentUI.BusinessLogic/Models/TransactionModels.cs
new file mode 100644
index 00000000..03abbc2f
--- /dev/null
+++ b/EstateManagmentUI.BusinessLogic/Models/TransactionModels.cs
@@ -0,0 +1,37 @@
+using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace EstateManagementUI.BusinessLogic.Models
+{
+    public class TransactionModels
+    {
+        public class TransactionDetailReportResponse
+        {
+            public List<TransactionDetail> Transactions { get; set; }
+            public TransactionDetailSummary Summary { get; set; }
+        }
+
+        public class TransactionDetail
+        {
+            public Guid Id { get; set; }
+            public DateTime DateTime { get; set; }
+            public String Merchant { get; set; }
+            public Guid MerchantId { get; set; }
+            public Int32 MerchantReportingId { get; set; }
+            public String Operator { get; set; }
+            public Guid OperatorId { get; set; }
+            public Int32 OperatorReportingId { get; set; }
+            public String Product { get; set; }
+            public Guid ProductId { get; set; }
+            public Int32 ProductReportingId { get; set; }
+            public String Type { get; set; }
+            public String Status { get; set; }
+            public Decimal Value { get; set; }
+            public Decimal TotalFees { get; set; }
+            public String SettlementReference { get; set; }
+        }
+    }
+}
diff --git a/EstateManagmentUI.BusinessLogic/RequestHandlers/DashboardRequestHandler.cs b/EstateManagmentUI.BusinessLogic/RequestHandlers/DashboardRequestHandler.cs
index 08212f91..7e9cc5ae 100644
--- a/EstateManagmentUI.BusinessLogic/RequestHandlers/DashboardRequestHandler.cs
+++ b/EstateManagmentUI.BusinessLogic/RequestHandlers/DashboardRequestHandler.cs
@@ -6,20 +6,19 @@
 
 namespace EstateManagementUI.BusinessLogic.RequestHandlers;
 
-public class DashboardRequestHandler : IRequestHandler<Queries.GetTodaysSalesQuery, Result<TodaysSalesModel>>,
+public class DashboardRequestHandler : 
     IRequestHandler<Queries.GetTodaysSettlementQuery, Result<TodaysSettlementModel>>,
     IRequestHandler<Queries.GetTodaysSalesCountByHourQuery, Result<List<TodaysSalesCountByHourModel>>>,
     IRequestHandler<Queries.GetTodaysSalesValueByHourQuery, Result<List<TodaysSalesValueByHourModel>>>,
-    IRequestHandler<MerchantQueries.GetMerchantKpiQuery, Result<MerchantModels.MerchantKpiModel>>,
-    IRequestHandler<Queries.GetTodaysFailedSalesQuery, Result<TodaysSalesModel>>,
+    
     IRequestHandler<Queries.GetTopProductDataQuery, Result<List<TopBottomProductDataModel>>>,
     IRequestHandler<Queries.GetBottomProductDataQuery, Result<List<TopBottomProductDataModel>>>,
     IRequestHandler<Queries.GetTopMerchantDataQuery, Result<List<TopBottomMerchantDataModel>>>,
     IRequestHandler<Queries.GetBottomMerchantDataQuery, Result<List<TopBottomMerchantDataModel>>>,
     IRequestHandler<Queries.GetTopOperatorDataQuery, Result<List<TopBottomOperatorDataModel>>>,
     IRequestHandler<Queries.GetBottomOperatorDataQuery, Result<List<TopBottomOperatorDataModel>>>,
-    IRequestHandler<Queries.GetLastSettlementQuery, Result<LastSettlementModel>>,
-    IRequestHandler<Queries.GetTransactionDetailQuery, Result<List<TransactionDetailModel>>>
+    IRequestHandler<Queries.GetLastSettlementQuery, Result<LastSettlementModel>>//,
+    //IRequestHandler<Queries.GetTransactionDetailQuery, Result<List<TransactionDetailModel>>>
 {
     private readonly IApiClient ApiClient;
 
@@ -29,10 +28,7 @@ public DashboardRequestHandler(IApiClient apiClient) {
     }
 
     // Implementations similar to above handlers returning stub data
-    public async Task<Result<TodaysSalesModel>> Handle(Queries.GetTodaysSalesQuery request,
-                                                       CancellationToken cancellationToken) {
-        return await this.ApiClient.GetTodaysSales(request, cancellationToken);
-    }
+    
 
     public async Task<Result<TodaysSettlementModel>> Handle(Queries.GetTodaysSettlementQuery request,
                                                             CancellationToken cancellationToken) {
@@ -48,17 +44,7 @@ public async Task<Result<List<TodaysSalesValueByHourModel>>> Handle(Queries.GetT
                                                                         CancellationToken cancellationToken) {
         return Result.Success(StubTestData.GetMockSalesValueByHour());
     }
-
-    public async Task<Result<MerchantModels.MerchantKpiModel>> Handle(MerchantQueries.GetMerchantKpiQuery request,
-                                                                      CancellationToken cancellationToken) {
-        return await this.ApiClient.GetMerchantKpi(request, cancellationToken);
-    }
-
-    public async Task<Result<TodaysSalesModel>> Handle(Queries.GetTodaysFailedSalesQuery request,
-                                                       CancellationToken cancellationToken) {
-        return await this.ApiClient.GetTodaysFailedSales(request, cancellationToken);
-    }
-
+    
     public async Task<Result<List<TopBottomProductDataModel>>> Handle(Queries.GetTopProductDataQuery request,
                                                                       CancellationToken cancellationToken) {
         return Result.Success(StubTestData.GetMockTopProducts());
@@ -93,9 +79,4 @@ public async Task<Result<LastSettlementModel>> Handle(Queries.GetLastSettlementQ
                                                           CancellationToken cancellationToken) {
         return Result.Success(StubTestData.GetMockLastSettlement());
     }
-
-    public async Task<Result<List<TransactionDetailModel>>> Handle(Queries.GetTransactionDetailQuery request,
-                                                                   CancellationToken cancellationToken) {
-        return Result.Success(StubTestData.GetMockTransactionDetails(request));
-    }
 }
\ No newline at end of file
diff --git a/EstateManagmentUI.BusinessLogic/RequestHandlers/MerchantRequestHandler.cs b/EstateManagmentUI.BusinessLogic/RequestHandlers/MerchantRequestHandler.cs
index 9d572aaa..53614747 100644
--- a/EstateManagmentUI.BusinessLogic/RequestHandlers/MerchantRequestHandler.cs
+++ b/EstateManagmentUI.BusinessLogic/RequestHandlers/MerchantRequestHandler.cs
@@ -22,7 +22,8 @@ public class MerchantRequestHandler : IRequestHandler<MerchantQueries.GetMerchan
     IRequestHandler<MerchantQueries.GetMerchantsForDropDownQuery, Result<List<MerchantModels.MerchantDropDownModel>>>,
     IRequestHandler<MerchantQueries.GetMerchantContractsQuery, Result<List<MerchantModels.MerchantContractModel>>>,
     IRequestHandler<MerchantQueries.GetMerchantOperatorsQuery, Result<List<MerchantModels.MerchantOperatorModel>>>,
-    IRequestHandler<MerchantQueries.GetMerchantDevicesQuery, Result<List<MerchantModels.MerchantDeviceModel>>>
+    IRequestHandler<MerchantQueries.GetMerchantDevicesQuery, Result<List<MerchantModels.MerchantDeviceModel>>>,
+    IRequestHandler<MerchantQueries.GetMerchantKpiQuery, Result<MerchantModels.MerchantKpiModel>>
 {
 
     private readonly IApiClient ApiClient;
@@ -123,4 +124,9 @@ public async Task<Result> Handle(MerchantCommands.AssignContractToMerchantComman
                                                                                CancellationToken cancellationToken) {
         return await this.ApiClient.GetMerchantDevices(request, cancellationToken);
     }
+
+    public async Task<Result<MerchantModels.MerchantKpiModel>> Handle(MerchantQueries.GetMerchantKpiQuery request,
+                                                                      CancellationToken cancellationToken) {
+        return await this.ApiClient.GetMerchantKpi(request, cancellationToken);
+    }
 }
\ No newline at end of file
diff --git a/EstateManagmentUI.BusinessLogic/RequestHandlers/TransactionRequestHandler.cs b/EstateManagmentUI.BusinessLogic/RequestHandlers/TransactionRequestHandler.cs
new file mode 100644
index 00000000..601c960c
--- /dev/null
+++ b/EstateManagmentUI.BusinessLogic/RequestHandlers/TransactionRequestHandler.cs
@@ -0,0 +1,32 @@
+using EstateManagementUI.BusinessLogic.Client;
+using EstateManagementUI.BusinessLogic.Models;
+using EstateManagementUI.BusinessLogic.Requests;
+using MediatR;
+using SimpleResults;
+
+namespace EstateManagementUI.BusinessLogic.RequestHandlers;
+
+public class TransactionRequestHandler : IRequestHandler<TransactionQueries.GetTodaysSalesQuery, Result<TodaysSalesModel>>, 
+    IRequestHandler<TransactionQueries.GetTransactionDetailQuery, Result<TransactionModels.TransactionDetailReportResponse>>,
+    IRequestHandler<TransactionQueries.GetTodaysFailedSalesQuery, Result<TodaysSalesModel>>
+{
+    private readonly IApiClient ApiClient;
+    public TransactionRequestHandler(IApiClient apiClient) {
+        this.ApiClient = apiClient;
+    }
+
+    public async Task<Result<TransactionModels.TransactionDetailReportResponse>> Handle(TransactionQueries.GetTransactionDetailQuery request,
+                                                                                        CancellationToken cancellationToken) {
+        return await this.ApiClient.GetTransactionDetailReport(request, cancellationToken);
+    }
+
+    public async Task<Result<TodaysSalesModel>> Handle(TransactionQueries.GetTodaysSalesQuery request,
+                                                       CancellationToken cancellationToken) {
+        return await this.ApiClient.GetTodaysSales(request, cancellationToken);
+    }
+
+    public async Task<Result<TodaysSalesModel>> Handle(TransactionQueries.GetTodaysFailedSalesQuery request,
+                                                       CancellationToken cancellationToken) {
+        return await this.ApiClient.GetTodaysFailedSales(request, cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/EstateManagmentUI.BusinessLogic/Requests/Queries.cs b/EstateManagmentUI.BusinessLogic/Requests/Queries.cs
index a3361300..339f4704 100644
--- a/EstateManagmentUI.BusinessLogic/Requests/Queries.cs
+++ b/EstateManagmentUI.BusinessLogic/Requests/Queries.cs
@@ -4,6 +4,12 @@
 
 namespace EstateManagementUI.BusinessLogic.Requests;
 
+public static class TransactionQueries {
+    public record GetTodaysSalesQuery(CorrelationId CorrelationId, Guid EstateId, DateTime ComparisonDate) : IRequest<Result<TodaysSalesModel>>;
+    public record GetTodaysFailedSalesQuery(CorrelationId CorrelationId, Guid EstateId, string ResponseCode, DateTime ComparisonDate) : IRequest<Result<TodaysSalesModel>>;
+    public record GetTransactionDetailQuery(CorrelationId CorrelationId, Guid EstateId, DateTime StartDate, DateTime EndDate, List<Int32>? MerchantIds = null, List<Int32>? OperatorIds = null, List<Int32>? ProductIds = null) : IRequest<Result<TransactionModels.TransactionDetailReportResponse>>;
+}
+
 public static class Queries
 {
     public record GetFileImportLogsListQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid MerchantId, DateTime StartDate, DateTime EndDate)
@@ -12,12 +18,12 @@ public record GetFileImportLogQuery(CorrelationId CorrelationId, string AccessTo
         : IRequest<Result<FileImportLogModel>>;
     public record GetFileDetailsQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid FileId) : IRequest<Result<FileDetailsModel>>;
     public record GetComparisonDatesQuery(CorrelationId CorrelationId, Guid EstateId) : IRequest<Result<List<ComparisonDateModel>>>;
-    public record GetTodaysSalesQuery(CorrelationId CorrelationId, Guid EstateId, DateTime ComparisonDate) : IRequest<Result<TodaysSalesModel>>;
+    
     public record GetTodaysSettlementQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, DateTime ComparisonDate) : IRequest<Result<TodaysSettlementModel>>;
     public record GetTodaysSalesCountByHourQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, DateTime ComparisonDate) : IRequest<Result<List<TodaysSalesCountByHourModel>>>;
     public record GetTodaysSalesValueByHourQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, DateTime ComparisonDate) : IRequest<Result<List<TodaysSalesValueByHourModel>>>;
     
-    public record GetTodaysFailedSalesQuery(CorrelationId CorrelationId, Guid EstateId, string ResponseCode, DateTime ComparisonDate) : IRequest<Result<TodaysSalesModel>>;
+    
     public record GetTopProductDataQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, int ResultCount) : IRequest<Result<List<TopBottomProductDataModel>>>;
     public record GetBottomProductDataQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, int ResultCount) : IRequest<Result<List<TopBottomProductDataModel>>>;
     public record GetTopMerchantDataQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, int ResultCount) : IRequest<Result<List<TopBottomMerchantDataModel>>>;
@@ -31,5 +37,4 @@ public record GetProductPerformanceQuery(CorrelationId CorrelationId, string Acc
     public record GetOperatorTransactionSummaryQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, DateTime StartDate, DateTime EndDate, Guid? MerchantId = null, Guid? OperatorId = null) : IRequest<Result<List<OperatorTransactionSummaryModel>>>;
     public record GetMerchantSettlementHistoryQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid? MerchantId, DateTime StartDate, DateTime EndDate) : IRequest<Result<List<MerchantSettlementHistoryModel>>>;
     public record GetSettlementSummaryQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, DateTime StartDate, DateTime EndDate, Guid? MerchantId = null, string? Status = null) : IRequest<Result<List<SettlementSummaryModel>>>;
-    public record GetTransactionDetailQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, DateTime StartDate, DateTime EndDate, List<Guid>? MerchantIds = null, List<Guid>? OperatorIds = null, List<Guid>? ProductIds = null) : IRequest<Result<List<TransactionDetailModel>>>;
 }
\ No newline at end of file
diff --git a/EstateManagmentUI.BusinessLogic/Services/TestMediatorService.cs b/EstateManagmentUI.BusinessLogic/Services/TestMediatorService.cs
index e6aac87a..97583bca 100644
--- a/EstateManagmentUI.BusinessLogic/Services/TestMediatorService.cs
+++ b/EstateManagmentUI.BusinessLogic/Services/TestMediatorService.cs
@@ -46,12 +46,12 @@ public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, Cancellation
             
             // Dashboard Queries - return mock data
             Queries.GetComparisonDatesQuery => Task.FromResult((TResponse)(object)Result.Success(GetMockComparisonDates())),
-            Queries.GetTodaysSalesQuery query => Task.FromResult((TResponse)(object)Result.Success(GetMockTodaysSales(query.ComparisonDate))),
+            TransactionQueries.GetTodaysSalesQuery query => Task.FromResult((TResponse)(object)Result.Success(GetMockTodaysSales(query.ComparisonDate))),
             Queries.GetTodaysSettlementQuery => Task.FromResult((TResponse)(object)Result.Success(GetMockTodaysSettlement())),
             Queries.GetTodaysSalesCountByHourQuery => Task.FromResult((TResponse)(object)Result.Success(GetMockSalesCountByHour())),
             Queries.GetTodaysSalesValueByHourQuery => Task.FromResult((TResponse)(object)Result.Success(GetMockSalesValueByHour())),
             MerchantQueries.GetMerchantKpiQuery => Task.FromResult((TResponse)(object)Result.Success(GetMockMerchantKpi())),
-            Queries.GetTodaysFailedSalesQuery query => Task.FromResult((TResponse)(object)Result.Success(GetMockTodaysFailedSales(query.ComparisonDate))),
+            TransactionQueries.GetTodaysFailedSalesQuery query => Task.FromResult((TResponse)(object)Result.Success(GetMockTodaysFailedSales(query.ComparisonDate))),
             Queries.GetTopProductDataQuery => Task.FromResult((TResponse)(object)Result.Success(GetMockTopProducts())),
             Queries.GetBottomProductDataQuery => Task.FromResult((TResponse)(object)Result.Success(GetMockBottomProducts())),
             Queries.GetTopMerchantDataQuery => Task.FromResult((TResponse)(object)Result.Success(GetMockTopMerchants())),
@@ -64,7 +64,7 @@ public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, Cancellation
             Queries.GetOperatorTransactionSummaryQuery query => Task.FromResult((TResponse)(object)Result.Success(this.GetMockOperatorTransactionSummary(query))),
             Queries.GetMerchantSettlementHistoryQuery query => Task.FromResult((TResponse)(object)Result.Success(this.GetMockMerchantSettlementHistory(query))),
             Queries.GetSettlementSummaryQuery query => Task.FromResult((TResponse)(object)Result.Success(this.GetMockSettlementSummary(query))),
-            Queries.GetTransactionDetailQuery q => Task.FromResult((TResponse)(object)Result.Success(this.GetMockTransactionDetails(q))),
+            TransactionQueries.GetTransactionDetailQuery q => Task.FromResult((TResponse)(object)Result.Success(this.GetMockTransactionDetails(q))),
 
             // Commands - execute against test data store
             MerchantCommands.CreateMerchantCommand cmd => Task.FromResult((TResponse)(object)this.ExecuteCreateMerchant(cmd)),
@@ -813,7 +813,7 @@ private List<OperatorTransactionSummaryModel> GetMockOperatorTransactionSummary(
         return summary;
     }
 
-    private List<TransactionDetailModel> GetMockTransactionDetails(Queries.GetTransactionDetailQuery query)
+    private List<TransactionDetailModel> GetMockTransactionDetails(TransactionQueries.GetTransactionDetailQuery query)
     {
         var merchants = this._testDataStore.GetMerchants(query.EstateId);
         var operators = this._testDataStore.GetOperators(query.EstateId);
@@ -906,20 +906,20 @@ private List<TransactionDetailModel> GetMockTransactionDetails(Queries.GetTransa
         // Apply filters
         IEnumerable<TransactionDetailModel> filteredTransactions = transactions;
         
-        if (query.MerchantIds != null && query.MerchantIds.Any())
-        {
-            filteredTransactions = filteredTransactions.Where(t => query.MerchantIds.Contains(t.MerchantId));
-        }
+        //if (query.MerchantIds != null && query.MerchantIds.Any())
+        //{
+        //    filteredTransactions = filteredTransactions.Where(t => query.MerchantIds.Contains(t.MerchantId));
+        //}
         
-        if (query.OperatorIds != null && query.OperatorIds.Any())
-        {
-            filteredTransactions = filteredTransactions.Where(t => query.OperatorIds.Contains(t.OperatorId));
-        }
+        //if (query.OperatorIds != null && query.OperatorIds.Any())
+        //{
+        //    filteredTransactions = filteredTransactions.Where(t => query.OperatorIds.Contains(t.OperatorId));
+        //}
         
-        if (query.ProductIds != null && query.ProductIds.Any())
-        {
-            filteredTransactions = filteredTransactions.Where(t => query.ProductIds.Contains(t.ProductId));
-        }
+        //if (query.ProductIds != null && query.ProductIds.Any())
+        //{
+        //    filteredTransactions = filteredTransactions.Where(t => query.ProductIds.Contains(t.ProductId));
+        //}
         
         // Sort by transaction date descending (most recent first) and materialize
         return filteredTransactions.OrderByDescending(t => t.TransactionDateTime).ToList();