latest

bookstore-api/.idea/workspace.xml

@@ -16,11 +16,11 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="PaymentResource.java" pinned="false" current-in-tab="false">
+      <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="272">
+            <state relative-caret-position="233">
-              <caret line="69" column="0" lean-forward="true" selection-start-line="69" selection-start-column="0" selection-end-line="69" selection-end-column="0" />
+              <caret line="60" column="12" lean-forward="true" selection-start-line="60" selection-start-column="12" selection-end-line="74" selection-end-column="65" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -28,16 +28,36 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UserServiceImpl.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="UserServiceImpl.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/service/impl/UserServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
+            <state relative-caret-position="-765">
               <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="LoginResource.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="647">
+              <caret line="71" column="33" lean-forward="false" selection-start-line="71" selection-start-column="33" selection-end-line="71" selection-end-column="33" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="197">
+              <caret line="88" column="12" lean-forward="false" selection-start-line="88" selection-start-column="12" selection-end-line="88" selection-end-column="80" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -894,12 +914,12 @@
       <workItem from="1486538831944" duration="450000" />
       <workItem from="1488378219247" duration="650000" />
       <workItem from="1488461561430" duration="18419000" />
-      <workItem from="1488731165185" duration="19048000" />
+      <workItem from="1488731165185" duration="19617000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="81060000" />
+    <option name="totallyTimeSpent" value="81629000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="82" y="23" width="1280" height="797" extended-state="0" />
@@ -1168,24 +1188,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="870">
-          <caret line="71" column="33" lean-forward="false" selection-start-line="71" selection-start-column="33" selection-end-line="71" selection-end-column="33" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#2400#2401#0" expanded="false" />
-            <element signature="e#2445#2446#0" expanded="false" />
-            <element signature="e#2503#2504#0" expanded="false" />
-            <element signature="e#2532#2533#0" expanded="false" />
-            <element signature="e#2605#2606#0" expanded="false" />
-            <element signature="e#2644#2645#0" expanded="false" />
-            <element signature="e#2752#2753#0" expanded="false" />
-            <element signature="e#2825#2826#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/BookstoreApplication.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
@@ -1254,14 +1256,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="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">
@@ -1294,23 +1288,39 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/service/impl/UserServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-765">
+          <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="647">
+          <caret line="71" column="33" lean-forward="false" selection-start-line="71" selection-start-column="33" selection-end-line="71" selection-end-column="33" />
+          <folding />
+        </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="197">
+          <caret line="88" column="12" lean-forward="false" selection-start-line="88" selection-start-column="12" selection-end-line="88" selection-end-column="80" />
+          <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="272">
+        <state relative-caret-position="233">
-          <caret line="69" column="0" lean-forward="true" selection-start-line="69" selection-start-column="0" selection-end-line="69" selection-end-column="0" />
+          <caret line="60" column="12" lean-forward="true" selection-start-line="60" selection-start-column="12" selection-end-line="74" selection-end-column="65" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/service/impl/UserServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>

bookstore-api/src/main/java/com/bookstore/resource/PaymentResource.java

@@ -43,8 +43,40 @@ public class PaymentResource {
         userService.updateUserBilling(userBilling, userPayment, user);
 
         return new ResponseEntity("Payment Added(Updated) Successfully!", HttpStatus.OK);
+    }
+
+    @RequestMapping("/update")
+    public ResponseEntity updateCreditCard(
+            @RequestBody String id, Principal principal,
+            Model model
+    ) {
+
+        User user = userService.findByUsername(principal.getName());
+        UserPayment userPayment = userPaymentService.findById(Long.parseLong(id));
+
+        if (user.getId()!=userPayment.getUser().getId()) {
+            return new ResponseEntity("Invalid Request", HttpStatus.BAD_REQUEST);
+        } else {
+
+            model.addAttribute("user", user);
+            UserBilling userBilling = userPayment.getUserBilling();
+            model.addAttribute("userPayment", userPayment);
+            model.addAttribute("userBilling", userBilling);
+
+            List<String> stateList = USConstants.listOfUSStatesCode;
+            Collections.sort(stateList);
+            model.addAttribute("stateList", stateList);
+
+            model.addAttribute("addNewCreditCard", true);
+            model.addAttribute("classActiveBilling", true);
+            model.addAttribute("listOfShippingAddresses", true);
+            model.addAttribute("userPaymentList", user.getUserPaymentList());
+            model.addAttribute("userShippingList", user.getUserShippingList());
+            model.addAttribute("orderList", user.getOrderList());
 
 
+            return new ResponseEntity("Payment Added(Updated) Successfully!", HttpStatus.OK);
+        }
     }
 
     @RequestMapping(value = "/remove", method = RequestMethod.POST)

