Skip to content

Commit c08eff1

Browse files
author
Carlos Cañizares Estévez
committed
2 parents 6f6530b + 13e659e commit c08eff1

20 files changed

Lines changed: 423 additions & 31 deletions

File tree

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public App()
2525

2626
private void InitApp()
2727
{
28-
UseMockServices = false;
28+
UseMockServices = true;
2929

3030
ViewModelLocator.Instance.UpdateDependencies(UseMockServices);
3131
}

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,18 @@ private List<OrderItem> CreateOrderItems(ObservableCollection<BasketItem> basket
161161

162162
foreach (var basketItem in basketItems)
163163
{
164-
orderItems.Add(new OrderItem
164+
if (!string.IsNullOrEmpty(basketItem.ProductName))
165165
{
166-
OrderId = null,
167-
ProductId = basketItem.ProductId,
168-
ProductName = basketItem.ProductName,
169-
PictureUrl = basketItem.PictureUrl,
170-
Quantity = basketItem.Quantity,
171-
UnitPrice = basketItem.UnitPrice
172-
});
166+
orderItems.Add(new OrderItem
167+
{
168+
OrderId = null,
169+
ProductId = basketItem.ProductId,
170+
ProductName = basketItem.ProductName,
171+
PictureUrl = basketItem.PictureUrl,
172+
Quantity = basketItem.Quantity,
173+
UnitPrice = basketItem.UnitPrice
174+
});
175+
}
173176
}
174177

175178
return orderItems;

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1818
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1919
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
20-
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
2121
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
2222
<AndroidStoreUncompressedFileExtensions />
2323
<MandroidI18n />

‎src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1717
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1818
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
19-
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
2020
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
2121
<NuGetPackageImportStamp>
2222
</NuGetPackageImportStamp>

‎src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1717
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1818
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
19-
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
2020
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
2121
<NuGetPackageImportStamp>
2222
</NuGetPackageImportStamp>

‎src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.module.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { AppService } from './app.service';
99
import { AppComponent } from './app.component';
1010
import { SharedModule } from './shared/shared.module';
1111
import { CatalogModule } from './catalog/catalog.module';
12+
import { OrdersModule } from './orders/orders.module';
1213
import { BasketModule } from './basket/basket.module';
1314

1415
@NgModule({
@@ -20,6 +21,7 @@ import { BasketModule } from './basket/basket.module';
2021
// Only module that app module loads
2122
SharedModule.forRoot(),
2223
CatalogModule,
24+
OrdersModule,
2325
BasketModule
2426
],
2527
providers: [

‎src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.routes.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ import { Routes, RouterModule } from '@angular/router';
22

33
import { BasketComponent } from './basket/basket.component';
44
import { CatalogComponent } from './catalog/catalog.component';
5+
import { OrdersComponent } from './orders/orders.component';
6+
import { OrdersDetailComponent } from './orders/orders-detail/orders-detail.component';
57

68
export const routes: Routes = [
79
{ path: '', redirectTo: 'catalog', pathMatch: 'full' },
810
{ path: 'basket', component: BasketComponent },
9-
{ path: 'catalog', component: CatalogComponent }
11+
{ path: 'catalog', component: CatalogComponent },
12+
{ path: 'orders', component: OrdersComponent },
13+
{ path: 'orders/:id', component: OrdersDetailComponent },
1014
//Lazy async modules (angular-loader-router) and enable a router in each module.
1115
//{
1216
// path: 'basket', loadChildren: '/basket/basket.module' });

‎src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.routes.ts‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.routes.ts‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<div class="esh-orders-detail-header">
2+
<ul class="container">
3+
<li class="esh-orders-detail-header-back" routerLink="/orders">Back to list</li>
4+
</ul>
5+
</div>
6+
<div class="container esh-orders-detail-container">
7+
<div class="row">
8+
<div class="col-sm-3">
9+
<span>ORDER NUMBER</span><br>
10+
<span>{{order.ordernumber}}</span>
11+
</div>
12+
<div class="col-sm-3">
13+
<span>DATE</span><br>
14+
<span>{{order.date | date:'short'}}</span>
15+
</div>
16+
<div class="col-sm-3">
17+
<span>TOTAL</span><br>
18+
<span>$ {{order.total}}</span>
19+
</div>
20+
<div class="col-sm-3">
21+
<span>STATUS</span><br>
22+
<span>{{order.status}}</span>
23+
</div>
24+
</div>
25+
<div class="row esh-orders-detail-section">
26+
<div class="col-sm-3">
27+
<span>SHIPING ADDRESS</span><br>
28+
<span>{{order.street}}</span><br>
29+
<span>{{order.city}}</span><br>
30+
<span>{{order.country}}</span><br>
31+
</div>
32+
</div>
33+
<div>
34+
<div class="row esh-orders-detail-section"><div class="col-sm-3">ORDER DETAILS</div></div>
35+
<section>
36+
<table class="table">
37+
<tbody>
38+
<tr *ngFor="let item of order.orderitems">
39+
<td class="esh-orders-detail-column"><img class="esh-orders-detail-image" src="{{item.pictureurl}}"></td>
40+
<td class="esh-orders-detail-column">{{item.productname}}</td>
41+
<td class="esh-orders-detail-column">ROSLYN</td>
42+
<td class="esh-orders-detail-column">$ {{item.unitprice}}</td>
43+
<td class="esh-orders-detail-column">{{item.units}}</td>
44+
<td class="esh-orders-detail-column esh-orders-detail-total-value">$ {{item.units * item.unitprice}}</td>
45+
</tr>
46+
</tbody>
47+
</table>
48+
</section>
49+
</div>
50+
<div class="col-md-9 col-md-3">
51+
52+
</div>
53+
<div class="col-md-3">
54+
<div class="esh-orders-detail-total">
55+
<div class="esh-orders-detail-total-label"><span>TOTAL</span></div>
56+
<div class="esh-orders-detail-total-value"><span>$ 12.00</span></div>
57+
</div>
58+
</div>
59+
</div>

0 commit comments

Comments
 (0)