bug fixing and design issues

src/app/purchase/addaddress/addaddress.component.ts

@@ -42,12 +42,6 @@ export class AddaddressComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.prdtData = JSON.parse(this.webService.getLocalStorageItem('productDetails'));
-    this.subjectService.getLoginData().subscribe(loginData => {
-      this.loginDetails = JSON.parse(this.webService.getLocalStorageItem('userData'));
-    });
-    this.checkProductId(this.prdtData['product_id']);
-
     this.route.params.subscribe(val => {
       this.route.queryParams.subscribe(params => {
         this.address_id = params['address_id'];
@@ -56,6 +50,9 @@ export class AddaddressComponent implements OnInit {
     if(this.address_id != ''){
       this.getUserAddressById(this.address_id);
     }
+    
+    this.checkUserLogin();
+    this.checkProductId();
     this.buildAddressForm();
   }
 
@@ -72,14 +69,34 @@ export class AddaddressComponent implements OnInit {
     });
   }
 
-  checkProductId(product_id){
-    if(product_id > 0){
-      this.product_id = product_id;
+  // checkProductId(product_id){
+  //   if(product_id > 0){
+  //     this.product_id = product_id;
+  //   }else{
+  //     this.goToPage('purchaseHome','');
+  //   }
+  // }
+
+  checkProductId(){
+    this.prdtData = JSON.parse(this.webService.getLocalStorageItem('productDetails'));
+  
+    if(this.prdtData && this.prdtData['product_id'] > 0){
+      this.product_id = this.prdtData['product_id'];
     }else{
       this.goToPage('purchaseHome','');
     }
   }
 
+  checkUserLogin(){
+    this.loginDetails = JSON.parse(this.webService.getLocalStorageItem('userData'));
+    if(!this.loginDetails){
+      this.goToPage('purchaseHome','');
+    }
+    this.subjectService.getLoginData().subscribe(loginData => {
+      this.loginDetails = JSON.parse(this.webService.getLocalStorageItem('userData'));
+    });
+  }
+
   addressFormSubmit(data){
     if(this.addaddressForm.invalid){
       return false;

src/app/purchase/address/address.component.html

@@ -25,7 +25,7 @@
           </ng-template>
           <div class="row">
             <div class="col-md-6">
-                <h2>$ {{prdtData.total_amount}}</h2>
+                <h2 *ngIf="prdtData">$ {{prdtData.total_amount}}</h2>
                 <!-- <h5>Delivery expected by Thur 1 May 2019</h5>  -->
                 
             </div>

src/app/purchase/orders/orders.component.html

@@ -60,7 +60,7 @@
               <h5>{{prdt.product_name}}</h5>
               <p>{{prdt.short_description}}</p>
               <div class="star_ratting">
-                  <fieldset class="rating"  *ngIf="prdt.rating > 0">
+                  <fieldset class="rating prevent-click">
                     <input type="radio" [checked]="(prdt.rating >= 4.75) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_5'" [attr.name]="'thirdStarName_'+prdt.product_id" value="5" /><label class = "full" for="thirdStar5"></label>
                     <input type="radio" [checked]="(prdt.rating >= 4.25 && prdt.rating < 4.75) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_4half'" [attr.name]="'thirdStarName_'+prdt.product_id" value="4.5" /><label class="half" for="thirdStar4half"></label>
                     <input type="radio" [checked]="(prdt.rating >= 3.75 && prdt.rating < 4.25) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_4'" [attr.name]="'thirdStarName_'+prdt.product_id" value="4" /><label class = "full" for="thirdStar4"></label>
@@ -70,11 +70,11 @@
                     <input type="radio" [checked]="(prdt.rating >= 1.75 && prdt.rating < 2.25) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_2'" [attr.name]="'thirdStarName_'+prdt.product_id" value="2" /><label class = "full" for="thirdStar2"></label>
                     <input type="radio" [checked]="(prdt.rating >= 1.25 && prdt.rating < 1.75) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_1half'" [attr.name]="'thirdStarName_'+prdt.product_id" value="1.5" /><label class="half" for="thirdStar1half"></label>
                     <input type="radio" [checked]="(prdt.rating >= 0.75 && prdt.rating < 1.25) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_1'" [attr.name]="'thirdStarName_'+prdt.product_id" value="1" /><label class = "full" for="thirdStar1"></label>
-                    <input type="radio" [checked]="(prdt.rating < 0.75) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_half'" [attr.name]="'thirdStarName_'+prdt.product_id" value="0.5" /><label class="half" for="thirdStarhalf"></label>
+                    <input type="radio" [checked]="(prdt.rating < 0.75 && prdt.rating >= 0.25) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_half'" [attr.name]="'thirdStarName_'+prdt.product_id" value="0.5" /><label class="half" for="thirdStarhalf"></label>
                   </fieldset>
                   <span class="floatRight">$ {{prdt.amount}}</span>
                   <div class="clear"></div>
-                  <p>{{prdt.reviews}}  Reviews</p>
+                  <p>{{(prdt.reviews > 0)?prdt.reviews+' Reviews':'Be the first one to review.'}}</p>
               </div>
           </div>
       </li>

src/app/purchase/orders/orders.component.ts

@@ -41,9 +41,15 @@ export class OrdersComponent implements OnInit {
   
   checkUserLogin(){
     this.loginDetails = JSON.parse(this.webService.getLocalStorageItem('userData'));
+    if(!this.loginDetails){
+      this.goToPage('purchaseHome','');
+    }
   }
 
   getMyOrders(){
+    if(!this.loginDetails){
+      this.goToPage('purchaseHome','');
+    }
     this.loader = true;
     this.webService.post_data('getMyOrders',{"customer_id":this.loginDetails.customer_id,'page':this.page}).subscribe(response => {
       if(response.status == 'success'){

src/app/purchase/productdetails/productdetails.component.html

@@ -32,7 +32,7 @@
                           <input type="radio" [checked]="(productDetails.rating >= 1.75 && productDetails.rating < 2.25) ? 'true':''" id="firstStar2" name="firstRating" value="2" /><label class = "full" for="firstStar2"></label>
                           <input type="radio" [checked]="(productDetails.rating >= 1.25 && productDetails.rating < 1.75) ? 'true':''" id="firstStar1half" name="firstRating" value="1.5" /><label class="half" for="firstStar1half"></label>
                           <input type="radio" [checked]="(productDetails.rating >= 0.75 && productDetails.rating < 1.25) ? 'true':''" id="firstStar1" name="firstRating" value="1" /><label class = "full" for="firstStar1"></label>
-                          <input type="radio" [checked]="(productDetails.rating < 0.75) ? 'true':''" id="firstStarhalf" name="firstRating" value="0.5" /><label class="half" for="firstStarhalf"></label>
+                          <input type="radio" [checked]="(productDetails.rating < 0.75 && productDetails.rating >= 0.25) ? 'true':''" id="firstStarhalf" name="firstRating" value="0.5" /><label class="half" for="firstStarhalf"></label>
                       </fieldset>
                       <div class="clear"></div>
                   </div>
@@ -65,7 +65,7 @@
                                 <input type="radio" [checked]="(productDetails.rating >= 1.75 && productDetails.rating < 2.25) ? 'true':''" id="secondStar2" name="secondRating" value="2" /><label class = "full" for="secondStar2"></label>
                                 <input type="radio" [checked]="(productDetails.rating >= 1.25 && productDetails.rating < 1.75) ? 'true':''" id="secondStar1half" name="secondRating" value="1.5" /><label class="half" for="secondStar1half"></label>
                                 <input type="radio" [checked]="(productDetails.rating >= 0.75 && productDetails.rating < 1.25) ? 'true':''" id="secondStar1" name="secondRating" value="1" /><label class = "full" for="secondStar1"></label>
-                                <input type="radio" [checked]="(productDetails.rating < 0.75) ? 'true':''" id="secondStarhalf" name="secondRating" value="0.5" /><label class="half" for="secondStarhalf"></label>
+                                <input type="radio" [checked]="(productDetails.rating < 0.75 && productDetails.rating >= 0.25) ? 'true':''" id="secondStarhalf" name="secondRating" value="0.5" /><label class="half" for="secondStarhalf"></label>
                             </fieldset>
                         <div class="clear"></div>
                     </div>
@@ -90,7 +90,7 @@
                                     <input type="radio" [checked]="(revws.rating >= 1.75 && revws.rating < 2.25) ? 'true':''" [attr.id]="'usrReviewId_'+revws.id+'_2'" [attr.name]="'usrReviewName_'+revws.id" value="2" /><label class = "full" for="secondStar2"></label>
                                     <input type="radio" [checked]="(revws.rating >= 1.25 && revws.rating < 1.75) ? 'true':''" [attr.id]="'usrReviewId_'+revws.id+'_1half'" [attr.name]="'usrReviewName_'+revws.id" value="1.5" /><label class="half" for="secondStar1half"></label>
                                     <input type="radio" [checked]="(revws.rating >= 0.75 && revws.rating < 1.25) ? 'true':''" [attr.id]="'usrReviewId_'+revws.id+'_1'" [attr.name]="'usrReviewName_'+revws.id" value="1" /><label class = "full" for="secondStar1"></label>
-                                    <input type="radio" [checked]="(revws.rating < 0.75) ? 'true':''" [attr.id]="'usrReviewId_'+revws.id+'_half'" [attr.name]="'usrReviewName_'+revws.id" value="0.5" /><label class="half" for="secondStarhalf"></label>
+                                    <input type="radio" [checked]="(revws.rating < 0.75 && revws.rating >= 0.25) ? 'true':''" [attr.id]="'usrReviewId_'+revws.id+'_half'" [attr.name]="'usrReviewName_'+revws.id" value="0.5" /><label class="half" for="secondStarhalf"></label>
                                 </fieldset>
                               </div>
                               <div class="clear"></div>
@@ -117,8 +117,8 @@
               </div>
               <h5>{{prdt.product_name}}</h5>
               <p>{{prdt.short_description}}</p>
-              <div class="star_ratting">
-                  <fieldset class="rating"  *ngIf="prdt.rating > 0">
+              <div class="star_ratting prevent-click">
+                  <fieldset class="rating">
                     <input type="radio" [checked]="(prdt.rating >= 4.75) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_5'" [attr.name]="'thirdStarName_'+prdt.product_id" value="5" /><label class = "full" for="thirdStar5"></label>
                     <input type="radio" [checked]="(prdt.rating >= 4.25 && prdt.rating < 4.75) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_4half'" [attr.name]="'thirdStarName_'+prdt.product_id" value="4.5" /><label class="half" for="thirdStar4half"></label>
                     <input type="radio" [checked]="(prdt.rating >= 3.75 && prdt.rating < 4.25) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_4'" [attr.name]="'thirdStarName_'+prdt.product_id" value="4" /><label class = "full" for="thirdStar4"></label>
@@ -128,11 +128,11 @@
                     <input type="radio" [checked]="(prdt.rating >= 1.75 && prdt.rating < 2.25) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_2'" [attr.name]="'thirdStarName_'+prdt.product_id" value="2" /><label class = "full" for="thirdStar2"></label>
                     <input type="radio" [checked]="(prdt.rating >= 1.25 && prdt.rating < 1.75) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_1half'" [attr.name]="'thirdStarName_'+prdt.product_id" value="1.5" /><label class="half" for="thirdStar1half"></label>
                     <input type="radio" [checked]="(prdt.rating >= 0.75 && prdt.rating < 1.25) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_1'" [attr.name]="'thirdStarName_'+prdt.product_id" value="1" /><label class = "full" for="thirdStar1"></label>
-                    <input type="radio" [checked]="(prdt.rating < 0.75) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_half'" [attr.name]="'thirdStarName_'+prdt.product_id" value="0.5" /><label class="half" for="thirdStarhalf"></label>
+                    <input type="radio" [checked]="(prdt.rating < 0.75 && prdt.rating >= 0.25) ? 'true':''" [attr.id]="'thirdStar_'+prdt.product_id+'_half'" [attr.name]="'thirdStarName_'+prdt.product_id" value="0.5" /><label class="half" for="thirdStarhalf"></label>
                   </fieldset>
                   <span class="floatRight">$ {{prdt.amount}}</span>
                   <div class="clear"></div>
-                  <p>{{prdt.reviews}} Reviews</p>
+                  <p>{{(prdt.reviews > 0)?prdt.reviews+' Reviews':'Be the first one to review.'}}</p>
               </div>
           </div>
       </li>

src/app/purchase/productdetails/productdetails.component.ts

@@ -88,7 +88,6 @@ export class ProductdetailsComponent implements OnInit {
         this.productDetails = response.data;
         this.reviewArray = response.data.reviews.data;
         this.total_page = response.data.reviews.meta.total_pages;
-        console.log(response.data)
         if(this.productDetails.images.length > 0){
           thisObj.productDetails.images.forEach(function (data) {
             image = thisObj.imageServer + data.image;

src/app/purchase/purchase-home/purchase-home.component.html

@@ -30,7 +30,7 @@
                                     <h5>{{prdt.product_name}}</h5>
                                     <p>{{prdt.short_description}}</p>
                                     <div class="star_ratting">
-                                        <fieldset class="rating" *ngIf="prdt.rating > 0">
+                                        <fieldset class="rating prevent-click">
                                             <input type="radio" [checked]="(prdt.rating >= 4.75) ? 'true':''" [attr.id]="'usrStar_'+prdt.product_id+'_5'" [attr.name]="'usrStarName_'+prdt.product_id" value="5" /><label class = "full" for="secondStar5"></label>
                                             <input type="radio" [checked]="(prdt.rating >= 4.25 && prdt.rating < 4.75) ? 'true':''" [attr.id]="'usrStar_'+prdt.product_id+'_4half'" [attr.name]="'usrStarName_'+prdt.product_id" value="4.5" /><label class="half" for="secondStar4half"></label>
                                             <input type="radio" [checked]="(prdt.rating >= 3.75 && prdt.rating < 4.25) ? 'true':''" [attr.id]="'usrStar_'+prdt.product_id+'_4'" [attr.name]="'usrStarName_'+prdt.product_id" value="4" /><label class = "full" for="secondStar4"></label>
@@ -40,11 +40,11 @@
                                             <input type="radio" [checked]="(prdt.rating >= 1.75 && prdt.rating < 2.25) ? 'true':''" [attr.id]="'usrStar_'+prdt.product_id+'_2'" [attr.name]="'usrStarName_'+prdt.product_id" value="2" /><label class = "full" for="secondStar2"></label>
                                             <input type="radio" [checked]="(prdt.rating >= 1.25 && prdt.rating < 1.75) ? 'true':''" [attr.id]="'usrStar_'+prdt.product_id+'_1half'" [attr.name]="'usrStarName_'+prdt.product_id" value="1.5" /><label class="half" for="secondStar1half"></label>
                                             <input type="radio" [checked]="(prdt.rating >= 0.75 && prdt.rating < 1.25) ? 'true':''" [attr.id]="'usrStar_'+prdt.product_id+'_1'" [attr.name]="'usrStarName_'+prdt.product_id" value="1" /><label class = "full" for="secondStar1"></label>
-                                            <input type="radio" [checked]="(prdt.rating < 0.75) ? 'true':''" [attr.id]="'usrStar_'+prdt.product_id+'_half'" [attr.name]="'usrStarName_'+prdt.product_id" value="0.5" /><label class="half" for="secondStarhalf"></label>
+                                            <input type="radio" [checked]="(prdt.rating < 0.75 && prdt.rating >= 0.25) ? 'true':''" [attr.id]="'usrStar_'+prdt.product_id+'_half'" [attr.name]="'usrStarName_'+prdt.product_id" value="0.5" /><label class="half" for="secondStarhalf"></label>
                                         </fieldset>
                                         <span class="floatRight">$ {{prdt.amount}}</span>
                                         <div class="clear"></div>
-                                        <p>{{prdt.reviews}} Reviews</p>
+                                        <p>{{(prdt.reviews > 0)?prdt.reviews+' Reviews':'Be the first one to review.'}}</p>
                                     </div>
                                 </div>
                             </li>
@@ -71,7 +71,7 @@
                                 <h5>{{prdt.product_name}}</h5>
                                 <p>{{prdt.short_description}}</p>
                                 <div class="star_ratting">
-                                    <fieldset class="rating" *ngIf="prdt.rating > 0">
+                                    <fieldset class="rating prevent-click">
                                         <input type="radio" [checked]="(prdt.rating >= 4.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_5'" [attr.name]="'usrReviewName_'+prdt.product_id" value="5" /><label class = "full" for="secondStar5"></label>
                                         <input type="radio" [checked]="(prdt.rating >= 4.25 && prdt.rating < 4.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_4half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="4.5" /><label class="half" for="secondStar4half"></label>
                                         <input type="radio" [checked]="(prdt.rating >= 3.75 && prdt.rating < 4.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_4'" [attr.name]="'usrReviewName_'+prdt.product_id" value="4" /><label class = "full" for="secondStar4"></label>
@@ -81,11 +81,11 @@
                                         <input type="radio" [checked]="(prdt.rating >= 1.75 && prdt.rating < 2.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_2'" [attr.name]="'usrReviewName_'+prdt.product_id" value="2" /><label class = "full" for="secondStar2"></label>
                                         <input type="radio" [checked]="(prdt.rating >= 1.25 && prdt.rating < 1.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_1half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="1.5" /><label class="half" for="secondStar1half"></label>
                                         <input type="radio" [checked]="(prdt.rating >= 0.75 && prdt.rating < 1.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_1'" [attr.name]="'usrReviewName_'+prdt.product_id" value="1" /><label class = "full" for="secondStar1"></label>
-                                        <input type="radio" [checked]="(prdt.rating < 0.75) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="0.5" /><label class="half" for="secondStarhalf"></label>
+                                        <input type="radio" [checked]="(prdt.rating < 0.75 && prdt.rating >= 0.25) ? 'true':''" [attr.id]="'usrReviewId_'+prdt.product_id+'_half'" [attr.name]="'usrReviewName_'+prdt.product_id" value="0.5" /><label class="half" for="secondStarhalf"></label>
                                     </fieldset>
                                     <span class="floatRight">$ {{prdt.amount}}</span>
                                     <div class="clear"></div>
-                                    <p>{{prdt.reviews}} Reviews</p>
+                                    <p>{{(prdt.reviews > 0)?prdt.reviews+' Reviews':'Be the first one to review.'}}</p>
                                 </div>
                             </div>
                         </li>

src/app/purchase/summary/summary.component.ts

@@ -76,7 +76,6 @@ export class SummaryComponent implements OnInit {
     this.webService.post_data('SingleProductSearch',{'product_id':this.product_id}).subscribe(response => {
       if(response.status == 'success'){
         this.productDetails = response.data;
-        console.log(this.productDetails)
       }else{
         this.productDetails = false;
       }

src/app/purchase/track/track.component.ts

@@ -126,7 +126,6 @@ export class TrackComponent implements OnInit {
           const thisObj = this;
           this.orderDetails = response.data;
           this.userReviewed = (this.orderDetails.review_id <= 0 && (this.orderDetails.odr_status == '5' || this.orderDetails.odr_status == '6' || this.orderDetails.odr_status == '7'))?false:true;
-          console.log(this.userReviewed);
           if(this.orderDetails.images.length > 0){
             thisObj.orderDetails.images.forEach(function (data) {
               image = thisObj.imageServer + data.image;