From 0c274d46be9de021007266d98104f29703730c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez=20Ruiz?= <javiersuarezruiz@hotmail.com>
Date: Mon, 25 Sep 2017 08:17:20 +0200
Subject: [PATCH] Fixed bindings errors Fixed Checkout process Changed some UWP
 icons

---
 .../Services/Order/IOrderService.cs           |   2 +-
 .../Services/Order/OrderMockService.cs        |  10 ++++++++++
 .../Services/Order/OrderService.cs            |   6 +++++-
 .../ViewModels/CheckoutViewModel.cs           |  15 +++++++++++++++
 .../Views/CheckoutView.xaml                   |   2 +-
 .../eShopOnContainers.Core.csproj             |  18 +++---------------
 .../Resources/Resource.Designer.cs            |   8 ++++----
 .../Assets/LockScreenLogo.scale-200.png       | Bin 1430 -> 898 bytes
 ...x44Logo.targetsize-24_altform-unplated.png | Bin 1255 -> 397 bytes
 .../Assets/StoreLogo.png                      | Bin 1451 -> 943 bytes
 10 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs
index 59b746917..a01938779 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs
+++ b/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);
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs
index c32093203..e44e289e3 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs
+++ b/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);
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs
index 2d85bef5c..f74d6e19b 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs
+++ b/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";
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
index a358f94d3..700fd8b53 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
+++ b/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);
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CheckoutView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CheckoutView.xaml
index ec6ea70d5..12fcaaabe 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CheckoutView.xaml
+++ b/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>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
index e31d06f37..bc0cb1936 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
+++ b/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')" />
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs
index cbf2a07ea..48bbb9b82 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs
+++ b/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>
 //------------------------------------------------------------------------------
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/LockScreenLogo.scale-200.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/LockScreenLogo.scale-200.png
index 735f57adb5dfc01886d137b4e493d7e97cf13af3..08838125d9909c4951ab8db4e2c8fd173f295aed 100644
GIT binary patch
delta 875
zcmV-x1C;!h3xWrbB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tn
z000tn0p4aGcmMzZ8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF)~90YwQ330`f^j
zK~!i%?U*}g6j2n0lPD1tEi6QQB!Y;Ig@p(r78W8FRua)xTYsB~V3#8J!XlbZ3|ROG
z*4h}b6R|Kw6bvXnP(h=Og^FU#uHS#>++jB}yR$>wJ6W6$e&?QZ|9i$ClI-ksbu!gz
z)m9x!8K7v&07X*<D4PE(K&4XYMaxsP#4Necxp{NEdd-qa%K;d=2L0hc0{Y`-%LV6d
z+lV@JAKlMvO@F~|s|*;p(S{%4a;R4HHk&OMoa;}SrTMzgCbKmKtF1C%pbxOhT5Un|
z7exSk8_+>?91Wmtw$&7T#Rbq!(KvdKD)M_&!zXkHHT=)97d`;(rSyl;Z+Wti51m0h
zHX?>z*Z|ba&~@$Qg>x6U*rW)}x4mEiE~{S)y_e`L+JA-C+jSIuF-r`+!#2u69WDUt
zed>9r=g<i1HcK7!SD?>kcThj&68oux26&{NhkD4i8iK6{->>LI1odv)4i`XIG^?Iq
z{hW*QW`TD)Iu$`ZVp~B298>L~zUGV#U|-KTd(mn1%8ogxC(IT!z&X_(>WfG}<2%s_
zbOqf-lYeLi&6za;dsFTvz&cofQPm#mpD6WVFAL7ixSN3HTd(Z_PN{Ac{NgKmhVG-Q
z=p@pQRs7`1I#_@`s%xPqzM*$$3f)7)=m1*l24#RROaL8Z{X;#$`a4?Z%q@Udj~|K8
z3wmJ!2-XkP^H2}kRwj6Fp~UBg=G&|w0S46bP=D(ed8=(V1kV`Kw=OY(;;*Evg9hkE
z57hTi&!U^C&uk9r)o2jCK=GqCOFfzHFk9FFg1QgA)m|<1#0NBu^h=%i6RRFNYNH&~
zVFL(yThOHTTLu3cwBJU=Xuj=-3n1w0d%=115!HPg^QaH6(IvFfj@CiHm;fFP#G|(h
zH)POb>L*<F!8Oc!yY`!buh;+!B}9O<_d@+<%Z1LR%xc?vq0W9YCm5=Cqk3eXuZ6rD
zO`G@c-;FL-$^b=E1}K^`K+%)|ipB-dKb@;;*I%vTM@m>2ie3N!002ovPDHLkV1i8v
Bkr)5~

