Browse Source

Multiple updates

master
30117125 4 years ago
parent
commit
7ba43f7c7f

+ 8
- 1
src/components/admin/status/editTimeShareAdminPage.vue View File

477
                   name="agency"
477
                   name="agency"
478
                   v-model="weekParam.agencyId"
478
                   v-model="weekParam.agencyId"
479
                 >
479
                 >
480
+                  <option value=""></option>
480
                   <option v-for="(item, i) in agencies" :key="i" :value="item.id">
481
                   <option v-for="(item, i) in agencies" :key="i" :value="item.id">
481
                     {{ item.agencyName }}
482
                     {{ item.agencyName }}
482
                   </option>
483
                   </option>
491
                   v-model="weekParam.agentId"
492
                   v-model="weekParam.agentId"
492
                   :disabled="!weekParam.agencyId"
493
                   :disabled="!weekParam.agencyId"
493
                 >
494
                 >
495
+                  <option value=""></option>
494
                   <option v-for="(item, i) in displayNotDeletedAgents" :key="i" :value="item.id">
496
                   <option v-for="(item, i) in displayNotDeletedAgents" :key="i" :value="item.id">
495
                     <div>{{ item.name + " " + item.surname }}</div>
497
                     <div>{{ item.name + " " + item.surname }}</div>
496
                   </option>
498
                   </option>
807
       delete this.weekParam.Owner;
809
       delete this.weekParam.Owner;
808
       delete this.weekParam.agency;
810
       delete this.weekParam.agency;
809
       delete this.weekParam.agent;
811
       delete this.weekParam.agent;
810
-      delete this.status;
812
+      //delete this.status;
811
       delete this.weekParam.owner.howMarried;
813
       delete this.weekParam.owner.howMarried;
812
       delete this.weekParam.cellNumber;
814
       delete this.weekParam.cellNumber;
815
+      this.week.owner.name =
816
+        this.week.owner.name.charAt(0).toUpperCase() + this.week.owner.name.slice(1);
817
+      this.week.owner.surname =
818
+        this.week.owner.surname.charAt(0).toUpperCase() + this.week.owner.surname.slice(1);
819
+      this.weekParam.statusId = this.selectedStatus.id;
813
       //console.log(JSON.stringify(this.weekParam));
820
       //console.log(JSON.stringify(this.weekParam));
814
       //console.log(this.weekParam);
821
       //console.log(this.weekParam);
