Add local Claude settings

.claude/settings.local.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(dotnet build *)",
+      "PowerShell(Get-Command mysql -ErrorAction SilentlyContinue)",
+      "PowerShell(Get-Command mysql.exe -ErrorAction SilentlyContinue)"
+    ]
+  }
+}

.gitea/workflows/ci-cd.yml

@@ -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"

Distribution.Tests/Services/RegionServiceTests.cs

@@ -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);
-    }
 }

Distribution.Tests/obj/Debug/net9.0/Distribution.Tests.AssemblyInfo.cs

@@ -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+6c40421b2d23630d4249841425ec7906d93d5985")]
 [assembly: System.Reflection.AssemblyProductAttribute("Distribution.Tests")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Distribution.Tests")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Distribution.Tests/obj/Debug/net9.0/Distribution.Tests.AssemblyInfoInputs.cache

@@ -1 +1 @@
-100cae0f5643c7476420ef14e72b5b17dcb877fe4318c0b6cb2cff0baa955aa5
+00c7acd66c7d7d5bdbb8d4468924c7202fbdc15259175676556b482252622db8

Distribution.Tests/obj/Debug/net9.0/Distribution.Tests.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ce3b0b0b2776e1f5cfcf61d517b9f6ce1c89ed303e7e35ab0b7261f5686d0ddb
+b5689108dc90f1afbeded25902110c1295d20ccadf0aaae3dfd42fcd421eba23

Distribution.Tests/obj/Debug/net9.0/Distribution.Tests.csproj.FileListAbsolute.txt

@@ -125,3 +125,13 @@ C:\Users\lenovo\Desktop\NEWGITEA\ERP_Distribution\Distribution.Tests\obj\Debug\n
 C:\Users\lenovo\Desktop\NEWGITEA\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\Distribution.Tests.pdb
 C:\Users\lenovo\Desktop\NEWGITEA\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\Distribution.Tests.genruntimeconfig.cache
 C:\Users\lenovo\Desktop\NEWGITEA\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\ref\Distribution.Tests.dll
+D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\bin\Debug\net9.0\.msCoverageSourceRootsMapping_Distribution.Tests
+D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\bin\Debug\net9.0\CoverletSourceRootsMapping_Distribution.Tests
+D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\Distribution.Tests.csproj.AssemblyReference.cache
+D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\Distribution.Tests.GeneratedMSBuildEditorConfig.editorconfig
+D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\Distribution.Tests.AssemblyInfoInputs.cache
+D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\Distribution.Tests.AssemblyInfo.cs
+D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\Distribution.Tests.csproj.CoreCompileInputs.cache
+D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\Distribution.Tests.dll
+D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\refint\Distribution.Tests.dll
+D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\obj\Debug\net9.0\Distribution.Tests.pdb

Distribution/.dotnet/10.0.303_IsDockerContainer.dotnetUserLevelCache

@@ -1 +0,0 @@
-False

Distribution/.dotnet/10.0.303_MachineId.dotnetUserLevelCache

@@ -1 +0,0 @@
-bf7d0202-9a86-43b3-8323-402073a8c61a

Distribution/.dotnet/TelemetryStorageService/20260917054849_3c2c0c4055d6437591042769f431029b.trn

@@ -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

Distribution/.dotnet/TelemetryStorageService/20260917054849_5d637cd612c34f1d8c78e7f3b2716acb.trn

@@ -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=

Distribution/.dotnet/TelemetryStorageService/20260917054849_5e3ab89dd1164922b68cd8a91afb4dd1.trn

@@ -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=

Distribution/.dotnet/TelemetryStorageService/20260917054849_7f218358f90d4dea89beb22e746aaa5e.trn

@@ -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=

Distribution/.dotnet/TelemetryStorageService/20260917054849_a1db53cd4756496796a45e4d0e060b23.trn

@@ -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

Distribution/.dotnet/TelemetryStorageService/20260917054849_ace67540371e4eae93f6d0895b617653.trn

@@ -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

Distribution/.dotnet/TelemetryStorageService/20260917054849_b532e6064ddb4074a63b8d295ce297d9.trn

@@ -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==

Distribution/.dotnet/TelemetryStorageService/20260917054849_f3a1d0f218a5492cacc3df523c5ff9b2.trn

@@ -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

Distribution/.dotnet/TelemetryStorageService/20260917054850_55c23537298a4cdd905fff2a066c61c8.trn

@@ -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

Distribution/.dotnet/TelemetryStorageService/20260917054850_6247cb09d42c4e96ace11389a1a91bf7.trn

@@ -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==

Distribution/.dotnet/TelemetryStorageService/20260917054850_965e4b827a0a4c4d8d08cc2d43e6bc44.trn

@@ -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

Distribution/.dotnet/TelemetryStorageService/20260917054850_dcc554cb89e74159855b8fda6d16c235.trn

@@ -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==

Distribution/.dotnet/TelemetryStorageService/20260917054856_09e56a2b38574bdb8e196ea189c58142.trn

@@ -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=

Distribution/.dotnet/TelemetryStorageService/20260917054856_3e9580a6a36741b390d50bd290250e42.trn

@@ -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=

Distribution/.dotnet/TelemetryStorageService/20260917054856_5d9eff7293784d3c9fe7fbec6ab2a85b.trn

@@ -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

Distribution/.dotnet/TelemetryStorageService/7b4fdabac24445e18bb7e730fceaf989

@@ -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=

Distribution/.dotnet/sdk-advertising/10.0.300/microsoft.net.workloads/10.0.303.1/microsoft.net.workloads.workloadset.json

@@ -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"
-}

Distribution/.dotnet/sdk-advertising/10.0.300/microsoft.net.workloads/AdvertisedManifestFeatureBand.txt

@@ -1 +0,0 @@
-10.0.300

Distribution/.dotnet/sdk-advertising/10.0.300/microsoft.net.workloads/workloadVersion.txt

@@ -1 +0,0 @@
-10.0.303.1

Distribution/Data/AppDBContext.cs

@@ -16,13 +16,11 @@ 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<Sale> Sales { get; set; }
+    public DbSet<Order> Orders { get; set; }
+    public DbSet<OrderItem> OrderItems { get; set; }
     public DbSet<Invoice> Invoices { get; set; }
-    public DbSet<LoadingSheetOrder> LoadingSheetOrders { get; set; }
     public DbSet<DeliveryRun> DeliveryRuns { get; set; }
     public DbSet<User> Users { get; set; }
     public DbSet<Role> Roles { get; set; }
@@ -33,11 +31,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 +49,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; }
@@ -64,11 +62,14 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
     public DbSet<RegionAgencyMap> RegionAgencyMaps { get; set; }
     public DbSet<RegionalTaxRule> RegionalTaxRules { get; set; }
     public DbSet<RouteVisitLog> RouteVisitLogs { get; set; }
-    public DbSet<SysConfig> SysConfigs { get; set; }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
-        // --- Composite PKs ---
+        // OrderItem uses its inherited Template.Id as PK (no composite key on
+        // {FK_OrderId, FK_ItemId}) so that editing a PO's items can soft-delete the current
+        // row and insert a fresh one for the same item — versioning per order_invoice_lifecycle.md.
+        modelBuilder.Entity<OrderItem>()
+            .HasIndex(oi => oi.FK_OrderId);
 
         modelBuilder.Entity<RolePermission>()
             .HasKey(rp => new { rp.FK_RoleId, rp.FK_PermissionId });
@@ -82,39 +83,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 +112,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 +124,76 @@ 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)
+            .IsRequired(false);
+
+        modelBuilder.Entity<Order>()
+            .HasOne(o => o.CreatedByUser)
+            .WithMany()
+            .HasForeignKey(o => o.CreatedByUserId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        modelBuilder.Entity<Order>()
+            .HasOne(o => o.ConfirmedByUser)
+            .WithMany()
+            .HasForeignKey(o => o.ConfirmedByUserId)
+            .OnDelete(DeleteBehavior.Restrict)
+            .IsRequired(false);
+
+        // Order.InvoiceId is a plain column with no DB-level FK constraint — deliberately
+        // unmapped as a relationship, per order_invoice_lifecycle.md.
+        modelBuilder.Entity<Order>()
+            .Property(o => o.InvoiceId)
+            .HasColumnName("InvoiceId");
+
+        modelBuilder.Entity<Invoice>()
+            .HasOne(i => i.Order)
+            .WithMany()
+            .HasForeignKey(i => i.FK_OrderId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        modelBuilder.Entity<Invoice>()
+            .HasOne(i => i.CreatedByUser)
+            .WithMany()
+            .HasForeignKey(i => i.CreatedByUserId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        modelBuilder.Entity<Invoice>()
+            .HasOne(i => i.PrintedByUser)
+            .WithMany()
+            .HasForeignKey(i => i.PrintedByUserId)
+            .OnDelete(DeleteBehavior.Restrict)
+            .IsRequired(false);
+
+        modelBuilder.Entity<Invoice>()
+            .HasOne(i => i.FinalizedByUser)
+            .WithMany()
+            .HasForeignKey(i => i.FinalizedByUserId)
+            .OnDelete(DeleteBehavior.Restrict)
+            .IsRequired(false);
 
         modelBuilder.Entity<SchemeRedemption>()
             .HasOne(r => r.Scheme)
@@ -230,11 +202,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 +213,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 +241,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 +277,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 +301,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 +319,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 +358,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 +416,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 +423,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,25 +450,6 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
             .HasIndex(r => r.FK_RegionId)
             .IsUnique();
 
-        // --- SysConfig ---
-
-        modelBuilder.Entity<SysConfig>()
-            .HasKey(c => c.Key);
-
-        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 }
-        );
-
         Seed.RoleAndPermissionSeed.Apply(modelBuilder);
         Seed.MasterDataSeed.Apply(modelBuilder);
         Seed.OperationsDataSeed.Apply(modelBuilder);

Distribution/Data/Seed/CommerceSeed.cs

@@ -16,9 +16,6 @@ public static class CommerceSeed
     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");
@@ -83,18 +80,15 @@ public static class CommerceSeed
         );
 
         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) }
+            new SchemeRedemption { Id = SchemeRedemption1Id, FK_SchemeId = Scheme1Id, FK_OrderId = OperationsDataSeed.Order1Id, 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 }
+            new Payment { Id = Payment1Id, FK_SaleId = OperationsDataSeed.Sale1Id, FK_StoreId = MasterDataSeed.FortStoreId, Amount = 3000m, Method = PaymentMethod.Cash, CollectedAt = new DateTime(2026, 8, 25, 9, 30, 0), CollectedBy = MasterDataSeed.SalesRep1UserId, CreatedAt = new DateTime(2026, 8, 25, 9, 30, 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 }
+            new SaleReturn { Id = SaleReturn1Id, FK_OrderId = OperationsDataSeed.Order1Id, Mode = ReturnMode.CreditDeduction, TotalCreditAmount = 300m, CreatedByUserId = MasterDataSeed.SalesRep1UserId, CreatedAt = new DateTime(2026, 8, 26), IsActive = true }
         );
 
         modelBuilder.Entity<SaleReturnItem>().HasData(

Distribution/Data/Seed/MasterDataSeed.cs

@@ -84,8 +84,8 @@ public static class MasterDataSeed
         );
 
         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 }
+            new Region { Id = WesternRegionId, Name = "Western Province", CreatedAt = SeedDate, IsActive = true },
+            new Region { Id = CentralRegionId, Name = "Central Province", CreatedAt = SeedDate, IsActive = true }
         );
 
         modelBuilder.Entity<Models.Route>().HasData(
@@ -96,12 +96,12 @@ public static class MasterDataSeed
         );
 
         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 }
+            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", KycStatus = KycStatus.Verified, 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", KycStatus = KycStatus.Verified, 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", KycStatus = KycStatus.Pending, 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, KycStatus = KycStatus.Pending, 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", KycStatus = KycStatus.Verified, 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, KycStatus = KycStatus.Pending, CreatedAt = SeedDate, IsActive = true }
         );
 
         modelBuilder.Entity<Warehouse>().HasData(

Distribution/Data/Seed/OperationsDataSeed.cs

@@ -8,20 +8,15 @@ 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 Sale2Id = new("32000000-0000-0000-0000-000000000002");
 
-    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 Order1Id = new("33000000-0000-0000-0000-000000000001");
+    internal static readonly Guid Order2Id = new("33000000-0000-0000-0000-000000000002");
 
-    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 OrderItem1Id = new("34000000-0000-0000-0000-000000000001");
+    internal static readonly Guid OrderItem2Id = new("34000000-0000-0000-0000-000000000002");
+    internal static readonly Guid OrderItem3Id = new("34000000-0000-0000-0000-000000000003");
 
     internal static readonly Guid LoadingSheet1Id = new("35000000-0000-0000-0000-000000000001");
 
@@ -36,12 +31,16 @@ public static class OperationsDataSeed
             new DeliveryRun
             {
                 Id = ClosedSaleRunId,
+                RideType = RideType.Sale,
                 Status = RideStatus.Closed,
                 FK_VehicleId = MasterDataSeed.VanVehicleId,
                 FK_DriverProfileId = MasterDataSeed.Driver1ProfileId,
+                FK_RouteId = MasterDataSeed.ColomboRouteId,
+                FK_SourceWarehouseId = MasterDataSeed.ColomboWarehouseId,
                 Meterstart = 10500,
                 Meterend = 10550,
                 StartedAt = new DateTime(2026, 8, 25, 8, 0, 0),
+                ActivatedAt = new DateTime(2026, 8, 25, 8, 15, 0),
                 ClosedAt = new DateTime(2026, 8, 25, 14, 0, 0),
                 CreatedAt = new DateTime(2026, 8, 25, 7, 30, 0),
                 IsActive = true
@@ -49,101 +48,88 @@ public static class OperationsDataSeed
             new DeliveryRun
             {
                 Id = ActiveDeliveryRunId,
-                Status = RideStatus.Open,
+                RideType = RideType.Delivery,
+                Status = RideStatus.Active,
                 FK_VehicleId = MasterDataSeed.TruckVehicleId,
                 FK_DriverProfileId = MasterDataSeed.Driver2ProfileId,
+                FK_RouteId = MasterDataSeed.KandyRouteId,
+                FK_SourceWarehouseId = MasterDataSeed.KandyWarehouseId,
                 Meterstart = 20300,
                 Meterend = 0,
                 StartedAt = new DateTime(2026, 8, 30, 9, 0, 0),
+                ActivatedAt = new DateTime(2026, 8, 30, 9, 20, 0),
                 ClosedAt = null,
                 CreatedAt = new DateTime(2026, 8, 30, 8, 45, 0),
                 IsActive = true
             }
         );
 
-        modelBuilder.Entity<ShopPO>().HasData(
-            new ShopPO
+        modelBuilder.Entity<Sale>().HasData(
+            new Sale
             {
-                Id = ShopPO1Id,
+                Id = Sale1Id,
+                SaleDate = new DateTime(2026, 8, 25, 9, 0, 0),
                 FK_StoreId = MasterDataSeed.FortStoreId,
-                RaisedById = MasterDataSeed.SalesRep1UserId,
-                InvoiceId = Invoice1Id,
+                CreatedByUserId = MasterDataSeed.SalesRep1UserId,
+                FK_RideId = ClosedSaleRunId,
                 TotalAmount = 3000m,
-                Status = ShopPOStatus.Fulfilled,
-                ConfirmedAt = new DateTime(2026, 8, 25, 8, 30, 0),
-                ConfirmedBy = MasterDataSeed.Supervisor1UserId,
+                Status = SaleStatus.Completed,
+                PaymentStatus = PaymentStatus.Paid,
+                FulfillImmediately = false,
+                CompletedAt = new DateTime(2026, 8, 25, 9, 30, 0),
+                CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0),
+                IsActive = true
+            },
+            new Sale
+            {
+                Id = Sale2Id,
+                SaleDate = new DateTime(2026, 8, 30, 10, 0, 0),
+                FK_StoreId = MasterDataSeed.KandyStoreId,
+                CreatedByUserId = MasterDataSeed.SalesRep2UserId,
+                FK_RideId = ActiveDeliveryRunId,
+                TotalAmount = 1200m,
+                Status = SaleStatus.Pending,
+                PaymentStatus = PaymentStatus.Pending,
+                FulfillImmediately = false,
+                CompletedAt = null,
+                CreatedAt = new DateTime(2026, 8, 30, 10, 0, 0),
+                IsActive = true
+            }
+        );
+
+        modelBuilder.Entity<Order>().HasData(
+            new Order
+            {
+                Id = Order1Id,
+                FK_SaleId = Sale1Id,
+                OrderDate = new DateTime(2026, 8, 25, 9, 0, 0),
+                FK_StoreId = MasterDataSeed.FortStoreId,
+                CreatedByUserId = MasterDataSeed.SalesRep1UserId,
+                TotalAmount = 3000m,
+                Status = OrderStatus.Fulfilled,
                 FulfilledAt = new DateTime(2026, 8, 25, 13, 0, 0),
                 CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0),
                 IsActive = true
             },
-            new ShopPO
+            new Order
             {
-                Id = ShopPO2Id,
+                Id = Order2Id,
+                FK_SaleId = Sale2Id,
+                OrderDate = new DateTime(2026, 8, 30, 10, 0, 0),
                 FK_StoreId = MasterDataSeed.KandyStoreId,
-                RaisedById = MasterDataSeed.SalesRep2UserId,
-                InvoiceId = null,
+                CreatedByUserId = MasterDataSeed.SalesRep2UserId,
                 TotalAmount = 1200m,
-                Status = ShopPOStatus.Pending,
-                ConfirmedAt = null,
-                ConfirmedBy = null,
+                Status = OrderStatus.Pending,
                 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<OrderItem>().HasData(
+            new OrderItem { Id = OrderItem1Id, FK_OrderId = Order1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, Quantity = 30, QuantityFulfilled = 30, UnitPrice = 60m, CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0), IsActive = true },
+            new OrderItem { Id = OrderItem2Id, FK_OrderId = Order1Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Quantity = 24, QuantityFulfilled = 24, UnitPrice = 50m, CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0), IsActive = true },
+            new OrderItem { Id = OrderItem3Id, FK_OrderId = Order2Id, FK_ItemId = MasterDataSeed.Coke1500ItemId, Quantity = 10, QuantityFulfilled = 0, UnitPrice = 120m, CreatedAt = new DateTime(2026, 8, 30, 10, 0, 0), IsActive = true }
         );
 
         modelBuilder.Entity<LoadingSheet>().HasData(
@@ -151,19 +137,20 @@ public static class OperationsDataSeed
             {
                 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,
+                FK_SourceWarehouseId = MasterDataSeed.ColomboWarehouseId,
+                Status = LoadingSheetStatus.ReceiptConfirmed,
+                DispatchConfirmedAt = new DateTime(2026, 8, 25, 7, 45, 0),
+                DispatchConfirmedBy = MasterDataSeed.Supervisor1UserId,
+                ReceiptConfirmedAt = new DateTime(2026, 8, 25, 14, 5, 0),
+                ReceiptConfirmedBy = MasterDataSeed.Driver1UserId,
                 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 }
+            new LoadingSheetItem { Id = LoadingSheetItem1Id, FK_LoadingSheetId = LoadingSheet1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, QuantityDispatched = 50m, QuantityReceived = 50m, QuantityResolved = null },
+            new LoadingSheetItem { Id = LoadingSheetItem2Id, FK_LoadingSheetId = LoadingSheet1Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, QuantityDispatched = 30m, QuantityReceived = 30m, QuantityResolved = null }
         );
 
         modelBuilder.Entity<DeliveryTask>().HasData(
@@ -171,7 +158,7 @@ public static class OperationsDataSeed
             {
                 Id = DeliveryTask1Id,
                 FK_RideId = ActiveDeliveryRunId,
-                FK_ShopPOId = ShopPO2Id,
+                FK_OrderId = Order2Id,
                 Sequence = 1,
                 Status = DeliveryTaskStatus.Pending,
                 CustomerConfirmed = false,

Distribution/Data/Seed/OperationsExtrasSeed.cs

@@ -27,9 +27,13 @@ public static class OperationsExtrasSeed
     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 StoreKycDocument1Id = new("63000000-0000-0000-0000-000000000001");
+    private static readonly Guid StoreKycDocument2Id = new("63000000-0000-0000-0000-000000000002");
 
     private static readonly Guid DriverComplianceConfig1Id = new("64000000-0000-0000-0000-000000000001");
 
+    private static readonly Guid RideCancelRequest1Id = new("65000000-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");
 
@@ -81,10 +85,31 @@ public static class OperationsExtrasSeed
             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<StoreKycDocument>().HasData(
+            new StoreKycDocument { Id = StoreKycDocument1Id, FK_StoreId = MasterDataSeed.FortStoreId, DocumentType = "Business Registration", FileReference = "seed/kyc/fort-mini-mart-brc.pdf", UploadedAt = new DateTime(2026, 8, 10), CreatedAt = new DateTime(2026, 8, 10), IsActive = true },
+            new StoreKycDocument { Id = StoreKycDocument2Id, FK_StoreId = MasterDataSeed.WattalaStoreId, DocumentType = "NIC", FileReference = "seed/kyc/wattala-owner-nic.pdf", UploadedAt = new DateTime(2026, 8, 12), CreatedAt = new DateTime(2026, 8, 12), IsActive = true }
+        );
+
         modelBuilder.Entity<DriverComplianceConfig>().HasData(
             new DriverComplianceConfig { Id = DriverComplianceConfig1Id, EnforceLicenseExpiry = true, EnforceMedicalClearance = true, UpdatedAt = new DateTime(2026, 8, 20), UpdatedBy = MasterDataSeed.Supervisor1UserId }
         );
 
+        modelBuilder.Entity<RideCancelRequest>().HasData(
+            new RideCancelRequest
+            {
+                Id = RideCancelRequest1Id,
+                FK_RideId = OperationsDataSeed.ActiveDeliveryRunId,
+                TypeCode = CancelRequestType.VehicleBreakdown,
+                Reason = "Reported minor engine issue, resolved after inspection",
+                RequestedBy = MasterDataSeed.Driver2UserId,
+                RequestedAt = new DateTime(2026, 8, 30, 9, 10, 0),
+                Status = CancelRequestStatus.Rejected,
+                ApprovedBy = MasterDataSeed.Supervisor1UserId,
+                ApprovedAt = new DateTime(2026, 8, 30, 9, 15, 0)
+            }
+        );
+
         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 }

Distribution/Features/DeliveryRide/DeliveryTaskController.cs

@@ -1,12 +1,10 @@
-using Distribution.Models;
-using Distribution.Infra.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")]
     public async Task<IActionResult> Generate(Guid rideId, CancellationToken ct)
@@ -28,16 +26,6 @@ public class DeliveryTaskController(DeliveryTaskService service, ICurrentUserSer
         return Ok(result);
     }
 
-    [HttpGet("delivery-tasks")]
-    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}")]
     public async Task<IActionResult> GetById(Guid id)
     {
@@ -62,7 +50,7 @@ public class DeliveryTaskController(DeliveryTaskService service, ICurrentUserSer
     {
         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(); }

Distribution/Features/DeliveryRide/DeliveryTaskDTOs.cs

@@ -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,

Distribution/Features/DeliveryRide/DeliveryTaskRepository.cs

@@ -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);

Distribution/Features/DeliveryRide/DeliveryTaskService.cs

@@ -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,58 @@ 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 vehicleBalance = await stockRepo.GetBalanceAsync(item.FK_ItemId, vehicleId);
+                var availableQuantity = vehicleBalance?.Quantity ?? 0;
                 var itemName = item.Item?.Name ?? item.FK_ItemId.ToString();
 
-                await mover.MoveAsync(item.FK_ItemId, itemName,
-                    vehicleId, LocationType.Vehicle,
-                    StockService.ExternalLocationId, LocationType.External,
-                    item.QuantityFulfilled, MovementType.Sale, task.FK_ShopPOId, userId);
+                if (availableQuantity < item.QuantityFulfilled)
+                    throw new InvalidOperationException(
+                        $"Insufficient vehicle stock for item '{itemName}': available {availableQuantity}, required {item.QuantityFulfilled}");
+
+                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,
+                    ToLocationId = StockService.ExternalLocationId,
+                    ToLocationType = LocationType.External,
+                    Quantity = item.QuantityFulfilled,
+                    Type = MovementType.Sale,
+                    ReferenceId = task.FK_OrderId
+                });
             }
 
             repo.Update(task);
