Skip to content

Commit 7ce8af1

Browse files
mattbrailsfordmattbrailsford
authored
Merge pull request #10 from vendrhub/v2/complete-menus
Register the service connectors / uSync.Complete menus
2 parents 5058dd4 + e182b1a commit 7ce8af1

File tree

6 files changed

+107
-42
lines changed

6 files changed

+107
-42
lines changed

‎src/Vendr.uSync/Handlers/VendrSyncHandlerBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public virtual IEnumerable<uSyncAction> ProcessPostImport(string folder, IEnumer
9494
{
9595
if (result.Success)
9696
{
97-
var attempt = ImportSecondPass(result, config, null);
97+
var attempt = ImportSecondPass(result, config, new uSyncImportOptions());
9898
// postActions.Add();
9999
}
100100
}

‎src/Vendr.uSync/Vendr.uSync.csproj

+54-41
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,59 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>net472;net5.0</TargetFrameworks>
5-
<Authors>Vendr, Outfield Digital Ltd</Authors>
6-
<Company>Outfield Digital Ltd</Company>
7-
<Copyright>Outfield Digital Ltd</Copyright>
8-
<Description>uSync serializers for Vendr, the eCommerce solution for Umbraco</Description>
9-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10-
<PackageProjectUrl>https://vendr.net</PackageProjectUrl>
11-
<PackageIcon>logo-128.png</PackageIcon>
12-
<RepositoryUrl>https://github.com/vendrhub/vendr-payment-provider-stripe</RepositoryUrl>
13-
<PackageTags>umbraco, vendr, ecommerce, usync</PackageTags>
14-
<RepositoryType>git</RepositoryType>
15-
</PropertyGroup>
16-
17-
<ItemGroup>
18-
<PackageReference Include="Vendr.Core" Version="2.0.0" />
19-
<PackageReference Include="Vendr.Umbraco.Startup" Version="2.0.0" />
20-
</ItemGroup>
21-
22-
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
23-
<PackageReference Include="uSync.BackOffice.Core" Version="8.10.3" />
3+
<PropertyGroup>
4+
<TargetFrameworks>net472;net5.0</TargetFrameworks>
5+
<Authors>Vendr, Outfield Digital Ltd</Authors>
6+
<Company>Outfield Digital Ltd</Company>
7+
<Copyright>Outfield Digital Ltd</Copyright>
8+
<Description>uSync serializers for Vendr, the eCommerce solution for Umbraco</Description>
9+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<PackageProjectUrl>https://vendr.net</PackageProjectUrl>
11+
<PackageIcon>logo-128.png</PackageIcon>
12+
<RepositoryUrl>https://github.com/vendrhub/vendr-payment-provider-stripe</RepositoryUrl>
13+
<PackageTags>umbraco, vendr, ecommerce, usync</PackageTags>
14+
<RepositoryType>git</RepositoryType>
15+
</PropertyGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="Vendr.Core" Version="2.0.0" />
19+
<PackageReference Include="Vendr.Umbraco.Startup" Version="2.0.0" />
20+
</ItemGroup>
21+
22+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
23+
<PackageReference Include="uSync.BackOffice.Core" Version="8.10.3" />
2424
<PackageReference Include="Microsoft.Web.Xdt" Version="3.1.0" />
25-
</ItemGroup>
26-
27-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
28-
<PackageReference Include="uSync.Core" Version="9.0.1" />
29-
<PackageReference Include="uSync.BackOffice" Version="9.0.1" />
30-
</ItemGroup>
31-
32-
<!-- Workaround for this bug (replace the analyzer name with the one you need to exclude (filename only, no extension) -->
33-
<Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">
34-
<ItemGroup>
35-
<Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Lucene.Net.CodeAnalysis.CSharp'" />
36-
</ItemGroup>
37-
</Target>
38-
39-
<ItemGroup>
40-
<None Include="..\..\assets\logo-128.png">
41-
<Pack>True</Pack>
42-
<PackagePath></PackagePath>
43-
</None>
44-
</ItemGroup>
25+
</ItemGroup>
26+
27+
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
28+
<PackageReference Include="uSync.Core" Version="9.0.1" />
29+
<PackageReference Include="uSync.BackOffice" Version="9.0.1" />
30+
</ItemGroup>
31+
32+
<!-- Workaround for this bug (replace the analyzer name with the one you need to exclude (filename only, no extension) -->
33+
<Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">
34+
<ItemGroup>
35+
<Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Lucene.Net.CodeAnalysis.CSharp'" />
36+
</ItemGroup>
37+
</Target>
38+
39+
<ItemGroup>
40+
<None Include="..\..\assets\logo-128.png">
41+
<Pack>True</Pack>
42+
<PackagePath></PackagePath>
43+
</None>
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<None Include="Web\UI\App_Plugins\**\*.*">
48+
<Pack>True</Pack>
49+
<PackagePath>content\App_Plugins</PackagePath>
50+
</None>
51+
52+
<None Include="build\**\*.*">
53+
<Pack>True</Pack>
54+
<PackagePath>buildTransitive</PackagePath>
55+
</None>
56+
</ItemGroup>
57+
4558

4659
</Project>

‎src/Vendr.uSync/VendrSync.cs

+5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ namespace Vendr.uSync
1515
/// <remarks>
1616
/// Not strictly required, just lets people see its installed.
1717
/// </remarks>
18+
#if NETFRAMEWORK
1819
[JsonObject(NamingStrategyType = typeof(DefaultNamingStrategy))]
20+
#else
21+
[JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))]
22+
#endif
23+
1924
public class VendrSync : ISyncAddOn
2025
{
2126
public string Name => "Vendr.uSync";

‎src/Vendr.uSync/VendrSyncComposer.cs

+16
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
using Umbraco.Cms.Core.DependencyInjection;
1515
using Vendr.Extensions;
1616
using Vendr.Umbraco;
17+
using Umbraco.Cms.Core;
18+
using Vendr.uSync.ServiceConnectors;
1719
#endif
1820

1921
namespace Vendr.uSync
@@ -41,6 +43,7 @@ public void Compose(Composition composition)
4143
composition.Register<ISyncSerializer<RegionReadOnly>, RegionSerializer>();
4244
composition.Register<ISyncSerializer<ShippingMethodReadOnly>, ShippingMethodSerializer>();
4345
composition.Register<ISyncSerializer<TaxClassReadOnly>, TaxClassSerializer>();
46+
4447
}
4548
#else
4649
public void Compose(IUmbracoBuilder builder)
@@ -50,6 +53,19 @@ public void Compose(IUmbracoBuilder builder)
5053
// that Vendr has been initialized so we'll call AddVendr
5154
// which should auto escape if it's already been added
5255
builder.AddVendr();
56+
57+
// in v9 looks like you have to register service connectors.
58+
// they are autodiscovered in v8.
59+
UdiParserServiceConnectors.RegisterServiceConnector<StoreServiceConnector>();
60+
UdiParserServiceConnectors.RegisterServiceConnector<OrderStatusServiceConnector>();
61+
UdiParserServiceConnectors.RegisterServiceConnector<ShippingMethodServiceConnector>();
62+
UdiParserServiceConnectors.RegisterServiceConnector<CountryServiceConnector>();
63+
UdiParserServiceConnectors.RegisterServiceConnector<CurrencyServiceConnector>();
64+
UdiParserServiceConnectors.RegisterServiceConnector<PaymentServiceConnector>();
65+
UdiParserServiceConnectors.RegisterServiceConnector<TaxServiceConnector>();
66+
UdiParserServiceConnectors.RegisterServiceConnector<EmailTemplateServiceConnector>();
67+
UdiParserServiceConnectors.RegisterServiceConnector<ExportTemplateServiceConnector>();
68+
UdiParserServiceConnectors.RegisterServiceConnector<PrintTemplateServiceConnector>();
5369
}
5470
#endif
5571
}

