From bf178b8539c048a193dec3e7f17ce164ca9ab371 Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Sun, 2 Sep 2018 11:48:37 +0530
Subject: [PATCH 01/14] type specific fixes

---
 src/app/app.component.scss                    |   8 +-
 .../add-address/add-address.component.html    |   2 -
 .../checkout/address/address.component.html   |   8 +-
 .../payment-modes-list.component.ts           | 119 ++++++++++--------
 src/app/checkout/reducers/selectors.ts        |   4 +-
 src/app/core/services/product.service.ts      | 119 ++++++++++++++----
 .../core/services/variant-parser.service.ts   |   2 -
 .../category-page/category-page.component.ts  |  10 +-
 .../content-header.component.html             |   6 +-
 .../content-header.component.ts               |  13 +-
 src/app/home/content/content.ts               |   5 +-
 src/app/home/home.component.html              |   2 +-
 src/app/home/home.component.ts                |   4 +
 .../lp-banner/lp-banner.component.scss        |   2 +-
 src/app/layout/header/header.component.scss   |  38 +++---
 15 files changed, 212 insertions(+), 130 deletions(-)

diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index d990e4dd..e8f85a9d 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -3,13 +3,15 @@
   min-height: 100vh;
   display: block;
   .main-body {
-    margin-top: 50px;
+    @media screen and (min-width: 768px) {
+      margin-top: 50px;
+    }
   }
 }
 
 .issearchopen :host /deep/ .main-body {
-  @media screen and(min-width: 320px) and(max-width: 768px) {
-    margin-top: 48px;
+  @media screen and (min-width: 320px) and(max-width: 768px) {
+    margin-top: 45px;
   }
 }
 
diff --git a/src/app/checkout/address/add-address/add-address.component.html b/src/app/checkout/address/add-address/add-address.component.html
index 647a1b58..e4532d12 100644
--- a/src/app/checkout/address/add-address/add-address.component.html
+++ b/src/app/checkout/address/add-address/add-address.component.html
@@ -10,8 +10,6 @@
 </form>
 <form class="form" [formGroup]="addressForm" (ngSubmit)="onSubmit()">
   <div class="row">
-
-
     <div class="form-group col-sm-6">
       <label>Pin Code
         <span class="required">*</span>
diff --git a/src/app/checkout/address/address.component.html b/src/app/checkout/address/address.component.html
index f0690ba4..f9e459a8 100644
--- a/src/app/checkout/address/address.component.html
+++ b/src/app/checkout/address/address.component.html
@@ -1,6 +1,6 @@
-<div class="address-section col-12 col-md-8 col-lg-8">
+<div *ngIf="shipAddress$ | async; let shipAddress" class="address-section col-12 col-md-8 col-lg-8">
 	<div *ngIf=!editAddress>
-		<div *ngIf="shipAddress$ | async; let shipAddress" class="row m-0">
+		<div class="row m-0">
 			<div class="left col-12 col-md-8 col-lg-8 m-0 ">
 				<div class="edit-address">
 					<span class="edit-label">
@@ -16,7 +16,7 @@
 			</div>
 		</div>
 	</div>
-	<div *ngIf="!(shipAddress$ | async)" class="row">
+	<div *ngIf="!shipAddress" class="row">
 		<div class="left col-12 col-md-10 col-lg-10 m-auto border-right-0">
 			<div class="add-address">
 				<span class="add-label">
@@ -37,4 +37,4 @@
 			</app-add-address>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/checkout/payment/payment-modes-list/payment-modes-list.component.ts b/src/app/checkout/payment/payment-modes-list/payment-modes-list.component.ts
index af85ba09..4dbfb8cb 100644
--- a/src/app/checkout/payment/payment-modes-list/payment-modes-list.component.ts
+++ b/src/app/checkout/payment/payment-modes-list/payment-modes-list.component.ts
@@ -1,17 +1,18 @@
-
+import { Component, OnInit, Input, PLATFORM_ID, Inject, OnDestroy } from '@angular/core';
 import { tap } from 'rxjs/operators';
+import { ToastrService } from 'ngx-toastr';
+import { Subscription } from 'rxjs';
+import { Store } from '@ngrx/store';
+import { Router } from '@angular/router';
+
 import { getAuthStatus } from './../../../auth/reducers/selectors';
 import { CheckoutActions } from './../../actions/checkout.actions';
 import { AppState } from './../../../interfaces';
-import { Store } from '@ngrx/store';
-import { Router } from '@angular/router';
 import { PaymentMode } from './../../../core/models/payment_mode';
 import { PaymentService } from './../services/payment.service';
 import { CheckoutService } from './../../../core/services/checkout.service';
-import { Component, OnInit, Input, PLATFORM_ID, Inject } from '@angular/core';
 import { Address } from '../../../core/models/address';
 import { environment } from '../../../../environments/environment';
-import { ToastrService } from 'ngx-toastr';
 import { isPlatformBrowser } from '../../../../../node_modules/@angular/common';
 
 @Component({
@@ -19,14 +20,14 @@ import { isPlatformBrowser } from '../../../../../node_modules/@angular/common';
   templateUrl: './payment-modes-list.component.html',
   styleUrls: ['./payment-modes-list.component.scss']
 })
-export class PaymentModesListComponent implements OnInit {
+export class PaymentModesListComponent implements OnInit, OnDestroy {
 
   @Input() paymentAmount: number;
   @Input() orderNumber: string;
   @Input() address: Address;
   isShippeble: boolean;
   showDummyCardInfo = environment.config.showDummyCardInfo;
-
+  subscriptionList$: Array<Subscription> = [];
   paymentModes: PaymentMode[];
   selectedMode: PaymentMode = new PaymentMode;
   isAuthenticated: boolean;
@@ -42,13 +43,14 @@ export class PaymentModesListComponent implements OnInit {
     private store: Store<AppState>,
     private checkoutActions: CheckoutActions,
     private toastyService: ToastrService,
-    @Inject(PLATFORM_ID) private platformId: Object) {
-    this.store.select(getAuthStatus).subscribe((auth) => {
-      this.isAuthenticated = auth;
-    });
-  }
+    @Inject(PLATFORM_ID) private platformId: Object) { }
 
   ngOnInit() {
+    this.subscriptionList$.push(
+      this.store.select(getAuthStatus).subscribe((auth) => {
+        this.isAuthenticated = auth;
+      })
+    );
     this.fetchAllPayments();
   }
 
@@ -57,56 +59,63 @@ export class PaymentModesListComponent implements OnInit {
   }
 
   private fetchAllPayments() {
-    this.checkoutService.availablePaymentMethods()
-      .subscribe((payment) => {
-        this.paymentModes = payment.payment_methods;
-        this.selectedMode = this.paymentService.getDefaultSelectedMode(this.paymentModes);
-      });
+    this.subscriptionList$.push(
+      this.checkoutService.availablePaymentMethods()
+        .subscribe((payment) => {
+          this.paymentModes = payment.payment_methods;
+          this.selectedMode = this.paymentService.getDefaultSelectedMode(this.paymentModes);
+        })
+    );
   }
 
   makePaymentCod() {
     const paymentModeId = this.selectedMode.id;
     const shipping_pincode = (this.address.zipcode)
-    this.checkoutService.shipmentAvailability(+shipping_pincode)
-      .subscribe((res: any) => {
-        this.isShippeble = res.available
-        if (this.isShippeble && this.paymentAmount >= this.freeShippingAmount) {
-          this.checkoutService.createNewPayment(paymentModeId, this.paymentAmount).pipe(
-            tap(() => {
-              this.store.dispatch(this.checkoutActions.orderCompleteSuccess());
-              this.redirectToNewPage();
-              this.checkoutService.createEmptyOrder()
-                .subscribe();
-            }))
-            .subscribe();
-        } else {
-          if (this.paymentAmount < this.freeShippingAmount) {
-            // tslint:disable-next-line:max-line-length
-            this.toastyService.error(`${this.selectedMode.name} is not available for Order amount less than ${this.currency} ${this.freeShippingAmount}.`, 'Order Amount');
-          } else if (!this.isShippeble) {
-            this.toastyService.error(`${this.selectedMode.name} is not available for pincode ${shipping_pincode}.`, 'Pincode');
+    this.subscriptionList$.push(
+      this.checkoutService.shipmentAvailability(+shipping_pincode)
+        .subscribe((res: any) => {
+          this.isShippeble = res.available
+          if (this.isShippeble && this.paymentAmount >= this.freeShippingAmount) {
+            this.subscriptionList$.push(
+              this.checkoutService.createNewPayment(paymentModeId, this.paymentAmount).pipe(
+                tap(() => {
+                  this.store.dispatch(this.checkoutActions.orderCompleteSuccess());
+                  this.redirectToNewPage();
+                  this.subscriptionList$.push(this.checkoutService.createEmptyOrder().subscribe());
+                }))
+                .subscribe()
+            );
+          } else {
+            if (this.paymentAmount < this.freeShippingAmount) {
+              // tslint:disable-next-line:max-line-length
+              this.toastyService.error(`${this.selectedMode.name} is not available for Order amount less than ${this.currency} ${this.freeShippingAmount}.`, 'Order Amount');
+            } else if (!this.isShippeble) {
+              this.toastyService.error(`${this.selectedMode.name} is not available for pincode ${shipping_pincode}.`, 'Pincode');
+            }
           }
-        }
-      });
+        })
+    );
   }
 
   makePaymentPayubiz() {
-    this.checkoutService.makePayment(this.paymentAmount, this.address, this.orderNumber)
-      .subscribe((response: any) => {
-        response = response
-        this.checkoutService.createNewPayment(this.selectedMode.id, this.paymentAmount).pipe(
-          tap(() => {
-            this.store.dispatch(this.checkoutActions.orderCompleteSuccess());
-            this.checkoutService.createEmptyOrder()
-              .subscribe();
-          })
-        )
-          .subscribe((res) => {
-            if (isPlatformBrowser(this.platformId)) {
-              window.open(response.url, '_self');
-            }
-          });
-      })
+    this.subscriptionList$.push(
+      this.checkoutService.makePayment(this.paymentAmount, this.address, this.orderNumber)
+        .subscribe((response: any) => {
+          this.subscriptionList$.push(
+            this.checkoutService.createNewPayment(this.selectedMode.id, this.paymentAmount).pipe(
+              tap(() => {
+                this.store.dispatch(this.checkoutActions.orderCompleteSuccess());
+                this.subscriptionList$.push(this.checkoutService.createEmptyOrder().subscribe());
+              })
+            )
+            .subscribe(_ => {
+              if (isPlatformBrowser(this.platformId)) {
+                window.open(response.url, '_self');
+              }
+            })
+          );
+        })
+    );
   }
 
   private redirectToNewPage() {
@@ -117,4 +126,8 @@ export class PaymentModesListComponent implements OnInit {
       this.router.navigate(['/']);
     }
   }
+
+  ngOnDestroy() {
+    this.subscriptionList$.map(sub$ => sub$.unsubscribe());
+  }
 }
diff --git a/src/app/checkout/reducers/selectors.ts b/src/app/checkout/reducers/selectors.ts
index 53ce894f..e4d596b7 100644
--- a/src/app/checkout/reducers/selectors.ts
+++ b/src/app/checkout/reducers/selectors.ts
@@ -28,11 +28,11 @@ export function fetchTotalCartValue(state: CheckoutState) {
 }
 
 export function fetchShipAddress(state: CheckoutState) {
-  return state.shipAddress ? state.shipAddress.toJS() : state.shipAddress.toJS();
+  return state.shipAddress ? state.shipAddress.toJS() : state.shipAddress;
 }
 
 export function fetchBillAddress(state: CheckoutState) {
-  return state.billAddress ? state.billAddress.toJS() : state.billAddress.toJS();
+  return state.billAddress ? state.billAddress.toJS() : state.billAddress;
 }
 
 export function fetchOrderState(state: CheckoutState) {
diff --git a/src/app/core/services/product.service.ts b/src/app/core/services/product.service.ts
index 7b8f3671..1735dcfa 100644
--- a/src/app/core/services/product.service.ts
+++ b/src/app/core/services/product.service.ts
@@ -1,15 +1,19 @@
+import { HttpClient } from '@angular/common/http';
+import { map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { Injectable } from '@angular/core';
+
 import { JsonApiParserService } from './json-api-parser.service';
 import { CJsonApi } from './../models/jsonapi';
 import { ToastrService } from 'ngx-toastr';
 import { Taxonomy } from './../models/taxonomy';
-import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
 import { Product } from '../models/product';
-import { map } from 'rxjs/operators';
-import { Observable } from 'rxjs';
 
 @Injectable()
 export class ProductService {
+  success: any;
+  error: any;
+
   /**
    * Creates an instance of ProductService.
    * @param {HttpService} http
@@ -21,10 +25,6 @@ export class ProductService {
     private toastrService: ToastrService,
     private apiParser: JsonApiParserService,
   ) { }
-  // tslint:disable-next-line:member-ordering
-  success: any;
-  // tslint:disable-next-line:member-ordering
-  error: any;
   /**
    *
    *
@@ -49,22 +49,22 @@ export class ProductService {
   getProductReviews(products): Observable<any> {
     return this.http.get(`products/${products}/reviews`);
   }
+
   /**
    *
    *
-   * @returns {Array<Taxonomy>}
-   *
+   * @returns {Observable<Array<Taxonomy>>}
    * @memberof ProductService
    */
-  getTaxonomies(): any {
+  getTaxonomies(): Observable<Array<Taxonomy>> {
     return this.http.get<Array<Taxonomy>>(`api/v1/taxonomies?set=nested`);
   }
 
   /**
    *
    *
-   * @returns {Array<Product>}
-   *
+   * @param {number} pageNumber
+   * @returns {Observable<Array<Product>>}
    * @memberof ProductService
    */
   getProducts(pageNumber: number): Observable<Array<Product>> {
@@ -79,14 +79,34 @@ export class ProductService {
       );
   }
 
+  /**
+   *
+   *
+   * @param {number} id
+   * @returns {Observable<{}>}
+   * @memberof ProductService
+   */
   markAsFavorite(id: number): Observable<{}> {
     return this.http.post<{}>(`favorite_products`, { id: id });
   }
 
+  /**
+   *
+   *
+   * @param {number} id
+   * @returns {Observable<{}>}
+   * @memberof ProductService
+   */
   removeFromFavorite(id: number): Observable<{}> {
     return this.http.delete<{}>(`favorite_products/${id}`);
   }
 
+  /**
+   *
+   *
+   * @returns {Observable<Array<Product>>}
+   * @memberof ProductService
+   */
   getFavoriteProducts(): Observable<Array<Product>> {
     return this.http
       .get<{ data: CJsonApi[] }>(
@@ -99,6 +119,12 @@ export class ProductService {
       );
   }
 
+  /**
+   *
+   *
+   * @returns {Observable<Array<Product>>}
+   * @memberof ProductService
+   */
   getUserFavoriteProducts(): Observable<Array<Product>> {
     return this.http
       .get<{ data: CJsonApi[] }>(
@@ -111,8 +137,14 @@ export class ProductService {
       );
   }
 
-  // tslint:disable-next-line:max-line-length
-  getProductsByTaxon(id: string): Observable<any> {
+  /**
+   *
+   *
+   * @param {string} id
+   * @returns {Observable<{pagination: Object, products: Array<Product>}>}
+   * @memberof ProductService
+   */
+  getProductsByTaxon(id: string): Observable<{ pagination: Object, products: Array<Product> }> {
     return this.http
       .get<{ data: CJsonApi[]; pagination: Object }>(
         `api/v1/taxons/products?${id}&per_page=20&data_set=small`
@@ -127,6 +159,13 @@ export class ProductService {
       );
   }
 
+  /**
+   *
+   *
+   * @param {string} id
+   * @returns {Observable<Array<Product>>}
+   * @memberof ProductService
+   */
   getProductsByTaxonNP(id: string): Observable<Array<Product>> {
     return this.http
       .get<{ data: CJsonApi[] }>(
@@ -139,13 +178,27 @@ export class ProductService {
       );
   }
 
+  /**
+   *
+   *
+   * @param {string} name
+   * @returns {Observable<Array<Taxonomy>>}
+   * @memberof ProductService
+   */
   getTaxonByName(name: string): Observable<Array<Taxonomy>> {
     return this.http.get<Array<Taxonomy>>(
       `api/v1/taxonomies?q[name_cont]=${name}&set=nested&per_page=2`
     );
   }
 
-  getproductsByKeyword(keyword: string): Observable<any> {
+  /**
+   *
+   *
+   * @param {string} keyword
+   * @returns {Observable<{pagination: Object, products: Array<Product>}>}
+   * @memberof ProductService
+   */
+  getproductsByKeyword(keyword: string): Observable<{ pagination: Object, products: Array<Product> }> {
     return this.http
       .get<{ data: CJsonApi[]; pagination: Object }>(
         `api/v1/products?${keyword}&per_page=20&data_set=small`
@@ -154,23 +207,34 @@ export class ProductService {
         map(resp => {
           return {
             pagination: resp.pagination,
-            products: this.apiParser.parseArrayofObject(resp.data) as Array<
-              Product
-              >
+            products: this.apiParser.parseArrayofObject(resp.data) as Array<Product>
           };
         })
       );
   }
 
-  getChildTaxons(
-    taxonomyId: string,
-    taxonId: string
-  ): Observable<Array<Taxonomy>> {
+  /**
+   *
+   *
+   * @param {string} taxonomyId
+   * @param {string} taxonId
+   * @returns {Observable<Array<Taxonomy>>}
+   * @memberof ProductService
+   */
+  getChildTaxons(taxonomyId: string, taxonId: string): Observable<Array<Taxonomy>> {
     return this.http.get<Array<Taxonomy>>(
       `/api/v1/taxonomies/${taxonomyId}/taxons/${taxonId}`
     );
   }
 
+  /**
+   *
+   *
+   * @param {*} productId
+   * @param {*} params
+   * @returns
+   * @memberof ProductService
+   */
   submitReview(productId: any, params: any) {
     return this.http.post(`products/${productId}/reviews`, params).pipe(
       map(
@@ -193,7 +257,14 @@ export class ProductService {
     );
   }
 
-  getRelatedProducts(productId: any): Observable<Array<Product>> {
+  /**
+   *
+   *
+   * @param {number} productId
+   * @returns {Observable<Array<Product>>}
+   * @memberof ProductService
+   */
+  getRelatedProducts(productId: number): Observable<Array<Product>> {
     return this.http
       .get<{ data: CJsonApi[] }>(`api/products/${productId}/relations`)
       .pipe(
diff --git a/src/app/core/services/variant-parser.service.ts b/src/app/core/services/variant-parser.service.ts
index 725bf21f..8e8f6d3c 100644
--- a/src/app/core/services/variant-parser.service.ts
+++ b/src/app/core/services/variant-parser.service.ts
@@ -1,6 +1,4 @@
-import { Effect } from '@ngrx/effects';
 import { OptionValue } from './../models/option_value';
-import { element } from 'protractor';
 import { Variant } from './../models/variant';
 import { OptionType } from './../models/option_type';
 import { Injectable } from '@angular/core';
diff --git a/src/app/home/category-page/category-page.component.ts b/src/app/home/category-page/category-page.component.ts
index 4e8d35c1..99a55873 100644
--- a/src/app/home/category-page/category-page.component.ts
+++ b/src/app/home/category-page/category-page.component.ts
@@ -1,3 +1,4 @@
+import { Taxon } from './../../core/models/taxon';
 import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
 import { environment } from '../../../environments/environment';
 import { ActivatedRoute } from '@angular/router';
@@ -7,6 +8,7 @@ import { getTaxonomies } from '../../product/reducers/selectors';
 import { Observable, forkJoin, of } from 'rxjs';
 import { ProductService } from '../../core/services/product.service';
 import { map, switchMap } from 'rxjs/operators';
+import { Product } from '../../core/models/product';
 
 @Component({
   selector: 'app-category-page',
@@ -16,11 +18,9 @@ import { map, switchMap } from 'rxjs/operators';
 })
 export class CategoryPageComponent implements OnInit {
   banners = environment.config.category_banner;
-  category_banner: any;
-  categeory_number: any;
-  id: any
-  selectedTaxons$: Observable<any>
-  productList$: Observable<any>
+  categeory_number: number;
+  selectedTaxons$: Observable<Taxon>;
+  productList$: Observable<Array<Product>>;
   selectedCategory: any;
 
   constructor(private route: ActivatedRoute,
diff --git a/src/app/home/content/content-header/content-header.component.html b/src/app/home/content/content-header/content-header.component.html
index d44b02ac..8e8275cb 100644
--- a/src/app/home/content/content-header/content-header.component.html
+++ b/src/app/home/content/content-header/content-header.component.html
@@ -1,4 +1,4 @@
-<div class="container content mb-4" *ngIf="!screenWidth">
+<div class="container content mb-4" *ngIf="!layoutState.isMobileView">
   <div class="row ">
 
     <div itemprop="name" class="queried-for col-7 pl-1 ">
@@ -25,7 +25,7 @@ <h4 title="men casual shirts">Showing {{paginationInfo.count}} of {{paginationIn
   </div>
 </div>
 
-<div class="container content content-device" *ngIf="screenWidth">
+<div class="container content content-device" *ngIf="layoutState.isMobileView">
 
 
   <div class="row">
@@ -50,7 +50,7 @@ <h4 title="men casual shirts">Showing {{paginationInfo.count}} of {{paginationIn
                   </button>
                 </li>
                 <li *ngFor="let entry of options; let idx = index">
-                  <input type="radio" name="radiogroup" id="test{{idx}}" [checked]="idx === entry.name" [value]="entry.id" (change)="onSelectionChange(entry)">
+                  <input type="radio" name="radiogroup" id="test{{idx}}" [checked]="idx === entry.value" [value]="entry.value" (change)="onSelectionChange(entry)">
                   <label for="test{{idx}}">{{ entry.name }}</label>
                 </li>
               </ul>
diff --git a/src/app/home/content/content-header/content-header.component.ts b/src/app/home/content/content-header/content-header.component.ts
index df2e621d..8551d226 100644
--- a/src/app/home/content/content-header/content-header.component.ts
+++ b/src/app/home/content/content-header/content-header.component.ts
@@ -1,6 +1,7 @@
 import { Router } from '@angular/router';
 import { Component, OnInit, Output, EventEmitter, Input, ChangeDetectionStrategy, PLATFORM_ID, Inject } from '@angular/core';
-import { isPlatformBrowser } from '../../../../../node_modules/@angular/common';
+import { LayoutState } from '../../../layout/reducers/layout.state';
+
 @Component({
   selector: 'app-content-header',
   templateUrl: './content-header.component.html',
@@ -11,9 +12,9 @@ export class ContentHeaderComponent implements OnInit {
   @Output() toggleSize = new EventEmitter();
   @Input() paginationInfo;
   @Input() fillterList;
+  @Input() layoutState: LayoutState;
   subselectedItem;
   childselectedItem;
-  screenWidth: any;
 
   options = [
     { name: 'Newest', value: 1 },
@@ -34,14 +35,13 @@ export class ContentHeaderComponent implements OnInit {
   }
 
   selectedOption = 'Relevance';
-  isMobile: any;
   selectedSize = 'COZY';
   searchKeyword = '';
   selectedEntry;
   isfilterModalShown;
   issortModalShown
   defaultselectedEntry = 'Relevance';
-  constructor(private routernomal: Router, @Inject(PLATFORM_ID) private platformId: any) { }
+  constructor(private routernomal: Router) { }
 
   sortModalShow() { this.issortModalShown = true; }
   sortModalhide() { this.issortModalShown = false; }
@@ -61,11 +61,6 @@ export class ContentHeaderComponent implements OnInit {
   }
 
   ngOnInit() {
-    if (isPlatformBrowser(this.platformId)) {
-      if (window.screen.width <= 768) {
-        this.screenWidth = window.screen.width;
-      }
-    }
   }
 
   toggleView(view) {
diff --git a/src/app/home/content/content.ts b/src/app/home/content/content.ts
index 65c6b2d9..8409bec7 100644
--- a/src/app/home/content/content.ts
+++ b/src/app/home/content/content.ts
@@ -5,20 +5,19 @@ import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
   selector: 'app-content',
   template: `
    <div *ngIf='paginationData.total_count > 0'>
-    <app-content-header (toggleSize)="toggleSize($event)"
+    <app-content-header [layoutState]="layoutState" (toggleSize)="toggleSize($event)"
      [paginationInfo]="paginationData" [fillterList]="fillterList"></app-content-header>
     <app-product-list [(toggleLayout)]='toggleLayout'
      [products]='productsList' [paginationData]='paginationData' [taxonIds]="taxonIds"></app-product-list>
     </div>
   `,
-  //   styleUrls: ['./content-header.component.scss'] <app-filter-summary></app-filter-summary>
-  // <app-customize></app-customize>
 })
 export class ContentComponent implements OnInit {
   @Input() productsList;
   @Input() paginationData;
   @Input() taxonIds;
   @Input() fillterList;
+  @Input() layoutState;
   toggleLayout = { size: 'COZY' };
 
   constructor() { }
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index 96df7503..16842fac 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -10,7 +10,7 @@ <h1>Searched Results</h1>
           <app-brand-filter [taxonomiList]="brands$ | async" [isFilterOn]="isFilterOn$ | async"></app-brand-filter>
         </div>
         <div class="col-lg-9 col-12 col-sm-12" [ngClass]="[isMobile ? 'p-0' : '']">
-          <app-content [productsList]="products$ | async" [paginationData]="paginationData" [fillterList]="taxonomies" class="col-12">
+          <app-content [layoutState]="layoutState$ | async" [productsList]="products$ | async" [paginationData]="paginationData" [fillterList]="taxonomies" class="col-12">
           </app-content>
         </div>
       </div>
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 3c16718b..8ff5a13b 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -1,3 +1,4 @@
+import { getlayoutStateJS } from './../layout/reducers/layout.selector';
 import { SearchActions } from './reducers/search.actions';
 import {
   getSelectedTaxonIds,
@@ -17,6 +18,7 @@ import { Component, OnInit, ViewChild, ChangeDetectionStrategy, PLATFORM_ID, Inj
 import { ModalDirective } from 'ngx-bootstrap/modal';
 import { Product } from '../core/models/product';
 import { isPlatformBrowser } from '../../../node_modules/@angular/common';
+import { LayoutState } from '../layout/reducers/layout.state';
 
 @Component({
   selector: 'app-home',
@@ -38,6 +40,7 @@ export class HomeComponent implements OnInit, OnDestroy {
   isMobile;
   rootTaxonomyId: any;
   rootTaxonomyIdSubs$: Subscription;
+  layoutState$: Observable<LayoutState>;
 
   @ViewChild('autoShownModal') autoShownModal: ModalDirective;
   isModalShown = false;
@@ -57,6 +60,7 @@ export class HomeComponent implements OnInit, OnDestroy {
     this.pagination$ = this.store.select(getPaginationData);
     this.isFilterOn$ = this.store.select(searchFilterStatus);
     this.rootTaxonomyIdSubs$ = this.store.select(rootTaxonomyId).subscribe(id => this.rootTaxonomyId = id);
+    this.layoutState$ = this.store.select(getlayoutStateJS);
   }
 
   showModal(): void {
diff --git a/src/app/landing/components/lp-banner/lp-banner.component.scss b/src/app/landing/components/lp-banner/lp-banner.component.scss
index 50d0d003..eb26473b 100644
--- a/src/app/landing/components/lp-banner/lp-banner.component.scss
+++ b/src/app/landing/components/lp-banner/lp-banner.component.scss
@@ -8,7 +8,7 @@
       }
       @media (max-width: 768px) {
         img {
-          height: 150px;
+          height: 170px;
           object-fit: cover;
         }
       }
diff --git a/src/app/layout/header/header.component.scss b/src/app/layout/header/header.component.scss
index f4d8fa07..ef7cb45f 100644
--- a/src/app/layout/header/header.component.scss
+++ b/src/app/layout/header/header.component.scss
@@ -2,24 +2,26 @@
 .navbar {
   padding: 0px;
   padding-top: 1rem;
-  &#main{
-    transition: all 500ms;
-    position: fixed;
-    width: 100%;
-    z-index: 100;
-  }
-  &:not(#main),
-  &.page-scroll-header {
-    box-shadow: 0 8px 6px -8px $gray-900;
-    z-index: 1;
-  }
-  &#sub-header {
-    transition: all 150ms;
-    width: 100%;
-    z-index: 1;
-    top: 50px;
-    &.hide-sub-header {
-      top: 0;
+  @media screen and (min-width: 768px) {
+    &#main {
+      transition: all 500ms;
+      position: fixed;
+      width: 100%;
+      z-index: 100;
+    }
+    &:not(#main),
+    &.page-scroll-header {
+      box-shadow: 0 8px 6px -8px $gray-900;
+      z-index: 1;
+    }
+    &#sub-header {
+      transition: all 150ms;
+      width: 100%;
+      z-index: 1;
+      top: 50px;
+      &.hide-sub-header {
+        top: 0;
+      }
     }
   }
 }

From 63d0b8ddf80a7a27ecef2c03b41626a5de354cf8 Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Thu, 30 Aug 2018 16:09:13 +0530
Subject: [PATCH 02/14] This change fixes the issue with order persistance
 between guest user and logged in user.

---
 src/app/core/services/checkout.service.ts | 47 +++++++++++++++--------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/app/core/services/checkout.service.ts b/src/app/core/services/checkout.service.ts
index 198decb2..197e3859 100644
--- a/src/app/core/services/checkout.service.ts
+++ b/src/app/core/services/checkout.service.ts
@@ -1,4 +1,4 @@
-import { map, tap } from 'rxjs/operators';
+import { map, tap, switchMap } from 'rxjs/operators';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { getOrderNumber } from './../../checkout/reducers/selectors';
 import { CheckoutActions } from './../../checkout/actions/checkout.actions';
@@ -18,11 +18,12 @@ export class CheckoutService {
   private orderNumber: number;
 
   /**
-   * Creates an instance of CheckoutService.
-   * @param {HttpService} http
+   *Creates an instance of CheckoutService.
+   * @param {HttpClient} http
    * @param {CheckoutActions} actions
    * @param {Store<AppState>} store
-   *
+   * @param {ToastrService} toastyService
+   * @param {*} platformId
    * @memberof CheckoutService
    */
   constructor(
@@ -61,23 +62,39 @@ export class CheckoutService {
   }
 
   /**
-   *
-   *
+   * This method fetches the current order in two ways.
+   * 1. Guest user
+   *    1. Check for localstorage order details, to find the order.
+   *    2. Create new order if not found.
+   * 2. Logged in User
+   *    1. Get user current user from api.
+   *    2. If not current order, then check for localstorage order details, to find the order.
+   *    3. Create new order if not found.
    * @returns
    *
    * @memberof CheckoutService
    */
   fetchCurrentOrder() {
     return this.http.get<Order>('api/v1/orders/current').pipe(
-      map(order => {
+      tap(order => {
         if (order) {
           const token = order.token;
-          this.setOrderTokenInLocalStorage({ order_token: token });
+          this.setOrderTokenInLocalStorage({ order_token: token, order_number: order.number });
           return this.store.dispatch(
             this.actions.fetchCurrentOrderSuccess(order)
           );
-        } else {
-          this.createEmptyOrder().subscribe();
+        }
+      }),
+      switchMap(order => {
+        if (!order) {
+          if (this.getOrderToken()) {
+            const s_order = JSON.parse(localStorage.getItem('order'));
+            return this
+              .getOrder(s_order.order_number)
+              .pipe(tap(_order => this.store.dispatch(this.actions.fetchCurrentOrderSuccess(_order))));
+          } else {
+            return this.createEmptyOrder();
+          }
         }
       })
     );
@@ -109,10 +126,8 @@ export class CheckoutService {
       .post<Order>('api/v1/orders.json', null, { headers: headers })
       .pipe(
         map(order => {
-          this.setOrderTokenInLocalStorage({ order_token: order.token });
-          return this.store.dispatch(
-            this.actions.fetchCurrentOrderSuccess(order)
-          );
+          this.setOrderTokenInLocalStorage({ order_token: order.token, order_number: order.number });
+          return this.store.dispatch(this.actions.fetchCurrentOrderSuccess(order));
         }),
         tap(
           _ => _,
@@ -265,8 +280,7 @@ export class CheckoutService {
    */
   private getOrderToken() {
     const order = isPlatformBrowser(this.platformId) ? JSON.parse(localStorage.getItem('order')) : {};
-    const token = order.order_token;
-    return token;
+    return order ? order.order_token : null;
   }
 
   shipmentAvailability(pincode: number): Observable<{available: boolean}> {
@@ -283,6 +297,7 @@ export class CheckoutService {
    */
   private setOrderTokenInLocalStorage(token: any): void {
     const jsonData = JSON.stringify(token);
+    this.orderNumber = token.order_number
     if (isPlatformBrowser(this.platformId)) {
       localStorage.setItem('order', jsonData) ;
     }

From c3b589cc705600ef6835a3df6bc671bcab000b2e Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Tue, 4 Sep 2018 13:39:32 +0530
Subject: [PATCH 03/14] fixing auth issue

---
 src/app/app.component.ts                      |  10 +-
 src/app/auth/effects/auth.effects.ts          |  24 +--
 .../checkout/address/address.component.html   |   6 +-
 .../payment-modes-list.component.ts           |   4 +-
 src/app/core/services/checkout.service.ts     | 143 +++++++++---------
 src/app/user/services/user.service.ts         |   2 +-
 6 files changed, 90 insertions(+), 99 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 8637ec8d..315f6982 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -3,10 +3,9 @@ import { LayoutState } from './layout/reducers/layout.state';
 import { getlayoutStateJS } from './layout/reducers/layout.selector';
 import { environment } from './../environments/environment';
 import { filter } from 'rxjs/operators';
-import { getAuthStatus } from './auth/reducers/selectors';
 import { AppState } from './interfaces';
 import { Store } from '@ngrx/store';
-import { Subscription, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { CheckoutService } from './core/services/checkout.service';
 import { Component, OnInit, OnDestroy, Inject, PLATFORM_ID } from '@angular/core';
 import { Router, NavigationEnd } from '@angular/router';
@@ -19,7 +18,6 @@ import { isPlatformBrowser } from '../../node_modules/@angular/common';
   styleUrls: ['./app.component.scss']
 })
 export class AppComponent implements OnInit, OnDestroy {
-  orderSub$: Subscription;
   currentUrl: string;
   currentStep: string;
   checkoutUrls = ['/checkout/cart', '/checkout/address', '/checkout/payment'];
@@ -28,7 +26,6 @@ export class AppComponent implements OnInit, OnDestroy {
 
   constructor(
     private router: Router,
-    private checkoutService: CheckoutService,
     private store: Store<AppState>,
     private metaTitle: Title,
     private meta: Meta,
@@ -54,10 +51,6 @@ export class AppComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.store.select(getAuthStatus).subscribe(() => {
-      this.orderSub$ = this.checkoutService.fetchCurrentOrder().subscribe();
-    });
-
     this.layoutState$ = this.store.select(getlayoutStateJS);
 
     this.addFaviconIcon();
@@ -86,7 +79,6 @@ export class AppComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy() {
-    this.orderSub$.unsubscribe();
   }
 
   private addMetaInfo() {
diff --git a/src/app/auth/effects/auth.effects.ts b/src/app/auth/effects/auth.effects.ts
index 7e24f776..77b12354 100644
--- a/src/app/auth/effects/auth.effects.ts
+++ b/src/app/auth/effects/auth.effects.ts
@@ -1,37 +1,34 @@
 import { Injectable } from '@angular/core';
 import { filter, switchMap, map } from 'rxjs/operators';
-import { Observable } from 'rxjs';
+import { Observable} from 'rxjs';
 import { Actions, Effect } from '@ngrx/effects';
 import { Action } from '@ngrx/store';
 
 import { User } from './../../core/models/user';
 import { AuthService } from '../../core/services/auth.service';
 import { AuthActions } from '../actions/auth.actions';
+import { CheckoutService } from '../../core/services/checkout.service';
 
 @Injectable()
 export class AuthenticationEffects {
-  constructor(
-    private actions$: Actions,
-    private authService: AuthService,
-    private authActions: AuthActions
-  ) {}
 
-  // tslint:disable-next-line:member-ordering
   @Effect()
   Authorized$: Observable<Action> = this.actions$
     .ofType(AuthActions.AUTHORIZE)
     .pipe(
-      switchMap<Action, {status: string} & User>(() => this.authService.authorized()),
+      switchMap<Action, { status: string } & User>(() => {
+        return this.authService.authorized();
+      }),
+      switchMap((data) => this.checkoutService.fetchCurrentOrder().pipe(map(() => data))),
       filter(data => data.status !== 'unauthorized'),
       map(() => this.authActions.loginSuccess())
     );
 
-  // tslint:disable-next-line:member-ordering
   @Effect()
   OAuthLogin: Observable<Action> = this.actions$
     .ofType(AuthActions.O_AUTH_LOGIN)
     .pipe(
-      switchMap<Action & {payload: string}, string | User>(action => {
+      switchMap<Action & { payload: string }, string | User>(action => {
         return this.authService.socialLogin(action.payload);
       }),
       map(data => {
@@ -42,4 +39,11 @@ export class AuthenticationEffects {
         }
       })
     );
+
+  constructor(
+    private actions$: Actions,
+    private authService: AuthService,
+    private authActions: AuthActions,
+    private checkoutService: CheckoutService
+  ) { }
 }
diff --git a/src/app/checkout/address/address.component.html b/src/app/checkout/address/address.component.html
index f9e459a8..ed141980 100644
--- a/src/app/checkout/address/address.component.html
+++ b/src/app/checkout/address/address.component.html
@@ -1,7 +1,7 @@
-<div *ngIf="shipAddress$ | async; let shipAddress" class="address-section col-12 col-md-8 col-lg-8">
+<div class="address-section col-12 col-md-8 col-lg-8">
 	<div *ngIf=!editAddress>
 		<div class="row m-0">
-			<div class="left col-12 col-md-8 col-lg-8 m-0 ">
+			<div class="left col-12 col-md-8 col-lg-8 m-0 " *ngIf="shipAddress$ | async; let shipAddress">
 				<div class="edit-address">
 					<span class="edit-label">
 						Delivery Address
@@ -16,7 +16,7 @@
 			</div>
 		</div>
 	</div>
-	<div *ngIf="!shipAddress" class="row">
+	<div *ngIf="!(shipAddress$ | async)" class="row">
 		<div class="left col-12 col-md-10 col-lg-10 m-auto border-right-0">
 			<div class="add-address">
 				<span class="add-label">
diff --git a/src/app/checkout/payment/payment-modes-list/payment-modes-list.component.ts b/src/app/checkout/payment/payment-modes-list/payment-modes-list.component.ts
index 4dbfb8cb..0ecbde5c 100644
--- a/src/app/checkout/payment/payment-modes-list/payment-modes-list.component.ts
+++ b/src/app/checkout/payment/payment-modes-list/payment-modes-list.component.ts
@@ -81,7 +81,7 @@ export class PaymentModesListComponent implements OnInit, OnDestroy {
                 tap(() => {
                   this.store.dispatch(this.checkoutActions.orderCompleteSuccess());
                   this.redirectToNewPage();
-                  this.subscriptionList$.push(this.checkoutService.createEmptyOrder().subscribe());
+                  this.checkoutService.removeLocalOrder();
                 }))
                 .subscribe()
             );
@@ -105,7 +105,7 @@ export class PaymentModesListComponent implements OnInit, OnDestroy {
             this.checkoutService.createNewPayment(this.selectedMode.id, this.paymentAmount).pipe(
               tap(() => {
                 this.store.dispatch(this.checkoutActions.orderCompleteSuccess());
-                this.subscriptionList$.push(this.checkoutService.createEmptyOrder().subscribe());
+                this.checkoutService.removeLocalOrder();
               })
             )
             .subscribe(_ => {
diff --git a/src/app/core/services/checkout.service.ts b/src/app/core/services/checkout.service.ts
index 197e3859..00b7e589 100644
--- a/src/app/core/services/checkout.service.ts
+++ b/src/app/core/services/checkout.service.ts
@@ -11,11 +11,10 @@ import { ToastrService } from 'ngx-toastr';
 import * as CryptoJS from 'crypto-js';
 import { environment } from '../../../environments/environment';
 import { isPlatformBrowser } from '@angular/common';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 
 @Injectable()
 export class CheckoutService {
-  private orderNumber: number;
 
   /**
    *Creates an instance of CheckoutService.
@@ -32,8 +31,6 @@ export class CheckoutService {
     private store: Store<AppState>,
     private toastyService: ToastrService,
     @Inject(PLATFORM_ID) private platformId: Object) {
-    this.store.select(getOrderNumber)
-      .subscribe(number => (this.orderNumber = number));
   }
 
   /**
@@ -44,49 +41,53 @@ export class CheckoutService {
    *
    * @memberof CheckoutService
    */
-  createNewLineItem(variant_id: number, quantity: number) {
-    const params = {
-      line_item: { variant_id: variant_id, quantity: quantity }
-    },
-      url = `api/v1/orders/${this.orderNumber}/line_items?order_token=${this.getOrderToken()}`;
-
-    return this.http.post<LineItem>(url, params).pipe(
-      tap(
-        lineItem => {
-          this.toastyService.success('Success!', 'Cart updated!');
-          return lineItem;
-        },
-        _ => this.toastyService.error('Something went wrong!', 'Failed')
-      )
-    );
+  createNewLineItem(variant_id: number, quantity: number): Observable<LineItem> {
+    if (!this.getOrderToken()) {
+      const order_params = {
+        order: {
+          line_items: {
+            0: { variant_id: variant_id, quantity: quantity }
+          }
+        }
+      };
+      const new_order_url = `api/v1/orders`;
+      return this.http.post<Order>(new_order_url, order_params).pipe(
+        map(
+          order => {
+            this.toastyService.success('Success!', 'Cart updated!');
+            this.setOrderTokenInLocalStorage({ order_token: order.token, order_number: order.number });
+            this.store.dispatch(this.actions.fetchCurrentOrderSuccess(order));
+            return order.line_items[0];
+          }
+        ),
+        tap(_order =>
+          _ => _,
+          _ => this.toastyService.error('Something went wrong!', 'Failed')
+        )
+      );
+    } else {
+      const params = {
+        line_item: { variant_id: variant_id, quantity: quantity }
+      };
+      const url = `api/v1/orders/${this.orderNumber()}/line_items?order_token=${this.getOrderToken()}`;
+      return this.http.post<LineItem>(url, params).pipe(
+        tap(
+          lineItem => {
+            this.toastyService.success('Success!', 'Cart updated!');
+            return lineItem;
+          },
+          _ => this.toastyService.error('Something went wrong!', 'Failed')
+        )
+      );
+    }
   }
 
-  /**
-   * This method fetches the current order in two ways.
-   * 1. Guest user
-   *    1. Check for localstorage order details, to find the order.
-   *    2. Create new order if not found.
-   * 2. Logged in User
-   *    1. Get user current user from api.
-   *    2. If not current order, then check for localstorage order details, to find the order.
-   *    3. Create new order if not found.
-   * @returns
-   *
-   * @memberof CheckoutService
-   */
   fetchCurrentOrder() {
     return this.http.get<Order>('api/v1/orders/current').pipe(
-      tap(order => {
-        if (order) {
-          const token = order.token;
-          this.setOrderTokenInLocalStorage({ order_token: token, order_number: order.number });
-          return this.store.dispatch(
-            this.actions.fetchCurrentOrderSuccess(order)
-          );
-        }
-      }),
       switchMap(order => {
-        if (!order) {
+        if (order) {
+          return of(order);
+        } else {
           if (this.getOrderToken()) {
             const s_order = JSON.parse(localStorage.getItem('order'));
             return this
@@ -96,6 +97,11 @@ export class CheckoutService {
             return this.createEmptyOrder();
           }
         }
+      }),
+      map(order => {
+        const { token, number } = order;
+        this.setOrderTokenInLocalStorage({ order_token: token, order_number: number });
+        return this.store.dispatch(this.actions.fetchCurrentOrderSuccess(order));
       })
     );
   }
@@ -108,33 +114,18 @@ export class CheckoutService {
    * @memberof CheckoutService
    */
   getOrder(orderNumber: string) {
-    const url = `api/v1/orders/${orderNumber}.json`;
+    const url = `api/v1/orders/${orderNumber}?order_token=${this.getOrderToken()}`;
     return this.http.get<Order>(url);
   }
 
-  /**
-   *
-   *
-   * @returns
-   *
-   * @memberof CheckoutService
-   */
-  createEmptyOrder() {
-    const headers = new HttpHeaders().set('Content-Type', 'text/plain');
+  removeLocalOrder() {
+    if (isPlatformBrowser(this.platformId)) {
+      localStorage.removeItem('order');
+    }
+  }
 
-    return this.http
-      .post<Order>('api/v1/orders.json', null, { headers: headers })
-      .pipe(
-        map(order => {
-          this.setOrderTokenInLocalStorage({ order_token: order.token, order_number: order.number });
-          return this.store.dispatch(this.actions.fetchCurrentOrderSuccess(order));
-        }),
-        tap(
-          _ => _,
-          _ =>
-            this.toastyService.error('Unable to create empty order', 'ERROR!!')
-        )
-      );
+  createEmptyOrder() {
+    return this.http.post<Order>(`api/v1/orders`, { order: {} });
   }
 
   /**
@@ -146,7 +137,7 @@ export class CheckoutService {
    * @memberof CheckoutService
    */
   deleteLineItem(lineItem: LineItem) {
-    const url = `api/v1/orders/${this.orderNumber}/line_items/${
+    const url = `api/v1/orders/${this.orderNumber()}/line_items/${
       lineItem.id
       }?order_token=${this.getOrderToken()}`;
     return this.http.delete(url).pipe(map(_ => lineItem));
@@ -161,7 +152,7 @@ export class CheckoutService {
    */
   changeOrderState() {
     const url = `api/v1/checkouts/${
-      this.orderNumber
+      this.orderNumber()
       }/next.json?order_token=${this.getOrderToken()}`;
     return this.http
       .put<Order>(url, {})
@@ -182,7 +173,7 @@ export class CheckoutService {
    */
   updateOrder(params: any) {
     const url = `api/v1/checkouts/${
-      this.orderNumber
+      this.orderNumber()
       }.json?order_token=${this.getOrderToken()}`;
     return this.http
       .put<Order>(url, params)
@@ -202,7 +193,7 @@ export class CheckoutService {
    */
   availablePaymentMethods() {
     const url = `api/v1/orders/${
-      this.orderNumber
+      this.orderNumber()
       }/payments/new?order_token=${this.getOrderToken()}`;
     return this.http.get<any>(url);
   }
@@ -219,7 +210,7 @@ export class CheckoutService {
     return this.http
       .post(
         `api/v1/orders/${
-        this.orderNumber
+        this.orderNumber()
         }/payments?order_token=${this.getOrderToken()}`,
         {
           payment: {
@@ -283,9 +274,14 @@ export class CheckoutService {
     return order ? order.order_token : null;
   }
 
-  shipmentAvailability(pincode: number): Observable<{available: boolean}> {
+  private orderNumber() {
+    const order = isPlatformBrowser(this.platformId) ? JSON.parse(localStorage.getItem('order')) : {};
+    return order ? order.order_number : null;
+  }
+
+  shipmentAvailability(pincode: number): Observable<{ available: boolean }> {
     return this.http
-      .post<{available: boolean}>(`address/shipment_availability`, { pincode: pincode });
+      .post<{ available: boolean }>(`address/shipment_availability`, { pincode: pincode });
   }
   /**
    *
@@ -297,9 +293,8 @@ export class CheckoutService {
    */
   private setOrderTokenInLocalStorage(token: any): void {
     const jsonData = JSON.stringify(token);
-    this.orderNumber = token.order_number
     if (isPlatformBrowser(this.platformId)) {
-      localStorage.setItem('order', jsonData) ;
+      localStorage.setItem('order', jsonData);
     }
   }
 }
diff --git a/src/app/user/services/user.service.ts b/src/app/user/services/user.service.ts
index 08989b33..6d912b4e 100644
--- a/src/app/user/services/user.service.ts
+++ b/src/app/user/services/user.service.ts
@@ -73,7 +73,7 @@ export class UserService {
   }
 
   /**
-   * This function updates the address of the user. 
+   * This function updates the address of the user.
    *
    * @param {Address} updatedAddress
    * @returns {Observable<{status: string}>}

From 7d4d6a4fc04aa972797e54aba270b9e852b0184f Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Tue, 4 Sep 2018 14:52:18 +0530
Subject: [PATCH 04/14] fixed authentication persistance issue

---
 src/app/auth/effects/auth.effects.ts                 | 9 +++++++--
 src/app/checkout/address/address.component.html      | 4 ++--
 src/app/checkout/address/services/address.service.ts | 5 ++++-
 src/app/checkout/payment/payment.component.ts        | 4 +++-
 src/app/core/services/checkout.service.ts            | 7 ++++---
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/app/auth/effects/auth.effects.ts b/src/app/auth/effects/auth.effects.ts
index 77b12354..36f5e5fe 100644
--- a/src/app/auth/effects/auth.effects.ts
+++ b/src/app/auth/effects/auth.effects.ts
@@ -20,8 +20,13 @@ export class AuthenticationEffects {
         return this.authService.authorized();
       }),
       switchMap((data) => this.checkoutService.fetchCurrentOrder().pipe(map(() => data))),
-      filter(data => data.status !== 'unauthorized'),
-      map(() => this.authActions.loginSuccess())
+      map(data => {
+        if (data.status === 'unauthorized') {
+          return this.authActions.noOp();
+        } else {
+          return this.authActions.loginSuccess();
+        }
+      })
     );
 
   @Effect()
diff --git a/src/app/checkout/address/address.component.html b/src/app/checkout/address/address.component.html
index ed141980..2e19fe00 100644
--- a/src/app/checkout/address/address.component.html
+++ b/src/app/checkout/address/address.component.html
@@ -1,7 +1,7 @@
 <div class="address-section col-12 col-md-8 col-lg-8">
 	<div *ngIf=!editAddress>
-		<div class="row m-0">
-			<div class="left col-12 col-md-8 col-lg-8 m-0 " *ngIf="shipAddress$ | async; let shipAddress">
+		<div *ngIf="shipAddress$ | async; let shipAddress" class="row m-0">
+			<div class="left col-12 col-md-8 col-lg-8 m-0 ">
 				<div class="edit-address">
 					<span class="edit-label">
 						Delivery Address
diff --git a/src/app/checkout/address/services/address.service.ts b/src/app/checkout/address/services/address.service.ts
index abb7b92a..fbf79cb7 100644
--- a/src/app/checkout/address/services/address.service.ts
+++ b/src/app/checkout/address/services/address.service.ts
@@ -1,3 +1,4 @@
+import { CheckoutService } from './../../../core/services/checkout.service';
 import { ToastrService } from 'ngx-toastr';
 import { map, tap } from 'rxjs/operators';
 import { HttpClient } from '@angular/common/http';
@@ -11,7 +12,8 @@ export class AddressService {
   constructor(
     private fb: FormBuilder,
     private http: HttpClient,
-    private toastrService: ToastrService
+    private toastrService: ToastrService,
+    private checkoutService: CheckoutService
   ) { }
 
   initAddressForm() {
@@ -70,6 +72,7 @@ export class AddressService {
       + `&address[zipcode]=${updatedAddress.zipcode}`
       + `&address[state_id]=${updatedAddress.state_id}`
       + `&address[country_id]=${updatedAddress.country_id}`
+      + `&order_token=${this.checkoutService.getOrderToken()}`
     return this.http.put(url, {})
       .pipe(
         tap(
diff --git a/src/app/checkout/payment/payment.component.ts b/src/app/checkout/payment/payment.component.ts
index c0ad4885..18c61dd0 100644
--- a/src/app/checkout/payment/payment.component.ts
+++ b/src/app/checkout/payment/payment.component.ts
@@ -1,5 +1,7 @@
 import { Address } from './../../core/models/address';
-import { getTotalCartValue, getOrderNumber, getTotalCartItems, getShipAddress, getShipTotal, getItemTotal, getAdjustmentTotal } from './../reducers/selectors';
+import {
+  getTotalCartValue, getOrderNumber, getTotalCartItems, getShipAddress, getShipTotal, getItemTotal, getAdjustmentTotal
+} from './../reducers/selectors';
 import { AppState } from './../../interfaces';
 import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
diff --git a/src/app/core/services/checkout.service.ts b/src/app/core/services/checkout.service.ts
index 00b7e589..508fd5cb 100644
--- a/src/app/core/services/checkout.service.ts
+++ b/src/app/core/services/checkout.service.ts
@@ -94,11 +94,12 @@ export class CheckoutService {
               .getOrder(s_order.order_number)
               .pipe(tap(_order => this.store.dispatch(this.actions.fetchCurrentOrderSuccess(_order))));
           } else {
-            return this.createEmptyOrder();
+            return of(null);
           }
         }
       }),
       map(order => {
+        if (!order) { return }
         const { token, number } = order;
         this.setOrderTokenInLocalStorage({ order_token: token, order_number: number });
         return this.store.dispatch(this.actions.fetchCurrentOrderSuccess(order));
@@ -269,12 +270,12 @@ export class CheckoutService {
    *
    * @memberof CheckoutService
    */
-  private getOrderToken() {
+  getOrderToken() {
     const order = isPlatformBrowser(this.platformId) ? JSON.parse(localStorage.getItem('order')) : {};
     return order ? order.order_token : null;
   }
 
-  private orderNumber() {
+  orderNumber() {
     const order = isPlatformBrowser(this.platformId) ? JSON.parse(localStorage.getItem('order')) : {};
     return order ? order.order_number : null;
   }

From 44d73e917851bcdec8ef60d9ee4d971fad2ba74b Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Wed, 5 Sep 2018 01:24:47 +0530
Subject: [PATCH 05/14] Fixed order persistance issue by sending guest order
 token in header

---
 .../auth/components/login/login.component.ts  | 19 ++++--
 src/app/auth/effects/auth.effects.ts          |  8 +++
 .../delivery-options.component.ts             |  2 +-
 src/app/core/services/auth.service.ts         |  6 +-
 src/app/core/services/checkout.service.ts     | 66 +++++++++----------
 5 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/src/app/auth/components/login/login.component.ts b/src/app/auth/components/login/login.component.ts
index 88a418ed..ca017502 100644
--- a/src/app/auth/components/login/login.component.ts
+++ b/src/app/auth/components/login/login.component.ts
@@ -45,13 +45,18 @@ export class LoginComponent implements OnInit, OnDestroy {
 
     if (this.signInForm.valid) {
       this.loginSubs = this.authService
-        .login(values).pipe(
-        tap(_ => _, (user) => {
-          const errors = user.error.error || 'Something went wrong';
-          keys.forEach(val => {
-            this.pushErrorFor(val, errors);
-          });
-        })).subscribe();
+        .login(values)
+        .pipe(
+          tap(
+            _ => _,
+            (user) => {
+              const errors = user.error.error || 'Something went wrong';
+              keys.forEach(val => {
+                this.pushErrorFor(val, errors);
+              });
+            }
+          )
+        ).subscribe();
     } else {
       keys.forEach(val => {
         const ctrl = this.signInForm.controls[val];
diff --git a/src/app/auth/effects/auth.effects.ts b/src/app/auth/effects/auth.effects.ts
index 36f5e5fe..cefd39c2 100644
--- a/src/app/auth/effects/auth.effects.ts
+++ b/src/app/auth/effects/auth.effects.ts
@@ -29,6 +29,14 @@ export class AuthenticationEffects {
       })
     );
 
+  @Effect()
+  AfterLoginSuccess$: Observable<Action> = this.actions$
+    .ofType(AuthActions.LOGIN_SUCCESS)
+    .pipe(
+      switchMap(() => this.checkoutService.fetchCurrentOrder()),
+      map(_ => this.authActions.noOp())
+    );
+
   @Effect()
   OAuthLogin: Observable<Action> = this.actions$
     .ofType(AuthActions.O_AUTH_LOGIN)
diff --git a/src/app/checkout/address/delivery-options/delivery-options.component.ts b/src/app/checkout/address/delivery-options/delivery-options.component.ts
index 41f80f51..455ecf1a 100644
--- a/src/app/checkout/address/delivery-options/delivery-options.component.ts
+++ b/src/app/checkout/address/delivery-options/delivery-options.component.ts
@@ -33,7 +33,7 @@ export class DeliveryOptionsComponent implements OnInit, OnDestroy {
   ngOnInit() {
     this.orderSub$ = this.checkoutService.fetchCurrentOrder().subscribe();
   }
-  
+
   ngOnDestroy() {
     this.orderSub$.unsubscribe();
   }
diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts
index 3fdb9122..cd596f23 100644
--- a/src/app/core/services/auth.service.ts
+++ b/src/app/core/services/auth.service.ts
@@ -1,3 +1,4 @@
+import { CheckoutService } from './checkout.service';
 import { of as observableOf, Observable, throwError, of } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 import { Router } from '@angular/router';
@@ -28,6 +29,7 @@ export class AuthService {
     private store: Store<AppState>,
     private oAuthService: OauthService,
     private toastrService: ToastrService,
+    private checkoutService: CheckoutService,
     private router: Router,
     @Inject(PLATFORM_ID) private platformId: Object
   ) { }
@@ -156,6 +158,7 @@ export class AuthService {
         // Setting token after login
         if (isPlatformBrowser(this.platformId)) {
           localStorage.removeItem('user');
+          localStorage.removeItem('order');
         }
         this.store.dispatch(this.actions.logoutSuccess());
         return res;
@@ -184,7 +187,8 @@ export class AuthService {
       client: user.client || [],
       uid: user.uid || [],
       'Auth-Token': user.spree_api_key || [],
-      'ng-api': 'true'
+      'ng-api': 'true',
+      'Order-Token': this.checkoutService.getOrderToken() || []
     });
   }
 
diff --git a/src/app/core/services/checkout.service.ts b/src/app/core/services/checkout.service.ts
index 508fd5cb..44e09cec 100644
--- a/src/app/core/services/checkout.service.ts
+++ b/src/app/core/services/checkout.service.ts
@@ -43,43 +43,37 @@ export class CheckoutService {
    */
   createNewLineItem(variant_id: number, quantity: number): Observable<LineItem> {
     if (!this.getOrderToken()) {
-      const order_params = {
-        order: {
-          line_items: {
-            0: { variant_id: variant_id, quantity: quantity }
-          }
-        }
-      };
-      const new_order_url = `api/v1/orders`;
-      return this.http.post<Order>(new_order_url, order_params).pipe(
-        map(
-          order => {
-            this.toastyService.success('Success!', 'Cart updated!');
-            this.setOrderTokenInLocalStorage({ order_token: order.token, order_number: order.number });
-            this.store.dispatch(this.actions.fetchCurrentOrderSuccess(order));
-            return order.line_items[0];
-          }
-        ),
-        tap(_order =>
-          _ => _,
-          _ => this.toastyService.error('Something went wrong!', 'Failed')
-        )
-      );
-    } else {
-      const params = {
-        line_item: { variant_id: variant_id, quantity: quantity }
-      };
-      const url = `api/v1/orders/${this.orderNumber()}/line_items?order_token=${this.getOrderToken()}`;
-      return this.http.post<LineItem>(url, params).pipe(
-        tap(
-          lineItem => {
-            this.toastyService.success('Success!', 'Cart updated!');
-            return lineItem;
-          },
-          _ => this.toastyService.error('Something went wrong!', 'Failed')
-        )
-      );
+      const order_params = { order: { line_items: { 0: { variant_id: variant_id, quantity: quantity } } } };
+      return this.createNewOrder(order_params).pipe(map(order => order.line_items[0]));
     }
+
+    const params = {
+      line_item: { variant_id: variant_id, quantity: quantity }
+    };
+    const url = `api/v1/orders/${this.orderNumber()}/line_items?order_token=${this.getOrderToken()}`;
+    return this.http.post<LineItem>(url, params).pipe(
+      tap(
+        lineItem => {
+          this.toastyService.success('Success!', 'Cart updated!');
+          return lineItem;
+        },
+        _ => this.toastyService.error('Something went wrong!', 'Failed')
+      )
+    );
+  }
+
+  createNewOrder(orderParams): Observable<Order> {
+    const new_order_url = `api/v1/orders`;
+    return this.http.post<Order>(new_order_url, orderParams).pipe(
+      tap(
+        order => {
+          this.toastyService.success('Success!', 'Cart updated!');
+          this.setOrderTokenInLocalStorage({ order_token: order.token, order_number: order.number });
+          this.store.dispatch(this.actions.fetchCurrentOrderSuccess(order));
+        },
+        _ => this.toastyService.error('Something went wrong!', 'Failed')
+      )
+    );
   }
 
   fetchCurrentOrder() {

From 5a558c9c5c40091ae0708fbcbfa0730598bd535f Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Wed, 5 Sep 2018 10:47:14 +0530
Subject: [PATCH 06/14] Social login order persistance issue resolved

---
 src/app/auth/effects/auth.effects.ts      | 12 +++++++++++-
 src/app/core/services/auth.service.ts     |  2 +-
 src/app/core/services/checkout.service.ts |  3 +--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/auth/effects/auth.effects.ts b/src/app/auth/effects/auth.effects.ts
index cefd39c2..8c6c7209 100644
--- a/src/app/auth/effects/auth.effects.ts
+++ b/src/app/auth/effects/auth.effects.ts
@@ -1,5 +1,6 @@
+import { CheckoutActions } from './../../checkout/actions/checkout.actions';
 import { Injectable } from '@angular/core';
-import { filter, switchMap, map } from 'rxjs/operators';
+import { switchMap, map } from 'rxjs/operators';
 import { Observable} from 'rxjs';
 import { Actions, Effect } from '@ngrx/effects';
 import { Action } from '@ngrx/store';
@@ -8,6 +9,7 @@ import { User } from './../../core/models/user';
 import { AuthService } from '../../core/services/auth.service';
 import { AuthActions } from '../actions/auth.actions';
 import { CheckoutService } from '../../core/services/checkout.service';
+import { Order } from '../../core/models/order';
 
 @Injectable()
 export class AuthenticationEffects {
@@ -37,6 +39,13 @@ export class AuthenticationEffects {
       map(_ => this.authActions.noOp())
     );
 
+  @Effect()
+  AfterLogoutSuccess$: Observable<Action> = this.actions$
+    .ofType(AuthActions.LOGOUT_SUCCESS)
+    .pipe(
+      map(_ => this.checkoutActions.orderCompleteSuccess())
+    );
+
   @Effect()
   OAuthLogin: Observable<Action> = this.actions$
     .ofType(AuthActions.O_AUTH_LOGIN)
@@ -55,6 +64,7 @@ export class AuthenticationEffects {
 
   constructor(
     private actions$: Actions,
+    private checkoutActions: CheckoutActions,
     private authService: AuthService,
     private authActions: AuthActions,
     private checkoutService: CheckoutService
diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts
index cd596f23..c352a93a 100644
--- a/src/app/core/services/auth.service.ts
+++ b/src/app/core/services/auth.service.ts
@@ -188,7 +188,7 @@ export class AuthService {
       uid: user.uid || [],
       'Auth-Token': user.spree_api_key || [],
       'ng-api': 'true',
-      'Order-Token': this.checkoutService.getOrderToken() || []
+      'Guest-Order-Token': this.checkoutService.getOrderToken() || []
     });
   }
 
diff --git a/src/app/core/services/checkout.service.ts b/src/app/core/services/checkout.service.ts
index 44e09cec..b80b81f4 100644
--- a/src/app/core/services/checkout.service.ts
+++ b/src/app/core/services/checkout.service.ts
@@ -1,6 +1,5 @@
 import { map, tap, switchMap } from 'rxjs/operators';
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { getOrderNumber } from './../../checkout/reducers/selectors';
+import { HttpClient } from '@angular/common/http';
 import { CheckoutActions } from './../../checkout/actions/checkout.actions';
 import { Injectable, Inject, PLATFORM_ID } from '@angular/core';
 import { LineItem } from './../models/line_item';

From bba6bebf266c5a5e05ccd97ecfb280a01332c2a2 Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Wed, 5 Sep 2018 11:33:06 +0530
Subject: [PATCH 07/14] fixed order/success/failure page issue

---
 .../order-failed/order-failed.component.ts    | 23 ++++++++++---------
 .../order-success/order-success.component.ts  | 20 ++++++++--------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/app/checkout/order-failed/order-failed.component.ts b/src/app/checkout/order-failed/order-failed.component.ts
index 5cdbc136..b872901d 100644
--- a/src/app/checkout/order-failed/order-failed.component.ts
+++ b/src/app/checkout/order-failed/order-failed.component.ts
@@ -3,7 +3,7 @@ import { AppState } from './../../interfaces';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs/Observable';
 import { LayoutState } from './../../layout/reducers/layout.state';
-import { tap } from 'rxjs/operators';
+import { tap, switchMap } from 'rxjs/operators';
 import { LineItem } from './../../core/models/line_item';
 import { Order } from './../../core/models/order';
 import { UserService } from './../../user/services/user.service';
@@ -11,7 +11,7 @@ import { ActivatedRoute, Router, Params } from '@angular/router';
 import { Component, OnInit, PLATFORM_ID, Inject, OnDestroy } from '@angular/core';
 import { CheckoutService } from '../../core/services/checkout.service';
 import { isPlatformBrowser } from '../../../../node_modules/@angular/common';
-import { Subscription } from 'rxjs';
+import { Subscription, of } from 'rxjs';
 
 @Component({
   selector: 'app-order-failed',
@@ -40,18 +40,19 @@ export class OrderFailedComponent implements OnInit, OnDestroy {
     this.subscriptionList$.push(
       this.activatedRouter.queryParams
         .pipe(
-          tap(({ orderReferance }) => {
-            this.subscriptionList$.push(
-              this.userService
+          switchMap(params => {
+            const { reason, orderReferance } = params;
+            this.errorReason = reason;
+            if (!orderReferance) {
+              this.route.navigate(['/'])
+              return of(params);
+            }
+            return this.userService
               .getOrderDetail(orderReferance)
-              .subscribe(order => this.orderDetails = order)
-            )
+              .pipe(tap(order => this.orderDetails = order));
           })
         )
-        .subscribe(({ reason, orderReferance }) => {
-          this.errorReason = reason;
-          if (!orderReferance) { this.route.navigate(['/']) }
-        })
+        .subscribe()
     );
   }
 
diff --git a/src/app/checkout/order-success/order-success.component.ts b/src/app/checkout/order-success/order-success.component.ts
index 91997be2..29acc6c7 100644
--- a/src/app/checkout/order-success/order-success.component.ts
+++ b/src/app/checkout/order-success/order-success.component.ts
@@ -4,7 +4,7 @@ import { Order } from './../../core/models/order';
 import { UserService } from './../../user/services/user.service';
 import { ActivatedRoute, Router, Params } from '@angular/router';
 import { Component, OnInit, PLATFORM_ID, Inject, OnDestroy } from '@angular/core';
-import { Subscription, Observable, interval } from 'rxjs';
+import { Subscription, Observable, interval, of } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../interfaces';
 import { getlayoutStateJS } from '../../layout/reducers/layout.selector';
@@ -36,23 +36,23 @@ export class OrderSuccessComponent implements OnInit, OnDestroy {
     this.subscriptionList$.push(
       this.activatedRouter.queryParams
         .pipe(
-          tap(({ orderReferance }) => {
-            interval(200)
+          switchMap(params => {
+            const { orderReferance } = params;
+            if (!orderReferance) {
+              this.route.navigate(['/']);
+              return of(params);
+            }
+            return interval(2000)
               .pipe(
                 switchMap(_ => this.userService.getOrderDetail(orderReferance)),
                 take(30),
                 skipWhile(order => order.shipment_state !== 'ready'),
                 map(order => this.orderDetails = order),
                 take(1)
-              )
+              );
           })
         )
-        .subscribe(params => {
-          this.queryParams = params
-          if (!this.queryParams.orderReferance) {
-            this.route.navigate(['/'])
-          }
-        })
+        .subscribe()
     );
   }
 

From 29e60f22cbe8e4f5db2fb5ec458a9b06ffd08ae3 Mon Sep 17 00:00:00 2001
From: Gopal <gopalshimpi@gmail.com>
Date: Wed, 5 Sep 2018 13:28:19 +0530
Subject: [PATCH 08/14] Added fixes for line_item quantity addiotion in cart.

---
 .../line-item-list/line-item/line-item.component.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/app/checkout/cart/components/line-item-list/line-item/line-item.component.ts b/src/app/checkout/cart/components/line-item-list/line-item/line-item.component.ts
index bf21fdae..bf5dcfeb 100644
--- a/src/app/checkout/cart/components/line-item-list/line-item/line-item.component.ts
+++ b/src/app/checkout/cart/components/line-item-list/line-item/line-item.component.ts
@@ -5,6 +5,7 @@ import { CheckoutService } from './../../../../../core/services/checkout.service
 import { CheckoutActions } from './../../../../actions/checkout.actions';
 import { AppState } from './../../../../../interfaces';
 import { LineItem } from './../../../../../core/models/line_item';
+import { ToastrService } from 'ngx-toastr';
 
 @Component({
   selector: 'app-line-item',
@@ -24,6 +25,7 @@ export class LineItemComponent implements OnInit {
     private store: Store<AppState>,
     private checkoutService: CheckoutService,
     private checkoutActions: CheckoutActions,
+    private toastyService: ToastrService
   ) { }
 
   ngOnInit() {
@@ -55,7 +57,14 @@ export class LineItemComponent implements OnInit {
   }
 
   addQuantity() {
-    this.quantityCount += 1;
-    this.store.dispatch(this.checkoutActions.addToCart(this.lineItem.variant_id, 1));
+    const productInHands = this.lineItem.variant.total_on_hand;
+    const backOrderable = this.lineItem.variant.is_backorderable;
+
+    if (productInHands >= (this.quantityCount + 1) || backOrderable === true) {
+      this.quantityCount += 1;
+      this.store.dispatch(this.checkoutActions.addToCart(this.lineItem.variant_id, 1));
+    } else {
+      this.toastyService.error('Sorry! You can not add more quantity for this product.')
+    }
   }
 }

From 5a594fef1667d5d3a3d1960d794e5ef259d4bfa4 Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Wed, 5 Sep 2018 14:00:06 +0530
Subject: [PATCH 09/14] removed server ping for cod order status

---
 .../checkout/order-success/order-success.component.ts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/app/checkout/order-success/order-success.component.ts b/src/app/checkout/order-success/order-success.component.ts
index 29acc6c7..e05c9b21 100644
--- a/src/app/checkout/order-success/order-success.component.ts
+++ b/src/app/checkout/order-success/order-success.component.ts
@@ -42,14 +42,9 @@ export class OrderSuccessComponent implements OnInit, OnDestroy {
               this.route.navigate(['/']);
               return of(params);
             }
-            return interval(2000)
-              .pipe(
-                switchMap(_ => this.userService.getOrderDetail(orderReferance)),
-                take(30),
-                skipWhile(order => order.shipment_state !== 'ready'),
-                map(order => this.orderDetails = order),
-                take(1)
-              );
+            return this.userService
+              .getOrderDetail(orderReferance)
+              .pipe(tap(order => this.orderDetails = order));
           })
         )
         .subscribe()

From 51be24bbe6a18f938711fefddb05f44ac1e0264e Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Wed, 5 Sep 2018 14:03:51 +0530
Subject: [PATCH 10/14] added localstorage clear on logout

---
 src/app/core/services/auth.service.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts
index c352a93a..09873abb 100644
--- a/src/app/core/services/auth.service.ts
+++ b/src/app/core/services/auth.service.ts
@@ -157,8 +157,7 @@ export class AuthService {
       map((res: Response) => {
         // Setting token after login
         if (isPlatformBrowser(this.platformId)) {
-          localStorage.removeItem('user');
-          localStorage.removeItem('order');
+          localStorage.clear();
         }
         this.store.dispatch(this.actions.logoutSuccess());
         return res;

From f86012ae334f8870891b22fe925a89baa3bf003d Mon Sep 17 00:00:00 2001
From: Gopal <gopalshimpi@gmail.com>
Date: Wed, 5 Sep 2018 15:20:33 +0530
Subject: [PATCH 11/14] fixes for sign-up form.

---
 src/app/auth/components/sign-up/sign-up.component.html    | 8 ++++----
 src/app/auth/components/sign-up/sign-up.component.ts      | 7 ++++---
 .../update-password/update-password.component.ts          | 6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/app/auth/components/sign-up/sign-up.component.html b/src/app/auth/components/sign-up/sign-up.component.html
index 35df9205..085f5381 100644
--- a/src/app/auth/components/sign-up/sign-up.component.html
+++ b/src/app/auth/components/sign-up/sign-up.component.html
@@ -27,7 +27,7 @@ <h3 class="panel-title">Signup to {{title}}</h3>
                       autocomplete="off">
                     <div *ngIf="signUpForm.get('email').errors && signUpForm.get('email').touched">
                       <span class="register-error-icon">!</span>
-                      <p class="register-error-message">{{signUpForm.get('email').errors['msg']  || 'Please enter a valid email id'}}</p>
+                      <p class="register-error-message">{{signUpForm.get('email').errors.msg  || 'Please enter a valid email id'}}</p>
                     </div>
                   </div>
 
@@ -36,7 +36,7 @@ <h3 class="panel-title">Signup to {{title}}</h3>
                       placeholder="Choose Password" autocomplete="off">
                     <div *ngIf="signUpForm.get('password').errors && signUpForm.get('password').touched">
                       <span class="register-error-icon">!</span>
-                      <p class="register-error-message">{{signUpForm.get('password').errors['msg']  || 'Password must be at least 6 characters'}}</p>
+                      <p class="register-error-message">{{signUpForm.get('password').errors.msg  || 'Password must be at least 6 characters'}}</p>
                     </div>
                   </div>
 
@@ -53,7 +53,7 @@ <h3 class="panel-title">Signup to {{title}}</h3>
                     <input type="number" class="register-user-input-mobile register-user-input" name="mobile" formControlName="mobile" placeholder="Mobile Number (For order status updates)">
                     <div *ngIf="signUpForm.get('mobile').errors && signUpForm.get('mobile').touched">
                       <span class="register-error-icon">!</span>
-                      <p class="register-error-message">{{signUpForm.get('mobile').errors['msg']  || 'Please enter a valid mobile number (10 digits)'}}</p>
+                      <p class="register-error-message">{{signUpForm.get('mobile').errors.msg  || 'Please enter a valid mobile number (10 digits)'}}</p>
                     </div>
                   </div>
 
@@ -68,7 +68,7 @@ <h3 class="panel-title">Signup to {{title}}</h3>
 
                     <div *ngIf="signUpForm.get('gender').errors && signUpForm.get('gender').touched">
                       <span class="register-gender-error-icon register-error-icon">!</span>
-                      <p class="register-gender-error-message register-error-message">{{signUpForm.get('gender').errors['msg']  || 'Please select your gender'}}</p>
+                      <p class="register-gender-error-message register-error-message">{{signUpForm.get('gender').errors.msg  || 'Please select your gender'}}</p>
                     </div>
                   </fieldset>
                 </fieldset>
diff --git a/src/app/auth/components/sign-up/sign-up.component.ts b/src/app/auth/components/sign-up/sign-up.component.ts
index 0a599852..8016c445 100644
--- a/src/app/auth/components/sign-up/sign-up.component.ts
+++ b/src/app/auth/components/sign-up/sign-up.component.ts
@@ -37,6 +37,7 @@ export class SignUpComponent implements OnInit, OnDestroy {
   }
 
   onSubmit() {
+    debugger
     const values = this.signUpForm.value;
     const keys = Object.keys(values);
     this.formSubmit = true;
@@ -106,9 +107,9 @@ export class SignUpComponent implements OnInit, OnDestroy {
       const password = group.controls[passwordKey];
       const confirmPassword = group.controls[confirmPasswordKey];
 
-      return {
-        mismatchedPasswords: password.value !== confirmPassword.value
-      };
+      if (password.value !== confirmPassword.value) {
+        return { mismatchedPasswords: true }
+      }
     }
   }
 
diff --git a/src/app/auth/components/update-password/update-password.component.ts b/src/app/auth/components/update-password/update-password.component.ts
index 9174989b..d4c14f11 100644
--- a/src/app/auth/components/update-password/update-password.component.ts
+++ b/src/app/auth/components/update-password/update-password.component.ts
@@ -88,9 +88,9 @@ export class UpdatePasswordComponent implements OnInit {
       const password = group.controls[passwordKey];
       const confirmPassword = group.controls[confirmPasswordKey];
 
-      return {
-        mismatchedPasswords: password.value !== confirmPassword.value
-      };
+      if (password.value !== confirmPassword.value) {
+        return { mismatchedPasswords: true }
+      }
     }
   }
 

From 3487871bfd04ff1ba9289d175c065b063684aeb1 Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Wed, 5 Sep 2018 15:41:58 +0530
Subject: [PATCH 12/14] clear local order if order not present in api

---
 src/app/core/services/checkout.service.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/core/services/checkout.service.ts b/src/app/core/services/checkout.service.ts
index b80b81f4..5104889a 100644
--- a/src/app/core/services/checkout.service.ts
+++ b/src/app/core/services/checkout.service.ts
@@ -83,16 +83,17 @@ export class CheckoutService {
         } else {
           if (this.getOrderToken()) {
             const s_order = JSON.parse(localStorage.getItem('order'));
-            return this
-              .getOrder(s_order.order_number)
-              .pipe(tap(_order => this.store.dispatch(this.actions.fetchCurrentOrderSuccess(_order))));
+            return this.getOrder(s_order.order_number);
           } else {
             return of(null);
           }
         }
       }),
       map(order => {
-        if (!order) { return }
+        if (!order) {
+          localStorage.removeItem('order');
+          return;
+        }
         const { token, number } = order;
         this.setOrderTokenInLocalStorage({ order_token: token, order_number: number });
         return this.store.dispatch(this.actions.fetchCurrentOrderSuccess(order));

From e703b7489b907584db49203f8a003d246896a391 Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Wed, 5 Sep 2018 15:53:39 +0530
Subject: [PATCH 13/14] Bug fix

---
 src/app/core/services/checkout.service.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/core/services/checkout.service.ts b/src/app/core/services/checkout.service.ts
index 5104889a..bb338dbe 100644
--- a/src/app/core/services/checkout.service.ts
+++ b/src/app/core/services/checkout.service.ts
@@ -56,7 +56,11 @@ export class CheckoutService {
           this.toastyService.success('Success!', 'Cart updated!');
           return lineItem;
         },
-        _ => this.toastyService.error('Something went wrong!', 'Failed')
+        _ => {
+          localStorage.removeItem('order');
+          this.createNewLineItem(variant_id, quantity);
+          this.toastyService.error('Something went wrong!', 'Failed');
+        }
       )
     );
   }

From 7db36b2ae08a97e76053af3ec91f241d80e496c5 Mon Sep 17 00:00:00 2001
From: Pankaj Rawat <pankajrawat19sept@gmail.com>
Date: Wed, 5 Sep 2018 15:57:45 +0530
Subject: [PATCH 14/14] bug fix

---
 src/app/core/services/checkout.service.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/core/services/checkout.service.ts b/src/app/core/services/checkout.service.ts
index bb338dbe..2e3de08e 100644
--- a/src/app/core/services/checkout.service.ts
+++ b/src/app/core/services/checkout.service.ts
@@ -58,8 +58,7 @@ export class CheckoutService {
         },
         _ => {
           localStorage.removeItem('order');
-          this.createNewLineItem(variant_id, quantity);
-          this.toastyService.error('Something went wrong!', 'Failed');
+          this.createNewLineItem(variant_id, quantity).subscribe();
         }
       )
     );