Merge branch 'adarsh' into 'master'

src/app/app.component.html

@@ -28,7 +28,8 @@
                             <div class="sub_menu">
                                 <ul *ngIf="categoryService.activecategories">
                                     <ion-menu-toggle>
-                                        <li *ngFor="let category of categoryService.activecategories" (click)="goToPage('catstorelist', category)">
+                                        <li *ngFor="let category of categoryService.activecategories"
+                                            (click)="goToPage('catstorelist', category)">
                                             {{ category.catName }}
                                         </li>
                                     </ion-menu-toggle>

src/app/contact/contact.page.ts

@@ -51,8 +51,12 @@ export class ContactPage implements OnInit {
     this.submitted = true;
     console.log(form.value);
     if (form.valid && form.value.message !== '') {
-      const contData = { ...this.contactData, from: this.userData.emailId };
+      this.service.get('orderId').then((orderId) => {
+        const newOrder = orderId;
+        const contData = { ...this.contactData, from: this.userData.emailId, orderId: newOrder };
         this.contactService.contactCreate(contData);
+      });
+
     } else {
       console.log('form not valid');
       this.submitted = false;

src/app/orderplaced/orderplaced.page.html

@@ -106,7 +106,7 @@
         {{data.deliveryAddress.building}}, <br />
         {{data.deliveryAddress.landmark}}
       </h5>
-      <button class="cancel_btn" (click)="goToPage('contact')"
+      <button class="cancel_btn" (click)="cancelOrder(data.orderId)"
         *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
         CANCEL THIS ORDER
       </button>

src/app/orderplaced/orderplaced.page.ts

@@ -78,6 +78,11 @@ export class OrderplacedPage implements OnInit {
     document.body.scrollTop = document.documentElement.scrollTop = 0;
   }
 
+  cancelOrder(orderId) {
+    this.service.set('orderId', orderId);
+    this.router.navigateByUrl('contact');
+  }
+
   changeAddress(orderId) {
     this.service.set('orderId', orderId);
     this.router.navigateByUrl('changeaddress');

src/app/preference/preference.page.ts

@@ -46,7 +46,7 @@ export class PreferencePage implements OnInit {
     });
   }
 
-  ngOnInit() {}
+  ngOnInit() { }
 
   selectPrefernce(preferenceId) {
     console.log(this.userPrefence);
@@ -72,8 +72,8 @@ export class PreferencePage implements OnInit {
     setTimeout(() => {
       this.loader = false;
       this.successState = false;
-      if (this.type === 1) {
       this.service.set('type', 0);
+      if (this.type === 1) {
         this.router.navigateByUrl('home', { queryParams: null });
       } else {
         this.goBack();

src/config/address.service.ts

@@ -55,7 +55,6 @@ export class AddressService {
       ref => ref.where('status', '==', state).where('uid', '==', userId).where('defaultVal', '==', 1)
     );
     orderRef.valueChanges().subscribe(value => {
-      this.addressList = [];
       const res = value;
       if (res.length > 0) {
         const item = res[0];

src/config/contact.service.ts

@@ -25,13 +25,13 @@ export class ContactService {
     this.loader = true;
     this.afs
       .collection('contacts')
-      .add({})
+      .add(data)
       .then(docRef => {
         data.contactId = docRef.id;
         this.afs
           .collection('contacts')
           .doc(data.contactId)
-          .set(data)
+          .update({ contactId: data.contactId })
           .then(() => {
             this.service
               .showToast('Thank you for your feedback!', 'top', 'my-toast', 500)

src/config/order.service.ts

@@ -134,14 +134,7 @@ export class OrdersService {
     const promise = new Promise(resolve => {
       distinctShops.forEach(item => {
         console.log(item);
-        this.afs
-          .collection('orders')
-          .add({
-            shopper: firebase.firestore().doc('/shoppers/' + item),
-            bookDate: firebase.firestore.FieldValue.serverTimestamp()
-          })
-          .then(docRef => {
-            const neworderId = docRef.id;
+
         const pickup = new firebase.firestore.GeoPoint(10.7231, 76.1234);
         const products = {};
         const cartItem = cartGroup[item];
@@ -174,7 +167,7 @@ export class OrdersService {
           bookDate: firebase.firestore.FieldValue.serverTimestamp(),
           orderDate: Math.floor(Date.now() / 1000),
           orderCode: this.orderCode(),
-              orderId: neworderId,
+          orderId: '',
           orderStatus: 1,
           pickupAddress: '',
           pickupLocation: pickup,
@@ -200,8 +193,13 @@ export class OrdersService {
 
         this.afs
           .collection('orders')
+          .add(orderItem)
+          .then(docRef => {
+            const neworderId = docRef.id;
+            this.afs
+              .collection('orders')
               .doc(neworderId)
-              .set(orderItem)
+              .update({ orderId: neworderId })
               .then(() => {
                 // console.log('Booking Successfully');
                 // this.router.navigateByUrl('cart');
@@ -209,8 +207,7 @@ export class OrdersService {
                 resolve('Cart to Order Successfully');
                 document.body.scrollTop = document.documentElement.scrollTop = 0;
               });
-          })
-          .catch(error => {
+          }).catch(error => {
             console.error('Error adding document: ', error);
           });
       });