Protect from null the Checkout proccess

This commit is contained in:
Javier Suárez Ruiz 2017-03-07 08:15:47 +01:00
parent 9181946438
commit c446af002e
4 changed files with 42 additions and 25 deletions

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
@ -17,6 +19,8 @@ namespace eShopOnContainers.Core.Helpers
return; return;
} }
try
{
if (!ViewModelLocator.Instance.UseMockService if (!ViewModelLocator.Instance.UseMockService
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint) && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
{ {
@ -29,11 +33,17 @@ namespace eShopOnContainers.Core.Helpers
{ {
var serviceIp = serverResult[0].Value; var serviceIp = serverResult[0].Value;
var localIp = localResult[0].Value; var localIp = localResult[0].Value;
catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, localIp); 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,6 +52,8 @@ namespace eShopOnContainers.Core.Helpers
return; return;
} }
try
{
if (!ViewModelLocator.Instance.UseMockService if (!ViewModelLocator.Instance.UseMockService
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint) && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
{ {
@ -59,5 +71,10 @@ namespace eShopOnContainers.Core.Helpers
} }
} }
} }
catch (Exception ex)
{
Debug.WriteLine(ex.Message);
}
}
} }
} }

View File

@ -85,7 +85,7 @@ namespace eShopOnContainers.Core.ViewModels
// 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,

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>

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>