Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update VendrSyncHandlerBase to reflect changes in latest uSync API #5

Merged
merged 2 commits into from
Mar 17, 2021
Merged

Update VendrSyncHandlerBase to reflect changes in latest uSync API #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
569c190
Fix NullReference exception when importing countries with no values s…
Xanashi Mar 15, 2021
c203628
Update VendrSyncHandlerBase to reflect changes in latest uSync API
Xanashi Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/Vendr.uSync/Handlers/VendrSyncHandlerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,14 @@ public virtual IEnumerable<uSyncAction> ProcessPostImport(string folder, IEnumer

foreach (var action in actions)
{
var result = Import(action.FileName, config, SerializerFlags.None);
if (result.Success)
var results = Import(action.FileName, config, SerializerFlags.None);
foreach (var result in results)
{
var attempt = ImportSecondPass(action.FileName, result.Item, config, null);
// postActions.Add();
if (result.Success)
{
var attempt = ImportSecondPass(result, config, null);
// postActions.Add();
}
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/Vendr.uSync/Serializers/CountrySerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ protected override SyncAttempt<CountryReadOnly> DeserializeCore(XElement node, S
country.SetSortOrder(sortOrder);

var defaultCurrencyId = node.Element(nameof(country.DefaultCurrencyId)).ValueOrDefault(country.DefaultCurrencyId);
if (_vendrApi.GetCurrency(defaultCurrencyId.Value) != null) {
if (defaultCurrencyId.HasValue && _vendrApi.GetCurrency(defaultCurrencyId.Value) != null) {
country.SetDefaultCurrency(defaultCurrencyId);
}

var defaultPaymentId = node.Element(nameof(country.DefaultPaymentMethodId)).ValueOrDefault(country.DefaultPaymentMethodId);
if (_vendrApi.GetPaymentMethod(defaultPaymentId.Value) != null) {
if (defaultPaymentId.HasValue && _vendrApi.GetPaymentMethod(defaultPaymentId.Value) != null) {
country.SetDefaultPaymentMethod(defaultPaymentId);
}

var defaultShippingId = node.Element(nameof(country.DefaultShippingMethodId)).ValueOrDefault(country.DefaultShippingMethodId);
if (_vendrApi.GetShippingMethod(defaultShippingId.Value) != null) {
if (defaultShippingId.HasValue && _vendrApi.GetShippingMethod(defaultShippingId.Value) != null) {
country.SetDefaultShippingMethod(defaultShippingId);
}

Expand Down
8 changes: 4 additions & 4 deletions src/Vendr.uSync/Vendr.uSync.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@
<Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\UmbracoCms.Core.8.0.0\lib\net472\Umbraco.Core.dll</HintPath>
</Reference>
<Reference Include="uSync8.BackOffice, Version=8.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\uSync.BackOffice.Core.8.6.5\lib\net472\uSync8.BackOffice.dll</HintPath>
<Reference Include="uSync8.BackOffice, Version=8.8.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\uSync.BackOffice.Core.8.8.4\lib\net472\uSync8.BackOffice.dll</HintPath>
</Reference>
<Reference Include="uSync8.Core, Version=8.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\uSync.Core.8.6.5\lib\net472\uSync8.Core.dll</HintPath>
<Reference Include="uSync8.Core, Version=8.8.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\uSync.Core.8.8.4\lib\net472\uSync8.Core.dll</HintPath>
</Reference>
<Reference Include="Vendr.Core, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Vendr.Core.1.3.0\lib\net472\Vendr.Core.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions src/Vendr.uSync/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
<package id="UmbracoCms.Core" version="8.0.0" targetFramework="net472" />
<package id="uSync.BackOffice.Core" version="8.6.5" targetFramework="net472" />
<package id="uSync.Core" version="8.6.5" targetFramework="net472" />
<package id="uSync.BackOffice.Core" version="8.8.4" targetFramework="net472" />
<package id="uSync.Core" version="8.8.4" targetFramework="net472" />
<package id="Vendr.Core" version="1.3.0" targetFramework="net472" />
</packages>