‎src/Vendr.uSync/Web/UI/App_Plugins/Vendr.uSync/lang/en-us.xml

+1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
<area alias="usync">
44
<key alias="import-vendr">Import Vendr settings</key>
55
<key alias="report-vendr">Report Vendr settings</key>
6+
<key alias="vendr-description">Sync vendr settings</key>
67
</area>
78
</language>

‎src/Vendr.uSync/build/Vendr.uSync.targets

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<PropertyGroup>
4+
<vendruSyncPluginFolder>App_Plugins\Vendr.uSync</vendruSyncPluginFolder>
5+
<vendruSyncPackageContentFilesPath>$(MSBuildThisFileDirectory)..\content\$(vendruSyncPluginFolder)\**\*.*</vendruSyncPackageContentFilesPath>
6+
</PropertyGroup>
7+
8+
<Target Name="CopyvendruSyncPackageAssets" BeforeTargets="Build">
9+
<ItemGroup>
10+
<vendruSyncPackageContentFiles Include="$(vendruSyncPackageContentFilesPath)" />
11+
</ItemGroup>
12+
<Message Text="Copying Vendr.uSync Package files -> $(vendruSyncPluginFolder) - #@(vendruSyncPackageContentFiles->Count()) files" Importance="high" />
13+
<Warning Text="No Vendr.uSync Package files found in $(vendruSyncPluginFolder)" Condition="@(vendruSyncPackageContentFiles->Count()) == 0" />
14+
15+
<Copy
16+
SourceFiles="@(vendruSyncPackageContentFiles)"
17+
DestinationFiles="@(vendruSyncPackageContentFiles->'$(MSBuildProjectDirectory)\$(vendruSyncPluginFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
18+
SkipUnchangedFiles="true" />
19+
20+
</Target>
21+
22+
<Target Name="ClearvendruSyncPackageAssets" BeforeTargets="Clean">
23+
<ItemGroup>
24+
<vendruSyncPackageDir Include="$(MSBuildProjectDirectory)\$(vendruSyncPluginFolder)\" />
25+
</ItemGroup>
26+
<Message Text="Clear old vendr.uSync Package data" Importance="high" />
27+
<RemoveDir Directories="@(vendruSyncPackageDir)" />
28+
</Target>
29+
30+
</Project>

0 commit comments

Comments
 (0)