Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivateProperties

package-lock.json

@@ -7793,6 +7793,11 @@
         }
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",

package.json

@@ -17,6 +17,7 @@
     "jquery": "^3.4.1",
     "lodash": "^4.17.15",
     "material-design-icons-iconfont": "^3.0.3",
+    "moment": "^2.24.0",
     "node-sass": "^4.12.0",
     "roboto-fontface": "*",
     "sass-loader": "^7.3.1",

src/components/admin/logs/SearchLogs.vue

@@ -0,0 +1,83 @@
+<template>
+  <!-- eslint-disable max-len -->
+  <div>
+    <div class="container">
+      <!-- <section class="intro-single"> -->
+      <div class="container">
+        <br />
+        <br />
+        <br />
+        <br />
+        <div class="row">
+          <div class="col-md-12 col-lg-8">
+            <div class="title-box-d">
+              <h1 class="title-d" style="text-align:left; font-size: 250%">Search Log</h1>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- </section> -->
+    </div>
+    <div class="container">
+      <table class="table table-bordered">
+        <thead>
+          <tr>
+            <th>Date</th>
+            <th>Time</th>
+            <th>User</th>
+            <th>Keyword</th>
+            <th>Sales Type</th>
+            <th>Property Usage Type</th>
+            <th>Property Type</th>
+            <th>Province</th>
+            <th>City</th>
+            <th>Suburb</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(item, i) in propertySearch" :key="i">
+            <td>{{ formatDate(item.date) }}</td>
+            <td>{{ formatTime(item.date) }}</td>
+            <td v-if="item.user">{{ item.user }}</td>
+            <td v-else>No User</td>
+            <td>{{ item.keyword === 'All' ? '' : item.keyword }}</td>
+            <td>{{ item.salesType === 'All' ? '' : item.salesType }}</td>
+            <td>{{ item.propertyUsageType === 'All' ? '' : item.propertyUsageType }}</td>
+            <td>{{ item.propertyType === 'All' ? '' : item.propertyType }}</td>
+            <td>{{ item.province === 'All' ? '' : item.province }}</td>
+            <td>{{ item.city === 'All' ? '' : item.city }}</td>
+            <td>{{ item.suburb === 'All' ? '' : item.suburb }}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <br />
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions } from 'vuex';
+import moment from 'moment';
+
+export default {
+  name: 'searchLog',
+  data() {
+    return {};
+  },
+  methods: {
+    ...mapActions('searchLog', ['getPropertySearchLogs']),
+    formatDate(value) {
+      return moment(String(value)).format('YYYY/MM/DD');
+    },
+    formatTime(value) {
+      return moment(String(value)).format('hh:mm');
+    },
+  },
+  mounted() {
+    this.getPropertySearchLogs();
+  },
+  computed: {
+    ...mapState('searchLog', ['propertySearch']),
+  },
+};
+</script>

src/components/processFlow/makeOffer.vue

@@ -21,7 +21,7 @@
         <div class="form-group row">
           <div class="col-md-6 col-lg-5 section-md-t3">
             <div class="title-box-d">
-              <h3 class="title-d">{{ item.resort.resortName }}</h3>
+              <h3 class="title-d">{{ item ? item.resortName : '' }}</h3>
             </div>
           </div>
         </div>

src/components/property/propertyList.vue

@@ -49,7 +49,8 @@
             <td v-html="item.size" />
             <td>{{ item.price }}</td>
             <td>{{ item.type }}</td>
-            <td>{{ item.publish }}</td>
+            <!-- <td>{{ item.publish }}</td> -->
+            <td></td>
             <td>{{ item.status }}</td>
             <td>
               <button
@@ -57,10 +58,16 @@
                 @click="Edit(item)"
                 class="btn btn-b-n"
                 style="width: 85px; height:40px;"
+                disabled
               >Edit</button>
             </td>
             <td>
-              <button type="button" class="btn btn-b-n" style="width: 85px; height:40px;">Delete</button>
+              <button
+                type="button"
+                class="btn btn-b-n"
+                style="width: 85px; height:40px;"
+                disabled
+              >Delete</button>
             </td>
           </tr>
         </tbody>

