Dear ,
++
Thank you for shopping from our book store. We hope you had a good time with our service!
+Your order number is: #. Here is your order detail:
+Order Detail for purchase #
++ +
| Billing Details | +Payment Information | +Shipping Address | +
|---|---|---|
|
+ + + + + + |
+
+ Card Name + Visa + Card Number + Exp Date: / + |
+
+ David Peere: + + + + + |
+
Order summary
+| Item Name | +Item Price | +Item Quantity + | +Total | +
| + | ++ | ++ + | ++ | +
| + | + | + Subtotal | ++ | +
| + | + | Tax + | ++ | +
| + | + | Total + | ++ | +
+
Best,
+Le's Bookstore
+ + \ No newline at end of file diff --git a/bookstore-api/target/classes/com/bookstore/resource/CheckoutResource.class b/bookstore-api/target/classes/com/bookstore/resource/CheckoutResource.class new file mode 100644 index 0000000..7423619 Binary files /dev/null and b/bookstore-api/target/classes/com/bookstore/resource/CheckoutResource.class differ diff --git a/bookstore-api/target/classes/templates/orderConfirmationEmailTemplate.html b/bookstore-api/target/classes/templates/orderConfirmationEmailTemplate.html new file mode 100644 index 0000000..89ecbd8 --- /dev/null +++ b/bookstore-api/target/classes/templates/orderConfirmationEmailTemplate.html @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + +Dear ,
++
Thank you for shopping from our book store. We hope you had a good time with our service!
+Your order number is: #. Here is your order detail:
+Order Detail for purchase #
++ +
| Billing Details | +Payment Information | +Shipping Address | +
|---|---|---|
|
+ + + + + + |
+
+ Card Name + Visa + Card Number + Exp Date: / + |
+
+ David Peere: + + + + + |
+
Order summary
+| Item Name | +Item Price | +Item Quantity + | +Total | +
| + | ++ | ++ + | ++ | +
| + | + | + Subtotal | ++ | +
| + | + | Tax + | ++ | +
| + | + | Total + | ++ | +
+
Best,
+Le's Bookstore
+ + \ No newline at end of file diff --git a/store-front/src/app/app.module.ts b/store-front/src/app/app.module.ts index 90463fa..cb624a1 100644 --- a/store-front/src/app/app.module.ts +++ b/store-front/src/app/app.module.ts @@ -20,6 +20,7 @@ import { PaymentService } from './services/payment.service'; import { ShippingService } from './services/shipping.service'; import { BookService } from './services/book.service'; import { CartService } from './services/cart.service'; +import { CheckoutService } from './services/checkout.service'; import { MyAccountComponent } from './components/my-account/my-account.component'; import { MyProfileComponent } from './components/my-profile/my-profile.component'; @@ -27,6 +28,7 @@ import { BookListComponent } from './components/book-list/book-list.component'; import { BookDetailComponent } from './components/book-detail/book-detail.component'; import { ShoppingCartComponent } from './components/shopping-cart/shopping-cart.component'; import { OrderComponent } from './components/order/order.component'; +import { OrderSummaryComponent } from './components/order-summary/order-summary.component'; @NgModule({ declarations: [ @@ -39,7 +41,8 @@ import { OrderComponent } from './components/order/order.component'; BookListComponent, BookDetailComponent, ShoppingCartComponent, - OrderComponent + OrderComponent, + OrderSummaryComponent ], imports: [ BrowserModule, @@ -55,7 +58,8 @@ import { OrderComponent } from './components/order/order.component'; PaymentService, ShippingService, BookService, - CartService + CartService, + CheckoutService ], bootstrap: [AppComponent] }) diff --git a/store-front/src/app/app.routing.ts b/store-front/src/app/app.routing.ts index 65eb5dc..c88bada 100644 --- a/store-front/src/app/app.routing.ts +++ b/store-front/src/app/app.routing.ts @@ -11,6 +11,8 @@ import {BookListComponent} from './components/book-list/book-list.component'; import {BookDetailComponent} from './components/book-detail/book-detail.component'; import {ShoppingCartComponent} from './components/shopping-cart/shopping-cart.component'; import {OrderComponent} from './components/order/order.component'; +import { OrderSummaryComponent } from './components/order-summary/order-summary.component'; + const appRoutes: Routes = [ { @@ -45,6 +47,10 @@ const appRoutes: Routes = [ { path: 'order', component: OrderComponent + }, + { + path: 'orderSummary', + component: OrderSummaryComponent } ]; diff --git a/store-front/src/app/components/order-summary/order-summary.component.css b/store-front/src/app/components/order-summary/order-summary.component.css new file mode 100644 index 0000000..e69de29 diff --git a/store-front/src/app/components/order-summary/order-summary.component.html b/store-front/src/app/components/order-summary/order-summary.component.html new file mode 100644 index 0000000..82ef69c --- /dev/null +++ b/store-front/src/app/components/order-summary/order-summary.component.html @@ -0,0 +1,45 @@ +
+
+
+
diff --git a/store-front/src/app/components/order-summary/order-summary.component.spec.ts b/store-front/src/app/components/order-summary/order-summary.component.spec.ts
new file mode 100644
index 0000000..e4b34ab
--- /dev/null
+++ b/store-front/src/app/components/order-summary/order-summary.component.spec.ts
@@ -0,0 +1,28 @@
+/* tslint:disable:no-unused-variable */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+
+import { OrderSummaryComponent } from './order-summary.component';
+
+describe('OrderSummaryComponent', () => {
+ let component: OrderSummaryComponent;
+ let fixture: ComponentFixture
+
+
+
+ Order Summary
+
+ 
+
+
+ +
+
+
+
+
+
+
+ Thank you, your order has + been placed.
++ The estimated delivery date is {{estimatedDeliveryDate}}
+List of Items
+ +
+
+
+ +
+ 
+
+
+
+
+ {{cartItem.book.title}}
+In Stock
+Only {{cartItem.book.inStockNumber}} In Stock +
+Product Unavailable
+
+
+ ${{cartItem.book.ourPrice}} +
+
+
+ {{cartItem.qty}}
+
-
Shopping Cart
+Checkout
@@ -294,16 +294,17 @@
Choose your shipping method:
-
+
-
+
+
diff --git a/store-front/src/app/components/order/order.component.ts b/store-front/src/app/components/order/order.component.ts
index 9238e34..0717bed 100644
--- a/store-front/src/app/components/order/order.component.ts
+++ b/store-front/src/app/components/order/order.component.ts
@@ -5,6 +5,7 @@ import {Router} from "@angular/router";
import {CartService} from '../../services/cart.service';
import {ShippingService} from '../../services/shipping.service';
import {PaymentService} from '../../services/payment.service';
+import {CheckoutService} from '../../services/checkout.service';
import {CartItem} from '../../models/cart-item';
import {ShoppingCart} from '../../models/shopping-cart';
import {ShippingAddress} from '../../models/shipping-address';
@@ -14,6 +15,7 @@ import {UserBilling} from '../../models/user-billing';
import {UserShipping} from '../../models/user-shipping';
import {Payment} from '../../models/payment';
+
@Component({
selector: 'app-order',
templateUrl: './order.component.html',
@@ -38,12 +40,14 @@ export class OrderComponent implements OnInit {
private emptyShippingList: boolean = true;
private emptyPaymentList: boolean = true;
private stateList: string[] = [];
+ private shippingMethod:string;
constructor(
private router:Router,
private cartService: CartService,
private shippingService: ShippingService,
- private paymentService: PaymentService
+ private paymentService: PaymentService,
+ private checkoutService: CheckoutService
) { }
onSelect(book:Book) {
@@ -87,26 +91,26 @@ export class OrderComponent implements OnInit {
setPaymentMethod(userPayment: UserPayment) {
this.payment.type = userPayment.type;
- this.payment.cardName = userPayment.cardName;
this.payment.cardNumber = userPayment.cardNumber;
this.payment.expiryMonth = userPayment.expiryMonth;
this.payment.expiryYear = userPayment.expiryYear;
this.payment.cvc = userPayment.cvc;
this.payment.holderName = userPayment.holderName;
this.payment.defaultPayment = userPayment.defaultPayment;
- this.payment.billingAddress.billingAddressName = userPayment.userBilling.userBillingName;
- this.payment.billingAddress.billingAddressStreet1 = userPayment.userBilling.userBillingStreet1;
- this.payment.billingAddress.billingAddressStreet2 = userPayment.userBilling.userBillingStreet2;
- this.payment.billingAddress.billingAddressCity = userPayment.userBilling.userBillingCity;
- this.payment.billingAddress.billingAddressState = userPayment.userBilling.userBillingState;
- this.payment.billingAddress.billingAddressCountry = userPayment.userBilling.userBillingCountry;
- this.payment.billingAddress.billingAddressZipcode = userPayment.userBilling.userBillingZipcode;
+ this.billingAddress.billingAddressName = userPayment.userBilling.userBillingName;
+ this.billingAddress.billingAddressStreet1 = userPayment.userBilling.userBillingStreet1;
+ this.billingAddress.billingAddressStreet2 = userPayment.userBilling.userBillingStreet2;
+ this.billingAddress.billingAddressCity = userPayment.userBilling.userBillingCity;
+ this.billingAddress.billingAddressState = userPayment.userBilling.userBillingState;
+ this.billingAddress.billingAddressCountry = userPayment.userBilling.userBillingCountry;
+ this.billingAddress.billingAddressZipcode = userPayment.userBilling.userBillingZipcode;
}
setBillingAsShipping(checked:boolean){
console.log("same as shipping")
if(checked) {
+ this.billingAddress.billingAddressName = this.shippingAddress.shippingAddressName;
this.billingAddress.billingAddressStreet1 = this.shippingAddress.shippingAddressStreet1;
this.billingAddress.billingAddressStreet2 = this.shippingAddress.shippingAddressStreet2;
this.billingAddress.billingAddressCity = this.shippingAddress.shippingAddressCity;
@@ -114,6 +118,7 @@ export class OrderComponent implements OnInit {
this.billingAddress.billingAddressCountry = this.shippingAddress.shippingAddressCountry;
this.billingAddress.billingAddressZipcode = this.shippingAddress.shippingAddressZipcode;
} else {
+ this.billingAddress.billingAddressName = "";
this.billingAddress.billingAddressStreet1 = "";
this.billingAddress.billingAddressStreet2 = "";
this.billingAddress.billingAddressCity = "";
@@ -123,7 +128,23 @@ export class OrderComponent implements OnInit {
}
}
+ onSubmit(){
+ this.checkoutService.checkout(
+ this.shippingAddress,
+ this.billingAddress,
+ this.payment,
+ this.shippingMethod
+ ).subscribe(
+ res=>{
+ console.log(res.text());
+ },
+ error=>{
+ console.log(error.text());
+ }
+ );
+ this.router.navigate(['/orderSummary']);
+ }
ngOnInit() {
this.getCartItemList();
@@ -165,12 +186,12 @@ export class OrderComponent implements OnInit {
this.stateList.push(s);
}
- this.payment.billingAddress = this.billingAddress;
this.payment.type="";
this.payment.expiryMonth="";
this.payment.expiryYear="";
this.billingAddress.billingAddressState="";
this.shippingAddress.shippingAddressState="";
+ this.shippingMethod="groundShipping";
}
diff --git a/store-front/src/app/components/shopping-cart/shopping-cart.component.html b/store-front/src/app/components/shopping-cart/shopping-cart.component.html
index 71df3bd..03ad33e 100644
--- a/store-front/src/app/components/shopping-cart/shopping-cart.component.html
+++ b/store-front/src/app/components/shopping-cart/shopping-cart.component.html
@@ -1,7 +1,7 @@
diff --git a/store-front/src/app/models/billing-address.ts b/store-front/src/app/models/billing-address.ts
index 6d21f01..27ad9f2 100644
--- a/store-front/src/app/models/billing-address.ts
+++ b/store-front/src/app/models/billing-address.ts
@@ -7,4 +7,5 @@ export class BillingAddress {
public billingAddressState:string;
public billingAddressCountry:string;
public billingAddressZipcode:string;
+ public order: Order;
}
diff --git a/store-front/src/app/models/payment.ts b/store-front/src/app/models/payment.ts
index d7832ac..63d3978 100644
--- a/store-front/src/app/models/payment.ts
+++ b/store-front/src/app/models/payment.ts
@@ -3,7 +3,6 @@ import {BillingAddress} from './billing-address';
export class Payment {
public id: number;
public type: string;
- public cardName: string;
public cardNumber: string;
public expiryMonth: string;
public expiryYear: string;
diff --git a/store-front/src/app/models/shipping-address.ts b/store-front/src/app/models/shipping-address.ts
index d10392a..6c3693c 100644
--- a/store-front/src/app/models/shipping-address.ts
+++ b/store-front/src/app/models/shipping-address.ts
@@ -1,3 +1,5 @@
+import {Order} from "./order";
+
export class ShippingAddress {
public id:number;
public shippingAddressName:string;
@@ -7,4 +9,5 @@ export class ShippingAddress {
public shippingAddressState:string;
public shippingAddressCountry:string;
public shippingAddressZipcode:string;
+ public order:Order;
}
diff --git a/store-front/src/app/services/checkout.service.spec.ts b/store-front/src/app/services/checkout.service.spec.ts
new file mode 100644
index 0000000..dc932b8
--- /dev/null
+++ b/store-front/src/app/services/checkout.service.spec.ts
@@ -0,0 +1,16 @@
+/* tslint:disable:no-unused-variable */
+
+import { TestBed, async, inject } from '@angular/core/testing';
+import { CheckoutService } from './checkout.service';
+
+describe('CheckoutService', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ providers: [CheckoutService]
+ });
+ });
+
+ it('should ...', inject([CheckoutService], (service: CheckoutService) => {
+ expect(service).toBeTruthy();
+ }));
+});
diff --git a/store-front/src/app/services/checkout.service.ts b/store-front/src/app/services/checkout.service.ts
new file mode 100644
index 0000000..c5d241f
--- /dev/null
+++ b/store-front/src/app/services/checkout.service.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import {Headers, Http} from "@angular/http";
+import {AppConst} from '../constants/app-const';
+import {ShippingAddress} from '../models/shipping-address';
+import {BillingAddress} from '../models/billing-address';
+import {Payment} from '../models/payment';
+
+@Injectable()
+export class CheckoutService {
+
+ constructor(private http: Http) { }
+
+ checkout(
+ shippingAddress:ShippingAddress,
+ billingAddress:BillingAddress,
+ payment:Payment,
+ shippingMethod:string
+ ) {
+ let url = AppConst.serverPath+"/checkout/checkout";
+ let order = {
+ "shippingAddress" : shippingAddress,
+ "billingAddress" : billingAddress,
+ "payment" : payment,
+ "shippingMethod" : shippingMethod
+ }
+ let tokenHeader = new Headers ({
+ 'x-auth-token' : localStorage.getItem("xAuthToken")
+ });
+ return this.http.post(url, order, {headers : tokenHeader});
+ }
+
+}
Products
-
Checkout
+Shopping Cart
diff --git a/store-front/src/app/models/billing-address.ts b/store-front/src/app/models/billing-address.ts
index 6d21f01..27ad9f2 100644
--- a/store-front/src/app/models/billing-address.ts
+++ b/store-front/src/app/models/billing-address.ts
@@ -7,4 +7,5 @@ export class BillingAddress {
public billingAddressState:string;
public billingAddressCountry:string;
public billingAddressZipcode:string;
+ public order: Order;
}
diff --git a/store-front/src/app/models/payment.ts b/store-front/src/app/models/payment.ts
index d7832ac..63d3978 100644
--- a/store-front/src/app/models/payment.ts
+++ b/store-front/src/app/models/payment.ts
@@ -3,7 +3,6 @@ import {BillingAddress} from './billing-address';
export class Payment {
public id: number;
public type: string;
- public cardName: string;
public cardNumber: string;
public expiryMonth: string;
public expiryYear: string;
diff --git a/store-front/src/app/models/shipping-address.ts b/store-front/src/app/models/shipping-address.ts
index d10392a..6c3693c 100644
--- a/store-front/src/app/models/shipping-address.ts
+++ b/store-front/src/app/models/shipping-address.ts
@@ -1,3 +1,5 @@
+import {Order} from "./order";
+
export class ShippingAddress {
public id:number;
public shippingAddressName:string;
@@ -7,4 +9,5 @@ export class ShippingAddress {
public shippingAddressState:string;
public shippingAddressCountry:string;
public shippingAddressZipcode:string;
+ public order:Order;
}
diff --git a/store-front/src/app/services/checkout.service.spec.ts b/store-front/src/app/services/checkout.service.spec.ts
new file mode 100644
index 0000000..dc932b8
--- /dev/null
+++ b/store-front/src/app/services/checkout.service.spec.ts
@@ -0,0 +1,16 @@
+/* tslint:disable:no-unused-variable */
+
+import { TestBed, async, inject } from '@angular/core/testing';
+import { CheckoutService } from './checkout.service';
+
+describe('CheckoutService', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ providers: [CheckoutService]
+ });
+ });
+
+ it('should ...', inject([CheckoutService], (service: CheckoutService) => {
+ expect(service).toBeTruthy();
+ }));
+});
diff --git a/store-front/src/app/services/checkout.service.ts b/store-front/src/app/services/checkout.service.ts
new file mode 100644
index 0000000..c5d241f
--- /dev/null
+++ b/store-front/src/app/services/checkout.service.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import {Headers, Http} from "@angular/http";
+import {AppConst} from '../constants/app-const';
+import {ShippingAddress} from '../models/shipping-address';
+import {BillingAddress} from '../models/billing-address';
+import {Payment} from '../models/payment';
+
+@Injectable()
+export class CheckoutService {
+
+ constructor(private http: Http) { }
+
+ checkout(
+ shippingAddress:ShippingAddress,
+ billingAddress:BillingAddress,
+ payment:Payment,
+ shippingMethod:string
+ ) {
+ let url = AppConst.serverPath+"/checkout/checkout";
+ let order = {
+ "shippingAddress" : shippingAddress,
+ "billingAddress" : billingAddress,
+ "payment" : payment,
+ "shippingMethod" : shippingMethod
+ }
+ let tokenHeader = new Headers ({
+ 'x-auth-token' : localStorage.getItem("xAuthToken")
+ });
+ return this.http.post(url, order, {headers : tokenHeader});
+ }
+
+}