815
       this.editSave(this.weekParam).then(() => {
822
       this.editSave(this.weekParam).then(() => {

+ 3
- 0
src/components/admin/status/timeshareAdminList.vue View File

55
 
55
 
56
             <tbody>
56
             <tbody>
57
               <tr v-for="(item, i) in DisplayItems" :key="i">
57
               <tr v-for="(item, i) in DisplayItems" :key="i">
58
+                <td>#{{ item.id }}</td>
58
                 <td>{{ item.owner }}</td>
59
                 <td>{{ item.owner }}</td>
59
                 <td>{{ item.agent }}</td>
60
                 <td>{{ item.agent }}</td>
60
                 <td>{{ item.resort.resortName }}</td>
61
                 <td>{{ item.resort.resortName }}</td>
163
       reverse: true,
164
       reverse: true,
164
       sortKey: "id",
165
       sortKey: "id",
165
       displayColumns: [
166
       displayColumns: [
167
+        "Ref",
166
         "Owner",
168
         "Owner",
167
         "Agent",
169
         "Agent",
168
         "Resort",
170
         "Resort",
176
         "Status"
178
         "Status"
177
       ],
179
       ],
178
       columns: [
180
       columns: [
181
+        "id",
179
         "owner",
182
         "owner",
180
         "agent",
183
         "agent",
181
         "resort",
184
         "resort",

+ 1
- 1
src/components/shared/contactUsSection.vue View File

106
     async sendMail() {
106
     async sendMail() {
107
       var mailObj = {
107
       var mailObj = {
108
         //toAddress: "abigaildf@provision-sa.com",
108
         //toAddress: "abigaildf@provision-sa.com",
109
-        fromAddress: "jlouw365@gmail.com",
109
+        //fromAddress: "jlouw365@gmail.com",
110
         name: this.name,
110
         name: this.name,
111
         email: this.email,
111
         email: this.email,
112
         phone: this.phone,
112
         phone: this.phone,

+ 17
- 28
src/components/timeshare/buy/latestWeeks.vue View File

2
   <section id="portfolio">
2
   <section id="portfolio">
3
     <div class="container">
3
     <div class="container">
4
       <div v-if="boolLoaded" class="row">
4
       <div v-if="boolLoaded" class="row">
5
-        <div v-for="week in latestWeeks" :key="week.id" class="col-lg-3 col-md-4 col-sm-6">
5
+        <div v-for="week in getLatestWeeks" :key="week.id" class="col-lg-3 col-md-4 col-sm-6">
6
           <div class="portfolio-item justify-content-md-center my-3" style="min-height:430px">
6
           <div class="portfolio-item justify-content-md-center my-3" style="min-height:430px">
7
             <img :src="week.image" alt="" style="max-height: 250px" />
7
             <img :src="week.image" alt="" style="max-height: 250px" />
8
             <div class="my-3">
8
             <div class="my-3">
9
-              <h4>{{ week.resort.resortName }}</h4>
9
+              <h4>{{ week.resortName }}</h4>
10
               <p>
10
               <p>
11
-                <strong>Week</strong> {{ week.weekNumber }} &nbsp;|&nbsp;
12
-                <strong>Season</strong> Peak <br />
11
+                <strong>Week</strong> {{ week.module }} &nbsp;|&nbsp; <strong>Season</strong>
12
+                {{ week.season }} <br />
13
                 <strong>Levy</strong> R{{ week.levyAmount }} &nbsp;|&nbsp;
13
                 <strong>Levy</strong> R{{ week.levyAmount }} &nbsp;|&nbsp;
14
                 <strong>Week Reference</strong> #{{ week.id }}
14
                 <strong>Week Reference</strong> #{{ week.id }}
15
               </p>
15
               </p>
16
               <h4>R{{ week.sellPrice }}</h4>
16
               <h4>R{{ week.sellPrice }}</h4>
17
-              <router-link :to="'/resort/' + week.resort.resortCode" class="btn-white-border"
17
+              <router-link :to="'/resort/' + week.resortCode" class="btn-white-border"
18
                 ><i class="fa fa-search"></i> VIEW</router-link
18
                 ><i class="fa fa-search"></i> VIEW</router-link
19
               >
19
               >
20
             </div>
20
             </div>
27
 
27
 
28
 <script>
28
 <script>
29
 /* eslint-disable */
29
 /* eslint-disable */
30
-import { mapState, mapActions } from "vuex";
30
+import { mapState, mapActions, mapGetters } from "vuex";
31
 export default {
31
 export default {
32
   computed: {
32
   computed: {
33
-    ...mapState("weekList", ["weeks", "status"]),
34
-    ...mapState("resort", ["resort", "description", "images", "layout"])
33
+    ...mapState("resort", ["resort", "description", "images", "layout"]),
34
+    ...mapGetters("timeshare", ["getLatestWeeks"])
35
   },
35
   },
36
-  mounted() {
37
-    this.populateWeeks();
36
+  mounted() {},
37
+  created() {
38
+    this.retrieveLatestWeeks().then(() => {
39
+      this.boolLoaded = true;
40
+    });
38
   },
41
   },
39
-  created() {},
40
   data() {
42
   data() {
41
     return {
43
     return {
42
       latestWeeks: [],
44
       latestWeeks: [],
43
       boolLoaded: false,
45
       boolLoaded: false,
44
-      currImage: ""
46
+      currImage: "",
47
+      weeks: []
45
     };
48
     };
46
   },
49
   },
47
   methods: {
50
   methods: {
49
       this.$router.push(`/resort/${item.resort.resortCode}/${item.unitNumber}`);
52
       this.$router.push(`/resort/${item.resort.resortCode}/${item.unitNumber}`);
50
     },
53
     },
51
     ...mapActions("weekList", ["getWeeks", "applyResortFilter"]),
54
     ...mapActions("weekList", ["getWeeks", "applyResortFilter"]),
52
-    ...mapActions("resort", ["getImage1"]),
53
-    async populateWeeks() {
54
-      await this.getWeeks();
55
-
56
-      var dispArr = [];
57
-      for (let i = 0; i < 4; i++) {
58
-        await this.getImage1(this.weeks[i].resort.resortCode).then(res => {
59
-          dispArr.push(this.weeks[i]);
60
-          dispArr[i].image = "data:image/jpeg;base64," + res;
61
-        });
62
-      }
63
-      console.log(dispArr);
64
-
65
-      this.latestWeeks = dispArr;
66
-      this.boolLoaded = true;
67
-    }
55
+    ...mapActions("resort", ["getImage1", "getResortData"]),
56
+    ...mapActions("timeshare", ["retrieveLatestWeeks"])
68
   }
57
   }
69
 };
58
 };
70
 </script>
59
 </script>

+ 7
- 1
src/components/timeshare/buy/weekListComponent.vue View File

149
       return list.slice(startSlice, endSlice);
149
       return list.slice(startSlice, endSlice);
150
     },
150
     },
151
     PageCount() {
151
     PageCount() {
152
+      var list = [];
153
+      this.filteredWeeks.forEach(week => {
154
+        if (!week.isTender) {
155
+          list.push(week);
156
+        }
157
+      });
152
       return this.visibleItemsPerPageCount !== 0
158
       return this.visibleItemsPerPageCount !== 0
153
-        ? Math.ceil(this.filteredWeeks.length / this.visibleItemsPerPageCount)
159
+        ? Math.ceil(list.length / this.visibleItemsPerPageCount)
154
         : 1;
160
         : 1;
155
     }
161
     }
156
   },
162
   },

+ 2
- 0
src/components/timeshare/sell/contentSection.vue View File

29
                       name="agency"
29
                       name="agency"
30
                       v-model="sellItem.agencyId"
30
                       v-model="sellItem.agencyId"
31
                     >
31
                     >
32
+                      <option value=""></option>
32
                       <option v-for="(item, i) in agencies" :key="i" :value="item.id">
33
                       <option v-for="(item, i) in agencies" :key="i" :value="item.id">
33
                         {{ item.agencyName }}
34
                         {{ item.agencyName }}
34
                       </option>
35
                       </option>
43
                       v-model="sellItem.agentId"
44
                       v-model="sellItem.agentId"
44
                       :disabled="!sellItem.agencyId"
45
                       :disabled="!sellItem.agencyId"
45
                     >
46
                     >
47
+                      <option value=""></option>
46
                       <option
48
                       <option
47
                         v-for="(item, i) in displayNotDeletedAgents"
49
                         v-for="(item, i) in displayNotDeletedAgents"
48
                         :key="i"
50
                         :key="i"

+ 0
- 1
src/store/modules/timeshare/resort.js View File

153
       await axios
153
       await axios
154
         .get(`/api/resort/GetResortData/${resortCode}`)
154
         .get(`/api/resort/GetResortData/${resortCode}`)
155
         .then(result => {
155
         .then(result => {
156
-          console.log(result.data);
157
           commit("setResort", result.data);
156
           commit("setResort", result.data);
158
         })
157
         })
159
         .catch(error => console.log(new Error(error.message)));
158
         .catch(error => console.log(new Error(error.message)));

+ 12
- 2
src/store/modules/timeshare/timeshare.js View File

19
     agents: [],
19
     agents: [],
20
     maritalStatus: MaritalStatus,
20
     maritalStatus: MaritalStatus,
21
     result: undefined,
21
     result: undefined,
22
+    latestWeeks: [],
22
     sellItem: {
23
     sellItem: {
23
       referedByAgent: false,
24
       referedByAgent: false,
24
       agentId: undefined,
25
       agentId: undefined,
112
         count++
113
         count++
113
       })
114
       })
114
       Object.assign(state.agents[index], agent)
115
       Object.assign(state.agents[index], agent)
116
+    },
117
+    getLatestWeeks(state, data){
118
+      state.latestWeeks = data
115
     }
119
     }
