ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dotnet/eShopOnContainers

Browse Source
This commit is contained in:
Cesar De la Torre 2017-03-06 23:20:52 -08:00
commit b23d32d0d1
4 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs
View File

@ -1,7 +1,9 @@
using eShopOnContainers.Core.Models.Basket; using eShopOnContainers.Core.Models.Basket;
using eShopOnContainers.Core.Models.Catalog; using eShopOnContainers.Core.Models.Catalog;
using eShopOnContainers.ViewModels.Base; using eShopOnContainers.ViewModels.Base;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
namespace eShopOnContainers.Core.Helpers namespace eShopOnContainers.Core.Helpers
@ -12,27 +14,35 @@ namespace eShopOnContainers.Core.Helpers
public static void FixCatalogItemPictureUri(IEnumerable<CatalogItem> catalogItems) public static void FixCatalogItemPictureUri(IEnumerable<CatalogItem> catalogItems)
{ {
if(catalogItems == null) if (catalogItems == null)
{ {
return; return;
} }
if (!ViewModelLocator.Instance.UseMockService try
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint)
{ {
foreach (var catalogItem in catalogItems) if (!ViewModelLocator.Instance.UseMockService
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint)
{ {
MatchCollection serverResult = IpRegex.Matches(catalogItem.PictureUri); foreach (var catalogItem in catalogItems)
MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
if (serverResult.Count != -1 && localResult.Count != -1)
{ {
var serviceIp = serverResult[0].Value; MatchCollection serverResult = IpRegex.Matches(catalogItem.PictureUri);
var localIp = localResult[0].Value; MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, localIp);
if (serverResult.Count != -1 && localResult.Count != -1)
{
var serviceIp = serverResult[0].Value;
var localIp = localResult[0].Value;
catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, localIp);
}
} }
} }
} }
catch (Exception ex)
{
Debug.WriteLine(ex.Message);
}
} }
public static void FixBasketItemPictureUri(IEnumerable<BasketItem> basketItems) public static void FixBasketItemPictureUri(IEnumerable<BasketItem> basketItems)
@ -42,22 +52,29 @@ namespace eShopOnContainers.Core.Helpers
return; return;
} }
if (!ViewModelLocator.Instance.UseMockService try
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint)
{ {
foreach (var basketItem in basketItems) if (!ViewModelLocator.Instance.UseMockService
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint)
{ {
MatchCollection serverResult = IpRegex.Matches(basketItem.PictureUrl); foreach (var basketItem in basketItems)
MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
if (serverResult.Count != -1 && localResult.Count != -1)
{ {
var serviceIp = serverResult[0].Value; MatchCollection serverResult = IpRegex.Matches(basketItem.PictureUrl);
var localIp = localResult[0].Value; MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
basketItem.PictureUrl = basketItem.PictureUrl.Replace(serviceIp, localIp);
if (serverResult.Count != -1 && localResult.Count != -1)
{
var serviceIp = serverResult[0].Value;
var localIp = localResult[0].Value;
basketItem.PictureUrl = basketItem.PictureUrl.Replace(serviceIp, localIp);
}
} }
} }
} }
catch (Exception ex)
{
Debug.WriteLine(ex.Message);
}
} }
} }
} }

4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
View File

@ -79,13 +79,13 @@ namespace eShopOnContainers.Core.ViewModels
OrderItems = orderItems; OrderItems = orderItems;
var authToken = Settings.AuthAccessToken; var authToken = Settings.AuthAccessToken;
var userInfo = await _userService.GetUserInfoAsync(authToken); var userInfo = await _userService.GetUserInfoAsync(authToken);
// Create Shipping Address // Create Shipping Address
ShippingAddress = new Address ShippingAddress = new Address
{ {
Id = new Guid(userInfo.UserId), Id = !string.IsNullOrEmpty(userInfo?.UserId) ? new Guid(userInfo.UserId) : Guid.NewGuid(),
Street = userInfo?.Street, Street = userInfo?.Street,
ZipCode = userInfo?.ZipCode, ZipCode = userInfo?.ZipCode,
State = userInfo?.State, State = userInfo?.State,

2
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
View File

@ -16,7 +16,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion> <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
</NuGetPackageImportStamp> </NuGetPackageImportStamp>

2
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak
View File

@ -16,7 +16,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion> <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
</NuGetPackageImportStamp> </NuGetPackageImportStamp>