From 3218c1b54c87c2bf061248e5c2871bc9cbeb7c56 Mon Sep 17 00:00:00 2001
From: Cesar De la Torre <cesardl@microsoft.com>
Date: Tue, 31 Oct 2017 21:55:04 -0700
Subject: [PATCH] Fixed bug in Xamarin code when mapping from Order to Basket,
 method MapOrderToBasket(), in order to submit to the Basket microservice.

---
 .../eShopOnContainers.Core/Services/Order/OrderService.cs       | 1 +
 .../eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs
index 85f8c85a6..fc6a03a7e 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs
@@ -68,6 +68,7 @@ namespace eShopOnContainers.Core.Services.Order
                 CardSecurityNumber = order.CardSecurityNumber,
                 CardTypeId = order.CardTypeId,
                 City = order.ShippingCity,
+                State = order.ShippingState,
                 Country = order.ShippingCountry,
                 ZipCode = order.ShippingZipCode,
                 Street = order.ShippingStreet
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
index 700fd8b53..0113202bf 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
@@ -165,7 +165,7 @@ namespace eShopOnContainers.Core.ViewModels
                 await NavigationService.RemoveLastFromBackStackAsync();
 
                 // Show Dialog
-                await DialogService.ShowAlertAsync("Order sent successfully!", string.Format("Order {0}", Order.OrderNumber), "Ok");
+                await DialogService.ShowAlertAsync("Order sent successfully!", "Checkout", "Ok");
                 await NavigationService.RemoveLastFromBackStackAsync();
             }
             catch