116
   },
120
   },
117
   getters: {
121
   getters: {
133
           return res.resortName;
137
           return res.resortName;
134
         }
138
         }
135
       };
139
       };
136
-    }
140
+    },
141
+    getLatestWeeks: (state) => state.latestWeeks
137
   },
142
   },
138
   actions: {
143
   actions: {
139
     initTimeshare({ commit, dispatch }, timeshareId) {
144
     initTimeshare({ commit, dispatch }, timeshareId) {
153
       axios
158
       axios
154
         .get(`api/timeshareweek/${timeshareId}`)
159
         .get(`api/timeshareweek/${timeshareId}`)
155
         .then(result => {
160
         .then(result => {
156
-          console.log(result.data);
157
           commit("setWeekDetail", result.data);
161
           commit("setWeekDetail", result.data);
158
         })
162
         })
159
         .catch(console.error);
163
         .catch(console.error);
211
         }
215
         }
212
       }
216
       }
213
     },
217
     },
218
+    async retrieveLatestWeeks({commit}){
219
+      await axios.get('/api/timeshareWeek/GetLatest')
220
+      .then((result) => {
221
+        commit('getLatestWeeks', result.data)
222
+      })
223
+    },
214
     onResortChange({ commit }, resort) {
224
     onResortChange({ commit }, resort) {
215
       commit("changeResort", resort);
225
       commit("changeResort", resort);
216
     },
226
     },

Loading…
Cancel
Save