-            shopPORepo.Update(shopPO);
+            orderRepo.Update(order);
+
+            if (fullyDelivered && order.FK_SaleId is Guid saleId)
+            {
+                var sale = await saleRepo.GetByIdAsync(saleId)
+                    ?? throw new KeyNotFoundException("Sale not found");
+                sale.Status = SaleStatus.Completed;
+                sale.CompletedAt = DateTime.Now;
+                saleRepo.Update(sale);
+            }
 
             await uow.CommitAsync(ct);
         }

Distribution/Features/DeliveryRide/IDeliveryTaskRepository.cs

@@ -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);

Distribution/Features/Grn/GrnController.cs

@@ -32,28 +32,13 @@ public class GrnController(GrnService service, ICurrentUserService currentUser)
         if (userId is null) return BadRequest(new { error = "ReceivedByUserId is required while auth is unavailable" });
         try
         {
-            var inner = new CreateGrnRequest(request.WarehouseId, request.Items,
-                DiscountPercent: request.DiscountPercent, VatPercent: request.VatPercent, NbtPercent: request.NbtPercent);
+            var inner = new CreateGrnRequest(request.WarehouseId, request.Items);
             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")]
-    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);
-            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")]
     public async Task<IActionResult> GetByPurchaseOrder(Guid id) =>
         Ok(await service.GetByPurchaseOrderIdAsync(id));

Distribution/Features/Grn/GrnDTOs.cs

@@ -1,104 +1,35 @@
 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(
-    // 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 GrnItemRequest(Guid PurchaseOrderItemId, int AcceptedQuantity, int RejectedQuantity);
 
 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);
+    Guid? ReceivedByUserId = 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);
+    Guid? ReceivedByUserId = null);
 
 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);

Distribution/Features/Grn/GrnPricing.cs

@@ -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.");
-    }
-}

Distribution/Features/Grn/GrnRepository.cs

@@ -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);
 }

Distribution/Features/Grn/GrnService.cs

@@ -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,48 @@ 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,
+                    FromLocationId = StockService.ExternalLocationId,
+                    FromLocationType = LocationType.External,
+                    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; }

Distribution/Features/Invoice/IInvoiceRepository.cs

@@ -1,14 +1,9 @@
-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);
+    Task<Models.Invoice?> GetByOrderIdAsync(Guid orderId);
+    Task AddAsync(Models.Invoice entity);
+    void Update(Models.Invoice entity);
 }

Distribution/Features/Invoice/InvoiceController.cs

@@ -1,34 +1,11 @@
-using Microsoft.AspNetCore.Mvc;
-using Distribution.Infra.Authorization;
-using Distribution.Models;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Distribution.Features.Invoice;
 
 [ApiController]
 [Route("api/invoices")]
-public class InvoiceController(InvoiceService service, ICurrentUserService currentUser) : ControllerBase
+public class InvoiceController(InvoiceService service) : 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)
     {
@@ -36,35 +13,36 @@ public class InvoiceController(InvoiceService service, ICurrentUserService curre
         return result is null ? NotFound() : Ok(result);
     }
 
-    [HttpPost("{id:guid}/print")]
-    public async Task<IActionResult> Print(Guid id, [FromBody] PrintInvoiceRequest? request, CancellationToken ct)
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateInvoiceRequest 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);
+            var result = await service.CreateAsync(request, ct);
+            return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
+        }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("{id:guid}/print")]
+    public async Task<IActionResult> Print(Guid id, CancellationToken ct)
+    {
+        try
+        {
+            var result = await service.PrintAsync(id, ct);
+            return result is null ? NotFound() : 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)
+    public async Task<IActionResult> Finalize(Guid id, 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);
+            var result = await service.FinalizeAsync(id, request, ct);
+            return result is null ? NotFound() : Ok(result);
         }
-        catch (KeyNotFoundException) { return NotFound(); }
         catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
     }
 }

Distribution/Features/Invoice/InvoiceDTOs.cs

@@ -1,25 +1,29 @@
-using Distribution.Models;
+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 CreateInvoiceRequest(Guid OrderId);
+
+public record FinalizeInvoiceItemRequest(Guid OrderItemId, decimal DeliveredQuantity, decimal FreeQuantity);
+
+public record FinalizeInvoiceReturnRequest(Guid ItemId, decimal Quantity, ReturnReasonCode ReasonCode);
+
+public record FinalizeInvoiceDiscountRequest(DiscountType Type, decimal Value, string? Reason);
+
+public record FinalizeInvoiceRequest(
+    List<FinalizeInvoiceItemRequest> Items,
+    List<FinalizeInvoiceReturnRequest>? Returns,
+    FinalizeInvoiceDiscountRequest? Discount);
 
 public record InvoiceResponse(
     Guid Id,
-    Guid ShopPOId,
-    string StoreName,
+    Guid OrderId,
     InvoiceStatus Status,
-    PaymentStatus PaymentStatus,
-    Guid CreatedBy,
+    Guid CreatedByUserId,
     DateTime? PrintedAt,
-    Guid? PrintedBy,
+    Guid? PrintedByUserId,
     DateTime? FinalizedAt,
-    Guid? FinalizedBy,
+    Guid? FinalizedByUserId,
     decimal TotalAmount,
     bool IsActive,
     DateTime CreatedAt);
-
-public record OutstandingPaymentsResponse(int InvoiceCount, decimal OutstandingAmount);

Distribution/Features/Invoice/InvoiceRepository.cs

@@ -1,5 +1,4 @@
-using Distribution.Data;
-using Distribution.Models;
+using Distribution.Data;
 using Microsoft.EntityFrameworkCore;
 
 namespace Distribution.Features.Invoice;
@@ -7,50 +6,14 @@ 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);
+        await context.Invoices.FindAsync(id);
 
-    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<Models.Invoice?> GetByOrderIdAsync(Guid orderId) =>
+        await context.Invoices.FirstOrDefaultAsync(i => i.FK_OrderId == orderId && 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 AddAsync(Models.Invoice entity) =>
+        await context.Invoices.AddAsync(entity);
 
-    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);
+    public void Update(Models.Invoice entity) =>
+        context.Invoices.Update(entity);
 }

Distribution/Features/Invoice/InvoiceService.cs

@@ -1,97 +1,202 @@
-using Distribution.Features.Stock;
+using Distribution.Features.Item;
+using Distribution.Features.Order;
+using Distribution.Features.Returns;
 using Distribution.Infra.Authorization;
 using Distribution.Infra.UoW;
 using Distribution.Models;
+using Microsoft.Extensions.Configuration;
 
 namespace Distribution.Features.Invoice;
 
 public class InvoiceService(
     IInvoiceRepository repo,
+    IOrderRepository orderRepo,
+    IReturnRepository returnRepo,
+    IItemRepository itemRepo,
     IUnitOfWork uow,
-    ICurrentUserService currentUser)
+    ICurrentUserService currentUser,
+    IConfiguration configuration)
 {
     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);
+        new(i.Id, i.FK_OrderId, i.Status, i.CreatedByUserId, i.PrintedAt, i.PrintedByUserId,
+            i.FinalizedAt, i.FinalizedByUserId, i.TotalAmount, i.IsActive, i.CreatedAt);
+
+    private bool IsModeB =>
+        configuration.GetValue<string>("OrderInvoice:InvoiceCreationMode") != "A";
 
     public async Task<InvoiceResponse?> GetByIdAsync(Guid id)
     {
         var invoice = await repo.GetByIdAsync(id);
-        return invoice is null ? null : ToResponse(invoice);
+        return invoice is null || !invoice.IsActive ? null : ToResponse(invoice);
     }
 
-    public async Task<PagedResponse<InvoiceResponse>> GetAllAsync(Guid? agentId, Guid? routeId, Guid? shopId, InvoiceStatus? status, PaymentStatus? paymentStatus, int page, int pageSize)
+    /// <summary>Mode B only — creates the Invoice (Draft) for an already-Confirmed PO as a
+    /// separate action. Mode A creates the Invoice atomically via
+    /// OrderService.ConfirmAndCreateInvoiceAsync instead.</summary>
+    public async Task<InvoiceResponse> CreateAsync(CreateInvoiceRequest request, CancellationToken ct = default)
     {
-        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());
-    }
+        if (!IsModeB)
+            throw new InvalidOperationException("POST /api/invoices is not enabled — this system uses InvoiceCreationMode A, which creates the Invoice as part of PO confirmation.");
 
-    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);
-    }
+        var order = await orderRepo.GetByIdAsync(request.OrderId);
+        if (order is null || !order.IsActive)
+            throw new InvalidOperationException("Order not found.");
+        if (order.ConfirmedAt is null)
+            throw new InvalidOperationException("Only a Confirmed PO can have an Invoice created for it.");
+        if (order.InvoiceId is not null)
+            throw new InvalidOperationException("An Invoice already exists for this PO.");
 
-    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;
+        var invoice = new Models.Invoice
+        {
+            FK_OrderId = order.Id,
+            Status = InvoiceStatus.Draft,
+            CreatedByUserId = currentUser.UserId ?? throw new InvalidOperationException("No authenticated user."),
+            TotalAmount = order.TotalAmount,
+        };
+        order.InvoiceId = invoice.Id;
 
         await uow.BeginAsync(ct);
-        try { repo.Update(invoice); await uow.CommitAsync(ct); }
-        catch { await uow.RollbackAsync(ct); throw; }
+        try
+        {
+            await repo.AddAsync(invoice);
+            orderRepo.Update(order);
+            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)
+    /// <summary>Draft → Printed. The agent takes the physical copy to the field and may make
+    /// handwritten edits during the ride.</summary>
+    public async Task<InvoiceResponse?> PrintAsync(Guid id, CancellationToken ct = default)
     {
-        var invoice = await repo.GetByIdAsync(id)
-            ?? throw new KeyNotFoundException("Invoice not found");
+        var invoice = await repo.GetByIdAsync(id);
+        if (invoice is null || !invoice.IsActive) return null;
+        if (invoice.Status != InvoiceStatus.Draft)
+            throw new InvalidOperationException("Only a Draft invoice can be printed.");
 
-        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;
+        invoice.Status = InvoiceStatus.Printed;
+        invoice.PrintedAt = DateTime.Now;
+        invoice.PrintedByUserId = currentUser.UserId;
 
         await uow.BeginAsync(ct);
-        try { repo.Update(invoice); await uow.CommitAsync(ct); }
-        catch { await uow.RollbackAsync(ct); throw; }
+        try
+        {
+            repo.Update(invoice);
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        return ToResponse(invoice);
+    }
+
+    /// <summary>Printed → Finalized. The office worker enters whatever the agent handwrote on the
+    /// returned printed copy — delivered/free quantities per line, returns/damage (reusing the
+    /// SaleReturn/CreditNote shape from 18_returns_claims.md), and an optional invoice-level
+    /// discount. Payload shape resolved in order_invoice_lifecycle.md Open Question 6.</summary>
+    public async Task<InvoiceResponse?> FinalizeAsync(Guid id, FinalizeInvoiceRequest request, CancellationToken ct = default)
+    {
+        var invoice = await repo.GetByIdAsync(id);
+        if (invoice is null || !invoice.IsActive) return null;
+        if (invoice.Status != InvoiceStatus.Printed)
+            throw new InvalidOperationException("An invoice can only be finalized from Printed — Draft → Finalized directly is not a valid transition.");
+        if (request.Items is null || request.Items.Count == 0)
+            throw new InvalidOperationException("Finalize must include at least one line item.");
+
+        var order = await orderRepo.GetByIdAsync(invoice.FK_OrderId)
+            ?? throw new InvalidOperationException("Order not found for this Invoice.");
+        var orderItems = (await orderRepo.GetItemsByOrderIdAsync(order.Id)).ToDictionary(oi => oi.Id);
+
+        decimal subtotal = 0;
+        foreach (var line in request.Items)
+        {
+            if (!orderItems.TryGetValue(line.OrderItemId, out var orderItem))
+                throw new InvalidOperationException($"OrderItem {line.OrderItemId} does not belong to this Invoice's PO.");
+            if (line.DeliveredQuantity < 0 || line.FreeQuantity < 0)
+                throw new InvalidOperationException("Delivered/free quantity cannot be negative.");
+
+            subtotal += line.DeliveredQuantity * orderItem.UnitPrice; // freeQuantity never bills
+            orderItem.QuantityFulfilled = (int)(line.DeliveredQuantity + line.FreeQuantity);
+        }
+
+        Models.SaleReturn? saleReturn = null;
+        decimal creditNoteAmount = 0;
+        if (request.Returns is { Count: > 0 })
+        {
+            saleReturn = new Models.SaleReturn
+            {
+                FK_OrderId = order.Id,
+                Mode = ReturnMode.CreditDeduction,
+                CreatedByUserId = currentUser.UserId ?? throw new InvalidOperationException("No authenticated user."),
+            };
+
+            foreach (var line in request.Returns)
+            {
+                if (line.Quantity <= 0)
+                    throw new InvalidOperationException("Return quantity must be greater than zero.");
+
+                var matchingOrderItem = orderItems.Values.FirstOrDefault(oi => oi.FK_ItemId == line.ItemId);
+                var unitPrice = matchingOrderItem?.UnitPrice
+                    ?? (await itemRepo.GetByIdAsync(line.ItemId))?.SalePrice
+                    ?? 0;
+
+                saleReturn.Items.Add(new SaleReturnItem
+                {
+                    FK_ItemId = line.ItemId,
+                    Quantity = line.Quantity,
+                    ReasonCode = line.ReasonCode,
+                    UnitPrice = unitPrice,
+                });
+            }
+
+            creditNoteAmount = saleReturn.Items.Sum(i => i.Quantity * i.UnitPrice);
+            saleReturn.TotalCreditAmount = creditNoteAmount;
+        }
+
+        decimal discountAmount = request.Discount switch
+        {
+            { Type: DiscountType.Amount } d => d.Value,
+            { Type: DiscountType.Percentage } d => subtotal * d.Value / 100m,
+            null => 0,
+            _ => 0,
+        };
+
+        invoice.TotalAmount = Math.Max(0, subtotal - discountAmount - creditNoteAmount);
+        invoice.Status = InvoiceStatus.Finalized;
+        invoice.FinalizedAt = DateTime.Now;
+        invoice.FinalizedByUserId = currentUser.UserId;
+        order.TotalAmount = invoice.TotalAmount;
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            repo.Update(invoice);
+            orderRepo.Update(order);
+            if (saleReturn is not null)
+            {
+                await returnRepo.AddAsync(saleReturn);
+                await returnRepo.AddCreditNoteAsync(new CreditNote
+                {
+                    FK_SaleReturnId = saleReturn.Id,
+                    Amount = creditNoteAmount,
+                });
+            }
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
 
         return ToResponse(invoice);
     }

Distribution/Features/Item/ItemDTOs.cs

@@ -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,
@@ -28,14 +21,7 @@ public record UpdateItemRequest(
     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);
+    bool IsActive = true);
 
 public record ReplaceConversionsRequest(List<UomConversionRequest> Conversions);
 
@@ -54,13 +40,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 +58,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,

Distribution/Features/Item/ItemService.cs

@@ -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)
@@ -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
         };
 
@@ -125,9 +77,6 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow, SysConfig.SysCon
         if (item is null) 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,13 +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);

Distribution/Features/LoadingEvent/ILoadingSheetRepository.cs

@@ -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);
 }

Distribution/Features/LoadingEvent/LoadingSheetController.cs

@@ -1,4 +1,4 @@
-using Distribution.Models;
+using Distribution.Models;
 using Distribution.Infra.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -12,12 +12,10 @@ public class LoadingSheetController(LoadingSheetService service, ICurrentUserSer
     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)
     {
-        var result = await service.GetAllAsync(rideId, status, routeId, regionId, page, pageSize);
+        var result = await service.GetAllAsync(rideId, status, page, pageSize);
         return Ok(result);
     }
 
@@ -31,13 +29,9 @@ public class LoadingSheetController(LoadingSheetService service, ICurrentUserSer
     [HttpPost]
     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(); }
@@ -56,16 +50,90 @@ public class LoadingSheetController(LoadingSheetService service, ICurrentUserSer
         catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
     }
 
-    [HttpPost("{id:guid}/confirm")]
-    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(); }

Distribution/Features/LoadingEvent/LoadingSheetDTOs.cs

@@ -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);

Distribution/Features/LoadingEvent/LoadingSheetRepository.cs

@@ -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
-        }));
-    }
 }

Distribution/Features/LoadingEvent/LoadingSheetService.cs

@@ -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());
 }

Distribution/Features/Order/IOrderRepository.cs