store-front/src/app/components/my-profile/my-profile.component.html

@@ -73,7 +73,7 @@
                                 <br>
                                 <br>
                                 <div>
-                                    <md-tab-group [selectedIndex]="selectedBillingTab">
+                                    <md-tab-group (selectedIndexChange)="selectedIndexChange($event)"  [selectedIndex]="selectedBillingTab">
                                         <md-tab label="List of Credit Cards">
                                             <form (ngSubmit)="setDefaultPayment()" method="post">
                                                 <table class="table">
@@ -92,7 +92,7 @@
                                                             </td>
                                                             <td>{{userPayment.cardName}}</td>
                                                             <td>
-                                                                <a md-button><i
+                                                                <a md-button (click)="onUpdatePayment(userPayment)"><i
                                                             class="fa fa-pencil"></i></a>
                                                                 <a md-button (click)="onRemovePayment(userPayment.id)"><i
                                                             class="fa fa-times"></i></a>
@@ -196,15 +196,15 @@
                                                                         <option value="" disabled="disabled">
                                                                             --Month--
                                                                         </option>
-                                                                        <option value="01">Jan (01)</option>
+                                                                        <option value="1">Jan (01)</option>
-                                                                        <option value="02">Feb (02)</option>
+                                                                        <option value="2">Feb (02)</option>
-                                                                        <option value="03">Mar (03)</option>
+                                                                        <option value="3">Mar (03)</option>
-                                                                        <option value="04">Apr (04)</option>
+                                                                        <option value="4">Apr (04)</option>
-                                                                        <option value="05">May (05)</option>
+                                                                        <option value="5">May (05)</option>
-                                                                        <option value="06">June (06)</option>
+                                                                        <option value="6">June (06)</option>
-                                                                        <option value="07">July (07)</option>
+                                                                        <option value="7">July (07)</option>
-                                                                        <option value="08">Aug (08)</option>
+                                                                        <option value="8">Aug (08)</option>
-                                                                        <option value="09">Sep (09)</option>
+                                                                        <option value="9">Sep (09)</option>
                                                                         <option value="10">Oct (10)</option>
                                                                         <option value="11">Nov (11)</option>
                                                                         <option value="12">Dec (12)</option>

store-front/src/app/components/my-profile/my-profile.component.ts

@@ -44,6 +44,10 @@ export class MyProfileComponent implements OnInit {
   constructor (private paymentService:PaymentService, private loginService: LoginService, private userService: UserService, private router: Router){
   }
 
+  selectedIndexChange(val :number ){
+    this.selectedBillingTab=val;
+  }
+
   onLogin() {
     this.loginService.sendCredential(this.credential.username, this.credential.password).subscribe(
       res=>{
@@ -107,6 +111,12 @@ export class MyProfileComponent implements OnInit {
       );
   }
 
+  onUpdatePayment(payment:UserPayment) {
+    this.userPayment = payment;
+    this.userBilling = payment.userBilling;
+    this.selectedBillingTab=1;
+  }
+
   onRemovePayment(id:number) {
     this.paymentService.removePayment(id).subscribe(
       res => {