diff --git a/src/Domain.LinnApps/Imports/ImportBook.cs b/src/Domain.LinnApps/Imports/ImportBook.cs index 5ca6949d..849e2b09 100644 --- a/src/Domain.LinnApps/Imports/ImportBook.cs +++ b/src/Domain.LinnApps/Imports/ImportBook.cs @@ -144,6 +144,8 @@ public ImportBook( public string Comments { get; set; } + public string ClearanceComments { get; set; } + public string CustomsEntryCode { get; set; } public DateTime? CustomsEntryCodeDate { get; set; } @@ -198,6 +200,8 @@ public void Update(ImportUpdate update) this.TransportBillNumber = update.TransportBillNumber; this.DateReceived = update.DateReceived; this.DateInstructionSent = update.DateInstructionSent; + this.Comments = update.Comments; + this.ClearanceComments = update.ClearanceComments; if (update.Period != null && this.Period == null) { diff --git a/src/Domain.LinnApps/Imports/ImportReportService.cs b/src/Domain.LinnApps/Imports/ImportReportService.cs index 4da09125..74ad6d92 100644 --- a/src/Domain.LinnApps/Imports/ImportReportService.cs +++ b/src/Domain.LinnApps/Imports/ImportReportService.cs @@ -199,7 +199,7 @@ private List SetImportReportModelRows(IEnumerable Totals { get; set; } + public bool HasComments => this.Comments != null && this.Comments.Any(); + public bool HasIPRAndBRG => this.Sections.Any(s => s.CpcScheme == "IPR") && this.Sections.Any(s => s.CpcScheme == "BRG"); public ICollection IPRTotals => this.Totals.Where(t => t.CpcScheme == "IPR").ToList(); @@ -107,6 +111,18 @@ public void AddImportBook(ImportBook importBook, IEnumerable i this.InstructionDate = importBook.DateInstructionSent.Value; } + if (!string.IsNullOrEmpty(importBook.ClearanceComments)) + { + if (!this.HasComments) + { + this.Comments = importBook.ClearanceComments.Split("\n"); + } + else + { + this.Comments = this.Comments.Concat(importBook.ClearanceComments.Split("/n")).ToArray(); + } + } + foreach (var orderDetail in importBook.OrderDetails) { var invoice = orderDetail.RsnNumber != null diff --git a/src/Domain.LinnApps/Imports/Models/ImportUpdate.cs b/src/Domain.LinnApps/Imports/Models/ImportUpdate.cs index 04dfaa65..bf501e94 100644 --- a/src/Domain.LinnApps/Imports/Models/ImportUpdate.cs +++ b/src/Domain.LinnApps/Imports/Models/ImportUpdate.cs @@ -19,6 +19,10 @@ public class ImportUpdate public string TransportBillNumber { get; set; } + public string Comments { get; set; } + + public string ClearanceComments { get; set; } + public DateTime? DateReceived { get; set; } public DateTime? DateInstructionSent { get; set; } diff --git a/src/Domain.LinnApps/Supplier.cs b/src/Domain.LinnApps/Supplier.cs index 2b1c2260..9e640bc8 100644 --- a/src/Domain.LinnApps/Supplier.cs +++ b/src/Domain.LinnApps/Supplier.cs @@ -1,4 +1,4 @@ -namespace Linn.Stores2.Domain.LinnApps +namespace Linn.Stores2.Domain.LinnApps { using System; @@ -12,10 +12,12 @@ public class Supplier public string ApprovedCarrier { get; set; } - public string CountryCode { get; set; } - public Country Country { get; set; } public DateTime? DateClosed { get; set; } + + public Address OrderAddress { get; set; } + + public string NiceSupplierName => this.OrderAddress?.Addressee ?? this.Name; } } diff --git a/src/Facade/Extensions/ImportBookSearchResourceExtensions.cs b/src/Facade/Extensions/ImportBookSearchResourceExtensions.cs index 9db64373..5393617b 100644 --- a/src/Facade/Extensions/ImportBookSearchResourceExtensions.cs +++ b/src/Facade/Extensions/ImportBookSearchResourceExtensions.cs @@ -60,52 +60,45 @@ public static Expression> ToExpression(this ImportBookSea if (!string.IsNullOrEmpty(searchResource.DateField)) { - DateTime? fromDate = string.IsNullOrEmpty(searchResource.FromDate) ? null : DateTime.Parse(searchResource.FromDate); - DateTime? toDate = string.IsNullOrEmpty(searchResource.ToDate) ? null : DateTime.Parse(searchResource.ToDate); + DateTime? fromDate = string.IsNullOrEmpty(searchResource.FromDate) + ? null + : DateTime.Parse(searchResource.FromDate).Date; + DateTime? toDate = string.IsNullOrEmpty(searchResource.ToDate) + ? null + : DateTime.Parse(searchResource.ToDate).Date.AddDays(1).AddTicks(-1); if (searchResource.DateField == "Date Created") { - if (fromDate != null && toDate != null) - { - filter = filter.And(ib => ib.DateCreated >= fromDate && ib.DateCreated <= toDate); - } - else if (fromDate != null) + if (fromDate != null) { filter = filter.And(ib => ib.DateCreated >= fromDate); } - else if (toDate != null) + + if (toDate != null) { filter = filter.And(ib => ib.DateCreated <= toDate); } } - - if (searchResource.DateField == "Date Received") + else if (searchResource.DateField == "Date Received") { - if (fromDate != null && toDate != null) - { - filter = filter.And(ib => ib.DateReceived >= fromDate && ib.DateReceived <= toDate); - } - else if (fromDate != null) + if (fromDate != null) { filter = filter.And(ib => ib.DateReceived >= fromDate); } - else if (toDate != null) + + if (toDate != null) { filter = filter.And(ib => ib.DateReceived <= toDate); } } - - if (searchResource.DateField == "Customs Date") + else if (searchResource.DateField == "Customs Date") { - if (fromDate != null && toDate != null) - { - filter = filter.And(ib => ib.CustomsEntryCodeDate >= fromDate && ib.CustomsEntryCodeDate <= toDate); - } - else if (fromDate != null) + if (fromDate != null) { filter = filter.And(ib => ib.CustomsEntryCodeDate >= fromDate); } - else if (toDate != null) + + if (toDate != null) { filter = filter.And(ib => ib.CustomsEntryCodeDate <= toDate); } diff --git a/src/Facade/ResourceBuilders/ImportBookResourceBuilder.cs b/src/Facade/ResourceBuilders/ImportBookResourceBuilder.cs index 32de0d56..85c3987f 100644 --- a/src/Facade/ResourceBuilders/ImportBookResourceBuilder.cs +++ b/src/Facade/ResourceBuilders/ImportBookResourceBuilder.cs @@ -52,7 +52,7 @@ public ImportBookResource Build(ImportBook model, IEnumerable claims) SupplierCountry = model.Supplier != null ? new CountryResource { - CountryCode = model.Supplier.CountryCode, + CountryCode = model.Supplier.Country.CountryCode, Name = model.Supplier.Country?.BestName } : null, @@ -78,6 +78,7 @@ public ImportBookResource Build(ImportBook model, IEnumerable claims) NumCartons = model.NumCartons, NumPallets = model.NumPallets, Comments = model.Comments, + ClearanceComments = model.ClearanceComments, CustomsEntryCodePrefix = model.CustomsEntryCodePrefix, Pva = model.Pva, ExchangeRate = model.ExchangeRate.GetValueOrDefault(), diff --git a/src/Facade/Services/ImportBookFacadeService.cs b/src/Facade/Services/ImportBookFacadeService.cs index ac3f9f7d..b96b51bd 100644 --- a/src/Facade/Services/ImportBookFacadeService.cs +++ b/src/Facade/Services/ImportBookFacadeService.cs @@ -183,6 +183,8 @@ protected override async Task UpdateFromResourceAsync( CustomsEntryCodeDate = string.IsNullOrEmpty(updateResource.CustomsEntryCodeDate) ? null : Convert.ToDateTime(updateResource.CustomsEntryCodeDate), CustomsEntryCodePrefix = updateResource.CustomsEntryCodePrefix, TransportBillNumber = updateResource.TransportBillNumber, + Comments = updateResource.Comments, + ClearanceComments = updateResource.ClearanceComments, DateInstructionSent = string.IsNullOrEmpty(updateResource.DateInstructionSent) ? null : Convert.ToDateTime(updateResource.DateInstructionSent), DateReceived = string.IsNullOrEmpty(updateResource.DateReceived) ? null : Convert.ToDateTime(updateResource.DateReceived), Period = entity.Period, diff --git a/src/Persistence.LinnApps/Repositories/ImportBookRepository.cs b/src/Persistence.LinnApps/Repositories/ImportBookRepository.cs index 3d72701a..96e356e6 100644 --- a/src/Persistence.LinnApps/Repositories/ImportBookRepository.cs +++ b/src/Persistence.LinnApps/Repositories/ImportBookRepository.cs @@ -29,7 +29,7 @@ public override async Task FindByIdAsync(int key) .Include(r => r.OrderDetails).ThenInclude(o => o.Rsn).ThenInclude(r => r.AllegedReason) .Include(i => i.InvoiceDetails) .Include(i => i.PostEntries) - .Include(i => i.Supplier).ThenInclude(s => s.Country) + .Include(i => i.Supplier).ThenInclude(s => s.OrderAddress).ThenInclude(s => s.Country) .Include(i => i.Carrier) .Include(i => i.CreatedBy) .Include(i => i.ContactEmployee) @@ -47,6 +47,7 @@ public override IQueryable FilterBy( .Include(i => i.InvoiceDetails) .Include(r => r.OrderDetails).ThenInclude(o => o.ImportBookCpcNumber) .Include(i => i.Supplier).ThenInclude(s => s.Country) + .Include(i => i.Supplier).ThenInclude(s => s.OrderAddress).ThenInclude(a => a.Country) .Include(i => i.Carrier) .Include(i => i.CreatedBy); } diff --git a/src/Persistence.LinnApps/ServiceDbContext.cs b/src/Persistence.LinnApps/ServiceDbContext.cs index e53a1e60..24d557f8 100644 --- a/src/Persistence.LinnApps/ServiceDbContext.cs +++ b/src/Persistence.LinnApps/ServiceDbContext.cs @@ -1219,11 +1219,11 @@ private static void BuildSuppliers(ModelBuilder builder) q.ToTable("SUPPLIERS"); q.Property(e => e.Id).HasColumnName("SUPPLIER_ID"); q.Property(e => e.Name).HasColumnName("SUPPLIER_NAME").HasMaxLength(50); - q.Property(e => e.CountryCode).HasColumnName("COUNTRY"); q.Property(e => e.DateClosed).HasColumnName("DATE_CLOSED"); q.Property(s => s.ApprovedCarrier).HasColumnName("APPROVED_CARRIER"); q.Property(s => s.AccountingCompany).HasColumnName("ACCOUNTING_COMPANY").HasMaxLength(10); - q.HasOne(s => s.Country).WithMany().HasForeignKey(s => s.CountryCode); + q.HasOne(s => s.Country).WithMany().HasForeignKey("COUNTRY"); + q.HasOne(o => o.OrderAddress).WithMany().HasForeignKey("ORD_ADDRESS_ID"); } private static void BuildImportBooks(ModelBuilder builder) @@ -1257,6 +1257,7 @@ private static void BuildImportBooks(ModelBuilder builder) q.Property(e => e.NumCartons).HasColumnName("NUM_CARTONS"); q.Property(e => e.NumPallets).HasColumnName("NUM_PALLETS"); q.Property(e => e.Comments).HasColumnName("COMMENTS").HasMaxLength(2000); + q.Property(e => e.ClearanceComments).HasColumnName("CLEARANCE_COMMENTS").HasMaxLength(2000); q.Property(e => e.CreatedById).HasColumnName("CREATED_BY"); q.Property(e => e.CustomsEntryCodePrefix).HasColumnName("CUSTOMS_ENTRY_CODE_PREFIX").HasMaxLength(3); q.Property(e => e.Pva).HasColumnName("PVA").HasMaxLength(1); @@ -1269,14 +1270,14 @@ private static void BuildImportBooks(ModelBuilder builder) .HasForeignKey(detail => detail.ImportBookId); q.HasMany(t => t.PostEntries).WithOne() .HasForeignKey(detail => detail.ImportBookId); - q.HasOne(d => d.Supplier).WithOne().HasForeignKey(s => s.SupplierId); - q.HasOne(d => d.Carrier).WithOne().HasForeignKey(s => s.CarrierId); - q.HasOne(d => d.CreatedBy).WithOne().HasForeignKey(s => s.CreatedById); - q.HasOne(d => d.Currency).WithOne().HasForeignKey(s => s.CurrencyCode); - q.HasOne(d => d.Period).WithOne().HasForeignKey(s => s.PeriodNumber); - q.HasOne(d => d.BaseCurrency).WithOne().HasForeignKey("BASE_CURRENCY"); - q.HasOne(d => d.ExchangeCurrency).WithOne().HasForeignKey("EXCHANGE_CURRENCY"); - q.HasOne(d => d.ContactEmployee).WithOne().HasForeignKey("CONTACT_EMPLOYEE"); + q.HasOne(d => d.Supplier).WithMany().HasForeignKey(s => s.SupplierId); + q.HasOne(d => d.Carrier).WithMany().HasForeignKey(s => s.CarrierId); + q.HasOne(d => d.CreatedBy).WithMany().HasForeignKey(s => s.CreatedById); + q.HasOne(d => d.Currency).WithMany().HasForeignKey(s => s.CurrencyCode); + q.HasOne(d => d.Period).WithMany().HasForeignKey(s => s.PeriodNumber); + q.HasOne(d => d.BaseCurrency).WithMany().HasForeignKey("BASE_CURRENCY"); + q.HasOne(d => d.ExchangeCurrency).WithMany().HasForeignKey("EXCHANGE_CURRENCY"); + q.HasOne(d => d.ContactEmployee).WithMany().HasForeignKey("CONTACT_EMPLOYEE"); } private static void BuildImportBookInvoiceDetails(ModelBuilder builder) @@ -1384,7 +1385,7 @@ private static void BuildSalesArticles(ModelBuilder builder) e.Property(a => a.Description).HasColumnName("INVOICE_DESCRIPTION"); e.Property(a => a.TariffId).HasColumnName("TARIFF_ID").HasMaxLength(3); e.Property(a => a.Weight).HasColumnName("WEIGHT").HasMaxLength(10); - e.HasOne(a => a.Tariff).WithOne().HasForeignKey(x => x.TariffId); + e.HasOne(a => a.Tariff).WithMany().HasForeignKey(x => x.TariffId); e.HasOne(a => a.CountryOfOrigin).WithMany().HasForeignKey("COUNTRY_CODE"); } diff --git a/src/Resources/Imports/ImportBookResource.cs b/src/Resources/Imports/ImportBookResource.cs index 7bab3091..b06873e0 100644 --- a/src/Resources/Imports/ImportBookResource.cs +++ b/src/Resources/Imports/ImportBookResource.cs @@ -42,6 +42,8 @@ public class ImportBookResource : HypermediaResource public string Comments { get; set; } + public string ClearanceComments { get; set; } + public string Currency { get; set; } public string BaseCurrency { get; set; } diff --git a/src/Service.Host/client/src/components/imports/CommentsTab.js b/src/Service.Host/client/src/components/imports/CommentsTab.js new file mode 100644 index 00000000..c7ec5a95 --- /dev/null +++ b/src/Service.Host/client/src/components/imports/CommentsTab.js @@ -0,0 +1,36 @@ +import React from 'react'; +import Grid from '@mui/material/Grid'; +import { InputField } from '@linn-it/linn-form-components-library'; + +function CommentsTab({ importBook, canChange, handleFieldChange }) { + return ( + <> + + + + + + + + + + ); +} + +export default CommentsTab; diff --git a/src/Service.Host/client/src/components/imports/CreateTab.js b/src/Service.Host/client/src/components/imports/CreateTab.js index d71c0022..56c1a236 100644 --- a/src/Service.Host/client/src/components/imports/CreateTab.js +++ b/src/Service.Host/client/src/components/imports/CreateTab.js @@ -299,17 +299,19 @@ function CreateTab() { )} - + {(importType === 'RSN' || importType === 'PO') && ( + + )} {(rsnLoading || purchaseOrderLoading) && ( diff --git a/src/Service.Host/client/src/components/imports/ImportBookUtility.js b/src/Service.Host/client/src/components/imports/ImportBookUtility.js index b5383566..0f9c2345 100644 --- a/src/Service.Host/client/src/components/imports/ImportBookUtility.js +++ b/src/Service.Host/client/src/components/imports/ImportBookUtility.js @@ -19,6 +19,7 @@ import useGet from '../../hooks/useGet'; import usePost from '../../hooks/usePost'; import Page from '../Page'; import MainTab from './MainTab'; +import CommentsTab from './CommentsTab'; import HistoryTab from './HistoryTab'; function ImportBookUtility({ creating }) { @@ -45,8 +46,9 @@ function ImportBookUtility({ creating }) { send: createImportBook, isLoading: createLoading, errorMessage: createError, + postResult: createResult, clearPostResult: clearCreateResult - } = usePost(itemTypes.importBooks.url, true, true); + } = usePost(itemTypes.importBooks.url, true, false); const { send: updateImportBook, @@ -76,9 +78,11 @@ function ImportBookUtility({ creating }) { const [importBook, setImportBook] = useState(); const [changesMade, setChangesMade] = useState(false); - if (importBookGetResult && !importBook) { - setImportBook(importBookGetResult); - } + useEffect(() => { + if (importBookGetResult) { + setImportBook(importBookGetResult); + } + }, [importBookGetResult]); useEffect(() => { if (updateResult) { @@ -87,6 +91,14 @@ function ImportBookUtility({ creating }) { } }, [updateResult, clearUpdateResult]); + useEffect(() => { + if (createResult) { + getImportBook(createResult.id); + navigate(utilities.getSelfHref(createResult)); + clearCreateResult(); + } + }, [createResult, clearCreateResult, navigate, getImportBook]); + const canChange = () => { if (importBookGetResult) { if (creating && utilities.getHref(importBookGetResult, 'create')) { @@ -189,6 +201,7 @@ function ImportBookUtility({ creating }) { creating ? 'New Import' : `Import ${importBook.id}` } /> + @@ -201,10 +214,17 @@ function ImportBookUtility({ creating }) { cpcNumbers={cpcNumbers} canChange={canChange()} handleFieldChange={handleFieldChange} - handleNumberFieldChange={handleNumberFieldChange} + creating={creating} /> )} {tab === 1 && ( + + )} + {tab === 2 && ( - - - - - - - - - - - - + {!creating && ( + <> + + + + + + + + + + + + + + )}
- @Model.Supplier?.Name + @Model.Supplier?.NiceSupplierName
@@ -591,9 +604,21 @@
+ @if (Model.HasComments) + { +
+ Notes/Other Info: +
+
+ @foreach (var comment in Model.Comments) + { + @comment
+ } +
+ }
@Model.Footer[0]
- @Model.Footer[1]
+ @Model.Footer[1]
@Model.Footer[2]
diff --git a/tests/TestData/TestData/Suppliers/TestSuppliers.cs b/tests/TestData/TestData/Suppliers/TestSuppliers.cs index 8fc0f243..3d2cae92 100644 --- a/tests/TestData/TestData/Suppliers/TestSuppliers.cs +++ b/tests/TestData/TestData/Suppliers/TestSuppliers.cs @@ -12,7 +12,6 @@ public static class TestSuppliers Id = 29407, Name = "FEDERAL EXPRESS UK LTD", AccountingCompany = "LINN", - CountryCode = TestCountries.UnitedKingdom.CountryCode, Country = TestCountries.UnitedKingdom, ApprovedCarrier = "Y" }; @@ -23,21 +22,22 @@ public static class TestSuppliers Id = 1054, Name = "DHL LOGISTICS (UK) LTD", AccountingCompany = "LINN", - CountryCode = TestCountries.UnitedKingdom.CountryCode, Country = TestCountries.UnitedKingdom, ApprovedCarrier = "Y" }; // Retailers for RSN type Imports + public static readonly Country TaktAndTonCountry = TestCountries.Sweden; + public static readonly Supplier TaktAndTon = new Supplier { Id = 54290, - Name = "TAKT AND TON", + Name = "TAKT AND TON (SEK ACCOUNT)", AccountingCompany = "LINN", - CountryCode = TestCountries.Sweden.CountryCode, - Country = TestCountries.Sweden, - ApprovedCarrier = "N" + Country = TaktAndTonCountry, + ApprovedCarrier = "N", + OrderAddress = new Address("Takt and Ton", "Box 1102", "S-164 22 Kista", string.Empty, string.Empty, string.Empty, TaktAndTonCountry) }; public static readonly Supplier LinnJapan = @@ -46,7 +46,6 @@ public static class TestSuppliers Id = 104164, Name = "LINN JAPAN", AccountingCompany = "LINN", - CountryCode = TestCountries.Japan.CountryCode, Country = TestCountries.Japan, ApprovedCarrier = "N" }; @@ -58,7 +57,6 @@ public static class TestSuppliers Id = 121628, Name = "SEAS FABRIKKER AS (EURO ACCOUNT)", AccountingCompany = "LINN", - CountryCode = TestCountries.Norway.CountryCode, Country = TestCountries.Norway, ApprovedCarrier = "N" }; @@ -70,7 +68,6 @@ public static class TestSuppliers Id = 146737, Name = "ACME INCORPORATED (IMPORT ONLY)", AccountingCompany = "LINN", - CountryCode = TestCountries.China.CountryCode, Country = TestCountries.China, ApprovedCarrier = "N" }; diff --git a/tests/Unit/Domain.LinnApps.Tests/ImportClearanceInstructionTests/WhenAddingComments.cs b/tests/Unit/Domain.LinnApps.Tests/ImportClearanceInstructionTests/WhenAddingComments.cs new file mode 100644 index 00000000..34cb59e9 --- /dev/null +++ b/tests/Unit/Domain.LinnApps.Tests/ImportClearanceInstructionTests/WhenAddingComments.cs @@ -0,0 +1,90 @@ +namespace Linn.Stores2.Domain.LinnApps.Tests.ImportClearanceInstructionTests +{ + using System; + using System.Collections.Generic; + using System.Text; + + using FluentAssertions; + + using Linn.Stores2.Domain.LinnApps.Imports; + using Linn.Stores2.Domain.LinnApps.Imports.Models; + using Linn.Stores2.Domain.LinnApps.Returns; + using Linn.Stores2.TestData.CpcNumbers; + using Linn.Stores2.TestData.Currencies; + using Linn.Stores2.TestData.Employees; + using Linn.Stores2.TestData.SalesArticles; + using Linn.Stores2.TestData.SalesOutlets; + using Linn.Stores2.TestData.Suppliers; + + using NUnit.Framework; + + public class WhenAddingComments : ContextBase + { + [SetUp] + public void SetUp() + { + var rsn = new Rsn + { + RsnNumber = 1234, + SalesOutlet = TestSalesOutlets.TonlagetHifi, + AccountId = TestSalesOutlets.TonlagetHifi.AccountId, + OutletNumber = TestSalesOutlets.TonlagetHifi.OutletNumber, + Quantity = 1, + Ipr = "Y", + SalesArticle = TestSalesArticles.Akiva, + AllegedReason = new RsnReturnReason + { + ReasonCode = "RFR", + ReasonCategory = "Repair" + }, + ImportBookOrderDetails = new List(), + ExportReturnDetails = new List + { + new ExportReturnDetail + { + CustomsValue = 100, + ExportReturn = new ExportReturn + { + Currency = TestCurrencies.SwedishKrona + } + } + } + }; + + var orderDetail = new ImportOrderDetailCandidate(rsn, TestCpcNumbers.IPRCpc); + + var candidate = new ImportCandidate + { + Id = 1, + TransportBillNumber = "12345", + Supplier = TestSuppliers.TaktAndTon, + Carrier = TestSuppliers.Fedex, + Currency = TestCurrencies.SwedishKrona, + BaseCurrency = TestCurrencies.UKPound, + CreatedBy = TestEmployees.SophlyBard, + OrderDetailCandidates = new List { orderDetail }, + InvoiceDetailCandidates = new List + { + new ImportInvoiceDetailCandidate(rsn) + } + }; + + var importBook = new ImportBook(candidate) + { + ClearanceComments = "Comment 1\nComment 2" + }; + + this.Sut = new ImportClearanceInstruction(this.Master, "Marvin@tnt.com"); + + this.Sut.AddImportBook(importBook, this.AuthNumbers); + } + + [Test] + public void ShouldHaveComments() + { + this.Sut.HasComments.Should().BeTrue(); + this.Sut.Comments.Should().NotBeNull(); + this.Sut.Comments.Length.Should().Be(2); + } + } +} diff --git a/tests/Unit/Domain.LinnApps.Tests/ImportClearanceInstructionTests/WhenAddingRsnImportBookForRepair.cs b/tests/Unit/Domain.LinnApps.Tests/ImportClearanceInstructionTests/WhenAddingRsnImportBookForRepair.cs index c48b9a7d..ed000be9 100644 --- a/tests/Unit/Domain.LinnApps.Tests/ImportClearanceInstructionTests/WhenAddingRsnImportBookForRepair.cs +++ b/tests/Unit/Domain.LinnApps.Tests/ImportClearanceInstructionTests/WhenAddingRsnImportBookForRepair.cs @@ -85,6 +85,7 @@ public void ShouldHaveShippingDetails() { this.Sut.Supplier.Should().NotBeNull(); this.Sut.Supplier.Name.Should().Be(TestSuppliers.TaktAndTon.Name); + this.Sut.Supplier.NiceSupplierName.Should().Be("Takt and Ton"); this.Sut.Carrier.Should().NotBeNull(); this.Sut.Invoices.Should().Be("1234"); }