src/components/property/propertySearchPage.vue

@@ -47,7 +47,12 @@
         </div>
         <div class="col-md-4">
           <p>
-            <img class="img-fluid" src="./../../../public/img/residential.jpg" alt="About Resale" style="border-radius:10px"/>
+            <img
+              class="img-fluid"
+              src="./../../../public/img/residential.jpg"
+              alt="About Resale"
+              style="border-radius:10px"
+            />
           </p>
         </div>
       </div>
@@ -130,7 +135,6 @@
   </div>
 </template>
 <script>
-import { mkdir } from 'fs';
 import { mapState, mapActions } from 'vuex';
 import propertyCard from './propertyCard.vue';
 
@@ -179,64 +183,33 @@ export default {
         suburb: 'All',
       };
 
-      if (typeof this.$route.params.propertyType === 'undefined') {
-        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-        this.propertySearch = this.$route.query;
-      } else {
+      if (Object.keys(this.$route.params).length > 0) {
+        if (this.$route.params.propertyUsageType) {
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.propertySearch.propertyUsageType = this.$route.params.propertyUsageType;
+        }
+      }
+      if (Object.keys(this.$route.query).length > 0) {
+        if (Object.keys(this.$route.query).length > 2) {
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.propertySearch = this.$route.query;
+        } else {
+          if (this.$route.query.salesType) {
+            // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+            this.propertySearch.salesType = this.$route.query.salesType;
+          }
+          if (this.$route.query.propertyUsageType) {
+            // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+            this.propertySearch.propertyUsageType = this.$route.query.propertyUsageType;
+          }
+        }
+      }
+      if (this.propertySearch.keyword === '') {
         // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-        this.propertySearch.propertyUsageType = this.$route.params.propertyType;
+        this.propertySearch.keyword = 'All';
       }
 
-      console.log('PropertySearch = ' + JSON.stringify(this.propertySearch));
-
       this.searchProperties(this.propertySearch);
-      // this.type = this.$route.query.type;
-      // this.propertyType = this.$route.query.propertyType;
-      // this.province = this.$route.query.province;
-      // this.city = this.$route.query.city;
-      // this.suburb = this.$route.query.suburb;
-      // this.proptype = this.$route.query.propType;
-      // this.keyword = this.$route.query.keyword;
-      // if (typeof this.propertyType === 'undefined') {
-      //   this.propertyType = this.propertyTypeparam;
-      // }
-      // if (this.type === '') {
-      //   this.type = 'undefined';
-      // }
-      // if (this.propertyType === '') {
-      //   this.propertyType = 'undefined';
-      // }
-      // if (this.province === '') {
-      //   this.province = 'undefined';
-      // }
-      // if (this.city === '') {
-      //   this.city = 'undefined';
-      // }
-      // if (this.suburb === '') {
-      //   this.suburb = 'undefined';
-      // }
-      // if (this.proptype === '') {
-      //   this.propType = 'undefined';
-      // }
-      // if (typeof this.keyword === 'undefined' || this.keyword === '') {
-      //   this.searchPropertiesParams(
-      //     Object.assign(
-      //       {},
-      //       {
-      //         type: this.type,
-      //         propertyType: this.propertyType,
-      //         province: this.province,
-      //         city: this.city,
-      //         suburb: this.suburb,
-      //         propType: this.proptype,
-      //       },
-      //     ),
-      //   );
-      // } else {
-      //   this.searchPropertiesKeyword(
-      //     Object.assign({}, { keyword: this.keyword }),
-      //   );
-      // }
       return null;
     },
   },

src/components/property/propertyeditPage.vue

@@ -355,12 +355,12 @@ export default {
 
       setTimeout(
         () => this.$router.push({
-            path: '/property/search',
-            query: {
-              salesType: this.salesType,
-              propertyUsageType: this.propertyType,
-            },
-          }),
+          path: '/property/search',
+          query: {
+            salesType: this.salesType,
+            propertyUsageType: this.propertyType,
+          },
+        }),
         3000,
       );
     },

