Merge branch 'master' of http://provision-sa.co.za:3000/Provision/UnivateProperties into master

src/components/admin/status/editTimeShareAdminPage.vue

@@ -1,6 +1,7 @@
 <template>
   <main id="main">
-    <section id="contact2">
+    <div v-if="wait" id="preloader"></div>
+    <section v-else id="contact2">
       <div class="container">
         <div class="row">
           <div class="col-lg-12">
@@ -474,7 +475,7 @@ export default {
   },
   data() {
     return {
-      wait: false,
+      wait: true,
       userLoggedIn: Log.isLoggedIn(),
       listedWeekId: this.$route.params.id,
       selectedItems: [],
@@ -496,6 +497,9 @@ export default {
     Alert
   },
   async mounted() {
+    this.getWeek(this.weekParam.id).then(() => {
+      this.wait = false;
+    });
     if (this.sellItem.id) {
       this.newSale();
     }
@@ -507,7 +511,7 @@ export default {
     this.initTimeshare(0);
     this.getIndividual(Log.getUser().id);
     this.getBanks();
-    this.getWeek(this.weekParam.id);
+    //this.getWeek(this.weekParam.id);
     this.selectedRegion = this.weekParam.region.regionCode;
     this.selectedResort = this.weekParam.resort.resortCode;
     this.selectedBedrooms = this.weekParam.bedrooms;

src/store/modules/timeshare/myWeeks.js

@@ -1,11 +1,11 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable guard-for-in */
-import axios from 'axios';
+import axios from "axios";
 
 export default {
   namespaced: true,
   state: {
-    items: [],
+    items: []
   },
   mutations: {
     setItems(state, list) {
@@ -15,38 +15,34 @@ export default {
       state.week = item;
     },
     updateItem(state, item) {
-      var index
-    var count = 0
-    state.items.forEach((el) => {
-      if (el.id === item.id) {
-        index = count
-      }
-      count++
-    })
+      var index;
+      var count = 0;
+      state.items.forEach(el => {
+        if (el.id === item.id) {
+          index = count;
+        }
+        count++;
+      });
 
-    Object.assign(state.items[index], item)
-    },
+      Object.assign(state.items[index], item);
+    }
   },
   getters: {
     getNeedsVerify(state) {
-      return _.filter(state.items, x => x.status && x.status.code === 'A1');
-    },
+      return _.filter(state.items, x => x.status && x.status.code === "A1");
+    }
     // removeListing(state, id) {
     //   state.myWeeks.pop(state.myWeeks.find(w => w.id === id));
     // },
   },
   actions: {
-    getItems({
-      commit,
-    }, id) {
-      axios.get(`/api/timeshareweek/getMyWeek/${id}`).then(r => commit('setItems', r.data)).catch(
-        console
-          .error,
-      );
+    getItems({ commit }, id) {
+      axios
+        .get(`/api/timeshareweek/getMyWeek/${id}`)
+        .then(r => commit("setItems", r.data))
+        .catch(console.error);
     },
-    verifyWeek({
-      commit,
-    }, id) {
+    verifyWeek({ commit }, id) {
       try {
         axios.post(`/api/timeshareweek/verifyweek/${id}`).catch(console.error);
       } catch (err) {
@@ -62,22 +58,22 @@ export default {
     //   .then(result => commit('removeListing', id))
     //   .catch(console.error);
     // }
-    getWeek({ commit }, id) {
-      axios
-      .get(`/api/timeshareweek/${id}`)
-      .then(r => {
-        console.log(JSON.stringify(r));
-        commit('setItem', r.data);
-      })
-      .catch(console.error);
+    async getWeek({ commit }, id) {
+      await axios
+        .get(`/api/timeshareweek/${id}`)
+        .then(r => {
+          console.log(JSON.stringify(r));
+          commit("setItem", r.data);
+        })
+        .catch(console.error);
     },
     editSave({ commit }, week) {
       axios
-      .put(`/api/timeshareweek`, week)
-      .then(r => {
-        commit('updateItem', r.data);
-      })
-      .catch(console.error);
+        .put(`/api/timeshareweek`, week)
+        .then(r => {
+          commit("updateItem", r.data);
+        })
+        .catch(console.error);
     }
-  },
+  }
 };