diff --git a/cli-mac/build-bits.sh b/cli-mac/build-bits.sh index a7712b831..8b4917144 100755 --- a/cli-mac/build-bits.sh +++ b/cli-mac/build-bits.sh @@ -3,12 +3,15 @@ # List of microservices here needs to be updated to include all the new microservices (Marketing, etc.) projectList=( - "../src/Services/Catalog/Catalog.API" - "../src/Services/Basket/Basket.API" - "../src/Services/Ordering/Ordering.API" - "../src/Services/Identity/Identity.API" "../src/Web/WebMVC" "../src/Web/WebSPA" + "../src/Services/Identity/Identity.API" + "../src/Services/Catalog/Catalog.API" + "../src/Services/Ordering/Ordering.API" + "../src/Services/Basket/Basket.API" + "../src/Services/Location/Locations.API" + "../src/Services/Marketing/Marketing.API" + "../src/Services/Payment/Payment.API" "../src/Web/WebStatus" ) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs index 811c8436f..1d41584c4 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs @@ -28,7 +28,7 @@ namespace eShopOnContainers.Core.Services.Basket CustomerBasket basket = await _requestProvider.GetAsync(uri, token); - ServicesHelper.FixBasketItemPictureUri(basket?.Items); + ServicesHelper.FixBasketItemPictureUri(basket?.Items); return basket; } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs index a01938779..3503f7c2b 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs @@ -10,7 +10,6 @@ namespace eShopOnContainers.Core.Services.Order Task CreateOrderAsync(Models.Orders.Order newOrder, string token); Task> GetOrdersAsync(string token); Task GetOrderAsync(int orderId, string token); - Task> GetCardTypesAsync(string token); Task CancelOrderAsync(int orderId, string token); BasketCheckout MapOrderToBasket(Models.Orders.Order order); } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs index e44e289e3..9d25edc65 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs @@ -55,15 +55,8 @@ namespace eShopOnContainers.Core.Services.Order private static List MockOrderItems = new List() { - new OrderItem { OrderId = Guid.NewGuid(), ProductId = Common.Common.MockCatalogItemId01, Discount = 15, ProductName = ".NET Bot Blue Sweatshirt (M)", Quantity = 1, UnitPrice = 16.50M, PictureUrl = Device.RuntimePlatform != Device.Windows ? "fake_product_01.png" : "Assets/fake_product_01.png" }, - new OrderItem { OrderId = Guid.NewGuid(), ProductId = Common.Common.MockCatalogItemId03, Discount = 0, ProductName = ".NET Bot Black Sweatshirt (M)", Quantity = 2, UnitPrice = 19.95M, PictureUrl = Device.RuntimePlatform != Device.Windows ? "fake_product_03.png" : "Assets/fake_product_03.png" } - }; - - private static List MockCardTypes = new List() - { - new CardType { Id = 1, Name = "Amex" }, - new CardType { Id = 2, Name = "Visa" }, - new CardType { Id = 3, Name = "MasterCard" }, + new OrderItem { OrderId = Guid.NewGuid(), ProductId = Common.Common.MockCatalogItemId01, Discount = 15, ProductName = ".NET Bot Blue Sweatshirt (M)", Quantity = 1, UnitPrice = 16.50M, PictureUrl = Device.RuntimePlatform != Device.Windows ? "fake_product_01.png" : "Assets/fake_product_01.png" }, + new OrderItem { OrderId = Guid.NewGuid(), ProductId = Common.Common.MockCatalogItemId03, Discount = 0, ProductName = ".NET Bot Black Sweatshirt (M)", Quantity = 2, UnitPrice = 19.95M, PictureUrl = Device.RuntimePlatform != Device.Windows ? "fake_product_03.png" : "Assets/fake_product_03.png" } }; private static BasketCheckout MockBasketCheckout = new BasketCheckout() @@ -114,19 +107,9 @@ namespace eShopOnContainers.Core.Services.Order } } - public async Task> GetCardTypesAsync(string token) - { - await Task.Delay(500); - - if (!string.IsNullOrEmpty(token)) - return MockCardTypes.ToObservableCollection(); - else - return new ObservableCollection(); - } - public BasketCheckout MapOrderToBasket(Models.Orders.Order order) { - return MockBasketCheckout; + return MockBasketCheckout; } public Task CancelOrderAsync(int orderId, string token) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs index f74d6e19b..85f8c85a6 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs @@ -34,7 +34,7 @@ namespace eShopOnContainers.Core.Services.Order await _requestProvider.GetAsync>(uri, token); return orders; - + } public async Task GetOrderAsync(int orderId, string token) @@ -58,27 +58,6 @@ namespace eShopOnContainers.Core.Services.Order } } - public async Task> GetCardTypesAsync(string token) - { - try - { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint); - - builder.Path = "api/v1/orders/cardtypes"; - - string uri = builder.ToString(); - - ObservableCollection cardTypes = - await _requestProvider.GetAsync>(uri, token); - - return cardTypes; - } - catch - { - return new ObservableCollection(); - } - } - public BasketCheckout MapOrderToBasket(Models.Orders.Order order) { return new BasketCheckout() diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs index 87d41bd11..d2e9728cc 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs @@ -16,7 +16,6 @@ namespace eShopOnContainers.Core.Services.User public async Task GetUserInfoAsync(string authToken) { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.UserInfoEndpoint); string uri = builder.ToString(); @@ -25,7 +24,6 @@ namespace eShopOnContainers.Core.Services.User await _requestProvider.GetAsync(uri, authToken); return userInfo; - } } } \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml index dffc8c746..9314fb9fb 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml @@ -65,6 +65,20 @@ Value="True" /> + + + +