8000 Development by WillStrohl · Pull Request #8 · HotcakesCommerce/hotcakes-commerce-core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Development #8

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

Merged
merged 10 commits into from
Jun 13, 2017
Merged

Development #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e50adb6
Don't track the build DLL's
WillStrohl Jun 9, 2017
0ffbd04
Don't track these build DLL's
WillStrohl Jun 9, 2017
a13c978
Updated the ignored files and added Git files to solution folder.
WillStrohl Jun 9, 2017
b78a45d
Explicitly loading locales when they're null due to environment-speci…
WillStrohl Jun 9, 2017
532adde
Merge pull request #2 from hismightiness/Issues/Issue-1
Jun 9, 2017
f7ffed0
Preparing for release packaging
WillStrohl Jun 9, 2017
e9a4e51
Rolling back the version changes
WillStrohl Jun 9, 2017
54b4670
removing files that should never have been checked in
WillStrohl Jun 13, 2017
42cbdf6
removing files that should have never been checked in
WillStrohl Jun 13, 2017
98e2512
Updates to resolve packaging issues with 3.0
WillStrohl Jun 13, 2017
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
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ _[Ii]nstall

*.zip.manifest

# ignore development builds
**/[Bb]in/[Dd]ebug
**/[Bb]in/[Rr]elease
**/[Ff]akes[Aa]ssemblies/[Hh]otcakes*
[Ww]ebsite/[Bb]in/[Hh]otcakes.*
[Ww]ebsite/[Dd]esktop[Mm]odules/[Hh]otcakes/[Bb]in

