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

Jump to bottom

Missing updates from the previous PR #65

Merged
merged 1 commit into from
Jan 26, 2018
Merged

Missing updates from the previous PR #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .build/ModulePackage.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Shipping.dll" />
<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Shipping.FedEx.dll" />
<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Shipping.Ups.dll" />
<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Shipping.UpsFreight.dll" />
<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Shipping.USPostal.dll" />
<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Web.dll" />
<HotcakesDlls Include="$(MSBuildDnnBinPath)\$(AssemblyName).dll" />
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Hotcakes.Shipping.UpsFreight/UPSFreightService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public UPSFreightService(UPSFreightServiceGlobalSettings globalSettings, ILogger

public string Name
{
get { return "UPSFreight"; }
get { return "UPS Freight"; }
}

public string Id
Expand Down
5 changes: 5 additions & 0 deletions Website/DesktopModules/Hotcakes/Hotcakes.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,11 @@
<name>Hotcakes.Shipping.Ups.dll</name>
<sourceFileName>bin\Hotcakes.Shipping.Ups.dll</sourceFileName>
</assembly>
<assembly>
<path>bin</path>
<name>Hotcakes.Shipping.Ups.dll</name>
<sourceFileName>bin\Hotcakes.Shipping.UpsFreight.dll</sourceFileName>
</assembly>
<assembly>
<path>bin</path>
<name>Hotcakes.Shipping.USPostal.dll</name>
Expand Down