@@ -0,0 +1,19 @@
+namespace Distribution.Features.Order;
+
+public interface IOrderRepository
+{
+    Task<Models.Order?> GetByIdAsync(Guid id);
+    Task<List<Models.Order>> GetAllAsync();
+    Task<Models.Order?> GetBySaleIdAsync(Guid saleId);
+    Task AddAsync(Models.Order entity);
+    void Update(Models.Order entity);
+    void Remove(Models.Order entity);
+    Task<List<Models.OrderItem>> GetItemsByOrderIdAsync(Guid orderId, bool includeHistory = false);
+    Task<List<Models.Order>> GetByStoreIdAsync(Guid storeId);
+    Task AddItemsAsync(IEnumerable<Models.OrderItem> items);
+    Task<List<Models.Order>> GetPendingByRouteIdAsync(Guid routeId);
+
+    /// <summary>Confirmed POs (ConfirmedAt set, not cancelled) matching the optional filters —
+    /// backs Mode B's "office browses Confirmed POs" step per order_invoice_lifecycle.md.</summary>
+    Task<List<Models.Order>> GetConfirmedAsync(Guid? agentId, Guid? routeId, Guid? storeId);
+}

Distribution/Features/Order/OrderController.cs

@@ -0,0 +1,99 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace Distribution.Features.Order;
+
+[ApiController]
+[Route("api/orders")]
+public class OrderController(OrderService service) : ControllerBase
+{
+    [HttpGet]
+    public async Task<IActionResult> GetAll() =>
+        Ok(await service.GetAllAsync());
+
+    [HttpGet("confirmed")]
+    public async Task<IActionResult> GetConfirmed([FromQuery] Guid? agentId, [FromQuery] Guid? routeId, [FromQuery] Guid? shopId) =>
+        Ok(await service.GetConfirmedAsync(agentId, routeId, shopId));
+
+    [HttpGet("{id:guid}")]
+    public async Task<IActionResult> GetById(Guid id)
+    {
+        var result = await service.GetByIdAsync(id);
+        return result is null ? NotFound() : Ok(result);
+    }
+
+    [HttpGet("store/{storeId:guid}")]
+    public async Task<IActionResult> GetByStore(Guid storeId)
+    {
+        var result = await service.GetByStoreIdAsync(storeId);
+        return result is null ? StatusCode(StatusCodes.Status403Forbidden) : Ok(result);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateOrderRequest request, CancellationToken ct)
+    {
+        try
+        {
+            var result = await service.CreateAsync(request, ct);
+            return result is null ? StatusCode(StatusCodes.Status403Forbidden) : CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
+        }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPut("{id:guid}/items")]
+    public async Task<IActionResult> ReplaceItems(Guid id, UpdateOrderItemsRequest request, CancellationToken ct)
+    {
+        try
+        {
+            var result = await service.ReplaceItemsAsync(id, request, ct);
+            return result is null ? NotFound() : Ok(result);
+        }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("{id:guid}/confirm")]
+    public async Task<IActionResult> Confirm(Guid id, CancellationToken ct)
+    {
+        try
+        {
+            var result = await service.ConfirmAsync(id, ct);
+            return result is null ? NotFound() : Ok(result);
+        }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("{id:guid}/confirm-and-create-invoice")]
+    public async Task<IActionResult> ConfirmAndCreateInvoice(Guid id, CancellationToken ct)
+    {
+        try
+        {
+            var result = await service.ConfirmAndCreateInvoiceAsync(id, ct);
+            return result is null ? NotFound() : Ok(result);
+        }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPut("{id:guid}")]
+    public async Task<IActionResult> Update(Guid id, UpdateOrderRequest request, CancellationToken ct)
+    {
+        try
+        {
+            var result = await service.UpdateAsync(id, request, ct);
+            return result is null ? NotFound() : Ok(result);
+        }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("{id:guid}/cancel")]
+    public async Task<IActionResult> Cancel(Guid id, CancellationToken ct)
+    {
+        var cancelled = await service.DeleteAsync(id, ct);
+        return cancelled ? NoContent() : NotFound();
+    }
+
+    [HttpDelete("{id:guid}")]
+    public async Task<IActionResult> Delete(Guid id, CancellationToken ct)
+    {
+        var deleted = await service.DeleteAsync(id, ct);
+        return deleted ? NoContent() : NotFound();
+    }
+}

Distribution/Features/Order/OrderDTOs.cs

@@ -0,0 +1,28 @@
+using Distribution.Models;
+
+namespace Distribution.Features.Order;
+
+public record CreateOrderItemRequest(Guid ItemId, int Quantity, decimal? UnitPrice);
+
+public record CreateOrderRequest(Guid StoreId, List<CreateOrderItemRequest> Items);
+
+public record UpdateOrderItemsRequest(List<CreateOrderItemRequest> Items);
+
+public record UpdateOrderRequest(OrderStatus Status);
+
+public record OrderItemResponse(Guid Id, Guid ItemId, int Quantity, int QuantityFulfilled, decimal UnitPrice);
+
+public record OrderResponse(
+    Guid Id,
+    Guid? SaleId,
+    Guid? InvoiceId,
+    DateTime OrderDate,
+    Guid StoreId,
+    Guid CreatedByUserId,
+    decimal TotalAmount,
+    OrderStatus Status,
+    DateTime? ConfirmedAt,
+    DateTime? FulfilledAt,
+    List<OrderItemResponse> Items,
+    bool IsActive,
+    DateTime CreatedAt);

Distribution/Features/Order/OrderRepository.cs

@@ -0,0 +1,62 @@
+using Distribution.Data;
+using Distribution.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace Distribution.Features.Order;
+
+public class OrderRepository(AppDBContext context) : IOrderRepository
+{
+    public async Task<Models.Order?> GetByIdAsync(Guid id) =>
+        await context.Orders.FindAsync(id);
+
+    public async Task<List<Models.Order>> GetAllAsync() =>
+        await context.Orders.ToListAsync();
+
+    public async Task<Models.Order?> GetBySaleIdAsync(Guid saleId) =>
+        await context.Orders.FirstOrDefaultAsync(o => o.FK_SaleId == saleId && o.IsActive);
+
+    public async Task AddAsync(Models.Order entity) =>
+        await context.Orders.AddAsync(entity);
+
+    public void Update(Models.Order entity) =>
+        context.Orders.Update(entity);
+
+    public void Remove(Models.Order entity)
+    {
+        entity.Status = Models.OrderStatus.Cancelled;
+        entity.IsActive = false;
+        context.Orders.Update(entity);
+    }
+
+    public async Task<List<Models.OrderItem>> GetItemsByOrderIdAsync(Guid orderId, bool includeHistory = false) =>
+        await context.OrderItems
+            .Where(oi => oi.FK_OrderId == orderId && (includeHistory || oi.IsActive))
+            .ToListAsync();
+
+    public async Task<List<Models.Order>> GetByStoreIdAsync(Guid storeId) =>
+        await context.Orders.Where(o => o.FK_StoreId == storeId && o.IsActive).ToListAsync();
+
+    public async Task AddItemsAsync(IEnumerable<Models.OrderItem> items) =>
+        await context.OrderItems.AddRangeAsync(items);
+
+    public async Task<List<Models.Order>> GetPendingByRouteIdAsync(Guid routeId) =>
+        await context.Orders
+            .Include(o => o.Store)
+            .Include(o => o.OrderItems.Where(i => i.IsActive))
+                .ThenInclude(i => i.Item)
+            .Where(o => o.IsActive
+                && o.Store.FK_RouteId == routeId
+                && (o.Status == OrderStatus.Pending || o.Status == OrderStatus.PartiallyFulfilled))
+            .ToListAsync();
+
+    public async Task<List<Models.Order>> GetConfirmedAsync(Guid? agentId, Guid? routeId, Guid? storeId) =>
+        await context.Orders
+            .Include(o => o.Store)
+            .Where(o => o.IsActive
+                && o.ConfirmedAt != null
+                && o.Status != OrderStatus.Cancelled
+                && (agentId == null || o.CreatedByUserId == agentId)
+                && (routeId == null || o.Store.FK_RouteId == routeId)
+                && (storeId == null || o.FK_StoreId == storeId))
+            .ToListAsync();
+}

Distribution/Features/Order/OrderService.cs

@@ -0,0 +1,379 @@
+using Distribution.Features.Invoice;
+using Distribution.Features.Item;
+using Distribution.Features.PriceList;
+using Distribution.Features.Sale;
+using Distribution.Features.Store;
+using Distribution.Features.Stock;
+using Distribution.Infra.Authorization;
+using Distribution.Infra.UoW;
+using Distribution.Models;
+using Microsoft.Extensions.Configuration;
+
+namespace Distribution.Features.Order;
+
+public class OrderService(
+    IOrderRepository repo,
+    IStoreRepository storeRepo,
+    IItemRepository itemRepo,
+    IStockRepository stockRepo,
+    PriceListService priceListService,
+    ISaleRepository saleRepo,
+    IInvoiceRepository invoiceRepo,
+    IUnitOfWork uow,
+    ICurrentUserService currentUser,
+    IScopeAccessService scopeAccess,
+    IConfiguration configuration)
+{
+    private const int GlobalScopeRoleLevel = 50;
+
+    private static OrderResponse ToResponse(Models.Order o, List<Models.OrderItem> items) =>
+        new(o.Id, o.FK_SaleId, o.InvoiceId, o.OrderDate, o.FK_StoreId, o.CreatedByUserId, o.TotalAmount, o.Status,
+            o.ConfirmedAt, o.FulfilledAt,
+            items.Select(i => new OrderItemResponse(i.Id, i.FK_ItemId, i.Quantity, i.QuantityFulfilled, i.UnitPrice)).ToList(),
+            o.IsActive, o.CreatedAt);
+
+    private bool HasGlobalScope => currentUser.RoleLevel >= GlobalScopeRoleLevel;
+
+    /// <summary>The active InvoiceCreationMode ("A" = combined confirm+create-invoice,
+    /// "B" = separate confirm then create-invoice) per order_invoice_lifecycle.md. Exactly one is
+    /// reachable at a time.</summary>
+    private InvoiceCreationMode ActiveMode =>
+        configuration.GetValue<string>("OrderInvoice:InvoiceCreationMode") == "A"
+            ? InvoiceCreationMode.A
+            : InvoiceCreationMode.B;
+
+    private async Task<bool> HasStoreScopeAsync(Guid storeId)
+    {
+        if (HasGlobalScope || currentUser.UserId is null) return HasGlobalScope;
+        return await scopeAccess.HasStoreScopeAsync(currentUser.UserId.Value, storeId);
+    }
+
+    public async Task<List<OrderResponse>> GetAllAsync()
+    {
+        // Deleted orders stay IsActive=false but remain visible with a Cancelled status —
+        // Delete never removes the row from the list, only marks it cancelled.
+        var orders = (await repo.GetAllAsync()).ToList();
+        if (!HasGlobalScope && currentUser.UserId is not null)
+        {
+            var accessibleStoreIds = (await scopeAccess.GetAccessibleStoreIdsAsync(currentUser.UserId.Value)).ToHashSet();
+            orders = orders.Where(o => accessibleStoreIds.Contains(o.FK_StoreId)).ToList();
+        }
+        var result = new List<OrderResponse>();
+        foreach (var order in orders)
+        {
+            var items = await repo.GetItemsByOrderIdAsync(order.Id);
+            result.Add(ToResponse(order, items));
+        }
+        return result;
+    }
+
+    public async Task<OrderResponse?> GetByIdAsync(Guid id)
+    {
+        var order = await repo.GetByIdAsync(id);
+        if (order is null || !order.IsActive) return null;
+        if (!await HasStoreScopeAsync(order.FK_StoreId)) return null;
+        var items = await repo.GetItemsByOrderIdAsync(id);
+        return ToResponse(order, items);
+    }
+
+    public async Task<List<OrderResponse>?> GetByStoreIdAsync(Guid storeId)
+    {
+        if (!await HasStoreScopeAsync(storeId)) return null;
+        var orders = await repo.GetByStoreIdAsync(storeId);
+        var result = new List<OrderResponse>();
+        foreach (var order in orders)
+        {
+            var items = await repo.GetItemsByOrderIdAsync(order.Id);
+            result.Add(ToResponse(order, items));
+        }
+        return result;
+    }
+
+    /// <summary>Confirmed POs matching the given filters — Mode B's "office browses Confirmed POs"
+    /// step. Also usable as a general Confirmed-PO listing regardless of active mode.</summary>
+    public async Task<List<OrderResponse>> GetConfirmedAsync(Guid? agentId, Guid? routeId, Guid? storeId)
+    {
+        var orders = await repo.GetConfirmedAsync(agentId, routeId, storeId);
+        var result = new List<OrderResponse>();
+        foreach (var order in orders)
+        {
+            var items = await repo.GetItemsByOrderIdAsync(order.Id);
+            result.Add(ToResponse(order, items));
+        }
+        return result;
+    }
+
+    private async Task<decimal> ResolveUnitPriceAsync(Guid itemId, decimal? requestedUnitPrice, Guid storeId, DateTime orderDate)
+    {
+        if (requestedUnitPrice.HasValue) return requestedUnitPrice.Value;
+        var resolution = await priceListService.ResolveByStoreAsync(itemId, storeId, orderDate);
+        if (resolution is not null) return resolution.Price;
+        var item = await itemRepo.GetByIdAsync(itemId)
+            ?? throw new InvalidOperationException($"Item {itemId} not found");
+        return item.SalePrice
+            ?? throw new InvalidOperationException($"Could not resolve a price for item {itemId} — no price list covers it and it has no catalogue SalePrice");
+    }
+
+    /// <summary>Creates a Shop PO independent of any Sale — the entry point to the pipeline per
+    /// order_invoice_lifecycle.md. Items are freely editable until Confirm.</summary>
+    public async Task<OrderResponse?> CreateAsync(CreateOrderRequest request, CancellationToken ct = default)
+    {
+        var store = await storeRepo.GetByIdAsync(request.StoreId);
+        if (store is null || !store.IsActive) return null;
+        if (!await HasStoreScopeAsync(request.StoreId)) return null;
+        if (request.Items is null || request.Items.Count == 0)
+            throw new InvalidOperationException("A PO must have at least one line item.");
+
+        var order = new Models.Order
+        {
+            FK_StoreId = request.StoreId,
+            OrderDate = DateTime.Now,
+            CreatedByUserId = currentUser.UserId ?? throw new InvalidOperationException("No authenticated user."),
+            Status = OrderStatus.Pending,
+        };
+
+        var items = new List<Models.OrderItem>();
+        foreach (var line in request.Items)
+        {
+            var unitPrice = await ResolveUnitPriceAsync(line.ItemId, line.UnitPrice, request.StoreId, order.OrderDate);
+            items.Add(new Models.OrderItem
+            {
+                FK_OrderId = order.Id,
+                FK_ItemId = line.ItemId,
+                Quantity = line.Quantity,
+                UnitPrice = unitPrice,
+                IsActive = true,
+            });
+        }
+        order.TotalAmount = items.Sum(i => i.Quantity * i.UnitPrice);
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            await repo.AddAsync(order);
+            await repo.AddItemsAsync(items);
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        return ToResponse(order, items);
+    }
+
+    /// <summary>Rewrites a Shop PO's line items — every edit soft-deletes the current active rows
+    /// and writes a fresh set (active = latest version, soft-deleted = history). Only allowed before
+    /// confirmation.</summary>
+    public async Task<OrderResponse?> ReplaceItemsAsync(Guid id, UpdateOrderItemsRequest request, CancellationToken ct = default)
+    {
+        var order = await repo.GetByIdAsync(id);
+        if (order is null || !order.IsActive) return null;
+        if (!await HasStoreScopeAsync(order.FK_StoreId)) return null;
+        if (order.ConfirmedAt is not null)
+            throw new InvalidOperationException("Items are locked once the PO is confirmed.");
+        if (request.Items is null || request.Items.Count == 0)
+            throw new InvalidOperationException("A PO must have at least one line item.");
+
+        var currentItems = await repo.GetItemsByOrderIdAsync(id);
+        foreach (var item in currentItems)
+            item.IsActive = false;
+
+        var newItems = new List<Models.OrderItem>();
+        foreach (var line in request.Items)
+        {
+            var unitPrice = await ResolveUnitPriceAsync(line.ItemId, line.UnitPrice, order.FK_StoreId, order.OrderDate);
+            newItems.Add(new Models.OrderItem
+            {
+                FK_OrderId = order.Id,
+                FK_ItemId = line.ItemId,
+                Quantity = line.Quantity,
+                UnitPrice = unitPrice,
+                IsActive = true,
+            });
+        }
+        order.TotalAmount = newItems.Sum(i => i.Quantity * i.UnitPrice);
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            // currentItems came from the tracked DbContext (OrderRepository does not use
+            // AsNoTracking), so flipping IsActive above is enough for SaveChanges to persist it —
+            // no explicit repo.Update call needed for the soft-deleted rows.
+            await repo.AddItemsAsync(newItems);
+            repo.Update(order);
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        return ToResponse(order, newItems);
+    }
+
+    /// <summary>Mode B — confirms the PO (locks items) without creating an Invoice. The Invoice is
+    /// created separately later via InvoiceService.CreateAsync.</summary>
+    public async Task<OrderResponse?> ConfirmAsync(Guid id, CancellationToken ct = default)
+    {
+        if (ActiveMode != InvoiceCreationMode.B)
+            throw new InvalidOperationException("Separate confirm is not enabled — this system uses InvoiceCreationMode A.");
+
+        var order = await repo.GetByIdAsync(id);
+        if (order is null || !order.IsActive) return null;
+        if (!await HasStoreScopeAsync(order.FK_StoreId)) return null;
+        if (order.Status == OrderStatus.Cancelled)
+            throw new InvalidOperationException("Cannot confirm a cancelled PO.");
+        if (order.ConfirmedAt is not null) return ToResponse(order, await repo.GetItemsByOrderIdAsync(id));
+
+        order.ConfirmedAt = DateTime.Now;
+        order.ConfirmedByUserId = currentUser.UserId;
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            repo.Update(order);
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        var items = await repo.GetItemsByOrderIdAsync(id);
+        return ToResponse(order, items);
+    }
+
+    /// <summary>Mode A — confirms the PO and creates its Invoice (Draft) atomically in one
+    /// transaction.</summary>
+    public async Task<OrderResponse?> ConfirmAndCreateInvoiceAsync(Guid id, CancellationToken ct = default)
+    {
+        if (ActiveMode != InvoiceCreationMode.A)
+            throw new InvalidOperationException("Combined confirm-and-create-invoice is not enabled — this system uses InvoiceCreationMode B.");
+
+        var order = await repo.GetByIdAsync(id);
+        if (order is null || !order.IsActive) return null;
+        if (!await HasStoreScopeAsync(order.FK_StoreId)) return null;
+        if (order.Status == OrderStatus.Cancelled)
+            throw new InvalidOperationException("Cannot confirm a cancelled PO.");
+        if (order.InvoiceId is not null)
+            throw new InvalidOperationException("An Invoice already exists for this PO.");
+
+        var items = await repo.GetItemsByOrderIdAsync(id);
+        var invoice = new Models.Invoice
+        {
+            FK_OrderId = order.Id,
+            Status = InvoiceStatus.Draft,
+            CreatedByUserId = currentUser.UserId ?? throw new InvalidOperationException("No authenticated user."),
+            TotalAmount = order.TotalAmount,
+        };
+
+        order.ConfirmedAt ??= DateTime.Now;
+        order.ConfirmedByUserId ??= currentUser.UserId;
+        order.InvoiceId = invoice.Id;
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            await invoiceRepo.AddAsync(invoice);
+            repo.Update(order);
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        return ToResponse(order, items);
+    }
+
+    public async Task<OrderResponse?> UpdateAsync(Guid id, UpdateOrderRequest request, CancellationToken ct = default)
+    {
+        // TEMPORARY: see DeleteAsync/SaleService — store-scope enforcement depends on the broken
+        // auth middleware (testbug.md #28) and would reject every update. Skipped for now.
+        var order = await repo.GetByIdAsync(id);
+        if (order is null || !order.IsActive) return null;
+
+        order.Status = request.Status;
+        order.FulfilledAt = request.Status == OrderStatus.Fulfilled ? DateTime.Now : null;
+
+        if (order.FK_SaleId is Guid saleId)
+        {
+            var sale = await saleRepo.GetByIdAsync(saleId)
+                ?? throw new InvalidOperationException("Sale not found for this order");
+            sale.Status = request.Status switch
+            {
+                OrderStatus.Fulfilled => SaleStatus.Completed,
+                OrderStatus.Cancelled => SaleStatus.Cancelled,
+                _ => SaleStatus.Pending
+            };
+            sale.CompletedAt = request.Status == OrderStatus.Fulfilled ? DateTime.Now : null;
+
+            await uow.BeginAsync(ct);
+            try
+            {
+                repo.Update(order);
+                saleRepo.Update(sale);
+                await uow.CommitAsync(ct);
+            }
+            catch
+            {
+                await uow.RollbackAsync(ct);
+                throw;
+            }
+        }
+        else
+        {
+            await uow.BeginAsync(ct);
+            try
+            {
+                repo.Update(order);
+                await uow.CommitAsync(ct);
+            }
+            catch
+            {
+                await uow.RollbackAsync(ct);
+                throw;
+            }
+        }
+
+        var items = await repo.GetItemsByOrderIdAsync(id);
+        return ToResponse(order, items);
+    }
+
+    /// <summary>Cancels a Shop PO or Confirmed PO. If an Invoice was already created for this PO,
+    /// the Invoice/loading-sheet cascade is an explicitly unresolved open question in
+    /// order_invoice_lifecycle.md (Open Question 5) — the Invoice is left untouched here.</summary>
+    public async Task<bool> DeleteAsync(Guid id, CancellationToken ct = default)
+    {
+        // TEMPORARY: see SaleService — store-scope enforcement depends on the broken auth
+        // middleware (testbug.md #28) and would reject every delete. Skipped for now.
+        var order = await repo.GetByIdAsync(id);
+        if (order is null || !order.IsActive) return false;
+
+        var sale = order.FK_SaleId is Guid saleId ? await saleRepo.GetByIdAsync(saleId) : null;
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            repo.Remove(order);
+            if (sale is not null)
+            {
+                sale.Status = SaleStatus.Cancelled;
+                sale.CompletedAt = null;
+                saleRepo.Update(sale);
+            }
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+        return true;
+    }
+}

