This commit is contained in:
Le Deng
2017-03-08 11:22:28 -05:00
parent b1260fc682
commit 630d626613
7 changed files with 220 additions and 33 deletions

View File

@@ -19,14 +19,26 @@
<file leaf-file-name="UserResource.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/UserResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="182" column="0" lean-forward="false" selection-start-line="182" selection-start-column="0" selection-end-line="182" selection-end-column="0" />
<state relative-caret-position="368">
<caret line="99" column="0" lean-forward="false" selection-start-line="99" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShoppingCart.java" pinned="false" current-in-tab="true">
<file leaf-file-name="PaymentResource.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="353">
<caret line="48" column="33" lean-forward="false" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShoppingCart.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/ShoppingCart.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
@@ -49,7 +61,7 @@
<file leaf-file-name="BookResource.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/BookResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="787">
<state relative-caret-position="1200">
<caret line="124" column="5" lean-forward="true" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="5" />
<folding />
</state>
@@ -134,6 +146,7 @@
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/BookResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/UserResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/ShoppingCart.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java" />
</list>
</option>
</component>
@@ -930,12 +943,12 @@
<workItem from="1486538831944" duration="450000" />
<workItem from="1488378219247" duration="650000" />
<workItem from="1488461561430" duration="18419000" />
<workItem from="1488731165185" duration="13962000" />
<workItem from="1488731165185" duration="15175000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="75974000" />
<option name="totallyTimeSpent" value="77187000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="797" extended-state="0" />
@@ -998,14 +1011,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/config/SecurityConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/config/RequestFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
@@ -1328,22 +1333,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/BookResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="787">
<caret line="124" column="5" lean-forward="true" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/UserResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="182" column="0" lean-forward="false" selection-start-line="182" selection-start-column="0" selection-end-line="182" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/ShoppingCart.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
@@ -1352,5 +1341,31 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/BookResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1200">
<caret line="124" column="5" lean-forward="true" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/UserResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="99" column="0" lean-forward="false" selection-start-line="99" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="353">
<caret line="48" column="33" lean-forward="false" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

View File

@@ -0,0 +1,63 @@
package com.bookstore.resource;
import com.bookstore.domain.User;
import com.bookstore.domain.UserBilling;
import com.bookstore.domain.UserPayment;
import com.bookstore.service.UserService;
import com.bookstore.utility.USConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
/**
* Created by z00382545 on 3/8/17.
*/
@RestController
@RequestMapping("/payment")
public class PaymentResource {
@Autowired
private UserService userService;
@RequestMapping("/listOfCreditCards")
public String listOfCreditCards(
Model model, Principal principal, HttpServletRequest request
) {
User user = userService.findByUsername(principal.getName());
model.addAttribute("user", user);
model.addAttribute("userPaymentList", user.getUserPaymentList());
model.addAttribute("userShippingList", user.getUserShippingList());
model.addAttribute("orderList", user.getOrderList());
model.addAttribute("listOfCreditCards", true);
model.addAttribute("classActiveBilling", true);
model.addAttribute("listOfShippingAddresses", true);
return "myProfile";
}
@RequestMapping(value = "/add", method = RequestMethod.POST)
public ResponseEntity addNewCreditCardPost(
@RequestBody HashMap<String, Object> mapper,
Principal principal, Model model) {
User user = userService.findByUsername(principal.getName());
UserPayment userPayment = (UserPayment) mapper.get("userPayment");
UserBilling userBilling = (UserBilling) mapper.get("userBilling");
userService.updateUserBilling(userBilling, userPayment, user);
return new ResponseEntity("Payment Added(Updated) Successfully!", HttpStatus.OK);
}
}

View File

@@ -159,7 +159,7 @@
</div>
<div class="row">
<div class="col-xs-12">
<img src="/image/creditcard.png" class="img-responsive" />
<img src="../../../assets/image/creditcard.png" class="img-responsive" />
<br/>
<div class="form-group">
<label for="cardType">* Select Card Type:</label>

View File

@@ -31,7 +31,9 @@ export class MyProfileComponent implements OnInit {
private user: User = new User();
private userPayment: UserPayment = new UserPayment();
private userBilling: UserBilling = new UserBilling();
private userBilling: UserBilling = new UserBilling();
private userPaymentList: UserPayment[] = [];
private stateList: string[] = [];
constructor (private loginService: LoginService, private userService: UserService, private router: Router){
}
@@ -102,11 +104,15 @@ export class MyProfileComponent implements OnInit {
res => {
console.log(res.json());
this.user=res.json();
this.userPaymentList = this.user.userPaymentList;
},
error => {
console.log(error);
}
);
for (let s in AppConst.usStates) {
this.stateList.push(s);
}
}
}

View File

@@ -1,3 +1,76 @@
export class AppConst {
export class AppConst implements OnInit {
public static serverPath='http://127.0.0.1:8181';
public static usStates = {
"AL": "Alabama",
"AK": "Alaska",
"AS": "American Samoa",
"AZ": "Arizona",
"AR": "Arkansas",
"CA": "California",
"CO": "Colorado",
"CT": "Connecticut",
"DE": "Delaware",
"DC": "District Of Columbia",
"FM": "Federated States Of Micronesia",
"FL": "Florida",
"GA": "Georgia",
"GU": "Guam",
"HI": "Hawaii",
"ID": "Idaho",
"IL": "Illinois",
"IN": "Indiana",
"IA": "Iowa",
"KS": "Kansas",
"KY": "Kentucky",
"LA": "Louisiana",
"ME": "Maine",
"MH": "Marshall Islands",
"MD": "Maryland",
"MA": "Massachusetts",
"MI": "Michigan",
"MN": "Minnesota",
"MS": "Mississippi",
"MO": "Missouri",
"MT": "Montana",
"NE": "Nebraska",
"NV": "Nevada",
"NH": "New Hampshire",
"NJ": "New Jersey",
"NM": "New Mexico",
"NY": "New York",
"NC": "North Carolina",
"ND": "North Dakota",
"MP": "Northern Mariana Islands",
"OH": "Ohio",
"OK": "Oklahoma",
"OR": "Oregon",
"PW": "Palau",
"PA": "Pennsylvania",
"PR": "Puerto Rico",
"RI": "Rhode Island",
"SC": "South Carolina",
"SD": "South Dakota",
"TN": "Tennessee",
"TX": "Texas",
"UT": "Utah",
"VT": "Vermont",
"VI": "Virgin Islands",
"VA": "Virginia",
"WA": "Washington",
"WV": "West Virginia",
"WI": "Wisconsin",
"WY": "Wyoming"
}
constructor () {
console.log("test");
for (let s in this.usStates) {
this.stateList.push(s);
console.log(s);
}
}
ngOnInit() {
}
}

View File

@@ -0,0 +1,16 @@
/* tslint:disable:no-unused-variable */
import { TestBed, async, inject } from '@angular/core/testing';
import { PaymentService } from './payment.service';
describe('PaymentService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [PaymentService]
});
});
it('should ...', inject([PaymentService], (service: PaymentService) => {
expect(service).toBeTruthy();
}));
});

View File

@@ -0,0 +1,14 @@
import { Injectable } from '@angular/core';
import {AppConst} from '../constants/app-const';
import {Http, Headers} from '@angular/http';
@Injectable()
export class PaymentService {
private serverPath:string = AppConst.serverPath;
constructor(private http:Http) { }
getUserPaymentlist() {
}
}