Merge pull request #350 from dotnet-architecture/xamarin-fake-services-review

Fake services now allow creating new orders again.

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs

@@ -7,7 +7,7 @@ namespace eShopOnContainers.Core.Services.Order
 {
     public interface IOrderService
     {
-        //Task CreateOrderAsync(Models.Orders.Order newOrder, string token);
+        Task CreateOrderAsync(Models.Orders.Order newOrder, string token);
         Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync(string token);
         Task<Models.Orders.Order> GetOrderAsync(int orderId, string token);
         Task<ObservableCollection<Models.Orders.CardType>> GetCardTypesAsync(string token);

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs

@@ -104,6 +104,16 @@ namespace eShopOnContainers.Core.Services.Order
                 return new Models.Orders.Order();
         }
 
+        public async Task CreateOrderAsync(Models.Orders.Order newOrder, string token)
+        {
+            await Task.Delay(500);
+
+            if (!string.IsNullOrEmpty(token))
+            {
+                MockOrders.Add(newOrder);
+            }
+        }
+
         public async Task<ObservableCollection<CardType>> GetCardTypesAsync(string token)
         {
             await Task.Delay(500);

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs

@@ -17,9 +17,13 @@ namespace eShopOnContainers.Core.Services.Order
             _requestProvider = requestProvider;
         }
 
+        public Task CreateOrderAsync(Models.Orders.Order newOrder, string token)
+        {
+            throw new Exception("Only available in Mock Services!");
+        }
+
         public async Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync(string token)
         {
-        
             UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint);
 
             builder.Path = "api/v1/orders";

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs

@@ -122,6 +122,16 @@ namespace eShopOnContainers.Core.ViewModels
                     Total = CalculateTotal(CreateOrderItems(orderItems))
                 };
 
+                if (Settings.UseMocks)
+                {
+                    // Get number of orders
+                    var orders = await _orderService.GetOrdersAsync(authToken);
+
+                    // Create the OrderNumber
+                    Order.OrderNumber = orders.Count + 1;
+                    RaisePropertyChanged(() => Order);
+                }
+
                 IsBusy = false;
             }
         }
@@ -138,6 +148,11 @@ namespace eShopOnContainers.Core.ViewModels
                 // Create basket checkout
                 await _basketService.CheckoutAsync(basket, authToken);
 
+                if (Settings.UseMocks)
+                {
+                    await _orderService.CreateOrderAsync(Order, authToken);
+                }
+
                 // Clean Basket
                 await _basketService.ClearBasketAsync(_shippingAddress.Id.ToString(), authToken);
 

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CheckoutView.xaml

@@ -134,7 +134,7 @@
                             Text="STATUS"
                             Style="{StaticResource OrderTitleStyle}"/>
                         <Label 
-                            Text="{Binding Order.State, Converter={StaticResource ToUpperConverter}}"
+                            Text="{Binding Order.OrderStatus, Converter={StaticResource ToUpperConverter}}"
                             Style="{StaticResource OrderContentStyle}"/>
                     </StackLayout>
                 </Grid>

src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -91,7 +91,7 @@
     <Compile Include="Models\Marketing\CampaignRoot.cs" />
     <Compile Include="Models\Navigation\TabParameter.cs" />
     <Compile Include="Models\Orders\CancelOrderCommand.cs" />
-    <Compile Include="Models\Orders\CardType.CS" />
+    <Compile Include="Models\Orders\CardType.cs" />
     <Compile Include="Models\Orders\Order.cs" />
     <Compile Include="Models\Orders\OrderItem.cs" />
     <Compile Include="Models\Orders\OrderStatus.cs" />
@@ -216,19 +216,7 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Animations\" />
-    <Folder Include="Behaviors\" />
-    <Folder Include="Animations\Base\" />
-    <Folder Include="Controls\" />
-    <Folder Include="Helpers\" />
-    <Folder Include="Views\" />
-    <Folder Include="ViewModels\" />
-    <Folder Include="Services\" />
-    <Folder Include="Behaviors\Base\" />
-    <Folder Include="Converters\" />
-    <Folder Include="Validations\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.270\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.270\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Import Project="..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs

@@ -1,11 +1,11 @@
 #pragma warning disable 1591
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Este código fue generado por una herramienta.
+//     Versión de runtime:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
+//     se vuelve a generar el código.
 // </auto-generated>
 //------------------------------------------------------------------------------