############
## Windows
############
Expand Down
2 changes: 1 addition & 1 deletion CommonAssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.MainAssembly)]
[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.MainAssembly)]
78 changes: 12 additions & 66 deletions Hotcakes.sln
View file
10000 Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Portals", "Portals", "{F4EBAEA6-F4F5-4215-9B84-F11EE8298E7F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_default", "_default", "{3CBE5616-E32C-4C85-B1AF-C581A574B9FC}"
Expand Down Expand Up @@ -34,6 +36,13 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotcakes.Web", "Libraries\Hotcakes.Web\Hotcakes.Web.csproj", "{A822B6B9-CE48-4717-9EC2-1C1548289315}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F008FB3A-586D-4339-98D1-00A990006429}"
ProjectSection(SolutionItems) = preProject
.gitattributes = .gitattributes
.gitignore = .gitignore
CONTRIBUTING.md = CONTRIBUTING.md
LICENSE = LICENSE
README.md = README.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotcakes.Modules", "Website\DesktopModules\Hotcakes\Hotcakes.Modules.csproj", "{AA89B33A-2A62-4919-B15F-FF3685947622}"
EndProject
Expand Down Expand Up @@ -81,69 +90,6 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotcakes.Commerce.NoCms", "Libraries\Hotcakes.Commerce.NoCms\Hotcakes.Commerce.NoCms.csproj", "{CB21DFDA-99A5-4E97-92F8-A6C8689F9341}"
EndProject
Global
GlobalSection(TeamFoundationVersionControl) = preSolution
SccNumberOfProjects = 20
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
SccTeamFoundationServer = http://tfs.arrowdesigns.net:8080/tfs/defaultcollection
SccLocalPath0 = .
SccProjectUniqueName1 = Website\\Hotcakes.Views.csproj
SccProjectName1 = Website
SccLocalPath1 = Website
SccProjectUniqueName2 = Libraries\\Hotcakes.Shipping.Ups.Keys\\Hotcakes.Shipping.Ups.Keys.csproj
SccProjectName2 = Libraries/Hotcakes.Shipping.Ups.Keys
SccLocalPath2 = Libraries\\Hotcakes.Shipping.Ups.Keys
SccProjectUniqueName3 = Libraries\\Hotcakes.CommerceDTO\\Hotcakes.CommerceDTO.csproj
SccProjectName3 = Libraries/Hotcakes.CommerceDTO
SccLocalPath3 = Libraries\\Hotcakes.CommerceDTO
SccProjectUniqueName4 = Libraries\\Hotcakes.Payment\\Hotcakes.Payment.csproj
SccProjectName4 = Libraries/Hotcakes.Payment
SccLocalPath4 = Libraries\\Hotcakes.Payment
SccProjectUniqueName5 = Libraries\\Hotcakes.Shipping\\Hotcakes.Shipping.csproj
SccProjectName5 = Libraries/Hotcakes.Shipping
SccLocalPath5 = Libraries\\Hotcakes.Shipping
SccProjectUniqueName6 = Libraries\\Hotcakes.Payment.Tests\\Hotcakes.Payment.Tests.csproj
SccProjectName6 = Libraries/Hotcakes.Payment.Tests
SccLocalPath6 = Libraries\\Hotcakes.Payment.Tests
SccProjectUniqueName7 = Libraries\\Hotcakes.PaypalWebServices\\Hotcakes.PaypalWebServices.csproj
SccProjectName7 = Libraries/Hotcakes.PaypalWebServices
SccLocalPath7 = Libraries\\Hotcakes.PaypalWebServices
SccProjectUniqueName8 = Libraries\\Hotcakes.Shipping.FedEx\\Hotcakes.Shipping.FedEx.csproj
SccProjectName8 = Libraries/Hotcakes.Shipping.FedEx
SccLocalPath8 = Libraries\\Hotcakes.Shipping.FedEx
SccProjectUniqueName9 = Libraries\\Hotcakes.Shipping.Ups\\Hotcakes.Shipping.Ups.csproj
SccProjectName9 = Libraries/Hotcakes.Shipping.Ups
SccLocalPath9 = Libraries\\Hotcakes.Shipping.Ups
SccProjectUniqueName10 = Libraries\\Hotcakes.Shipping.USPostal\\Hotcakes.Shipping.USPostal.csproj
SccProjectName10 = Libraries/Hotcakes.Shipping.USPostal
SccLocalPath10 = Libraries\\Hotcakes.Shipping.USPostal
SccProjectUniqueName11 = Libraries\\Hotcakes.Web\\Hotcakes.Web.csproj
SccProjectName11 = Libraries/Hotcakes.Web
SccLocalPath11 = Libraries\\Hotcakes.Web
SccProjectUniqueName12 = Libraries\\Hotcakes.Commerce.Tests\\Hotcakes.Commerce.Tests.csproj
SccProjectName12 = Libraries/Hotcakes.Commerce.Tests
SccLocalPath12 = Libraries\\Hotcakes.Commerce.Tests
SccProjectUniqueName13 = Libraries\\Hotcakes.Commerce\\Hotcakes.Commerce.csproj
SccProjectName13 = Libraries/Hotcakes.Commerce
SccLocalPath13 = Libraries\\Hotcakes.Commerce
SccProjectUniqueName14 = Libraries\\Hotcakes.Commerce.Dnn\\Hotcakes.Commerce.Dnn.csproj
SccProjectName14 = Libraries/Hotcakes.Commerce.Dnn
SccLocalPath14 = Libraries\\Hotcakes.Commerce.Dnn
SccProjectUniqueName15 = Website\\DesktopModules\\Hotcakes\\Hotcakes.Modules.csproj
SccProjectName15 = Website/DesktopModules/Hotcakes
SccLocalPath15 = Website\\DesktopModules\\Hotcakes
SccProjectUniqueName16 = Libraries\\Hotcakes.Web.Test\\Hotcakes.Web.Test.csproj
SccProjectName16 = Libraries/Hotcakes.Web.Test
SccLocalPath16 = Libraries\\Hotcakes.Web.Test
SccProjectUniqueName17 = Libraries\\Hotcakes.Web.TestStubs\\Hotcakes.Web.TestStubs.csproj
SccProjectName17 = Libraries/Hotcakes.Web.TestStubs
SccLocalPath17 = Libraries\\Hotcakes.Web.TestStubs
SccProjectUniqueName18 = Libraries\\Hotcakes.CommerceDTO.Tests\\Hotcakes.CommerceDTO.Tests.csproj
SccProjectName18 = Libraries/Hotcakes.CommerceDTO.Tests
SccLocalPath18 = Libraries\\Hotcakes.CommerceDTO.Tests
SccProjectUniqueName19 = Libraries\\Hotcakes.Commerce.NoCms\\Hotcakes.Commerce.NoCms.csproj
SccProjectName19 = Libraries/Hotcakes.Commerce.NoCms
SccLocalPath19 = Libraries\\Hotcakes.Commerce.NoCms
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -346,12 +292,12 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1EDD16FA-4A6D-44CB-813E-04F36354A959} = {F008FB3A-586D-4339-98D1-00A990006429}
{B564E37A-B553-4073-801F-5CE93C217FF9} = {F008FB3A-586D-4339-98D1-00A990006429}
{F4EBAEA6-F4F5-4215-9B84-F11EE8298E7F} = {1EDD16FA-4A6D-44CB-813E-04F36354A959}
{3CBE5616-E32C-4C85-B1AF-C581A574B9FC} = {F4EBAEA6-F4F5-4215-9B84-F11EE8298E7F}
{DFCDD07F-8F2E-4D88-A3C3-E4E2554816B5} = {3CBE5616-E32C-4C85-B1AF-C581A574B9FC}
{6F53F15B-6573-4E46-8A00-8C02521365EF} = {DFCDD07F-8F2E-4D88-A3C3-E4E2554816B5}
{B564E37A-B553-4073-801F-5CE93C217FF9} = {F008FB3A-586D-4339-98D1-00A990006429}
{1EDD16FA-4A6D-44CB-813E-04F36354A959} = {F008FB3A-586D-4339-98D1-00A990006429}
{F30E7ACF-674E-465A-B1A8-BB6E80428CDF} = {DFCDD07F-8F2E-4D88-A3C3-E4E2554816B5}
{F8E776BA-042B-48EB-B7BA-C6BB0E101542} = {DFCDD07F-8F2E-4D88-A3C3-E4E2554816B5}
EndGlobalSection
Expand Down
11 changes: 10 additions & 1 deletion Libraries/Hotcakes.Commerce.Dnn/DnnGlobal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
using System.Collections.Generic;
using System.Globalization;
using DotNetNuke.Common.Utilities;
using DotNetNuke.Data;
using DotNetNuke.Entities.Portals;
using DotNetNuke.Framework;
using DotNetNuke.Services.Localization;
Expand Down Expand Up @@ -94,7 +95,15 @@ public Dictionary<string, Locale> GetLocales()

