ride reconcilation with driver profile update

2026-08-31 12:14:30 +05:30
549 changed files with 8703 additions and 166439 deletions
@@ -1,89 +0,0 @@
-name: CI/CD - ERP Distribution
-on:
-  pull_request:
-    branches:
-      - production
-    types:
-      - closed
-jobs:
-  build-and-deploy-backend:
-    name: Build & Deploy Backend
-    runs-on: linux
-    if: github.event.pull_request.merged == true
-    steps:
-      - name: Checkout code
-        run: |
-          git clone \
-            --depth 1 \
-            --branch production \
-            https://oauth2:${{ secrets.DISTRIBUTION }}@gitea.hexdive.com/New_REP_SYSTEM/ERP_Distribution.git \
-            .
-      - name: Restore
-        run: dotnet restore Distribution/Distribution.csproj
-      - name: Publish
-        run: |
-          rm -rf /tmp/erpdistribution-deploy
-          mkdir -p /tmp/erpdistribution-deploy
-          dotnet publish Distribution/Distribution.csproj \
-            -c Release \
-            -r linux-x64 \
-            --self-contained true \
-            -o /tmp/erpdistribution-deploy
-      - name: Stop service
-        run: systemctl stop erpdistribution.service
-      - name: Copy to deploy folder
-        run: |
-          mkdir -p /home/distribution/core/publish
-          rm -rf /home/distribution/core/publish/*
-          cp -r /tmp/erpdistribution-deploy/* /home/distribution/core/publish/
-      - name: Fix ownership and permissions
-        run: |
-          chown -R distributionuser:distributionuser /home/distribution/core/publish
-          find /home/distribution/core/publish -type d -exec chmod 755 {} +
-          find /home/distribution/core/publish -type f -exec chmod 644 {} +
-          chmod +x /home/distribution/core/publish/Distribution
-      - name: Restart service
-        run: systemctl restart erpdistribution.service
-      - name: Verify
-        run: |
-          systemctl is-active erpdistribution.service && echo "✅ Service running" || echo "❌ Service failed"
-
-  build-and-deploy-frontend:
-    name: Build & Deploy Frontend
-    runs-on: linux
-    if: github.event.pull_request.merged == true
-    steps:
-      - name: Checkout code
-        run: |
-          git clone \
-            --depth 1 \
-            --branch production \
-            https://oauth2:${{ secrets.DISTRIBUTION }}@gitea.hexdive.com/New_REP_SYSTEM/ERP_Distribution.git \
-            .
-      - name: Build Docker image
-        run: |
-          docker build --progress=plain --no-cache \
-            --build-arg NEXT_PUBLIC_API_URL=https://distribution.hexdive.com/api \
-            -t erpdistributionfe:latest \
-            ./distribution_fe
-      - name: Stop & remove existing container
-        run: |
-          docker stop erpdistributionfe 2>/dev/null || true
-          docker rm erpdistributionfe 2>/dev/null || true
-      - name: Start container
-        run: |
-          docker run -d \
-            --name erpdistributionfe \
-            -p 8801:3000 \
-            --restart unless-stopped \
-            --memory="512m" \
-            --cpus="1.0" \
-            --cap-drop ALL \
-            --security-opt no-new-privileges \
-            erpdistributionfe:latest
-      - name: Remove old images
-        run: docker image prune -f
-      - name: Verify
-        run: |
-          docker ps --filter name=erpdistributionfe --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" \
-            | grep erpdistributionfe && echo "✅ Container running" || echo "❌ Container failed"
@@ -18,7 +18,6 @@ public class RegionServiceTests
    public RegionServiceTests()
    {
        _currentUser.Setup(u => u.RoleLevel).Returns(60);
-        _repo.Setup(r => r.GetAllCodesAsync()).ReturnsAsync([]);
        _sut = new RegionService(_repo.Object, _uow.Object, _currentUser.Object, _scopeAccess.Object);
    }

@@ -149,123 +148,6 @@ public class RegionServiceTests
        _uow.Verify(u => u.CommitAsync(default), Times.Once);
    }

-    // Region code
-
-    [Fact]
-    public async Task CreateAsync_GeneratesFirstCode_WhenNoRegionsExist()
-    {
-        _repo.Setup(r => r.GetAllCodesAsync()).ReturnsAsync([]);
-
-        var result = await _sut.CreateAsync(new CreateRegionRequest("North"));
-
-        Assert.Equal("REG-0001", result.Code);
-    }
-
-    [Fact]
-    public async Task CreateAsync_GeneratesNextCode_FromHighestExisting_IgnoringNonMatching()
-    {
-        _repo.Setup(r => r.GetAllCodesAsync()).ReturnsAsync(["REG-0002", "REG-0009", "CUSTOM", "REG-abc", ""]);
-
-        var result = await _sut.CreateAsync(new CreateRegionRequest("North"));
-
-        Assert.Equal("REG-0010", result.Code);
-    }
-
-    [Fact]
-    public async Task CreateAsync_StoresProvidedCode_AsEntered()
-    {
-        var result = await _sut.CreateAsync(new CreateRegionRequest("North", " nth-1 "));
-
-        Assert.Equal("nth-1", result.Code);
-        _repo.Verify(r => r.GetAllCodesAsync(), Times.Never);
-    }
-
-    [Fact]
-    public async Task CreateAsync_Throws_WhenProvidedCodeInUse()
-    {
-        _repo.Setup(r => r.CodeExistsAsync("NTH-1", null)).ReturnsAsync(true);
-
-        await Assert.ThrowsAsync<InvalidOperationException>(() =>
-            _sut.CreateAsync(new CreateRegionRequest("North", "NTH-1")));
-
-        _uow.Verify(u => u.CommitAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task GetNextCodeAsync_ReturnsSuggestion()
-    {
-        _repo.Setup(r => r.GetAllCodesAsync()).ReturnsAsync(["REG-0003"]);
-
-        var result = await _sut.GetNextCodeAsync();
-
-        Assert.Equal("REG-0004", result.Code);
-    }
-
-    [Fact]
-    public async Task UpdateAsync_ChangesCode_StoredAsEntered()
-    {
-        var region = ActiveRegion();
-        region.Code = "REG-0001";
-        _repo.Setup(r => r.GetByIdAsync(region.Id)).ReturnsAsync(region);
-        _repo.Setup(r => r.CodeExistsAsync("north-1", region.Id)).ReturnsAsync(false);
-
-        var result = await _sut.UpdateAsync(region.Id, new UpdateRegionRequest("North", " north-1 "));
-
-        Assert.Equal("north-1", result!.Code);
-        _uow.Verify(u => u.CommitAsync(default), Times.Once);
-    }
-
-    [Fact]
-    public async Task UpdateAsync_KeepsCode_WhenCodeBlank()
-    {
-        var region = ActiveRegion();
-        region.Code = "REG-0001";
-        _repo.Setup(r => r.GetByIdAsync(region.Id)).ReturnsAsync(region);
-
-        var result = await _sut.UpdateAsync(region.Id, new UpdateRegionRequest("North", "  "));
-
-        Assert.Equal("REG-0001", result!.Code);
-        _repo.Verify(r => r.CodeExistsAsync(It.IsAny<string>(), It.IsAny<Guid?>()), Times.Never);
-    }
-
-    [Fact]
-    public async Task UpdateAsync_Throws_WhenCodeUsedByAnotherRegion()
-    {
-        var region = ActiveRegion();
-        region.Code = "REG-0001";
-        _repo.Setup(r => r.GetByIdAsync(region.Id)).ReturnsAsync(region);
-        _repo.Setup(r => r.CodeExistsAsync("REG-0002", region.Id)).ReturnsAsync(true);
-
-        await Assert.ThrowsAsync<InvalidOperationException>(() =>
-            _sut.UpdateAsync(region.Id, new UpdateRegionRequest("North", "REG-0002")));
-
-        _uow.Verify(u => u.CommitAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task UpdateAsync_AllowsResubmittingOwnCode()
-    {
-        var region = ActiveRegion();
-        region.Code = "REG-0001";
-        _repo.Setup(r => r.GetByIdAsync(region.Id)).ReturnsAsync(region);
-
-        var result = await _sut.UpdateAsync(region.Id, new UpdateRegionRequest("North", "REG-0001"));
-
-        Assert.Equal("REG-0001", result!.Code);
-    }
-
-    [Fact]
-    public async Task GetByIdAsync_ReturnsCode()
-    {
-        var region = ActiveRegion();
-        region.Code = "REG-0007";
-        _repo.Setup(r => r.GetByIdAsync(region.Id)).ReturnsAsync(region);
-
-        var result = await _sut.GetByIdAsync(region.Id);
-
-        Assert.Equal("REG-0007", result!.Code);
-    }
-
    // DeleteAsync

    [Fact]
@@ -313,93 +195,4 @@ public class RegionServiceTests

        _uow.Verify(u => u.RollbackAsync(default), Times.Once);
    }
-
-    // Region manager
-
-    private static User ManagerUser(string role = "RegionalManager", bool active = true) => new()
-    {
-        Id = Guid.NewGuid(), Username = "mgr", FullName = "Mgr One", IsActive = active,
-        Role = new Role { Name = role, Level = 50 }
-    };
-
-    [Fact]
-    public async Task SetManagerAsync_ReturnsNull_WhenRegionMissing()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync((Region?)null);
-
-        Assert.Null(await _sut.SetManagerAsync(Guid.NewGuid(), new SetRegionManagerRequest(Guid.NewGuid())));
-    }
-
-    [Fact]
-    public async Task SetManagerAsync_Throws_WhenUserNotRegionalManager()
-    {
-        var region = ActiveRegion();
-        var user = ManagerUser("SalesRep");
-        _repo.Setup(r => r.GetByIdAsync(region.Id)).ReturnsAsync(region);
-        _repo.Setup(r => r.GetUserWithRoleAsync(user.Id)).ReturnsAsync(user);
-
-        await Assert.ThrowsAsync<InvalidOperationException>(() =>
-            _sut.SetManagerAsync(region.Id, new SetRegionManagerRequest(user.Id)));
-        _uow.Verify(u => u.CommitAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task SetManagerAsync_ReplacesExistingManager_AndAddsScope()
-    {
-        var region = ActiveRegion();
-        var user = ManagerUser();
-        var old = new UserRegionScope { FK_UserId = Guid.NewGuid(), FK_RegionId = region.Id };
-        _repo.Setup(r => r.GetByIdAsync(region.Id)).ReturnsAsync(region);
-        _repo.Setup(r => r.GetUserWithRoleAsync(user.Id)).ReturnsAsync(user);
-        _repo.Setup(r => r.GetManagerScopesAsync(region.Id)).ReturnsAsync([old]);
-        _repo.Setup(r => r.GetRegionScopeAsync(user.Id, region.Id)).ReturnsAsync((UserRegionScope?)null);
-
-        var result = await _sut.SetManagerAsync(region.Id, new SetRegionManagerRequest(user.Id));
-
-        Assert.Equal(user.Id, result!.UserId);
-        _repo.Verify(r => r.RemoveRegionScopes(It.Is<IEnumerable<UserRegionScope>>(s => s.Single() == old)), Times.Once);
-        _repo.Verify(r => r.AddRegionScopeAsync(It.Is<UserRegionScope>(s => s.FK_UserId == user.Id && s.FK_RegionId == region.Id)), Times.Once);
-        _uow.Verify(u => u.CommitAsync(default), Times.Once);
-    }
-
-    [Fact]
-    public async Task SetManagerAsync_DoesNotDuplicateScope_WhenAlreadyManager()
-    {
-        var region = ActiveRegion();
-        var user = ManagerUser();
-        var existing = new UserRegionScope { FK_UserId = user.Id, FK_RegionId = region.Id };
-        _repo.Setup(r => r.GetByIdAsync(region.Id)).ReturnsAsync(region);
-        _repo.Setup(r => r.GetUserWithRoleAsync(user.Id)).ReturnsAsync(user);
-        _repo.Setup(r => r.GetManagerScopesAsync(region.Id)).ReturnsAsync([existing]);
-        _repo.Setup(r => r.GetRegionScopeAsync(user.Id, region.Id)).ReturnsAsync(existing);
-
-        await _sut.SetManagerAsync(region.Id, new SetRegionManagerRequest(user.Id));
-
-        _repo.Verify(r => r.AddRegionScopeAsync(It.IsAny<UserRegionScope>()), Times.Never);
-        _repo.Verify(r => r.RemoveRegionScopes(It.Is<IEnumerable<UserRegionScope>>(s => !s.Any())), Times.Once);
-    }
-
-    [Fact]
-    public async Task RemoveManagerAsync_ReturnsFalse_WhenNoManager()
-    {
-        var region = ActiveRegion();
-        _repo.Setup(r => r.GetByIdAsync(region.Id)).ReturnsAsync(region);
-        _repo.Setup(r => r.GetManagerScopesAsync(region.Id)).ReturnsAsync([]);
-
-        Assert.False(await _sut.RemoveManagerAsync(region.Id));
-    }
-
-    [Fact]
-    public async Task GetManagerAsync_ReturnsManager()
-    {
-        var region = ActiveRegion();
-        var user = ManagerUser();
-        _repo.Setup(r => r.GetByIdAsync(region.Id)).ReturnsAsync(region);
-        _repo.Setup(r => r.GetManagerScopesAsync(region.Id))
-            .ReturnsAsync([new UserRegionScope { FK_UserId = user.Id, FK_RegionId = region.Id, User = user }]);
-
-        var result = await _sut.GetManagerAsync(region.Id);
-
-        Assert.Equal("mgr", result!.Username);
-    }
 }
@@ -1,343 +0,0 @@
-using Distribution.Features.Region;
-using Distribution.Features.Route;
-using Distribution.Infra.Authorization;
-using Distribution.Infra.UoW;
-using Distribution.Models;
-using Moq;
-using Xunit;
-
-namespace Distribution.Tests.Services;
-
-public class RouteServiceTests
-{
-    private readonly Mock<IRouteRepository> _repo = new();
-    private readonly Mock<IRegionRepository> _regionRepo = new();
-    private readonly Mock<IUnitOfWork> _uow = new();
-    private readonly Mock<ICurrentUserService> _currentUser = new();
-    private readonly Mock<IScopeAccessService> _scopeAccess = new();
-    private readonly RouteService _sut;
-
-    private static readonly Guid RepUserId = Guid.NewGuid();
-
-    public RouteServiceTests()
-    {
-        _currentUser.Setup(u => u.RoleLevel).Returns(20);
-        _currentUser.Setup(u => u.UserId).Returns(RepUserId);
-        _sut = new RouteService(_repo.Object, _regionRepo.Object, _uow.Object, _currentUser.Object, _scopeAccess.Object);
-    }
-
-    private static Models.Route ActiveRoute(Guid? ownerId = null) =>
-        new() { Id = Guid.NewGuid(), RouteName = "R1", StartPoint = "A", EndPoint = "B", Length = 10, IsActive = true, FK_OwnerUserId = ownerId };
-
-    private static Models.Route InactiveRoute() =>
-        new() { Id = Guid.NewGuid(), RouteName = "Old", StartPoint = "A", EndPoint = "B", Length = 10, IsActive = false };
-
-    private static Store ActiveStore(Guid routeId, decimal lat = 10m, decimal lon = 20m) =>
-        new() { Id = Guid.NewGuid(), FK_RouteId = routeId, IsActive = true, Latitude = lat, Longitude = lon };
-
-    // AssignStoresToRouteAsync
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_ReturnsNull_WhenRouteNotFound()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync((Models.Route?)null);
-
-        var result = await _sut.AssignStoresToRouteAsync(Guid.NewGuid(), new AssignStoresToRouteRequest([Guid.NewGuid()]));
-
-        Assert.Null(result);
-        _uow.Verify(u => u.BeginAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_ReturnsNull_WhenRouteInactive()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync(InactiveRoute());
-
-        var result = await _sut.AssignStoresToRouteAsync(Guid.NewGuid(), new AssignStoresToRouteRequest([Guid.NewGuid()]));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_ReturnsNull_WhenCallerLacksRouteScope()
-    {
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(false);
-
-        var result = await _sut.AssignStoresToRouteAsync(route.Id, new AssignStoresToRouteRequest([Guid.NewGuid()]));
-
-        Assert.Null(result);
-        _uow.Verify(u => u.BeginAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_ReturnsNull_WhenCallerBelowRoleFloor()
-    {
-        _currentUser.Setup(u => u.RoleLevel).Returns(10);
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-
-        var result = await _sut.AssignStoresToRouteAsync(route.Id, new AssignStoresToRouteRequest([Guid.NewGuid()]));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_ReturnsNull_WhenAnyStoreIdMissing()
-    {
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        var storeIds = new List<Guid> { Guid.NewGuid(), Guid.NewGuid() };
-        _repo.Setup(r => r.GetStoresByIdsAsync(storeIds)).ReturnsAsync([ActiveStore(route.Id)]); // only one of two found
-
-        var result = await _sut.AssignStoresToRouteAsync(route.Id, new AssignStoresToRouteRequest(storeIds));
-
-        Assert.Null(result);
-        _uow.Verify(u => u.BeginAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_UpdatesEachStore_AndCommits()
-    {
-        var route = ActiveRoute();
-        var otherRouteId = Guid.NewGuid();
-        var stores = new List<Store> { ActiveStore(otherRouteId), ActiveStore(otherRouteId) };
-        var storeIds = stores.Select(s => s.Id).ToList();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoresByIdsAsync(storeIds)).ReturnsAsync(stores);
-
-        var result = await _sut.AssignStoresToRouteAsync(route.Id, new AssignStoresToRouteRequest(storeIds));
-
-        Assert.NotNull(result);
-        Assert.All(stores, s => Assert.Equal(route.Id, s.FK_RouteId));
-        _repo.Verify(r => r.UpdateStore(It.IsAny<Store>()), Times.Exactly(2));
-        _uow.Verify(u => u.CommitAsync(default), Times.Once);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_Rollbacks_WhenUpdateThrows()
-    {
-        var route = ActiveRoute();
-        var stores = new List<Store> { ActiveStore(route.Id) };
-        var storeIds = stores.Select(s => s.Id).ToList();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoresByIdsAsync(storeIds)).ReturnsAsync(stores);
-        _repo.Setup(r => r.UpdateStore(It.IsAny<Store>())).Throws(new Exception("db error"));
-
-        await Assert.ThrowsAsync<Exception>(() => _sut.AssignStoresToRouteAsync(route.Id, new AssignStoresToRouteRequest(storeIds)));
-
-        _uow.Verify(u => u.RollbackAsync(default), Times.Once);
-        _uow.Verify(u => u.CommitAsync(default), Times.Never);
-    }
-
-    // AssignOwnerAsync
-
-    [Fact]
-    public async Task AssignOwnerAsync_ReturnsNull_WhenRouteNotFound()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync((Models.Route?)null);
-
-        var result = await _sut.AssignOwnerAsync(Guid.NewGuid(), new AssignRouteOwnerRequest(Guid.NewGuid()));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task AssignOwnerAsync_ReturnsNull_WhenTargetUserNotActive()
-    {
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetActiveUserAsync(It.IsAny<Guid>())).ReturnsAsync((User?)null);
-
-        var result = await _sut.AssignOwnerAsync(route.Id, new AssignRouteOwnerRequest(Guid.NewGuid()));
-
-        Assert.Null(result);
-        _uow.Verify(u => u.BeginAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task AssignOwnerAsync_SetsOwner_AndCommits()
-    {
-        var route = ActiveRoute();
-        var salesRep = new User { Id = Guid.NewGuid(), IsActive = true };
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetActiveUserAsync(salesRep.Id)).ReturnsAsync(salesRep);
-
-        var result = await _sut.AssignOwnerAsync(route.Id, new AssignRouteOwnerRequest(salesRep.Id));
-
-        Assert.NotNull(result);
-        Assert.Equal(salesRep.Id, result.OwnerUserId);
-        Assert.Equal(salesRep.Id, route.FK_OwnerUserId);
-        _uow.Verify(u => u.CommitAsync(default), Times.Once);
-    }
-
-    [Fact]
-    public async Task AssignOwnerAsync_AllowsReassignment_ToDifferentSalesRep()
-    {
-        var firstOwner = Guid.NewGuid();
-        var route = ActiveRoute(firstOwner);
-        var newRep = new User { Id = Guid.NewGuid(), IsActive = true };
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetActiveUserAsync(newRep.Id)).ReturnsAsync(newRep);
-
-        var result = await _sut.AssignOwnerAsync(route.Id, new AssignRouteOwnerRequest(newRep.Id));
-
-        Assert.NotNull(result);
-        Assert.Equal(newRep.Id, result.OwnerUserId);
-        Assert.NotEqual(firstOwner, result.OwnerUserId);
-    }
-
-    // RecordCheckInAsync
-
-    [Fact]
-    public async Task RecordCheckInAsync_ReturnsNull_WhenCallerNotAuthenticated()
-    {
-        _currentUser.Setup(u => u.UserId).Returns((Guid?)null);
-
-        var result = await _sut.RecordCheckInAsync(Guid.NewGuid(), new RecordCheckInRequest(Guid.NewGuid(), 1, 2, null));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_ReturnsNull_WhenRouteNotFoundOrInactive()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync(InactiveRoute());
-
-        var result = await _sut.RecordCheckInAsync(Guid.NewGuid(), new RecordCheckInRequest(Guid.NewGuid(), 1, 2, null));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_ReturnsNull_WhenCallerLacksRouteScope()
-    {
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(false);
-
-        var result = await _sut.RecordCheckInAsync(route.Id, new RecordCheckInRequest(Guid.NewGuid(), 1, 2, null));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_ReturnsNull_WhenStoreNotOnRoute()
-    {
-        var route = ActiveRoute();
-        var store = ActiveStore(Guid.NewGuid()); // belongs to a different route
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoreByIdAsync(store.Id)).ReturnsAsync(store);
-
-        var result = await _sut.RecordCheckInAsync(route.Id, new RecordCheckInRequest(store.Id, 1, 2, null));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_NotFlagged_WhenGpsMatchesStoreLocation()
-    {
-        var route = ActiveRoute();
-        var store = ActiveStore(route.Id, lat: 12.9716m, lon: 77.5946m);
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoreByIdAsync(store.Id)).ReturnsAsync(store);
-
-        var result = await _sut.RecordCheckInAsync(route.Id, new RecordCheckInRequest(store.Id, 12.9716m, 77.5946m, null));
-
-        Assert.NotNull(result);
-        Assert.False(result.IsDeviationFlagged);
-        _repo.Verify(r => r.AddVisitLogAsync(It.IsAny<RouteVisitLog>()), Times.Once);
-        _uow.Verify(u => u.CommitAsync(default), Times.Once);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_Flagged_WhenGpsFarFromStoreLocation()
-    {
-        var route = ActiveRoute();
-        var store = ActiveStore(route.Id, lat: 12.9716m, lon: 77.5946m); // Bengaluru
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoreByIdAsync(store.Id)).ReturnsAsync(store);
-
-        // Mumbai coordinates - hundreds of km away
-        var result = await _sut.RecordCheckInAsync(route.Id, new RecordCheckInRequest(store.Id, 19.0760m, 72.8777m, null));
-
-        Assert.NotNull(result);
-        Assert.True(result.IsDeviationFlagged);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_UsesCurrentUserId_AsVisitingRep()
-    {
-        var route = ActiveRoute();
-        var store = ActiveStore(route.Id);
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoreByIdAsync(store.Id)).ReturnsAsync(store);
-
-        var result = await _sut.RecordCheckInAsync(route.Id, new RecordCheckInRequest(store.Id, store.Latitude, store.Longitude, null));
-
-        Assert.NotNull(result);
-        Assert.Equal(RepUserId, result.UserId);
-    }
-
-    // RecordCheckOutAsync
-
-    [Fact]
-    public async Task RecordCheckOutAsync_ReturnsNull_WhenNoOpenVisit()
-    {
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetOpenVisitAsync(route.Id, It.IsAny<Guid>())).ReturnsAsync((RouteVisitLog?)null);
-
-        var result = await _sut.RecordCheckOutAsync(route.Id, new RecordCheckOutRequest(Guid.NewGuid(), null));
-
-        Assert.Null(result);
-        _uow.Verify(u => u.BeginAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task RecordCheckOutAsync_SetsCheckOutAt_AndCommits()
-    {
-        var route = ActiveRoute();
-        var storeId = Guid.NewGuid();
-        var log = new RouteVisitLog { Id = Guid.NewGuid(), FK_RouteId = route.Id, FK_StoreId = storeId, FK_UserId = RepUserId, CheckInAt = DateTime.Now.AddHours(-1) };
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetOpenVisitAsync(route.Id, storeId)).ReturnsAsync(log);
-
-        var result = await _sut.RecordCheckOutAsync(route.Id, new RecordCheckOutRequest(storeId, null));
-
-        Assert.NotNull(result);
-        Assert.NotNull(result.CheckOutAt);
-        Assert.NotNull(log.CheckOutAt);
-        _repo.Verify(r => r.UpdateVisitLog(log), Times.Once);
-        _uow.Verify(u => u.CommitAsync(default), Times.Once);
-    }
-
-    [Fact]
-    public async Task RecordCheckOutAsync_Rollbacks_WhenUpdateThrows()
-    {
-        var route = ActiveRoute();
-        var storeId = Guid.NewGuid();
-        var log = new RouteVisitLog { Id = Guid.NewGuid(), FK_RouteId = route.Id, FK_StoreId = storeId, FK_UserId = RepUserId, CheckInAt = DateTime.Now };
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetOpenVisitAsync(route.Id, storeId)).ReturnsAsync(log);
-        _repo.Setup(r => r.UpdateVisitLog(It.IsAny<RouteVisitLog>())).Throws(new Exception("db error"));
-
-        await Assert.ThrowsAsync<Exception>(() => _sut.RecordCheckOutAsync(route.Id, new RecordCheckOutRequest(storeId, null)));
-
-        _uow.Verify(u => u.RollbackAsync(default), Times.Once);
-    }
-}
@@ -1,85 +0,0 @@
-using Distribution.Features.Item;
-using Distribution.Features.Order;
-using Distribution.Features.Route;
-using Distribution.Features.Scheme;
-using Distribution.Features.Stock;
-using Distribution.Features.Store;
-using Distribution.Infra.Authorization;
-using Distribution.Infra.UoW;
-using Distribution.Models;
-using Moq;
-using Xunit;
-
-namespace Distribution.Tests.Services;
-
-public class StoreServiceTests
-{
-    private readonly Mock<IStoreRepository> _repo = new();
-    private readonly Mock<IUnitOfWork> _uow = new();
-    private readonly Mock<ICurrentUserService> _currentUser = new();
-    private readonly Mock<IScopeAccessService> _scopeAccess = new();
-    private readonly Mock<IRouteRepository> _routeRepo = new();
-    private readonly StoreService _sut;
-
-    public StoreServiceTests()
-    {
-        _currentUser.Setup(u => u.RoleLevel).Returns(50); // global scope, skips per-store scope lookups
-        var schemeService = new SchemeService(
-            Mock.Of<ISchemeRepository>(),
-            Mock.Of<IOrderRepository>(),
-            Mock.Of<IItemRepository>(),
-            _repo.Object,
-            Mock.Of<IStockRepository>(),
-            _uow.Object);
-        _sut = new StoreService(_repo.Object, _uow.Object, _currentUser.Object, _scopeAccess.Object, schemeService, _routeRepo.Object);
-    }
-
-    private static Store ActiveStore() =>
-        new() { Id = Guid.NewGuid(), IsActive = true };
-
-    // GetVisitHistoryAsync
-
-    [Fact]
-    public async Task GetVisitHistoryAsync_ReturnsNull_WhenStoreNotFound()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync((Store?)null);
-
-        var result = await _sut.GetVisitHistoryAsync(Guid.NewGuid());
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task GetVisitHistoryAsync_ReturnsEmpty_WhenNoVisitsLogged()
-    {
-        var store = ActiveStore();
-        _repo.Setup(r => r.GetByIdAsync(store.Id)).ReturnsAsync(store);
-        _routeRepo.Setup(r => r.GetVisitsByStoreIdAsync(store.Id)).ReturnsAsync([]);
-
-        var result = await _sut.GetVisitHistoryAsync(store.Id);
-
-        Assert.NotNull(result);
-        Assert.Empty(result);
-    }
-
-    [Fact]
-    public async Task GetVisitHistoryAsync_MapsVisits_MostRecentFirst()
-    {
-        var store = ActiveStore();
-        var repId = Guid.NewGuid();
-        var older = new RouteVisitLog { Id = Guid.NewGuid(), FK_StoreId = store.Id, FK_UserId = repId, CheckInAt = DateTime.Now.AddDays(-2), CheckOutAt = DateTime.Now.AddDays(-2).AddHours(1) };
-        var newer = new RouteVisitLog { Id = Guid.NewGuid(), FK_StoreId = store.Id, FK_UserId = repId, CheckInAt = DateTime.Now.AddDays(-1), CheckOutAt = null };
-        _repo.Setup(r => r.GetByIdAsync(store.Id)).ReturnsAsync(store);
-        _routeRepo.Setup(r => r.GetVisitsByStoreIdAsync(store.Id)).ReturnsAsync([older, newer]);
-
-        var result = await _sut.GetVisitHistoryAsync(store.Id);
-
-        Assert.NotNull(result);
-        Assert.Equal(2, result.Count);
-        Assert.Equal(newer.Id, result[0].VisitId);
-        Assert.Equal("In Progress", result[0].Outcome);
-        Assert.Equal(older.Id, result[1].VisitId);
-        Assert.Equal("Completed", result[1].Outcome);
-        Assert.Equal(repId, result[0].RepUserId);
-    }
-}
@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Distribution.Tests")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+85a16396aad31f1e82cf28f330a97dee2eafa51d")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+aa7ea37ab61a149a38d83283c5dabd76bf5a39b3")]
 [assembly: System.Reflection.AssemblyProductAttribute("Distribution.Tests")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Distribution.Tests")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
@@ -1 +1 @@
-100cae0f5643c7476420ef14e72b5b17dcb877fe4318c0b6cb2cff0baa955aa5
+5c052f1f25bc37b6a51a3abe0e2b79d99d21422d5ab89151faea450c0ddb9cc0
@@ -11,7 +11,7 @@ build_property.EnforceExtendedAnalyzerRules =
 build_property.EntryPointFilePath = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Distribution.Tests
-build_property.ProjectDir = D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\
+build_property.ProjectDir = C:\Users\lenovo\Desktop\NEWGITEA\ERP_Distribution\Distribution.Tests\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
 build_property.EffectiveAnalysisLevelStyle = 9.0
@@ -1,23 +1,23 @@
 {
  "format": 1,
  "restore": {
-    "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj": {}
+    "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj": {}
  },
  "projects": {
-    "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj": {
+    "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj": {
      "version": "1.0.0",
      "restore": {
-        "projectUniqueName": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
+        "projectUniqueName": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
        "projectName": "Distribution.Tests",
-        "projectPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
-        "packagesPath": "C:\\Users\\dell\\.nuget\\packages\\",
-        "outputPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\obj\\",
+        "projectPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
+        "packagesPath": "C:\\Users\\lenovo\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\obj\\",
        "projectStyle": "PackageReference",
        "fallbackFolders": [
          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
        ],
        "configFilePaths": [
-          "C:\\Users\\dell\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
        ],
@@ -26,7 +26,6 @@
        ],
        "sources": {
          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "C:\\Program Files\\dotnet\\library-packs": {},
          "https://api.nuget.org/v3/index.json": {}
        },
        "frameworks": {
@@ -34,8 +33,8 @@
            "framework": "net9.0",
            "targetAlias": "net9.0",
            "projectReferences": {
-              "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj": {
-                "projectPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj"
+              "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj": {
+                "projectPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj"
              }
            }
          }
@@ -50,7 +49,7 @@
          "auditLevel": "low",
          "auditMode": "direct"
        },
-        "SdkAnalysisLevel": "10.0.400"
+        "SdkAnalysisLevel": "10.0.300"
      },
      "frameworks": {
        "net9.0": {
@@ -98,24 +97,24 @@
              "privateAssets": "all"
            }
          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.302/PortableRuntimeIdentifierGraph.json"
        }
      }
    },
-    "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj": {
+    "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj": {
      "version": "1.0.0",
      "restore": {
-        "projectUniqueName": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj",
+        "projectUniqueName": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj",
        "projectName": "Distribution",
-        "projectPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj",
-        "packagesPath": "C:\\Users\\dell\\.nuget\\packages\\",
-        "outputPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\obj\\",
+        "projectPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj",
+        "packagesPath": "C:\\Users\\lenovo\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\obj\\",
        "projectStyle": "PackageReference",
        "fallbackFolders": [
          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
        ],
        "configFilePaths": [
-          "C:\\Users\\dell\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
        ],
@@ -124,7 +123,6 @@
        ],
        "sources": {
          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "C:\\Program Files\\dotnet\\library-packs": {},
          "https://api.nuget.org/v3/index.json": {}
        },
        "frameworks": {
@@ -144,7 +142,7 @@
          "auditLevel": "low",
          "auditMode": "direct"
        },
-        "SdkAnalysisLevel": "10.0.400"
+        "SdkAnalysisLevel": "10.0.300"
      },
      "frameworks": {
        "net9.0": {
@@ -193,7 +191,7 @@
              "privateAssets": "all"
            }
          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.302/PortableRuntimeIdentifierGraph.json"
        }
      }
    }
@@ -5,12 +5,12 @@
    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\dell\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\lenovo\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">7.0.0</NuGetToolVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\dell\.nuget\packages\" />
+    <SourceRoot Include="C:\Users\lenovo\.nuget\packages\" />
    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
  </ItemGroup>
  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
@@ -22,7 +22,7 @@
    <Import Project="$(NuGetPackageRoot)microsoft.net.test.sdk\17.12.0\build\netcoreapp3.1\Microsoft.NET.Test.Sdk.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.test.sdk\17.12.0\build\netcoreapp3.1\Microsoft.NET.Test.Sdk.props')" />
  </ImportGroup>
  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Pkgxunit_analyzers Condition=" '$(Pkgxunit_analyzers)' == '' ">C:\Users\dell\.nuget\packages\xunit.analyzers\1.18.0</Pkgxunit_analyzers>
-    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\dell\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
+    <Pkgxunit_analyzers Condition=" '$(Pkgxunit_analyzers)' == '' ">C:\Users\lenovo\.nuget\packages\xunit.analyzers\1.18.0</Pkgxunit_analyzers>
+    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\lenovo\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
  </PropertyGroup>
 </Project>
@@ -2542,23 +2542,23 @@
    ]
  },
  "packageFolders": {
-    "C:\\Users\\dell\\.nuget\\packages\\": {},
+    "C:\\Users\\lenovo\\.nuget\\packages\\": {},
    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
  },
  "project": {
    "version": "1.0.0",
    "restore": {
-      "projectUniqueName": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
+      "projectUniqueName": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
      "projectName": "Distribution.Tests",
-      "projectPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
-      "packagesPath": "C:\\Users\\dell\\.nuget\\packages\\",
-      "outputPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\obj\\",
+      "projectPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
+      "packagesPath": "C:\\Users\\lenovo\\.nuget\\packages\\",
+      "outputPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\obj\\",
      "projectStyle": "PackageReference",
      "fallbackFolders": [
        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
      ],
      "configFilePaths": [
-        "C:\\Users\\dell\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Users\\lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
      ],
@@ -2567,7 +2567,6 @@
      ],
      "sources": {
        "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-        "C:\\Program Files\\dotnet\\library-packs": {},
        "https://api.nuget.org/v3/index.json": {}
      },
      "frameworks": {
@@ -2575,8 +2574,8 @@
          "framework": "net9.0",
          "targetAlias": "net9.0",
          "projectReferences": {
-            "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj": {
-              "projectPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj"
+            "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj": {
+              "projectPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj"
            }
          }
        }
@@ -2591,7 +2590,7 @@
        "auditLevel": "low",
        "auditMode": "direct"
      },
-      "SdkAnalysisLevel": "10.0.400"
+      "SdkAnalysisLevel": "10.0.300"
    },
    "frameworks": {
      "net9.0": {
@@ -2639,7 +2638,7 @@
            "privateAssets": "all"
          }
        },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400/PortableRuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.302/PortableRuntimeIdentifierGraph.json"
      }
    }
  }
@@ -1,57 +1,57 @@
 {
  "version": 2,
-  "dgSpecHash": "JPCR3IFZHKY=",
+  "dgSpecHash": "XdH8cqlThLk=",
  "success": true,
-  "projectFilePath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
+  "projectFilePath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
  "expectedPackageFiles": [
-    "C:\\Users\\dell\\.nuget\\packages\\castle.core\\5.1.1\\castle.core.5.1.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\coverlet.collector\\6.0.2\\coverlet.collector.6.0.2.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\9.0.0\\microsoft.aspnetcore.authentication.jwtbearer.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.aspnetcore.openapi\\9.0.0\\microsoft.aspnetcore.openapi.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.codecoverage\\17.12.0\\microsoft.codecoverage.17.12.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.entityframeworkcore\\9.0.0\\microsoft.entityframeworkcore.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\9.0.0\\microsoft.entityframeworkcore.abstractions.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\9.0.0\\microsoft.entityframeworkcore.analyzers.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\9.0.0\\microsoft.entityframeworkcore.relational.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.apidescription.server\\6.0.5\\microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\9.0.0\\microsoft.extensions.caching.abstractions.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.caching.memory\\9.0.0\\microsoft.extensions.caching.memory.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\9.0.0\\microsoft.extensions.configuration.abstractions.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\9.0.0\\microsoft.extensions.dependencyinjection.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\9.0.0\\microsoft.extensions.dependencyinjection.abstractions.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.logging\\9.0.0\\microsoft.extensions.logging.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\9.0.0\\microsoft.extensions.logging.abstractions.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.options\\9.0.0\\microsoft.extensions.options.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.primitives\\9.0.0\\microsoft.extensions.primitives.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.0.1\\microsoft.identitymodel.abstractions.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.0.1\\microsoft.identitymodel.jsonwebtokens.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.logging\\8.0.1\\microsoft.identitymodel.logging.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.protocols\\8.0.1\\microsoft.identitymodel.protocols.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\8.0.1\\microsoft.identitymodel.protocols.openidconnect.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.0.1\\microsoft.identitymodel.tokens.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.net.test.sdk\\17.12.0\\microsoft.net.test.sdk.17.12.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.openapi\\1.6.22\\microsoft.openapi.1.6.22.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.testplatform.objectmodel\\17.12.0\\microsoft.testplatform.objectmodel.17.12.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.testplatform.testhost\\17.12.0\\microsoft.testplatform.testhost.17.12.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\moq\\4.20.72\\moq.4.20.72.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\mysqlconnector\\2.4.0\\mysqlconnector.2.4.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\pomelo.entityframeworkcore.mysql\\9.0.0\\pomelo.entityframeworkcore.mysql.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\swashbuckle.aspnetcore\\7.3.1\\swashbuckle.aspnetcore.7.3.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\7.3.1\\swashbuckle.aspnetcore.swagger.7.3.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\7.3.1\\swashbuckle.aspnetcore.swaggergen.7.3.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\7.3.1\\swashbuckle.aspnetcore.swaggerui.7.3.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\system.diagnostics.eventlog\\6.0.0\\system.diagnostics.eventlog.6.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.0.1\\system.identitymodel.tokens.jwt.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\system.reflection.metadata\\1.6.0\\system.reflection.metadata.1.6.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit\\2.9.3\\xunit.2.9.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.abstractions\\2.0.3\\xunit.abstractions.2.0.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.analyzers\\1.18.0\\xunit.analyzers.1.18.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.assert\\2.9.3\\xunit.assert.2.9.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.core\\2.9.3\\xunit.core.2.9.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.extensibility.core\\2.9.3\\xunit.extensibility.core.2.9.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.extensibility.execution\\2.9.3\\xunit.extensibility.execution.2.9.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.runner.visualstudio\\2.8.2\\xunit.runner.visualstudio.2.8.2.nupkg.sha512"
+    "C:\\Users\\lenovo\\.nuget\\packages\\castle.core\\5.1.1\\castle.core.5.1.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\coverlet.collector\\6.0.2\\coverlet.collector.6.0.2.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\9.0.0\\microsoft.aspnetcore.authentication.jwtbearer.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.aspnetcore.openapi\\9.0.0\\microsoft.aspnetcore.openapi.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.codecoverage\\17.12.0\\microsoft.codecoverage.17.12.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.entityframeworkcore\\9.0.0\\microsoft.entityframeworkcore.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\9.0.0\\microsoft.entityframeworkcore.abstractions.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\9.0.0\\microsoft.entityframeworkcore.analyzers.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\9.0.0\\microsoft.entityframeworkcore.relational.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.apidescription.server\\6.0.5\\microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\9.0.0\\microsoft.extensions.caching.abstractions.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.caching.memory\\9.0.0\\microsoft.extensions.caching.memory.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\9.0.0\\microsoft.extensions.configuration.abstractions.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\9.0.0\\microsoft.extensions.dependencyinjection.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\9.0.0\\microsoft.extensions.dependencyinjection.abstractions.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.logging\\9.0.0\\microsoft.extensions.logging.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\9.0.0\\microsoft.extensions.logging.abstractions.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.options\\9.0.0\\microsoft.extensions.options.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.primitives\\9.0.0\\microsoft.extensions.primitives.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.0.1\\microsoft.identitymodel.abstractions.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.0.1\\microsoft.identitymodel.jsonwebtokens.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.logging\\8.0.1\\microsoft.identitymodel.logging.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols\\8.0.1\\microsoft.identitymodel.protocols.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\8.0.1\\microsoft.identitymodel.protocols.openidconnect.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.0.1\\microsoft.identitymodel.tokens.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.net.test.sdk\\17.12.0\\microsoft.net.test.sdk.17.12.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.openapi\\1.6.22\\microsoft.openapi.1.6.22.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.testplatform.objectmodel\\17.12.0\\microsoft.testplatform.objectmodel.17.12.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.testplatform.testhost\\17.12.0\\microsoft.testplatform.testhost.17.12.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\moq\\4.20.72\\moq.4.20.72.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\mysqlconnector\\2.4.0\\mysqlconnector.2.4.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\pomelo.entityframeworkcore.mysql\\9.0.0\\pomelo.entityframeworkcore.mysql.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\swashbuckle.aspnetcore\\7.3.1\\swashbuckle.aspnetcore.7.3.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\7.3.1\\swashbuckle.aspnetcore.swagger.7.3.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\7.3.1\\swashbuckle.aspnetcore.swaggergen.7.3.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\7.3.1\\swashbuckle.aspnetcore.swaggerui.7.3.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\system.diagnostics.eventlog\\6.0.0\\system.diagnostics.eventlog.6.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.0.1\\system.identitymodel.tokens.jwt.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\system.reflection.metadata\\1.6.0\\system.reflection.metadata.1.6.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit\\2.9.3\\xunit.2.9.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.abstractions\\2.0.3\\xunit.abstractions.2.0.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.analyzers\\1.18.0\\xunit.analyzers.1.18.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.assert\\2.9.3\\xunit.assert.2.9.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.core\\2.9.3\\xunit.core.2.9.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.extensibility.core\\2.9.3\\xunit.extensibility.core.2.9.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.extensibility.execution\\2.9.3\\xunit.extensibility.execution.2.9.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.runner.visualstudio\\2.8.2\\xunit.runner.visualstudio.2.8.2.nupkg.sha512"
  ],
  "logs": []
 }
@@ -1 +0,0 @@
-False
@@ -1 +0,0 @@
-bf7d0202-9a86-43b3-8323-402073a8c61a
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpRTyW7bMBD9FYFnUaFIaqFuSeygRpDaiI226I3LKCaikAZFZUHgfy8oO0jTWy8EMeCbecvwHTn5BKhDl4fD8hlcHFGOop1LlNAaE4HLZkeqjrcdF0VZcUoZ+41yZG/hDXWo4VqXWgBmUAPmhlRYsV5jY0CUpDSEVjz1lA8j6t6RtIWBZ6uh8OMPCKP1DnXop3XGv6TZ0hZ68JMpgh9g5cYonU5kFsvt7W69wTdN/X15dXV6OcKYGhTWoA61VUW10AJzISrMdcOx7BuKe6r6UpVNRQScYNZFCE4OxWgePzkYHx1E3dGCsoJgKtAxR0ZGmWgrOcLu7ZCYzDYtUj2fy/O1e0fPEFBH8w9DT+0u9GAvnkY12cFcnM4ox8ek9BD8AUK0MPsySx0GGa132XnS9WDBRZSj9TbbDDL2Pjx9MWt70r/6D/m7NH35CnqKYK795GLCohzdSb23DrLVAnWoLrnhghjMSyUxb3qBJTCJVVUL3ipmakihXnsXrZv8NGYrF+EhzPRRh27kMKZp6212GfTeRtBxCknTrzoBN8GbScfs0/2SFKRghCXQFA9TzO7B2AA6QlK3C9O53z8QWlNCEpUpBHAx28i4z77JcZ8emMZUmgKYkqmGqB6q1rRVqxtT123da15pwspKc65Zr4yQSgmmKae94tDUKEeQws7m/Wr6viW1ajEXjcJcMo6VIBzzsq4kV9JUMiE+fczWQ8KpvjGEEoqFbGvMmWK4ZZRhTihpmGx1XaZV+rDknD1PmdxCcDD8JfnO6uBH38fsvATZFxPuJ5f+bjYvxIt1+HV2e+H1I4QspSWtS2t6Duh4PB7/AAAA//8DAAY6R+UCBAAA
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpRTyU7dMBT9lcjrOHiKHWfHqCJEQYDaqjvHvuFZBPvJcRiE3r9XDg9RuuvOuvI5PsP1GwrmEVCPDrfb0ycIeUY1yn4dMcIkJhpTdUfaXnS90A2VHVdK/UY18hfwinqkhLXUasAcJGDhSIsHPlrsHGhKqCOsFYXT3M+of0PGNw6evIUmzj8gzT4G1KOfPrj4XN42vrFTXFyT4gTnYc4m2CLm5PT24u7qGp8p+f306Oj95gxzIWi8Qz3q2pZZbTUWWrdYWCWwGRXDIxtGOlDVEg3vMB8ypGCmZnYPnxpczAGy7VnDeEMw02hXI2eyKbIHM8Pd67YoWWM6KfN6Ha/H/g09QUI9qz8Cfac7sJM/sPHx0QR3MPrg5w2q0TbFLaTsYY1kdTlNJvsYqv0jx5OHkFGNrm6r68nkMabHLzndvls//w/nl8ZufIDq/AT1SFLhhCYOCzoYLNSosQFu8NBKLbqBOwmltuMYsg9LXObqPGS4T6tK1KMzM82F9Oq2Okx24zPYvKQi/ZcsQHjx+Ti6MiCoRtcpusXm6jNuShrScMILx5K3S65uwPkENkPxdJeWPf0/ECYZKYzHS0oQcnVt8qb6ZuZNueCUay0DcJQPigwjtJ3r2s4qJ2UnRytaSzhtrRCWj4PTZhg0t0ywcRCgZNFd2q3WhQJCmNCK4lGqFgupKDbcScwJjAoYpa4riM9Yq6up4IZROcIIw9p0Egs+cNxxxrEgjChuOitp2Z2PSPaNiw7V6AJSgOkvy5fepjjHMVf76qsvIdwsoXzWal2DZx/wyxr+SbQPkKpSnvGh7OW+r91ut/sDAAD//wMAfxRohPMDAAA=
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpRTS0/jMBD+K5HPdXBsJ3FyA1q0FWKpoNpd7c0eT6hFcCrH4SHU/75yWsSyt73E0cgz8738Trx+QtKS8/1+9Yw+jmRBoptLnPGKsoYW9ZaVrVStbHKlmkpU8jdZEHeNb6QltQQooEEqsEIqLSupER1Qa7EpWGEZL2WaqR9G0r4T7XKLzw4wH8YfGEY3eNKSn87b4SXt1i6HfphsHoYe136M2kMCs1zdX29vN/Sqrr6vLi6ON0cc04DcWdKSqkOjrC5p3TRAJTSGqrqpqdaisx2W6Ty2OR8xeN3no338xGCH6DFCy3MuckZ5Qw4LYnXUCbbRI27f9gnJLNMy1Rdzef5t38kzBtLyxYegx3Fn0Luzp9FMrrdnx2/U42Niug/DHkN0OOsyU+17Hd3gs9Omy96hj2RBbu+zTa9jN4SnL2LdH/mv/4P+Nm1fvSJMEe3lMPlIWqLIgtxo2DmP2XqZhhXSyoZZKgujqay7hmoUmpqyaqQywlaYTL0cfHR+GqYxW/uID2GGT1pypfsRj8DPA+xcRIhTSJx+ValxEwY7Qcw+1S9YznLBRGqa4n6K2R1aFxAiJnbbMJ3m/dPCK85YgjKFgD5mGx132Tc97tIFW9sSOKIthKmZ6bBUVpUKaltVqupAlsBEUYKUIDpjG21MI4BL3hmJdUUWBJPZ2ZwvbQ2zrKip6rim0uqCKgBGrapBAGCBUHzRMbvtU5/pass447TRqqJSGEGV4IJKxlkttIKqSFH6kOTkvUyeXGPw2P9F+cZBGMahi9kpBNkXEe4mn95uNgfixXn6Oqu9HOARQ5bc0s6nmJ4MOhwOhz8AAAD//wMACwdnnQIEAAA=
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpSTS2/cIBSF/4rF2jgYsA3e5alGUZooGbVVdzyuExQHRoDzUDT/vcIzVZvuusHoinM5fOf6A3n1DGhEx9vt+Qv4nFCNsltLlNAeE4nbYUO6kYuRy0aInhJJfqIauSt4RyMauDGtkYAZ9IC5JR3WbDLYWpAtaS2hHS891UNC4wdSrrHw4gw0IX2DmFzwaETfnbfhtdytXGPmsNgmhhkufcrKm2Lm7Pz+anNziy+G/uv5ycn+ZIJUGjTOohH1E2hhVYcHKQ3mRmosBjlgpdhkJ+jKdy9zPkP0am6SffrjwYbsIZuRNpQ1BFOJdjWyKqtiW6sEm/dtcbJiOiv1ei2v2/EDvUBEI61/A923OzKzO3pOenGzPdqvWaWntK6TMjnEd1SjbQxbiNnByug4JXjW8/tGpaeL/ZmyTedvYJYM9jQsPqMRCVSjFdE8q+yCrw4OT2cHPqMa3dxXt7PKU4jPnyDf77ld/ge2a2UenYfq8qxoWm65JBbzVivMh0liBUxh3fWSC81sDyXz0+Cz80tYUnXpMzzE1SUa0YWaE+z9HUfz6DKYvMRi/UdfhLcx2MXk6k84LWlIwwgroiVvl1zdgXURTIbyiE1cDv3+kdCeElKsLDGCz9Wtyo/VF5UeywE72M5QANsyPRA9QSes6IQZbN+LfjK8M4S1neHcsElbqbSWzFBOJ81h6FGNoMxCtY6fsUQTbQQeqLGYc9liwcSAmSJaU2HEpOUnjtXNXHR6GiyhhGKpRI850wwLRhnmhJKBKWH6tkzabySHiHnJ/gqih/mvJ187E0MKU64OWVefINwtvvza1Zr7q/P4baV9FswTxKqkpZwvU3wIaLfb7X4BAAD//wMA4dUdUiEEAAA=
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpSUTW/cNhCG/4rAsyhTJMUP3ZLYQV0j9SJeNEVvQ3JkC9FSC4raNDD2vxfUbuCmt5xIDPgOZx6+nFcS4YCkJ++Ox7sTxryQmuRxC3HGFWWWtnrPul6aXtpGWGN5K/8mNRkf8DvpiZbet94iFaiQysA66sTgaQhoW9YGxjtZcsLzQvpXAmMT8DR6bOblT0zLOEfSky9jDPO3cjeMjZ/mNTRpnvA+LhmiL8Xc3j097B939KNWf9y9f385ueBSEjRjID1RAzoToKPaWk+lt44abTUFEEMYsCvrRTbGjCnC1Czh61sNYc4Rs+95w0XDKLfkXJMAGUrZDhbcfz+WSjZMtyVeb+Ft27+SEybS8/oH0Eu6Gz+NN3k+TnjC6QhpwXTj58MBYiA1Oab5iCmPuKHZup0myOMcq+tlH6YRYyY1eXyqdhPkYU6Hn3g9XRDc/wKBEyZHetKZDkSrEWQwaMOgOuS2E6ZlKCUIzQODYZBK+KCYVQMCD156r1vOgxWK1OR5mh1Mvy8bP8uZM4FprjhKtFwqZT1DYXDoNLIASjllvA3CaC5NMAIsQGsdam+VLyb5BP5ljFjd35ZuWhmkZYHK1gGVerAUUAB1nbLSOBEUFs2HOeYxrvO6VPcx43Pa+JGefIRpwQu5d8m/jBl9XlOB+pcqwl2aw+pz9eaAljWsEUwU0ZqPa64+YxgT+owF7z6t13z/k3DFGSulrClhzNUO8kv1Gywv5UDQofMcMbTCaeYG7EwwnfE6KGXU4GXnmWg7L6UXgwsWnLPCc8kHJ1EXylgMV20ed8xLaNFT7V1HJVhDQYKhxjDDW9VxZouv3jhWj9OmG3RgnHFqwSgqhRPUCC6oZJxpAcarttj5B5Kr+aQhNXnAFHH6T8ufRp/mZR5ydXVh9ROEz2ss86PaHPltjPSfjfbt7L9iqsprwRjLV7k+0LkmB4RlTXjYxk//Snbln1T7bQpx1TBjTE2eMqS8Hq/hrmsMk+fz+fwvAAAA//8DALVuXjbCBAAA
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpRU207kOBD9lcivGwffEtt5A7rRIsRF063d1b75UgEvaaflODAI9b+vkoYBZrQP+xJHJVfVqXOO6xVFswPUotP9fv0EMY+oRDksIUZYg4nGVG5J3QrVCl0pzZlk9d+oROEKXlCLpHCOOg2YQwNYeFJjyzuHvQdNCfWE1WKuae5H1L4iEyoPT8FBNYx/QBrDEFGL/gzRD89zbxMq1w+Tr9LQw2Ucs4luBrNab662t3f4QjY367Oz480RxrlAFTxqUdOBVd7UWGrtsHDaYiW1xMbwzndQz+cxLcQMKZq+Gv3jBwY/5AjZtaxivCKYaXQokTfZzLCtGWH7sp+RLDSt5ni5hJff9hU9QUItK98JPZY7cX042Y12Cr0/Wb6oRPs07CHlAAsjy5B9b3IYYvHW47wPEDMq0dmcspmcg3FELdqmCd6j63gfIlwks4PnIT3eHNtWN+stKtFdGv4Bl+9MfkAt4p1TvrOOGqFtZ8HrhtQGtOmEFarznlPXOUY70khpmei48taappG1t5YxVKLbTXHXm9wNafdFr81Rgsv/ocDm9Hwdje1hzrkw/fhjpK1J95BRiyylnVNSa+FZrT0H4xQI2lhPjFIcBHgute6o4pxxRTtFrNKmVsTWIDxHJbocN9lEb/ohwvo7uGnm94PCa+MeQoTicjUDp8ILTTwW1BosZKexAW6wrRstlOW+gdnD50PMIU7DNBaXMcN9WjT7NMTtpjhN7iFkcHlKsxx/NXPiXRr85HLxYTZKKlJxMgO9nfJ+ysU38CGBywsrbyBvNz+nsIYRMkOZUoKYi1ng4nczzipTL33tGICn3EpiO6iVV7Vy0jeNajonakc4rZ0QjnfWa2Ot5o4J1lkBskElgtnbxfKcrGkceEewB6OwUKrBhmuPQVsKXBkpmPjCY3HbL3md9IQRhrVRDRbccqw441gQRiQ3yjXUfLXwpxFV1VRUVFyqhZp33t5ehVCoRFeQIvSfeLkOLg3j0OXizZXFF6Y+NVqFcd+bl1/6/QaSk456K9/vnz+Ae/zVpN+mOO/GYnH7c4j4+yLvanCPkIrZHibEeQ38yLie+hy2DwmMB389ePi56KFEOzDjlGC3bN9lIURIC4zVdLTYZbwOfR9GcEP0I2oFUxUlgr6h/c9rmlVSE3U4HA7/AgAA//8DADlZ+rXpBQAA
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACoxTTW/bOBD9K8KcRYUSqQ/q1sQJNkhbB7V3u9gbP0YOEYU0KCptEPi/F5Sdtm572JOE0ejNm/fevIKTTwg9vNvvr5/RxQlyiHYpVbRqCBWkbLe07nnXc1Hwpu2qlv4HOdg7fIEeWq51qQUShg0SbmhNFBs0MQZFSUtDq5onTLmboH8FaQuDz1Zj4ad/MEzWO+jhs3XGf0mzpS306GdTBD/irZuidDqRWV1v7rbre3LTNh+vLy+PnRNOCaCwBnpoBlSdkTVphdCEa6FI14qWSMkGM2CdnsffrIsYnByLyTz+4GB8dBh1XxUVKyipBBxyMDLKRFvJCbcv+8RkkWmV6vlSXl77V3jGAH2Vvwl6hLvQo714mtRsR3Mx+t3Out2Vd4PdzUHGNDiHffB7DNHiItB6k/3gVNKCFlVTUQo5fJD6wTrMblfZekwbq6E1tKIVEbJrCGeKkY5VjHBa0ZbJTjdlInmHweH4E+oHq4Of/BCzk+7Z2Zwr76J1s5+n7NZF3J2I9nAjxwlTwxwCupjdy/iQ/SWnh8TUtKbWFaIpmWqpGrDuTFd3ujVN0zWD5rWmrKw155oNygiplGC64tWgOLYN5LDF8GSdHN/73S5p+X3e+YcVDnIe48bPYUnGZB4hh0vrZHg5dvw9oTl1fTya8Ya0BGocl4Wyk59Xo0UXz/RNaSq54YIawkslCW8HQSQySVTdCN4pZhpMsb4P3sw6/moZowxy+DS7dErZbTLri3Xka8N/ofoTN0y5ypYoCymVarQgjFEkvCkrIriQhCGTkg+a8UFADiuvHzFkyS9p3RnYepO9C/rBRtRxDmnNf5fZ6012P8o4+PB0dnbrOe7nmH1CYwPqiInFNswJ6saO+BvZt71PGvIOctgcr3HZ9n8e45V3k/8D/B8dhx7kHD0cDofDNwAAAP//AwDB5+uJuAQAAA==
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpRTy07cMBT9lcjrODi248TZwQyoCFEQjNqqOz9uGItgjxyHh9D8e+XMIEp3XcW68jk+j5t35NUToB6d7nbnz+DThEqU3DKihApMJK7bDWl63vVcVpIwSrr2NyqRu4I31KOWG1MbCZiBAMwtabBmg8HWgqxJbQlteOZUDxPq35FylYVnZ6AK0w+Ikwse9ein8za85LeVq8wYZlvFMMKln5LyJotZn99fbW5u8UUrvp+fnR1uTjBlgspZ1CMxgO6sanArpcHcSI27VrZYKTbYAZr8PcCcTxC9GqvJPn5qsCF5SKanFWUVwVSifYmsSirL1mqCzdsuK1liWud5uYyXY/+OniGinpYfgR7oTszoTkx4elLengzOu2mLSrSLYQcxOVgiWVyOo0ou+OL4yGp04BMq0c19cTuqNIT49CWn+4P1y/9wfq3M1nkoLtcZU3PLJbGY11ph3g4SK2AK60ZI3mlmBeTaVsEn5+cwT8WlT/AQF5WoRxdqnOCg7zSarUtg0hyz9F8iA+HVpVWweUBQiW5jsLNJxWfcNalIxQjLHHPazam4A+simATZ0ybOR/p/IFRQkhlXc4zgU3Gr0rb4pqZtvmBb2xgKYGumW6IHaDrbNZ1prRCdGAxvDGF1Yzg3bNBWKq0lM5TTQXNoRdad2y2WhSINlxKswMKQBnMuNdaSMtxo0tq2YVTorP4z1uJmzDg9tJZQQrFUncCcaYY7RhnmhJKWqc6IOu/ORyTHxnmHSnQF0cP4l+VrZ2KYwpCKY/XFlxDuZp9/1mJZgxfn8esS/jqYR4hFLk85n/fy2Nd+v9//AQAA//8DAB8jFwPzAwAA
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpSUS2/dNhCF/4rAtSjzJT60S2IHdY3URmw0RXdDcmQL0aUuKMppYNz/XlC+gZvusiMGPMPDj4fzQhIckAzk3fF49YyprKQlZdpLgglNmaPcPLB+UHboWccsF9rwv0lLphv8TgZiVAg8OKQSNVIVWU+9HAONER1nPDLRq9oTHlcyvBCYuojPU8BuWf/EvE5LIgP5MqW4fKtnw9SFedlil5cZr9NaIIVq5vLq/ubh9o5+NPqPq/fvX3euuNYG3RTJQKKzIVghqTGipwowUDcCUAAZIcKoneOvsikVzAnmbo1f3zzEpSQsYRCdkB2jwpFTSyIUqLY9rPjw/Vid7Jgua73dy/tyeCHPmMkg2h9AX9tdhHm6KMtxxmecj5BXzBdhORwgRdKSY16OmMuEO5r9tvMMZVpScz7swzxhKqQlt/fN3QxlXPLhJ173rwiuf4HAM2ZPBiJZL7UxqKSU4LQXDKPRQWvhAzAzeoE8IOudMo4bxqUTzMleG2siMBdISx7nxcP8+7rzc4J5G5kRWqBCJ5TWLjCUFsfeIIugtdc2uCitEcpGK8EBcOfRBKdDDcknCE9Twub6kgxEcxWVY5Eq7oEqMzoKKIH6XjtlvYwaq+bDksqUtmVbm+tU8DHv/MhAPsK84iu5dzk8TQVD2XKF+peuwru8xC2U5i0BnHWsk0xW0VaOW2k+Y5wyhoIV70Pezv3+JxFaMFatbDljKs0dlKfmN1if6oZoYh8EYuTSG+ZH7G20vQ0mam31GFQfmOR9UCrI0UcH3jsZhBKjV2g0aQnWwDV7xsMYjRo9Uo9CUqUsp1b3hkouNToEiLuRN47N7Vx1fjSRCSaoA6upkl5SK2sHJpiRYIPmNc4/kJzDpyxpyQ3mhPN/rvxpCnlZl7E05xQ2P0H4vKU6P5o9kd+mRP/ZaV8u4Svmpr4WTKl+lfMDnVpyQFi3jId9/Awv5K7+k+Zhn0JCdZpz05L7Arlsx3NZ6c4xrU6n0+lfAAAA//8DAMJGy6DDBAAA
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpSUy27dNhCGX0XgWpR5v2iXxA5qGKmN+CAtuuNlFBPRoQ4oymlgnHcvKJ/ATXfdEQPO8J9vfs4Lyu4IaETvTqebZ8h1RT2qaQ8xwhQmFlN9IHIUZpRkoMRYQsVfqEfpDn6gEWkRAg0WMAcFWEQisedTwDGCpYRGwqRoNd3XFY0vyKUhwnMKMCzrFyhrWjIa0R8px+V7e9ulIczLFoeyzHCb1+pyaGKubx7vDvcP+KNWv9+8f/96c4W1FRhSRCOK1oRgGMdaM4mFg4Dt5Bx2jkcX3aSspa9pKVco2c3DGr+9aYhLzVDDyAbGB4KZReceRVddk+3dCocfp6Zkx3Td4v0e3o/jC3qGgkbW/wT6Wu4qzOlq3fwMzzCfXFmhXIXleHQ5oh6dynKCUhPsaJ6h+GVNtVENQTtjKI3GaSF1NFwyriMnEA3RMtponRJqYkHKKXpjtZhEZFREBUJ4jXq0w5tnV9OSu4v2D3OCXFGP7h+7h9nVaSnHX/A/vhK9/R9Am2w0Ik4kV1qD4Jw7qzwjELUKSjEfHNGTZ0ADEGmFtlQTyi0jlkuljY6O2IB69MmFp5Shu71GI1JURGFJxIJ6h4WeLHbAHfZSWWE8b42iHn1Yck15W7a1u80Vvpa9XzSij25e4bXTdyU8pQqhbqVB+FO1xIeyxC3U7s0AlAxk4IS3pK2ettp9hpgKhAoNx6Fsl3r/SWGKEdKkbKVArt2Dq0/db259aheijjIwgEi518RPIE000gQdlTJqCkIGwqkMQgQ++Wid95YHJtjkBWiFegTNb91u8TBJyi112BhtsIheYi8Nw0QqYo0xOoo2kTeO3f3c8vykI2GEYeuMwoJ7jg1nHAvCiObOBEWbm38iuZhFGNSjOygZ5n+1/CmFsqzLVLuLa7pfIHzeclsf3e6g7ynjv3fa10v4BqVr03Ipt59yGdC5R0dw61bguG+f8QU9tG/SHfYlxMSgKNU9eqyu1O10CQs1WKLE+Xw+/wMAAP//AwC8ws6OwgQAAA==
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACoyUTW/bOBCG/4owZ1GhSOrz1sQJNsi2Tmu3u9gbRY4cIgppkFS6QeD/vqDsbOp2D3sTRqN3nnlnRq9g5RNCDx/2++tntDFADtEsIUZZTWhHymZLq160fUWLsmmrqhJ/QQ7mDl+gh0YoVaoOCccaidC0IgMfFdEau5KWmrJKJE25C9C/gjSFxmejsHDhG/pgnIUe/jBWu++ptjSFmtysC+8mvLUhSqsSzOp6c7dd35Obpv50fXl5zAwYkkBhNPSgu1aplnHSNKwiQqIi3SglkZJrqeVYd115/MzYiN7KqQj68Z1Bu2gxqp4VjBeUsA4OOWgZZcIeZMDtyz6RLDatUjxfwstj/wrP6KFn+ZuhR7kLNZmLpzDMZtIXk9vtjN1dOTua3exlTIVz2Hu3Rx8NLgatN9k7U0kLWrCaUQo5fJTqwVjMblfZekodD2OjKaOMdLKtieADJy1nnAjKaMNlq+oyQd6htzj9oPrRKO+CG2N28j07q3PlbDR2dnPIbm3E3Qm0hxs5BUwJs/doY3Yv40P2mwwPiVQ3ulIMUZd8aOgwYtXqtmpVo+u6rUclKkV5WSkhFB8H3clh6Lhigo2DwKaGHLbon4yV0+9ut0te/lvv/MUKRzlPceNmv2xG0I+Qw6Wx0r8cM74G1KesT8dhvCktCzVNS0PZaZ5Xk0Ebz/yFHupSaNFRTUQ5SCKasSMSuSRDVXeiHbiuMa31vXd6VvHnkXHKIYcvs02nlN2mYX03lvxdi59Qf2DDtFfZssp1Q5EPoyZIO0GEGJFIHCnRVOMoq6qsaAc5rJx6RJ+leUljz8TWm+yDVw8mooqzT23+udReb7L7ScbR+aezs1vPcT/H7Atq41FFTBRbPyepGzPhL7BvfZ88FO1xb4J7y/2GfnDBxPSL+DwbTAZvjue62PE/r/VM853pPzcCepBzdHA4HA7/AAAA//8DAL7u70zYBAAA
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACoxUy27jOBD8FYFnUaFI6mVgDxknwQbZjI3Ys7vYGx/NmIhMGhSVTBDk3weU5YkzmMPeCLIfVdXVfENO7AEt0OXhcP0MLg4oR9FOV5TQGpMOl82WVAveLipS1C1rSMn/Qzmyd/CKFqjhSpWqA8ygBsw1qbBkRmGtoStJqQmteKopHge0eEPCFhqerYLCD39DGKx3aIH+sU77l9Rb2EL1ftRF8D3cuiEKpxKYq+vN3Xa1xjdN/fX6y5dj5ABDKlBYjRZId61SLWW4aWiFuQCFOyMEFoJpoYWpu648plkXITjRF4N++sCgfXQQ1YIWlBUE0w6950iLKBJsKQbYvh4Skkmmq3SfT9fTcfGGniGgBc1Pgh7LXajeXuwHOdpeX0QRHiGaIPbw4sMTPIse5egQ/AFCtDDps9pkH5BKUpCC1pQQlKN7oXbWQXZ7la36RFiaRhNKKO5EW2POJMMtowxzQknDRKvqMmG8g+CgP6t6b1Xwgzcxm2XPPvVZehetG/04ZLcuwmMQ8Zh3I/oBUI7Wo+ztsHsAoV+3/mFMb27sE5flGAK4mK1F3GV/imGXSOhGV4oC6JLJhkgDVavbqlWNruu2NopXirCyUpwrZqTuhJQdU5RTIzk0NcrRaoyHMZ70/34GYhvsfg/6A8F20njdi2h82N9qcNEam0ZziphM1fcTq2yuuewtuPhJZLRAdck174jGvJQC88Z0WAATWFZ1x1vJdA3J2kvvjH0cf+pEjNGcmapta9nJkgA1TctJYyTRyjDV6UpCQxvStNB2ihBZ8bKVnSIayorrxC54Par4qxUYYShHD6NLG5rdJtov1uHvNf9QZB189Mr3aWC2h83rEGH/u6kt/f7gBxsTfzOP9tsA996l1/kPmDWbky99PAuGtAjZtHtJFg2c4k7VDHNtGiwp0biuW97UXDDQHcrRlVdPELLkMGHdNJSTqVab7DKonY2g4hhS638nVsd53px25kOQ4uv1dukDXB4O+Xz7x3NXJAevNtnJAJ/+lm9Dit75IbGIYTzz0QZ6c4J15qaj8bIH0DaAitPT9pg4a/Q7h12GaI1QcUhr8JdXkzFmp80hv/Y7G8DP7GPzsyHMppgr8XaqM/2AkxX+1wf4/v7+/gMAAP//AwCxdSWE9QUAAA==
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpRTTU/cMBD9K9Gc4+DYjvNxoyxVEWpBsGqr3ib2pFgEZ+U4fAjtf6+cXUTprRfLGvnNvPfm+RU8PhB0cLrbnT+SjzPkEN1aElxoxltW1ltedarpKl00Uopa6l+Qg7ukF+igVsaUpiUmSRNTllesl4Nh1lJb8tJyUanUE3/P0L0CusLSozNUTPN3CrObPHTww3k7PaXZ6AozTostwjTShZ8jepPIbM5vL7dX1+xzrb+df/p0eDnTnBoUzkIHtm2MaYRkdS0qppAMawdEhigtWhx025YHmPORgsexmO39Owc7RU/RdKIQsuBMtLDPwWLERLvHmbYvu8RktWmT6vlaXq/dKzxSgE7kb4Ye2p2Y0Z08zP3iRntyOCPO90npLkw7CtHR6ssqdRwxuslnx0lnoyMfIYer2+x6xDhM4eGDWbcH/Rf/IX+bpp8/k1ki2bNp8RE6UAJy+IrmznnKLjbQgS6VVS23TJU9MlUPLUOSyPpKt6rppdWUtno2+ej8Mi1zduEj/Q4rf+jgM44zHZifBnPnIpm4hCTqp07A6zDZxcTs3f6SF7yQXCbQEndLzG7IukAmUpK3Dcux3z8QoQXnicoSAvmYXWO8y77gfJce2NpWRhDZUvY17weqGttUjamt1o0ejKoMl2VllDJy6G2Lfd9KI5QYekW1hhwobTtbA9YS15wImUbNmdKVYNhzYkZz5FXbN7ZMmXj3MbsaE64fassFF6zFRjMle8kaKSRTXPBaYmP0inuz5Lh81UAOlxQ8jX9J/upMmOZpiNkxBdkHE24Wnz5vtibiyXn2vLq9mcw9hSxtC51POT0uaL/f7/8AAAD//wMAd4cViwMEAAA=
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpRTXW/bIBT9KxbPwcWAMfitbVotqrpGbbRNe8Nw3aA6EGHcD1X57xNOqq5725t1xTn3fFy/I693gFp0vt9fPYNPI1qg5OYRJVRgonDVbEjdctnWopSMM0bVb7RA7gbeUIsabkxlFGAGAjC3pMYd6w22FlRFKktozTOnfhxR+460Ky08OwNlGH9AHF3wqEU/nbfhJe/WrjRDmGwZwwArPybtTRazvHq42dyt8XUjvl9dXBxfjjBmgtJZ1CKrpDGSMtw0tMZcg8Gq1xprzay2uhdKVUeY8wmi10M52qdPDTYkD8m0tKSsJJgqdFggq5POsjs9wuZtn5XMMS3zfDGP58/2HT1DRC1dfAR6pDszgzszYbfT3p71zrtxixZoH8MeYnIwRzK7HAadXPDFacnl4MAntEB3D8V60KkPcfclp4ej9dV/OL/VZus8FKslapGouOWKWMyrTmPe9AprYBp3tVBcdswKyLVdBp+cn8I0Fiuf4DHOKlGLrvUwwlHfeTRbl8CkKWbpv0QGwqtLl8HmQd69jsFOJhWfcVekJCUjLHNMaT+l4h6si2ASZE+bOJ3o/4FQQQnJyqYYwadirdO2+KbHbX5gG1sbCmAr1jWk66GWVtbSNFYIKXrDa0NYVRvODes7q3TXKWYop33HoRFZd263mA+qMY1QnQbMOasxZ12HOwUWV5KQCqSESvdfYi3uhozr+sYSSihWWoqMY1gyyjAnlDRMSyOqfDsfkZwa5xIt0A1ED8Nflm+diWEMfSpO1RdfQriffP5Zi/kMXpzHr3P4y2CeIBa5PO18vstTX4fD4fAHAAD//wMA/WXCnPMDAAA=
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpRUy27kIBD8FYvz4GDA2PiWpzaKsok2o+xqbzzaCYoDI8B5KJp/X+GZKDun1V4QancX1VUlfyCvngEN6HizOX8BnxNaoeyWEiVUYCJx061JO/B+aEXdU0lb2v1GK+Su4B0NqOPGNEYCZiAAc0tarNlosLUgG9JYQlteMNVDQsMHUq628OIM1CHdQ0wueDSgn87b8FreVq42U5htHcMElz5l5U0hc3Z+d7W+ucUXnfh+fnKy60yQCkDtLBqQlb0xPWW462iLuQKD5agUVopZZdUopGx2Y85niF5NdbJPXxxsyB6yGWhNWU0wlWi7QlZlVWhrlWD9vilMFpnOSn21lJfr8IFeIKKBrj4F3cEdmckdPSc9u8ke7c6s0lNazlGZHOI7WqFNDBuI2cGi0XFK8Kyn97VKTxe7nnJN529g5gz2NMw+owExgVZo0WiaVHbBV3uKp5MDn5ePOTqfnPkXVEG6uatuJ5XHEJ8PLLnbqXz5HyJfK/PoPFSXZwW74ZZLYjFvtMK8GyVWwBTWrZC818wKKAk5DT47P4c5VZc+w0NcVkIDulBTgh2/42geXQaT51j2/CXK4G0Mdja5+rKyITWpGWFlaM6bOVc/wLoIJkNZYh3nPd794QgVlJBCZY4RfK5uVX6svqn0WBpsZ1tDAWzDdEf0CG1v+7Y3nRWiF6PhrSGsaQ3nho3aSqW1ZIZyOmoOXREYSnKqJaySso522mA7tgJzYhusjBW4oVJT23R2pPRAx+pmKnN67CyhhGKpeoE50wz3jDLMCSUdU70RTcnlpyT7PPAerdAVRA/TXytfOxNDCmOu9l5XByL8mH35EVSL76/O47dF7bNgniBWxS3lfMn83qDtdrv9AwAA//8DAJ9uh65PBAAA
@@ -1,5 +0,0 @@
-https://dc.services.visualstudio.com/v2/track
-Content-Type:application/x-json-stream
-Content-Encoding:gzip
-
-H4sIAAAAAAAACpRVTW/jNhD9KwKvlbQSKZGSgD1kHWcbLPKB2OgWvQ3JYcxGIQ2KyjYN/N8LyknX2UUPvdjSSDPz5r031Atx8IhkIGf7/foJXZxITqJdQrSivKj6ohbbqh2abmh52bGu5XX/B8mJ/YLPZCCiUapWPRYMORaNrtpCMqMKrbGvq1pXtG1STbifyPBCwJYan6zC0k+/YZisd2QgX63T/lvqDbZUo591GfyIl26K4FQCc77efNne3BYXgl+vP306vjnhlAqUVpOB6L5TqqOsEIK2RQOoit4AFABMgwbD+74+plkXMTgYy0k/fMegfXQY1UBLysqqoD055ERDhARbwoTb531CstB0nuL5El4uhxfyhIEMNH8j9Fjugxrth8dJznbUH5ZfkpN98HsM0eLCyDLkOEK03mWvPVajRRdJTj6llM2sFE4TGcgFjBO+hdfu3jq8CPCI33x4uD72La/XW5KT2+D/RBVvIe7IQJhRnTZS1dD00kjUPa9awB5MI5vOaM1qZRStTcWFkLQxrNNSAuei1VJSSnJys8luR4jGh8d3gm2OGlz+Dwk2Z6u1Azmi/nGkLYR7jGQgLW8lMtNRLjlo6FlnakDWayUZb7GTQncoBKMMVKuqrla1qFvoRdsKzmjqcjltIjgNo3e4/gvVnAgmA9mGOfW7ArWzDrPLczIQXje66StdNLWEohGmLwAZFLLlfdNJpjkmE1+AHeeAK4h470Ny//X8GZNOK++idbOfp+zSRbwPi5wn491ssrOgdjaiinNIQv3OU8nb4PWsYvbdh3VVViWrWEqa436O2R1qG1DFha9X+DebH1Mop1WVoMwhoItZkj77Faakf62FbhVF1DWTopIG2053baeE5rzjRjWtqljdqqZRzEjdg5Q9U7ShRjYoOMkJJttny6Y1XS8qo6DoIFHGelOAkrLg0vTQiKpjlXjHcHYzpjxphK5oRYseOl40TLKiY5QVTUUrwaBTvIb35j4ZsSt5WTclE91CzRtvrwvTdCQn6xB8WPk5nWLD6d2lMz57yVb+cW9HDNnHLM+upqXPZ3QYYDwNrZ9gnI/reBp9s9C77AD73RLYwvSwXGz0wx1OfnzCMC2Ba4wbfXy2uCX7mNV5tqSvdqhen0C0T7j1flQ7sMceK6/xzMH4PNljpTv42x/Bf92b5f9s2l8vFfPsJu6WybIDyckXDA7HE4dcWRX85E3MXjc3e+eZE8rP7bQf4fkn5n9BwSpTa5mk/Y7+50W+m136gGTLifDNuuKvxejnXj1gyNKigHXprPw342oeo93uAoJGfeU1/lj0kJNHhGkO+Lh8opZT02FYYJzPx2W7dFd2HO2Eyjs9kYFz3pSM0/YV7n++JxpaVqzmh8Ph8A8AAAD//wMADw4oQRAHAAA=
@@ -1,18 +0,0 @@
-{
-  "Microsoft.NET.Workload.Emscripten.Current": "10.0.111/10.0.100",
-  "Microsoft.NET.Workload.Emscripten.net6": "10.0.111/10.0.100",
-  "Microsoft.NET.Workload.Emscripten.net7": "10.0.111/10.0.100",
-  "Microsoft.NET.Workload.Emscripten.net8": "10.0.111/10.0.100",
-  "Microsoft.NET.Workload.Emscripten.net9": "10.0.111/10.0.100",
-  "Microsoft.NET.Sdk.Android": "36.1.69/10.0.100",
-  "Microsoft.NET.Sdk.iOS": "26.5.10315/10.0.100",
-  "Microsoft.NET.Sdk.MacCatalyst": "26.5.10315/10.0.100",
-  "Microsoft.NET.Sdk.macOS": "26.5.10315/10.0.100",
-  "Microsoft.NET.Sdk.Maui": "10.0.20/10.0.100",
-  "Microsoft.NET.Sdk.tvOS": "26.5.10315/10.0.100",
-  "Microsoft.NET.Workload.Mono.ToolChain.Current": "10.0.111/10.0.100",
-  "Microsoft.NET.Workload.Mono.ToolChain.net6": "10.0.111/10.0.100",
-  "Microsoft.NET.Workload.Mono.ToolChain.net7": "10.0.111/10.0.100",
-  "Microsoft.NET.Workload.Mono.ToolChain.net8": "10.0.111/10.0.100",
-  "Microsoft.NET.Workload.Mono.ToolChain.net9": "10.0.111/10.0.100"
-}
@@ -1 +0,0 @@
-10.0.300
@@ -1 +0,0 @@
-10.0.303.1
@@ -16,13 +16,10 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
    public DbSet<Uom> Uoms { get; set; }
    public DbSet<UomConversion> UomConversions { get; set; }
    public DbSet<Item> Items { get; set; }
-    public DbSet<ItemBatch> ItemBatches { get; set; }
-    public DbSet<ItemSerialNumber> ItemSerialNumbers { get; set; }
    public DbSet<SaleRoute> SaleRoutes { get; set; }
-    public DbSet<ShopPO> ShopPOs { get; set; }
-    public DbSet<ShopPOItem> ShopPOItems { get; set; }
-    public DbSet<Invoice> Invoices { get; set; }
-    public DbSet<LoadingSheetOrder> LoadingSheetOrders { get; set; }
+    public DbSet<Sale> Sales { get; set; }
+    public DbSet<Order> Orders { get; set; }
+    public DbSet<OrderItem> OrderItems { get; set; }
    public DbSet<DeliveryRun> DeliveryRuns { get; set; }
    public DbSet<User> Users { get; set; }
    public DbSet<Role> Roles { get; set; }
@@ -33,11 +30,13 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
    public DbSet<UserStoreScope> UserStoreScopes { get; set; }
    public DbSet<StockBalance> StockBalances { get; set; }
    public DbSet<StockMovement> StockMovements { get; set; }
+    public DbSet<StoreKycDocument> StoreKycDocuments { get; set; }
    public DbSet<PriceList> PriceLists { get; set; }
    public DbSet<PriceListItem> PriceListItems { get; set; }
    public DbSet<Supplier> Suppliers { get; set; }
    public DbSet<DriverProfile> DriverProfiles { get; set; }
    public DbSet<DriverComplianceConfig> DriverComplianceConfigs { get; set; }
+    public DbSet<RideCancelRequest> RideCancelRequests { get; set; }
    public DbSet<Scheme> Schemes { get; set; }
    public DbSet<SchemeRedemption> SchemeRedemptions { get; set; }
    public DbSet<SchemeBundleComponent> SchemeBundleComponents { get; set; }
@@ -49,8 +48,6 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
    public DbSet<PurchaseOrderItem> PurchaseOrderItems { get; set; }
    public DbSet<GoodsReceipt> GoodsReceipts { get; set; }
    public DbSet<GoodsReceiptItem> GoodsReceiptItems { get; set; }
-    public DbSet<GoodsReceiptItemBatch> GoodsReceiptItemBatches { get; set; }
-    public DbSet<GoodsReceiptItemSerial> GoodsReceiptItemSerials { get; set; }
    public DbSet<PurchaseReturn> PurchaseReturns { get; set; }
    public DbSet<PurchaseReturnItem> PurchaseReturnItems { get; set; }
    public DbSet<SaleReturn> SaleReturns { get; set; }
@@ -63,12 +60,14 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
    public DbSet<RegionalBudget> RegionalBudgets { get; set; }
    public DbSet<RegionAgencyMap> RegionAgencyMaps { get; set; }
    public DbSet<RegionalTaxRule> RegionalTaxRules { get; set; }
-    public DbSet<RouteVisitLog> RouteVisitLogs { get; set; }
-    public DbSet<SysConfig> SysConfigs { get; set; }
+    public DbSet<RideItemCount> RideItemCounts { get; set; }
+    public DbSet<RideVariance> RideVariances { get; set; }
+    public DbSet<RideCloseSummary> RideCloseSummaries { get; set; }

    protected override void OnModelCreating(ModelBuilder modelBuilder)
    {
-        // --- Composite PKs ---
+        modelBuilder.Entity<OrderItem>()
+            .HasKey(oi => new { oi.FK_OrderId, oi.FK_ItemId });

        modelBuilder.Entity<RolePermission>()
            .HasKey(rp => new { rp.FK_RoleId, rp.FK_PermissionId });
@@ -82,39 +81,27 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
        modelBuilder.Entity<UserStoreScope>()
            .HasKey(s => new { s.FK_UserId, s.FK_StoreId });

-        modelBuilder.Entity<LoadingSheetOrder>()
-            .HasKey(lo => new { lo.FK_LoadingSheetId, lo.FK_ShopPOId });
-
-        // --- Unique indexes ---
-
-        // NOTE: MySQL treats each NULL as distinct in a unique index, so this does not by itself
-        // prevent duplicate rows for untracked items (both FK columns null) — StockRepository's
-        // get-then-update pattern is what keeps those to one row per (Item, Location), same as before.
-        modelBuilder.Entity<StockBalance>()
-            .HasIndex(sb => new { sb.FK_ItemId, sb.LocationId, sb.FK_ItemBatchId, sb.FK_ItemSerialNumberId })
-            .IsUnique();
-
-        modelBuilder.Entity<ItemSerialNumber>()
-            .HasIndex(s => new { s.FK_ItemId, s.SerialNumber })
-            .IsUnique();
-
-        modelBuilder.Entity<PriceListItem>()
-            .HasIndex(pli => new { pli.FK_PriceListId, pli.FK_ItemId })
-            .IsUnique();
-
-        modelBuilder.Entity<DriverProfile>()
-            .HasIndex(dp => dp.FK_UserId)
-            .IsUnique();
-
-        // --- User ---
-
        modelBuilder.Entity<User>()
            .HasOne(u => u.ReportsTo)
            .WithMany()
            .HasForeignKey(u => u.FK_ReportsToUserId)
            .OnDelete(DeleteBehavior.Restrict);

-        // --- Vehicle ---
+        modelBuilder.Entity<StockBalance>()
+            .HasIndex(sb => new { sb.FK_ItemId, sb.LocationId })
+            .IsUnique();
+
+        modelBuilder.Entity<PriceListItem>()
+            .HasIndex(pli => new { pli.FK_PriceListId, pli.FK_ItemId })
+            .IsUnique();
+
+        modelBuilder.Entity<Order>()
+            .HasIndex(o => o.FK_SaleId)
+            .IsUnique();
+
+        modelBuilder.Entity<DriverProfile>()
+            .HasIndex(dp => dp.FK_UserId)
+            .IsUnique();

        modelBuilder.Entity<Vehicle>()
            .HasOne<Warehouse>()
@@ -123,7 +110,11 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
            .OnDelete(DeleteBehavior.Restrict)
            .IsRequired(false);

-        // --- DeliveryRun ---
+        modelBuilder.Entity<DeliveryRun>()
+            .HasOne(r => r.SourceWarehouse)
+            .WithMany()
+            .HasForeignKey(r => r.FK_SourceWarehouseId)
+            .OnDelete(DeleteBehavior.Restrict);

        modelBuilder.Entity<DeliveryRun>()
            .HasOne(r => r.DriverProfile)
@@ -131,97 +122,30 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
            .HasForeignKey(r => r.FK_DriverProfileId)
            .OnDelete(DeleteBehavior.Restrict);

-        // --- ShopPO ---
-
-        modelBuilder.Entity<ShopPO>()
-            .HasOne(p => p.Store)
+        modelBuilder.Entity<Sale>()
+            .HasOne(s => s.Store)
            .WithMany()
-            .HasForeignKey(p => p.FK_StoreId)
+            .HasForeignKey(s => s.FK_StoreId)
            .OnDelete(DeleteBehavior.Restrict);

-        // InvoiceId is a plain column — no FK constraint
-        modelBuilder.Entity<ShopPO>()
-            .Property(p => p.InvoiceId)
-            .HasColumnName("InvoiceId");
-
-        // --- ShopPOItem ---
-
-        modelBuilder.Entity<ShopPOItem>()
-            .HasOne(i => i.ShopPO)
-            .WithMany(p => p.Items)
-            .HasForeignKey(i => i.FK_ShopPOId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        modelBuilder.Entity<ShopPOItem>()
-            .HasOne(i => i.Item)
+        modelBuilder.Entity<Sale>()
+            .HasOne(s => s.CreatedByUser)
            .WithMany()
-            .HasForeignKey(i => i.FK_ItemId)
+            .HasForeignKey(s => s.CreatedByUserId)
            .OnDelete(DeleteBehavior.Restrict);

-        // --- Invoice ---
-
-        modelBuilder.Entity<Invoice>()
-            .HasOne(i => i.ShopPO)
-            .WithMany()
-            .HasForeignKey(i => i.FK_ShopPOId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        modelBuilder.Entity<Invoice>()
-            .HasMany(i => i.Payments)
-            .WithOne(p => p.Invoice)
-            .HasForeignKey(p => p.FK_InvoiceId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        // --- LoadingSheet ---
-
-        modelBuilder.Entity<LoadingSheet>()
+        modelBuilder.Entity<Sale>()
            .HasOne(s => s.Ride)
            .WithMany()
            .HasForeignKey(s => s.FK_RideId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        // --- LoadingSheetOrder ---
-
-        modelBuilder.Entity<LoadingSheetOrder>()
-            .HasOne(lo => lo.LoadingSheet)
-            .WithMany(s => s.Orders)
-            .HasForeignKey(lo => lo.FK_LoadingSheetId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        modelBuilder.Entity<LoadingSheetOrder>()
-            .HasOne(lo => lo.ShopPO)
-            .WithMany()
-            .HasForeignKey(lo => lo.FK_ShopPOId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        // --- LoadingSheetItem ---
-
-        modelBuilder.Entity<LoadingSheetItem>()
-            .HasOne(i => i.LoadingSheet)
-            .WithMany(s => s.Items)
-            .HasForeignKey(i => i.FK_LoadingSheetId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        modelBuilder.Entity<LoadingSheetItem>()
-            .HasOne(i => i.Item)
-            .WithMany()
-            .HasForeignKey(i => i.FK_ItemId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        modelBuilder.Entity<LoadingSheetItem>()
-            .HasOne(i => i.Warehouse)
-            .WithMany()
-            .HasForeignKey(i => i.FK_WarehouseId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        modelBuilder.Entity<LoadingSheetItem>()
-            .HasOne(i => i.ShopPOItem)
-            .WithMany()
-            .HasForeignKey(i => i.FK_ShopPOItemId)
-            .OnDelete(DeleteBehavior.SetNull)
+            .OnDelete(DeleteBehavior.Restrict)
            .IsRequired(false);

-        // --- SchemeRedemption ---
+        modelBuilder.Entity<Order>()
+            .HasOne(o => o.Sale)
+            .WithMany()
+            .HasForeignKey(o => o.FK_SaleId)
+            .OnDelete(DeleteBehavior.Restrict);

        modelBuilder.Entity<SchemeRedemption>()
            .HasOne(r => r.Scheme)
@@ -230,11 +154,10 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
            .OnDelete(DeleteBehavior.Restrict);

        modelBuilder.Entity<SchemeRedemption>()
-            .HasOne(r => r.ShopPO)
+            .HasOne(r => r.Order)
            .WithMany()
-            .HasForeignKey(r => r.FK_ShopPOId)
-            .OnDelete(DeleteBehavior.Restrict)
-            .IsRequired(false);
+            .HasForeignKey(r => r.FK_OrderId)
+            .OnDelete(DeleteBehavior.Restrict);

        modelBuilder.Entity<SchemeRedemption>()
            .HasOne(r => r.FreeItem)
@@ -242,8 +165,6 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
            .HasForeignKey(r => r.FK_FreeItemId)
            .OnDelete(DeleteBehavior.Restrict);

-        // --- Scheme ---
-
        modelBuilder.Entity<Scheme>()
            .HasOne(s => s.TriggerItem)
            .WithMany()
@@ -272,7 +193,23 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
            .HasIndex(c => new { c.FK_SchemeId, c.FK_ItemId })
            .IsUnique();

-        // --- PurchaseOrder ---
+        modelBuilder.Entity<LoadingSheet>()
+            .HasOne(s => s.SourceWarehouse)
+            .WithMany()
+            .HasForeignKey(s => s.FK_SourceWarehouseId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        modelBuilder.Entity<LoadingSheet>()
+            .HasOne(s => s.Ride)
+            .WithMany()
+            .HasForeignKey(s => s.FK_RideId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        modelBuilder.Entity<LoadingSheetItem>()
+            .HasOne(i => i.Item)
+            .WithMany()
+            .HasForeignKey(i => i.FK_ItemId)
+            .OnDelete(DeleteBehavior.Restrict);

        modelBuilder.Entity<PurchaseOrder>()
            .HasOne(po => po.Supplier)
@@ -292,24 +229,12 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
            .HasForeignKey(i => i.FK_ItemId)
            .OnDelete(DeleteBehavior.Restrict);

-        modelBuilder.Entity<PurchaseOrderItem>()
-            .HasIndex(i => i.FK_PurchaseOrderId);
-
-        // --- GoodsReceipt ---
-
        modelBuilder.Entity<GoodsReceipt>()
            .HasOne(gr => gr.PurchaseOrder)
            .WithMany()
            .HasForeignKey(gr => gr.FK_PurchaseOrderId)
            .OnDelete(DeleteBehavior.Restrict);

-        modelBuilder.Entity<GoodsReceipt>()
-            .HasOne(gr => gr.Supplier)
-            .WithMany()
-            .HasForeignKey(gr => gr.FK_SupplierId)
-            .OnDelete(DeleteBehavior.Restrict)
-            .IsRequired(false);
-
        modelBuilder.Entity<GoodsReceipt>()
            .HasOne(gr => gr.Warehouse)
            .WithMany()
@@ -328,94 +253,6 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
            .HasForeignKey(i => i.FK_PurchaseOrderItemId)
            .OnDelete(DeleteBehavior.Restrict);

-        modelBuilder.Entity<GoodsReceiptItem>()
-            .HasOne(i => i.Item)
-            .WithMany()
-            .HasForeignKey(i => i.FK_ItemId)
-            .OnDelete(DeleteBehavior.Restrict)
-            .IsRequired(false);
-
-        modelBuilder.Entity<GoodsReceiptItem>()
-            .HasIndex(i => i.FK_GoodsReceiptId);
-
-        modelBuilder.Entity<GoodsReceiptItem>()
-            .HasIndex(i => i.FK_PurchaseOrderItemId);
-
-        // --- ItemBatch / ItemSerialNumber ---
-
-        modelBuilder.Entity<ItemBatch>()
-            .HasOne(b => b.Item)
-            .WithMany()
-            .HasForeignKey(b => b.FK_ItemId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        modelBuilder.Entity<ItemBatch>()
-            .HasIndex(b => new { b.FK_ItemId, b.BatchNumber });
-
-        modelBuilder.Entity<ItemSerialNumber>()
-            .HasOne(s => s.Item)
-            .WithMany()
-            .HasForeignKey(s => s.FK_ItemId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        // --- StockBalance / StockMovement batch & serial links ---
-
-        modelBuilder.Entity<StockBalance>()
-            .HasOne(sb => sb.ItemBatch)
-            .WithMany()
-            .HasForeignKey(sb => sb.FK_ItemBatchId)
-            .OnDelete(DeleteBehavior.Restrict)
-            .IsRequired(false);
-
-        modelBuilder.Entity<StockBalance>()
-            .HasOne(sb => sb.ItemSerialNumber)
-            .WithMany()
-            .HasForeignKey(sb => sb.FK_ItemSerialNumberId)
-            .OnDelete(DeleteBehavior.Restrict)
-            .IsRequired(false);
-
-        modelBuilder.Entity<StockMovement>()
-            .HasOne(sm => sm.ItemBatch)
-            .WithMany()
-            .HasForeignKey(sm => sm.FK_ItemBatchId)
-            .OnDelete(DeleteBehavior.Restrict)
-            .IsRequired(false);
-
-        modelBuilder.Entity<StockMovement>()
-            .HasOne(sm => sm.ItemSerialNumber)
-            .WithMany()
-            .HasForeignKey(sm => sm.FK_ItemSerialNumberId)
-            .OnDelete(DeleteBehavior.Restrict)
-            .IsRequired(false);
-
-        // --- GoodsReceiptItemBatch / GoodsReceiptItemSerial ---
-
-        modelBuilder.Entity<GoodsReceiptItemBatch>()
-            .HasOne(b => b.GoodsReceiptItem)
-            .WithMany(i => i.Batches)
-            .HasForeignKey(b => b.FK_GoodsReceiptItemId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        modelBuilder.Entity<GoodsReceiptItemBatch>()
-            .HasOne(b => b.ItemBatch)
-            .WithMany()
-            .HasForeignKey(b => b.FK_ItemBatchId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        modelBuilder.Entity<GoodsReceiptItemSerial>()
-            .HasOne(s => s.GoodsReceiptItem)
-            .WithMany(i => i.Serials)
-            .HasForeignKey(s => s.FK_GoodsReceiptItemId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        modelBuilder.Entity<GoodsReceiptItemSerial>()
-            .HasOne(s => s.ItemSerialNumber)
-            .WithMany()
-            .HasForeignKey(s => s.FK_ItemSerialNumberId)
-            .OnDelete(DeleteBehavior.Restrict);
-
-        // --- PurchaseReturn ---
-
        modelBuilder.Entity<PurchaseReturn>()
            .HasOne(pr => pr.PurchaseOrder)
            .WithMany()
@@ -434,15 +271,22 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
            .HasForeignKey(i => i.FK_ItemId)
            .OnDelete(DeleteBehavior.Restrict);

+        modelBuilder.Entity<PurchaseOrderItem>()
+            .HasIndex(i => i.FK_PurchaseOrderId);
+
+        modelBuilder.Entity<GoodsReceiptItem>()
+            .HasIndex(i => i.FK_GoodsReceiptId);
+
+        modelBuilder.Entity<GoodsReceiptItem>()
+            .HasIndex(i => i.FK_PurchaseOrderItemId);
+
        modelBuilder.Entity<PurchaseReturnItem>()
            .HasIndex(i => i.FK_PurchaseReturnId);

-        // --- SaleReturn ---
-
        modelBuilder.Entity<SaleReturn>()
-            .HasOne(r => r.ShopPO)
+            .HasOne(r => r.Order)
            .WithMany()
-            .HasForeignKey(r => r.FK_ShopPOId)
+            .HasForeignKey(r => r.FK_OrderId)
            .OnDelete(DeleteBehavior.Restrict);

        modelBuilder.Entity<SaleReturn>()
@@ -466,16 +310,12 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
        modelBuilder.Entity<SaleReturnItem>()
            .HasIndex(i => i.FK_SaleReturnId);

-        // --- CreditNote ---
-
        modelBuilder.Entity<CreditNote>()
            .HasOne(n => n.SaleReturn)
            .WithMany()
            .HasForeignKey(n => n.FK_SaleReturnId)
            .OnDelete(DeleteBehavior.Restrict);

-        // --- Claims ---
-
        modelBuilder.Entity<Claim>()
            .HasOne(c => c.AgencyUser)
            .WithMany()
@@ -528,8 +368,6 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
        modelBuilder.Entity<SupplierClaimItem>()
            .HasIndex(i => i.FK_SupplierClaimId);

-        // --- DeliveryTask ---
-
        modelBuilder.Entity<DeliveryTask>()
            .HasOne(t => t.Ride)
            .WithMany()
@@ -537,22 +375,11 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
            .OnDelete(DeleteBehavior.Restrict);

        modelBuilder.Entity<DeliveryTask>()
-            .HasOne(t => t.ShopPO)
+            .HasOne(t => t.Order)
            .WithMany()
-            .HasForeignKey(t => t.FK_ShopPOId)
+            .HasForeignKey(t => t.FK_OrderId)
            .OnDelete(DeleteBehavior.Restrict);

-        // --- Regional ---
-
-        modelBuilder.Entity<Region>()
-            .Property(r => r.Code)
-            .HasMaxLength(50);
-
-        modelBuilder.Entity<Region>()
-            .HasIndex(r => r.Code)
-            .IsUnique();
-
-
        modelBuilder.Entity<RegionalTarget>()
            .HasIndex(t => new { t.FK_RegionId, t.Period })
            .IsUnique();
@@ -575,31 +402,23 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
            .HasIndex(r => r.FK_RegionId)
            .IsUnique();

-        // --- SysConfig ---
+        modelBuilder.Entity<RideVariance>()
+            .HasOne(v => v.ResolvedBy)
+            .WithMany()
+            .HasForeignKey(v => v.FK_ResolvedByUserId)
+            .OnDelete(DeleteBehavior.Restrict)
+            .IsRequired(false);

-        modelBuilder.Entity<SysConfig>()
-            .HasKey(c => c.Key);
+        modelBuilder.Entity<RideCloseSummary>()
+            .HasIndex(s => s.FK_RideId)
+            .IsUnique();

-        modelBuilder.Entity<SysConfig>()
-            .Property(c => c.Key)
-            .HasMaxLength(100);
-
-        modelBuilder.Entity<SysConfig>().HasData(
-            new SysConfig { Key = "InvoiceCreationMode", Value = "ModeB", UpdatedAt = new DateTime(2026, 9, 17), UpdatedBy = null },
-            new SysConfig { Key = Distribution.Features.SysConfig.SysConfigService.KeySerialNumberTrackingEnabled, Value = "false", UpdatedAt = new DateTime(2026, 10, 1), UpdatedBy = null },
-            new SysConfig { Key = Distribution.Features.SysConfig.SysConfigService.KeyBatchTrackingEnabled, Value = "false", UpdatedAt = new DateTime(2026, 10, 1), UpdatedBy = null },
-            new SysConfig { Key = Distribution.Features.SysConfig.SysConfigService.KeyExpiryDateTrackingEnabled, Value = "false", UpdatedAt = new DateTime(2026, 10, 1), UpdatedBy = null },
-            new SysConfig { Key = Distribution.Features.SysConfig.SysConfigService.KeyWarrantyTrackingEnabled, Value = "false", UpdatedAt = new DateTime(2026, 10, 1), UpdatedBy = null },
-            new SysConfig { Key = Distribution.Features.SysConfig.SysConfigService.KeyCustomWarrantyOverrideEnabled, Value = "false", UpdatedAt = new DateTime(2026, 10, 1), UpdatedBy = null },
-            new SysConfig { Key = Distribution.Features.SysConfig.SysConfigService.KeyDefaultWarrantyPeriodDays, Value = "0", UpdatedAt = new DateTime(2026, 10, 1), UpdatedBy = null }
-        );
+        modelBuilder.Entity<RideCloseSummary>()
+            .HasOne(s => s.ClosedByUser)
+            .WithMany()
+            .HasForeignKey(s => s.FK_ClosedByUserId)
+            .OnDelete(DeleteBehavior.Restrict);

        Seed.RoleAndPermissionSeed.Apply(modelBuilder);
-        Seed.MasterDataSeed.Apply(modelBuilder);
-        Seed.OperationsDataSeed.Apply(modelBuilder);
-        Seed.ProcurementSeed.Apply(modelBuilder);
-        Seed.CommerceSeed.Apply(modelBuilder);
-        Seed.OperationsExtrasSeed.Apply(modelBuilder);
-        Seed.AdminSeed.Apply(modelBuilder);
    }
 }
@@ -1,25 +0,0 @@
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class AdminSeed
-{
-    private static readonly DateTime SeedDate = new(2026, 10, 13);
-
-    // Same GUID as the AuthHex user — the sub claim from the JWT maps to this Id
-    internal static readonly Guid SuperAdminUserId = new("00000001-0000-0000-0000-000000000001");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<User>().HasData(new User
-        {
-            Id = SuperAdminUserId,
-            Username = "superadmin",
-            FullName = "Super Admin",
-            FK_RoleId = RoleAndPermissionSeed.SuperAdminRoleId,
-            IsActive = true,
-            CreatedAt = SeedDate
-        });
-    }
-}
@@ -1,123 +0,0 @@
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class CommerceSeed
-{
-    private static readonly Guid PriceList1Id = new("39000000-0000-0000-0000-000000000001");
-    private static readonly Guid PriceListItem1Id = new("40000000-0000-0000-0000-000000000001");
-    private static readonly Guid PriceListItem2Id = new("40000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid Scheme1Id = new("48000000-0000-0000-0000-000000000001");
-    private static readonly Guid Scheme2Id = new("48000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid SchemeBundleComponent1Id = new("49000000-0000-0000-0000-000000000001");
-    private static readonly Guid SchemeRedemption1Id = new("50000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid Payment1Id = new("47000000-0000-0000-0000-000000000001");
-    private static readonly Guid Payment2Id = new("47000000-0000-0000-0000-000000000002");
-    private static readonly Guid Payment3Id = new("47000000-0000-0000-0000-000000000003");
-    private static readonly Guid Payment4Id = new("47000000-0000-0000-0000-000000000004");
-
-    private static readonly Guid SaleReturn1Id = new("51000000-0000-0000-0000-000000000001");
-    private static readonly Guid SaleReturnItem1Id = new("52000000-0000-0000-0000-000000000001");
-    private static readonly Guid CreditNote1Id = new("54000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid Claim1Id = new("53000000-0000-0000-0000-000000000001");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<PriceList>().HasData(
-            new PriceList { Id = PriceList1Id, Name = "Western Province Price List", FK_RegionId = MasterDataSeed.WesternRegionId, EffectiveFrom = new DateTime(2026, 1, 1), EffectiveTo = new DateTime(2026, 12, 31), CreatedAt = new DateTime(2026, 8, 1), IsActive = true }
-        );
-
-        modelBuilder.Entity<PriceListItem>().HasData(
-            new PriceListItem { Id = PriceListItem1Id, FK_PriceListId = PriceList1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, Price = 60m, MinPrice = 55m, CreatedAt = new DateTime(2026, 8, 1), IsActive = true },
-            new PriceListItem { Id = PriceListItem2Id, FK_PriceListId = PriceList1Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Price = 50m, MinPrice = 45m, CreatedAt = new DateTime(2026, 8, 1), IsActive = true }
-        );
-
-        modelBuilder.Entity<Scheme>().HasData(
-            new Scheme
-            {
-                Id = Scheme1Id,
-                Name = "Buy 10 Coke Get 1 Free",
-                RuleType = SchemeRuleType.BuyXGetY,
-                RuleConfig = null,
-                FK_TriggerItemId = MasterDataSeed.Coke500ItemId,
-                TriggerQty = 10,
-                FK_FreeItemId = MasterDataSeed.Coke500ItemId,
-                FreeQty = 1m,
-                FK_RegionId = MasterDataSeed.WesternRegionId,
-                EligibleSegment = null,
-                DateRangeFrom = new DateTime(2026, 8, 1),
-                DateRangeTo = new DateTime(2026, 12, 31),
-                AgentLimitExempt = false,
-                BaselineExpectedSales = 500000m,
-                CreatedAt = new DateTime(2026, 8, 1),
-                IsActive = true
-            },
-            new Scheme
-            {
-                Id = Scheme2Id,
-                Name = "Snack Combo Bundle",
-                RuleType = SchemeRuleType.FreeBundle,
-                RuleConfig = null,
-                FK_TriggerItemId = null,
-                TriggerQty = null,
-                FK_FreeItemId = MasterDataSeed.LaysFamilyItemId,
-                FreeQty = 1m,
-                FK_RegionId = MasterDataSeed.CentralRegionId,
-                EligibleSegment = null,
-                DateRangeFrom = new DateTime(2026, 8, 1),
-                DateRangeTo = new DateTime(2026, 12, 31),
-                AgentLimitExempt = false,
-                BaselineExpectedSales = null,
-                CreatedAt = new DateTime(2026, 8, 1),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<SchemeBundleComponent>().HasData(
-            new SchemeBundleComponent { Id = SchemeBundleComponent1Id, FK_SchemeId = Scheme2Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Qty = 5 }
-        );
-
-        modelBuilder.Entity<SchemeRedemption>().HasData(
-            new SchemeRedemption { Id = SchemeRedemption1Id, FK_SchemeId = Scheme1Id, FK_ShopPOId = OperationsDataSeed.ShopPO1Id, FieldInvoiceId = null, DiscountAmount = 0m, FK_FreeItemId = MasterDataSeed.Coke500ItemId, FreeQty = 1m, FreeItemCostValue = 40m, RedeemedAt = new DateTime(2026, 8, 25, 9, 30, 0) }
-        );
-
-        modelBuilder.Entity<Payment>().HasData(
-            new Payment { Id = Payment1Id, FK_InvoiceId = OperationsDataSeed.Invoice1Id, Amount = 3000m, Method = PaymentMethod.Cash, EntryMode = EntryMode.RealTime, CollectedAt = new DateTime(2026, 8, 25, 9, 30, 0), CollectedBy = MasterDataSeed.SalesRep1UserId, CreatedAt = new DateTime(2026, 8, 25, 9, 30, 0), IsActive = true },
-            new Payment { Id = Payment2Id, FK_InvoiceId = OperationsDataSeed.Invoice2Id, Amount = 1000m, Method = PaymentMethod.Cash, EntryMode = EntryMode.RealTime, CollectedAt = new DateTime(2026, 8, 31, 9, 20, 0), CollectedBy = MasterDataSeed.SalesRep2UserId, CreatedAt = new DateTime(2026, 8, 31, 9, 20, 0), IsActive = true },
-            new Payment { Id = Payment3Id, FK_InvoiceId = OperationsDataSeed.Invoice2Id, Amount = 800m, Method = PaymentMethod.Cheque, EntryMode = EntryMode.DayEndManual, ChequeNumber = "000456", ChequeDate = new DateTime(2026, 8, 31), CollectedAt = new DateTime(2026, 8, 31, 11, 0, 0), CollectedBy = MasterDataSeed.SalesRep2UserId, RecordedBy = MasterDataSeed.Supervisor1UserId, CreatedAt = new DateTime(2026, 8, 31, 18, 0, 0), IsActive = true },
-            new Payment { Id = Payment4Id, FK_InvoiceId = OperationsDataSeed.Invoice2Id, Amount = 300m, Method = PaymentMethod.Credit, EntryMode = EntryMode.RealTime, CollectedAt = new DateTime(2026, 8, 31, 11, 5, 0), CollectedBy = MasterDataSeed.SalesRep2UserId, CreatedAt = new DateTime(2026, 8, 31, 11, 5, 0), IsActive = true }
-        );
-
-        modelBuilder.Entity<SaleReturn>().HasData(
-            new SaleReturn { Id = SaleReturn1Id, FK_ShopPOId = OperationsDataSeed.ShopPO1Id, Mode = ReturnMode.CreditDeduction, TotalCreditAmount = 300m, CreatedByUserId = MasterDataSeed.SalesRep1UserId, CreatedAt = new DateTime(2026, 8, 26), IsActive = true }
-        );
-
-        modelBuilder.Entity<SaleReturnItem>().HasData(
-            new SaleReturnItem { Id = SaleReturnItem1Id, FK_SaleReturnId = SaleReturn1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, Quantity = 5m, ReasonCode = ReturnReasonCode.Damaged, UnitPrice = 60m, CreatedAt = new DateTime(2026, 8, 26), IsActive = true }
-        );
-
-        modelBuilder.Entity<CreditNote>().HasData(
-            new CreditNote { Id = CreditNote1Id, FK_SaleReturnId = SaleReturn1Id, Amount = 300m, IssuedAt = new DateTime(2026, 8, 26), CreatedAt = new DateTime(2026, 8, 26), IsActive = true }
-        );
-
-        modelBuilder.Entity<Claim>().HasData(
-            new Claim
-            {
-                Id = Claim1Id,
-                FK_AgencyUserId = OperationsExtrasSeed.RegionalAgency1UserId,
-                Details = "Distributor margin claim for Q3 promotional shortfall",
-                Status = ClaimStatus.Settled,
-                SettlementAmount = 15000m,
-                SettledByUserId = MasterDataSeed.RegionalManager1UserId,
-                SettledAt = new DateTime(2026, 8, 28),
-                CreatedAt = new DateTime(2026, 8, 27),
-                IsActive = true
-            }
-        );
-    }
-}
@@ -1,127 +0,0 @@
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class MasterDataSeed
-{
-    private static readonly DateTime SeedDate = new(2026, 8, 20);
-
-    // Role ids match Data/Seed/RoleAndPermissionSeed.cs (private there, so re-declared here by value).
-    internal static readonly Guid SalesRepRoleId = new("10000000-0000-0000-0000-000000000001");
-    internal static readonly Guid SupervisorRoleId = new("10000000-0000-0000-0000-000000000002");
-    internal static readonly Guid RegionalManagerRoleId = new("10000000-0000-0000-0000-000000000005");
-
-    internal static readonly Guid BeveragesCategoryId = new("20000000-0000-0000-0000-000000000001");
-    internal static readonly Guid SnacksCategoryId = new("20000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid CocaColaBrandId = new("21000000-0000-0000-0000-000000000001");
-    internal static readonly Guid LaysBrandId = new("21000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid PieceUomId = new("22000000-0000-0000-0000-000000000001");
-
-    internal static readonly Guid Coke500ItemId = new("23000000-0000-0000-0000-000000000001");
-    internal static readonly Guid Coke1500ItemId = new("23000000-0000-0000-0000-000000000002");
-    internal static readonly Guid LaysClassicItemId = new("23000000-0000-0000-0000-000000000003");
-    internal static readonly Guid LaysFamilyItemId = new("23000000-0000-0000-0000-000000000004");
-
-    internal static readonly Guid WesternRegionId = new("24000000-0000-0000-0000-000000000001");
-    internal static readonly Guid CentralRegionId = new("24000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid ColomboRouteId = new("25000000-0000-0000-0000-000000000001");
-    internal static readonly Guid NegomboRouteId = new("25000000-0000-0000-0000-000000000002");
-    internal static readonly Guid KandyRouteId = new("25000000-0000-0000-0000-000000000003");
-    internal static readonly Guid MataleRouteId = new("25000000-0000-0000-0000-000000000004");
-
-    internal static readonly Guid FortStoreId = new("26000000-0000-0000-0000-000000000001");
-    internal static readonly Guid DehiwalaStoreId = new("26000000-0000-0000-0000-000000000002");
-    internal static readonly Guid WattalaStoreId = new("26000000-0000-0000-0000-000000000003");
-    internal static readonly Guid NegomboStoreId = new("26000000-0000-0000-0000-000000000004");
-    internal static readonly Guid KandyStoreId = new("26000000-0000-0000-0000-000000000005");
-    internal static readonly Guid MataleStoreId = new("26000000-0000-0000-0000-000000000006");
-
-    internal static readonly Guid ColomboWarehouseId = new("27000000-0000-0000-0000-000000000001");
-    internal static readonly Guid KandyWarehouseId = new("27000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid VanVehicleId = new("28000000-0000-0000-0000-000000000001");
-    internal static readonly Guid TruckVehicleId = new("28000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid Supervisor1UserId = new("29000000-0000-0000-0000-000000000001");
-    internal static readonly Guid SalesRep1UserId = new("29000000-0000-0000-0000-000000000002");
-    internal static readonly Guid SalesRep2UserId = new("29000000-0000-0000-0000-000000000003");
-    internal static readonly Guid Driver1UserId = new("29000000-0000-0000-0000-000000000004");
-    internal static readonly Guid Driver2UserId = new("29000000-0000-0000-0000-000000000005");
-    internal static readonly Guid RegionalManager1UserId = new("29000000-0000-0000-0000-000000000006");
-
-    internal static readonly Guid Driver1ProfileId = new("30000000-0000-0000-0000-000000000001");
-    internal static readonly Guid Driver2ProfileId = new("30000000-0000-0000-0000-000000000002");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<Category>().HasData(
-            new Category { Id = BeveragesCategoryId, Name = "Beverages", CreatedAt = SeedDate, IsActive = true },
-            new Category { Id = SnacksCategoryId, Name = "Snacks", CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Brand>().HasData(
-            new Brand { Id = CocaColaBrandId, Name = "Coca-Cola", CreatedAt = SeedDate, IsActive = true },
-            new Brand { Id = LaysBrandId, Name = "Lays", CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Uom>().HasData(
-            new Uom { Id = PieceUomId, Name = "Piece", CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Item>().HasData(
-            new Item { Id = Coke500ItemId, Sku = "BEV-COKE-500", Name = "Coca-Cola 500ml", Description = "Coca-Cola 500ml bottle", FK_CategoryId = BeveragesCategoryId, FK_BrandId = CocaColaBrandId, FK_BaseUomId = PieceUomId, SalePrice = 60m, SyncSource = SyncSource.Manual, CreatedAt = SeedDate, IsActive = true },
-            new Item { Id = Coke1500ItemId, Sku = "BEV-COKE-1500", Name = "Coca-Cola 1.5L", Description = "Coca-Cola 1.5L bottle", FK_CategoryId = BeveragesCategoryId, FK_BrandId = CocaColaBrandId, FK_BaseUomId = PieceUomId, SalePrice = 120m, SyncSource = SyncSource.Manual, CreatedAt = SeedDate, IsActive = true },
-            new Item { Id = LaysClassicItemId, Sku = "SNK-LAYS-52", Name = "Lays Classic 52g", Description = "Lays Classic Salted 52g pack", FK_CategoryId = SnacksCategoryId, FK_BrandId = LaysBrandId, FK_BaseUomId = PieceUomId, SalePrice = 50m, SyncSource = SyncSource.Manual, CreatedAt = SeedDate, IsActive = true },
-            new Item { Id = LaysFamilyItemId, Sku = "SNK-LAYS-FAM", Name = "Lays Family Pack 150g", Description = "Lays Family Pack 150g", FK_CategoryId = SnacksCategoryId, FK_BrandId = LaysBrandId, FK_BaseUomId = PieceUomId, SalePrice = 150m, SyncSource = SyncSource.Manual, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Region>().HasData(
-            new Region { Id = WesternRegionId, Code = "REG-0001", Name = "Western Province", CreatedAt = SeedDate, IsActive = true },
-            new Region { Id = CentralRegionId, Code = "REG-0002", Name = "Central Province", CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Models.Route>().HasData(
-            new Models.Route { Id = ColomboRouteId, RouteName = "Colombo City Route", StartPoint = "Colombo Fort", EndPoint = "Dehiwala", Length = 18.5m, FK_RegionId = WesternRegionId, FK_OwnerUserId = SalesRep1UserId, CreatedAt = SeedDate, IsActive = true },
-            new Models.Route { Id = NegomboRouteId, RouteName = "Negombo Coastal Route", StartPoint = "Wattala", EndPoint = "Negombo", Length = 32.0m, FK_RegionId = WesternRegionId, FK_OwnerUserId = SalesRep1UserId, CreatedAt = SeedDate, IsActive = true },
-            new Models.Route { Id = KandyRouteId, RouteName = "Kandy Town Route", StartPoint = "Kandy Lake", EndPoint = "Peradeniya", Length = 12.0m, FK_RegionId = CentralRegionId, FK_OwnerUserId = SalesRep2UserId, CreatedAt = SeedDate, IsActive = true },
-            new Models.Route { Id = MataleRouteId, RouteName = "Matale Route", StartPoint = "Kandy", EndPoint = "Matale", Length = 26.0m, FK_RegionId = CentralRegionId, FK_OwnerUserId = SalesRep2UserId, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Store>().HasData(
-            new Store { Id = FortStoreId, FK_RouteId = ColomboRouteId, OwnerName = "Saman Kumara", StoreName = "Fort Mini Mart", StoreAddress = "12 York Street, Colombo Fort", Latitude = 6.9344m, Longitude = 79.8428m, CreditLimit = 50000m, OutstandingBalance = 0m, Segment = "Gold", CreatedAt = SeedDate, IsActive = true },
-            new Store { Id = DehiwalaStoreId, FK_RouteId = ColomboRouteId, OwnerName = "Nadeesha Silva", StoreName = "Dehiwala Grocery", StoreAddress = "45 Galle Road, Dehiwala", Latitude = 6.8508m, Longitude = 79.8654m, CreditLimit = 30000m, OutstandingBalance = 5000m, Segment = "Silver", CreatedAt = SeedDate, IsActive = true },
-            new Store { Id = WattalaStoreId, FK_RouteId = NegomboRouteId, OwnerName = "Ruwan Gunasekara", StoreName = "Wattala Supermarket", StoreAddress = "88 Negombo Road, Wattala", Latitude = 6.9890m, Longitude = 79.8912m, CreditLimit = 40000m, OutstandingBalance = 1200m, Segment = "Gold", CreatedAt = SeedDate, IsActive = true },
-            new Store { Id = NegomboStoreId, FK_RouteId = NegomboRouteId, OwnerName = "Chamari Peiris", StoreName = "Negombo Beach Store", StoreAddress = "5 Beach Road, Negombo", Latitude = 7.2094m, Longitude = 79.8380m, CreditLimit = 25000m, OutstandingBalance = 0m, CreatedAt = SeedDate, IsActive = true },
-            new Store { Id = KandyStoreId, FK_RouteId = KandyRouteId, OwnerName = "Dinesh Wickramasinghe", StoreName = "Kandy Lake View Store", StoreAddress = "3 Lake Road, Kandy", Latitude = 7.2906m, Longitude = 80.6337m, CreditLimit = 35000m, OutstandingBalance = 0m, Segment = "Key Account", CreatedAt = SeedDate, IsActive = true },
-            new Store { Id = MataleStoreId, FK_RouteId = MataleRouteId, OwnerName = "Ishara Bandara", StoreName = "Matale Central Store", StoreAddress = "20 Main Street, Matale", Latitude = 7.4675m, Longitude = 80.6234m, CreditLimit = 20000m, OutstandingBalance = 0m, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Warehouse>().HasData(
-            new Warehouse { Id = ColomboWarehouseId, Name = "Colombo Distribution Center", Location = "Peliyagoda, Colombo", Type = WareHouseType.DistributionCenter, VehicleId = null, CreatedAt = SeedDate, IsActive = true },
-            new Warehouse { Id = KandyWarehouseId, Name = "Kandy Fulfillment Center", Location = "Katugastota, Kandy", Type = WareHouseType.FulfillmentCenter, VehicleId = null, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Vehicle>().HasData(
-            new Vehicle { Id = VanVehicleId, RegNumber = "WP-CAB-1234", NumberPlate = "CAB-1234", Type = VehicleType.Van, DefaultWarehouseId = ColomboWarehouseId, CreatedAt = SeedDate, IsActive = true },
-            new Vehicle { Id = TruckVehicleId, RegNumber = "CP-KY-5678", NumberPlate = "KY-5678", Type = VehicleType.Truck, DefaultWarehouseId = KandyWarehouseId, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<User>().HasData(
-            new User { Id = Supervisor1UserId, Username = "sunil.fernando",FullName = "Sunil Fernando", FK_RoleId = SupervisorRoleId, FK_ReportsToUserId = null, CreatedAt = SeedDate, IsActive = true },
-            new User { Id = SalesRep1UserId, Username = "nimal.perera",FullName = "Nimal Perera", FK_RoleId = SalesRepRoleId, FK_ReportsToUserId = Supervisor1UserId, CreatedAt = SeedDate, IsActive = true },
-            new User { Id = SalesRep2UserId, Username = "kamal.silva",FullName = "Kamal Silva", FK_RoleId = SalesRepRoleId, FK_ReportsToUserId = Supervisor1UserId, CreatedAt = SeedDate, IsActive = true },
-            new User { Id = Driver1UserId, Username = "ruwan.jayasuriya",FullName = "Ruwan Jayasuriya", FK_RoleId = SalesRepRoleId, FK_ReportsToUserId = Supervisor1UserId, CreatedAt = SeedDate, IsActive = true },
-            new User { Id = Driver2UserId, Username = "priyantha.kumara",FullName = "Priyantha Kumara", FK_RoleId = SalesRepRoleId, FK_ReportsToUserId = Supervisor1UserId, CreatedAt = SeedDate, IsActive = true },
-            new User { Id = RegionalManager1UserId, Username = "priya.rajapaksa",FullName = "Priya Rajapaksa", FK_RoleId = RegionalManagerRoleId, FK_ReportsToUserId = null, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<DriverProfile>().HasData(
-            new DriverProfile { Id = Driver1ProfileId, FK_UserId = Driver1UserId, LicenseNumber = "B1234567", LicenseExpiry = new DateTime(2027, 6, 30), MedicalClearanceExpiry = new DateTime(2027, 1, 31), CreatedAt = SeedDate, IsActive = true },
-            new DriverProfile { Id = Driver2ProfileId, FK_UserId = Driver2UserId, LicenseNumber = "B7654321", LicenseExpiry = new DateTime(2027, 9, 30), MedicalClearanceExpiry = new DateTime(2027, 3, 31), CreatedAt = SeedDate, IsActive = true }
-        );
-    }
-}
@@ -1,185 +0,0 @@
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class OperationsDataSeed
-{
-    internal static readonly Guid ClosedSaleRunId = new("31000000-0000-0000-0000-000000000001");
-    internal static readonly Guid ActiveDeliveryRunId = new("31000000-0000-0000-0000-000000000002");
-
-    // Kept for OperationsExtrasSeed stock movement reference (ReferenceId on MovementType.Sale)
-    internal static readonly Guid Sale1Id = new("32000000-0000-0000-0000-000000000001");
-
-    internal static readonly Guid ShopPO1Id = new("33000000-0000-0000-0000-000000000001");
-    internal static readonly Guid ShopPO2Id = new("33000000-0000-0000-0000-000000000002");
-    internal static readonly Guid ShopPO3Id = new("33000000-0000-0000-0000-000000000003");
-
-    internal static readonly Guid ShopPOItem1Id = new("34000000-0000-0000-0000-000000000001");
-    internal static readonly Guid ShopPOItem2Id = new("34000000-0000-0000-0000-000000000002");
-    internal static readonly Guid ShopPOItem3Id = new("34000000-0000-0000-0000-000000000003");
-    internal static readonly Guid ShopPOItem4Id = new("34000000-0000-0000-0000-000000000004");
-
-    internal static readonly Guid Invoice1Id = new("34500000-0000-0000-0000-000000000001");
-    internal static readonly Guid Invoice2Id = new("34500000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid LoadingSheet1Id = new("35000000-0000-0000-0000-000000000001");
-
-    internal static readonly Guid LoadingSheetItem1Id = new("36000000-0000-0000-0000-000000000001");
-    internal static readonly Guid LoadingSheetItem2Id = new("36000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid DeliveryTask1Id = new("37000000-0000-0000-0000-000000000001");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<DeliveryRun>().HasData(
-            new DeliveryRun
-            {
-                Id = ClosedSaleRunId,
-                Status = RideStatus.Closed,
-                FK_VehicleId = MasterDataSeed.VanVehicleId,
-                FK_DriverProfileId = MasterDataSeed.Driver1ProfileId,
-                Meterstart = 10500,
-                Meterend = 10550,
-                StartedAt = new DateTime(2026, 8, 25, 8, 0, 0),
-                ClosedAt = new DateTime(2026, 8, 25, 14, 0, 0),
-                CreatedAt = new DateTime(2026, 8, 25, 7, 30, 0),
-                IsActive = true
-            },
-            new DeliveryRun
-            {
-                Id = ActiveDeliveryRunId,
-                Status = RideStatus.Open,
-                FK_VehicleId = MasterDataSeed.TruckVehicleId,
-                FK_DriverProfileId = MasterDataSeed.Driver2ProfileId,
-                Meterstart = 20300,
-                Meterend = 0,
-                StartedAt = new DateTime(2026, 8, 30, 9, 0, 0),
-                ClosedAt = null,
-                CreatedAt = new DateTime(2026, 8, 30, 8, 45, 0),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<ShopPO>().HasData(
-            new ShopPO
-            {
-                Id = ShopPO1Id,
-                FK_StoreId = MasterDataSeed.FortStoreId,
-                RaisedById = MasterDataSeed.SalesRep1UserId,
-                InvoiceId = Invoice1Id,
-                TotalAmount = 3000m,
-                Status = ShopPOStatus.Fulfilled,
-                ConfirmedAt = new DateTime(2026, 8, 25, 8, 30, 0),
-                ConfirmedBy = MasterDataSeed.Supervisor1UserId,
-                FulfilledAt = new DateTime(2026, 8, 25, 13, 0, 0),
-                CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0),
-                IsActive = true
-            },
-            new ShopPO
-            {
-                Id = ShopPO2Id,
-                FK_StoreId = MasterDataSeed.KandyStoreId,
-                RaisedById = MasterDataSeed.SalesRep2UserId,
-                InvoiceId = null,
-                TotalAmount = 1200m,
-                Status = ShopPOStatus.Pending,
-                ConfirmedAt = null,
-                ConfirmedBy = null,
-                FulfilledAt = null,
-                CreatedAt = new DateTime(2026, 8, 30, 10, 0, 0),
-                IsActive = true
-            },
-            new ShopPO
-            {
-                Id = ShopPO3Id,
-                FK_StoreId = MasterDataSeed.KandyStoreId,
-                RaisedById = MasterDataSeed.SalesRep2UserId,
-                InvoiceId = Invoice2Id,
-                TotalAmount = 2400m,
-                Status = ShopPOStatus.Fulfilled,
-                ConfirmedAt = new DateTime(2026, 8, 31, 8, 30, 0),
-                ConfirmedBy = MasterDataSeed.Supervisor1UserId,
-                FulfilledAt = new DateTime(2026, 8, 31, 13, 0, 0),
-                CreatedAt = new DateTime(2026, 8, 31, 9, 0, 0),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<ShopPOItem>().HasData(
-            new ShopPOItem { Id = ShopPOItem1Id, FK_ShopPOId = ShopPO1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, Quantity = 30, QuantityFulfilled = 30, UnitPrice = 60m, CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0), IsActive = true },
-            new ShopPOItem { Id = ShopPOItem2Id, FK_ShopPOId = ShopPO1Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Quantity = 24, QuantityFulfilled = 24, UnitPrice = 50m, CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0), IsActive = true },
-            new ShopPOItem { Id = ShopPOItem3Id, FK_ShopPOId = ShopPO2Id, FK_ItemId = MasterDataSeed.Coke1500ItemId, Quantity = 10, QuantityFulfilled = 0, UnitPrice = 120m, CreatedAt = new DateTime(2026, 8, 30, 10, 0, 0), IsActive = true },
-            new ShopPOItem { Id = ShopPOItem4Id, FK_ShopPOId = ShopPO3Id, FK_ItemId = MasterDataSeed.Coke1500ItemId, Quantity = 20, QuantityFulfilled = 20, UnitPrice = 120m, CreatedAt = new DateTime(2026, 8, 31, 9, 0, 0), IsActive = true }
-        );
-
-        modelBuilder.Entity<Invoice>().HasData(
-            new Invoice
-            {
-                Id = Invoice1Id,
-                FK_ShopPOId = ShopPO1Id,
-                Status = InvoiceStatus.Finalized,
-                PaymentStatus = PaymentStatus.Paid,
-                CreatedBy = MasterDataSeed.SalesRep1UserId,
-                PrintedAt = new DateTime(2026, 8, 25, 8, 45, 0),
-                PrintedBy = MasterDataSeed.SalesRep1UserId,
-                FinalizedAt = new DateTime(2026, 8, 25, 9, 0, 0),
-                FinalizedBy = MasterDataSeed.Supervisor1UserId,
-                TotalAmount = 3000m,
-                CreatedAt = new DateTime(2026, 8, 25, 8, 30, 0),
-                IsActive = true
-            },
-            new Invoice
-            {
-                Id = Invoice2Id,
-                FK_ShopPOId = ShopPO3Id,
-                Status = InvoiceStatus.Printed,
-                PaymentStatus = PaymentStatus.PartiallyPaid,
-                CreatedBy = MasterDataSeed.SalesRep2UserId,
-                PrintedAt = new DateTime(2026, 8, 31, 9, 15, 0),
-                PrintedBy = MasterDataSeed.SalesRep2UserId,
-                FinalizedAt = null,
-                FinalizedBy = null,
-                TotalAmount = 2400m,
-                CreatedAt = new DateTime(2026, 8, 31, 9, 0, 0),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<LoadingSheet>().HasData(
-            new LoadingSheet
-            {
-                Id = LoadingSheet1Id,
-                FK_RideId = ClosedSaleRunId,
-                Status = LoadingSheetStatus.Confirmed,
-                PopulatedBy = MasterDataSeed.Supervisor1UserId,
-                PopulatedAt = new DateTime(2026, 8, 25, 7, 30, 0),
-                ConfirmedAt = new DateTime(2026, 8, 25, 7, 45, 0),
-                ConfirmedBy = MasterDataSeed.Supervisor1UserId,
-                CreatedAt = new DateTime(2026, 8, 25, 7, 30, 0),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<LoadingSheetItem>().HasData(
-            new LoadingSheetItem { Id = LoadingSheetItem1Id, FK_LoadingSheetId = LoadingSheet1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, FK_WarehouseId = MasterDataSeed.ColomboWarehouseId, QuantityDispatched = 50m, CreatedAt = new DateTime(2026, 8, 25, 7, 30, 0), IsActive = true },
-            new LoadingSheetItem { Id = LoadingSheetItem2Id, FK_LoadingSheetId = LoadingSheet1Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, FK_WarehouseId = MasterDataSeed.ColomboWarehouseId, QuantityDispatched = 30m, CreatedAt = new DateTime(2026, 8, 25, 7, 30, 0), IsActive = true }
-        );
-
-        modelBuilder.Entity<DeliveryTask>().HasData(
-            new DeliveryTask
-            {
-                Id = DeliveryTask1Id,
-                FK_RideId = ActiveDeliveryRunId,
-                FK_ShopPOId = ShopPO2Id,
-                Sequence = 1,
-                Status = DeliveryTaskStatus.Pending,
-                CustomerConfirmed = false,
-                ConfirmedAt = null,
-                Note = null,
-                CreatedAt = new DateTime(2026, 8, 30, 10, 5, 0),
-                IsActive = true
-            }
-        );
-    }
-}
@@ -1,110 +0,0 @@
-using Distribution.Features.Stock;
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class OperationsExtrasSeed
-{
-    // Role id matches RegionalAgency in Data/Seed/RoleAndPermissionSeed.cs (private there).
-    private static readonly Guid RegionalAgencyRoleId = new("10000000-0000-0000-0000-000000000006");
-
-    internal static readonly Guid RegionalAgency1UserId = new("70000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid CaseUomId = new("67000000-0000-0000-0000-000000000001");
-    private static readonly Guid UomConversion1Id = new("67000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid RegionAgencyMap1Id = new("57000000-0000-0000-0000-000000000001");
-    private static readonly Guid RegionalBudget1Id = new("58000000-0000-0000-0000-000000000001");
-    private static readonly Guid RegionalTarget1Id = new("59000000-0000-0000-0000-000000000001");
-    private static readonly Guid RegionalTaxRule1Id = new("60000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid StockBalance1Id = new("61000000-0000-0000-0000-000000000001");
-    private static readonly Guid StockBalance2Id = new("61000000-0000-0000-0000-000000000002");
-    private static readonly Guid StockBalance3Id = new("61000000-0000-0000-0000-000000000003");
-
-    private static readonly Guid StockMovement1Id = new("62000000-0000-0000-0000-000000000001");
-    private static readonly Guid StockMovement2Id = new("62000000-0000-0000-0000-000000000002");
-    private static readonly Guid StockMovement3Id = new("62000000-0000-0000-0000-000000000003");
-
-
-    private static readonly Guid DriverComplianceConfig1Id = new("64000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid RouteVisitLog1Id = new("66000000-0000-0000-0000-000000000001");
-    private static readonly Guid RouteVisitLog2Id = new("66000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid UserRegionScope1Id = new("68000000-0000-0000-0000-000000000001");
-    private static readonly Guid UserRouteScope1Id = new("68000000-0000-0000-0000-000000000002");
-    private static readonly Guid UserStoreScope1Id = new("68000000-0000-0000-0000-000000000003");
-
-    private static readonly Guid SaleRoute1Id = new("69000000-0000-0000-0000-000000000001");
-    private static readonly Guid SaleRoute2Id = new("69000000-0000-0000-0000-000000000002");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<User>().HasData(
-            new User { Id = RegionalAgency1UserId, Username = "channa.desilva", FullName = "Channa De Silva", FK_RoleId = RegionalAgencyRoleId, FK_ReportsToUserId = null, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<Uom>().HasData(
-            new Uom { Id = CaseUomId, Name = "Case", CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<UomConversion>().HasData(
-            new UomConversion { Id = UomConversion1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, FK_FromUomId = CaseUomId, FK_ToUomId = MasterDataSeed.PieceUomId, Factor = 24m }
-        );
-
-        modelBuilder.Entity<RegionAgencyMap>().HasData(
-            new RegionAgencyMap { Id = RegionAgencyMap1Id, FK_RegionId = MasterDataSeed.WesternRegionId, FK_AgencyUserId = RegionalAgency1UserId, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<RegionalBudget>().HasData(
-            new RegionalBudget { Id = RegionalBudget1Id, FK_RegionId = MasterDataSeed.WesternRegionId, Period = "2026-08", BudgetAmount = 200000m, CreatedAt = new DateTime(2026, 8, 1), IsActive = true }
-        );
-
-        modelBuilder.Entity<RegionalTarget>().HasData(
-            new RegionalTarget { Id = RegionalTarget1Id, FK_RegionId = MasterDataSeed.WesternRegionId, Period = "2026-08", TargetValue = 500000m, CreatedAt = new DateTime(2026, 8, 1), IsActive = true }
-        );
-
-        modelBuilder.Entity<RegionalTaxRule>().HasData(
-            new RegionalTaxRule { Id = RegionalTaxRule1Id, FK_RegionId = MasterDataSeed.WesternRegionId, RuleConfig = "{\"rate\": 0.15}", CreatedAt = new DateTime(2026, 8, 1), IsActive = true }
-        );
-
-        modelBuilder.Entity<StockBalance>().HasData(
-            new StockBalance { Id = StockBalance1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, LocationId = MasterDataSeed.ColomboWarehouseId, LocationType = LocationType.Warehouse, Quantity = 150m, UpdatedAt = new DateTime(2026, 8, 25, 9, 30, 0) },
-            new StockBalance { Id = StockBalance2Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, LocationId = MasterDataSeed.ColomboWarehouseId, LocationType = LocationType.Warehouse, Quantity = 90m, UpdatedAt = new DateTime(2026, 8, 25, 9, 30, 0) },
-            new StockBalance { Id = StockBalance3Id, FK_ItemId = MasterDataSeed.Coke500ItemId, LocationId = MasterDataSeed.VanVehicleId, LocationType = LocationType.Vehicle, Quantity = 20m, UpdatedAt = new DateTime(2026, 8, 25, 9, 30, 0) }
-        );
-
-        modelBuilder.Entity<StockMovement>().HasData(
-            new StockMovement { Id = StockMovement1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, FromLocationId = StockService.ExternalLocationId, FromLocationType = LocationType.External, ToLocationId = MasterDataSeed.ColomboWarehouseId, ToLocationType = LocationType.Warehouse, Quantity = 200m, Type = MovementType.PurchaseReceipt, ReasonCode = null, ReferenceId = ProcurementSeed.GoodsReceipt1Id, CreatedAt = new DateTime(2026, 8, 15), CreatedBy = MasterDataSeed.Supervisor1UserId },
-            new StockMovement { Id = StockMovement2Id, FK_ItemId = MasterDataSeed.Coke500ItemId, FromLocationId = MasterDataSeed.ColomboWarehouseId, FromLocationType = LocationType.Warehouse, ToLocationId = MasterDataSeed.VanVehicleId, ToLocationType = LocationType.Vehicle, Quantity = 50m, Type = MovementType.Load, ReasonCode = null, ReferenceId = OperationsDataSeed.LoadingSheet1Id, CreatedAt = new DateTime(2026, 8, 25, 7, 30, 0), CreatedBy = MasterDataSeed.Supervisor1UserId },
-            new StockMovement { Id = StockMovement3Id, FK_ItemId = MasterDataSeed.Coke500ItemId, FromLocationId = MasterDataSeed.VanVehicleId, FromLocationType = LocationType.Vehicle, ToLocationId = StockService.ExternalLocationId, ToLocationType = LocationType.External, Quantity = 30m, Type = MovementType.Sale, ReasonCode = null, ReferenceId = OperationsDataSeed.Sale1Id, CreatedAt = new DateTime(2026, 8, 25, 9, 30, 0), CreatedBy = MasterDataSeed.SalesRep1UserId }
-        );
-        modelBuilder.Entity<DriverComplianceConfig>().HasData(
-            new DriverComplianceConfig { Id = DriverComplianceConfig1Id, EnforceLicenseExpiry = true, EnforceMedicalClearance = true, UpdatedAt = new DateTime(2026, 8, 20), UpdatedBy = MasterDataSeed.Supervisor1UserId }
-        );
-
-        modelBuilder.Entity<RouteVisitLog>().HasData(
-            new RouteVisitLog { Id = RouteVisitLog1Id, FK_RouteId = MasterDataSeed.ColomboRouteId, FK_StoreId = MasterDataSeed.FortStoreId, FK_UserId = MasterDataSeed.SalesRep1UserId, CheckInAt = new DateTime(2026, 8, 25, 9, 0, 0), CheckInLatitude = 6.9344m, CheckInLongitude = 79.8428m, IsDeviationFlagged = false, CheckOutAt = new DateTime(2026, 8, 25, 9, 25, 0), CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0), IsActive = true },
-            new RouteVisitLog { Id = RouteVisitLog2Id, FK_RouteId = MasterDataSeed.ColomboRouteId, FK_StoreId = MasterDataSeed.DehiwalaStoreId, FK_UserId = MasterDataSeed.SalesRep1UserId, CheckInAt = new DateTime(2026, 8, 25, 10, 0, 0), CheckInLatitude = 6.9000m, CheckInLongitude = 79.8654m, IsDeviationFlagged = true, CheckOutAt = null, CreatedAt = new DateTime(2026, 8, 25, 10, 0, 0), IsActive = true }
-        );
-
-        modelBuilder.Entity<UserRegionScope>().HasData(
-            new UserRegionScope { Id = UserRegionScope1Id, FK_UserId = MasterDataSeed.RegionalManager1UserId, FK_RegionId = MasterDataSeed.WesternRegionId, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<UserRouteScope>().HasData(
-            new UserRouteScope { Id = UserRouteScope1Id, FK_UserId = MasterDataSeed.Supervisor1UserId, FK_RouteId = MasterDataSeed.ColomboRouteId, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<UserStoreScope>().HasData(
-            new UserStoreScope { Id = UserStoreScope1Id, FK_UserId = MasterDataSeed.SalesRep2UserId, FK_StoreId = MasterDataSeed.KandyStoreId, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<SaleRoute>().HasData(
-            new SaleRoute { Id = SaleRoute1Id, CreatedAt = new DateTime(2026, 8, 20), IsActive = true },
-            new SaleRoute { Id = SaleRoute2Id, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-    }
-}
@@ -1,88 +0,0 @@
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class ProcurementSeed
-{
-    private static readonly Guid Supplier1Id = new("38000000-0000-0000-0000-000000000001");
-    private static readonly Guid Supplier2Id = new("38000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid PurchaseOrder1Id = new("41000000-0000-0000-0000-000000000001");
-    private static readonly Guid PurchaseOrder2Id = new("41000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid PurchaseOrderItem1Id = new("42000000-0000-0000-0000-000000000001");
-    private static readonly Guid PurchaseOrderItem2Id = new("42000000-0000-0000-0000-000000000002");
-    private static readonly Guid PurchaseOrderItem3Id = new("42000000-0000-0000-0000-000000000003");
-
-    internal static readonly Guid GoodsReceipt1Id = new("43000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid GoodsReceiptItem1Id = new("44000000-0000-0000-0000-000000000001");
-    private static readonly Guid GoodsReceiptItem2Id = new("44000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid PurchaseReturn1Id = new("45000000-0000-0000-0000-000000000001");
-    private static readonly Guid PurchaseReturnItem1Id = new("46000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid SupplierClaim1Id = new("55000000-0000-0000-0000-000000000001");
-    private static readonly Guid SupplierClaimItem1Id = new("56000000-0000-0000-0000-000000000001");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<Supplier>().HasData(
-            new Supplier { Id = Supplier1Id, Name = "Ceylon Beverages Ltd", ContactInfo = "+94 11 234 5678", PerformanceScore = 4.2m, CreatedAt = new DateTime(2026, 8, 14), IsActive = true },
-            new Supplier { Id = Supplier2Id, Name = "Snack Foods (Pvt) Ltd", ContactInfo = "+94 11 876 5432", PerformanceScore = null, CreatedAt = new DateTime(2026, 8, 14), IsActive = true }
-        );
-
-        modelBuilder.Entity<PurchaseOrder>().HasData(
-            new PurchaseOrder { Id = PurchaseOrder1Id, FK_SupplierId = Supplier1Id, FK_CreatedByUserId = MasterDataSeed.Supervisor1UserId, Status = PurchaseOrderStatus.Received, CancelReason = null, CreatedAt = new DateTime(2026, 8, 14), IsActive = true },
-            new PurchaseOrder { Id = PurchaseOrder2Id, FK_SupplierId = Supplier2Id, FK_CreatedByUserId = MasterDataSeed.Supervisor1UserId, Status = PurchaseOrderStatus.Received, CancelReason = null, CreatedAt = new DateTime(2026, 8, 14), IsActive = true }
-        );
-
-        modelBuilder.Entity<PurchaseOrderItem>().HasData(
-            new PurchaseOrderItem { Id = PurchaseOrderItem1Id, FK_PurchaseOrderId = PurchaseOrder1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, Quantity = 200, UnitCost = 40m, ReceivedQuantity = 200, CancelledQuantity = 0, IsCancelled = false, CreatedAt = new DateTime(2026, 8, 14), IsActive = true },
-            new PurchaseOrderItem { Id = PurchaseOrderItem2Id, FK_PurchaseOrderId = PurchaseOrder1Id, FK_ItemId = MasterDataSeed.Coke1500ItemId, Quantity = 100, UnitCost = 80m, ReceivedQuantity = 98, CancelledQuantity = 0, IsCancelled = false, CreatedAt = new DateTime(2026, 8, 14), IsActive = true },
-            new PurchaseOrderItem { Id = PurchaseOrderItem3Id, FK_PurchaseOrderId = PurchaseOrder2Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Quantity = 150, UnitCost = 35m, ReceivedQuantity = 150, CancelledQuantity = 0, IsCancelled = false, CreatedAt = new DateTime(2026, 8, 14), IsActive = true }
-        );
-
-        modelBuilder.Entity<GoodsReceipt>().HasData(
-            new GoodsReceipt { Id = GoodsReceipt1Id, FK_PurchaseOrderId = PurchaseOrder1Id, FK_ReceivedByUserId = MasterDataSeed.Supervisor1UserId, FK_WarehouseId = MasterDataSeed.ColomboWarehouseId, ReceivedAt = new DateTime(2026, 8, 15), CreatedAt = new DateTime(2026, 8, 15), IsActive = true }
-        );
-
-        modelBuilder.Entity<GoodsReceiptItem>().HasData(
-            new GoodsReceiptItem { Id = GoodsReceiptItem1Id, FK_GoodsReceiptId = GoodsReceipt1Id, FK_PurchaseOrderItemId = PurchaseOrderItem1Id, AcceptedQuantity = 200, RejectedQuantity = 0, CreatedAt = new DateTime(2026, 8, 15), IsActive = true },
-            new GoodsReceiptItem { Id = GoodsReceiptItem2Id, FK_GoodsReceiptId = GoodsReceipt1Id, FK_PurchaseOrderItemId = PurchaseOrderItem2Id, AcceptedQuantity = 98, RejectedQuantity = 2, CreatedAt = new DateTime(2026, 8, 15), IsActive = true }
-        );
-
-        modelBuilder.Entity<PurchaseReturn>().HasData(
-            new PurchaseReturn { Id = PurchaseReturn1Id, FK_PurchaseOrderId = PurchaseOrder2Id, Reason = "Damaged in transit", CreatedAt = new DateTime(2026, 8, 16), IsActive = true }
-        );
-
-        modelBuilder.Entity<PurchaseReturnItem>().HasData(
-            new PurchaseReturnItem { Id = PurchaseReturnItem1Id, FK_PurchaseReturnId = PurchaseReturn1Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Quantity = 10, CreatedAt = new DateTime(2026, 8, 16), IsActive = true }
-        );
-
-        modelBuilder.Entity<SupplierClaim>().HasData(
-            new SupplierClaim
-            {
-                Id = SupplierClaim1Id,
-                FK_PurchaseOrderId = PurchaseOrder1Id,
-                FK_GoodsReceiptId = GoodsReceipt1Id,
-                Details = "2 units of Coke 1.5L received damaged",
-                EvidenceUrl = null,
-                Status = SupplierClaimStatus.Approved,
-                ResolutionType = SupplierClaimResolutionType.Credit,
-                ResolutionAmount = 160m,
-                ResolutionNotes = "Credited against next invoice",
-                RaisedByUserId = MasterDataSeed.Supervisor1UserId,
-                ResolvedByUserId = MasterDataSeed.RegionalManager1UserId,
-                ResolvedAt = new DateTime(2026, 8, 16),
-                CreatedAt = new DateTime(2026, 8, 15),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<SupplierClaimItem>().HasData(
-            new SupplierClaimItem { Id = SupplierClaimItem1Id, FK_SupplierClaimId = SupplierClaim1Id, FK_ItemId = MasterDataSeed.Coke1500ItemId, Quantity = 2m, IssueType = SupplierClaimIssueType.Damaged, CreatedAt = new DateTime(2026, 8, 15), IsActive = true }
-        );
-    }
-}
@@ -7,191 +7,22 @@ public static class RoleAndPermissionSeed
 {
    private static readonly DateTime SeedDate = new(2026, 8, 18);

-    private static readonly Guid SalesRepId        = new("10000000-0000-0000-0000-000000000001");
-    private static readonly Guid SupervisorId       = new("10000000-0000-0000-0000-000000000002");
-    private static readonly Guid AreaManagerId      = new("10000000-0000-0000-0000-000000000003");
-    private static readonly Guid AreaSupervisorId   = new("10000000-0000-0000-0000-000000000004");
-    private static readonly Guid RegionalManagerId  = new("10000000-0000-0000-0000-000000000005");
-    private static readonly Guid RegionalAgencyId   = new("10000000-0000-0000-0000-000000000006");
-    internal static readonly Guid SuperAdminRoleId  = new("10000000-0000-0000-0000-000000000007");
-
-    // ── Legacy broad permissions (nav.ts uses these for sidebar visibility) ────
-    private static readonly Guid PermOrdersView         = new("20000000-0000-0000-0000-000000000001");
-    private static readonly Guid PermRidesView          = new("20000000-0000-0000-0000-000000000002");
-    private static readonly Guid PermLoadingView        = new("20000000-0000-0000-0000-000000000003");
-    private static readonly Guid PermStoresView         = new("20000000-0000-0000-0000-000000000004");
-    private static readonly Guid PermSalesVisitsCheckin = new("20000000-0000-0000-0000-000000000005");
-    private static readonly Guid PermItemsView          = new("20000000-0000-0000-0000-000000000006");
-    private static readonly Guid PermCategoriesView     = new("20000000-0000-0000-0000-000000000007");
-    private static readonly Guid PermWarehousesView     = new("20000000-0000-0000-0000-000000000008");
-    private static readonly Guid PermPurchaseOrdersView = new("20000000-0000-0000-0000-000000000009");
-    private static readonly Guid PermPricelistsView     = new("20000000-0000-0000-0000-000000000010");
-    private static readonly Guid PermSchemesView        = new("20000000-0000-0000-0000-000000000011");
-    private static readonly Guid PermSuppliersView      = new("20000000-0000-0000-0000-000000000012");
-    private static readonly Guid PermDriverProfilesView = new("20000000-0000-0000-0000-000000000013");
-    private static readonly Guid PermComplianceManage   = new("20000000-0000-0000-0000-000000000014");
-    private static readonly Guid PermUsersView          = new("20000000-0000-0000-0000-000000000015");
-    private static readonly Guid PermRolesView          = new("20000000-0000-0000-0000-000000000016");
-    private static readonly Guid PermRegionsView        = new("20000000-0000-0000-0000-000000000017");
-    private static readonly Guid PermRoutesView         = new("20000000-0000-0000-0000-000000000018");
-    private static readonly Guid PermVehiclesView       = new("20000000-0000-0000-0000-000000000019");
-
-    // ── Granular API permissions (used in [Authorize("...")] on controller actions) ─
-    private static readonly Guid PermClaimView          = new("20000000-0000-0000-0000-000000000020");
-    private static readonly Guid PermClaimManage        = new("20000000-0000-0000-0000-000000000021");
-    private static readonly Guid PermDeliveryTaskView   = new("20000000-0000-0000-0000-000000000022");
-    private static readonly Guid PermDeliveryTaskManage = new("20000000-0000-0000-0000-000000000023");
-    private static readonly Guid PermDriverView         = new("20000000-0000-0000-0000-000000000024");
-    private static readonly Guid PermDriverManage       = new("20000000-0000-0000-0000-000000000025");
-    private static readonly Guid PermGrnView            = new("20000000-0000-0000-0000-000000000026");
-    private static readonly Guid PermGrnManage          = new("20000000-0000-0000-0000-000000000027");
-    private static readonly Guid PermLoadingSheetView   = new("20000000-0000-0000-0000-000000000028");
-    private static readonly Guid PermLoadingSheetManage = new("20000000-0000-0000-0000-000000000029");
-    private static readonly Guid PermPriceListView      = new("20000000-0000-0000-0000-000000000030");
-    private static readonly Guid PermPriceListManage    = new("20000000-0000-0000-0000-000000000031");
-    private static readonly Guid PermPurchaseOrderView  = new("20000000-0000-0000-0000-000000000032");
-    private static readonly Guid PermPurchaseOrderManage= new("20000000-0000-0000-0000-000000000033");
-    private static readonly Guid PermPurchaseReturnManage=new("20000000-0000-0000-0000-000000000034");
-    private static readonly Guid PermRegionView         = new("20000000-0000-0000-0000-000000000035");
-    private static readonly Guid PermRegionManage       = new("20000000-0000-0000-0000-000000000036");
-    private static readonly Guid PermReturnView         = new("20000000-0000-0000-0000-000000000037");
-    private static readonly Guid PermReturnManage       = new("20000000-0000-0000-0000-000000000038");
-    private static readonly Guid PermRouteView          = new("20000000-0000-0000-0000-000000000039");
-    private static readonly Guid PermRouteManage        = new("20000000-0000-0000-0000-000000000040");
-    private static readonly Guid PermSchemeView         = new("20000000-0000-0000-0000-000000000041");
-    private static readonly Guid PermSchemeManage       = new("20000000-0000-0000-0000-000000000042");
-    private static readonly Guid PermStockView          = new("20000000-0000-0000-0000-000000000043");
-    private static readonly Guid PermStockManage        = new("20000000-0000-0000-0000-000000000044");
-    private static readonly Guid PermStoreView          = new("20000000-0000-0000-0000-000000000045");
-    private static readonly Guid PermStoreManage        = new("20000000-0000-0000-0000-000000000046");
-    private static readonly Guid PermSupplierClaimView  = new("20000000-0000-0000-0000-000000000047");
-    private static readonly Guid PermSupplierClaimManage= new("20000000-0000-0000-0000-000000000048");
-    private static readonly Guid PermSysConfigView      = new("20000000-0000-0000-0000-000000000049");
-    private static readonly Guid PermSysConfigManage    = new("20000000-0000-0000-0000-000000000050");
+    private static readonly Guid SalesRepId = new("10000000-0000-0000-0000-000000000001");
+    private static readonly Guid SupervisorId = new("10000000-0000-0000-0000-000000000002");
+    private static readonly Guid AreaManagerId = new("10000000-0000-0000-0000-000000000003");
+    private static readonly Guid AreaSupervisorId = new("10000000-0000-0000-0000-000000000004");
+    private static readonly Guid RegionalManagerId = new("10000000-0000-0000-0000-000000000005");
+    private static readonly Guid RegionalAgencyId = new("10000000-0000-0000-0000-000000000006");

    public static void Apply(ModelBuilder modelBuilder)
    {
        modelBuilder.Entity<Role>().HasData(
-            new Role { Id = SalesRepId,       Name = "SalesRep",       Level = 10,  CreatedAt = SeedDate, IsActive = true },
-            new Role { Id = SupervisorId,     Name = "Supervisor",     Level = 20,  CreatedAt = SeedDate, IsActive = true },
-            new Role { Id = AreaManagerId,    Name = "AreaManager",    Level = 30,  CreatedAt = SeedDate, IsActive = true },
-            new Role { Id = AreaSupervisorId, Name = "AreaSupervisor", Level = 40,  CreatedAt = SeedDate, IsActive = true },
-            new Role { Id = RegionalManagerId,Name = "RegionalManager",Level = 50,  CreatedAt = SeedDate, IsActive = true },
-            new Role { Id = RegionalAgencyId, Name = "RegionalAgency", Level = 60,  CreatedAt = SeedDate, IsActive = true },
-            new Role { Id = SuperAdminRoleId, Name = "SuperAdmin",     Level = 100, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Permission>().HasData(
-            // ── Legacy broad permissions ──────────────────────────────────────────
-            new Permission { Id = PermOrdersView,         Code = "orders.view",           Description = "View shop POs, invoices, payments and returns",                     CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermRidesView,          Code = "rides.view",            Description = "View and manage delivery rides and delivery tasks",                  CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermLoadingView,        Code = "loading.view",          Description = "View and manage loading sheets",                                     CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermStoresView,         Code = "stores.view",           Description = "View store accounts, credit limits and balances",                    CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermSalesVisitsCheckin, Code = "sales_visits.checkin",  Description = "Check in and out of scheduled store visits",                         CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermItemsView,          Code = "items.view",            Description = "View and manage catalogue products",                                 CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermCategoriesView,     Code = "categories.view",       Description = "View and manage product categories and brands",                      CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermWarehousesView,     Code = "warehouses.view",       Description = "View stock balances, movements, warehouses and reports",             CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermPurchaseOrdersView, Code = "purchase_orders.view",  Description = "View and manage purchase orders, GRNs and supplier claims",          CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermPricelistsView,     Code = "pricelists.view",       Description = "View and manage regional price lists",                               CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermSchemesView,        Code = "schemes.view",          Description = "View and manage pricing schemes and promotions",                     CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermSuppliersView,      Code = "suppliers.view",        Description = "View and manage supplier accounts",                                  CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermDriverProfilesView, Code = "driver_profiles.view",  Description = "View and manage driver profiles and licensing",                      CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermComplianceManage,   Code = "compliance.manage",     Description = "Manage driver compliance rules",                                     CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermUsersView,          Code = "users.view",            Description = "View and manage staff user accounts",                                CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermRolesView,          Code = "roles.view",            Description = "View and manage roles and their permission sets",                    CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermRegionsView,        Code = "regions.view",          Description = "View and manage regions and region configuration",                   CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermRoutesView,         Code = "routes.view",           Description = "View and manage delivery routes",                                    CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermVehiclesView,       Code = "vehicles.view",         Description = "View and manage fleet vehicles",                                     CreatedAt = SeedDate, IsActive = true },
-
-            // ── Granular API permissions ──────────────────────────────────────────
-            new Permission { Id = PermClaimView,          Code = "claim.view",            Description = "View agency claims and settlement status",                           CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermClaimManage,        Code = "claim.manage",          Description = "Create and settle agency claims",                                    CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermDeliveryTaskView,   Code = "delivery-task.view",    Description = "View delivery tasks within a ride",                                  CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermDeliveryTaskManage, Code = "delivery-task.manage",  Description = "Confirm and fail delivery tasks",                                    CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermDriverView,         Code = "driver.view",           Description = "View driver profiles and license details",                           CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermDriverManage,       Code = "driver.manage",         Description = "Create and update driver profiles",                                  CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermGrnView,            Code = "grn.view",              Description = "View goods receipt notes",                                           CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermGrnManage,          Code = "grn.manage",            Description = "Create and confirm goods receipts",                                  CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermLoadingSheetView,   Code = "loading-sheet.view",    Description = "View loading sheets and their items",                                CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermLoadingSheetManage, Code = "loading-sheet.manage",  Description = "Create, edit, and confirm loading sheets",                           CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermPriceListView,      Code = "price-list.view",       Description = "View regional price lists",                                          CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermPriceListManage,    Code = "price-list.manage",     Description = "Create and manage item price lists",                                 CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermPurchaseOrderView,  Code = "purchase-order.view",   Description = "View purchase orders and line items",                                CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermPurchaseOrderManage,Code = "purchase-order.manage", Description = "Create, confirm, and close purchase orders",                         CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermPurchaseReturnManage,Code= "purchase-return.manage",Description = "Create and manage purchase returns to suppliers",                    CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermRegionView,         Code = "region.view",           Description = "View regions and their configuration",                               CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermRegionManage,       Code = "region.manage",         Description = "Create and update regions, targets, and budgets",                    CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermReturnView,         Code = "return.view",           Description = "View order returns",                                                 CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermReturnManage,       Code = "return.manage",         Description = "Create and manage order returns",                                    CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermRouteView,          Code = "route.view",            Description = "View delivery routes",                                               CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermRouteManage,        Code = "route.manage",          Description = "Create and manage delivery routes",                                  CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermSchemeView,         Code = "scheme.view",           Description = "View pricing schemes and promotions",                                CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermSchemeManage,       Code = "scheme.manage",         Description = "Create and configure pricing schemes",                               CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermStockView,          Code = "stock.view",            Description = "View stock balances and movements",                                  CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermStockManage,        Code = "stock.manage",          Description = "Transfer stock and record damage or adjustments",                    CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermStoreView,          Code = "store.view",            Description = "View store accounts and balances",                                   CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermStoreManage,        Code = "store.manage",          Description = "Create and update store accounts",                                   CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermSupplierClaimView,  Code = "supplier-claim.view",   Description = "View supplier claims",                                               CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermSupplierClaimManage,Code = "supplier-claim.manage", Description = "Create and resolve supplier claims",                                 CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermSysConfigView,      Code = "sys-config.view",       Description = "View system configuration settings",                                 CreatedAt = SeedDate, IsActive = true },
-            new Permission { Id = PermSysConfigManage,    Code = "sys-config.manage",     Description = "Update system configuration settings",                               CreatedAt = SeedDate, IsActive = true }
-        );
-
-        // SuperAdmin gets every permission
-        modelBuilder.Entity<RolePermission>().HasData(
-            // ── Legacy broad permissions ──────────────────────────────────────────
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermOrdersView,         CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermRidesView,          CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermLoadingView,        CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermStoresView,         CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermSalesVisitsCheckin, CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermItemsView,          CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermCategoriesView,     CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermWarehousesView,     CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermPurchaseOrdersView, CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermPricelistsView,     CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermSchemesView,        CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermSuppliersView,      CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermDriverProfilesView, CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermComplianceManage,   CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermUsersView,          CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermRolesView,          CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermRegionsView,        CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermRoutesView,         CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermVehiclesView,       CreatedAt = SeedDate, IsActive = true },
-
-            // ── Granular API permissions ──────────────────────────────────────────
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermClaimView,          CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermClaimManage,        CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermDeliveryTaskView,   CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermDeliveryTaskManage, CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermDriverView,         CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermDriverManage,       CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermGrnView,            CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermGrnManage,          CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermLoadingSheetView,   CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermLoadingSheetManage, CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermPriceListView,      CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermPriceListManage,    CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermPurchaseOrderView,  CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermPurchaseOrderManage,CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermPurchaseReturnManage,CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermRegionView,         CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermRegionManage,       CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermReturnView,         CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermReturnManage,       CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermRouteView,          CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermRouteManage,        CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermSchemeView,         CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermSchemeManage,       CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermStockView,          CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermStockManage,        CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermStoreView,          CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermStoreManage,        CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermSupplierClaimView,  CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermSupplierClaimManage,CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermSysConfigView,      CreatedAt = SeedDate, IsActive = true },
-            new RolePermission { FK_RoleId = SuperAdminRoleId, FK_PermissionId = PermSysConfigManage,    CreatedAt = SeedDate, IsActive = true }
+            new Role { Id = SalesRepId, Name = "SalesRep", Level = 10, CreatedAt = SeedDate, IsActive = true },
+            new Role { Id = SupervisorId, Name = "Supervisor", Level = 20, CreatedAt = SeedDate, IsActive = true },
+            new Role { Id = AreaManagerId, Name = "AreaManager", Level = 30, CreatedAt = SeedDate, IsActive = true },
+            new Role { Id = AreaSupervisorId, Name = "AreaSupervisor", Level = 40, CreatedAt = SeedDate, IsActive = true },
+            new Role { Id = RegionalManagerId, Name = "RegionalManager", Level = 50, CreatedAt = SeedDate, IsActive = true },
+            new Role { Id = RegionalAgencyId, Name = "RegionalAgency", Level = 60, CreatedAt = SeedDate, IsActive = true }
        );
    }
 }
@@ -1,5 +1,3 @@
-using System.IdentityModel.Tokens.Jwt;
-using Distribution.Features.User;
 using Distribution.Infra.Authorization;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -8,93 +6,32 @@ namespace Distribution.Features.Auth;

 [ApiController]
 [Route("api/auth")]
-public class AuthController(AuthService service, ICurrentUserService currentUser, IUserRepository userRepo) : ControllerBase
+public class AuthController(AuthService service, ICurrentUserService currentUser) : ControllerBase
 {
    private static IActionResult ToActionResult(AuthHexResponse result) =>
        result.Success ? new OkObjectResult(result) : new ObjectResult(result) { StatusCode = result.StatusCode is >= 400 and < 600 ? result.StatusCode : 401 };

    [HttpPost("login")]
-    [AllowAnonymous]
-    public async Task<IActionResult> Login(LoginRequest request, CancellationToken ct)
-    {
-        var result = await service.LoginAsync(request, ct);
-
-        if (!result.Success || result.Data is not { } data)
-            return ToActionResult(result);
-
-        string? token = null;
-        TimeSpan maxAge = TimeSpan.FromHours(1);
-
-        if (data.TryGetProperty("accessToken", out var tokenEl))
-            token = tokenEl.GetString();
-
-        if (data.TryGetProperty("expiresIn", out var expEl))
-            maxAge = TimeSpan.FromSeconds(expEl.GetInt32());
-
-        if (!string.IsNullOrEmpty(token))
-        {
-            Response.Cookies.Append("access-token", token, new CookieOptions
-            {
-                HttpOnly = true,
-                SameSite = SameSiteMode.Lax,
-                Path = "/",
-                MaxAge = maxAge,
-                Secure = Request.IsHttps,
-            });
-        }
-
-        MeResponse? profile = null;
-        if (!string.IsNullOrEmpty(token))
-        {
-            var jwt = new JwtSecurityTokenHandler().ReadJwtToken(token);
-            var userIdStr = jwt.Claims.FirstOrDefault(c => c.Type == "UserId")?.Value;
-            if (Guid.TryParse(userIdStr, out var userId))
-            {
-                var user = await userRepo.GetByIdAsync(userId);
-                if (user is not null)
-                    profile = new MeResponse(
-                        user.Id,
-                        user.Username,
-                        user.FK_RoleId,
-                        user.Role?.Name ?? string.Empty,
-                        user.Role?.Level ?? 0);
-            }
-        }
-
-        return Ok(new { result.StatusCode, result.Success, result.Message, result.Data, profile });
-    }
+    public async Task<IActionResult> Login(LoginRequest request, CancellationToken ct) =>
+        ToActionResult(await service.LoginAsync(request, ct));

    [HttpPost("register")]
-    [AllowAnonymous]
    public async Task<IActionResult> Register(RegisterRequest request, CancellationToken ct) =>
        ToActionResult(await service.RegisterAsync(request, ct));

    [HttpGet("me")]
    [Authorize]
-    public async Task<IActionResult> Me()
+    public async Task<IActionResult> Me(CancellationToken ct)
    {
-        if (currentUser.UserId is null) return Unauthorized();
-        var user = await userRepo.GetByIdAsync(currentUser.UserId.Value);
-        if (user is null) return Unauthorized();
-        return Ok(new MeResponse(
-            user.Id,
-            user.Username,
-            user.FK_RoleId,
-            user.Role?.Name ?? string.Empty,
-            user.Role?.Level ?? 0));
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        return ToActionResult(await service.GetUserDetailsAsync(userId, ct));
    }

    [HttpPost("logout")]
-    [AllowAnonymous]
-    public IActionResult Logout()
+    [Authorize]
+    public async Task<IActionResult> Logout(CancellationToken ct)
    {
-        Response.Cookies.Delete("access-token", new CookieOptions
-        {
-            HttpOnly = true,
-            SameSite = SameSiteMode.Lax,
-            Path = "/",
-            Secure = Request.IsHttps,
-        });
-        return Ok(new { success = true });
+        var token = Request.Headers.Authorization.ToString().Replace("Bearer ", "", StringComparison.OrdinalIgnoreCase);
+        return ToActionResult(await service.LogoutAsync(token, ct));
    }
 }
@@ -1,16 +1,5 @@
 namespace Distribution.Features.Auth;

-public record LoginRequest(
-    string Identifier,
-    string Password,
-    Guid? UserTypeId = null,
-    string DeviceName = "Unknown Device");
+public record LoginRequest(string Username, string Password);

-public record RegisterRequest(string Username, string email, string Password, string? FullName);
-
-public record MeResponse(
-    Guid UserId,
-    string Username,
-    Guid RoleId,
-    string RoleCode,
-    int RoleLevel);
+public record RegisterRequest(string Username, string Password, string? FullName);
@@ -1,21 +1,17 @@
+using Distribution.Infra.Authorization;

 namespace Distribution.Features.Auth;

 /// <summary>
 /// Own-user auth is fully delegated to AuthHex — this service only proxies the four functions
 /// AuthHex exposes (loginUser/registerUser/getUserDetails/LogoutUser). No local password check or
-/// token issuance happens here; AuthHex owns credentials and signs the JWT this app validates.
+/// token issuance happens here; AuthHex owns credentials and signs the JWT this app validates
+/// (see Program.cs's JwtBearer registration + OnTokenValidated role mapping).
 /// </summary>
 public class AuthService(IAuthHexClient authHex)
 {
    public Task<AuthHexResponse> LoginAsync(LoginRequest request, CancellationToken ct = default) =>
-        authHex.CallAsync("loginUser", new
-        {
-            identifier = request.Identifier,
-            password = request.Password,
-            userTypeId = request.UserTypeId,
-            deviceName = request.DeviceName
-        }, reference: Guid.NewGuid().ToString(), ct: ct);
+        authHex.CallAsync("loginUser", request, reference: Guid.NewGuid().ToString(), ct: ct);

    public Task<AuthHexResponse> RegisterAsync(RegisterRequest request, CancellationToken ct = default) =>
        authHex.CallAsync("registerUser", request, reference: Guid.NewGuid().ToString(), ct: ct);
@@ -0,0 +1,20 @@
+namespace Distribution.Features.Auth;
+
+/// <summary>
+/// Typed HttpClient that proxies requests to the external Auth Service.
+/// Registered via AddHttpClient&lt;AuthServiceClient&gt; in Program.cs.
+/// BaseAddress is configured from AuthService:BaseUrl in appsettings.json.
+///
+/// TODO: Implement methods once Auth Service contract is agreed.
+/// </summary>
+public class AuthServiceClient(HttpClient http) : IAuthServiceClient
+{
+    // TODO: implement proxy methods, e.g.:
+    //
+    // public async Task<AuthServiceResponse?> LoginAsync(LoginRequest request, CancellationToken ct)
+    // {
+    //     var response = await http.PostAsJsonAsync("/TODO_AUTH_SERVICE_LOGIN_PATH", request, ct);
+    //     if (!response.IsSuccessStatusCode) return null;
+    //     return await response.Content.ReadFromJsonAsync<AuthServiceResponse>(ct);
+    // }
+}
@@ -0,0 +1,11 @@
+namespace Distribution.Features.Auth;
+
+public class AuthServiceOptions
+{
+    public const string SectionName = "AuthService";
+
+    /// <summary>Base URL of the external Auth Service, e.g. "https://auth.internal".</summary>
+    public string BaseUrl { get; set; } = string.Empty;
+
+    // TODO: add other config (API keys, timeout, etc.) once Auth Service is defined.
+}
@@ -0,0 +1,16 @@
+namespace Distribution.Features.Auth;
+
+/// <summary>
+/// Connector to the external Auth Service. This backend proxies all auth
+/// traffic from the Next.js frontend through to the Auth Service — the
+/// frontend never calls the Auth Service directly.
+///
+/// TODO: Fill in the method signatures once the Auth Service contract is agreed.
+/// </summary>
+public interface IAuthServiceClient
+{
+    // TODO: define methods based on Auth Service contract, e.g.:
+    // Task<AuthServiceResponse?> LoginAsync(LoginRequest request, CancellationToken ct);
+    // Task<AuthServiceResponse?> RefreshAsync(string refreshToken, CancellationToken ct);
+    // Task LogoutAsync(string token, CancellationToken ct);
+}
@@ -1,5 +1,5 @@
 namespace Distribution.Features.Brand;

 public record CreateBrandRequest(string Name);
-public record UpdateBrandRequest(string Name, bool IsActive = true);
+public record UpdateBrandRequest(string Name);
 public record BrandResponse(Guid Id, string Name, bool IsActive, DateTime CreatedAt);
@@ -5,16 +5,15 @@ namespace Distribution.Features.Brand;
 public class BrandService(IBrandRepository repo, IUnitOfWork uow)
 {
    public async Task<List<BrandResponse>> GetAllAsync() =>
-        // Deleted brands stay IsActive=false but remain visible showing Inactive — delete
-        // never removes the row, only marks it (same rule as Items/Stores/Categories).
        (await repo.GetAllAsync())
+            .Where(b => b.IsActive)
            .Select(b => new BrandResponse(b.Id, b.Name, b.IsActive, b.CreatedAt))
            .ToList();

    public async Task<BrandResponse?> GetByIdAsync(Guid id)
    {
        var brand = await repo.GetByIdAsync(id);
-        if (brand is null) return null;
+        if (brand is null || !brand.IsActive) return null;
        return new BrandResponse(brand.Id, brand.Name, brand.IsActive, brand.CreatedAt);
    }

@@ -30,10 +29,9 @@ public class BrandService(IBrandRepository repo, IUnitOfWork uow)
    public async Task<BrandResponse?> UpdateAsync(Guid id, UpdateBrandRequest request, CancellationToken ct = default)
    {
        var brand = await repo.GetByIdAsync(id);
-        if (brand is null) return null;
+        if (brand is null || !brand.IsActive) return null;
        if (brand.ExternalErpId.HasValue) return null;
        brand.Name = request.Name;
-        brand.IsActive = request.IsActive;
        await uow.BeginAsync(ct);
        try { repo.Update(brand); await uow.CommitAsync(ct); }
        catch { await uow.RollbackAsync(ct); throw; }
@@ -42,11 +40,10 @@ public class BrandService(IBrandRepository repo, IUnitOfWork uow)

    public async Task<bool> DeleteAsync(Guid id, CancellationToken ct = default)
    {
-        // Soft-delete only — never blocked by items still referencing this brand, same rule
-        // as Categories.
        var brand = await repo.GetByIdAsync(id);
        if (brand is null || !brand.IsActive) return false;
        if (brand.ExternalErpId.HasValue) return false;
+        if (await repo.HasActiveItemsAsync(id)) return false;
        await uow.BeginAsync(ct);
        try { repo.Remove(brand); await uow.CommitAsync(ct); }
        catch { await uow.RollbackAsync(ct); throw; }
@@ -1,9 +1,9 @@
 namespace Distribution.Features.Category;

 public record CreateCategoryRequest(string Name);
-public record UpdateCategoryRequest(string Name, bool IsActive = true);
+public record UpdateCategoryRequest(string Name);
 public record CreateSubCategoryRequest(string Name);
-public record UpdateSubCategoryRequest(string Name, bool IsActive = true);
+public record UpdateSubCategoryRequest(string Name);

 public record SubCategoryResponse(Guid Id, string Name, bool IsActive, DateTime CreatedAt);
 public record CategorySummaryResponse(Guid Id, string Name, bool IsActive, DateTime CreatedAt);
@@ -4,27 +4,18 @@ namespace Distribution.Features.Category;

 public class CategoryService(ICategoryRepository categoryRepo, ISubCategoryRepository subCategoryRepo, IUnitOfWork uow)
 {
-    public async Task<List<CategoryResponse>> GetAllAsync()
-    {
-        // Deleted categories/sub-categories stay IsActive=false but remain visible showing
-        // Inactive — delete never removes the row, only marks it (same rule as Orders/Stores/Items).
-        var categoryList = await categoryRepo.GetAllAsync();
-        var result = new List<CategoryResponse>();
-        foreach (var category in categoryList)
-        {
-            var subs = (await subCategoryRepo.GetByCategoryIdAsync(category.Id))
-                .Select(s => new SubCategoryResponse(s.Id, s.Name, s.IsActive, s.CreatedAt))
-                .ToList();
-            result.Add(new CategoryResponse(category.Id, category.Name, category.IsActive, category.CreatedAt, subs));
-        }
-        return result;
-    }
+    public async Task<List<CategorySummaryResponse>> GetAllAsync() =>
+        (await categoryRepo.GetAllAsync())
+            .Where(c => c.IsActive)
+            .Select(c => new CategorySummaryResponse(c.Id, c.Name, c.IsActive, c.CreatedAt))
+            .ToList();

    public async Task<CategoryResponse?> GetByIdAsync(Guid id)
    {
        var category = await categoryRepo.GetByIdAsync(id);
-        if (category is null) return null;
+        if (category is null || !category.IsActive) return null;
        var subs = (await subCategoryRepo.GetByCategoryIdAsync(id))
+            .Where(s => s.IsActive)
            .Select(s => new SubCategoryResponse(s.Id, s.Name, s.IsActive, s.CreatedAt))
            .ToList();
        return new CategoryResponse(category.Id, category.Name, category.IsActive, category.CreatedAt, subs);
@@ -42,10 +33,9 @@ public class CategoryService(ICategoryRepository categoryRepo, ISubCategoryRepos
    public async Task<CategorySummaryResponse?> UpdateAsync(Guid id, UpdateCategoryRequest request, CancellationToken ct = default)
    {
        var category = await categoryRepo.GetByIdAsync(id);
-        if (category is null) return null;
+        if (category is null || !category.IsActive) return null;
        if (category.ExternalErpId.HasValue) return null;
        category.Name = request.Name;
-        category.IsActive = request.IsActive;
        await uow.BeginAsync(ct);
        try { categoryRepo.Update(category); await uow.CommitAsync(ct); }
        catch { await uow.RollbackAsync(ct); throw; }
@@ -54,11 +44,11 @@ public class CategoryService(ICategoryRepository categoryRepo, ISubCategoryRepos

    public async Task<bool> DeleteAsync(Guid id, CancellationToken ct = default)
    {
-        // Soft-delete only — never blocked by child sub-categories/items, same rule as
-        // Items/Stores/Orders. The row stays visible showing Inactive.
        var category = await categoryRepo.GetByIdAsync(id);
        if (category is null || !category.IsActive) return false;
        if (category.ExternalErpId.HasValue) return false;
+        if (await categoryRepo.HasActiveSubCategoriesAsync(id)) return false;
+        if (await categoryRepo.HasActiveItemsAsync(id)) return false;
        await uow.BeginAsync(ct);
        try { categoryRepo.Remove(category); await uow.CommitAsync(ct); }
        catch { await uow.RollbackAsync(ct); throw; }
@@ -79,10 +69,9 @@ public class CategoryService(ICategoryRepository categoryRepo, ISubCategoryRepos
    public async Task<SubCategoryResponse?> UpdateSubCategoryAsync(Guid id, UpdateSubCategoryRequest request, CancellationToken ct = default)
    {
        var sub = await subCategoryRepo.GetByIdAsync(id);
-        if (sub is null) return null;
+        if (sub is null || !sub.IsActive) return null;
        if (sub.ExternalErpId.HasValue) return null;
        sub.Name = request.Name;
-        sub.IsActive = request.IsActive;
        await uow.BeginAsync(ct);
        try { subCategoryRepo.Update(sub); await uow.CommitAsync(ct); }
        catch { await uow.RollbackAsync(ct); throw; }
@@ -91,10 +80,10 @@ public class CategoryService(ICategoryRepository categoryRepo, ISubCategoryRepos

    public async Task<bool> DeleteSubCategoryAsync(Guid id, CancellationToken ct = default)
    {
-        // Soft-delete only — never blocked by child items, same rule as the parent category.
        var sub = await subCategoryRepo.GetByIdAsync(id);
        if (sub is null || !sub.IsActive) return false;
        if (sub.ExternalErpId.HasValue) return false;
+        if (await subCategoryRepo.HasActiveItemsAsync(id)) return false;
        await uow.BeginAsync(ct);
        try { subCategoryRepo.Remove(sub); await uow.CommitAsync(ct); }
        catch { await uow.RollbackAsync(ct); throw; }
@@ -1,5 +1,4 @@
-using Distribution.Infra.Authorization;
-using Microsoft.AspNetCore.Authorization;
+using Distribution.Infra.Authorization;
 using Microsoft.AspNetCore.Mvc;

 namespace Distribution.Features.Claims;
@@ -7,13 +6,7 @@ namespace Distribution.Features.Claims;
 [ApiController]
 public class ClaimController(ClaimService service, ICurrentUserService currentUser) : ControllerBase
 {
-    [HttpGet("api/claims")]
-    [Authorize("claim.view")]
-    public async Task<IActionResult> GetAll() =>
-        Ok(await service.GetAllAsync());
-
    [HttpGet("api/claims/{id:guid}")]
-    [Authorize("claim.view")]
    public async Task<IActionResult> GetById(Guid id)
    {
        var result = await service.GetByIdAsync(id);
@@ -21,7 +14,6 @@ public class ClaimController(ClaimService service, ICurrentUserService currentUs
    }

    [HttpPost("api/claims")]
-    [Authorize("claim.manage")]
    public async Task<IActionResult> Create(CreateClaimRequest request, CancellationToken ct)
    {
        try
@@ -32,27 +24,13 @@ public class ClaimController(ClaimService service, ICurrentUserService currentUs
        catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
    }

-    [HttpPut("api/claims/{id:guid}")]
-    [Authorize("claim.manage")]
-    public async Task<IActionResult> Update(Guid id, UpdateClaimRequest request, CancellationToken ct)
-    {
-        try
-        {
-            var result = await service.UpdateAsync(id, request, ct);
-            return Ok(result);
-        }
-        catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
-    }
-
    [HttpPost("api/claims/{id:guid}/settle")]
-    [Authorize("claim.manage")]
    public async Task<IActionResult> Settle(Guid id, SettleClaimRequest request, CancellationToken ct)
    {
-        var userId = currentUser.UserId ?? request.SettledByUserId;
-        if (userId is null) return BadRequest(new { error = "SettledByUserId is required while auth is unavailable" });
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
        try
        {
-            var result = await service.SettleAsync(id, request, userId.Value, ct);
+            var result = await service.SettleAsync(id, request, userId, ct);
            return Ok(result);
        }
        catch (KeyNotFoundException) { return NotFound(); }
@@ -4,14 +4,7 @@ namespace Distribution.Features.Claims;

 public record CreateClaimRequest(Guid AgencyUserId, string Details);

-// Only editable while the claim is still Open — once settled, the settlement amount is a
-// financial record and the claim details it was settled against should not silently change.
-public record UpdateClaimRequest(Guid AgencyUserId, string Details);
-
-public record SettleClaimRequest(
-    decimal SettlementAmount,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? SettledByUserId = null);
+public record SettleClaimRequest(decimal SettlementAmount);

 public record ClaimResponse(
    Guid Id,
@@ -8,12 +8,6 @@ public class ClaimRepository(AppDBContext context) : IClaimRepository
    public async Task<Models.Claim?> GetByIdAsync(Guid id) =>
        await context.Claims.FirstOrDefaultAsync(c => c.Id == id);

-    public async Task<List<Models.Claim>> GetAllAsync() =>
-        await context.Claims
-            .Where(c => c.IsActive)
-            .OrderByDescending(c => c.CreatedAt)
-            .ToListAsync();
-
    public async Task<List<Models.Claim>> GetByAgencyUserIdAsync(Guid agencyUserId) =>
        await context.Claims
            .Where(c => c.FK_AgencyUserId == agencyUserId && c.IsActive)
@@ -15,9 +15,6 @@ public class ClaimService(IClaimRepository repo, IUnitOfWork uow)
        return Map(c);
    }

-    public async Task<List<ClaimResponse>> GetAllAsync() =>
-        (await repo.GetAllAsync()).Select(Map).ToList();
-
    public async Task<List<ClaimResponse>> GetByAgencyUserIdAsync(Guid agencyUserId) =>
        (await repo.GetByAgencyUserIdAsync(agencyUserId)).Select(Map).ToList();

@@ -43,26 +40,6 @@ public class ClaimService(IClaimRepository repo, IUnitOfWork uow)
        return Map(claim);
    }

-    public async Task<ClaimResponse> UpdateAsync(Guid id, UpdateClaimRequest request, CancellationToken ct = default)
-    {
-        var claim = await repo.GetByIdAsync(id);
-        if (claim is null || !claim.IsActive)
-            throw new InvalidOperationException("Claim not found.");
-        if (claim.Status == ClaimStatus.Settled)
-            throw new InvalidOperationException("Cannot edit a claim that has already been settled.");
-        if (string.IsNullOrWhiteSpace(request.Details))
-            throw new InvalidOperationException("Claim details are required.");
-
-        claim.FK_AgencyUserId = request.AgencyUserId;
-        claim.Details = request.Details;
-
-        await uow.BeginAsync(ct);
-        try { repo.Update(claim); await uow.CommitAsync(ct); }
-        catch { await uow.RollbackAsync(ct); throw; }
-
-        return Map(claim);
-    }
-
    public async Task<ClaimResponse> SettleAsync(Guid id, SettleClaimRequest request, Guid approverId, CancellationToken ct = default)
    {
        var claim = await repo.GetByIdAsync(id);
@@ -3,7 +3,6 @@ namespace Distribution.Features.Claims;
 public interface IClaimRepository
 {
    Task<Models.Claim?> GetByIdAsync(Guid id);
-    Task<List<Models.Claim>> GetAllAsync();
    Task<List<Models.Claim>> GetByAgencyUserIdAsync(Guid agencyUserId);
    Task AddAsync(Models.Claim entity);
    void Update(Models.Claim entity);
@@ -1,28 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace Distribution.Features.DashboardReport;
-
-[ApiController]
-[Route("api/reports/dashboard")]
-public class DashboardReportController(DashboardReportService service) : ControllerBase
-{
-    [HttpGet("sales")]
-    public async Task<IActionResult> Sales(
-        [FromQuery] DateTime? from, [FromQuery] DateTime? to,
-        [FromQuery] Guid? regionId, [FromQuery] Guid? categoryId)
-    {
-        var f = DashboardReportService.BuildFilter(from, to, regionId, categoryId, null);
-        var error = DashboardReportService.Validate(f);
-        return error is null ? Ok(await service.GetSalesSummaryAsync(f)) : BadRequest(new { message = error });
-    }
-
-    [HttpGet("inventory")]
-    public async Task<IActionResult> Inventory(
-        [FromQuery] DateTime? from, [FromQuery] DateTime? to,
-        [FromQuery] Guid? warehouseId, [FromQuery] Guid? categoryId)
-    {
-        var f = DashboardReportService.BuildFilter(from, to, null, categoryId, warehouseId);
-        var error = DashboardReportService.Validate(f);
-        return error is null ? Ok(await service.GetInventorySummaryAsync(f)) : BadRequest(new { message = error });
-    }
-}
@@ -1,32 +0,0 @@
-namespace Distribution.Features.DashboardReport;
-
-public record DashboardFilter(DateTime From, DateTime To, Guid? RegionId, Guid? CategoryId, Guid? WarehouseId);
-
-public record SalesTotals(decimal GrossSales, decimal ReturnValue, int Orders, decimal CostedSales, decimal CostOfSales);
-
-public record SalesKpis(
-    decimal GrossSales, decimal ReturnValue, decimal NetSales, int Orders, decimal AverageOrderValue,
-    decimal GrossProfit, decimal? GrossProfitMarginPercent);
-
-public record SalesKpiComparison(SalesKpis Current, SalesKpis Previous, DateTime PreviousFrom, DateTime PreviousTo);
-
-public record TrendPoint(string Period, decimal Sales, decimal Returns);
-
-public record NamedAmount(Guid? Id, string Name, decimal Amount);
-
-public record SalesSummaryResponse(
-    DateTime From, DateTime To, string Granularity,
-    SalesKpiComparison Kpis, List<TrendPoint> Trend,
-    List<NamedAmount> ByCategory, List<NamedAmount> ByRegion, List<NamedAmount> ByRep);
-
-public record PeriodAmount(DateTime Date, decimal Amount);
-
-public record MovementPoint(string Period, decimal Received, decimal Issued, decimal Net);
-
-public record WarehouseStockRow(Guid WarehouseId, string Name, decimal Quantity, decimal Value);
-
-public record CategoryValueRow(string Category, decimal Quantity, decimal Value);
-
-public record InventorySummaryResponse(
-    DateTime From, DateTime To, string Granularity,
-    List<CategoryValueRow> ValueByCategory, List<WarehouseStockRow> ByWarehouse, List<MovementPoint> MovementTrend);
@@ -1,171 +0,0 @@
-using Distribution.Data;
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Features.DashboardReport;
-
-public class DashboardReportRepository(AppDBContext db) : IDashboardReportRepository
-{
-    private sealed class SoldLine
-    {
-        public DateTime Date { get; set; }
-        public Guid PoId { get; set; }
-        public decimal Value { get; set; }
-        public decimal? Cost { get; set; }
-        public Guid CategoryId { get; set; }
-        public string CategoryName { get; set; } = "";
-        public Guid RegionId { get; set; }
-        public string RegionName { get; set; } = "";
-        public Guid RepId { get; set; }
-    }
-
-    // Same definition of "sold" as ProductReportRepository: fulfilled lines on non-cancelled POs
-    // whose invoice is Finalized, dated by Invoice.FinalizedAt. 'To' is inclusive (whole day).
-    private IQueryable<SoldLine> SoldLines(DashboardFilter f)
-    {
-        var start = f.From.Date;
-        var end = f.To.Date.AddDays(1);
-        var q =
-            from li in db.ShopPOItems.AsNoTracking()
-            join inv in db.Invoices.AsNoTracking() on li.FK_ShopPOId equals inv.FK_ShopPOId
-            where inv.Status == InvoiceStatus.Finalized
-                && li.ShopPO.Status != ShopPOStatus.Cancelled
-                && inv.FinalizedAt >= start && inv.FinalizedAt < end
-            select new SoldLine
-            {
-                Date = inv.FinalizedAt!.Value.Date,
-                PoId = li.FK_ShopPOId,
-                Value = li.QuantityFulfilled * li.UnitPrice,
-                Cost = li.Item.CostPrice == null ? null : li.QuantityFulfilled * li.Item.CostPrice,
-                CategoryId = li.Item.FK_CategoryId,
-                CategoryName = li.Item.Category.Name,
-                RegionId = li.ShopPO.Store.Route.FK_RegionId,
-                RegionName = li.ShopPO.Store.Route.Region.Name,
-                RepId = li.ShopPO.RaisedById,
-            };
-        if (f.RegionId.HasValue) q = q.Where(l => l.RegionId == f.RegionId.Value);
-        if (f.CategoryId.HasValue) q = q.Where(l => l.CategoryId == f.CategoryId.Value);
-        return q;
-    }
-
-    private IQueryable<SaleReturnItem> ReturnLines(DashboardFilter f)
-    {
-        var start = f.From.Date;
-        var end = f.To.Date.AddDays(1);
-        var q = db.SaleReturnItems.AsNoTracking()
-            .Where(r => r.SaleReturn.CreatedAt >= start && r.SaleReturn.CreatedAt < end);
-        if (f.RegionId.HasValue) q = q.Where(r => r.SaleReturn.ShopPO.Store.Route.FK_RegionId == f.RegionId.Value);
-        if (f.CategoryId.HasValue) q = q.Where(r => r.Item.FK_CategoryId == f.CategoryId.Value);
-        return q;
-    }
-
-    public async Task<SalesTotals> GetSalesTotalsAsync(DashboardFilter f)
-    {
-        var lines = SoldLines(f);
-        var gross = await lines.SumAsync(l => (decimal?)l.Value) ?? 0m;
-        var orders = await lines.Select(l => l.PoId).Distinct().CountAsync();
-        var costed = lines.Where(l => l.Cost != null);
-        var costedSales = await costed.SumAsync(l => (decimal?)l.Value) ?? 0m;
-        var cost = await costed.SumAsync(l => l.Cost) ?? 0m;
-        var returns = await ReturnLines(f).SumAsync(r => (decimal?)(r.Quantity * r.UnitPrice)) ?? 0m;
-        return new SalesTotals(gross, returns, orders, costedSales, cost);
-    }
-
-    public async Task<List<PeriodAmount>> GetDailySalesAsync(DashboardFilter f) =>
-        (await SoldLines(f).GroupBy(l => l.Date)
-            .Select(g => new { Date = g.Key, Amount = g.Sum(x => x.Value) })
-            .ToListAsync())
-        .Select(x => new PeriodAmount(x.Date, x.Amount)).ToList();
-
-    public async Task<List<PeriodAmount>> GetDailyReturnsAsync(DashboardFilter f) =>
-        (await ReturnLines(f).GroupBy(r => r.SaleReturn.CreatedAt.Date)
-            .Select(g => new { Date = g.Key, Amount = g.Sum(x => x.Quantity * x.UnitPrice) })
-            .ToListAsync())
-        .Select(x => new PeriodAmount(x.Date, x.Amount)).ToList();
-
-    public async Task<List<GroupAggregate>> GetSalesByCategoryAsync(DashboardFilter f) =>
-        (await SoldLines(f).GroupBy(l => new { l.CategoryId, l.CategoryName })
-            .Select(g => new { g.Key.CategoryId, g.Key.CategoryName, Amount = g.Sum(x => x.Value) })
-            .OrderByDescending(x => x.Amount).ToListAsync())
-        .Select(x => new GroupAggregate(x.CategoryId, x.CategoryName, x.Amount)).ToList();
-
-    public async Task<List<GroupAggregate>> GetSalesByRegionAsync(DashboardFilter f) =>
-        (await SoldLines(f).GroupBy(l => new { l.RegionId, l.RegionName })
-            .Select(g => new { g.Key.RegionId, g.Key.RegionName, Amount = g.Sum(x => x.Value) })
-            .OrderByDescending(x => x.Amount).ToListAsync())
-        .Select(x => new GroupAggregate(x.RegionId, x.RegionName, x.Amount)).ToList();
-
-    public async Task<List<GroupAggregate>> GetSalesByRepAsync(DashboardFilter f)
-    {
-        var rows = await SoldLines(f).GroupBy(l => l.RepId)
-            .Select(g => new { RepId = g.Key, Amount = g.Sum(x => x.Value) })
-            .OrderByDescending(x => x.Amount).Take(20).ToListAsync();
-        var ids = rows.Select(r => r.RepId).ToList();
-        var names = await db.Users.AsNoTracking().Where(u => ids.Contains(u.Id))
-            .ToDictionaryAsync(u => u.Id, u => u.FullName);
-        return rows.Select(r => new GroupAggregate(r.RepId, names.GetValueOrDefault(r.RepId, "Unknown"), r.Amount)).ToList();
-    }
-
-    private IQueryable<StockBalance> Balances(DashboardFilter f)
-    {
-        var q = db.StockBalances.AsNoTracking().AsQueryable();
-        if (f.WarehouseId.HasValue)
-            q = q.Where(b => b.LocationType == LocationType.Warehouse && b.LocationId == f.WarehouseId.Value);
-        if (f.CategoryId.HasValue) q = q.Where(b => b.Item.FK_CategoryId == f.CategoryId.Value);
-        return q;
-    }
-
-    // Value = quantity x cost price; items without a cost price contribute quantity only.
-    public async Task<List<CategoryValueRow>> GetStockValueByCategoryAsync(DashboardFilter f) =>
-        (await Balances(f).GroupBy(b => b.Item.Category.Name)
-            .Select(g => new
-            {
-                Category = g.Key,
-                Quantity = g.Sum(x => x.Quantity),
-                Value = g.Sum(x => x.Quantity * (x.Item.CostPrice ?? 0m)),
-            })
-            .OrderByDescending(x => x.Value).ToListAsync())
-        .Select(x => new CategoryValueRow(x.Category, x.Quantity, x.Value)).ToList();
-
-    public async Task<List<WarehouseStockRow>> GetStockByWarehouseAsync(DashboardFilter f)
-    {
-        var rows = await Balances(f).Where(b => b.LocationType == LocationType.Warehouse)
-            .GroupBy(b => b.LocationId)
-            .Select(g => new
-            {
-                Id = g.Key,
-                Quantity = g.Sum(x => x.Quantity),
-                Value = g.Sum(x => x.Quantity * (x.Item.CostPrice ?? 0m)),
-            })
-            .ToListAsync();
-        var ids = rows.Select(r => r.Id).ToList();
-        var names = await db.Warehouses.AsNoTracking().Where(w => ids.Contains(w.Id))
-            .ToDictionaryAsync(w => w.Id, w => w.Name);
-        return rows.Select(r => new WarehouseStockRow(r.Id, names.GetValueOrDefault(r.Id, "Unknown"), r.Quantity, r.Value))
-            .OrderByDescending(r => r.Value).ToList();
-    }
-
-    // Received = purchase receipts + customer returns; Issued = sales + purchase returns + damages.
-    // Transfers, loads and adjustments are internal/signed and excluded from this trend.
-    public async Task<List<(DateTime Date, decimal Received, decimal Issued)>> GetDailyMovementsAsync(DashboardFilter f)
-    {
-        var start = f.From.Date;
-        var end = f.To.Date.AddDays(1);
-        var q = db.StockMovements.AsNoTracking()
-            .Where(m => m.CreatedAt >= start && m.CreatedAt < end
-                && (m.Type == MovementType.PurchaseReceipt || m.Type == MovementType.CustomerReturn
-                    || m.Type == MovementType.Sale || m.Type == MovementType.PurchaseReturn || m.Type == MovementType.Damage));
-        if (f.CategoryId.HasValue) q = q.Where(m => m.Item.FK_CategoryId == f.CategoryId.Value);
-        if (f.WarehouseId.HasValue)
-            q = q.Where(m => m.ToLocationId == f.WarehouseId.Value || m.FromLocationId == f.WarehouseId.Value);
-
-        var rows = await q.GroupBy(m => new { m.CreatedAt.Date, m.Type })
-            .Select(g => new { g.Key.Date, g.Key.Type, Qty = g.Sum(x => x.Quantity) })
-            .ToListAsync();
-        return rows.GroupBy(r => r.Date)
-            .Select(g => (g.Key,
-                g.Where(r => r.Type is MovementType.PurchaseReceipt or MovementType.CustomerReturn).Sum(r => r.Qty),
-                g.Where(r => r.Type is MovementType.Sale or MovementType.PurchaseReturn or MovementType.Damage).Sum(r => r.Qty)))
-            .ToList();
-    }
-}
@@ -1,83 +0,0 @@
-namespace Distribution.Features.DashboardReport;
-
-public class DashboardReportService(IDashboardReportRepository repo)
-{
-    public const int MaxRangeDays = 366;
-    private const int DailyGranularityMaxDays = 62;
-
-    public static DashboardFilter BuildFilter(DateTime? from, DateTime? to, Guid? regionId, Guid? categoryId, Guid? warehouseId)
-    {
-        var end = (to ?? DateTime.Now).Date;
-        var start = (from ?? end.AddDays(-29)).Date;
-        return new DashboardFilter(start, end, regionId, categoryId, warehouseId);
-    }
-
-    public static string? Validate(DashboardFilter f)
-    {
-        if (f.To < f.From) return "'to' must not be before 'from'.";
-        if ((f.To - f.From).TotalDays > MaxRangeDays) return $"Date range cannot exceed {MaxRangeDays} days.";
-        return null;
-    }
-
-    private static bool Daily(DashboardFilter f) => (f.To - f.From).TotalDays <= DailyGranularityMaxDays;
-
-    private static string Bucket(DateTime d, bool daily) => daily ? d.ToString("yyyy-MM-dd") : d.ToString("yyyy-MM");
-
-    private static SalesKpis ToKpis(SalesTotals t)
-    {
-        var net = t.GrossSales - t.ReturnValue;
-        var gp = t.CostedSales - t.CostOfSales;
-        return new SalesKpis(
-            t.GrossSales, t.ReturnValue, net, t.Orders,
-            t.Orders > 0 ? Math.Round(t.GrossSales / t.Orders, 2) : 0m,
-            gp, t.CostedSales > 0 ? Math.Round(gp / t.CostedSales * 100, 2) : null);
-    }
-
-    public async Task<SalesSummaryResponse> GetSalesSummaryAsync(DashboardFilter f)
-    {
-        var days = (f.To - f.From).Days + 1;
-        var prev = f with { From = f.From.AddDays(-days), To = f.From.AddDays(-1) };
-        var daily = Daily(f);
-
-        var current = await repo.GetSalesTotalsAsync(f);
-        var previous = await repo.GetSalesTotalsAsync(prev);
-        var sales = await repo.GetDailySalesAsync(f);
-        var returns = await repo.GetDailyReturnsAsync(f);
-
-        var trend = sales.Select(s => (s.Date, Sales: s.Amount, Returns: 0m))
-            .Concat(returns.Select(r => (r.Date, Sales: 0m, Returns: r.Amount)))
-            .GroupBy(x => Bucket(x.Date, daily))
-            .OrderBy(g => g.Key)
-            .Select(g => new TrendPoint(g.Key, g.Sum(x => x.Sales), g.Sum(x => x.Returns)))
-            .ToList();
-
-        static NamedAmount Map(GroupAggregate g) => new(g.Key, g.Name, g.Amount);
-        return new SalesSummaryResponse(
-            f.From, f.To, daily ? "day" : "month",
-            new SalesKpiComparison(ToKpis(current), ToKpis(previous), prev.From, prev.To),
-            trend,
-            (await repo.GetSalesByCategoryAsync(f)).Select(Map).ToList(),
-            (await repo.GetSalesByRegionAsync(f)).Select(Map).ToList(),
-            (await repo.GetSalesByRepAsync(f)).Select(Map).ToList());
-    }
-
-    public async Task<InventorySummaryResponse> GetInventorySummaryAsync(DashboardFilter f)
-    {
-        var daily = Daily(f);
-        var movements = (await repo.GetDailyMovementsAsync(f))
-            .GroupBy(m => Bucket(m.Date, daily))
-            .OrderBy(g => g.Key)
-            .Select(g =>
-            {
-                var rec = g.Sum(x => x.Received);
-                var iss = g.Sum(x => x.Issued);
-                return new MovementPoint(g.Key, rec, iss, rec - iss);
-            }).ToList();
-
-        return new InventorySummaryResponse(
-            f.From, f.To, daily ? "day" : "month",
-            await repo.GetStockValueByCategoryAsync(f),
-            await repo.GetStockByWarehouseAsync(f),
-            movements);
-    }
-}
@@ -1,16 +0,0 @@
-namespace Distribution.Features.DashboardReport;
-
-public record GroupAggregate(Guid? Key, string Name, decimal Amount);
-
-public interface IDashboardReportRepository
-{
-    Task<SalesTotals> GetSalesTotalsAsync(DashboardFilter f);
-    Task<List<PeriodAmount>> GetDailySalesAsync(DashboardFilter f);
-    Task<List<PeriodAmount>> GetDailyReturnsAsync(DashboardFilter f);
-    Task<List<GroupAggregate>> GetSalesByCategoryAsync(DashboardFilter f);
-    Task<List<GroupAggregate>> GetSalesByRegionAsync(DashboardFilter f);
-    Task<List<GroupAggregate>> GetSalesByRepAsync(DashboardFilter f);
-    Task<List<CategoryValueRow>> GetStockValueByCategoryAsync(DashboardFilter f);
-    Task<List<WarehouseStockRow>> GetStockByWarehouseAsync(DashboardFilter f);
-    Task<List<(DateTime Date, decimal Received, decimal Issued)>> GetDailyMovementsAsync(DashboardFilter f);
-}
@@ -1,16 +1,12 @@
-using Distribution.Infra.Authorization;
-using Distribution.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;

 namespace Distribution.Features.DeliveryRide;

 [ApiController]
 [Route("api")]
-public class DeliveryTaskController(DeliveryTaskService service, ICurrentUserService currentUser) : ControllerBase
+public class DeliveryTaskController(DeliveryTaskService service) : ControllerBase
 {
    [HttpPost("rides/{rideId:guid}/tasks/generate")]
-    [Authorize("delivery-task.manage")]
    public async Task<IActionResult> Generate(Guid rideId, CancellationToken ct)
    {
        try
@@ -24,26 +20,13 @@ public class DeliveryTaskController(DeliveryTaskService service, ICurrentUserSer

    [HttpGet("rides/{rideId:guid}/tasks")]
    [HttpGet("rides/{rideId:guid}/delivery-tasks")]
-    [Authorize("delivery-task.view")]
    public async Task<IActionResult> GetByRide(Guid rideId)
    {
        var result = await service.GetByRideIdAsync(rideId);
        return Ok(result);
    }

-    [HttpGet("delivery-tasks")]
-    //[Authorize("delivery-task.view")]
-    public async Task<IActionResult> GetAll(
-        [FromQuery] DeliveryTaskStatus? status,
-        [FromQuery] int page = 1,
-        [FromQuery] int pageSize = 20)
-    {
-        var result = await service.GetAllAsync(status, page, pageSize);
-        return Ok(result);
-    }
-
    [HttpGet("delivery-tasks/{id:guid}")]
-    [Authorize("delivery-task.view")]
    public async Task<IActionResult> GetById(Guid id)
    {
        var result = await service.GetByIdAsync(id);
@@ -51,7 +34,6 @@ public class DeliveryTaskController(DeliveryTaskService service, ICurrentUserSer
    }

    [HttpPut("delivery-tasks/{id:guid}/quantities")]
-    [Authorize("delivery-task.manage")]
    public async Task<IActionResult> SetQuantities(Guid id, SetQuantitiesRequest request, CancellationToken ct)
    {
        try
@@ -64,12 +46,11 @@ public class DeliveryTaskController(DeliveryTaskService service, ICurrentUserSer
    }

    [HttpPost("delivery-tasks/{id:guid}/confirm")]
-    [Authorize("delivery-task.manage")]
    public async Task<IActionResult> Confirm(Guid id, CancellationToken ct)
    {
        try
        {
-            var result = await service.ConfirmAsync(id, currentUser.UserId ?? Guid.Empty, ct);
+            var result = await service.ConfirmAsync(id, ct);
            return Ok(result);
        }
        catch (KeyNotFoundException) { return NotFound(); }
@@ -77,7 +58,6 @@ public class DeliveryTaskController(DeliveryTaskService service, ICurrentUserSer
    }

    [HttpPost("delivery-tasks/{id:guid}/fail")]
-    [Authorize("delivery-task.manage")]
    public async Task<IActionResult> Fail(Guid id, FailTaskRequest request, CancellationToken ct)
    {
        try
@@ -1,4 +1,4 @@
-using Distribution.Models;
+using Distribution.Models;

 namespace Distribution.Features.DeliveryRide;

@@ -7,7 +7,7 @@ public record DeliveryTaskItemResponse(Guid ItemId, string ItemName, int Quantit
 public record DeliveryTaskResponse(
    Guid Id,
    Guid FK_RideId,
-    Guid FK_ShopPOId,
+    Guid FK_OrderId,
    Guid StoreId,
    string StoreName,
    int Sequence,
@@ -1,4 +1,4 @@
-using Distribution.Data;
+using Distribution.Data;
 using Distribution.Models;
 using Microsoft.EntityFrameworkCore;

@@ -8,48 +8,27 @@ public class DeliveryTaskRepository(AppDBContext context) : IDeliveryTaskReposit
 {
    public async Task<DeliveryTask?> GetByIdAsync(Guid id) =>
        await context.DeliveryTasks
-            .Include(t => t.ShopPO)
+            .Include(t => t.Order)
                .ThenInclude(o => o.Store)
-            .Include(t => t.ShopPO)
-                .ThenInclude(o => o.Items.Where(i => i.IsActive))
+            .Include(t => t.Order)
+                .ThenInclude(o => o.OrderItems)
                    .ThenInclude(i => i.Item)
            .FirstOrDefaultAsync(t => t.Id == id);

    public async Task<List<DeliveryTask>> GetByRideIdAsync(Guid rideId) =>
        await context.DeliveryTasks
-            .Include(t => t.ShopPO)
+            .Include(t => t.Order)
                .ThenInclude(o => o.Store)
-            .Include(t => t.ShopPO)
-                .ThenInclude(o => o.Items.Where(i => i.IsActive))
+            .Include(t => t.Order)
+                .ThenInclude(o => o.OrderItems)
                    .ThenInclude(i => i.Item)
            .Where(t => t.FK_RideId == rideId)
            .OrderBy(t => t.Sequence)
            .ToListAsync();

-    public Task<List<DeliveryTask>> GetAllAsync(DeliveryTaskStatus? status, int page, int pageSize)
-    {
-        var query = context.DeliveryTasks
-            .Include(t => t.ShopPO)
-                .ThenInclude(o => o.Store)
-            .Include(t => t.ShopPO)
-                .ThenInclude(o => o.Items.Where(i => i.IsActive))
-                    .ThenInclude(i => i.Item)
-            .AsQueryable();
-        if (status.HasValue) query = query.Where(t => t.Status == status.Value);
-        return query.OrderByDescending(t => t.CreatedAt)
-            .Skip((page - 1) * pageSize).Take(pageSize).ToListAsync();
-    }
-
-    public Task<int> GetCountAsync(DeliveryTaskStatus? status)
-    {
-        var query = context.DeliveryTasks.AsQueryable();
-        if (status.HasValue) query = query.Where(t => t.Status == status.Value);
-        return query.CountAsync();
-    }
-
-    public async Task<bool> ExistsForOrderAndRideAsync(Guid shopPOId, Guid rideId) =>
+    public async Task<bool> ExistsForOrderAndRideAsync(Guid orderId, Guid rideId) =>
        await context.DeliveryTasks
-            .AnyAsync(t => t.FK_ShopPOId == shopPOId && t.FK_RideId == rideId);
+            .AnyAsync(t => t.FK_OrderId == orderId && t.FK_RideId == rideId);

    public async Task AddAsync(DeliveryTask task) =>
        await context.DeliveryTasks.AddAsync(task);
@@ -1,6 +1,6 @@
-using Distribution.Features.LoadingEvent;
+using Distribution.Features.Order;
 using Distribution.Features.Ride;
-using Distribution.Features.ShopPO;
+using Distribution.Features.Sale;
 using Distribution.Features.Stock;
 using Distribution.Infra.UoW;
 using Distribution.Models;
@@ -10,23 +10,23 @@ namespace Distribution.Features.DeliveryRide;
 public class DeliveryTaskService(
    IDeliveryTaskRepository repo,
    IRideRepository rideRepo,
-    IShopPORepository shopPORepo,
-    ILoadingSheetRepository loadingSheetRepo,
-    StockMover mover,
+    IOrderRepository orderRepo,
+    ISaleRepository saleRepo,
+    IStockRepository stockRepo,
    IUnitOfWork uow)
 {
    private static DeliveryTaskResponse ToResponse(DeliveryTask t) =>
        new(t.Id,
            t.FK_RideId,
-            t.FK_ShopPOId,
-            t.ShopPO.FK_StoreId,
-            t.ShopPO.Store?.StoreName ?? string.Empty,
+            t.FK_OrderId,
+            t.Order.FK_StoreId,
+            t.Order.Store?.StoreName ?? string.Empty,
            t.Sequence,
            t.Status,
            t.CustomerConfirmed,
            t.ConfirmedAt,
            t.Note,
-            t.ShopPO.Items.Select(i => new DeliveryTaskItemResponse(
+            t.Order.OrderItems.Select(i => new DeliveryTaskItemResponse(
                i.FK_ItemId,
                i.Item?.Name ?? string.Empty,
                i.Quantity,
@@ -39,43 +39,43 @@ public class DeliveryTaskService(
        var ride = await rideRepo.GetByIdAsync(rideId)
            ?? throw new KeyNotFoundException("Ride not found");

-        var confirmedSheets = await loadingSheetRepo.GetAllAsync(rideId, LoadingSheetStatus.Confirmed, null, null, 1, int.MaxValue);
-        if (confirmedSheets.Count == 0)
-            throw new InvalidOperationException("Ride has no confirmed loading sheet to generate delivery tasks from");
+        if (ride.Status != RideStatus.Active)
+            throw new InvalidOperationException("Tasks can only be generated for an Active ride");

-        var shopPOIds = confirmedSheets
-            .SelectMany(s => s.Orders)
-            .Select(o => o.FK_ShopPOId)
-            .Distinct()
-            .ToList();
+        if (ride.RideType != RideType.Delivery)
+            throw new InvalidOperationException("Tasks can only be generated for a Delivery ride");

-        var existingTasks = await repo.GetByRideIdAsync(rideId);
-        var nextSequence = existingTasks.Count > 0 ? existingTasks.Max(t => t.Sequence) + 1 : 1;
+        var orders = await orderRepo.GetPendingByRouteIdAsync(ride.FK_RouteId);

-        var newTasks = new List<DeliveryTask>();
-        foreach (var shopPOId in shopPOIds)
+        var created = new List<DeliveryTask>();
+        int sequence = 1;
+
+        foreach (var order in orders)
        {
-            if (await repo.ExistsForOrderAndRideAsync(shopPOId, rideId)) continue;
+            if (await repo.ExistsForOrderAndRideAsync(order.Id, rideId))
+                continue;

-            newTasks.Add(new DeliveryTask
+            var task = new DeliveryTask
            {
                FK_RideId = rideId,
-                FK_ShopPOId = shopPOId,
-                Sequence = nextSequence++,
+                FK_OrderId = order.Id,
+                Sequence = sequence++,
                Status = DeliveryTaskStatus.Pending
-            });
+            };
+            created.Add(task);
        }

-        if (newTasks.Count > 0)
+        if (created.Count == 0)
+            return new List<DeliveryTaskResponse>();
+
+        await uow.BeginAsync(ct);
+        try
        {
-            await uow.BeginAsync(ct);
-            try
-            {
-                foreach (var task in newTasks) await repo.AddAsync(task);
-                await uow.CommitAsync(ct);
-            }
-            catch { await uow.RollbackAsync(ct); throw; }
+            foreach (var task in created)
+                await repo.AddAsync(task);
+            await uow.CommitAsync(ct);
        }
+        catch { await uow.RollbackAsync(ct); throw; }

        var saved = await repo.GetByRideIdAsync(rideId);
        return saved.Select(ToResponse).ToList();
@@ -87,13 +87,6 @@ public class DeliveryTaskService(
        return tasks.Select(ToResponse).ToList();
    }

-    public async Task<PagedResponse<DeliveryTaskResponse>> GetAllAsync(DeliveryTaskStatus? status, int page, int pageSize)
-    {
-        var items = await repo.GetAllAsync(status, page, pageSize);
-        var total = await repo.GetCountAsync(status);
-        return new PagedResponse<DeliveryTaskResponse>(page, pageSize, total, items.Select(ToResponse).ToList());
-    }
-
    public async Task<DeliveryTaskResponse?> GetByIdAsync(Guid id)
    {
        var task = await repo.GetByIdAsync(id);
@@ -110,16 +103,16 @@ public class DeliveryTaskService(

        foreach (var input in request.Items)
        {
-            var shopPOItem = task.ShopPO.Items.FirstOrDefault(i => i.FK_ItemId == input.ItemId)
-                ?? throw new InvalidOperationException($"Item {input.ItemId} is not on this ShopPO");
+            var orderItem = task.Order.OrderItems.FirstOrDefault(i => i.FK_ItemId == input.ItemId)
+                ?? throw new InvalidOperationException($"Item {input.ItemId} is not on this order");

            if (input.QuantityFulfilled < 0)
                throw new InvalidOperationException($"QuantityFulfilled cannot be negative for item {input.ItemId}");

-            if (input.QuantityFulfilled > shopPOItem.Quantity)
+            if (input.QuantityFulfilled > orderItem.Quantity)
                throw new InvalidOperationException($"QuantityFulfilled exceeds ordered quantity for item {input.ItemId}");

-            shopPOItem.QuantityFulfilled = input.QuantityFulfilled;
+            orderItem.QuantityFulfilled = input.QuantityFulfilled;
        }

        await uow.BeginAsync(ct);
@@ -134,7 +127,7 @@ public class DeliveryTaskService(
        return ToResponse(saved!);
    }

-    public async Task<DeliveryTaskResponse> ConfirmAsync(Guid taskId, Guid userId, CancellationToken ct = default)
+    public async Task<DeliveryTaskResponse> ConfirmAsync(Guid taskId, CancellationToken ct = default)
    {
        var task = await repo.GetByIdAsync(taskId)
            ?? throw new KeyNotFoundException("Delivery task not found");
@@ -142,7 +135,7 @@ public class DeliveryTaskService(
        if (task.Status != DeliveryTaskStatus.Pending)
            throw new InvalidOperationException("Only a Pending task can be confirmed");

-        if (!task.ShopPO.Items.Any(i => i.QuantityFulfilled > 0))
+        if (!task.Order.OrderItems.Any(i => i.QuantityFulfilled > 0))
            throw new InvalidOperationException("Set quantities before confirming — at least one item must have a fulfilled quantity greater than zero");

        var ride = await rideRepo.GetByIdAsync(task.FK_RideId)
@@ -150,32 +143,54 @@ public class DeliveryTaskService(

        var vehicleId = ride.FK_VehicleId;

-        bool fullyDelivered = task.ShopPO.Items.All(i => i.QuantityFulfilled == i.Quantity);
+        bool fullyDelivered = task.Order.OrderItems.All(i => i.QuantityFulfilled == i.Quantity);

        task.CustomerConfirmed = true;
        task.ConfirmedAt = DateTime.Now;
        task.Status = fullyDelivered ? DeliveryTaskStatus.Delivered : DeliveryTaskStatus.PartiallyDelivered;

-        var shopPO = task.ShopPO;
-        shopPO.Status = fullyDelivered ? ShopPOStatus.Fulfilled : ShopPOStatus.PartiallyFulfilled;
+        var order = task.Order;
+        order.Status = fullyDelivered ? OrderStatus.Fulfilled : OrderStatus.PartiallyFulfilled;
        if (fullyDelivered)
-            shopPO.FulfilledAt = DateTime.Now;
+            order.FulfilledAt = DateTime.Now;

        await uow.BeginAsync(ct);
        try
        {
-            foreach (var item in task.ShopPO.Items.Where(i => i.QuantityFulfilled > 0))
+            foreach (var item in task.Order.OrderItems.Where(i => i.QuantityFulfilled > 0))
            {
-                var itemName = item.Item?.Name ?? item.FK_ItemId.ToString();
+                var vehicleBalance = await stockRepo.GetBalanceAsync(item.FK_ItemId, vehicleId)
+                    ?? throw new InvalidOperationException($"No vehicle stock found for item {item.FK_ItemId}");

-                await mover.MoveAsync(item.FK_ItemId, itemName,
-                    vehicleId, LocationType.Vehicle,
-                    StockService.ExternalLocationId, LocationType.External,
-                    item.QuantityFulfilled, MovementType.Sale, task.FK_ShopPOId, userId);
+                if (vehicleBalance.Quantity < item.QuantityFulfilled)
+                    throw new InvalidOperationException($"Insufficient vehicle stock for item {item.FK_ItemId}");
+
+                vehicleBalance.Quantity -= item.QuantityFulfilled;
+                vehicleBalance.UpdatedAt = DateTime.Now;
+                stockRepo.UpdateBalance(vehicleBalance);
+
+                await stockRepo.AddMovementAsync(new StockMovement
+                {
+                    FK_ItemId = item.FK_ItemId,
+                    FromLocationId = vehicleId,
+                    FromLocationType = LocationType.Vehicle,
+                    Quantity = item.QuantityFulfilled,
+                    Type = MovementType.Sale,
+                    ReferenceId = task.FK_OrderId
+                });
            }

            repo.Update(task);
-            shopPORepo.Update(shopPO);
+            orderRepo.Update(order);
+
+            if (fullyDelivered)
+            {
+                var sale = await saleRepo.GetByIdAsync(order.FK_SaleId)
+                    ?? throw new KeyNotFoundException("Sale not found");
+                sale.Status = SaleStatus.Completed;
+                sale.CompletedAt = DateTime.Now;
+                saleRepo.Update(sale);
+            }

            await uow.CommitAsync(ct);
        }
@@ -6,8 +6,6 @@ public interface IDeliveryTaskRepository
 {
    Task<DeliveryTask?> GetByIdAsync(Guid id);
    Task<List<DeliveryTask>> GetByRideIdAsync(Guid rideId);
-    Task<List<DeliveryTask>> GetAllAsync(DeliveryTaskStatus? status, int page, int pageSize);
-    Task<int> GetCountAsync(DeliveryTaskStatus? status);
    Task<bool> ExistsForOrderAndRideAsync(Guid orderId, Guid rideId);
    Task AddAsync(DeliveryTask task);
    void Update(DeliveryTask task);
@@ -1,12 +0,0 @@
-namespace Distribution.Features.DriverComplianceConfig;
-
-public record DriverComplianceConfigResponse(
-    Guid Id,
-    bool EnforceLicenseExpiry,
-    bool EnforceMedicalClearance,
-    DateTime UpdatedAt,
-    Guid UpdatedBy);
-
-public record UpdateDriverComplianceConfigRequest(
-    bool EnforceLicenseExpiry,
-    bool EnforceMedicalClearance);
@@ -1,16 +0,0 @@
-using Distribution.Data;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Features.DriverComplianceConfig;
-
-public class DriverComplianceConfigRepository(AppDBContext context) : IDriverComplianceConfigRepository
-{
-    public async Task<Models.DriverComplianceConfig?> GetAsync() =>
-        await context.DriverComplianceConfigs.FirstOrDefaultAsync();
-
-    public async Task AddAsync(Models.DriverComplianceConfig config) =>
-        await context.DriverComplianceConfigs.AddAsync(config);
-
-    public void Update(Models.DriverComplianceConfig config) =>
-        context.DriverComplianceConfigs.Update(config);
-}
@@ -1,62 +0,0 @@
-using Distribution.Infra.UoW;
-
-namespace Distribution.Features.DriverComplianceConfig;
-
-public class DriverComplianceConfigService(IDriverComplianceConfigRepository repo, IUnitOfWork uow)
-{
-    public async Task<DriverComplianceConfigResponse?> GetAsync()
-    {
-        var config = await repo.GetAsync();
-        return config is null
-            ? null
-            : new DriverComplianceConfigResponse(
-                config.Id,
-                config.EnforceLicenseExpiry,
-                config.EnforceMedicalClearance,
-                config.UpdatedAt,
-                config.UpdatedBy);
-    }
-
-    public async Task<DriverComplianceConfigResponse> UpsertAsync(UpdateDriverComplianceConfigRequest request, Guid updatedBy, CancellationToken ct = default)
-    {
-        var config = await repo.GetAsync();
-
-        await uow.BeginAsync(ct);
-        try
-        {
-            if (config is null)
-            {
-                config = new global::Distribution.Models.DriverComplianceConfig
-                {
-                    EnforceLicenseExpiry = request.EnforceLicenseExpiry,
-                    EnforceMedicalClearance = request.EnforceMedicalClearance,
-                    UpdatedBy = updatedBy,
-                    UpdatedAt = DateTime.Now
-                };
-                await repo.AddAsync(config);
-            }
-            else
-            {
-                config.EnforceLicenseExpiry = request.EnforceLicenseExpiry;
-                config.EnforceMedicalClearance = request.EnforceMedicalClearance;
-                config.UpdatedBy = updatedBy;
-                config.UpdatedAt = DateTime.Now;
-                repo.Update(config);
-            }
-
-            await uow.CommitAsync(ct);
-        }
-        catch
-        {
-            await uow.RollbackAsync(ct);
-            throw;
-        }
-
-        return new DriverComplianceConfigResponse(
-            config.Id,
-            config.EnforceLicenseExpiry,
-            config.EnforceMedicalClearance,
-            config.UpdatedAt,
-            config.UpdatedBy);
-    }
-}
@@ -1,8 +0,0 @@
-namespace Distribution.Features.DriverComplianceConfig;
-
-public interface IDriverComplianceConfigRepository
-{
-    Task<Models.DriverComplianceConfig?> GetAsync();
-    Task AddAsync(Models.DriverComplianceConfig config);
-    void Update(Models.DriverComplianceConfig config);
-}
@@ -1,6 +1,4 @@
-using Distribution.Features.DriverComplianceConfig;
 using Distribution.Infra.Authorization;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

 namespace Distribution.Features.DriverProfile;
@@ -9,11 +7,9 @@ namespace Distribution.Features.DriverProfile;
 [Route("api/driver-profiles")]
 public class DriverProfileController(
    DriverProfileService service,
-    DriverComplianceConfigService complianceService,
    ICurrentUserService currentUser) : ControllerBase
 {
    [HttpGet]
-    [Authorize("driver.view")]
    public async Task<IActionResult> GetAll([FromQuery] int page = 1, [FromQuery] int pageSize = 20)
    {
        var result = await service.GetAllAsync(page, pageSize);
@@ -21,7 +17,6 @@ public class DriverProfileController(
    }

    [HttpGet("{id:guid}")]
-    [Authorize("driver.view")]
    public async Task<IActionResult> GetById(Guid id)
    {
        var result = await service.GetByIdAsync(id);
@@ -29,7 +24,6 @@ public class DriverProfileController(
    }

    [HttpPost]
-    [Authorize("driver.manage")]
    public async Task<IActionResult> Create(CreateDriverProfileRequest request, CancellationToken ct)
    {
        try
@@ -48,7 +42,6 @@ public class DriverProfileController(
    }

    [HttpPut("{id:guid}")]
-    [Authorize("driver.manage")]
    public async Task<IActionResult> Update(Guid id, UpdateDriverProfileRequest request, CancellationToken ct)
    {
        var result = await service.UpdateAsync(id, request, ct);
@@ -56,7 +49,6 @@ public class DriverProfileController(
    }

    [HttpDelete("{id:guid}")]
-    [Authorize("driver.manage")]
    public async Task<IActionResult> Deactivate(Guid id, CancellationToken ct)
    {
        var success = await service.DeactivateAsync(id, ct);
@@ -64,19 +56,17 @@ public class DriverProfileController(
    }

    [HttpGet("compliance")]
-    [Authorize("driver.view")]
    public async Task<IActionResult> GetCompliance()
    {
-        var result = await complianceService.GetAsync();
+        var result = await service.GetComplianceConfigAsync();
        return result is null ? NoContent() : Ok(result);
    }

    [HttpPut("compliance")]
-    [Authorize("driver.manage")]
    public async Task<IActionResult> UpsertCompliance(UpdateDriverComplianceConfigRequest request, CancellationToken ct)
    {
        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
-        var result = await complianceService.UpsertAsync(request, userId, ct);
+        var result = await service.UpsertComplianceConfigAsync(request, userId, ct);
        return Ok(result);
    }
 }
@@ -20,3 +20,14 @@ public record UpdateDriverProfileRequest(
    string LicenseNumber,
    DateTime LicenseExpiry,
    DateTime MedicalClearanceExpiry);
+
+public record DriverComplianceConfigResponse(
+    Guid Id,
+    bool EnforceLicenseExpiry,
+    bool EnforceMedicalClearance,
+    DateTime UpdatedAt,
+    Guid UpdatedBy);
+
+public record UpdateDriverComplianceConfigRequest(
+    bool EnforceLicenseExpiry,
+    bool EnforceMedicalClearance);
@@ -37,4 +37,13 @@ public class DriverProfileRepository(AppDBContext context) : IDriverProfileRepos
        profile.IsActive = false;
        context.DriverProfiles.Update(profile);
    }
+
+    public async Task<global::Distribution.Models.DriverComplianceConfig?> GetComplianceConfigAsync() =>
+        await context.DriverComplianceConfigs.FirstOrDefaultAsync();
+
+    public async Task AddComplianceConfigAsync(global::Distribution.Models.DriverComplianceConfig config) =>
+        await context.DriverComplianceConfigs.AddAsync(config);
+
+    public void UpdateComplianceConfig(global::Distribution.Models.DriverComplianceConfig config) =>
+        context.DriverComplianceConfigs.Update(config);
 }
@@ -98,6 +98,56 @@ public class DriverProfileService(IDriverProfileRepository repo, IUnitOfWork uow
        return true;
    }

+    public async Task<DriverComplianceConfigResponse?> GetComplianceConfigAsync()
+    {
+        var config = await repo.GetComplianceConfigAsync();
+        return config is null ? null
+            : new DriverComplianceConfigResponse(
+                config.Id, config.EnforceLicenseExpiry, config.EnforceMedicalClearance,
+                config.UpdatedAt, config.UpdatedBy);
+    }
+
+    public async Task<DriverComplianceConfigResponse> UpsertComplianceConfigAsync(
+        UpdateDriverComplianceConfigRequest request, Guid updatedBy, CancellationToken ct = default)
+    {
+        var config = await repo.GetComplianceConfigAsync();
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            if (config is null)
+            {
+                config = new global::Distribution.Models.DriverComplianceConfig
+                {
+                    EnforceLicenseExpiry = request.EnforceLicenseExpiry,
+                    EnforceMedicalClearance = request.EnforceMedicalClearance,
+                    UpdatedBy = updatedBy,
+                    UpdatedAt = DateTime.Now
+                };
+                await repo.AddComplianceConfigAsync(config);
+            }
+            else
+            {
+                config.EnforceLicenseExpiry = request.EnforceLicenseExpiry;
+                config.EnforceMedicalClearance = request.EnforceMedicalClearance;
+                config.UpdatedBy = updatedBy;
+                config.UpdatedAt = DateTime.Now;
+                repo.UpdateComplianceConfig(config);
+            }
+
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        return new DriverComplianceConfigResponse(
+            config.Id, config.EnforceLicenseExpiry, config.EnforceMedicalClearance,
+            config.UpdatedAt, config.UpdatedBy);
+    }
+
    private static DriverProfileResponse ToResponse(global::Distribution.Models.DriverProfile p) =>
        new(p.Id, p.FK_UserId, p.User?.FullName ?? string.Empty,
            p.LicenseNumber, p.LicenseExpiry, p.MedicalClearanceExpiry,
@@ -9,4 +9,8 @@ public interface IDriverProfileRepository
    Task AddAsync(global::Distribution.Models.DriverProfile profile);
    void Update(global::Distribution.Models.DriverProfile profile);
    void Deactivate(global::Distribution.Models.DriverProfile profile);
+
+    Task<global::Distribution.Models.DriverComplianceConfig?> GetComplianceConfigAsync();
+    Task AddComplianceConfigAsync(global::Distribution.Models.DriverComplianceConfig config);
+    void UpdateComplianceConfig(global::Distribution.Models.DriverComplianceConfig config);
 }
@@ -1,5 +1,4 @@
-using Distribution.Infra.Authorization;
-using Microsoft.AspNetCore.Authorization;
+using Distribution.Infra.Authorization;
 using Microsoft.AspNetCore.Mvc;

 namespace Distribution.Features.Grn;
@@ -8,7 +7,6 @@ namespace Distribution.Features.Grn;
 public class GrnController(GrnService service, ICurrentUserService currentUser) : ControllerBase
 {
    [HttpGet("api/goods-receipts")]
-    [Authorize("grn.view")]
    public async Task<IActionResult> GetAll(
        [FromQuery] Guid? purchaseOrderId,
        [FromQuery] int page = 1,
@@ -19,7 +17,6 @@ public class GrnController(GrnService service, ICurrentUserService currentUser)
    }

    [HttpGet("api/goods-receipts/{id:guid}")]
-    [Authorize("grn.view")]
    public async Task<IActionResult> GetById(Guid id)
    {
        var result = await service.GetByIdAsync(id);
@@ -27,52 +24,29 @@ public class GrnController(GrnService service, ICurrentUserService currentUser)
    }

    [HttpPost("api/goods-receipts")]
-    [Authorize("grn.manage")]
    public async Task<IActionResult> CreateFlat(CreateFlatGrnRequest request, CancellationToken ct)
    {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request.ReceivedByUserId;
-        if (userId is null) return BadRequest(new { error = "ReceivedByUserId is required while auth is unavailable" });
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
        try
        {
-            var inner = new CreateGrnRequest(request.WarehouseId, request.Items,
-                DiscountPercent: request.DiscountPercent, VatPercent: request.VatPercent, NbtPercent: request.NbtPercent);
-            var result = await service.CreateAsync(request.PurchaseOrderId, inner, userId.Value, ct);
-            return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
-        }
-        catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
-    }
-
-    /// <summary>Goods received without a purchase order.</summary>
-    [HttpPost("api/goods-receipts/direct")]
-    [Authorize("grn.manage")]
-    public async Task<IActionResult> CreateDirect(CreateDirectGrnRequest request, CancellationToken ct)
-    {
-        var userId = currentUser.UserId ?? request.ReceivedByUserId;
-        if (userId is null) return BadRequest(new { error = "ReceivedByUserId is required while auth is unavailable" });
-        try
-        {
-            var result = await service.CreateDirectAsync(request, userId.Value, ct);
+            var inner = new CreateGrnRequest(request.WarehouseId, request.Items);
+            var result = await service.CreateAsync(request.PurchaseOrderId, inner, userId, ct);
            return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
        }
        catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
    }

    [HttpGet("api/purchase-orders/{id:guid}/goods-receipts")]
-    [Authorize("grn.view")]
    public async Task<IActionResult> GetByPurchaseOrder(Guid id) =>
        Ok(await service.GetByPurchaseOrderIdAsync(id));

    [HttpPost("api/purchase-orders/{id:guid}/goods-receipts")]
-    [Authorize("grn.manage")]
    public async Task<IActionResult> Create(Guid id, CreateGrnRequest request, CancellationToken ct)
    {
-        var userId = currentUser.UserId ?? request.ReceivedByUserId;
-        if (userId is null) return BadRequest(new { error = "ReceivedByUserId is required while auth is unavailable" });
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
        try
        {
-            var result = await service.CreateAsync(id, request, userId.Value, ct);
+            var result = await service.CreateAsync(id, request, userId, ct);
            return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
        }
        catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
@@ -1,104 +1,26 @@
 namespace Distribution.Features.Grn;

-/// <summary>BatchNumber is null for an expiry-only lot (TracksExpiryDate without TracksBatches).</summary>
-public record GrnBatchLineRequest(string? BatchNumber, DateTime? ExpiryDate, int Quantity);
+public record GrnItemRequest(Guid PurchaseOrderItemId, int AcceptedQuantity, int RejectedQuantity);

-public record GrnItemRequest(
-    // Set for a PO-based receipt; null for a direct receipt (ItemId is used instead).
-    Guid? PurchaseOrderItemId,
-    int AcceptedQuantity,
-    int RejectedQuantity,
-    // Populated only when the item has TracksBatches and/or TracksExpiryDate set.
-    List<GrnBatchLineRequest>? Batches = null,
-    // Populated only when the item has TracksSerialNumbers set — must contain exactly AcceptedQuantity entries.
-    List<string>? SerialNumbers = null,
-    // Set for a direct receipt line (no purchase order).
-    Guid? ItemId = null,
-    // Cost per base-UOM unit. Null on a PO line falls back to the PO line's unit cost; null on a direct line is 0.
-    decimal? UnitCost = null,
-    // Null falls back to the GRN-wide percentage.
-    decimal? DiscountPercent = null,
-    decimal? VatPercent = null,
-    // Free-issue units: stocked but not costed. Serial/batch entries must cover accepted + free.
-    int FreeQuantity = 0,
-    // Ignored when NBT is disabled in configuration; null falls back to the GRN-wide percentage.
-    decimal? NbtPercent = null);
+public record CreateGrnRequest(Guid WarehouseId, List<GrnItemRequest> Items);

-public record CreateGrnRequest(
-    Guid WarehouseId,
-    List<GrnItemRequest> Items,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? ReceivedByUserId = null,
-    // GRN-wide defaults for lines that don't set their own.
-    decimal? DiscountPercent = null,
-    decimal? VatPercent = null,
-    decimal? NbtPercent = null);
-
-public record CreateFlatGrnRequest(
-    Guid PurchaseOrderId,
-    Guid WarehouseId,
-    List<GrnItemRequest> Items,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? ReceivedByUserId = null,
-    decimal? DiscountPercent = null,
-    decimal? VatPercent = null,
-    decimal? NbtPercent = null);
-
-/// <summary>A goods receipt with no purchase order. SupplierId is optional.</summary>
-public record CreateDirectGrnRequest(
-    Guid WarehouseId,
-    List<GrnItemRequest> Items,
-    Guid? SupplierId = null,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? ReceivedByUserId = null,
-    decimal? DiscountPercent = null,
-    decimal? VatPercent = null,
-    decimal? NbtPercent = null);
-
-public record GrnBatchLineResponse(string? BatchNumber, DateTime? ExpiryDate, int Quantity);
+public record CreateFlatGrnRequest(Guid PurchaseOrderId, Guid WarehouseId, List<GrnItemRequest> Items);

 public record GrnItemResponse(
    Guid Id,
-    Guid? PurchaseOrderItemId,
+    Guid PurchaseOrderItemId,
    Guid ItemId,
    string Sku,
    string ItemName,
    int AcceptedQuantity,
-    int RejectedQuantity,
-    List<GrnBatchLineResponse> Batches,
-    List<string> SerialNumbers,
-    decimal UnitCost,
-    decimal DiscountPercent,
-    decimal VatPercent,
-    // Accepted qty x unit cost, before discount.
-    decimal GrossAmount,
-    decimal DiscountAmount,
-    decimal VatAmount,
-    // Gross - discount + VAT.
-    decimal LineTotal,
-    int FreeQuantity,
-    decimal NbtPercent,
-    decimal NbtAmount);
+    int RejectedQuantity);

 public record GrnResponse(
    Guid Id,
-    Guid? PurchaseOrderId,
+    Guid PurchaseOrderId,
    Guid ReceivedByUserId,
    Guid WarehouseId,
    string WarehouseName,
-    Guid? SupplierId,
-    string? SupplierName,
    DateTime ReceivedAt,
    DateTime CreatedAt,
-    List<GrnItemResponse> Items,
-    decimal DiscountPercent,
-    decimal VatPercent,
-    // Sum of line gross amounts.
-    decimal SubTotal,
-    decimal DiscountAmount,
-    // SubTotal - DiscountAmount (the base NBT is charged on; VAT is charged on this plus NBT).
-    decimal TaxableAmount,
-    decimal VatAmount,
-    decimal TotalAmount,
-    decimal NbtPercent,
-    decimal NbtAmount);
+    List<GrnItemResponse> Items);
@@ -1,37 +0,0 @@
-namespace Distribution.Features.Grn;
-
-public record LineAmounts(decimal Gross, decimal Discount, decimal Nbt, decimal Vat, decimal Total);
-
-/// <summary>
-/// GRN costing. Per line: gross = accepted qty x unit cost; discount = gross x disc%;
-/// NBT = (gross - discount) x NBT%; VAT = (gross - discount + NBT) x VAT%;
-/// total = gross - discount + NBT + VAT. Rejected units are never costed.
-/// Each amount is rounded to 2 dp per line so the GRN totals equal the sum of what the lines show.
-/// </summary>
-public static class GrnPricing
-{
-    public static decimal Round(decimal value) => Math.Round(value, 2, MidpointRounding.AwayFromZero);
-
-    public static LineAmounts Line(
-        int acceptedQty, decimal unitCost, decimal discountPercent, decimal nbtPercent, decimal vatPercent)
-    {
-        var gross = Round(acceptedQty * unitCost);
-        var discount = Round(gross * discountPercent / 100m);
-        var net = gross - discount;
-        var nbt = Round(net * nbtPercent / 100m);
-        var vat = Round((net + nbt) * vatPercent / 100m);
-        return new LineAmounts(gross, discount, nbt, vat, net + nbt + vat);
-    }
-
-    public static void ValidatePercent(decimal value, string label)
-    {
-        if (value < 0 || value > 100)
-            throw new InvalidOperationException($"{label} must be between 0 and 100.");
-    }
-
-    public static void ValidateCost(decimal value, string label)
-    {
-        if (value < 0)
-            throw new InvalidOperationException($"{label} cannot be negative.");
-    }
-}
@@ -8,21 +8,13 @@ public class GrnRepository(AppDBContext context) : IGrnRepository
    public async Task<Models.GoodsReceipt?> GetByIdAsync(Guid id) =>
        await context.GoodsReceipts
            .Include(gr => gr.Warehouse)
-            .Include(gr => gr.Supplier)
-            .Include(gr => gr.Items).ThenInclude(i => i.Item)
-            .Include(gr => gr.Items).ThenInclude(i => i.PurchaseOrderItem).ThenInclude(poi => poi!.Item)
-            .Include(gr => gr.Items).ThenInclude(i => i.Batches).ThenInclude(b => b.ItemBatch)
-            .Include(gr => gr.Items).ThenInclude(i => i.Serials).ThenInclude(s => s.ItemSerialNumber)
+            .Include(gr => gr.Items).ThenInclude(i => i.PurchaseOrderItem).ThenInclude(poi => poi.Item)
            .FirstOrDefaultAsync(gr => gr.Id == id);

    public async Task<List<Models.GoodsReceipt>> GetAllAsync(Guid? purchaseOrderId, int page, int pageSize) =>
        await context.GoodsReceipts
            .Include(gr => gr.Warehouse)
-            .Include(gr => gr.Supplier)
-            .Include(gr => gr.Items).ThenInclude(i => i.Item)
-            .Include(gr => gr.Items).ThenInclude(i => i.PurchaseOrderItem).ThenInclude(poi => poi!.Item)
-            .Include(gr => gr.Items).ThenInclude(i => i.Batches).ThenInclude(b => b.ItemBatch)
-            .Include(gr => gr.Items).ThenInclude(i => i.Serials).ThenInclude(s => s.ItemSerialNumber)
+            .Include(gr => gr.Items).ThenInclude(i => i.PurchaseOrderItem).ThenInclude(poi => poi.Item)
            .Where(gr => gr.IsActive && (purchaseOrderId == null || gr.FK_PurchaseOrderId == purchaseOrderId))
            .OrderByDescending(gr => gr.ReceivedAt)
            .Skip((page - 1) * pageSize)
@@ -37,11 +29,7 @@ public class GrnRepository(AppDBContext context) : IGrnRepository
    public async Task<List<Models.GoodsReceipt>> GetByPurchaseOrderIdAsync(Guid purchaseOrderId) =>
        await context.GoodsReceipts
            .Include(gr => gr.Warehouse)
-            .Include(gr => gr.Supplier)
-            .Include(gr => gr.Items).ThenInclude(i => i.Item)
-            .Include(gr => gr.Items).ThenInclude(i => i.PurchaseOrderItem).ThenInclude(poi => poi!.Item)
-            .Include(gr => gr.Items).ThenInclude(i => i.Batches).ThenInclude(b => b.ItemBatch)
-            .Include(gr => gr.Items).ThenInclude(i => i.Serials).ThenInclude(s => s.ItemSerialNumber)
+            .Include(gr => gr.Items).ThenInclude(i => i.PurchaseOrderItem).ThenInclude(poi => poi.Item)
            .Where(gr => gr.FK_PurchaseOrderId == purchaseOrderId && gr.IsActive)
            .OrderByDescending(gr => gr.ReceivedAt)
            .ToListAsync();
@@ -55,8 +43,8 @@ public class GrnRepository(AppDBContext context) : IGrnRepository
    public async Task<Dictionary<Guid, int>> GetAcceptedTotalsByItemAsync(Guid purchaseOrderId) =>
        await context.GoodsReceiptItems
            .Include(i => i.PurchaseOrderItem)
-            .Where(i => i.PurchaseOrderItem!.FK_PurchaseOrderId == purchaseOrderId && i.IsActive)
-            .GroupBy(i => i.PurchaseOrderItem!.FK_ItemId)
+            .Where(i => i.PurchaseOrderItem.FK_PurchaseOrderId == purchaseOrderId && i.IsActive)
+            .GroupBy(i => i.PurchaseOrderItem.FK_ItemId)
            .Select(g => new { ItemId = g.Key, Total = g.Sum(i => i.AcceptedQuantity) })
            .ToDictionaryAsync(x => x.ItemId, x => x.Total);
 }
@@ -1,6 +1,5 @@
 using Distribution.Features.Po;
 using Distribution.Features.Stock;
-using Distribution.Features.SysConfig;
 using Distribution.Infra.UoW;
 using Distribution.Models;

@@ -10,88 +9,15 @@ public class GrnService(
    IGrnRepository repo,
    IPoRepository poRepo,
    IStockRepository stockRepo,
-    IUnitOfWork uow,
-    Distribution.Features.Item.IItemRepository itemRepo,
-    Distribution.Features.Supplier.ISupplierRepository supplierRepo,
-    Distribution.Features.SysConfig.SysConfigService sysConfig)
+    IUnitOfWork uow)
 {
-    private static GrnItemResponse MapItem(Models.GoodsReceiptItem i)
-    {
-        // Direct-receipt lines carry the item themselves; PO lines resolve it through the PO line.
-        var item = i.Item ?? i.PurchaseOrderItem!.Item;
-        var a = GrnPricing.Line(i.AcceptedQuantity, i.UnitCost, i.DiscountPercent, i.NbtPercent, i.VatPercent);
-        return new(i.Id, i.FK_PurchaseOrderItemId, item.Id, item.Sku, item.Name,
-            i.AcceptedQuantity, i.RejectedQuantity,
-            i.Batches.Select(b => new GrnBatchLineResponse(b.ItemBatch.BatchNumber, b.ItemBatch.ExpiryDate, b.Quantity)).ToList(),
-            i.Serials.Select(s => s.ItemSerialNumber.SerialNumber).ToList(),
-            i.UnitCost, i.DiscountPercent, i.VatPercent, a.Gross, a.Discount, a.Vat, a.Total, i.FreeQuantity,
-            i.NbtPercent, a.Nbt);
-    }
+    private static GrnItemResponse MapItem(Models.GoodsReceiptItem i) =>
+        new(i.Id, i.FK_PurchaseOrderItemId, i.PurchaseOrderItem.FK_ItemId, i.PurchaseOrderItem.Item.Sku,
+            i.PurchaseOrderItem.Item.Name, i.AcceptedQuantity, i.RejectedQuantity);

-    /// <summary>Units that actually enter stock: accepted plus free-issue. Serial/batch entries must cover this.</summary>
-    private static int StockQty(GrnItemRequest line) => line.AcceptedQuantity + line.FreeQuantity;
-
-    private static GrnResponse Map(Models.GoodsReceipt gr)
-    {
-        var items = gr.Items.Where(i => i.IsActive).Select(MapItem).ToList();
-        var subTotal = items.Sum(i => i.GrossAmount);
-        var discount = items.Sum(i => i.DiscountAmount);
-        var vat = items.Sum(i => i.VatAmount);
-        var nbt = items.Sum(i => i.NbtAmount);
-        return new(gr.Id, gr.FK_PurchaseOrderId, gr.FK_ReceivedByUserId, gr.FK_WarehouseId, gr.Warehouse?.Name ?? string.Empty,
-            gr.FK_SupplierId, gr.Supplier?.Name,
-            gr.ReceivedAt, gr.CreatedAt, items,
-            gr.DiscountPercent, gr.VatPercent,
-            subTotal, discount, subTotal - discount, vat, subTotal - discount + nbt + vat,
-            gr.NbtPercent, nbt);
-    }
-
-    /// <summary>The percentages a receipt is saved with, after the configured tax rules were applied.</summary>
-    private record GrnHeader(decimal Discount, decimal Vat, decimal Nbt, decimal? RequestedVat, decimal? RequestedNbt);
-
-    /// <summary>
-    /// Validates and resolves the GRN-wide percentages that lines fall back to. A disabled tax is
-    /// forced to 0 whatever the client sent.
-    /// </summary>
-    private static GrnHeader ResolveHeader(GrnTaxSettings tax, decimal? discountPercent, decimal? vatPercent, decimal? nbtPercent)
-    {
-        var discount = discountPercent ?? 0m;
-        var vat = tax.VatMode == TaxMode.Disabled ? 0m : vatPercent ?? 0m;
-        var nbt = tax.NbtMode == TaxMode.Disabled ? 0m : nbtPercent ?? 0m;
-        GrnPricing.ValidatePercent(discount, "GRN discount %");
-        GrnPricing.ValidatePercent(vat, "GRN VAT %");
-        GrnPricing.ValidatePercent(nbt, "GRN NBT %");
-        return new GrnHeader(discount, vat, nbt, vatPercent, nbtPercent);
-    }
-
-    /// <summary>
-    /// A line's rate for one tax: 0 when the tax is disabled; otherwise the line's own value, else the
-    /// GRN-wide one. A Mandatory tax must be supplied somewhere; an Optional one defaults to 0.
-    /// </summary>
-    private static decimal ResolveTax(TaxMode mode, decimal? headerValue, decimal? lineValue, string label)
-    {
-        if (mode == TaxMode.Disabled) return 0m;
-        var value = lineValue ?? headerValue;
-        if (value is null)
-        {
-            if (mode == TaxMode.Mandatory) throw new InvalidOperationException($"{label} is mandatory.");
-            return 0m;
-        }
-        GrnPricing.ValidatePercent(value.Value, label);
-        return value.Value;
-    }
-
-    /// <summary>Copies a line's resolved cost, discount %, NBT % and VAT % onto the entity after validating them.</summary>
-    private static void ApplyPricing(Models.GoodsReceiptItem entity, GrnItemRequest line, decimal fallbackUnitCost,
-        GrnHeader header, GrnTaxSettings tax, string sku)
-    {
-        entity.UnitCost = line.UnitCost ?? fallbackUnitCost;
-        entity.DiscountPercent = line.DiscountPercent ?? header.Discount;
-        entity.VatPercent = ResolveTax(tax.VatMode, header.RequestedVat, line.VatPercent, $"VAT % for item {sku}");
-        entity.NbtPercent = ResolveTax(tax.NbtMode, header.RequestedNbt, line.NbtPercent, $"NBT % for item {sku}");
-        GrnPricing.ValidateCost(entity.UnitCost, $"Unit cost for item {sku}");
-        GrnPricing.ValidatePercent(entity.DiscountPercent, $"Discount % for item {sku}");
-    }
+    private static GrnResponse Map(Models.GoodsReceipt gr) =>
+        new(gr.Id, gr.FK_PurchaseOrderId, gr.FK_ReceivedByUserId, gr.FK_WarehouseId, gr.Warehouse?.Name ?? string.Empty,
+            gr.ReceivedAt, gr.CreatedAt, gr.Items.Where(i => i.IsActive).Select(MapItem).ToList());

    public async Task<PagedResponse<GrnResponse>> GetAllAsync(Guid? purchaseOrderId, int page, int pageSize)
    {
@@ -110,61 +36,10 @@ public class GrnService(
    public async Task<List<GrnResponse>> GetByPurchaseOrderIdAsync(Guid purchaseOrderId) =>
        (await repo.GetByPurchaseOrderIdAsync(purchaseOrderId)).Select(Map).ToList();

-    /// <summary>
-    /// Validates that a GRN line's batch/serial payload matches the item's tracking flags. When an
-    /// item tracks both serial numbers and batches/expiry, serial tracking takes precedence for
-    /// stock-ledger granularity in this phase — batch/expiry metadata for that combination is not
-    /// yet linked into the ledger (follow-up work).
-    /// </summary>
-    private static void ValidateLineShape(Models.Item item, GrnItemRequest line)
-    {
-        if (item.TracksSerialNumbers)
-        {
-            if (StockQty(line) > 0 && (line.SerialNumbers is null || line.SerialNumbers.Count != StockQty(line)))
-                throw new InvalidOperationException(
-                    $"Item {item.Sku} tracks serial numbers — expected {StockQty(line)} serial number(s).");
-
-            if (line.SerialNumbers is { Count: > 0 } && line.SerialNumbers.Distinct().Count() != line.SerialNumbers.Count)
-                throw new InvalidOperationException($"Duplicate serial numbers supplied for item {item.Sku}.");
-        }
-        else if (line.SerialNumbers is { Count: > 0 })
-        {
-            throw new InvalidOperationException($"Item {item.Sku} does not track serial numbers.");
-        }
-        else if (item.TracksBatches || item.TracksExpiryDate)
-        {
-            if (StockQty(line) > 0)
-            {
-                if (line.Batches is null || line.Batches.Count == 0)
-                    throw new InvalidOperationException($"Item {item.Sku} requires batch/expiry information.");
-                if (line.Batches.Sum(b => b.Quantity) != StockQty(line))
-                    throw new InvalidOperationException($"Batch quantities for item {item.Sku} must sum to the accepted quantity.");
-            }
-
-            foreach (var b in line.Batches ?? [])
-            {
-                if (b.Quantity <= 0)
-                    throw new InvalidOperationException($"Batch quantity for item {item.Sku} must be positive.");
-                if (item.TracksBatches && string.IsNullOrWhiteSpace(b.BatchNumber))
-                    throw new InvalidOperationException($"Item {item.Sku} requires a batch number.");
-                if (!item.TracksBatches && !string.IsNullOrWhiteSpace(b.BatchNumber))
-                    throw new InvalidOperationException($"Item {item.Sku} does not track batch numbers.");
-                if (item.TracksExpiryDate && b.ExpiryDate is null)
-                    throw new InvalidOperationException($"Item {item.Sku} requires an expiry date.");
-            }
-        }
-        else if (line.Batches is { Count: > 0 })
-        {
-            throw new InvalidOperationException($"Item {item.Sku} does not track batches or expiry dates.");
-        }
-    }
-
    /// <summary>
    /// Validates the Po status, increments PurchaseOrderItem.ReceivedQuantity, writes StockBalance/
-    /// StockMovement for AcceptedQuantity + FreeQuantity (RejectedQuantity never touches stock; free
-    /// units don't count against the PO's ordered quantity), creates
-    /// ItemBatch/ItemSerialNumber records for tracked items, and transitions the Po to
-    /// PartiallyReceived/Received. All in one unit of work.
+    /// StockMovement for AcceptedQuantity only (RejectedQuantity never touches stock), and
+    /// transitions the Po to PartiallyReceived/Received. All in one unit of work.
    /// </summary>
    public async Task<GrnResponse> CreateAsync(Guid purchaseOrderId, CreateGrnRequest request, Guid receivedByUserId, CancellationToken ct = default)
    {
@@ -181,63 +56,37 @@ public class GrnService(
        if (request.Items is null || request.Items.Count == 0)
            throw new InvalidOperationException("A goods receipt must have at least one line item.");

-        var tax = await sysConfig.GetGrnTaxSettingsAsync();
-        var header = ResolveHeader(tax, request.DiscountPercent, request.VatPercent, request.NbtPercent);
-
        var goodsReceipt = new Models.GoodsReceipt
        {
            FK_PurchaseOrderId = po.Id,
            FK_ReceivedByUserId = receivedByUserId,
            FK_WarehouseId = request.WarehouseId,
-            ReceivedAt = DateTime.Now,
-            DiscountPercent = header.Discount,
-            VatPercent = header.Vat,
-            NbtPercent = header.Nbt
+            ReceivedAt = DateTime.Now
        };

-        var grLines = new List<(Models.GoodsReceiptItem Entity, GrnItemRequest Line, Models.Item Item)>();
-
        foreach (var line in request.Items)
        {
-            if (line.PurchaseOrderItemId is null)
-                throw new InvalidOperationException("Each line of a PO receipt needs a PurchaseOrderItemId.");
-
            var poItem = po.Items.FirstOrDefault(i => i.Id == line.PurchaseOrderItemId && i.IsActive)
                ?? throw new InvalidOperationException($"Purchase order line {line.PurchaseOrderItemId} not found on this Po.");

            if (poItem.IsCancelled)
                throw new InvalidOperationException($"Line for item {poItem.FK_ItemId} is cancelled and cannot receive stock.");

-            if (line.AcceptedQuantity < 0 || line.RejectedQuantity < 0 || line.FreeQuantity < 0)
+            if (line.AcceptedQuantity < 0 || line.RejectedQuantity < 0)
                throw new InvalidOperationException("Accepted/rejected quantities cannot be negative.");

            if (line.AcceptedQuantity + line.RejectedQuantity + poItem.ReceivedQuantity > poItem.Quantity)
                throw new InvalidOperationException(
                    $"Accepted + rejected quantity for item {poItem.FK_ItemId} would exceed the ordered quantity.");

-            ValidateLineShape(poItem.Item, line);
-
-            if (poItem.Item.TracksSerialNumbers && line.SerialNumbers is { Count: > 0 })
-            {
-                foreach (var serialNumber in line.SerialNumbers)
-                {
-                    if (await stockRepo.SerialNumberExistsAsync(poItem.FK_ItemId, serialNumber))
-                        throw new InvalidOperationException($"Serial number '{serialNumber}' already exists for item {poItem.Item.Sku}.");
-                }
-            }
-
            poItem.ReceivedQuantity += line.AcceptedQuantity;

-            var entity = new Models.GoodsReceiptItem
+            goodsReceipt.Items.Add(new Models.GoodsReceiptItem
            {
                FK_PurchaseOrderItemId = poItem.Id,
                AcceptedQuantity = line.AcceptedQuantity,
-                FreeQuantity = line.FreeQuantity,
                RejectedQuantity = line.RejectedQuantity
-            };
-            ApplyPricing(entity, line, poItem.UnitCost, header, tax, poItem.Item.Sku);
-            goodsReceipt.Items.Add(entity);
-            grLines.Add((entity, line, poItem.Item));
+            });
        }

        var activeLines = po.Items.Where(i => i.IsActive && !i.IsCancelled).ToList();
@@ -245,238 +94,46 @@ public class GrnService(
            ? PurchaseOrderStatus.Received
            : PurchaseOrderStatus.PartiallyReceived;

-        return await PostReceiptAsync(goodsReceipt, grLines, request.WarehouseId, receivedByUserId, po, ct);
-    }
-    /// <summary>
-    /// A receipt with no purchase order: lines name the item directly. Stock, serial and batch
-    /// handling is identical to a PO receipt; there is no PO quantity or status to update.
-    /// </summary>
-    public async Task<GrnResponse> CreateDirectAsync(CreateDirectGrnRequest request, Guid receivedByUserId, CancellationToken ct = default)
-    {
-        if (request.Items is null || request.Items.Count == 0)
-            throw new InvalidOperationException("A goods receipt must have at least one line item.");
-
-        if (request.SupplierId is not null && await supplierRepo.GetByIdAsync(request.SupplierId.Value) is not { IsActive: true })
-            throw new InvalidOperationException("Supplier not found.");
-
-        var tax = await sysConfig.GetGrnTaxSettingsAsync();
-        var header = ResolveHeader(tax, request.DiscountPercent, request.VatPercent, request.NbtPercent);
-
-        var goodsReceipt = new Models.GoodsReceipt
-        {
-            FK_PurchaseOrderId = null,
-            FK_SupplierId = request.SupplierId,
-            FK_ReceivedByUserId = receivedByUserId,
-            FK_WarehouseId = request.WarehouseId,
-            ReceivedAt = DateTime.Now,
-            DiscountPercent = header.Discount,
-            VatPercent = header.Vat,
-            NbtPercent = header.Nbt
-        };
-
-        var grLines = new List<(Models.GoodsReceiptItem Entity, GrnItemRequest Line, Models.Item Item)>();
-        var serialsInRequest = new HashSet<(Guid ItemId, string Serial)>();
-
-        foreach (var line in request.Items)
-        {
-            if (line.ItemId is null)
-                throw new InvalidOperationException("Each line of a direct receipt needs an ItemId.");
-
-            var item = await itemRepo.GetByIdAsync(line.ItemId.Value);
-            if (item is null || !item.IsActive)
-                throw new InvalidOperationException($"Item {line.ItemId} not found.");
-
-            if (line.AcceptedQuantity < 0 || line.RejectedQuantity < 0 || line.FreeQuantity < 0)
-                throw new InvalidOperationException("Accepted/rejected quantities cannot be negative.");
-
-            if (line.AcceptedQuantity + line.RejectedQuantity + line.FreeQuantity == 0)
-                throw new InvalidOperationException($"Line for item {item.Sku} has no quantity.");
-
-            ValidateLineShape(item, line);
-
-            if (item.TracksSerialNumbers && line.SerialNumbers is { Count: > 0 })
-            {
-                foreach (var serialNumber in line.SerialNumbers)
-                {
-                    if (!serialsInRequest.Add((item.Id, serialNumber)))
-                        throw new InvalidOperationException($"Serial number '{serialNumber}' appears on more than one line for item {item.Sku}.");
-                    if (await stockRepo.SerialNumberExistsAsync(item.Id, serialNumber))
-                        throw new InvalidOperationException($"Serial number '{serialNumber}' already exists for item {item.Sku}.");
-                }
-            }
-
-            var entity = new Models.GoodsReceiptItem
-            {
-                FK_ItemId = item.Id,
-                FreeQuantity = line.FreeQuantity,
-                AcceptedQuantity = line.AcceptedQuantity,
-                RejectedQuantity = line.RejectedQuantity
-            };
-            ApplyPricing(entity, line, 0m, header, tax, item.Sku);
-            goodsReceipt.Items.Add(entity);
-            grLines.Add((entity, line, item));
-        }
-
-        return await PostReceiptAsync(goodsReceipt, grLines, request.WarehouseId, receivedByUserId, null, ct);
-    }
-
-    /// <summary>
-    /// Writes the receipt, its serials/batches, the stock balances and movements, and (for a PO
-    /// receipt) the PO update in one unit of work. Shared by PO-based and direct receipts.
-    /// </summary>
-    private async Task<GrnResponse> PostReceiptAsync(
-        Models.GoodsReceipt goodsReceipt,
-        List<(Models.GoodsReceiptItem Entity, GrnItemRequest Line, Models.Item Item)> grLines,
-        Guid warehouseId,
-        Guid receivedByUserId,
-        Models.PurchaseOrder? po,
-        CancellationToken ct)
-    {
        await uow.BeginAsync(ct);
        try
        {
            await repo.AddAsync(goodsReceipt);

-            foreach (var (entity, line, item) in grLines.Where(x => StockQty(x.Line) > 0))
+            foreach (var line in goodsReceipt.Items.Where(i => i.AcceptedQuantity > 0))
            {
-                if (item.TracksSerialNumbers)
+                var poItem = po.Items.First(i => i.Id == line.FK_PurchaseOrderItemId);
+
+                var balance = await stockRepo.GetBalanceAsync(poItem.FK_ItemId, request.WarehouseId);
+                if (balance is null)
                {
-                    foreach (var serialNumber in line.SerialNumbers!)
+                    await stockRepo.AddBalanceAsync(new StockBalance
                    {
-                        var serial = new ItemSerialNumber
-                        {
-                            FK_ItemId = item.Id,
-                            SerialNumber = serialNumber,
-                            Status = SerialStatus.InStock,
-                            CurrentLocationId = warehouseId,
-                            CurrentLocationType = LocationType.Warehouse,
-                            ReceivedAt = goodsReceipt.ReceivedAt
-                        };
-
-                        // Warranty is a customer-facing promise: the clock starts when the serial is sold,
-                        // not at receipt. Only snapshot the item's custom period here; WarrantyExpiresAt
-                        // stays null until the sale/delivery flow sets it.
-                        if (item.HasWarranty && item.AllowCustomWarrantyPeriod)
-                            serial.WarrantyPeriodDaysOverride = item.WarrantyPeriodDays;
-
-                        await stockRepo.AddItemSerialNumberAsync(serial);
-                        entity.Serials.Add(new GoodsReceiptItemSerial { FK_GoodsReceiptItemId = entity.Id, ItemSerialNumber = serial });
-
-                        await stockRepo.AddBalanceAsync(new StockBalance
-                        {
-                            FK_ItemId = item.Id,
-                            LocationId = warehouseId,
-                            LocationType = LocationType.Warehouse,
-                            FK_ItemSerialNumberId = serial.Id,
-                            Quantity = 1
-                        });
-
-                        await stockRepo.AddMovementAsync(new StockMovement
-                        {
-                            FK_ItemId = item.Id,
-                            FromLocationId = StockService.ExternalLocationId,
-                            FromLocationType = LocationType.External,
-                            ToLocationId = warehouseId,
-                            ToLocationType = LocationType.Warehouse,
-                            FK_ItemSerialNumberId = serial.Id,
-                            Quantity = 1,
-                            Type = MovementType.PurchaseReceipt,
-                            ReferenceId = goodsReceipt.Id,
-                            CreatedBy = receivedByUserId
-                        });
-                    }
-                }
-                else if (item.TracksBatches || item.TracksExpiryDate)
-                {
-                    foreach (var b in line.Batches!)
-                    {
-                        var batch = !string.IsNullOrWhiteSpace(b.BatchNumber)
-                            ? await stockRepo.FindBatchAsync(item.Id, b.BatchNumber)
-                            : null;
-
-                        if (batch is null)
-                        {
-                            batch = new ItemBatch
-                            {
-                                FK_ItemId = item.Id,
-                                BatchNumber = b.BatchNumber,
-                                ExpiryDate = b.ExpiryDate
-                            };
-                            await stockRepo.AddItemBatchAsync(batch);
-                        }
-
-                        entity.Batches.Add(new GoodsReceiptItemBatch { FK_GoodsReceiptItemId = entity.Id, ItemBatch = batch, Quantity = b.Quantity });
-
-                        var balance = await stockRepo.GetBalanceAsync(item.Id, warehouseId, batch.Id, null);
-                        if (balance is null)
-                        {
-                            await stockRepo.AddBalanceAsync(new StockBalance
-                            {
-                                FK_ItemId = item.Id,
-                                LocationId = warehouseId,
-                                LocationType = LocationType.Warehouse,
-                                FK_ItemBatchId = batch.Id,
-                                Quantity = b.Quantity
-                            });
-                        }
-                        else
-                        {
-                            balance.Quantity += b.Quantity;
-                            balance.UpdatedAt = DateTime.Now;
-                            stockRepo.UpdateBalance(balance);
-                        }
-
-                        await stockRepo.AddMovementAsync(new StockMovement
-                        {
-                            FK_ItemId = item.Id,
-                            FromLocationId = StockService.ExternalLocationId,
-                            FromLocationType = LocationType.External,
-                            ToLocationId = warehouseId,
-                            ToLocationType = LocationType.Warehouse,
-                            FK_ItemBatchId = batch.Id,
-                            Quantity = b.Quantity,
-                            Type = MovementType.PurchaseReceipt,
-                            ReferenceId = goodsReceipt.Id,
-                            CreatedBy = receivedByUserId
-                        });
-                    }
+                        FK_ItemId = poItem.FK_ItemId,
+                        LocationId = request.WarehouseId,
+                        LocationType = LocationType.Warehouse,
+                        Quantity = line.AcceptedQuantity
+                    });
                }
                else
                {
-                    var balance = await stockRepo.GetBalanceAsync(item.Id, warehouseId);
-                    if (balance is null)
-                    {
-                        await stockRepo.AddBalanceAsync(new StockBalance
-                        {
-                            FK_ItemId = item.Id,
-                            LocationId = warehouseId,
-                            LocationType = LocationType.Warehouse,
-                            Quantity = StockQty(line)
-                        });
-                    }
-                    else
-                    {
-                        balance.Quantity += StockQty(line);
-                        balance.UpdatedAt = DateTime.Now;
-                        stockRepo.UpdateBalance(balance);
-                    }
-
-                    await stockRepo.AddMovementAsync(new StockMovement
-                    {
-                        FK_ItemId = item.Id,
-                        FromLocationId = StockService.ExternalLocationId,
-                        FromLocationType = LocationType.External,
-                        ToLocationId = warehouseId,
-                        ToLocationType = LocationType.Warehouse,
-                        Quantity = StockQty(line),
-                        Type = MovementType.PurchaseReceipt,
-                        ReferenceId = goodsReceipt.Id,
-                        CreatedBy = receivedByUserId
-                    });
+                    balance.Quantity += line.AcceptedQuantity;
+                    balance.UpdatedAt = DateTime.Now;
+                    stockRepo.UpdateBalance(balance);
                }
+
+                await stockRepo.AddMovementAsync(new StockMovement
+                {
+                    FK_ItemId = poItem.FK_ItemId,
+                    ToLocationId = request.WarehouseId,
+                    ToLocationType = LocationType.Warehouse,
+                    Quantity = line.AcceptedQuantity,
+                    Type = MovementType.PurchaseReceipt,
+                    ReferenceId = goodsReceipt.Id,
+                    CreatedBy = receivedByUserId
+                });
            }

-            if (po is not null) poRepo.Update(po);
+            poRepo.Update(po);
            await uow.CommitAsync(ct);
        }
        catch { await uow.RollbackAsync(ct); throw; }
@@ -1,14 +0,0 @@
-using Distribution.Models;
-
-namespace Distribution.Features.Invoice;
-
-public interface IInvoiceRepository
-{
-    Task<Models.Invoice?> GetByIdAsync(Guid id);
-    Task<Models.Invoice?> GetByShopPOIdAsync(Guid shopPOId);
-    Task<List<Models.Invoice>> GetAllAsync(Guid? agentId, Guid? routeId, Guid? shopId, InvoiceStatus? status, PaymentStatus? paymentStatus, int page, int pageSize);
-    Task<int> GetCountAsync(Guid? agentId, Guid? routeId, Guid? shopId, InvoiceStatus? status, PaymentStatus? paymentStatus);
-    Task<List<Models.Invoice>> GetOutstandingAsync();
-    Task AddAsync(Models.Invoice invoice);
-    void Update(Models.Invoice invoice);
-}
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Distribution.Infra.Authorization;
-using Distribution.Models;
-
-namespace Distribution.Features.Invoice;
-
-[ApiController]
-[Route("api/invoices")]
-public class InvoiceController(InvoiceService service, ICurrentUserService currentUser) : ControllerBase
-{
-    [HttpGet]
-    public async Task<IActionResult> GetAll(
-        [FromQuery] Guid? agentId,
-        [FromQuery] Guid? routeId,
-        [FromQuery] Guid? shopId,
-        [FromQuery] InvoiceStatus? status,
-        [FromQuery] PaymentStatus? paymentStatus,
-        [FromQuery] int page = 1,
-        [FromQuery] int pageSize = 20)
-    {
-        var result = await service.GetAllAsync(agentId, routeId, shopId, status, paymentStatus, page, pageSize);
-        return Ok(result);
-    }
-
-    [HttpGet("outstanding-summary")]
-    public async Task<IActionResult> GetOutstandingSummary()
-    {
-        var result = await service.GetOutstandingSummaryAsync();
-        return Ok(result);
-    }
-
-    [HttpGet("{id:guid}")]
-    public async Task<IActionResult> GetById(Guid id)
-    {
-        var result = await service.GetByIdAsync(id);
-        return result is null ? NotFound() : Ok(result);
-    }
-
-    [HttpPost("{id:guid}/print")]
-    public async Task<IActionResult> Print(Guid id, [FromBody] PrintInvoiceRequest? request, CancellationToken ct)
-    {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request?.PrintedByUserId;
-        if (userId is null) return BadRequest(new { error = "PrintedByUserId is required while auth is unavailable" });
-        try
-        {
-            var result = await service.PrintAsync(id, userId.Value, ct);
-            return Ok(result);
-        }
-        catch (KeyNotFoundException) { return NotFound(); }
-        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
-    }
-
-    [HttpPost("{id:guid}/finalize")]
-    public async Task<IActionResult> Finalize(Guid id, [FromBody] FinalizeInvoiceRequest? request, CancellationToken ct)
-    {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request?.FinalizedByUserId;
-        if (userId is null) return BadRequest(new { error = "FinalizedByUserId is required while auth is unavailable" });
-        try
-        {
-            var result = await service.FinalizeAsync(id, request ?? new FinalizeInvoiceRequest(), userId.Value, ct);
-            return Ok(result);
-        }
-        catch (KeyNotFoundException) { return NotFound(); }
-        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
-    }
-}
@@ -1,25 +0,0 @@
-using Distribution.Models;
-
-namespace Distribution.Features.Invoice;
-
-public record CreateInvoiceRequest(Guid ShopPOId);
-public record InvoiceItemAdjustment(Guid ShopPOItemId, int AdjustedQuantity, string? Note = null);
-public record FinalizeInvoiceRequest(List<InvoiceItemAdjustment>? Adjustments = null, Guid? FinalizedByUserId = null);
-public record PrintInvoiceRequest(Guid? PrintedByUserId = null);
-
-public record InvoiceResponse(
-    Guid Id,
-    Guid ShopPOId,
-    string StoreName,
-    InvoiceStatus Status,
-    PaymentStatus PaymentStatus,
-    Guid CreatedBy,
-    DateTime? PrintedAt,
-    Guid? PrintedBy,
-    DateTime? FinalizedAt,
-    Guid? FinalizedBy,
-    decimal TotalAmount,
-    bool IsActive,
-    DateTime CreatedAt);
-
-public record OutstandingPaymentsResponse(int InvoiceCount, decimal OutstandingAmount);
@@ -1,56 +0,0 @@
-using Distribution.Data;
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Features.Invoice;
-
-public class InvoiceRepository(AppDBContext context) : IInvoiceRepository
-{
-    public async Task<Models.Invoice?> GetByIdAsync(Guid id) =>
-        await context.Invoices
-            .Include(i => i.ShopPO).ThenInclude(p => p.Store)
-            .Include(i => i.ShopPO).ThenInclude(p => p.Items.Where(x => x.IsActive))
-            .Include(i => i.Payments.Where(p => p.IsActive))
-            .FirstOrDefaultAsync(i => i.Id == id && i.IsActive);
-
-    public async Task<Models.Invoice?> GetByShopPOIdAsync(Guid shopPOId) =>
-        await context.Invoices
-            .Include(i => i.ShopPO)
-            .FirstOrDefaultAsync(i => i.FK_ShopPOId == shopPOId && i.IsActive);
-
-    public async Task<List<Models.Invoice>> GetAllAsync(Guid? agentId, Guid? routeId, Guid? shopId, InvoiceStatus? status, PaymentStatus? paymentStatus, int page, int pageSize) =>
-        await context.Invoices
-            .Include(i => i.ShopPO).ThenInclude(p => p.Store)
-            .Where(i => i.IsActive
-                && (agentId == null || i.ShopPO.RaisedById == agentId)
-                && (routeId == null || i.ShopPO.Store.FK_RouteId == routeId)
-                && (shopId == null || i.ShopPO.FK_StoreId == shopId)
-                && (status == null || i.Status == status)
-                && (paymentStatus == null || i.PaymentStatus == paymentStatus))
-            .OrderByDescending(i => i.CreatedAt)
-            .Skip((page - 1) * pageSize)
-            .Take(pageSize)
-            .ToListAsync();
-
-    public async Task<int> GetCountAsync(Guid? agentId, Guid? routeId, Guid? shopId, InvoiceStatus? status, PaymentStatus? paymentStatus) =>
-        await context.Invoices
-            .Include(i => i.ShopPO).ThenInclude(p => p.Store)
-            .CountAsync(i => i.IsActive
-                && (agentId == null || i.ShopPO.RaisedById == agentId)
-                && (routeId == null || i.ShopPO.Store.FK_RouteId == routeId)
-                && (shopId == null || i.ShopPO.FK_StoreId == shopId)
-                && (status == null || i.Status == status)
-                && (paymentStatus == null || i.PaymentStatus == paymentStatus));
-
-    public async Task<List<Models.Invoice>> GetOutstandingAsync() =>
-        await context.Invoices
-            .Include(i => i.Payments.Where(p => p.IsActive))
-            .Where(i => i.IsActive && i.PaymentStatus != PaymentStatus.Paid)
-            .ToListAsync();
-
-    public async Task AddAsync(Models.Invoice invoice) =>
-        await context.Invoices.AddAsync(invoice);
-
-    public void Update(Models.Invoice invoice) =>
-        context.Invoices.Update(invoice);
-}
@@ -1,98 +0,0 @@
-using Distribution.Features.Stock;
-using Distribution.Infra.Authorization;
-using Distribution.Infra.UoW;
-using Distribution.Models;
-
-namespace Distribution.Features.Invoice;
-
-public class InvoiceService(
-    IInvoiceRepository repo,
-    IUnitOfWork uow,
-    ICurrentUserService currentUser)
-{
-    private static InvoiceResponse ToResponse(Models.Invoice i) =>
-        new(i.Id, i.FK_ShopPOId,
-            i.ShopPO?.Store?.StoreName ?? string.Empty,
-            i.Status, i.PaymentStatus, i.CreatedBy,
-            i.PrintedAt, i.PrintedBy,
-            i.FinalizedAt, i.FinalizedBy,
-            i.TotalAmount, i.IsActive, i.CreatedAt);
-
-    public async Task<InvoiceResponse?> GetByIdAsync(Guid id)
-    {
-        var invoice = await repo.GetByIdAsync(id);
-        return invoice is null ? null : ToResponse(invoice);
-    }
-
-    public async Task<PagedResponse<InvoiceResponse>> GetAllAsync(Guid? agentId, Guid? routeId, Guid? shopId, InvoiceStatus? status, PaymentStatus? paymentStatus, int page, int pageSize)
-    {
-        var total = await repo.GetCountAsync(agentId, routeId, shopId, status, paymentStatus);
-        var items = await repo.GetAllAsync(agentId, routeId, shopId, status, paymentStatus, page, pageSize);
-        return new PagedResponse<InvoiceResponse>(page, pageSize, total, items.Select(ToResponse).ToList());
-    }
-
-    public async Task<OutstandingPaymentsResponse> GetOutstandingSummaryAsync()
-    {
-        var invoices = await repo.GetOutstandingAsync();
-        var count = invoices.Count;
-        var outstanding = invoices.Sum(i => i.TotalAmount - i.Payments.Sum(p => p.Amount));
-        return new OutstandingPaymentsResponse(count, outstanding);
-    }
-
-    public async Task<InvoiceResponse> PrintAsync(Guid id, Guid printedBy, CancellationToken ct = default)
-    {
-        var invoice = await repo.GetByIdAsync(id)
-            ?? throw new KeyNotFoundException("Invoice not found");
-
-        if (invoice.Status != InvoiceStatus.Draft)
-            throw new InvalidOperationException($"Cannot print an invoice in {invoice.Status} status");
-
-        invoice.Status = InvoiceStatus.Printed;
-        invoice.PrintedAt = DateTime.Now;
-        invoice.PrintedBy = printedBy;
-
-        await uow.BeginAsync(ct);
-        try { repo.Update(invoice); await uow.CommitAsync(ct); }
-        catch { await uow.RollbackAsync(ct); throw; }
-
-        return ToResponse(invoice);
-    }
-
-    public async Task<InvoiceResponse> FinalizeAsync(Guid id, FinalizeInvoiceRequest request, Guid finalizedBy, CancellationToken ct = default)
-    {
-        var invoice = await repo.GetByIdAsync(id)
-            ?? throw new KeyNotFoundException("Invoice not found");
-
-        if (invoice.Status != InvoiceStatus.Printed)
-            throw new InvalidOperationException($"Cannot finalize an invoice in {invoice.Status} status");
-
-        var adjustments = request.Adjustments ?? [];
-        if (adjustments.Count > 0)
-        {
-            var poItems = invoice.ShopPO.Items.Where(i => i.IsActive).ToList();
-            decimal total = 0;
-            foreach (var item in poItems)
-            {
-                var adjustment = adjustments.FirstOrDefault(a => a.ShopPOItemId == item.Id);
-                var billedQuantity = adjustment is not null ? adjustment.AdjustedQuantity : item.Quantity;
-
-                if (billedQuantity < 0 || billedQuantity > item.Quantity)
-                    throw new InvalidOperationException(
-                        $"Adjusted quantity for item {item.Id} must be between 0 and {item.Quantity}");
-
-                total += billedQuantity * item.UnitPrice;
-            }
-            invoice.TotalAmount = total;
-        }
-
-        invoice.Status = InvoiceStatus.Finalized;
-        invoice.FinalizedAt = DateTime.Now;
-        invoice.FinalizedBy = finalizedBy;
-
-        await uow.BeginAsync(ct);
-        try { repo.Update(invoice); await uow.CommitAsync(ct); }
-        catch { await uow.RollbackAsync(ct); throw; }
-
-        return ToResponse(invoice);
-    }
-}
@@ -11,14 +11,7 @@ public record CreateItemRequest(
    Guid? BrandId,
    Guid BaseUomId,
    decimal? SalePrice,
-    List<UomConversionRequest>? Conversions,
-    decimal? ReorderLevel = null,
-    bool TracksSerialNumbers = false,
-    bool TracksBatches = false,
-    bool TracksExpiryDate = false,
-    bool HasWarranty = false,
-    int? WarrantyPeriodDays = null,
-    bool AllowCustomWarrantyPeriod = false);
+    List<UomConversionRequest>? Conversions);

 public record UpdateItemRequest(
    string Name,
@@ -27,15 +20,7 @@ public record UpdateItemRequest(
    Guid? SubCategoryId,
    Guid? BrandId,
    Guid BaseUomId,
-    decimal? SalePrice,
-    bool IsActive = true,
-    decimal? ReorderLevel = null,
-    bool TracksSerialNumbers = false,
-    bool TracksBatches = false,
-    bool TracksExpiryDate = false,
-    bool HasWarranty = false,
-    int? WarrantyPeriodDays = null,
-    bool AllowCustomWarrantyPeriod = false);
+    decimal? SalePrice);

 public record ReplaceConversionsRequest(List<UomConversionRequest> Conversions);

@@ -54,13 +39,6 @@ public record ItemSummaryResponse(
    Guid BaseUomId,
    string BaseUomName,
    decimal? SalePrice,
-    decimal? ReorderLevel,
-    bool TracksSerialNumbers,
-    bool TracksBatches,
-    bool TracksExpiryDate,
-    bool HasWarranty,
-    int? WarrantyPeriodDays,
-    bool AllowCustomWarrantyPeriod,
    Models.SyncSource SyncSource,
    bool IsActive,
    DateTime CreatedAt);
@@ -79,13 +57,6 @@ public record ItemDetailResponse(
    Guid BaseUomId,
    string BaseUomName,
    decimal? SalePrice,
-    decimal? ReorderLevel,
-    bool TracksSerialNumbers,
-    bool TracksBatches,
-    bool TracksExpiryDate,
-    bool HasWarranty,
-    int? WarrantyPeriodDays,
-    bool AllowCustomWarrantyPeriod,
    Models.SyncSource SyncSource,
    bool IsActive,
    DateTime CreatedAt,
@@ -20,14 +20,12 @@ public class ItemRepository(AppDBContext context) : IItemRepository

    public async Task<List<Models.Item>> GetAllAsync(Guid? categoryId = null, Guid? subCategoryId = null, Guid? brandId = null)
    {
-        // Deleted items stay IsActive=false but remain visible with an Inactive status —
-        // Delete never removes the row, only marks it (same rule as Orders/Stores).
        var query = context.Items
            .Include(i => i.Category)
            .Include(i => i.SubCategory)
            .Include(i => i.Brand)
            .Include(i => i.BaseUom)
-            .AsQueryable();
+            .Where(i => i.IsActive);

        if (categoryId.HasValue) query = query.Where(i => i.FK_CategoryId == categoryId);
        if (subCategoryId.HasValue) query = query.Where(i => i.FK_SubCategoryId == subCategoryId);
@@ -2,7 +2,7 @@ using Distribution.Infra.UoW;

 namespace Distribution.Features.Item;

-public class ItemService(IItemRepository repo, IUnitOfWork uow, SysConfig.SysConfigService sysConfig)
+public class ItemService(IItemRepository repo, IUnitOfWork uow)
 {
    private static UomConversionResponse MapConversion(Models.UomConversion c) =>
        new(c.Id, c.FK_FromUomId, c.FromUom.Name, c.FK_ToUomId, c.ToUom.Name, c.Factor);
@@ -13,10 +13,7 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow, SysConfig.SysCon
            i.FK_SubCategoryId, i.SubCategory?.Name,
            i.FK_BrandId, i.Brand?.Name,
            i.FK_BaseUomId, i.BaseUom.Name,
-            i.SalePrice, i.ReorderLevel,
-            i.TracksSerialNumbers, i.TracksBatches, i.TracksExpiryDate,
-            i.HasWarranty, i.WarrantyPeriodDays, i.AllowCustomWarrantyPeriod,
-            i.SyncSource, i.IsActive, i.CreatedAt);
+            i.SalePrice, i.SyncSource, i.IsActive, i.CreatedAt);

    private static ItemDetailResponse MapDetail(Models.Item i) =>
        new(i.Id, i.Sku, i.Name, i.Description,
@@ -24,44 +21,9 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow, SysConfig.SysCon
            i.FK_SubCategoryId, i.SubCategory?.Name,
            i.FK_BrandId, i.Brand?.Name,
            i.FK_BaseUomId, i.BaseUom.Name,
-            i.SalePrice, i.ReorderLevel,
-            i.TracksSerialNumbers, i.TracksBatches, i.TracksExpiryDate,
-            i.HasWarranty, i.WarrantyPeriodDays, i.AllowCustomWarrantyPeriod,
-            i.SyncSource, i.IsActive, i.CreatedAt,
+            i.SalePrice, i.SyncSource, i.IsActive, i.CreatedAt,
            i.Conversions.Select(MapConversion).ToList());

-    /// <summary>
-    /// Rejects per-item tracking flags that are off system-wide, and warranty-period values that
-    /// don't make sense given HasWarranty/AllowCustomWarrantyPeriod.
-    /// </summary>
-    private async Task ValidateTrackingFlagsAsync(bool tracksSerialNumbers, bool tracksBatches,
-        bool tracksExpiryDate, bool hasWarranty, int? warrantyPeriodDays, bool allowCustomWarrantyPeriod)
-    {
-        if (tracksSerialNumbers && !await sysConfig.GetSerialNumberTrackingEnabledAsync())
-            throw new InvalidOperationException("Serial number tracking is disabled system-wide.");
-
-        if (tracksBatches && !await sysConfig.GetBatchTrackingEnabledAsync())
-            throw new InvalidOperationException("Batch tracking is disabled system-wide.");
-
-        if (tracksExpiryDate && !await sysConfig.GetExpiryDateTrackingEnabledAsync())
-            throw new InvalidOperationException("Expiry date tracking is disabled system-wide.");
-
-        if (hasWarranty && !await sysConfig.GetWarrantyTrackingEnabledAsync())
-            throw new InvalidOperationException("Warranty tracking is disabled system-wide.");
-
-        if (allowCustomWarrantyPeriod && !await sysConfig.GetCustomWarrantyOverrideEnabledAsync())
-            throw new InvalidOperationException("Custom warranty period override is disabled system-wide.");
-
-        if (!hasWarranty && (warrantyPeriodDays is not null || allowCustomWarrantyPeriod))
-            throw new InvalidOperationException("Warranty period/override can only be set when HasWarranty is true.");
-
-        if (warrantyPeriodDays is not null && !allowCustomWarrantyPeriod)
-            throw new InvalidOperationException("WarrantyPeriodDays can only be set when AllowCustomWarrantyPeriod is true.");
-
-        if (warrantyPeriodDays is < 0)
-            throw new InvalidOperationException("WarrantyPeriodDays cannot be negative.");
-    }
-
    public async Task<List<ItemSummaryResponse>> GetAllAsync(Guid? categoryId = null, Guid? subCategoryId = null, Guid? brandId = null) =>
        (await repo.GetAllAsync(categoryId, subCategoryId, brandId))
            .Select(MapSummary)
@@ -70,7 +32,7 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow, SysConfig.SysCon
    public async Task<ItemDetailResponse?> GetByIdAsync(Guid id)
    {
        var item = await repo.GetByIdAsync(id);
-        if (item is null) return null;
+        if (item is null || !item.IsActive) return null;
        return MapDetail(item);
    }

@@ -79,9 +41,6 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow, SysConfig.SysCon
        if (await repo.SkuExistsAsync(request.Sku))
            throw new InvalidOperationException($"SKU '{request.Sku}' already exists.");

-        await ValidateTrackingFlagsAsync(request.TracksSerialNumbers, request.TracksBatches,
-            request.TracksExpiryDate, request.HasWarranty, request.WarrantyPeriodDays, request.AllowCustomWarrantyPeriod);
-
        var item = new Models.Item
        {
            Sku = request.Sku,
@@ -92,13 +51,6 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow, SysConfig.SysCon
            FK_BrandId = request.BrandId,
            FK_BaseUomId = request.BaseUomId,
            SalePrice = request.SalePrice,
-            ReorderLevel = request.ReorderLevel,
-            TracksSerialNumbers = request.TracksSerialNumbers,
-            TracksBatches = request.TracksBatches,
-            TracksExpiryDate = request.TracksExpiryDate,
-            HasWarranty = request.HasWarranty,
-            WarrantyPeriodDays = request.WarrantyPeriodDays,
-            AllowCustomWarrantyPeriod = request.AllowCustomWarrantyPeriod,
            SyncSource = Models.SyncSource.Manual
        };

@@ -122,12 +74,9 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow, SysConfig.SysCon
    public async Task<ItemDetailResponse?> UpdateAsync(Guid id, UpdateItemRequest request, CancellationToken ct = default)
    {
        var item = await repo.GetByIdAsync(id);
-        if (item is null) return null;
+        if (item is null || !item.IsActive) return null;
        if (item.SyncSource == Models.SyncSource.Erp) return null;

-        await ValidateTrackingFlagsAsync(request.TracksSerialNumbers, request.TracksBatches,
-            request.TracksExpiryDate, request.HasWarranty, request.WarrantyPeriodDays, request.AllowCustomWarrantyPeriod);
-
        item.Name = request.Name;
        item.Description = request.Description;
        item.FK_CategoryId = request.CategoryId;
@@ -135,14 +84,6 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow, SysConfig.SysCon
        item.FK_BrandId = request.BrandId;
        item.FK_BaseUomId = request.BaseUomId;
        item.SalePrice = request.SalePrice;
-        item.ReorderLevel = request.ReorderLevel;
-        item.TracksSerialNumbers = request.TracksSerialNumbers;
-        item.TracksBatches = request.TracksBatches;
-        item.TracksExpiryDate = request.TracksExpiryDate;
-        item.HasWarranty = request.HasWarranty;
-        item.WarrantyPeriodDays = request.WarrantyPeriodDays;
-        item.AllowCustomWarrantyPeriod = request.AllowCustomWarrantyPeriod;
-        item.IsActive = request.IsActive;

        await uow.BeginAsync(ct);
        try { repo.Update(item); await uow.CommitAsync(ct); }
@@ -6,12 +6,11 @@ public interface ILoadingSheetRepository
 {
    Task<LoadingSheet?> GetByIdAsync(Guid id);
    Task<LoadingSheet?> GetActiveByRideIdAsync(Guid rideId);
-    Task<List<LoadingSheet>> GetAllAsync(Guid? rideId, LoadingSheetStatus? status, Guid? routeId, Guid? regionId, int page, int pageSize);
-    Task<int> GetCountAsync(Guid? rideId, LoadingSheetStatus? status, Guid? routeId, Guid? regionId);
+    Task<List<LoadingSheet>> GetAllAsync(Guid? rideId, LoadingSheetStatus? status, int page, int pageSize);
+    Task<int> GetCountAsync(Guid? rideId, LoadingSheetStatus? status);
+    Task<List<(Guid ItemId, decimal TotalQty)>> GetAggregatedOrderItemsByRouteIdAsync(Guid routeId);
    Task AddAsync(LoadingSheet sheet);
    void Update(LoadingSheet sheet);
    void RemoveItems(IEnumerable<LoadingSheetItem> items);
    Task AddItemsAsync(IEnumerable<LoadingSheetItem> items);
-    Task<List<Guid>> GetShopPOIdsByItemIdsAsync(IEnumerable<Guid> shopPOItemIds);
-    Task ReplaceOrdersAsync(Guid loadingSheetId, List<Guid> shopPOIds);
 }
@@ -1,47 +1,25 @@
+using Distribution.Models;
 using Distribution.Infra.Authorization;
-using Distribution.Models;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

 namespace Distribution.Features.LoadingEvent;

 [ApiController]
 [Route("api/loading-sheets")]
-public class LoadingSheetController(
-    LoadingSheetService service,
-    IScopeAccessService scopeAccess,
-    ICurrentUserService currentUser) : ControllerBase
+public class LoadingSheetController(LoadingSheetService service, ICurrentUserService currentUser) : ControllerBase
 {
    [HttpGet]
-    //[Authorize("loading-sheet.view")]
    public async Task<IActionResult> GetAll(
        [FromQuery] Guid? rideId,
        [FromQuery] LoadingSheetStatus? status,
-        [FromQuery] Guid? routeId,
-        [FromQuery] Guid? regionId,
        [FromQuery] int page = 1,
        [FromQuery] int pageSize = 20)
    {
-        if (routeId.HasValue)
-        {
-            var userId = currentUser.UserId;
-            if (userId.HasValue && !await scopeAccess.HasRouteScopeAsync(userId.Value, routeId.Value))
-                return StatusCode(403);
-        }
-
-        if (regionId.HasValue)
-        {
-            var userId = currentUser.UserId;
-            if (userId.HasValue && !await scopeAccess.HasRegionScopeAsync(userId.Value, regionId.Value))
-                return StatusCode(403);
-        }
-
-        var result = await service.GetAllAsync(rideId, status, routeId, regionId, page, pageSize);
+        var result = await service.GetAllAsync(rideId, status, page, pageSize);
        return Ok(result);
    }

    [HttpGet("{id:guid}")]
-    [Authorize("loading-sheet.view")]
    public async Task<IActionResult> GetById(Guid id)
    {
        var result = await service.GetByIdAsync(id);
@@ -49,16 +27,11 @@ public class LoadingSheetController(
    }

    [HttpPost]
-    [Authorize("loading-sheet.manage")]
    public async Task<IActionResult> Create(CreateLoadingSheetRequest request, CancellationToken ct)
    {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request.PopulatedByUserId;
-        if (userId is null) return BadRequest(new { error = "PopulatedByUserId is required while auth is unavailable" });
        try
        {
-            var result = await service.CreateAsync(request, userId.Value, ct);
+            var result = await service.CreateAsync(request, ct);
            return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
        }
        catch (KeyNotFoundException) { return NotFound(); }
@@ -66,7 +39,6 @@ public class LoadingSheetController(
    }

    [HttpPut("{id:guid}/items")]
-    [Authorize("loading-sheet.manage")]
    public async Task<IActionResult> SetItems(Guid id, SetItemsRequest request, CancellationToken ct)
    {
        try
@@ -78,17 +50,90 @@ public class LoadingSheetController(
        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
    }

-    [HttpPost("{id:guid}/confirm")]
-    [Authorize("loading-sheet.manage")]
-    public async Task<IActionResult> Confirm(Guid id, ConfirmLoadingSheetRequest request, CancellationToken ct)
+    [HttpPost("{id:guid}/confirm-dispatch")]
+    public async Task<IActionResult> ConfirmDispatch(Guid id, CancellationToken ct)
    {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request.ConfirmedByUserId;
-        if (userId is null) return BadRequest(new { error = "ConfirmedByUserId is required while auth is unavailable" });
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
        try
        {
-            var result = await service.ConfirmAsync(id, userId.Value, ct);
+            var result = await service.ConfirmDispatchAsync(id, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPut("{id:guid}/receipt-items")]
+    public async Task<IActionResult> SetReceiptItems(Guid id, SetReceiptItemsRequest request, CancellationToken ct)
+    {
+        try
+        {
+            var result = await service.SetReceiptItemsAsync(id, request, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("{id:guid}/confirm-receipt")]
+    public async Task<IActionResult> ConfirmReceipt(Guid id, ConfirmReceiptRequest request, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.ConfirmReceiptAsync(id, request, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("{id:guid}/resolve")]
+    public async Task<IActionResult> Resolve(Guid id, ResolveDiscrepancyRequest request, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.ResolveAsync(id, request, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPatch("{id:guid}/dispatch")]
+    public async Task<IActionResult> PatchDispatch(Guid id, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.ConfirmDispatchAsync(id, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPatch("{id:guid}/receipt")]
+    public async Task<IActionResult> PatchReceipt(Guid id, PatchReceiptRequest request, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.PatchReceiptAsync(id, request.Items, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPatch("{id:guid}/resolve")]
+    public async Task<IActionResult> PatchResolve(Guid id, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.PatchResolveAsync(id, userId, ct);
            return Ok(result);
        }
        catch (KeyNotFoundException) { return NotFound(); }
@@ -5,32 +5,37 @@ namespace Distribution.Features.LoadingEvent;
 public record LoadingSheetResponse(
    Guid Id,
    Guid FK_RideId,
+    Guid FK_SourceWarehouseId,
+    string WarehouseName,
    LoadingSheetStatus Status,
-    Guid PopulatedBy,
-    DateTime PopulatedAt,
-    DateTime? ConfirmedAt,
-    Guid? ConfirmedBy,
+    DateTime? DispatchConfirmedAt,
+    Guid? DispatchConfirmedBy,
+    DateTime? ReceiptConfirmedAt,
+    Guid? ReceiptConfirmedBy,
    DateTime CreatedAt,
-    List<LoadingSheetItemResponse> Items,
-    List<LoadingSheetOrderResponse> Orders);
+    List<LoadingSheetItemResponse> Items);

 public record LoadingSheetItemResponse(
    Guid Id,
    Guid FK_ItemId,
    string ItemName,
-    Guid FK_WarehouseId,
-    string WarehouseName,
    decimal QuantityDispatched,
-    Guid? FK_ShopPOItemId,
-    Guid? ShopPOId = null,
-    Guid? StoreId = null,
-    string? StoreName = null);
+    decimal? QuantityReceived,
+    decimal? QuantityResolved);

-public record LoadingSheetOrderResponse(Guid ShopPOId);
-
-public record CreateLoadingSheetRequest(Guid FK_RideId, Guid? PopulatedByUserId = null);
+public record CreateLoadingSheetRequest(Guid FK_RideId);

 public record SetItemsRequest(List<SetItemInput> Items);
-public record SetItemInput(Guid FK_ItemId, Guid FK_WarehouseId, decimal Quantity, Guid? FK_ShopPOItemId = null);
+public record SetItemInput(Guid FK_ItemId, decimal Quantity);

-public record ConfirmLoadingSheetRequest(Guid? ConfirmedByUserId = null);
+public record SetReceiptItemsRequest(List<ReceiptItemInput> Items);
+public record ReceiptItemInput(Guid FK_ItemId, decimal QuantityReceived);
+
+public record ConfirmReceiptRequest(int Meterstart);
+
+public record ResolveDiscrepancyRequest(List<ResolveItemInput> Items, int Meterstart);
+public record ResolveItemInput(Guid FK_ItemId, decimal QuantityResolved);
+
+// Combined PATCH endpoints used by the frontend
+public record PatchReceiptItemInput(Guid ItemId, decimal QuantityReceived);
+public record PatchReceiptRequest(List<PatchReceiptItemInput> Items);
@@ -8,39 +8,46 @@ public class LoadingSheetRepository(AppDBContext context) : ILoadingSheetReposit
 {
    public async Task<LoadingSheet?> GetByIdAsync(Guid id) =>
        await context.LoadingSheets
+            .Include(s => s.SourceWarehouse)
            .Include(s => s.Items).ThenInclude(i => i.Item)
-            .Include(s => s.Items).ThenInclude(i => i.Warehouse)
-            .Include(s => s.Items).ThenInclude(i => i.ShopPOItem).ThenInclude(p => p!.ShopPO).ThenInclude(p => p.Store)
-            .Include(s => s.Orders)
            .FirstOrDefaultAsync(s => s.Id == id);

    public async Task<LoadingSheet?> GetActiveByRideIdAsync(Guid rideId) =>
        await context.LoadingSheets
-            .FirstOrDefaultAsync(s => s.FK_RideId == rideId && s.Status == LoadingSheetStatus.Planned);
+            .FirstOrDefaultAsync(s =>
+                s.FK_RideId == rideId &&
+                s.Status != LoadingSheetStatus.ReceiptConfirmed &&
+                s.Status != LoadingSheetStatus.Resolved);

-    public async Task<List<LoadingSheet>> GetAllAsync(Guid? rideId, LoadingSheetStatus? status, Guid? routeId, Guid? regionId, int page, int pageSize) =>
+    public async Task<List<LoadingSheet>> GetAllAsync(Guid? rideId, LoadingSheetStatus? status, int page, int pageSize) =>
        await context.LoadingSheets
-            .Include(s => s.Items).ThenInclude(i => i.Item)
-            .Include(s => s.Items).ThenInclude(i => i.Warehouse)
-            .Include(s => s.Items).ThenInclude(i => i.ShopPOItem).ThenInclude(p => p!.ShopPO).ThenInclude(p => p.Store)
-            .Include(s => s.Orders)
+            .Include(s => s.SourceWarehouse)
            .Where(s =>
                (rideId == null || s.FK_RideId == rideId) &&
-                (status == null || s.Status == status) &&
-                (routeId == null || s.Orders.Any(o => o.ShopPO.Store.FK_RouteId == routeId)) &&
-                (regionId == null || s.Orders.Any(o => o.ShopPO.Store.Route.FK_RegionId == regionId)))
+                (status == null || s.Status == status))
            .OrderByDescending(s => s.CreatedAt)
            .Skip((page - 1) * pageSize)
            .Take(pageSize)
            .ToListAsync();

-    public async Task<int> GetCountAsync(Guid? rideId, LoadingSheetStatus? status, Guid? routeId, Guid? regionId) =>
+    public async Task<int> GetCountAsync(Guid? rideId, LoadingSheetStatus? status) =>
        await context.LoadingSheets
            .CountAsync(s =>
                (rideId == null || s.FK_RideId == rideId) &&
-                (status == null || s.Status == status) &&
-                (routeId == null || s.Orders.Any(o => o.ShopPO.Store.FK_RouteId == routeId)) &&
-                (regionId == null || s.Orders.Any(o => o.ShopPO.Store.Route.FK_RegionId == regionId)));
+                (status == null || s.Status == status));
+
+    public async Task<List<(Guid ItemId, decimal TotalQty)>> GetAggregatedOrderItemsByRouteIdAsync(Guid routeId)
+    {
+        var groups = await context.OrderItems
+            .Where(oi => oi.IsActive
+                && oi.Order.IsActive
+                && oi.Order.Store.FK_RouteId == routeId
+                && (oi.Order.Status == OrderStatus.Pending || oi.Order.Status == OrderStatus.PartiallyFulfilled))
+            .GroupBy(oi => oi.FK_ItemId)
+            .Select(g => new { ItemId = g.Key, TotalQty = g.Sum(oi => (decimal)(oi.Quantity - oi.QuantityFulfilled)) })
+            .ToListAsync();
+        return groups.Select(x => (x.ItemId, x.TotalQty)).ToList();
+    }

    public async Task AddAsync(LoadingSheet sheet) =>
        await context.LoadingSheets.AddAsync(sheet);
@@ -53,25 +60,4 @@ public class LoadingSheetRepository(AppDBContext context) : ILoadingSheetReposit

    public async Task AddItemsAsync(IEnumerable<LoadingSheetItem> items) =>
        await context.LoadingSheetItems.AddRangeAsync(items);
-
-    public async Task<List<Guid>> GetShopPOIdsByItemIdsAsync(IEnumerable<Guid> shopPOItemIds) =>
-        await context.ShopPOItems
-            .Where(i => shopPOItemIds.Contains(i.Id))
-            .Select(i => i.FK_ShopPOId)
-            .Distinct()
-            .ToListAsync();
-
-    public async Task ReplaceOrdersAsync(Guid loadingSheetId, List<Guid> shopPOIds)
-    {
-        var current = await context.LoadingSheetOrders
-            .Where(o => o.FK_LoadingSheetId == loadingSheetId)
-            .ToListAsync();
-        context.LoadingSheetOrders.RemoveRange(current);
-
-        await context.LoadingSheetOrders.AddRangeAsync(shopPOIds.Select(shopPOId => new LoadingSheetOrder
-        {
-            FK_LoadingSheetId = loadingSheetId,
-            FK_ShopPOId = shopPOId
-        }));
-    }
 }
@@ -8,13 +8,13 @@ namespace Distribution.Features.LoadingEvent;
 public class LoadingSheetService(
    ILoadingSheetRepository repo,
    IRideRepository rideRepo,
-    StockMover mover,
+    IStockRepository stockRepo,
    IUnitOfWork uow)
 {
-    public async Task<PagedResponse<LoadingSheetResponse>> GetAllAsync(Guid? rideId, LoadingSheetStatus? status, Guid? routeId, Guid? regionId, int page, int pageSize)
+    public async Task<PagedResponse<LoadingSheetResponse>> GetAllAsync(Guid? rideId, LoadingSheetStatus? status, int page, int pageSize)
    {
-        var total = await repo.GetCountAsync(rideId, status, routeId, regionId);
-        var items = await repo.GetAllAsync(rideId, status, routeId, regionId, page, pageSize);
+        var total = await repo.GetCountAsync(rideId, status);
+        var items = await repo.GetAllAsync(rideId, status, page, pageSize);
        return new PagedResponse<LoadingSheetResponse>(page, pageSize, total, items.Select(ToResponse).ToList());
    }

@@ -24,7 +24,7 @@ public class LoadingSheetService(
        return sheet is null ? null : ToResponse(sheet);
    }

-    public async Task<LoadingSheetResponse> CreateAsync(CreateLoadingSheetRequest request, Guid userId, CancellationToken ct = default)
+    public async Task<LoadingSheetResponse> CreateAsync(CreateLoadingSheetRequest request, CancellationToken ct = default)
    {
        var ride = await rideRepo.GetByIdAsync(request.FK_RideId)
            ?? throw new KeyNotFoundException("Ride not found");
@@ -34,16 +34,22 @@ public class LoadingSheetService(

        var existing = await repo.GetActiveByRideIdAsync(request.FK_RideId);
        if (existing is not null)
-            throw new InvalidOperationException("This ride already has a Planned loading sheet");
+            throw new InvalidOperationException("This ride already has an active loading sheet");

        var sheet = new LoadingSheet
        {
            FK_RideId = ride.Id,
-            Status = LoadingSheetStatus.Planned,
-            PopulatedBy = userId,
-            PopulatedAt = DateTime.Now
+            FK_SourceWarehouseId = ride.FK_SourceWarehouseId,
+            Status = LoadingSheetStatus.Pending
        };

+        if (ride.RideType == RideType.Delivery)
+        {
+            var orderItems = await repo.GetAggregatedOrderItemsByRouteIdAsync(ride.FK_RouteId);
+            foreach (var (itemId, qty) in orderItems)
+                sheet.Items.Add(new LoadingSheetItem { FK_ItemId = itemId, QuantityDispatched = qty });
+        }
+
        await uow.BeginAsync(ct);
        try
        {
@@ -61,57 +67,19 @@ public class LoadingSheetService(
        var sheet = await repo.GetByIdAsync(id)
            ?? throw new KeyNotFoundException("Loading sheet not found");

-        if (sheet.Status != LoadingSheetStatus.Planned)
-            throw new InvalidOperationException("Items can only be changed while the sheet is Planned");
+        if (sheet.Status != LoadingSheetStatus.Pending)
+            throw new InvalidOperationException("Items can only be changed while the sheet is Pending");

-        // The request is the full desired item list: a row matching (item, warehouse,
-        // shop PO item) gets its quantity updated in place, a new combination is added,
-        // and rows for combinations not present in the request are removed.
        await uow.BeginAsync(ct);
        try
        {
-            var newItems = new List<LoadingSheetItem>();
-            var keptItems = new List<LoadingSheetItem>();
-            foreach (var input in request.Items)
+            repo.RemoveItems(sheet.Items);
+            await repo.AddItemsAsync(request.Items.Select(i => new LoadingSheetItem
            {
-                var existing = sheet.Items.FirstOrDefault(i =>
-                    i.FK_ItemId == input.FK_ItemId &&
-                    i.FK_WarehouseId == input.FK_WarehouseId &&
-                    i.FK_ShopPOItemId == input.FK_ShopPOItemId);
-
-                if (existing is not null)
-                {
-                    existing.QuantityDispatched = input.Quantity;
-                    keptItems.Add(existing);
-                }
-                else
-                    newItems.Add(new LoadingSheetItem
-                    {
-                        FK_LoadingSheetId = sheet.Id,
-                        FK_ItemId = input.FK_ItemId,
-                        FK_WarehouseId = input.FK_WarehouseId,
-                        FK_ShopPOItemId = input.FK_ShopPOItemId,
-                        QuantityDispatched = input.Quantity
-                    });
-            }
-
-            var removedItems = sheet.Items.Where(i => !keptItems.Contains(i)).ToList();
-            if (removedItems.Count > 0)
-                repo.RemoveItems(removedItems);
-            if (newItems.Count > 0)
-                await repo.AddItemsAsync(newItems);
-
-            var shopPOItemIds = keptItems.Select(i => i.FK_ShopPOItemId)
-                .Concat(newItems.Select(i => i.FK_ShopPOItemId))
-                .Where(x => x.HasValue)
-                .Select(x => x!.Value)
-                .Distinct()
-                .ToList();
-            var shopPOIds = shopPOItemIds.Count > 0
-                ? await repo.GetShopPOIdsByItemIdsAsync(shopPOItemIds)
-                : new List<Guid>();
-
-            await repo.ReplaceOrdersAsync(sheet.Id, shopPOIds);
+                FK_LoadingSheetId = sheet.Id,
+                FK_ItemId = i.FK_ItemId,
+                QuantityDispatched = i.Quantity
+            }));
            await uow.CommitAsync(ct);
        }
        catch { await uow.RollbackAsync(ct); throw; }
@@ -120,60 +88,289 @@ public class LoadingSheetService(
        return ToResponse(saved!);
    }

-    public async Task<LoadingSheetResponse> ConfirmAsync(Guid id, Guid userId, CancellationToken ct = default)
+    public async Task<LoadingSheetResponse> ConfirmDispatchAsync(Guid id, Guid userId, CancellationToken ct = default)
    {
        var sheet = await repo.GetByIdAsync(id)
            ?? throw new KeyNotFoundException("Loading sheet not found");

-        if (sheet.Status != LoadingSheetStatus.Planned)
-            throw new InvalidOperationException($"Cannot confirm a sheet in {sheet.Status} status");
+        if (sheet.Status != LoadingSheetStatus.Pending)
+            throw new InvalidOperationException($"Cannot confirm dispatch for a sheet in {sheet.Status} status");

        if (!sheet.Items.Any(i => i.QuantityDispatched > 0))
            throw new InvalidOperationException("Sheet must have at least one item with quantity greater than zero");

+        sheet.Status = LoadingSheetStatus.DispatchConfirmed;
+        sheet.DispatchConfirmedAt = DateTime.Now;
+        sheet.DispatchConfirmedBy = userId;
+
+        await uow.BeginAsync(ct);
+        try { repo.Update(sheet); await uow.CommitAsync(ct); }
+        catch { await uow.RollbackAsync(ct); throw; }
+
+        return ToResponse(sheet);
+    }
+
+    public async Task<LoadingSheetResponse> SetReceiptItemsAsync(Guid id, SetReceiptItemsRequest request, CancellationToken ct = default)
+    {
+        var sheet = await repo.GetByIdAsync(id)
+            ?? throw new KeyNotFoundException("Loading sheet not found");
+
+        if (sheet.Status != LoadingSheetStatus.DispatchConfirmed)
+            throw new InvalidOperationException("Receipt quantities can only be set after dispatch is confirmed");
+
+        foreach (var input in request.Items)
+        {
+            var item = sheet.Items.FirstOrDefault(i => i.FK_ItemId == input.FK_ItemId)
+                ?? throw new InvalidOperationException($"Item {input.FK_ItemId} is not on this loading sheet");
+            item.QuantityReceived = input.QuantityReceived;
+        }
+
+        await uow.BeginAsync(ct);
+        try { repo.Update(sheet); await uow.CommitAsync(ct); }
+        catch { await uow.RollbackAsync(ct); throw; }
+
+        return ToResponse(sheet);
+    }
+
+    public async Task<LoadingSheetResponse> ConfirmReceiptAsync(Guid id, ConfirmReceiptRequest request, Guid userId, CancellationToken ct = default)
+    {
+        var sheet = await repo.GetByIdAsync(id)
+            ?? throw new KeyNotFoundException("Loading sheet not found");
+
+        if (sheet.Status != LoadingSheetStatus.DispatchConfirmed)
+            throw new InvalidOperationException($"Cannot confirm receipt for a sheet in {sheet.Status} status");
+
+        if (sheet.Items.Any(i => !i.QuantityReceived.HasValue))
+            throw new InvalidOperationException("All items must have a received quantity before confirming receipt");
+
        var ride = await rideRepo.GetByIdAsync(sheet.FK_RideId)
            ?? throw new KeyNotFoundException("Ride not found");

+        var hasDiscrepancy = sheet.Items.Any(i => i.QuantityReceived != i.QuantityDispatched);
+
        await uow.BeginAsync(ct);
        try
        {
-            await ApplyLoadMovementsAsync(sheet.Id, ride.FK_VehicleId, sheet.Items, userId);
+            if (hasDiscrepancy)
+            {
+                sheet.Status = LoadingSheetStatus.DiscrepancyFlagged;
+            }
+            else
+            {
+                sheet.Status = LoadingSheetStatus.ReceiptConfirmed;
+                sheet.ReceiptConfirmedAt = DateTime.Now;
+                sheet.ReceiptConfirmedBy = userId;

-            sheet.Status = LoadingSheetStatus.Confirmed;
-            sheet.ConfirmedAt = DateTime.Now;
-            sheet.ConfirmedBy = userId;
+                var lines = sheet.Items.Select(i => (i.FK_ItemId, i.QuantityReceived!.Value)).ToList();
+                await ApplyLoadMovementsAsync(sheet, ride.FK_VehicleId, lines, userId);
+
+                ride.Status = RideStatus.Active;
+                ride.ActivatedAt = DateTime.Now;
+                ride.Meterstart = request.Meterstart;
+                rideRepo.Update(ride);
+            }

            repo.Update(sheet);
            await uow.CommitAsync(ct);
        }
        catch { await uow.RollbackAsync(ct); throw; }

-        var saved = await repo.GetByIdAsync(id);
-        return ToResponse(saved!);
+        return ToResponse(sheet);
    }

-    private async Task ApplyLoadMovementsAsync(Guid sheetId, Guid vehicleId, List<LoadingSheetItem> items, Guid userId)
+    public async Task<LoadingSheetResponse> ResolveAsync(Guid id, ResolveDiscrepancyRequest request, Guid userId, CancellationToken ct = default)
    {
-        foreach (var item in items.Where(i => i.QuantityDispatched > 0))
-        {
-            var label = $"{item.Item?.Name ?? item.FK_ItemId.ToString()} (warehouse {item.Warehouse?.Name ?? item.FK_WarehouseId.ToString()})";
+        var sheet = await repo.GetByIdAsync(id)
+            ?? throw new KeyNotFoundException("Loading sheet not found");

-            await mover.MoveAsync(item.FK_ItemId, label,
-                item.FK_WarehouseId, LocationType.Warehouse,
-                vehicleId, LocationType.Vehicle,
-                item.QuantityDispatched, MovementType.Load, sheetId, userId);
+        if (sheet.Status != LoadingSheetStatus.DiscrepancyFlagged)
+            throw new InvalidOperationException($"Cannot resolve a sheet in {sheet.Status} status");
+
+        foreach (var input in request.Items)
+        {
+            var item = sheet.Items.FirstOrDefault(i => i.FK_ItemId == input.FK_ItemId)
+                ?? throw new InvalidOperationException($"Item {input.FK_ItemId} is not on this loading sheet");
+            if (input.QuantityResolved < 0)
+                throw new InvalidOperationException("Resolved quantity cannot be negative");
+            item.QuantityResolved = input.QuantityResolved;
+        }
+
+        if (sheet.Items.Any(i => !i.QuantityResolved.HasValue))
+            throw new InvalidOperationException("All items must have a resolved quantity");
+
+        var ride = await rideRepo.GetByIdAsync(sheet.FK_RideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        sheet.Status = LoadingSheetStatus.Resolved;
+        sheet.ReceiptConfirmedAt = DateTime.Now;
+        sheet.ReceiptConfirmedBy = userId;
+
+        var lines = sheet.Items.Select(i => (i.FK_ItemId, i.QuantityResolved!.Value)).ToList();
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            await ApplyLoadMovementsAsync(sheet, ride.FK_VehicleId, lines, userId);
+
+            ride.Status = RideStatus.Active;
+            ride.ActivatedAt = DateTime.Now;
+            ride.Meterstart = request.Meterstart;
+            rideRepo.Update(ride);
+
+            repo.Update(sheet);
+            await uow.CommitAsync(ct);
+        }
+        catch { await uow.RollbackAsync(ct); throw; }
+
+        return ToResponse(sheet);
+    }
+
+    public async Task<LoadingSheetResponse> PatchReceiptAsync(Guid id, List<PatchReceiptItemInput> items, Guid userId, CancellationToken ct = default)
+    {
+        var sheet = await repo.GetByIdAsync(id)
+            ?? throw new KeyNotFoundException("Loading sheet not found");
+
+        if (sheet.Status != LoadingSheetStatus.DispatchConfirmed)
+            throw new InvalidOperationException($"Cannot set receipt for a sheet in {sheet.Status} status");
+
+        foreach (var input in items)
+        {
+            var sheetItem = sheet.Items.FirstOrDefault(i => i.FK_ItemId == input.ItemId)
+                ?? throw new InvalidOperationException($"Item {input.ItemId} is not on this loading sheet");
+            sheetItem.QuantityReceived = input.QuantityReceived;
+        }
+
+        var ride = await rideRepo.GetByIdAsync(sheet.FK_RideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        var hasDiscrepancy = sheet.Items.Any(i => i.QuantityReceived != i.QuantityDispatched);
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            if (hasDiscrepancy)
+            {
+                sheet.Status = LoadingSheetStatus.DiscrepancyFlagged;
+            }
+            else
+            {
+                sheet.Status = LoadingSheetStatus.ReceiptConfirmed;
+                sheet.ReceiptConfirmedAt = DateTime.Now;
+                sheet.ReceiptConfirmedBy = userId;
+
+                var lines = sheet.Items.Select(i => (i.FK_ItemId, i.QuantityReceived!.Value)).ToList();
+                await ApplyLoadMovementsAsync(sheet, ride.FK_VehicleId, lines, userId);
+
+                ride.Status = RideStatus.Active;
+                ride.ActivatedAt = DateTime.Now;
+                ride.Meterstart = 0;
+                rideRepo.Update(ride);
+            }
+
+            repo.Update(sheet);
+            await uow.CommitAsync(ct);
+        }
+        catch { await uow.RollbackAsync(ct); throw; }
+
+        return ToResponse(sheet);
+    }
+
+    public async Task<LoadingSheetResponse> PatchResolveAsync(Guid id, Guid userId, CancellationToken ct = default)
+    {
+        var sheet = await repo.GetByIdAsync(id)
+            ?? throw new KeyNotFoundException("Loading sheet not found");
+
+        if (sheet.Status != LoadingSheetStatus.DiscrepancyFlagged)
+            throw new InvalidOperationException($"Cannot resolve a sheet in {sheet.Status} status");
+
+        foreach (var item in sheet.Items)
+        {
+            if (!item.QuantityReceived.HasValue)
+                throw new InvalidOperationException($"Item {item.FK_ItemId} has no received quantity to resolve from");
+            item.QuantityResolved = item.QuantityReceived.Value;
+        }
+
+        var ride = await rideRepo.GetByIdAsync(sheet.FK_RideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        sheet.Status = LoadingSheetStatus.Resolved;
+        sheet.ReceiptConfirmedAt = DateTime.Now;
+        sheet.ReceiptConfirmedBy = userId;
+
+        var lines = sheet.Items.Select(i => (i.FK_ItemId, i.QuantityResolved!.Value)).ToList();
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            await ApplyLoadMovementsAsync(sheet, ride.FK_VehicleId, lines, userId);
+
+            ride.Status = RideStatus.Active;
+            ride.ActivatedAt = DateTime.Now;
+            ride.Meterstart = 0;
+            rideRepo.Update(ride);
+
+            repo.Update(sheet);
+            await uow.CommitAsync(ct);
+        }
+        catch { await uow.RollbackAsync(ct); throw; }
+
+        return ToResponse(sheet);
+    }
+
+    private async Task ApplyLoadMovementsAsync(LoadingSheet sheet, Guid vehicleId, List<(Guid ItemId, decimal Qty)> lines, Guid userId)
+    {
+        foreach (var (itemId, qty) in lines.Where(l => l.Qty > 0))
+        {
+            var warehouseBalance = await stockRepo.GetBalanceAsync(itemId, sheet.FK_SourceWarehouseId)
+                ?? throw new InvalidOperationException($"No stock found in warehouse for item {itemId}");
+            if (warehouseBalance.Quantity < qty)
+                throw new InvalidOperationException($"Insufficient warehouse stock for item {itemId}");
+
+            warehouseBalance.Quantity -= qty;
+            warehouseBalance.UpdatedAt = DateTime.Now;
+            stockRepo.UpdateBalance(warehouseBalance);
+
+            var vehicleBalance = await stockRepo.GetBalanceAsync(itemId, vehicleId);
+            if (vehicleBalance is null)
+            {
+                await stockRepo.AddBalanceAsync(new StockBalance
+                {
+                    FK_ItemId = itemId,
+                    LocationId = vehicleId,
+                    LocationType = LocationType.Vehicle,
+                    Quantity = qty
+                });
+            }
+            else
+            {
+                vehicleBalance.Quantity += qty;
+                vehicleBalance.UpdatedAt = DateTime.Now;
+                stockRepo.UpdateBalance(vehicleBalance);
+            }
+
+            await stockRepo.AddMovementAsync(new StockMovement
+            {
+                FK_ItemId = itemId,
+                FromLocationId = sheet.FK_SourceWarehouseId,
+                FromLocationType = LocationType.Warehouse,
+                ToLocationId = vehicleId,
+                ToLocationType = LocationType.Vehicle,
+                Quantity = qty,
+                Type = MovementType.Load,
+                ReferenceId = sheet.Id,
+                CreatedBy = userId
+            });
        }
    }

    private static LoadingSheetResponse ToResponse(LoadingSheet s) =>
-        new(s.Id, s.FK_RideId, s.Status, s.PopulatedBy, s.PopulatedAt,
-            s.ConfirmedAt, s.ConfirmedBy, s.CreatedAt,
+        new(s.Id, s.FK_RideId, s.FK_SourceWarehouseId,
+            s.SourceWarehouse?.Name ?? string.Empty,
+            s.Status,
+            s.DispatchConfirmedAt, s.DispatchConfirmedBy,
+            s.ReceiptConfirmedAt, s.ReceiptConfirmedBy,
+            s.CreatedAt,
            s.Items.Select(i => new LoadingSheetItemResponse(
                i.Id, i.FK_ItemId, i.Item?.Name ?? string.Empty,
-                i.FK_WarehouseId, i.Warehouse?.Name ?? string.Empty,
-                i.QuantityDispatched, i.FK_ShopPOItemId,
-                i.ShopPOItem?.FK_ShopPOId,
-                i.ShopPOItem?.ShopPO?.FK_StoreId,
-                i.ShopPOItem?.ShopPO?.Store?.StoreName)).ToList(),
-            s.Orders.Select(o => new LoadingSheetOrderResponse(o.FK_ShopPOId)).ToList());
+                i.QuantityDispatched, i.QuantityReceived, i.QuantityResolved)).ToList());
 }
--- a/Show More
+++ b/Show More