literal 1430
zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@!
zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT
z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o
zH-bvQi|wt~L7q<c#Bs@6tJZpsaDp5#@^Kxb76?JKPM4Rjg?OPEsE7|VN<kaCGX4#U
zNTLm`F?$G4$N`$9k`4t_b(DF9j%I-s(fmV5p2k4~0ig1T7HA2EIn9Qy+vVUsevG5Y
zx{BItLpMm(dMXfytN_Gpv|s{3(g?#ENwbAvnU@d>$~a-gDFP!{&TQfc3fX*6=uHv*
zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M
zIf%q9@;<puwV{ydMhJnB$FpTP7~V`2Oc}26A)GW4cpwmuYh636R)YU&Y^xpiwub;-
z3Bq!lBEWk1a}r>fyT?0<D?&D0xgx=$@GVYRXbXU#>UP>tcw-bLkz;s2LlKl2qeP0w
zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ
ztnxttBz#NI_a@f<SS;sI0I$l5SC(56T~N^^t8%zW4j~T5dexEVYowqkN5Z-BGHpcd
z1d8+q5Q`K!fUM`4leXai7{C&K6Nxc?hQWB61{h0|4Cb>k7SU`WtrpsfZsNs9^0(2a
z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2L<e7iLm
zP}mwR5QOujz`+rgnOi!Y{({?C=+*8leK`I4)q-bwZ~S$=`Qx8za!;_&ojSySG^`y-
zUwxr;y18tmHR*DH-R#Zfn@dafJ#VG;#JXCA1?Fhi?=z+K#EYHSuZ6R;t9!2P-`Czg
zntSi!KX=pneo0;EVH+kX{Tbnm^ke?~Z}v~j1(%4Y2eEUe-ebObqI@uC5e<?ngPC8q
zexSeKJ6Lye>flg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7
zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ
zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH
z&(f2wz_Y0??Tf|g;?|1Znw6}6U43<uVfr(7fnD33UXp<u^(nDoL&FaIfW9||8X7Y8
zWBR>Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV
yGvCsSX<sgWK5pRdjuceaUA*+*;fQZyG$}(jP`_}c_gGYm|0&(BGUuqhq31shAo>*m

diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
index f6c02ce97e0a802b85f6021e822c89f8bf57d5cd..10deee1098326d77913c599295b7febb7504a6fe 100644
GIT binary patch
delta 370
zcmV-&0ge9W35^4gB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tn
z000tn0p4aGcmMzZ8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF)~90YwQ330R2fs
zK~zXf?Ub<&!B7;28zYm6SS2C`Vlx<R-b4%%Bk$l5yalttD1Y$+9zskKTK_rsZ=<Mk
z^_u!6zjN+?PtQNJ;khIT0(Oqb15!y0@O^)W%cY3cOTrnMrxoK}z?^Layb{!g%CsWj
z&Dh5HC;)v6gHOP3aKt_UwP)7p!WC49wzR~naLz8ktkFdUy&yPu>0f#NJ^*TR$)2`?
za}gTLoj}hjU~3=?P|s46;Jj5p&8*OnBea30P<CIDS+4==-vjRe>ASHGK%Fo^=+LV|
z7y2i9b^!wVg)Dmn{+c7d1%$vG;(-xrpH_rTfZP9~tjGgW`A>lSxKrTW0F$*0st6^&
Q2><{907*qoM6N<$f<Bj<g8%>k

literal 1255
zcmaJ>TWs4@7*5+{G#S+<G69{CW?TuiXeYkMv1xisQWlzol0`IV5A4`JZcXaTY?q{w
z&?qX=E<%VR9^fg07bdg|(uRb1SP@065)#_u(4;|M;B82}FnECDG%0(iX30M1Kj;7c
z|NCz~KVN!rD0Va!3WbL9C$eR{J{`P+2k`fodipQC4EwpNf6~_dI&@KJTC){I<W0DU
z$_Q$!XSUIJC^WEcRH}ZpSddlQOu#@V(J&p14u!@i8xB-!$R`xEXjp0T{x>&C!qC#>
zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U
zyQHecc_L%Gh!7G<pwbLah*E+PlA<IYCs-^~bc$kWKufZ~$uvuJ9};_WHC--eXS=?z
zlqQ#a-;pV*Uau$WT*7u2DMpecie@R61y}=ktCkNN!16|V7P81wUBmGW+adysP_bA1
zG>Mt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+
z<J>*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX
zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w
z&bSErwp+37<z5%eFWJ8BE!hr{$#kktj4l|KX4k#3piH|_XOU~XiL_bQHi=H2Wn&)>
zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o#
zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=&
zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E
zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx
zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q
z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS
zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s
Mu9UqpbNZeC0BbUo^Z)<=

diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/StoreLogo.png b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Assets/StoreLogo.png
index 7385b56c0e4d3c6b0efe3324aa1194157d837826..fb2f313c1dc1aeb60f5451e7bbabd9e212d75b0c 100644
GIT binary patch
delta 921
zcmV;K17`fI3$F)|B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tn
z000tn0p4aGcmMzZ8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF)~90YwQ3310P95
zK~!i%?U>I?R8bViHM59Fq8}s?6@-g|gtSO$Rc`tZB3ef6`hNx0DhOQFriCsuYEeOL
z+DH*n5Vb0Zph7H4!WIz~MOm0N)8~8dnP*JTnR&+C_muaAkMEs(&pC6xGUFR>!(33Y
zShTxYuG~o0lpD#KawAz&ZX|0;WTa3ibimOVj=*wDOC;4<eO%uTORK7+M$W?|yrnQg
zF?3s6B2m{hO@BYV&VZ#=6?Jx3gJ>)xFJV4~5yVYkS;?jPvVP(P)YXVyz*g!b^@kBi
z*9iNqZ~zA2COm*Ua2XE68cU58`{^2CeJ%9CPa01v?OR@~A=c9|q8K*AXFqCfBL5?7
z;MO{MS-(__Y=;RqT|!Ye4z1S8N&O+L5$-p^xF5@lcz*)ULObX=vB<7lVbIbdu{O+Q
zp|uQegyKf-hcrw{#IK;sB}^ms&slmT)^^)=cq3eQ`Z2tS^)}h!HY<o!{Q{o)Dlg(o
zww;QRem{m6@hP`agUCH;WlqHU;5XV{a3lBp7+%EH-crr53wq&+l|^E0z2yZrGU7+@
zBJPA0(0>Cb;40jQVfX;QEj3o`_gLTHMn?SzUc_IZ;;@xO?Lq4s+{j};LTw^n`Ua!$
z2nOK{?145?nyhbdBRAZHe~C3o&yla75AZY4cdos#jucm0N#q4L((9%-5x;?ruo9L)
zGs`YFiKq*1WQTKLB9_|SW(^{D8(g5Y*_NDG3x8{bVm;U%%0x-TccH~4R1i7c@D8Ng
zu-dl58<Dv0@fN1U+H=squ+jG?iCF(hw!vwbv~(xpYnGOd5sA1T3Vx(1vGfau;3C|D
z@3s|*HR%(qvUaH&(Qo>SA1#@vdkxF1m6Q5Icq5V;vA&P%dkt7k<mylJAy{B7BB?*5
zV}GP1_Vg9yIOs#KVcnCS>km-vb=VI}t>hoEm%fp5@dAsX1?JgORjEJJ-AL(NOJ`9I
zV)xZzrc!-bzaZyYaVL#qFw>JpJx|8U`qllUQD?u$V$eD5|D64*KCW-4rBziTBUx5%
vBx}lzWKFq|tSL8=HO(y}`Z4<{Hv9qiYZBAgs9W(#00000NkvXXu0mjffTgV%

literal 1451
zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv
z5nzWi(<Qp0OO$NM7W~Q_8E#Xi$ik*$nyFjFERiL|C5FvR_m#Nm-UE*L2eC=}zR&wU
zzvuZqU+t~gP??tUObUV^Y2GTg53Y3lH73JvZdvRkT$bsc2E9%R=n+8$h(l8R0QCli
zCg1~t)c*1XP>LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j
zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#x<D+(L#x4){@nZr*
zXH@hSJ2p$Ip}GcjDJnoMW-Bg|6oayynX*_}jx9oIC=;ZOph=wMcuO%)(&*fSL2s%Q
z;C=3jIbTq+W6ioA<_RJaiI^kBW<_lxD30R@k|t;xhZ?xn9@2#<9@17OEVzLts&ZJD
zl@J=YDEO7_x*dZ|XF~{vtE=Y?hqSpw!ITkEAxuzak_ZOlam{FJx)1zMV?k}LzC8>G
zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w
zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q
zX}S;+LBh8Tea~TSkHzvX6$rYb)+<VDq6=!86<yJql`!gZ%~TyN*er)6C88C^%QPFc
z8>n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?w<Zrf5
z;R%c*oS?(o7?BfgG=~RBn#Cy!Fu0#%8C>FM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U
zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e
z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S
zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ
zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8
zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v
zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-*
zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V
z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36
zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640
bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x