Distribution/Features/Payment/FlatPaymentController.cs

@@ -0,0 +1,38 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace Distribution.Features.Payment;
+
+[ApiController]
+[Route("api/payments")]
+public class FlatPaymentController(PaymentService service) : ControllerBase
+{
+    [HttpGet]
+    public async Task<IActionResult> GetAll(
+        [FromQuery] Guid? storeId,
+        [FromQuery] Guid? saleId,
+        [FromQuery] int page = 1,
+        [FromQuery] int pageSize = 20)
+    {
+        var result = await service.GetAllAsync(storeId, saleId, page, pageSize);
+        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]
+    public async Task<IActionResult> Create(CreateFlatPaymentRequest request, CancellationToken ct)
+    {
+        try
+        {
+            var inner = new CreatePaymentRequest(request.Amount, request.Method, request.CollectedByUserId);
+            var result = await service.CreateAsync(request.SaleId, inner, ct);
+            return result is null ? NotFound(new { error = "Sale not found or access denied" }) : Ok(result);
+        }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+}

Distribution/Features/Payment/IPaymentRepository.cs

@@ -1,13 +1,12 @@
-using Distribution.Models;
+using Distribution.Models;
 
 namespace Distribution.Features.Payment;
 
 public interface IPaymentRepository
 {
     Task<Models.Payment?> GetByIdAsync(Guid id);
-    Task<List<Models.Payment>> GetAllAsync(Guid? invoiceId, int page, int pageSize);
-    Task<int> GetCountAsync(Guid? invoiceId);
-    Task<List<Models.Payment>> GetByInvoiceIdAsync(Guid invoiceId);
+    Task<List<Models.Payment>> GetAllAsync(Guid? storeId, Guid? saleId, int page, int pageSize);
+    Task<int> GetCountAsync(Guid? storeId, Guid? saleId);
+    Task<List<Models.Payment>> GetBySaleIdAsync(Guid saleId);
     Task AddAsync(Models.Payment payment);
-    void Update(Models.Payment payment);
 }

Distribution/Features/Payment/PaymentController.cs

@@ -3,22 +3,22 @@
 namespace Distribution.Features.Payment;
 
 [ApiController]
-[Route("api/invoices/{invoiceId:guid}/payments")]
+[Route("api/sales/{saleId:guid}/payments")]
 public class PaymentController(PaymentService service) : ControllerBase
 {
     [HttpGet]
-    public async Task<IActionResult> GetByInvoice(Guid invoiceId)
+    public async Task<IActionResult> GetBySale(Guid saleId)
     {
-        var result = await service.GetByInvoiceIdAsync(invoiceId);
+        var result = await service.GetBySaleIdAsync(saleId);
         return result is null ? NotFound() : Ok(result);
     }
 
     [HttpPost]
-    public async Task<IActionResult> Create(Guid invoiceId, CreatePaymentRequest request, CancellationToken ct)
+    public async Task<IActionResult> Create(Guid saleId, CreatePaymentRequest request, CancellationToken ct)
     {
         try
         {
-            var result = await service.CreateAsync(invoiceId, request, ct);
+            var result = await service.CreateAsync(saleId, request, ct);
             return result is null ? NotFound() : Ok(result);
         }
         catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }

Distribution/Features/Payment/PaymentDTOs.cs

@@ -1,24 +1,25 @@
-using Distribution.Models;
+using Distribution.Models;
 
 namespace Distribution.Features.Payment;
 
 public record CreatePaymentRequest(
     decimal Amount,
     PaymentMethod Method,
-    EntryMode EntryMode = EntryMode.RealTime,
-    string? ChequeNumber = null,
-    DateTime? ChequeDate = null,
+    // TEMPORARY: auth middleware doesn't resolve a logged-in user yet — see testbug.md #28.
+    Guid? CollectedByUserId = null);
+
+public record CreateFlatPaymentRequest(
+    Guid SaleId,
+    decimal Amount,
+    PaymentMethod Method,
     Guid? CollectedByUserId = null);
 
 public record PaymentResponse(
     Guid Id,
-    Guid InvoiceId,
+    Guid SaleId,
+    Guid StoreId,
     decimal Amount,
     PaymentMethod Method,
-    EntryMode EntryMode,
-    string? ChequeNumber,
-    DateTime? ChequeDate,
     DateTime CollectedAt,
     Guid CollectedBy,
-    Guid? RecordedBy,
     DateTime CreatedAt);

Distribution/Features/Payment/PaymentRepository.cs

@@ -1,4 +1,4 @@
-using Distribution.Data;
+using Distribution.Data;
 using Distribution.Models;
 using Microsoft.EntityFrameworkCore;
 
@@ -9,27 +9,29 @@ public class PaymentRepository(AppDBContext context) : IPaymentRepository
     public async Task<Models.Payment?> GetByIdAsync(Guid id) =>
         await context.Payments.FirstOrDefaultAsync(p => p.Id == id && p.IsActive);
 
-    public async Task<List<Models.Payment>> GetAllAsync(Guid? invoiceId, int page, int pageSize) =>
+    public async Task<List<Models.Payment>> GetAllAsync(Guid? storeId, Guid? saleId, int page, int pageSize) =>
         await context.Payments
-            .Where(p => p.IsActive && (invoiceId == null || p.FK_InvoiceId == invoiceId))
+            .Where(p => p.IsActive
+                && (storeId == null || p.FK_StoreId == storeId)
+                && (saleId == null || p.FK_SaleId == saleId))
             .OrderByDescending(p => p.CollectedAt)
             .Skip((page - 1) * pageSize)
             .Take(pageSize)
             .ToListAsync();
 
-    public async Task<int> GetCountAsync(Guid? invoiceId) =>
+    public async Task<int> GetCountAsync(Guid? storeId, Guid? saleId) =>
         await context.Payments
-            .CountAsync(p => p.IsActive && (invoiceId == null || p.FK_InvoiceId == invoiceId));
+            .Where(p => p.IsActive
+                && (storeId == null || p.FK_StoreId == storeId)
+                && (saleId == null || p.FK_SaleId == saleId))
+            .CountAsync();
 
-    public async Task<List<Models.Payment>> GetByInvoiceIdAsync(Guid invoiceId) =>
+    public async Task<List<Models.Payment>> GetBySaleIdAsync(Guid saleId) =>
         await context.Payments
-            .Where(p => p.FK_InvoiceId == invoiceId && p.IsActive)
+            .Where(p => p.FK_SaleId == saleId && p.IsActive)
             .OrderBy(p => p.CollectedAt)
             .ToListAsync();
 
     public async Task AddAsync(Models.Payment payment) =>
         await context.Payments.AddAsync(payment);
-
-    public void Update(Models.Payment payment) =>
-        context.Payments.Update(payment);
 }

Distribution/Features/Payment/PaymentService.cs

@@ -1,4 +1,5 @@
-using Distribution.Features.Invoice;
+using Distribution.Features.Sale;
+using Distribution.Features.Stock;
 using Distribution.Infra.Authorization;
 using Distribution.Infra.UoW;
 using Distribution.Models;
@@ -7,52 +8,55 @@ namespace Distribution.Features.Payment;
 
 public class PaymentService(
     IPaymentRepository repo,
-    IInvoiceRepository invoiceRepo,
+    ISaleRepository saleRepo,
     IUnitOfWork uow,
     ICurrentUserService currentUser)
 {
     private static PaymentResponse ToResponse(Models.Payment p) =>
-        new(p.Id, p.FK_InvoiceId, p.Amount, p.Method, p.EntryMode, p.ChequeNumber, p.ChequeDate,
-            p.CollectedAt, p.CollectedBy, p.RecordedBy, p.CreatedAt);
+        new(p.Id, p.FK_SaleId, p.FK_StoreId, p.Amount, p.Method, p.CollectedAt, p.CollectedBy, p.CreatedAt);
 
-    public async Task<List<PaymentResponse>?> GetByInvoiceIdAsync(Guid invoiceId)
+    public async Task<PagedResponse<PaymentResponse>> GetAllAsync(Guid? storeId, Guid? saleId, int page, int pageSize)
     {
-        var invoice = await invoiceRepo.GetByIdAsync(invoiceId);
-        if (invoice is null || !invoice.IsActive) return null;
+        var total = await repo.GetCountAsync(storeId, saleId);
+        var items = await repo.GetAllAsync(storeId, saleId, page, pageSize);
+        return new PagedResponse<PaymentResponse>(page, pageSize, total, items.Select(ToResponse).ToList());
+    }
 
-        var payments = await repo.GetByInvoiceIdAsync(invoiceId);
+    public async Task<PaymentResponse?> GetByIdAsync(Guid id)
+    {
+        var payment = await repo.GetByIdAsync(id);
+        return payment is null ? null : ToResponse(payment);
+    }
+
+    public async Task<List<PaymentResponse>?> GetBySaleIdAsync(Guid saleId)
+    {
+        var sale = await saleRepo.GetByIdAsync(saleId);
+        if (sale is null || !sale.IsActive) return null;
+
+        var payments = await repo.GetBySaleIdAsync(saleId);
         return payments.Select(ToResponse).ToList();
     }
 
-    public async Task<PaymentResponse?> CreateAsync(Guid invoiceId, CreatePaymentRequest request, CancellationToken ct = default)
+    public async Task<PaymentResponse?> CreateAsync(Guid saleId, CreatePaymentRequest request, CancellationToken ct = default)
     {
-        var invoice = await invoiceRepo.GetByIdAsync(invoiceId);
-        if (invoice is null || !invoice.IsActive) return null;
-        if (invoice.Status == InvoiceStatus.Finalized)
-            throw new InvalidOperationException("Cannot record a payment against a finalized invoice");
+        var sale = await saleRepo.GetByIdAsync(saleId);
+        if (sale is null || !sale.IsActive) return null;
+        if (sale.Status == SaleStatus.Cancelled)
+            throw new InvalidOperationException("Cannot record a payment against a cancelled sale");
 
-        if (request.Method == PaymentMethod.Cheque &&
-            (string.IsNullOrWhiteSpace(request.ChequeNumber) || request.ChequeDate is null))
-            throw new InvalidOperationException("ChequeNumber and ChequeDate are required when Method is Cheque");
-
-        var recorderId = currentUser.UserId ?? request.CollectedByUserId
+        // 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.CollectedByUserId
             ?? throw new InvalidOperationException("CollectedByUserId is required while auth is unavailable");
-        var collectedBy = request.CollectedByUserId ?? recorderId;
-        var recordedBy = request.EntryMode == EntryMode.DayEndManual && collectedBy != recorderId
-            ? recorderId
-            : (Guid?)null;
 
         var payment = new Models.Payment
         {
-            FK_InvoiceId = invoiceId,
+            FK_SaleId = saleId,
+            FK_StoreId = sale.FK_StoreId,
             Amount = request.Amount,
             Method = request.Method,
-            EntryMode = request.EntryMode,
-            ChequeNumber = request.Method == PaymentMethod.Cheque ? request.ChequeNumber : null,
-            ChequeDate = request.Method == PaymentMethod.Cheque ? request.ChequeDate : null,
             CollectedAt = DateTime.Now,
-            CollectedBy = collectedBy,
-            RecordedBy = recordedBy
+            CollectedBy = userId
         };
 
         await uow.BeginAsync(ct);
@@ -60,16 +64,17 @@ public class PaymentService(
         {
             await repo.AddAsync(payment);
 
-            var allPayments = await repo.GetByInvoiceIdAsync(invoiceId);
+            var allPayments = await repo.GetBySaleIdAsync(saleId);
             var total = allPayments.Sum(p => p.Amount) + request.Amount;
 
-            invoice.PaymentStatus = total == 0
+            sale.PaymentStatus = total == 0
                 ? PaymentStatus.Pending
-                : total < invoice.TotalAmount
+                : total < sale.TotalAmount
                     ? PaymentStatus.PartiallyPaid
                     : PaymentStatus.Paid;
 
-            invoiceRepo.Update(invoice);
+            saleRepo.Update(sale);
+
             await uow.CommitAsync(ct);
         }
         catch { await uow.RollbackAsync(ct); throw; }

Distribution/Features/ProductReport/IProductReportRepository.cs

@@ -1,18 +0,0 @@
-using Distribution.Models;
-
-namespace Distribution.Features.ProductReport;
-
-public record SalesAggregate(Guid ItemId, string Sku, string Name, decimal? CostPrice,
-    int Orders, int Stores, decimal QtyOrdered, decimal QtyFulfilled, decimal SalesValue);
-
-public record ReturnAggregate(Guid ItemId, string Sku, string Name, ReturnReasonCode Reason,
-    decimal Qty, decimal Value);
-
-public interface IProductReportRepository
-{
-    Task<(List<ProductStockRow> Rows, int Total)> GetStockAsync(ProductReportFilter f, int page, int pageSize);
-    Task<(List<SalesAggregate> Rows, int Total)> GetSalesAsync(ProductReportFilter f, int page, int pageSize);
-    Task<List<ReturnAggregate>> GetReturnsAsync(ProductReportFilter f);
-    Task<Dictionary<Guid, decimal>> GetSoldQtyAsync(ProductReportFilter f, IEnumerable<Guid> itemIds);
-    Task<decimal> GetTotalSalesAsync(ProductReportFilter f);
-}

Distribution/Features/ProductReport/ProductReportController.cs

@@ -1,59 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace Distribution.Features.ProductReport;
-
-[ApiController]
-[Route("api/reports/products")]
-public class ProductReportController(ProductReportService service) : ControllerBase
-{
-    private IActionResult? Check(ProductReportFilter f, int page, int pageSize)
-    {
-        var error = ProductReportService.Validate(f, page, pageSize);
-        return error is null ? null : BadRequest(new { message = error });
-    }
-
-    [HttpGet("stock")]
-    public async Task<IActionResult> Stock(
-        [FromQuery] Guid? brandId, [FromQuery] Guid? categoryId, [FromQuery] Guid? subCategoryId,
-        [FromQuery] Guid? warehouseId, [FromQuery] bool activeOnly = true, [FromQuery] bool lowStockOnly = false,
-        [FromQuery] string? search = null, [FromQuery] int page = 1, [FromQuery] int pageSize = 50)
-    {
-        var f = new ProductReportFilter(brandId, categoryId, subCategoryId, warehouseId, null, null, null,
-            null, null, activeOnly, lowStockOnly, search);
-        return Check(f, page, pageSize) ?? Ok(await service.GetStockAsync(f, page, pageSize));
-    }
-
-    [HttpGet("sales")]
-    public async Task<IActionResult> Sales(
-        [FromQuery] Guid? brandId, [FromQuery] Guid? categoryId, [FromQuery] Guid? subCategoryId,
-        [FromQuery] Guid? regionId, [FromQuery] Guid? routeId, [FromQuery] Guid? storeId,
-        [FromQuery] DateTime? from, [FromQuery] DateTime? to,
-        [FromQuery] string? search = null, [FromQuery] int page = 1, [FromQuery] int pageSize = 50)
-    {
-        var f = new ProductReportFilter(brandId, categoryId, subCategoryId, null, regionId, routeId, storeId,
-            from, to, false, false, search);
-        return Check(f, page, pageSize) ?? Ok(await service.GetSalesAsync(f, page, pageSize));
-    }
-
-    [HttpGet("returns")]
-    public async Task<IActionResult> Returns(
-        [FromQuery] Guid? brandId, [FromQuery] Guid? categoryId, [FromQuery] Guid? subCategoryId,
-        [FromQuery] Guid? regionId, [FromQuery] Guid? routeId, [FromQuery] Guid? storeId,
-        [FromQuery] DateTime? from, [FromQuery] DateTime? to,
-        [FromQuery] string? search = null, [FromQuery] int page = 1, [FromQuery] int pageSize = 50)
-    {
-        var f = new ProductReportFilter(brandId, categoryId, subCategoryId, null, regionId, routeId, storeId,
-            from, to, false, false, search);
-        return Check(f, page, pageSize) ?? Ok(await service.GetReturnsAsync(f, page, pageSize));
-    }
-
-    [HttpGet("summary")]
-    public async Task<IActionResult> Summary(
-        [FromQuery] Guid? brandId, [FromQuery] Guid? categoryId, [FromQuery] Guid? warehouseId,
-        [FromQuery] DateTime? from, [FromQuery] DateTime? to)
-    {
-        var f = new ProductReportFilter(brandId, categoryId, null, warehouseId, null, null, null,
-            from, to, true, false, null);
-        return Check(f, 1, 1) ?? Ok(await service.GetSummaryAsync(f));
-    }
-}

Distribution/Features/ProductReport/ProductReportDTOs.cs

@@ -1,26 +0,0 @@
-using Distribution.Models;
-
-namespace Distribution.Features.ProductReport;
-
-public record ProductStockRow(
-    Guid ItemId, string Sku, string Name, string? Brand, string Category, string? SubCategory, string Uom,
-    decimal? SalePrice, decimal? CostPrice, decimal? ReorderLevel,
-    decimal WarehouseQty, decimal VehicleQty, decimal TotalQty, decimal StockValue,
-    bool IsLowStock, bool IsActive);
-
-public record ProductSalesRow(
-    Guid ItemId, string Sku, string Name,
-    int Orders, int Stores, decimal QtyOrdered, decimal QtyFulfilled,
-    decimal SalesValue, decimal? CostValue, decimal? Margin, decimal? MarginPercent);
-
-public record ProductReturnRow(
-    Guid ItemId, string Sku, string Name,
-    decimal ReturnedQty, decimal ReturnedValue, decimal SoldQty, decimal? ReturnPercent,
-    Dictionary<ReturnReasonCode, decimal> QtyByReason);
-
-public record ProductReportSummary(int ItemCount, decimal TotalQty, decimal TotalValue, decimal TotalSales);
-
-public record ProductReportFilter(
-    Guid? BrandId, Guid? CategoryId, Guid? SubCategoryId, Guid? WarehouseId,
-    Guid? RegionId, Guid? RouteId, Guid? StoreId,
-    DateTime? From, DateTime? To, bool ActiveOnly, bool LowStockOnly, string? Search);

Distribution/Features/ProductReport/ProductReportRepository.cs

@@ -1,156 +0,0 @@
-using Distribution.Data;
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Features.ProductReport;
-
-public class ProductReportRepository(AppDBContext db) : IProductReportRepository
-{
-    public async Task<(List<ProductStockRow> Rows, int Total)> GetStockAsync(ProductReportFilter f, int page, int pageSize)
-    {
-        var balances = db.StockBalances.AsNoTracking().AsQueryable();
-        if (f.WarehouseId.HasValue)
-            balances = balances.Where(b => b.LocationType == LocationType.Warehouse && b.LocationId == f.WarehouseId.Value);
-
-        var items = db.Items.AsNoTracking().AsQueryable();
-        if (f.ActiveOnly) items = items.Where(i => i.IsActive);
-        if (f.BrandId.HasValue) items = items.Where(i => i.FK_BrandId == f.BrandId.Value);
-        if (f.CategoryId.HasValue) items = items.Where(i => i.FK_CategoryId == f.CategoryId.Value);
-        if (f.SubCategoryId.HasValue) items = items.Where(i => i.FK_SubCategoryId == f.SubCategoryId.Value);
-        if (!string.IsNullOrWhiteSpace(f.Search))
-        {
-            var s = f.Search.Trim();
-            items = items.Where(i => i.Name.Contains(s) || i.Sku.Contains(s));
-        }
-
-        var withQty = items.Select(i => new
-        {
-            Item = i,
-            Wh = balances.Where(b => b.FK_ItemId == i.Id && b.LocationType == LocationType.Warehouse)
-                .Sum(b => b.Quantity),
-            Veh = balances.Where(b => b.FK_ItemId == i.Id && b.LocationType == LocationType.Vehicle)
-                .Sum(b => b.Quantity),
-        });
-
-        if (f.LowStockOnly)
-            withQty = withQty.Where(x => x.Item.ReorderLevel != null && x.Wh <= x.Item.ReorderLevel);
-
-        var total = await withQty.CountAsync();
-        var page_ = await withQty
-            .OrderBy(x => x.Item.Name)
-            .Skip((page - 1) * pageSize).Take(pageSize)
-            .Select(x => new
-            {
-                x.Item.Id, x.Item.Sku, x.Item.Name,
-                Brand = x.Item.Brand != null ? x.Item.Brand.Name : null,
-                Category = x.Item.Category.Name,
-                SubCategory = x.Item.SubCategory != null ? x.Item.SubCategory.Name : null,
-                Uom = x.Item.BaseUom.Name,
-                x.Item.SalePrice, x.Item.CostPrice, x.Item.ReorderLevel, x.Item.IsActive,
-                x.Wh, x.Veh,
-            })
-            .ToListAsync();
-
-        var rows = page_.Select(r => new ProductStockRow(
-            r.Id, r.Sku, r.Name, r.Brand, r.Category, r.SubCategory, r.Uom,
-            r.SalePrice, r.CostPrice, r.ReorderLevel,
-            r.Wh, r.Veh, r.Wh + r.Veh, (r.Wh + r.Veh) * (r.CostPrice ?? 0m),
-            r.ReorderLevel != null && r.Wh <= r.ReorderLevel,
-            r.IsActive)).ToList();
-        return (rows, total);
-    }
-
-    // Sold = shop PO lines on non-cancelled POs whose invoice is Finalized, dated by Invoice.FinalizedAt.
-    private IQueryable<ShopPOItem> SoldLines(ProductReportFilter f)
-    {
-        var lines =
-            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
-                && (!f.From.HasValue || inv.FinalizedAt >= f.From.Value)
-                && (!f.To.HasValue || inv.FinalizedAt < f.To.Value.Date.AddDays(1))
-            select li;
-
-        if (f.BrandId.HasValue) lines = lines.Where(l => l.Item.FK_BrandId == f.BrandId.Value);
-        if (f.CategoryId.HasValue) lines = lines.Where(l => l.Item.FK_CategoryId == f.CategoryId.Value);
-        if (f.SubCategoryId.HasValue) lines = lines.Where(l => l.Item.FK_SubCategoryId == f.SubCategoryId.Value);
-        if (f.StoreId.HasValue) lines = lines.Where(l => l.ShopPO.FK_StoreId == f.StoreId.Value);
-        if (f.RouteId.HasValue) lines = lines.Where(l => l.ShopPO.Store.FK_RouteId == f.RouteId.Value);
-        if (f.RegionId.HasValue) lines = lines.Where(l => l.ShopPO.Store.Route.FK_RegionId == f.RegionId.Value);
-        if (!string.IsNullOrWhiteSpace(f.Search))
-        {
-            var s = f.Search.Trim();
-            lines = lines.Where(l => l.Item.Name.Contains(s) || l.Item.Sku.Contains(s));
-        }
-        return lines;
-    }
-
-    public async Task<(List<SalesAggregate> Rows, int Total)> GetSalesAsync(ProductReportFilter f, int page, int pageSize)
-    {
-        var query = SoldLines(f)
-            .GroupBy(l => new { l.FK_ItemId, l.Item.Sku, l.Item.Name, l.Item.CostPrice })
-            .Select(g => new
-            {
-                g.Key.FK_ItemId, g.Key.Sku, g.Key.Name, g.Key.CostPrice,
-                Orders = g.Select(x => x.FK_ShopPOId).Distinct().Count(),
-                QtyOrdered = g.Sum(x => (decimal)x.Quantity),
-                QtyFulfilled = g.Sum(x => (decimal)x.QuantityFulfilled),
-                SalesValue = g.Sum(x => x.QuantityFulfilled * x.UnitPrice),
-            });
-
-        var total = await query.CountAsync();
-        var page_ = await query.OrderByDescending(r => r.SalesValue).ThenBy(r => r.Name)
-            .Skip((page - 1) * pageSize).Take(pageSize).ToListAsync();
-
-        // Distinct stores per item is counted separately: MySQL can't run the correlated
-        // "SELECT DISTINCT ... WHERE outer.col" derived table EF generates inside a GroupBy.
-        var ids = page_.Select(r => r.FK_ItemId).ToList();
-        var storePairs = await SoldLines(f)
-            .Where(l => ids.Contains(l.FK_ItemId))
-            .Select(l => new { l.FK_ItemId, l.ShopPO.FK_StoreId })
-            .Distinct()
-            .ToListAsync();
-        var storeCounts = storePairs.GroupBy(p => p.FK_ItemId).ToDictionary(g => g.Key, g => g.Count());
-
-        var rows = page_.Select(r => new SalesAggregate(r.FK_ItemId, r.Sku, r.Name, r.CostPrice,
-            r.Orders, storeCounts.GetValueOrDefault(r.FK_ItemId), r.QtyOrdered, r.QtyFulfilled, r.SalesValue)).ToList();
-        return (rows, total);
-    }
-
-    public Task<decimal> GetTotalSalesAsync(ProductReportFilter f) =>
-        SoldLines(f).SumAsync(x => x.QuantityFulfilled * x.UnitPrice);
-
-    public async Task<Dictionary<Guid, decimal>> GetSoldQtyAsync(ProductReportFilter f, IEnumerable<Guid> itemIds)
-    {
-        var ids = itemIds.ToList();
-        return await SoldLines(f with { Search = null })
-            .Where(l => ids.Contains(l.FK_ItemId))
-            .GroupBy(l => l.FK_ItemId)
-            .Select(g => new { g.Key, Qty = g.Sum(x => (decimal)x.QuantityFulfilled) })
-            .ToDictionaryAsync(x => x.Key, x => x.Qty);
-    }
-
-    public Task<List<ReturnAggregate>> GetReturnsAsync(ProductReportFilter f)
-    {
-        var q = db.SaleReturnItems.AsNoTracking().AsQueryable();
-        if (f.From.HasValue) q = q.Where(r => r.SaleReturn.CreatedAt >= f.From.Value);
-        if (f.To.HasValue) q = q.Where(r => r.SaleReturn.CreatedAt < f.To.Value.Date.AddDays(1));
-        if (f.BrandId.HasValue) q = q.Where(r => r.Item.FK_BrandId == f.BrandId.Value);
-        if (f.CategoryId.HasValue) q = q.Where(r => r.Item.FK_CategoryId == f.CategoryId.Value);
-        if (f.SubCategoryId.HasValue) q = q.Where(r => r.Item.FK_SubCategoryId == f.SubCategoryId.Value);
-        if (f.StoreId.HasValue) q = q.Where(r => r.SaleReturn.ShopPO.FK_StoreId == f.StoreId.Value);
-        if (f.RouteId.HasValue) q = q.Where(r => r.SaleReturn.ShopPO.Store.FK_RouteId == f.RouteId.Value);
-        if (f.RegionId.HasValue) q = q.Where(r => r.SaleReturn.ShopPO.Store.Route.FK_RegionId == f.RegionId.Value);
-        if (!string.IsNullOrWhiteSpace(f.Search))
-        {
-            var s = f.Search.Trim();
-            q = q.Where(r => r.Item.Name.Contains(s) || r.Item.Sku.Contains(s));
-        }
-
-        return q.GroupBy(r => new { r.FK_ItemId, r.Item.Sku, r.Item.Name, r.ReasonCode })
-            .Select(g => new ReturnAggregate(g.Key.FK_ItemId, g.Key.Sku, g.Key.Name, g.Key.ReasonCode,
-                g.Sum(x => x.Quantity), g.Sum(x => x.Quantity * x.UnitPrice)))
-            .ToListAsync();
-    }
-}

Distribution/Features/ProductReport/ProductReportService.cs

@@ -1,72 +0,0 @@
-using Distribution.Features.Stock;
-
-namespace Distribution.Features.ProductReport;
-
-public class ProductReportService(IProductReportRepository repo)
-{
-    public const int MaxRangeDays = 366;
-
-    public static string? Validate(ProductReportFilter f, int page, int pageSize)
-    {
-        if (page < 1 || pageSize < 1 || pageSize > 200) return "page must be >= 1 and pageSize between 1 and 200.";
-        if (f.From.HasValue && f.To.HasValue)
-        {
-            if (f.To < f.From) return "'to' must not be before 'from'.";
-            if ((f.To.Value - f.From.Value).TotalDays > MaxRangeDays) return $"Date range cannot exceed {MaxRangeDays} days.";
-        }
-        return null;
-    }
-
-    public async Task<PagedResponse<ProductStockRow>> GetStockAsync(ProductReportFilter f, int page, int pageSize)
-    {
-        var (rows, total) = await repo.GetStockAsync(f, page, pageSize);
-        return new PagedResponse<ProductStockRow>(page, pageSize, total, rows);
-    }
-
-    public async Task<PagedResponse<ProductSalesRow>> GetSalesAsync(ProductReportFilter f, int page, int pageSize)
-    {
-        var (rows, total) = await repo.GetSalesAsync(f, page, pageSize);
-        var mapped = rows.Select(r =>
-        {
-            decimal? cost = r.CostPrice.HasValue ? r.CostPrice.Value * r.QtyFulfilled : null;
-            decimal? margin = cost.HasValue ? r.SalesValue - cost.Value : null;
-            decimal? pct = margin.HasValue && r.SalesValue != 0 ? Math.Round(margin.Value / r.SalesValue * 100, 2) : null;
-            return new ProductSalesRow(r.ItemId, r.Sku, r.Name, r.Orders, r.Stores, r.QtyOrdered, r.QtyFulfilled,
-                r.SalesValue, cost, margin, pct);
-        }).ToList();
-        return new PagedResponse<ProductSalesRow>(page, pageSize, total, mapped);
-    }
-
-    public async Task<PagedResponse<ProductReturnRow>> GetReturnsAsync(ProductReportFilter f, int page, int pageSize)
-    {
-        var agg = await repo.GetReturnsAsync(f);
-        var grouped = agg.GroupBy(a => new { a.ItemId, a.Sku, a.Name })
-            .Select(g => new
-            {
-                g.Key,
-                Qty = g.Sum(x => x.Qty),
-                Value = g.Sum(x => x.Value),
-                ByReason = g.ToDictionary(x => x.Reason, x => x.Qty),
-            })
-            .OrderByDescending(x => x.Value).ThenBy(x => x.Key.Name)
-            .ToList();
-
-        var pageRows = grouped.Skip((page - 1) * pageSize).Take(pageSize).ToList();
-        var sold = await repo.GetSoldQtyAsync(f, pageRows.Select(r => r.Key.ItemId));
-
-        var rows = pageRows.Select(r =>
-        {
-            var soldQty = sold.GetValueOrDefault(r.Key.ItemId);
-            decimal? pct = soldQty > 0 ? Math.Round(r.Qty / soldQty * 100, 2) : null;
-            return new ProductReturnRow(r.Key.ItemId, r.Key.Sku, r.Key.Name, r.Qty, r.Value, soldQty, pct, r.ByReason);
-        }).ToList();
-        return new PagedResponse<ProductReturnRow>(page, pageSize, grouped.Count, rows);
-    }
-
-    public async Task<ProductReportSummary> GetSummaryAsync(ProductReportFilter f)
-    {
-        var (rows, total) = await repo.GetStockAsync(f, 1, int.MaxValue);
-        var totalSales = await repo.GetTotalSalesAsync(f);
-        return new ProductReportSummary(total, rows.Sum(r => r.TotalQty), rows.Sum(r => r.StockValue), totalSales);
-    }
-}

Distribution/Features/PurchaseReturn/PurchaseReturnService.cs

@@ -10,7 +10,7 @@ public class PurchaseReturnService(
     IPurchaseReturnRepository repo,
     IPoRepository poRepo,
     IGrnRepository goodsReceiptRepo,
-    StockMover mover,
+    IStockRepository stockRepo,
     IUnitOfWork uow)
 {
     private static PurchaseReturnItemResponse MapItem(Models.PurchaseReturnItem i) =>
@@ -89,12 +89,29 @@ public class PurchaseReturnService(
 
             foreach (var line in purchaseReturn.Items)
             {
-                var itemName = po.Items.FirstOrDefault(i => i.FK_ItemId == line.FK_ItemId)?.Item?.Name ?? line.FK_ItemId.ToString();
+                var balance = await stockRepo.GetBalanceAsync(line.FK_ItemId, warehouseId)
+                    ?? throw new InvalidOperationException($"No stock balance found for item {line.FK_ItemId} at the receiving warehouse.");
 
-                await mover.MoveAsync(line.FK_ItemId, itemName,
-                    warehouseId, LocationType.Warehouse,
-                    StockService.ExternalLocationId, LocationType.External,
-                    line.Quantity, MovementType.PurchaseReturn, purchaseReturn.Id, createdByUserId, request.Reason);
+                if (balance.Quantity < line.Quantity)
+                    throw new InvalidOperationException($"Insufficient warehouse stock for item {line.FK_ItemId} to return.");
+
+                balance.Quantity -= line.Quantity;
+                balance.UpdatedAt = DateTime.Now;
+                stockRepo.UpdateBalance(balance);
+
+                await stockRepo.AddMovementAsync(new StockMovement
+                {
+                    FK_ItemId = line.FK_ItemId,
+                    FromLocationId = warehouseId,
+                    FromLocationType = LocationType.Warehouse,
+                    ToLocationId = StockService.ExternalLocationId,
+                    ToLocationType = LocationType.External,
+                    Quantity = line.Quantity,
+                    Type = MovementType.PurchaseReturn,
+                    ReasonCode = request.Reason,
+                    ReferenceId = purchaseReturn.Id,
+                    CreatedBy = createdByUserId
+                });
             }
 
             await uow.CommitAsync(ct);

Distribution/Features/Region/IRegionRepository.cs

@@ -4,14 +4,6 @@ public interface IRegionRepository
 {
     Task<Models.Region?> GetByIdAsync(Guid id);
     Task<List<Models.Region>> GetAllAsync();
-    Task<List<string>> GetAllCodesAsync();
-    Task<bool> CodeExistsAsync(string code, Guid? excludeId = null);
-
-    Task<Models.User?> GetUserWithRoleAsync(Guid userId);
-    Task<List<Models.UserRegionScope>> GetManagerScopesAsync(Guid regionId);
-    Task<Models.UserRegionScope?> GetRegionScopeAsync(Guid userId, Guid regionId);
-    Task AddRegionScopeAsync(Models.UserRegionScope scope);
-    void RemoveRegionScopes(IEnumerable<Models.UserRegionScope> scopes);
     Task AddAsync(Models.Region entity);
     void Update(Models.Region entity);
     void Remove(Models.Region entity);
@@ -50,5 +42,5 @@ public interface IRegionRepository
     Task<List<Models.Route>> GetRoutesAsync(Guid regionId);
     Task<List<Models.Store>> GetStoresByRouteIdsAsync(List<Guid> routeIds);
 
-    Task<List<Models.ShopPO>> GetOrdersForDashboardAsync(Guid regionId, DateTime periodStart, DateTime periodEndExclusive);
+    Task<List<Models.Order>> GetOrdersForDashboardAsync(Guid regionId, DateTime periodStart, DateTime periodEndExclusive);
 }

Distribution/Features/Region/RegionController.cs

@@ -10,11 +10,6 @@ public class RegionController(RegionService service) : ControllerBase
     public async Task<IActionResult> GetAll() =>
         Ok(await service.GetAllAsync());
 
-    // Suggested code for the Add Region form; the user may override it.
-    [HttpGet("next-code")]
-    public async Task<IActionResult> GetNextCode() =>
-        Ok(await service.GetNextCodeAsync());
-
     [HttpGet("{id:guid}")]
     public async Task<IActionResult> GetById(Guid id)
     {
@@ -43,34 +38,6 @@ public class RegionController(RegionService service) : ControllerBase
         return deleted ? NoContent() : NotFound();
     }
 
-    [HttpGet("{id:guid}/manager")]
-    public async Task<IActionResult> GetManager(Guid id)
-    {
-        var result = await service.GetManagerAsync(id);
-        return result is null ? NotFound() : Ok(result);
-    }
-
-    [HttpPut("{id:guid}/manager")]
-    public async Task<IActionResult> SetManager(Guid id, SetRegionManagerRequest request, CancellationToken ct)
-    {
-        try
-        {
-            var result = await service.SetManagerAsync(id, request, ct);
-            return result is null ? NotFound() : Ok(result);
-        }
-        catch (InvalidOperationException ex)
-        {
-            return BadRequest(new { error = ex.Message });
-        }
-    }
-
-    [HttpDelete("{id:guid}/manager")]
-    public async Task<IActionResult> RemoveManager(Guid id, CancellationToken ct)
-    {
-        var removed = await service.RemoveManagerAsync(id, ct);
-        return removed ? NoContent() : NotFound();
-    }
-
     //targets/budgets/agencies/tax-rule.
     [HttpPut("{id:guid}/manage")]
     public async Task<IActionResult> Manage(Guid id, ManageRegionRequest request, CancellationToken ct)

Distribution/Features/Region/RegionDTOs.cs

@@ -1,14 +1,10 @@
 namespace Distribution.Features.Region;
 
-// Code is optional: blank/null auto-generates the next REG-#### code; otherwise stored as entered (trimmed).
-public record CreateRegionRequest(string Name, string? Code = null);
+public record CreateRegionRequest(string Name);
 
-public record NextRegionCodeResponse(string Code);
+public record UpdateRegionRequest(string Name);
 
-// Code is auto-generated on create; on update it is optional (null/blank keeps the current code).
-public record UpdateRegionRequest(string Name, string? Code = null);
-
-public record RegionResponse(Guid Id, string Code, string Name, bool IsActive, DateTime CreatedAt);
+public record RegionResponse(Guid Id, string Name, bool IsActive, DateTime CreatedAt);
 
 public record RegionalTargetResponse(Guid RegionId, string Period, decimal TargetValue);
 
@@ -65,9 +61,3 @@ public record RegionManageEntryResponse(
     string? RuleConfig,
     Guid? AgencyUserId,
     DateTime CreatedAt);
-
-// Region manager = the single active user with the RegionalManager role scoped to the region
-// (UserRegionScope). Users themselves are owned by the auth service; this only links one to a region.
-public record SetRegionManagerRequest(Guid UserId);
-
-public record RegionManagerResponse(Guid RegionId, Guid UserId, string Username, string FullName);

Distribution/Features/Region/RegionRepository.cs

@@ -11,32 +11,6 @@ public class RegionRepository(AppDBContext context) : IRegionRepository
     public async Task<List<Models.Region>> GetAllAsync() =>
         await context.Regions.ToListAsync();
 
-    // Includes soft-deleted regions: the unique index on Code doesn't know about IsActive.
-    public async Task<List<string>> GetAllCodesAsync() =>
-        await context.Regions.Select(r => r.Code).ToListAsync();
-
-    public async Task<bool> CodeExistsAsync(string code, Guid? excludeId = null) =>
-        await context.Regions.AnyAsync(r => r.Code == code && (excludeId == null || r.Id != excludeId));
-
-    public async Task<Models.User?> GetUserWithRoleAsync(Guid userId) =>
-        await context.Users.Include(u => u.Role).FirstOrDefaultAsync(u => u.Id == userId);
-
-    public async Task<List<Models.UserRegionScope>> GetManagerScopesAsync(Guid regionId) =>
-        await context.UserRegionScopes
-            .Include(s => s.User).ThenInclude(u => u.Role)
-            .Where(s => s.FK_RegionId == regionId && s.User.IsActive && s.User.Role.Name == "RegionalManager")
-            .ToListAsync();
-
-    public async Task<Models.UserRegionScope?> GetRegionScopeAsync(Guid userId, Guid regionId) =>
-        await context.UserRegionScopes.FirstOrDefaultAsync(s => s.FK_UserId == userId && s.FK_RegionId == regionId);
-
-    public async Task AddRegionScopeAsync(Models.UserRegionScope scope) =>
-        await context.UserRegionScopes.AddAsync(scope);
-
-    // Scope rows are hard-deleted (composite key user+region), same as UserRepository.ReplaceRegionScopesAsync.
-    public void RemoveRegionScopes(IEnumerable<Models.UserRegionScope> scopes) =>
-        context.UserRegionScopes.RemoveRange(scopes);
-
     public async Task AddAsync(Models.Region entity) =>
         await context.Regions.AddAsync(entity);
 
@@ -155,11 +129,11 @@ public class RegionRepository(AppDBContext context) : IRegionRepository
     public async Task<List<Models.Store>> GetStoresByRouteIdsAsync(List<Guid> routeIds) =>
         await context.Stores.Where(s => routeIds.Contains(s.FK_RouteId) && s.IsActive).ToListAsync();
 
-    public async Task<List<Models.ShopPO>> GetOrdersForDashboardAsync(Guid regionId, DateTime periodStart, DateTime periodEndExclusive) =>
-        await (from o in context.ShopPOs
+    public async Task<List<Models.Order>> GetOrdersForDashboardAsync(Guid regionId, DateTime periodStart, DateTime periodEndExclusive) =>
+        await (from o in context.Orders
                join s in context.Stores on o.FK_StoreId equals s.Id
                join r in context.Routes on s.FK_RouteId equals r.Id
                where r.FK_RegionId == regionId && o.IsActive && s.IsActive && r.IsActive
-                     && o.CreatedAt >= periodStart && o.CreatedAt < periodEndExclusive
+                     && o.OrderDate >= periodStart && o.OrderDate < periodEndExclusive
                select o).ToListAsync();
 }

Distribution/Features/Region/RegionService.cs

@@ -6,7 +6,6 @@ namespace Distribution.Features.Region;
 public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUserService currentUser, IScopeAccessService scopeAccess)
 {
     private const int RegionalAgencyRoleLevel = 60;
-    private const string CodePrefix = "REG-";
 
     // TODO: re-enable the RegionalManager+scope / RegionalAgency role gate on ManageAsync once
     // the role model for this endpoint is finalized. Left open (allow-all) for now on purpose.
@@ -15,42 +14,19 @@ public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUser
     public async Task<List<RegionResponse>> GetAllAsync() =>
         (await repo.GetAllAsync())
             .Where(r => r.IsActive)
-            .Select(r => new RegionResponse(r.Id, r.Code, r.Name, r.IsActive, r.CreatedAt))
+            .Select(r => new RegionResponse(r.Id, r.Name, r.IsActive, r.CreatedAt))
             .ToList();
 
     public async Task<RegionResponse?> GetByIdAsync(Guid id)
     {
         var region = await repo.GetByIdAsync(id);
         if (region is null || !region.IsActive) return null;
-        return new RegionResponse(region.Id, region.Code, region.Name, region.IsActive, region.CreatedAt);
-    }
-
-    // Next code = highest existing REG-#### number + 1 (soft-deleted regions included so codes are never reused).
-    public async Task<NextRegionCodeResponse> GetNextCodeAsync() => new(await GenerateCodeAsync());
-
-    private async Task<string> GenerateCodeAsync()
-    {
-        var max = (await repo.GetAllCodesAsync())
-            .Where(c => c.StartsWith(CodePrefix, StringComparison.OrdinalIgnoreCase)
-                        && int.TryParse(c[CodePrefix.Length..], out _))
-            .Select(c => int.Parse(c[CodePrefix.Length..]))
-            .DefaultIfEmpty(0)
-            .Max();
-        return $"{CodePrefix}{max + 1:D4}";
+        return new RegionResponse(region.Id, region.Name, region.IsActive, region.CreatedAt);
     }
 
     public async Task<RegionResponse> CreateAsync(CreateRegionRequest request, CancellationToken ct = default)
     {
-        string code;
-        if (string.IsNullOrWhiteSpace(request.Code))
-            code = await GenerateCodeAsync();
-        else
-        {
-            code = request.Code.Trim();
-            if (await repo.CodeExistsAsync(code))
-                throw new InvalidOperationException($"Region code '{code}' is already in use.");
-        }
-        var region = new Models.Region { Name = request.Name, Code = code };
+        var region = new Models.Region { Name = request.Name };
         await uow.BeginAsync(ct);
         try
         {
@@ -62,7 +38,7 @@ public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUser
             await uow.RollbackAsync(ct);
             throw;
         }
-        return new RegionResponse(region.Id, region.Code, region.Name, region.IsActive, region.CreatedAt);
+        return new RegionResponse(region.Id, region.Name, region.IsActive, region.CreatedAt);
     }
 
     public async Task<RegionResponse?> UpdateAsync(Guid id, UpdateRegionRequest request, CancellationToken ct = default)
@@ -70,13 +46,6 @@ public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUser
         var region = await repo.GetByIdAsync(id);
         if (region is null || !region.IsActive) return null;
         region.Name = request.Name;
-        if (!string.IsNullOrWhiteSpace(request.Code))
-        {
-            var code = request.Code.Trim();
-            if (code != region.Code && await repo.CodeExistsAsync(code, id))
-                throw new InvalidOperationException($"Region code '{code}' is already in use.");
-            region.Code = code;
-        }
         await uow.BeginAsync(ct);
         try
         {
@@ -88,68 +57,7 @@ public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUser
             await uow.RollbackAsync(ct);
             throw;
         }
-        return new RegionResponse(region.Id, region.Code, region.Name, region.IsActive, region.CreatedAt);
-    }
-
-    private const string RegionalManagerRole = "RegionalManager";
-
-    public async Task<RegionManagerResponse?> GetManagerAsync(Guid regionId)
-    {
-        var region = await repo.GetByIdAsync(regionId);
-        if (region is null || !region.IsActive) return null;
-        var scope = (await repo.GetManagerScopesAsync(regionId)).FirstOrDefault();
-        return scope is null ? null : new RegionManagerResponse(regionId, scope.FK_UserId, scope.User.Username, scope.User.FullName);
-    }
-
-    // A region has exactly one manager: assigning replaces any existing RegionalManager scoped to it.
-    // Returns null when the region does not exist; throws InvalidOperationException for an invalid user.
-    public async Task<RegionManagerResponse?> SetManagerAsync(Guid regionId, SetRegionManagerRequest request, CancellationToken ct = default)
-    {
-        var region = await repo.GetByIdAsync(regionId);
-        if (region is null || !region.IsActive) return null;
-
-        var user = await repo.GetUserWithRoleAsync(request.UserId);
-        if (user is null || !user.IsActive)
-            throw new InvalidOperationException("User not found.");
-        if (user.Role?.Name != RegionalManagerRole)
-            throw new InvalidOperationException($"User must have the {RegionalManagerRole} role to manage a region.");
-
-        await uow.BeginAsync(ct);
-        try
-        {
-            var existing = await repo.GetManagerScopesAsync(regionId);
-            repo.RemoveRegionScopes(existing.Where(s => s.FK_UserId != user.Id));
-            if (await repo.GetRegionScopeAsync(user.Id, regionId) is null)
-                await repo.AddRegionScopeAsync(new Models.UserRegionScope { FK_UserId = user.Id, FK_RegionId = regionId });
-            await uow.CommitAsync(ct);
-        }
-        catch
-        {
-            await uow.RollbackAsync(ct);
-            throw;
-        }
-        return new RegionManagerResponse(regionId, user.Id, user.Username, user.FullName);
-    }
-
-    public async Task<bool> RemoveManagerAsync(Guid regionId, CancellationToken ct = default)
-    {
-        var region = await repo.GetByIdAsync(regionId);
-        if (region is null || !region.IsActive) return false;
-        var existing = await repo.GetManagerScopesAsync(regionId);
-        if (existing.Count == 0) return false;
-
-        await uow.BeginAsync(ct);
-        try
-        {
-            repo.RemoveRegionScopes(existing);
-            await uow.CommitAsync(ct);
-        }
-        catch
-        {
-            await uow.RollbackAsync(ct);
-            throw;
-        }
-        return true;
+        return new RegionResponse(region.Id, region.Name, region.IsActive, region.CreatedAt);
     }
 
     public async Task<bool> DeleteAsync(Guid id, CancellationToken ct = default)
@@ -311,7 +219,7 @@ public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUser
             budget?.BudgetAmount,
             orders.Count,
             orders.Sum(o => o.TotalAmount),
-            orders.Count == 0 ? null : orders.Max(o => o.CreatedAt),
+            orders.Count == 0 ? null : orders.Max(o => o.OrderDate),
             taxRule?.RuleConfig,
             agencyMaps.Select(m => m.FK_AgencyUserId).ToList());
     }

Distribution/Features/Returns/IReturnRepository.cs

@@ -4,11 +4,11 @@ public interface IReturnRepository
 {
     Task<Models.SaleReturn?> GetByIdAsync(Guid id);
     Task<List<Models.SaleReturn>> GetAllAsync();
-    Task<List<Models.SaleReturn>> GetByShopPOIdAsync(Guid shopPOId);
+    Task<List<Models.SaleReturn>> GetByOrderIdAsync(Guid orderId);
     Task AddAsync(Models.SaleReturn entity);
     void Update(Models.SaleReturn entity);
     Task AddCreditNoteAsync(Models.CreditNote entity);
 
-    /// <summary>Whether this store has ever had this item on any of its (active) ShopPOs.</summary>
+    /// <summary>Whether this store has ever had this item on any of its (active) orders.</summary>
     Task<bool> StoreHasPriorSaleAsync(Guid storeId, Guid itemId);
 }

Distribution/Features/Returns/ReturnController.cs

@@ -1,4 +1,4 @@
-using Distribution.Infra.Authorization;
+using Distribution.Infra.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Distribution.Features.Returns;
@@ -28,13 +28,15 @@ public class ReturnController(ReturnService service, ICurrentUserService current
         catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
     }
 
-    [HttpGet("api/shop-pos/{id:guid}/returns")]
-    public async Task<IActionResult> GetByShopPO(Guid id) =>
-        Ok(await service.GetByShopPOIdAsync(id));
+    [HttpGet("api/orders/{id:guid}/returns")]
+    public async Task<IActionResult> GetByOrder(Guid id) =>
+        Ok(await service.GetByOrderIdAsync(id));
 
-    [HttpPost("api/shop-pos/{id:guid}/returns")]
+    [HttpPost("api/orders/{id:guid}/returns")]
     public async Task<IActionResult> Create(Guid id, CreateSaleReturnRequest 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.CreatedByUserId;
         if (userId is null) return BadRequest(new { error = "CreatedByUserId is required while auth is unavailable" });
         try
@@ -42,7 +44,6 @@ public class ReturnController(ReturnService service, ICurrentUserService current
             var result = await service.CreateAsync(id, request, userId.Value, ct);
             return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
         }
-        
         catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
     }
 }

Distribution/Features/Returns/ReturnDTOs.cs

@@ -27,7 +27,7 @@ public record SaleReturnItemResponse(
 
 public record SaleReturnResponse(
     Guid Id,
-    Guid ShopPOId,
+    Guid OrderId,
     ReturnMode Mode,
     decimal TotalCreditAmount,
     decimal OrderTotalAmountAfter,

Distribution/Features/Returns/ReturnRepository.cs

@@ -7,23 +7,23 @@ public class ReturnRepository(AppDBContext context) : IReturnRepository
 {
     public async Task<Models.SaleReturn?> GetByIdAsync(Guid id) =>
         await context.SaleReturns
-            .Include(r => r.ShopPO)
+            .Include(r => r.Order)
             .Include(r => r.Items).ThenInclude(i => i.Item)
             .FirstOrDefaultAsync(r => r.Id == id);
 
     public async Task<List<Models.SaleReturn>> GetAllAsync() =>
         await context.SaleReturns
-            .Include(r => r.ShopPO)
+            .Include(r => r.Order)
             .Include(r => r.Items).ThenInclude(i => i.Item)
             .Where(r => r.IsActive)
             .OrderByDescending(r => r.CreatedAt)
             .ToListAsync();
 
-    public async Task<List<Models.SaleReturn>> GetByShopPOIdAsync(Guid shopPOId) =>
+    public async Task<List<Models.SaleReturn>> GetByOrderIdAsync(Guid orderId) =>
         await context.SaleReturns
-            .Include(r => r.ShopPO)
+            .Include(r => r.Order)
             .Include(r => r.Items).ThenInclude(i => i.Item)
-            .Where(r => r.FK_ShopPOId == shopPOId && r.IsActive)
+            .Where(r => r.FK_OrderId == orderId && r.IsActive)
             .OrderByDescending(r => r.CreatedAt)
             .ToListAsync();
 
@@ -37,7 +37,7 @@ public class ReturnRepository(AppDBContext context) : IReturnRepository
         await context.CreditNotes.AddAsync(entity);
 
     public async Task<bool> StoreHasPriorSaleAsync(Guid storeId, Guid itemId) =>
-        await context.ShopPOItems
-            .Include(oi => oi.ShopPO)
-            .AnyAsync(oi => oi.ShopPO.FK_StoreId == storeId && oi.ShopPO.IsActive && oi.FK_ItemId == itemId);
+        await context.OrderItems
+            .Include(oi => oi.Order)
+            .AnyAsync(oi => oi.Order.FK_StoreId == storeId && oi.Order.IsActive && oi.FK_ItemId == itemId);
 }

Distribution/Features/Returns/ReturnService.cs

@@ -1,6 +1,7 @@
-using Distribution.Features.Category;
 using Distribution.Features.Item;
-using Distribution.Features.ShopPO;
+using Distribution.Features.Order;
+using Distribution.Features.Ride;
+using Distribution.Features.Sale;
 using Distribution.Features.Stock;
 using Distribution.Infra.UoW;
 using Distribution.Models;
@@ -9,17 +10,18 @@ namespace Distribution.Features.Returns;
 
 public class ReturnService(
     IReturnRepository repo,
-    IShopPORepository shopPORepo,
+    IOrderRepository orderRepo,
+    ISaleRepository saleRepo,
+    IRideRepository rideRepo,
     IItemRepository itemRepo,
-    ICategoryRepository categoryRepo,
-    StockMover mover,
+    IStockRepository stockRepo,
     IUnitOfWork uow)
 {
     private static SaleReturnItemResponse MapItem(SaleReturnItem i) =>
         new(i.Id, i.FK_ItemId, i.Item.Sku, i.Item.Name, i.Quantity, i.ReasonCode, i.UnitPrice);
 
     private static SaleReturnResponse Map(SaleReturn r) =>
-        new(r.Id, r.FK_ShopPOId, r.Mode, r.TotalCreditAmount, r.ShopPO.TotalAmount, r.IsActive, r.CreatedAt,
+        new(r.Id, r.FK_OrderId, r.Mode, r.TotalCreditAmount, r.Order.TotalAmount, r.IsActive, r.CreatedAt,
             r.Items.Where(i => i.IsActive).Select(MapItem).ToList());
 
     public async Task<SaleReturnResponse?> GetByIdAsync(Guid id)
@@ -56,30 +58,44 @@ public class ReturnService(
         return Map(r);
     }
 
-    public async Task<List<SaleReturnResponse>> GetByShopPOIdAsync(Guid shopPOId) =>
-        (await repo.GetByShopPOIdAsync(shopPOId)).Select(Map).ToList();
+    public async Task<List<SaleReturnResponse>> GetByOrderIdAsync(Guid orderId) =>
+        (await repo.GetByOrderIdAsync(orderId)).Select(Map).ToList();
 
     /// <summary>
-    /// Stock-only: records the return and puts the goods back on the vehicle that delivered them (restoring the
-    /// batches/serials that were sold). Credit/exchange money handling is not applied here, so TotalCreditAmount stays 0.
+    /// Records a return recognized during the same store visit as an open order and settles it
+    /// immediately: stock is credited back to the rep's vehicle, and either the order total is
+    /// reduced (CreditDeduction) or the matching order line quantities are reduced (ItemExchange).
+    /// A return is only allowed for an item the store has previously ordered.
     /// </summary>
-    public async Task<SaleReturnResponse> CreateAsync(Guid shopPOId, CreateSaleReturnRequest request, Guid createdByUserId, CancellationToken ct = default)
+    public async Task<SaleReturnResponse> CreateAsync(Guid orderId, CreateSaleReturnRequest request, Guid createdByUserId, CancellationToken ct = default)
     {
-        var shopPO = await shopPORepo.GetByIdAsync(shopPOId);
-        if (shopPO is null || !shopPO.IsActive)
+        var order = await orderRepo.GetByIdAsync(orderId);
+        if (order is null || !order.IsActive)
             throw new InvalidOperationException("Order not found.");
+        if (order.Status is OrderStatus.Cancelled or OrderStatus.Fulfilled)
+            throw new InvalidOperationException("Cannot record a return against a closed order.");
 
         if (request.Items is null || request.Items.Count == 0)
             throw new InvalidOperationException("A return must have at least one line item.");
 
-        if (request.Items.GroupBy(i => i.ItemId).Any(g => g.Count() > 1))
-            throw new InvalidOperationException("Each item can appear only once on a return.");
+        if (order.FK_SaleId is null)
+            throw new InvalidOperationException("Sale not found for this order.");
+        var sale = await saleRepo.GetByIdAsync(order.FK_SaleId.Value)
+            ?? throw new InvalidOperationException("Sale not found for this order.");
+        if (sale.FK_RideId is null)
+            throw new InvalidOperationException("A return can only be recorded for an order created during an active ride.");
+
+        var ride = await rideRepo.GetByIdAsync(sale.FK_RideId.Value)
+            ?? throw new InvalidOperationException("Ride not found.");
+        var vehicleId = ride.FK_VehicleId;
+
+        var orderItems = await orderRepo.GetItemsByOrderIdAsync(orderId);
+        var orderItemsByItemId = orderItems.ToDictionary(oi => oi.FK_ItemId);
 
         var saleReturn = new SaleReturn
         {
-            FK_ShopPOId = shopPOId,
+            FK_OrderId = orderId,
             Mode = request.Mode,
-            TotalCreditAmount = 0,
             CreatedByUserId = createdByUserId
         };
 
@@ -88,36 +104,90 @@ public class ReturnService(
             if (line.Quantity <= 0)
                 throw new InvalidOperationException("Return quantity must be greater than zero.");
 
-            var shopPOItem = shopPO.Items.FirstOrDefault(i => i.FK_ItemId == line.ItemId && i.IsActive)
-                ?? throw new InvalidOperationException($"Item {line.ItemId} is not on this order.");
-
             var item = await itemRepo.GetByIdAsync(line.ItemId)
-                ?? throw new InvalidOperationException("Item not found.");
+                ?? throw new InvalidOperationException($"Item {line.ItemId} not found.");
 
-            var category = await categoryRepo.GetByIdAsync(item.FK_CategoryId)
-                ?? throw new InvalidOperationException("Category not found.");
+            if (!await repo.StoreHasPriorSaleAsync(order.FK_StoreId, line.ItemId))
+                throw new InvalidOperationException($"No prior sale of item '{item.Name}' found for this store.");
 
-            if (!category.AllowCustomerReturn)
-                throw new InvalidOperationException($"Customer returns are not allowed for category '{category.Name}'.");
+            var unitPrice = orderItemsByItemId.TryGetValue(line.ItemId, out var matchingOrderItem)
+                ? matchingOrderItem.UnitPrice
+                : item.SalePrice ?? 0;
 
             saleReturn.Items.Add(new SaleReturnItem
             {
                 FK_ItemId = line.ItemId,
                 Quantity = line.Quantity,
                 ReasonCode = line.ReasonCode,
-                UnitPrice = shopPOItem.UnitPrice
+                UnitPrice = unitPrice
             });
         }
 
         await uow.BeginAsync(ct);
         try
         {
-            await repo.AddAsync(saleReturn);
-
             foreach (var line in saleReturn.Items)
             {
-                var itemName = shopPO.Items.First(i => i.FK_ItemId == line.FK_ItemId).Item?.Name ?? line.FK_ItemId.ToString();
-                await mover.ReturnToVehicleAsync(line.FK_ItemId, itemName, line.Quantity, shopPOId, createdByUserId, line.ReasonCode.ToString());
+                var balance = await stockRepo.GetBalanceAsync(line.FK_ItemId, vehicleId);
+                if (balance is null)
+                {
+                    await stockRepo.AddBalanceAsync(new StockBalance
+                    {
+                        FK_ItemId = line.FK_ItemId,
+                        LocationId = vehicleId,
+                        LocationType = LocationType.Vehicle,
+                        Quantity = line.Quantity
+                    });
+                }
+                else
+                {
+                    balance.Quantity += line.Quantity;
+                    balance.UpdatedAt = DateTime.Now;
+                    stockRepo.UpdateBalance(balance);
+                }
+
+                await stockRepo.AddMovementAsync(new StockMovement
+                {
+                    FK_ItemId = line.FK_ItemId,
+                    FromLocationId = StockService.ExternalLocationId,
+                    FromLocationType = LocationType.External,
+                    ToLocationId = vehicleId,
+                    ToLocationType = LocationType.Vehicle,
+                    Quantity = line.Quantity,
+                    Type = MovementType.CustomerReturn,
+                    ReasonCode = line.ReasonCode.ToString(),
+                    ReferenceId = saleReturn.Id,
+                    CreatedBy = createdByUserId
+                });
+            }
+
+            await repo.AddAsync(saleReturn);
+
+            if (request.Mode == ReturnMode.CreditDeduction)
+            {
+                var total = saleReturn.Items.Sum(i => i.Quantity * i.UnitPrice);
+                saleReturn.TotalCreditAmount = total;
+                order.TotalAmount = Math.Max(0, order.TotalAmount - total);
+                orderRepo.Update(order);
+
+                await repo.AddCreditNoteAsync(new CreditNote
+                {
+                    FK_SaleReturnId = saleReturn.Id,
+                    Amount = total
+                });
+            }
+            else // ItemExchange
+            {
+                foreach (var line in saleReturn.Items)
+                {
+                    if (!orderItemsByItemId.TryGetValue(line.FK_ItemId, out var orderItem))
+                        continue; // no matching line on this order — nothing to offset
+
+                    var offsetQty = Math.Min(line.Quantity, orderItem.Quantity);
+                    orderItem.Quantity -= (int)offsetQty;
+                    order.TotalAmount = Math.Max(0, order.TotalAmount - offsetQty * orderItem.UnitPrice);
+                }
+                orderRepo.Update(order);
             }
 
             await uow.CommitAsync(ct);

Distribution/Features/Ride/IRideCancelRequestRepository.cs

@@ -0,0 +1,14 @@
+using Distribution.Models;
+
+namespace Distribution.Features.Ride;
+
+public interface IRideCancelRequestRepository
+{
+    Task<RideCancelRequest?> GetByIdAsync(Guid id);
+    Task<RideCancelRequest?> GetByRideIdAsync(Guid rideId);
+    Task<RideCancelRequest?> GetPendingByRideIdAsync(Guid rideId);
+    Task<List<RideCancelRequest>> GetAllAsync(CancelRequestStatus? status, int page, int pageSize);
+    Task<int> GetCountAsync(CancelRequestStatus? status);
+    Task AddAsync(RideCancelRequest request);
+    void Update(RideCancelRequest request);
+}

Distribution/Features/Ride/IRideRepository.cs

@@ -1,13 +1,22 @@
-using Distribution.Models;
+using Distribution.Models;
 
 namespace Distribution.Features.Ride;
 
 public interface IRideRepository
 {
     Task<DeliveryRun?> GetByIdAsync(Guid id);
-    Task<List<DeliveryRun>> GetAllAsync(RideStatus? status, Guid? driverProfileId, Guid? vehicleId, int page, int pageSize);
-    Task<int> GetCountAsync(RideStatus? status, Guid? driverProfileId, Guid? vehicleId);
-    Task<bool> HasOpenRideForVehicleAsync(Guid vehicleId, Guid? excludeRideId = null);
+    Task<List<DeliveryRun>> GetAllAsync(RideStatus? status, RideType? type, Guid? driverProfileId, Guid? vehicleId, int page, int pageSize);
+    Task<int> GetCountAsync(RideStatus? status, RideType? type, Guid? driverProfileId, Guid? vehicleId);
+    Task<bool> HasOpenOrActiveRideForVehicleAsync(Guid vehicleId, Guid? excludeRideId = null);
+    Task<List<DeliveryRun>> GetActiveRidesAsync(Guid? excludeRideId = null);
+    Task<List<OrderSummaryModel>> GetActiveOrdersByRouteIdAsync(Guid routeId);
     Task AddAsync(DeliveryRun ride);
     void Update(DeliveryRun ride);
 }
+
+public record OrderSummaryModel(
+    Guid Id,
+    Guid StoreId,
+    string StoreName,
+    DateTime OrderDate,
+    decimal TotalAmount);

Distribution/Features/Ride/RideCancelRequestRepository.cs

@@ -0,0 +1,39 @@
+using Distribution.Data;
+using Distribution.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace Distribution.Features.Ride;
+
+public class RideCancelRequestRepository(AppDBContext context) : IRideCancelRequestRepository
+{
+    public async Task<RideCancelRequest?> GetByIdAsync(Guid id) =>
+        await context.RideCancelRequests.FirstOrDefaultAsync(r => r.Id == id);
+
+    public async Task<RideCancelRequest?> GetByRideIdAsync(Guid rideId) =>
+        await context.RideCancelRequests
+            .Where(r => r.FK_RideId == rideId)
+            .OrderByDescending(r => r.RequestedAt)
+            .FirstOrDefaultAsync();
+
+    public async Task<RideCancelRequest?> GetPendingByRideIdAsync(Guid rideId) =>
+        await context.RideCancelRequests
+            .FirstOrDefaultAsync(r => r.FK_RideId == rideId && r.Status == CancelRequestStatus.Pending);
+
+    public async Task<List<RideCancelRequest>> GetAllAsync(CancelRequestStatus? status, int page, int pageSize) =>
+        await context.RideCancelRequests
+            .Where(r => status == null || r.Status == status)
+            .OrderByDescending(r => r.RequestedAt)
+            .Skip((page - 1) * pageSize)
+            .Take(pageSize)
+            .ToListAsync();
+
+    public async Task<int> GetCountAsync(CancelRequestStatus? status) =>
+        await context.RideCancelRequests
+            .CountAsync(r => status == null || r.Status == status);
+
+    public async Task AddAsync(RideCancelRequest request) =>
+        await context.RideCancelRequests.AddAsync(request);
+
+    public void Update(RideCancelRequest request) =>
+        context.RideCancelRequests.Update(request);
+}

Distribution/Features/Ride/RideController.cs

@@ -1,5 +1,5 @@
-using Distribution.Models;
-using Distribution.Infra.Authorization;
+using Distribution.Infra.Authorization;
+using Distribution.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Distribution.Features.Ride;
@@ -11,12 +11,13 @@ public class RideController(RideService service, ICurrentUserService currentUser
     [HttpGet]
     public async Task<IActionResult> GetAll(
         [FromQuery] RideStatus? status,
+        [FromQuery] RideType? type,
         [FromQuery] Guid? driverProfileId,
         [FromQuery] Guid? vehicleId,
         [FromQuery] int page = 1,
         [FromQuery] int pageSize = 20)
     {
-        var result = await service.GetAllAsync(status, driverProfileId, vehicleId, page, pageSize);
+        var result = await service.GetAllAsync(status, type, driverProfileId, vehicleId, page, pageSize);
         return Ok(result);
     }
 
@@ -30,12 +31,8 @@ public class RideController(RideService service, ICurrentUserService currentUser
     [HttpPost]
     public async Task<IActionResult> Create(CreateRideRequest request, CancellationToken ct)
     {
-        try
-        {
-            var result = await service.CreateAsync(request, ct);
-            return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
-        }
-        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+        var result = await service.CreateAsync(request, ct);
+        return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
     }
 
     [HttpPut("{id:guid}/driver")]
@@ -50,27 +47,108 @@ public class RideController(RideService service, ICurrentUserService currentUser
         catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
     }
 
-    [HttpPost("{id:guid}/close")]
-    public async Task<IActionResult> Close(Guid id, CloseRideRequest request, CancellationToken ct)
+    [HttpPost("{id:guid}/open")]
+    public async Task<IActionResult> Open(Guid id, CancellationToken ct)
     {
         try
         {
-            var result = await service.CloseAsync(id, request, currentUser.UserId ?? Guid.Empty, ct);
+            var result = await service.OpenAsync(id, ct);
             return Ok(result);
         }
         catch (KeyNotFoundException) { return NotFound(); }
         catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
     }
 
-    [HttpPost("{id:guid}/cancel")]
-    public async Task<IActionResult> Cancel(Guid id, CancelRideRequest request, CancellationToken ct)
+    [HttpPatch("{id:guid}/activate")]
+    [HttpPost("{id:guid}/activate")]
+    public async Task<IActionResult> Activate(Guid id, ActivateRideRequest request, CancellationToken ct)
     {
         try
         {
-            var result = await service.CancelAsync(id, request, currentUser.UserId ?? Guid.Empty, ct);
+            var result = await service.ActivateAsync(id, request, ct);
             return Ok(result);
         }
         catch (KeyNotFoundException) { return NotFound(); }
         catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
     }
+
+    [HttpPatch("{id:guid}/close")]
+    [HttpPost("{id:guid}/close")]
+    public async Task<IActionResult> Close(Guid id, CloseRideRequest request, CancellationToken ct)
+    {
+        try
+        {
+            var result = await service.CloseAsync(id, request, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("{id:guid}/cancel-request")]
+    public async Task<IActionResult> RaiseCancelRequest(Guid id, RaiseCancelRequest request, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.RaiseCancelRequestAsync(id, request, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpGet("cancel-requests")]
+    public async Task<IActionResult> GetCancelRequests(
+        [FromQuery] CancelRequestStatus? status,
+        [FromQuery] int page = 1,
+        [FromQuery] int pageSize = 20)
+    {
+        var result = await service.GetCancelRequestsAsync(status, page, pageSize);
+        return Ok(result);
+    }
+
+    [HttpPost("cancel-requests/{id:guid}/approve")]
+    public async Task<IActionResult> ApproveCancelRequest(Guid id, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.ApproveCancelAsync(id, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("cancel-requests/{id:guid}/reject")]
+    public async Task<IActionResult> RejectCancelRequest(Guid id, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.RejectCancelAsync(id, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpGet("{id:guid}/cancel-request")]
+    public async Task<IActionResult> GetCancelRequest(Guid id)
+    {
+        var result = await service.GetCancelRequestAsync(id);
+        return result is null ? NotFound() : Ok(result);
+    }
+
+    [HttpGet("breakdown-assist/{rideId:guid}")]
+    public async Task<IActionResult> GetBreakdownAssist(Guid rideId)
+    {
+        try
+        {
+            var result = await service.GetBreakdownAssistAsync(rideId);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+    }
 }

Distribution/Features/Ride/RideDTOs.cs

@@ -1,29 +1,73 @@
-using Distribution.Models;
+using Distribution.Models;
+using Distribution.Features.Stock;
 
 namespace Distribution.Features.Ride;
 
+// Ride (DeliveryRun)
 public record RideResponse(
     Guid Id,
+    RideType RideType,
     RideStatus Status,
     Guid VehicleId,
     string VehicleNumberPlate,
     Guid DriverProfileId,
     string DriverFullName,
+    Guid RouteId,
+    string RouteName,
+    Guid SourceWarehouseId,
+    string SourceWarehouseName,
     int Meterstart,
     int Meterend,
     DateTime? StartedAt,
+    DateTime? ActivatedAt,
     DateTime? ClosedAt,
-    CancelRequestType? CancelTypeCode,
-    string? CancelReason,
     DateTime CreatedAt);
 
 public record CreateRideRequest(
+    RideType RideType,
     Guid VehicleId,
     Guid DriverProfileId,
-    int Meterstart);
+    Guid RouteId,
+    Guid? SourceWarehouseId);
 
 public record AssignRideDriverRequest(Guid DriverProfileId);
 
+public record ActivateRideRequest(int Meterstart);
+
 public record CloseRideRequest(int Meterend);
 
-public record CancelRideRequest(CancelRequestType TypeCode, string Reason);
+public record RaiseCancelRequest(CancelRequestType TypeCode, string Reason);
+
+// Cancel Request
+public record RideCancelRequestResponse(
+    Guid Id,
+    Guid RideId,
+    CancelRequestType TypeCode,
+    string Reason,
+    Guid RequestedBy,
+    DateTime RequestedAt,
+    CancelRequestStatus Status,
+    Guid? ApprovedBy,
+    DateTime? ApprovedAt);
+
+public record BreakdownAssistRideResponse(
+    Guid RideId,
+    Guid VehicleId,
+    string VehicleNumberPlate,
+    Guid DriverProfileId,
+    string DriverFullName,
+    Guid RouteId,
+    string RouteName,
+    List<StockBalanceResponse> StockLevels);
+
+public record BreakdownAssistOrderResponse(
+    Guid OrderId,
+    Guid StoreId,
+    string StoreName,
+    DateTime OrderDate,
+    decimal TotalAmount);
+
+public record BreakdownAssistResponse(
+    Guid RideId,
+    List<BreakdownAssistRideResponse> ActiveRides,
+    List<BreakdownAssistOrderResponse> OpenOrders);

Distribution/Features/Ride/RideRepository.cs

@@ -1,4 +1,4 @@
-using Distribution.Data;
+using Distribution.Data;
 using Distribution.Models;
 using Microsoft.EntityFrameworkCore;
 
@@ -10,32 +10,59 @@ public class RideRepository(AppDBContext context) : IRideRepository
         await context.DeliveryRuns
             .Include(r => r.Vehicle)
             .Include(r => r.DriverProfile).ThenInclude(dp => dp.User)
+            .Include(r => r.Route)
+            .Include(r => r.SourceWarehouse)
             .FirstOrDefaultAsync(r => r.Id == id);
 
-    public async Task<List<DeliveryRun>> GetAllAsync(RideStatus? status, Guid? driverProfileId, Guid? vehicleId, int page, int pageSize) =>
+    public async Task<List<DeliveryRun>> GetAllAsync(RideStatus? status, RideType? type, Guid? driverProfileId, Guid? vehicleId, int page, int pageSize) =>
         await context.DeliveryRuns
             .Include(r => r.Vehicle)
             .Include(r => r.DriverProfile).ThenInclude(dp => dp.User)
+            .Include(r => r.Route)
+            .Include(r => r.SourceWarehouse)
             .Where(r =>
                 (status == null || r.Status == status) &&
+                (type == null || r.RideType == type) &&
                 (driverProfileId == null || r.FK_DriverProfileId == driverProfileId) &&
                 (vehicleId == null || r.FK_VehicleId == vehicleId))
             .Skip((page - 1) * pageSize)
             .Take(pageSize)
             .ToListAsync();
 
-    public async Task<int> GetCountAsync(RideStatus? status, Guid? driverProfileId, Guid? vehicleId) =>
+    public async Task<int> GetCountAsync(RideStatus? status, RideType? type, Guid? driverProfileId, Guid? vehicleId) =>
         await context.DeliveryRuns
             .CountAsync(r =>
                 (status == null || r.Status == status) &&
+                (type == null || r.RideType == type) &&
                 (driverProfileId == null || r.FK_DriverProfileId == driverProfileId) &&
                 (vehicleId == null || r.FK_VehicleId == vehicleId));
 
-    public async Task<bool> HasOpenRideForVehicleAsync(Guid vehicleId, Guid? excludeRideId = null) =>
+    public async Task<bool> HasOpenOrActiveRideForVehicleAsync(Guid vehicleId, Guid? excludeRideId = null) =>
         await context.DeliveryRuns.AnyAsync(r =>
             r.FK_VehicleId == vehicleId &&
             r.Id != excludeRideId &&
-            r.Status == RideStatus.Open);
+            (r.Status == RideStatus.Open || r.Status == RideStatus.Active));
+
+    public async Task<List<DeliveryRun>> GetActiveRidesAsync(Guid? excludeRideId = null) =>
+        await context.DeliveryRuns
+            .Include(r => r.Vehicle)
+            .Include(r => r.DriverProfile).ThenInclude(dp => dp.User)
+            .Include(r => r.Route)
+            .Where(r => r.Id != excludeRideId && r.Status == RideStatus.Active)
+            .ToListAsync();
+
+    public async Task<List<OrderSummaryModel>> GetActiveOrdersByRouteIdAsync(Guid routeId) =>
+        await context.Orders
+            .Include(o => o.Store)
+            .Where(o => o.IsActive && o.Store.FK_RouteId == routeId)
+            .OrderByDescending(o => o.OrderDate)
+            .Select(o => new OrderSummaryModel(
+                o.Id,
+                o.FK_StoreId,
+                o.Store.StoreName,
+                o.OrderDate,
+                o.TotalAmount))
+            .ToListAsync();
 
     public async Task AddAsync(DeliveryRun ride) =>
         await context.DeliveryRuns.AddAsync(ride);

Distribution/Features/Ride/RideService.cs

@@ -1,4 +1,4 @@
-using Distribution.Features.Stock;
+using Distribution.Features.Stock;
 using Distribution.Features.DriverComplianceConfig;
 using Distribution.Features.DriverProfile;
 using Distribution.Infra.UoW;
@@ -10,13 +10,21 @@ public class RideService(
     IRideRepository rideRepo,
     IDriverProfileRepository driverRepo,
     IDriverComplianceConfigRepository complianceRepo,
-    StockMover mover,
+    IRideCancelRequestRepository cancelRepo,
+    Features.Vehicle.IVehicleRepository vehicleRepo,
+    IStockRepository stockRepo,
     IUnitOfWork uow)
 {
-    public async Task<PagedResponse<RideResponse>> GetAllAsync(RideStatus? status, Guid? driverProfileId, Guid? vehicleId, int page, int pageSize)
+    public async Task<PagedResponse<RideResponse>> GetAllAsync(
+        RideStatus? status,
+        RideType? type,
+        Guid? driverProfileId,
+        Guid? vehicleId,
+        int page,
+        int pageSize)
     {
-        var total = await rideRepo.GetCountAsync(status, driverProfileId, vehicleId);
-        var items = await rideRepo.GetAllAsync(status, driverProfileId, vehicleId, page, pageSize);
+        var total = await rideRepo.GetCountAsync(status, type, driverProfileId, vehicleId);
+        var items = await rideRepo.GetAllAsync(status, type, driverProfileId, vehicleId, page, pageSize);
         return new PagedResponse<RideResponse>(page, pageSize, total, items.Select(ToResponse).ToList());
     }
 
@@ -28,18 +36,21 @@ public class RideService(
 
     public async Task<RideResponse> CreateAsync(CreateRideRequest request, CancellationToken ct = default)
     {
-        if (await rideRepo.HasOpenRideForVehicleAsync(request.VehicleId))
-            throw new InvalidOperationException("Vehicle already has an open ride");
+        var vehicle = await vehicleRepo.GetByIdAsync(request.VehicleId)
+            ?? throw new InvalidOperationException("Vehicle not found");
 
-        await CheckDriverComplianceAsync(request.DriverProfileId);
+        var sourceWarehouseId = vehicle.DefaultWarehouseId ?? request.SourceWarehouseId;
+        if (!sourceWarehouseId.HasValue)
+            throw new InvalidOperationException("Source warehouse is required for this vehicle");
 
         var ride = new DeliveryRun
         {
+            RideType = request.RideType,
             FK_VehicleId = request.VehicleId,
             FK_DriverProfileId = request.DriverProfileId,
-            Status = RideStatus.Open,
-            Meterstart = request.Meterstart,
-            StartedAt = DateTime.Now
+            FK_RouteId = request.RouteId,
+            FK_SourceWarehouseId = sourceWarehouseId.Value,
+            Status = RideStatus.Draft
         };
 
         await uow.BeginAsync(ct);
@@ -48,19 +59,46 @@ public class RideService(
             await rideRepo.AddAsync(ride);
             await uow.CommitAsync(ct);
         }
-        catch { await uow.RollbackAsync(ct); throw; }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
 
         var saved = await rideRepo.GetByIdAsync(ride.Id);
         return ToResponse(saved!);
     }
 
+    public async Task<RideResponse> OpenAsync(Guid rideId, CancellationToken ct = default)
+    {
+        var ride = await rideRepo.GetByIdAsync(rideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        if (ride.Status != RideStatus.Draft)
+            throw new InvalidOperationException($"Cannot open a ride in {ride.Status} status");
+
+        if (await rideRepo.HasOpenOrActiveRideForVehicleAsync(ride.FK_VehicleId, ride.Id))
+            throw new InvalidOperationException("Vehicle already has an open or active ride");
+
+        await CheckDriverComplianceAsync(ride.FK_DriverProfileId);
+
+        ride.Status = RideStatus.Open;
+        ride.StartedAt = DateTime.Now;
+
+        await uow.BeginAsync(ct);
+        try { rideRepo.Update(ride); await uow.CommitAsync(ct); }
+        catch { await uow.RollbackAsync(ct); throw; }
+
+        return ToResponse(ride);
+    }
+
     public async Task<RideResponse> AssignDriverAsync(Guid rideId, Guid driverProfileId, CancellationToken ct = default)
     {
         var ride = await rideRepo.GetByIdAsync(rideId)
             ?? throw new KeyNotFoundException("Ride not found");
 
-        if (ride.Status != RideStatus.Open)
-            throw new InvalidOperationException("Driver can only be changed while the ride is Open");
+        if (ride.Status != RideStatus.Draft)
+            throw new InvalidOperationException("Driver can only be changed while the ride is in Draft status");
 
         var driver = await driverRepo.GetByIdAsync(driverProfileId);
         if (driver is null || !driver.IsActive)
@@ -76,56 +114,205 @@ public class RideService(
         return ToResponse(saved!);
     }
 
-    public async Task<RideResponse> CloseAsync(Guid rideId, CloseRideRequest request, Guid userId, CancellationToken ct = default)
+    public async Task<RideResponse> ActivateAsync(Guid rideId, ActivateRideRequest request, CancellationToken ct = default)
     {
         var ride = await rideRepo.GetByIdAsync(rideId)
             ?? throw new KeyNotFoundException("Ride not found");
 
         if (ride.Status != RideStatus.Open)
-            throw new InvalidOperationException($"Cannot close a ride in {ride.Status} status");
+            throw new InvalidOperationException($"Cannot activate a ride in {ride.Status} status");
 
-        if (request.Meterend < ride.Meterstart)
-            throw new InvalidOperationException($"Meter end ({request.Meterend}) cannot be less than meter start ({ride.Meterstart})");
+        ride.Status = RideStatus.Active;
+        ride.ActivatedAt = DateTime.Now;
+        ride.Meterstart = request.Meterstart;
 
-        ride.Status = RideStatus.Closed;
-        ride.ClosedAt = DateTime.Now;
-        ride.Meterend = request.Meterend;
-
-        // Whatever wasn't delivered goes back to the warehouse it was loaded from.
         await uow.BeginAsync(ct);
-        try
-        {
-            await mover.UnloadVehicleAsync(ride.FK_VehicleId, ride.Id, userId, "RideClosed");
-            rideRepo.Update(ride);
-            await uow.CommitAsync(ct);
-        }
+        try { rideRepo.Update(ride); await uow.CommitAsync(ct); }
         catch { await uow.RollbackAsync(ct); throw; }
 
         return ToResponse(ride);
     }
 
-    public async Task<RideResponse> CancelAsync(Guid rideId, CancelRideRequest request, Guid userId, CancellationToken ct = default)
+    public async Task<RideResponse> CloseAsync(Guid rideId, CloseRideRequest request, CancellationToken ct = default)
     {
         var ride = await rideRepo.GetByIdAsync(rideId)
             ?? throw new KeyNotFoundException("Ride not found");
 
-        if (ride.Status != RideStatus.Open)
-            throw new InvalidOperationException($"Cannot cancel a ride in {ride.Status} status");
+        if (ride.Status != RideStatus.Active)
+            throw new InvalidOperationException($"Cannot close a ride in {ride.Status} status");
 
-        ride.Status = RideStatus.Cancelled;
-        ride.CancelTypeCode = request.TypeCode;
-        ride.CancelReason = request.Reason;
+        if (request.Meterend < ride.Meterstart)
+            throw new InvalidOperationException($"Meter end ({request.Meterend}) cannot be less than meter start ({ride.Meterstart})");
+
+        await EnsureVehicleStockClearedAsync(ride.FK_VehicleId);
+
+        ride.Status = RideStatus.Closed;
+        ride.ClosedAt = DateTime.Now;
+        ride.Meterend = request.Meterend;
+
+        await uow.BeginAsync(ct);
+        try { rideRepo.Update(ride); await uow.CommitAsync(ct); }
+        catch { await uow.RollbackAsync(ct); throw; }
+
+        return ToResponse(ride);
+    }
+
+    public async Task<RideCancelRequestResponse> RaiseCancelRequestAsync(Guid rideId, RaiseCancelRequest request, Guid requestedBy, CancellationToken ct = default)
+    {
+        var ride = await rideRepo.GetByIdAsync(rideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        if (ride.Status != RideStatus.Active)
+            throw new InvalidOperationException($"Cannot raise a cancel request for a ride in {ride.Status} status");
+
+        var existing = await cancelRepo.GetPendingByRideIdAsync(rideId);
+        if (existing is not null)
+            throw new InvalidOperationException("There is already a pending cancel request for this ride");
+
+        var cancelRequest = new RideCancelRequest
+        {
+            FK_RideId = rideId,
+            TypeCode = request.TypeCode,
+            Reason = request.Reason,
+            RequestedBy = requestedBy,
+            RequestedAt = DateTime.Now,
+            Status = CancelRequestStatus.Pending
+        };
+
+        ride.Status = RideStatus.CancelRequested;
 
         await uow.BeginAsync(ct);
         try
         {
-            await mover.UnloadVehicleAsync(ride.FK_VehicleId, ride.Id, userId, "RideCancelled");
+            await cancelRepo.AddAsync(cancelRequest);
             rideRepo.Update(ride);
             await uow.CommitAsync(ct);
         }
         catch { await uow.RollbackAsync(ct); throw; }
 
-        return ToResponse(ride);
+        return ToCancelResponse(cancelRequest);
+    }
+
+    public async Task<PagedResponse<RideCancelRequestResponse>> GetCancelRequestsAsync(CancelRequestStatus? status, int page, int pageSize)
+    {
+        var total = await cancelRepo.GetCountAsync(status);
+        var items = await cancelRepo.GetAllAsync(status, page, pageSize);
+        return new PagedResponse<RideCancelRequestResponse>(page, pageSize, total, items.Select(ToCancelResponse).ToList());
+    }
+
+    public async Task<RideCancelRequestResponse> ApproveCancelAsync(Guid cancelRequestId, Guid approvedBy, CancellationToken ct = default)
+    {
+        var cancelRequest = await cancelRepo.GetByIdAsync(cancelRequestId)
+            ?? throw new KeyNotFoundException("Cancel request not found");
+
+        if (cancelRequest.Status != CancelRequestStatus.Pending)
+            throw new InvalidOperationException("Cancel request is not pending");
+
+        var ride = await rideRepo.GetByIdAsync(cancelRequest.FK_RideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        if (ride.Status != RideStatus.CancelRequested)
+            throw new InvalidOperationException("Ride is not in CancelRequested status");
+
+        await EnsureVehicleStockClearedAsync(ride.FK_VehicleId);
+
+        cancelRequest.Status = CancelRequestStatus.Approved;
+        cancelRequest.ApprovedBy = approvedBy;
+        cancelRequest.ApprovedAt = DateTime.Now;
+
+        ride.Status = RideStatus.Cancelled;
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            cancelRepo.Update(cancelRequest);
+            rideRepo.Update(ride);
+            await uow.CommitAsync(ct);
+        }
+        catch { await uow.RollbackAsync(ct); throw; }
+
+        return ToCancelResponse(cancelRequest);
+    }
+
+    public async Task<RideCancelRequestResponse> RejectCancelAsync(Guid cancelRequestId, Guid rejectedBy, CancellationToken ct = default)
+    {
+        var cancelRequest = await cancelRepo.GetByIdAsync(cancelRequestId)
+            ?? throw new KeyNotFoundException("Cancel request not found");
+
+        if (cancelRequest.Status != CancelRequestStatus.Pending)
+            throw new InvalidOperationException("Cancel request is not pending");
+
+        var ride = await rideRepo.GetByIdAsync(cancelRequest.FK_RideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        if (ride.Status != RideStatus.CancelRequested)
+            throw new InvalidOperationException("Ride is not in CancelRequested status");
+
+        cancelRequest.Status = CancelRequestStatus.Rejected;
+        cancelRequest.ApprovedBy = rejectedBy;
+        cancelRequest.ApprovedAt = DateTime.Now;
+
+        // Restore to previous status: Active if ActivatedAt is set, else Open
+        ride.Status = ride.ActivatedAt.HasValue ? RideStatus.Active : RideStatus.Open;
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            cancelRepo.Update(cancelRequest);
+            rideRepo.Update(ride);
+            await uow.CommitAsync(ct);
+        }
+        catch { await uow.RollbackAsync(ct); throw; }
+
+        return ToCancelResponse(cancelRequest);
+    }
+
+    public async Task<RideCancelRequestResponse?> GetCancelRequestAsync(Guid rideId)
+    {
+        var cancelRequest = await cancelRepo.GetByRideIdAsync(rideId);
+        return cancelRequest is null ? null : ToCancelResponse(cancelRequest);
+    }
+
+    public async Task<BreakdownAssistResponse> GetBreakdownAssistAsync(Guid rideId)
+    {
+        var strandedRide = await rideRepo.GetByIdAsync(rideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        var activeRides = await rideRepo.GetActiveRidesAsync(rideId);
+        var activeRideResponses = new List<BreakdownAssistRideResponse>();
+
+        foreach (var ride in activeRides)
+        {
+            var stockLevels = await stockRepo.GetBalancesByLocationAsync(ride.FK_VehicleId, LocationType.Vehicle);
+            activeRideResponses.Add(new BreakdownAssistRideResponse(
+                ride.Id,
+                ride.FK_VehicleId,
+                ride.Vehicle?.NumberPlate ?? string.Empty,
+                ride.FK_DriverProfileId,
+                ride.DriverProfile?.User?.FullName ?? string.Empty,
+                ride.FK_RouteId,
+                ride.Route?.RouteName ?? string.Empty,
+                stockLevels.Select(b => new StockBalanceResponse(
+                    b.FK_ItemId,
+                    b.Item.Name,
+                    b.LocationId,
+                    b.LocationType,
+                    b.Quantity,
+                    b.UpdatedAt,
+                    ride.Vehicle?.NumberPlate ?? string.Empty)).ToList()));
+        }
+
+        var openOrders = await rideRepo.GetActiveOrdersByRouteIdAsync(strandedRide.FK_RouteId);
+
+        return new BreakdownAssistResponse(
+            strandedRide.Id,
+            activeRideResponses,
+            openOrders.Select(o => new BreakdownAssistOrderResponse(
+                o.Id,
+                o.StoreId,
+                o.StoreName,
+                o.OrderDate,
+                o.TotalAmount)).ToList());
     }
 
     private async Task CheckDriverComplianceAsync(Guid driverProfileId)
@@ -148,10 +335,23 @@ public class RideService(
             throw new InvalidOperationException("Driver medical clearance has expired");
     }
 
+    private async Task EnsureVehicleStockClearedAsync(Guid vehicleId)
+    {
+        var balances = await stockRepo.GetBalancesByLocationAsync(vehicleId, LocationType.Vehicle);
+        if (balances.Any(b => b.Quantity > 0))
+            throw new InvalidOperationException("All vehicle stock must be returned before this ride can be completed");
+    }
+
     private static RideResponse ToResponse(DeliveryRun r) =>
-        new(r.Id, r.Status,
+        new(r.Id, r.RideType, r.Status,
             r.FK_VehicleId, r.Vehicle?.NumberPlate ?? string.Empty,
             r.FK_DriverProfileId, r.DriverProfile?.User?.FullName ?? string.Empty,
+            r.FK_RouteId, r.Route?.RouteName ?? string.Empty,
+            r.FK_SourceWarehouseId, r.SourceWarehouse?.Name ?? string.Empty,
             r.Meterstart, r.Meterend,
-            r.StartedAt, r.ClosedAt, r.CancelTypeCode, r.CancelReason, r.CreatedAt);
+            r.StartedAt, r.ActivatedAt, r.ClosedAt, r.CreatedAt);
+
+    private static RideCancelRequestResponse ToCancelResponse(RideCancelRequest c) =>
+        new(c.Id, c.FK_RideId, c.TypeCode, c.Reason, c.RequestedBy, c.RequestedAt,
+            c.Status, c.ApprovedBy, c.ApprovedAt);
 }

Distribution/Features/Route/RouteDTOs.cs

@@ -1,10 +1,10 @@
 namespace Distribution.Features.Route;
 
-public record CreateRouteRequest(Guid RegionId, string RouteName, string? StartPoint, string? EndPoint, decimal? Length);
+public record CreateRouteRequest(Guid RegionId, string RouteName, string StartPoint, string EndPoint, decimal Length);
 
-public record UpdateRouteRequest(Guid RegionId, string RouteName, string? StartPoint, string? EndPoint, decimal? Length, bool? IsActive = null);
+public record UpdateRouteRequest(Guid RegionId, string RouteName, string StartPoint, string EndPoint, decimal Length);
 
-public record RouteResponse(Guid Id, Guid RegionId, string RouteName, string? StartPoint, string? EndPoint, decimal? Length, Guid? OwnerUserId, bool IsActive, DateTime CreatedAt);
+public record RouteResponse(Guid Id, Guid RegionId, string RouteName, string StartPoint, string EndPoint, decimal Length, Guid? OwnerUserId, bool IsActive, DateTime CreatedAt);
 
 public record AssignRouteToRegionRequest(Guid RegionId);
 

Distribution/Features/Route/RouteService.cs

@@ -10,12 +10,8 @@ public class RouteService(IRouteRepository repo, Region.IRegionRepository region
 
     private async Task<bool> CanManageRouteAsync(Guid routeId)
     {
-        // TEMPORARY: role-floor and route-scope checks bypassed so routes can be assigned
-        // while auth doesn't resolve the current user (testbug.md #28). Restore the original:
-        //   if (currentUser.RoleLevel < RouteManagerRoleLevel || currentUser.UserId is null) return false;
-        //   return await scopeAccess.HasRouteScopeAsync(currentUser.UserId.Value, routeId);
-        await Task.CompletedTask;
-        return true;
+        if (currentUser.RoleLevel < RouteManagerRoleLevel || currentUser.UserId is null) return false;
+        return await scopeAccess.HasRouteScopeAsync(currentUser.UserId.Value, routeId);
     }
 
     private static double DistanceMeters(decimal lat1, decimal lon1, decimal lat2, decimal lon2)
@@ -40,6 +36,7 @@ public class RouteService(IRouteRepository repo, Region.IRegionRepository region
 
     public async Task<List<RouteResponse>> GetAllAsync() =>
         (await repo.GetAllAsync())
+            .Where(r => r.IsActive)
             .Select(r => new RouteResponse(r.Id, r.FK_RegionId, r.RouteName, r.StartPoint, r.EndPoint, r.Length, r.FK_OwnerUserId, r.IsActive, r.CreatedAt))
             .ToList();
 
@@ -77,14 +74,12 @@ public class RouteService(IRouteRepository repo, Region.IRegionRepository region
     public async Task<RouteResponse?> UpdateAsync(Guid id, UpdateRouteRequest request, CancellationToken ct = default)
     {
         var route = await repo.GetByIdAsync(id);
-        // Inactive routes stay editable so they can be reactivated.
-        if (route is null) return null;
+        if (route is null || !route.IsActive) return null;
         route.FK_RegionId = request.RegionId;
         route.RouteName = request.RouteName;
         route.StartPoint = request.StartPoint;
         route.EndPoint = request.EndPoint;
         route.Length = request.Length;
-        if (request.IsActive.HasValue) route.IsActive = request.IsActive.Value;
         await uow.BeginAsync(ct);
         try
         {

Distribution/Features/Sale/ISaleRepository.cs

@@ -0,0 +1,15 @@
+using Distribution.Models;
+
+namespace Distribution.Features.Sale;
+
+public interface ISaleRepository
+{
+    Task<Models.Sale?> GetByIdAsync(Guid id);
+    Task<List<Models.Sale>> GetAllAsync(Guid? rideId, IEnumerable<Guid>? storeIds, int page, int pageSize);
+    Task<int> GetCountAsync(Guid? rideId, IEnumerable<Guid>? storeIds);
+    Task<List<Models.Sale>> GetByStoreIdAsync(Guid storeId);
+    Task AddAsync(Models.Sale sale);
+    void Update(Models.Sale sale);
+    void Remove(Models.Sale sale);
+    Task<Models.Order?> GetOrderBySaleIdAsync(Guid saleId);
+}

Distribution/Features/Sale/SaleController.cs

@@ -0,0 +1,51 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace Distribution.Features.Sale;
+
+[ApiController]
+[Route("api/sales")]
+public class SaleController(SaleService service) : ControllerBase
+{
+    [HttpGet]
+    public async Task<IActionResult> GetAll(
+        [FromQuery] Guid? rideId,
+        [FromQuery] int page = 1,
+        [FromQuery] int pageSize = 20) =>
+        Ok(await service.GetAllAsync(rideId, page, pageSize));
+
+    [HttpGet("{id:guid}")]
+    public async Task<IActionResult> GetById(Guid id)
+    {
+        var result = await service.GetByIdAsync(id);
+        return result is null ? NotFound() : Ok(result);
+    }
+
+    [HttpGet("store/{storeId:guid}")]
+    public async Task<IActionResult> GetByStore(Guid storeId)
+    {
+        var result = await service.GetByStoreIdAsync(storeId);
+        return result is null ? StatusCode(StatusCodes.Status403Forbidden) : Ok(result);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateSaleRequest request, CancellationToken ct)
+    {
+        try
+        {
+            var result = await service.CreateAsync(request, ct);
+            return result is null ? StatusCode(StatusCodes.Status403Forbidden) : CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
+        }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPatch("{id:guid}/cancel")]
+    public async Task<IActionResult> Cancel(Guid id, CancellationToken ct)
+    {
+        try
+        {
+            var result = await service.CancelAsync(id, ct);
+            return result is null ? NotFound() : Ok(result);
+        }
+        catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
+    }
+}

Distribution/Features/Sale/SaleDTOs.cs

@@ -0,0 +1,36 @@
+using Distribution.Models;
+
+namespace Distribution.Features.Sale;
+
+public record SaleItemRequest(Guid ItemId, int Quantity, decimal? UnitPrice = null);
+
+public record CreateSaleRequest(
+    Guid StoreId,
+    DateTime SaleDate,
+    decimal TotalAmount,
+    bool FulfillImmediately,
+    Guid? RideId,
+    List<SaleItemRequest> Items,
+    // TEMPORARY: auth middleware doesn't attach a resolvable user yet (see testbug.md #28), so the
+    // caller supplies the acting user explicitly. Remove once currentUser.UserId is reliable again.
+    Guid? CreatedByUserId = null);
+
+public record SaleItemResponse(Guid ItemId, int Quantity, int QuantityFulfilled, decimal UnitPrice);
+
+public record SaleResponse(
+    Guid Id,
+    DateTime SaleDate,
+    Guid StoreId,
+    Guid CreatedByUserId,
+    Guid? RideId,
+    decimal TotalAmount,
+    SaleStatus Status,
+    PaymentStatus PaymentStatus,
+    bool FulfillImmediately,
+    DateTime? CompletedAt,
+    Guid OrderId,
+    OrderStatus OrderStatus,
+    DateTime? OrderFulfilledAt,
+    List<SaleItemResponse> Items,
+    bool IsActive,
+    DateTime CreatedAt);

Distribution/Features/Sale/SaleRepository.cs

@@ -0,0 +1,45 @@
+using Distribution.Data;
+using Distribution.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace Distribution.Features.Sale;
+
+public class SaleRepository(AppDBContext context) : ISaleRepository
+{
+    public async Task<Models.Sale?> GetByIdAsync(Guid id) =>
+        await context.Sales.FindAsync(id);
+
+    public async Task<List<Models.Sale>> GetAllAsync(Guid? rideId, IEnumerable<Guid>? storeIds, int page, int pageSize) =>
+        await context.Sales
+            .Where(s => s.IsActive &&
+                (rideId == null || s.FK_RideId == rideId) &&
+                (storeIds == null || storeIds.Contains(s.FK_StoreId)))
+            .OrderByDescending(s => s.CreatedAt)
+            .Skip((page - 1) * pageSize)
+            .Take(pageSize)
+            .ToListAsync();
+
+    public async Task<int> GetCountAsync(Guid? rideId, IEnumerable<Guid>? storeIds) =>
+        await context.Sales
+            .CountAsync(s => s.IsActive &&
+                (rideId == null || s.FK_RideId == rideId) &&
+                (storeIds == null || storeIds.Contains(s.FK_StoreId)));
+
+    public async Task<List<Models.Sale>> GetByStoreIdAsync(Guid storeId) =>
+        await context.Sales.Where(s => s.FK_StoreId == storeId && s.IsActive).ToListAsync();
+
+    public async Task AddAsync(Models.Sale sale) =>
+        await context.Sales.AddAsync(sale);
+
+    public void Update(Models.Sale sale) =>
+        context.Sales.Update(sale);
+
+    public void Remove(Models.Sale sale)
+    {
+        sale.IsActive = false;
+        context.Sales.Update(sale);
+    }
+
+    public async Task<Models.Order?> GetOrderBySaleIdAsync(Guid saleId) =>
+        await context.Orders.FirstOrDefaultAsync(o => o.FK_SaleId == saleId && o.IsActive);
+}