public Locale GetLocale(string code)
{
return LocaleController.Instance.GetLocale(GetPortalId(), code);
var locale = LocaleController.Instance.GetLocale(GetPortalId(), code);
if (locale == null)
{
// workaround to explicitly fill and retrieve the locales under some conditions
// under these (unknown) conditions, the CMS API doesn't aways fill the locale collection
var locales = CBO.FillDictionary("CultureCode", DataProvider.Instance().GetLanguages(), new Dictionary<string, Locale>(StringComparer.OrdinalIgnoreCase));
locales.TryGetValue(code, out locale);
}
return locale;
}

public CultureInfo GetPageLocale()
Expand Down
Binary file removed Libraries/Hotcakes.Commerce.Tests/FakesAssemblies/Hotcakes.Commerce.Dnn.Fakes.dll
View file
Open in desktop
Binary file not shown.
98 changes: 0 additions & 98 deletions Libraries/Hotcakes.Commerce.Tests/FakesAssemblies/Hotcakes.Commerce.Dnn.Fakes.xml
View file
Open in desktop

This file was deleted.

Binary file removed Libraries/Hotcakes.Commerce.Tests/FakesAssemblies/Hotcakes.Commerce.Fakes.dll
View file
Open in desktop
Binary file not shown.
Loading
0