src/components/shared/lightBoxGallery.vue

@@ -45,29 +45,29 @@ export default {
     return {
       bg: false,
       currentImage: 0,
-      count: true
+      count: true,
     };
   },
   props: {
     thumbnails: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     largeImages: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     captions: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     thumbnailsPath: {
       type: String,
-      default: ""
+      default: '',
     },
     largePath: {
       type: String,
-      default: ""
+      default: '',
     },
     caption: true
   },
@@ -91,8 +91,8 @@ export default {
       } else {
         this.currentImage = this.largeImages.length - 1;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 

src/components/shared/navBar.vue

@@ -177,6 +177,11 @@
                   class="dropdown-item cursor-pointer"
                   @click="routerGoTo('/propertyTypes/list')"
                 >Property Types</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/searchLog')"
+                >Search Logs</a>
+                <a class="dropdown-item cursor-pointer" @click="routerGoTo('/Offers')">Offers</a>
               </div>
             </li>
             <li class="nav-item dropdown">
@@ -245,7 +250,6 @@ export default {
     ...mapActions('authentication', ['logout']),
 
     routerGoTo(goTo) {
-      console.log(goTo);
       this.$emit('routerGoTo', goTo);
     },
   },

src/components/shared/searchTab.vue

@@ -8,12 +8,12 @@
     <div class="box-collapse-wrap">
       <form class="form-a">
         <div class="row">
-          <div class="col-md-12 mb-2">
+          <div class="col-md-12">
             <div class="form-group" style="text-align:left">
               <label for="Type">Keyword</label>
               <input
                 type="text"
-                class="form-control form-control-lg form-control-a"
+                class="form-control form-control-a"
                 placeholder="Keyword"
                 v-model="keyword"
               />

src/components/timeshare/buy/weekListComponent.vue

@@ -29,30 +29,7 @@
             <!-- <td>{{item.status ? item.status.description : ''}}</td> -->
             <td>
               <div class="col-md-12">
-                <button
-                  type="button"
-                  class="btn btn-b-n"
-                  data-toggle="modal"
-                  data-target="#myModal"
-                >Make an Offer</button>
-                <div id="myModal" class="modal fade" role="dialog">
-                  <div class="modal-dialog modal-lg">
-                    <!-- Modal content-->
-                    <div class="modal-content">
-                      <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
-                      </div>
-                      <div padding-left="20px">
-                        <makeOffer
-                          name="MakeOffer"
-                          :isMakeOffer="true"
-                          :isProperty="false"
-                          :item="item"
-                        />
-                      </div>
-                    </div>
-                  </div>
-                </div>
+                <button type="button" class="btn btn-b-n" @click="View(item)">View</button>
               </div>
             </td>
           </tr>
@@ -71,15 +48,12 @@
 </template>
 <script>
 import { mapState, mapActions, mapGetters } from 'vuex';
-import makeOffer from '../../processFlow/makeOffer.vue';
 
 export default {
   props: {
     resortCode: undefined,
   },
-  components: {
-    makeOffer,
-  },
+  components: {},
   computed: {
     ...mapState('weekList', ['weeks']),
     ...mapGetters({
@@ -93,6 +67,10 @@ export default {
     this.getWeeks();
   },
   methods: {
+    View(item) {
+      console.log(item);
+      this.$router.push(`/resort/${item.resort.resortCode}/${item.id}`);
+    },
     ...mapActions('weekList', ['getWeeks', 'applyResortFilter']),
   },
 };

src/components/timeshare/resort/resortPage.vue

@@ -40,7 +40,6 @@
           </div>
           {{description}}
           <hr />
-
           <div class="row">
             <div class="col-md-10 mb-4">
               <ul class="nav nav-tabs" id="myTab" role="tablist">

src/components/timeshare/resort/unitPage.vue

@@ -8,7 +8,10 @@
     <div class="row">
       <div class="col-md-12 col-lg-8">
         <div class="title-box-d">
-          <h1 class="title-d" style="text-align:left; font-size: 250%">{{resort.prName}}</h1>
+          <h1
+            class="title-d"
+            style="text-align:left; font-size: 250%"
+          >{{week ? week.resortName : ''}}</h1>
         </div>
         <br />
       </div>
@@ -41,7 +44,7 @@
             </ul>
           </div>
         </div>
-        <div class="col-md-6">
+        <div class="col-md-6" v-if="week">
           <form
             id="mainForm"
             method="POST"
@@ -66,7 +69,7 @@
                     type="text"
                     id="resort"
                     name="resortunit"
-                    :value="week.unit"
+                    :value="week ? week.unitNumber : ''"
                     disabled
                   />
                 </div>
@@ -84,7 +87,7 @@
                     type="text"
                     id="week"
                     name="resortWeek"
-                    :value="week.module"
+                    :value="week ? week.weekNumber : ''"
                     disabled
                   />
                 </div>
@@ -103,7 +106,7 @@
                     type="text"
                     id="levy"
                     name="levy"
-                    :value="formatPrice(week.currentLevy)"
+                    :value="formatPrice(week ? week.levyAmount : 0)"
                     disabled
                   />
                 </div>
@@ -115,7 +118,7 @@
                   <div style="width: 260px; height: 70px; border-style: solid; color: #60CBEB;">
                     <!-- <div class="card-title-c align-self-center"> -->
                     <a class="justify-content-center" style="color: black; font-size: 250%">
-                      <b>R{{ formatPrice(week.price) }}</b>
+                      <b>R{{ formatPrice(week ? week.sellPrice : 0) }}</b>
                     </a>
                     <!-- </div> -->
                   </div>
@@ -124,44 +127,9 @@
               </div>
             </div>
             <br />
-            <div class="form-row">
-              <div>
-                <div class="input-group mb-3">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text">
-                      <eva-icon name="person-outline" fill="#60CBEB"></eva-icon>
-                    </span>
-                    <input class="form-control" type="text" name="name" placeholder="Name" />
-                  </div>
-                </div>
-                <div class="input-group mb-3">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text">
-                      <eva-icon name="phone-outline" fill="#60CBEB"></eva-icon>
-                    </span>
-                    <input
-                      class="form-control"
-                      type="number"
-                      name="mobile"
-                      placeholder="Contact Number"
-                    />
-                  </div>
-                </div>
-                <div class="input-group mb-3">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text">
-                      <eva-icon name="email-outline" fill="#60CBEB"></eva-icon>
-                    </span>
-                    <input class="form-control" type="email" name="email" placeholder="Email" />
-                  </div>
-                </div>
-              </div>
-            </div>
           </form>
           <br />
 
-          <button class="btn btn-b-c even-width mr-auto" type="submit">Enquire Now</button>
-
           <!-- <a
               class="btn btn-b-n even-width mr-auto"
               href="/share-transfer-initiation-for-purchaser/"
@@ -172,20 +140,22 @@
             data-toggle="modal"
             data-target="#myModal"
           >Make an Offer</button>
-          <div id="myModal" class="modal fade" role="dialog">
-            <div class="modal-dialog modal-lg">
-              <!-- Modal content-->
-              <div class="modal-content">
-                <div class="modal-header">
-                  <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-                <div padding-left="20px">
-                  <makeOffer
-                    name="MakeOffer"
-                    :isMakeOffer="true"
-                    :isProperty="false"
-                    :item="{resort: resort.prName, unit: week.unit, week: week.week, module: week.module, price: week.price}"
-                  />
+          <div class="col-md-12">
+            <div id="myModal" class="modal fade" role="dialog">
+              <div class="modal-dialog modal-lg">
+                <!-- Modal content-->
+                <div class="modal-content">
+                  <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                  </div>
+                  <div padding-left="20px">
+                    <makeOffer
+                      name="MakeOffer"
+                      :isMakeOffer="true"
+                      :isProperty="false"
+                      :item="week"
+                    />
+                  </div>
                 </div>
               </div>
             </div>
@@ -223,7 +193,7 @@ export default {
       'image2',
       'image3',
     ]),
-    ...mapState('week', ['week', 'contactDetails']),
+    ...mapState('week', ['week']),
   },
   methods: {
     ...mapActions('resort', ['initResort']),

src/components/timeshare/sell/sellPage.vue

@@ -95,6 +95,23 @@
           <div class="container">
             <div class="col-md-12" style="text-align:left">
               <div class="form-group row">
+                <div class="col-md-6">
+                  <label>Region *</label>
+                  <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                      <span class="input-group-text" style="color: #60CBEB">
+                        <b>R</b>
+                      </span>
+                    </div>
+                    <select class="form-control" v-model="sellItem.region" @change="regionChange()">
+                      <option
+                        v-for="(region, r) in regions"
+                        :key="r"
+                        :value="region"
+                      >{{region.regionName}}</option>
+                    </select>
+                  </div>
+                </div>
                 <div class="col-md-6">
                   <label for="Resort Name">Resort Name *</label>
                   <div class="input-group mb-3">
@@ -250,19 +267,6 @@
                   </div>
                 </div>
               </div>
-              <div class="form-group row">
-                <div class="col-md-12">
-                  <label for="Owner">Owner *</label>
-                  <div class="input-group mb-3">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text" style="color: #60CBEB">
-                        <b>O</b>
-                      </span>
-                    </div>
-                    <input class="form-control" type="text" name="owner" v-model="sellItem.owner" />
-                  </div>
-                </div>
-              </div>
 
               <div class="form-group row">
                 <div class="col-md-6">
@@ -476,7 +480,7 @@
                   type="number"
                   step="any"
                   name="sellingPrice"
-                  v-model="sellItem.sellingPrice"
+                  v-model="sellItem.sellPrice"
                 />
               </div>
             </div>
@@ -516,9 +520,10 @@
             </div>
           </div>
 
-          <button type="submit" class="btn btn-b-n btn-lg">Submit</button>
+          <div class="btn btn-b-n btn-lg" @click="submitSale()">Submit</div>
+
           <hr />
-          {{sellItem}}
+          <h1>{{result}}</h1>
           <hr />
 
           <p>* A listing fee of R380 including VAT is payable to list your timeshare week/module on the Uni-Vate website</p>
@@ -551,6 +556,7 @@ export default {
       'regions',
       'detailedRegion',
       'seasons',
+      'result',
       'resortBedrooms',
       'maxSleep',
       'bankedEntities',
@@ -563,6 +569,9 @@ export default {
     },
   },
   methods: {
+    submitSale() {
+      this.saveWeek(this.sellItem);
+    },
     previewFiles(event) {
       console.log(event.target.files);
     },
@@ -582,6 +591,11 @@ export default {
       this.sellItem.currentYearBanked = !this.sellItem.currentYearBanked;
     },
     resortChange() {
+      this.onResortChange({
+        resortName: this.sellItem.resort.resortName,
+        resortCode: this.sellItem.resort.resortCode,
+      });
+
       if (this.sellItem && this.sellItem.resort === 'Other') {
         this.sellItem.otherResortName = undefined;
         this.sellItem.otherResort = true;
@@ -590,7 +604,12 @@ export default {
         this.sellItem.otherResort = false;
       }
     },
-    ...mapActions('timeshare', ['initTimeshare']),
+    regionChange() {
+      this.sellItem.regionId = this.sellItem.region
+        ? this.sellItem.region.id
+        : 1;
+    },
+    ...mapActions('timeshare', ['initTimeshare', 'onResortChange', 'saveWeek']),
   },
 };
 </script>

src/main.js

@@ -38,15 +38,7 @@ Vue.filter('toCurrency', (value) => {
   return `R ${formatter.format(value)}`;
 });
 
-const myPad = function (value, pattern) {
-  const val = '' + value;
-  return pattern.substring(0, pattern.length - val.length) + val;
-};
-
-Vue.filter('toDate', (value) => {
-  const date = new Date(value);
-  return `${date.getFullYear()}/${myPad(date.getMonth(), '00')}/${myPad(date.getDay(), '00')}`;
-});
+Vue.filter('toDate', value => value.substring(0, value.length > 9 ? 10 : value.length));
 
 new Vue({
   render: h => h(App),

src/router/index.js

@@ -40,13 +40,17 @@ import PrivacyPolicy from '../components/misc/privacyPolicyPage.vue';
 
 import MakeOffer from '../components/processFlow/makeOffer.vue';
 import Offer from '../components/processFlow/offers.vue';
+import searchLog from '../components/admin/logs/SearchLogs.vue';
 // import store from '../store';
 
 Vue.use(Router);
 
 export default new Router({
-  scrollBehavior (to, from, savedPosition) {
-    return { x: 0, y: 0 }
+  scrollBehavior(to, from, savedPosition) {
+    return {
+      x: 0,
+      y: 0,
+    };
   },
   routes: [{
     path: '/',
@@ -99,7 +103,7 @@ export default new Router({
     component: PropertyPage,
   },
   {
-    path: '/property/:propertyType/search',
+    path: '/property/:propertyUsageType/search',
     name: 'PropertySearch',
     component: PropertySearch,
   },
@@ -220,5 +224,10 @@ export default new Router({
     name: 'TimeshareSearch',
     component: TimeshareSearch,
   },
+  {
+    path: '/searchLog',
+    name: 'SearchLog',
+    component: searchLog,
+  },
   ],
 });

src/store/index.js

@@ -18,6 +18,7 @@ import WeekList from './modules/timeshare/weekList';
 import Bid from './modules/processFlow/bid';
 import Authentication from './modules/user/authentication';
 import PropertySearch from './modules/property/propertySearch';
+import SearchLog from './modules/logs/searchLog';
 
 Vue.use(Vuex);
 /* eslint no-param-reassign: ["error", { "props": false }] */
@@ -41,5 +42,6 @@ export default new Vuex.Store({
     bid: Bid,
     authentication: Authentication,
     propertySearch: PropertySearch,
+    searchLog: SearchLog,
   },
 });

src/store/modules/logs/searchLog.js

@@ -0,0 +1,24 @@
+// api/searchLog/property
+import axios from 'axios';
+
+export default {
+  namespaced: true,
+  state: {
+    propertySearch: {},
+  },
+  mutations: {
+    updateSearch(state, data) {
+      state.propertySearch = [];
+      state.propertySearch = data;
+    },
+  },
+  getters: {},
+  actions: {
+    getPropertySearchLogs({ commit }) {
+      axios
+        .get('/api/searchLog/property')
+        .then(result => commit('updateSearch', result.data))
+        .catch(console.error);
+    },
+  },
+};

src/store/modules/property/property.js

@@ -55,7 +55,9 @@ export default {
       state.propertyFields = fields;
     },
     updateCurrentProperty(state, property) {
-      state.properties.push(property);
+      if (state.properties) {
+        state.properties.push(property);
+      }
     },
     clearProperty(state) {
       state.property = {

src/store/modules/property/propertyLists.js

@@ -14,7 +14,7 @@ export default {
   actions: {
     getProperties({ commit }, item) {
       axios
-        .get(`/api/property/${item.propertyType}/${item.user}`)
+        .get(`/api/property/${item.propertyType}/All`) // .get(`/api/property/${item.propertyType}/${item.user}`)
         .then(result => commit('setProperties', result.data))
         .catch(console.error);
     },

src/store/modules/property/propertySearch.js

@@ -39,7 +39,7 @@ export default {
     getPropertySearchObject({ commit }) {
       const search = {
         userID: 0,
-        keyword: '',
+        keyword: 'All',
         salesType: 'Sale',
         propertyUsageType: 'All',
         propertyType: 'All',
@@ -50,8 +50,13 @@ export default {
       commit('setPropertySearch', search);
     },
     searchProperties({ commit }, item) {
+      if (item.keyword === '') {
+        item.keyword = 'All';
+      }
       axios
-        .post('/api/Property/Search', item)
+        .get(
+          `/api/Property/Search/${item.userID}/${item.keyword}/${item.salesType}/${item.propertyUsageType}/${item.propertyType}/${item.province}/${item.city}/${item.suburb}`,
+        )
         .then(result => commit('updateSearch', result.data))
         .catch(console.error);
     },

src/store/modules/timeshare/timeshare.js

@@ -1,6 +1,7 @@
 /* eslint-disable guard-for-in */
 /* eslint-disable no-restricted-syntax */
 import axios from 'axios';
+import _ from 'lodash';
 import MyData from '../../../assets/myData';
 import MaritalStatus from '../../../assets/staticData/maritalStatus';
 
@@ -17,6 +18,7 @@ export default {
     agencies: [],
     agents: [],
     maritalStatus: MaritalStatus,
+    result: undefined,
     sellItem: {
       referedByAgent: false,
       agentId: undefined,
@@ -24,6 +26,8 @@ export default {
       otherResort: false,
       otherResortName: undefined,
       resort: undefined,
+      resortCode: undefined,
+      resortName: undefined,
       regionId: undefined,
       season: undefined,
       module: undefined,
@@ -40,7 +44,7 @@ export default {
       originalPurchaseDate: undefined,
       arrivalDate: undefined,
       departureDate: undefined,
-      sellingPrice: undefined,
+      sellPrice: undefined,
       agentCommission: undefined,
       mandate: undefined,
       status: undefined,
@@ -100,6 +104,20 @@ export default {
     addDetailedRegion(state, detailedRegion) {
       state.detailedRegion.push(detailedRegion);
     },
+    changeResort(state, resort) {
+      for (const reg in state.detailedRegion) {
+        const region = state.detailedRegion[reg];
+        if (_.find(region.children, x => x.resortCode === resort.resortCode)) {
+          state.regionId = reg;
+          break;
+        }
+      }
+      state.sellItem.resortCode = resort.resortCode;
+      state.sellItem.resortName = resort.resortName;
+    },
+    displayResult(state) {
+      state.result = 'Week has been added ^-^';
+    },
   },
   getters: {
 
@@ -129,7 +147,6 @@ export default {
     getAgencies({
       commit,
     }) {
-      console.log(123);
       axios
         .get('/api/agency')
         .then(result => commit('setAgency', result.data))
@@ -185,14 +202,17 @@ export default {
         }
       }
     },
+    onResortChange({
+      commit,
+    }, resort) {
+      commit('changeResort', resort);
+    },
     saveWeek({
       commit,
     }, week) {
       axios
         .post('/api/timeshareweek', week)
-        .then(result => commit('addDetailedRegion', {
-          week,
-        }))
+        .then(result => commit('displayResult'))
         .catch(console.error);
     },
   },

src/store/modules/timeshare/week.js

@@ -1,3 +1,4 @@
+/* eslint-disable prefer-destructuring */
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable guard-for-in */
 import axios from 'axios';
@@ -5,23 +6,13 @@ import axios from 'axios';
 export default {
   namespaced: true,
   state: {
-    week: {
-      id: '',
-      unit: '',
-      week: '',
-      module: '',
-      price: '',
-      currentLevy: '',
-    },
-    contactDetails: {
-      name: '',
-      number: '',
-      email: '',
-    },
+    week: undefined,
   },
   mutations: {
     setWeek(state, week) {
-      state.week = week;
+      if (week.length > 0) {
+        state.week = week[0];
+      }
     },
   },
   getters: {},
@@ -29,14 +20,8 @@ export default {
     initWeek({
       commit,
     }, weekId) {
-      commit('setWeek', {
-        id: weekId,
-        unit: '359',
-        week: 'N18',
-        module: '359/N18 River View',
-        price: 85000,
-        currentLevy: 5455,
-      });
+      axios.get(`/api/timeshareweek/${weekId}`).then(r => commit('setWeek', r.data)).catch(console
+        .error);
     },
   },
 };