Merge branch 'adarsh' into 'master'

src/app/cart/cart.page.html

@@ -127,16 +127,16 @@
                                 <!-- <span class="floatRight">CHANGE</span> -->
                                 <div class="clear"></div>
                             </h5>
-                            <!-- <div class="payment_method">
+                            <div class="payment_method">
                                 <input type="radio" name="payments" id="cod" name="radio-group" checked="true"
                                     (click)="getwaycod()" />
                                 <label for="cod">
-                                    <p>COD</p>
+                                    <p>Credit Card</p>
                                 </label>
-                            </div> -->
+                            </div>
                             <div class="payment_method">
                                 <input type="radio" name="payments" id="paypal" name="radio-group"
-                                    (click)="getwaypaypal()" checked="true" />
+                                    (click)="getwaypaypal()" />
                                 <label for="paypal">
                                     <p>PayPal</p>
                                 </label>

src/app/cart/cart.page.ts

@@ -70,7 +70,7 @@ export class CartPage implements OnInit {
     this.bookDate = this.formatDate();
     this.currentIndex = 0;
     this.count = 1;
-    this.gateway = 1;
+    this.gateway = 4;
     this.deliveryCharge = 0;
     this.taxAmount = 0;
     this.discountApplied = 0;
@@ -157,7 +157,7 @@ export class CartPage implements OnInit {
 
   getwaycod() {
     this.gateway = 4;
-    this.paymentMethod = 'COD';
+    this.paymentMethod = 'Credit Card';
   }
 
   async finishpop() {

src/app/changeaddress/changeaddress.page.html

@@ -37,11 +37,8 @@
                 <div class="md-errors-spacer" [hidden]="building.valid || landmark.pristine" class="ion-padding-start">
                     Building Name is required
                 </div>
-                <input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required
+                <input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark"
                     placeholder="Landmark" />
-                <div class="md-errors-spacer" [hidden]="landmark.valid || landmark.pristine" class="ion-padding-start">
-                    Landmark is required
-                </div>
                 <ion-grid>
                     <ion-row>
                         <ion-col>

src/app/changeaddress/changeaddress.page.ts

@@ -183,7 +183,7 @@ export class ChangeaddressPage implements OnInit {
             address: This.address,
             addressType: data.addressType,
             building: data.building,
-            landmark: data.landmark,
+            landmark: data.landmark !== undefined ? data.landmark : '',
             defaultVal: 0,
             uid: This.uid,
             latLng: new firebase.firestore.GeoPoint(

src/app/orderplaced/orderplaced.page.html

@@ -85,7 +85,10 @@
                 </li>
             </ul>
         </div>
-        <div class="product_detail" *ngFor="let product of data.product">
+        <div class="product_detail" *ngFor="let product of data.product; let i = index">
+            <h5 *ngIf="data.orderStatus >= 3 || data.orderStatus < 7 && i == 0">
+                Delivery time : <span><b>{{deliveryTime}}</b></span>
+            </h5>
             <h6>
                 <span *ngIf="product.color !== 'No-Color'">Color: {{product.color}}, </span>
                 <span *ngIf="product.size !== 'Any-Size'">Size: {{product.size}}</span>
@@ -95,9 +98,7 @@
                 Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span
                     class="afterpay">{{data.paymentMode}}</span>
             </h5>
-            <h5 *ngIf="data.orderStatus >= 3 || data.orderStatus < 7">
-                Delivery time : <span>{{deliveryTime}}</span>
-            </h5>
+
             <h5>Order Status : <span>{{getStatus(data.orderStatus)}}</span></h5>
         </div>