Multiple updates

src/components/admin/status/editTimeShareAdminPage.vue

@@ -477,6 +477,7 @@
                   name="agency"
                   v-model="weekParam.agencyId"
                 >
+                  <option value=""></option>
                   <option v-for="(item, i) in agencies" :key="i" :value="item.id">
                     {{ item.agencyName }}
                   </option>
@@ -491,6 +492,7 @@
                   v-model="weekParam.agentId"
                   :disabled="!weekParam.agencyId"
                 >
+                  <option value=""></option>
                   <option v-for="(item, i) in displayNotDeletedAgents" :key="i" :value="item.id">
                     <div>{{ item.name + " " + item.surname }}</div>
                   </option>
@@ -807,9 +809,14 @@ export default {
       delete this.weekParam.Owner;
       delete this.weekParam.agency;
       delete this.weekParam.agent;
-      delete this.status;
+      //delete this.status;
       delete this.weekParam.owner.howMarried;
       delete this.weekParam.cellNumber;
+      this.week.owner.name =
+        this.week.owner.name.charAt(0).toUpperCase() + this.week.owner.name.slice(1);
+      this.week.owner.surname =
+        this.week.owner.surname.charAt(0).toUpperCase() + this.week.owner.surname.slice(1);
+      this.weekParam.statusId = this.selectedStatus.id;
       //console.log(JSON.stringify(this.weekParam));
       //console.log(this.weekParam);
       this.editSave(this.weekParam).then(() => {

src/components/admin/status/timeshareAdminList.vue

@@ -55,6 +55,7 @@
 
             <tbody>
               <tr v-for="(item, i) in DisplayItems" :key="i">
+                <td>#{{ item.id }}</td>
                 <td>{{ item.owner }}</td>
                 <td>{{ item.agent }}</td>
                 <td>{{ item.resort.resortName }}</td>
@@ -163,6 +164,7 @@ export default {
       reverse: true,
       sortKey: "id",
       displayColumns: [
+        "Ref",
         "Owner",
         "Agent",
         "Resort",
@@ -176,6 +178,7 @@ export default {
         "Status"
       ],
       columns: [
+        "id",
         "owner",
         "agent",
         "resort",

src/components/shared/contactUsSection.vue

@@ -106,7 +106,7 @@ export default {
     async sendMail() {
       var mailObj = {
         //toAddress: "abigaildf@provision-sa.com",
-        fromAddress: "jlouw365@gmail.com",
+        //fromAddress: "jlouw365@gmail.com",
         name: this.name,
         email: this.email,
         phone: this.phone,

src/components/timeshare/buy/latestWeeks.vue

@@ -2,19 +2,19 @@
   <section id="portfolio">
     <div class="container">
       <div v-if="boolLoaded" class="row">
-        <div v-for="week in latestWeeks" :key="week.id" class="col-lg-3 col-md-4 col-sm-6">
+        <div v-for="week in getLatestWeeks" :key="week.id" class="col-lg-3 col-md-4 col-sm-6">
           <div class="portfolio-item justify-content-md-center my-3" style="min-height:430px">
             <img :src="week.image" alt="" style="max-height: 250px" />
             <div class="my-3">
-              <h4>{{ week.resort.resortName }}</h4>
+              <h4>{{ week.resortName }}</h4>
               <p>
-                <strong>Week</strong> {{ week.weekNumber }} &nbsp;|&nbsp;
-                <strong>Season</strong> Peak <br />
+                <strong>Week</strong> {{ week.module }} &nbsp;|&nbsp; <strong>Season</strong>
+                {{ week.season }} <br />
                 <strong>Levy</strong> R{{ week.levyAmount }} &nbsp;|&nbsp;
                 <strong>Week Reference</strong> #{{ week.id }}
               </p>
               <h4>R{{ week.sellPrice }}</h4>
-              <router-link :to="'/resort/' + week.resort.resortCode" class="btn-white-border"
+              <router-link :to="'/resort/' + week.resortCode" class="btn-white-border"
                 ><i class="fa fa-search"></i> VIEW</router-link
               >
             </div>
@@ -27,21 +27,24 @@
 
 <script>
 /* eslint-disable */
-import { mapState, mapActions } from "vuex";
+import { mapState, mapActions, mapGetters } from "vuex";
 export default {
   computed: {
-    ...mapState("weekList", ["weeks", "status"]),
-    ...mapState("resort", ["resort", "description", "images", "layout"])
+    ...mapState("resort", ["resort", "description", "images", "layout"]),
+    ...mapGetters("timeshare", ["getLatestWeeks"])
   },
-  mounted() {
-    this.populateWeeks();
+  mounted() {},
+  created() {
+    this.retrieveLatestWeeks().then(() => {
+      this.boolLoaded = true;
+    });
   },
-  created() {},
   data() {
     return {
       latestWeeks: [],
       boolLoaded: false,
-      currImage: ""
+      currImage: "",
+      weeks: []
     };
   },
   methods: {
@@ -49,22 +52,8 @@ export default {
       this.$router.push(`/resort/${item.resort.resortCode}/${item.unitNumber}`);
     },
     ...mapActions("weekList", ["getWeeks", "applyResortFilter"]),
-    ...mapActions("resort", ["getImage1"]),
-    async populateWeeks() {
-      await this.getWeeks();
-
-      var dispArr = [];
-      for (let i = 0; i < 4; i++) {
-        await this.getImage1(this.weeks[i].resort.resortCode).then(res => {
-          dispArr.push(this.weeks[i]);
-          dispArr[i].image = "data:image/jpeg;base64," + res;
-        });
-      }
-      console.log(dispArr);
-
-      this.latestWeeks = dispArr;
-      this.boolLoaded = true;
-    }
+    ...mapActions("resort", ["getImage1", "getResortData"]),
+    ...mapActions("timeshare", ["retrieveLatestWeeks"])
   }
 };
 </script>

src/components/timeshare/buy/weekListComponent.vue

@@ -149,8 +149,14 @@ export default {
       return list.slice(startSlice, endSlice);
     },
     PageCount() {
+      var list = [];
+      this.filteredWeeks.forEach(week => {
+        if (!week.isTender) {
+          list.push(week);
+        }
+      });
       return this.visibleItemsPerPageCount !== 0
-        ? Math.ceil(this.filteredWeeks.length / this.visibleItemsPerPageCount)
+        ? Math.ceil(list.length / this.visibleItemsPerPageCount)
         : 1;
     }
   },

src/components/timeshare/sell/contentSection.vue

@@ -29,6 +29,7 @@
                       name="agency"
                       v-model="sellItem.agencyId"
                     >
+                      <option value=""></option>
                       <option v-for="(item, i) in agencies" :key="i" :value="item.id">
                         {{ item.agencyName }}
                       </option>
@@ -43,6 +44,7 @@
                       v-model="sellItem.agentId"
                       :disabled="!sellItem.agencyId"
                     >
+                      <option value=""></option>
                       <option
                         v-for="(item, i) in displayNotDeletedAgents"
                         :key="i"

src/store/modules/timeshare/resort.js

@@ -153,7 +153,6 @@ export default {
       await axios
         .get(`/api/resort/GetResortData/${resortCode}`)
         .then(result => {
-          console.log(result.data);
           commit("setResort", result.data);
         })
         .catch(error => console.log(new Error(error.message)));

src/store/modules/timeshare/timeshare.js

@@ -19,6 +19,7 @@ export default {
     agents: [],
     maritalStatus: MaritalStatus,
     result: undefined,
+    latestWeeks: [],
     sellItem: {
       referedByAgent: false,
       agentId: undefined,
@@ -112,6 +113,9 @@ export default {
         count++
       })
       Object.assign(state.agents[index], agent)
+    },
+    getLatestWeeks(state, data){
+      state.latestWeeks = data
     }
   },
   getters: {
@@ -133,7 +137,8 @@ export default {
           return res.resortName;
         }
       };
-    }
+    },
+    getLatestWeeks: (state) => state.latestWeeks
   },
   actions: {
     initTimeshare({ commit, dispatch }, timeshareId) {
@@ -153,7 +158,6 @@ export default {
       axios
         .get(`api/timeshareweek/${timeshareId}`)
         .then(result => {
-          console.log(result.data);
           commit("setWeekDetail", result.data);
         })
         .catch(console.error);
@@ -211,6 +215,12 @@ export default {
         }
       }
     },
+    async retrieveLatestWeeks({commit}){
+      await axios.get('/api/timeshareWeek/GetLatest')
+      .then((result) => {
+        commit('getLatestWeeks', result.data)
+      })
+    },
     onResortChange({ commit }, resort) {
       commit("changeResort", resort);
     },