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

src/App.vue

@@ -136,6 +136,14 @@ html {
   background-color: #ff8344;
   color: white;
 }
+.redText {
+  background-color: #eb5252;
+  color: white;
+}
+.greenText {
+  background-color: #43e243;
+  color: white;
+}
 .noWeeks {
   background-color: #ff4444;
 }

src/assets/staticData/itemsPerPageFive.js

@@ -0,0 +1,2 @@
+const items = [5, 10, 15, 20, 25, 50, 100];
+export default items;

src/components/admin/property/propertyList.vue

@@ -17,9 +17,26 @@
           <table class="table table-striped table-responsive">
             <thead>
               <tr>
-                <th scope="col">Owner</th>
-                <th scope="col">Reference</th>
-                <th scope="col">Property</th>
+                <th scope="col" v-for="(col, c) in displayColumns" :key="c">
+                  <div @click="sortBy(columns[c])" style="cursor: pointer;">
+                    <div class="d-flex bd-highlight">
+                      <div class="w-100 bd-highlight">{{ col }}</div>
+                      <div class="flex-shrink-1 bd-highlight">
+                        <img
+                          src="../../../../public/img/sort-up.png"
+                          height="8px;"
+                          v-if="sortKey === columns[c] && reverse"
+                        />
+                        <img
+                          src="../../../../public/img/sort-down.png"
+                          height="8px;"
+                          v-if="sortKey === columns[c] && !reverse"
+                        />
+                      </div>
+                    </div>
+                  </div>
+                </th>
+                <!-- <th scope="col">Property</th>
                 <th scope="col">Unit</th>
                 <th scope="col">Size</th>
                 <th scope="col">Price Ex VAT</th>
@@ -28,13 +45,13 @@
                 <th scope="col">Suburb</th>
                 <th scope="col">Status</th>
                 <th scope="col">Type</th>
-                <th scope="col">Publish</th>
+                <th scope="col">Publish</th>-->
                 <th scope="col">Edit</th>
                 <th scope="col">Delete</th>
               </tr>
             </thead>
             <tbody>
-              <tr v-for="(item, i) in FilteredProperties" :key="i">
+              <tr v-for="(item, i) in DisplayItems" :key="i">
                 <td>{{ item.owner }}</td>
                 <td>{{ item.reference }}</td>
                 <td>{{ item.property }}</td>
@@ -73,6 +90,45 @@
               </tr>
             </tbody>
           </table>
+          <div class="d-flex justify-content-between" v-if="showPager">
+            <div class="p-1">
+              {{
+              currentPage +
+              " / " +
+              PageCount +
+              (" - (" + FilteredProperties.length + " items)")
+              }}
+            </div>
+            <div class="p-1">
+              <BasePagination
+                :currentPage="currentPage"
+                :pageCount="PageCount"
+                @nextPage="pageChangeHandle('next')"
+                @previousPage="pageChangeHandle('previous')"
+                @loadPage="pageChangeHandle"
+              />
+            </div>
+            <div class="p-2">
+              <div class="d-flex flex-row">
+                <div>
+                  <select
+                    class="form-control uniSelect"
+                    v-model="visibleItemsPerPageCount"
+                    @change="onChangeItemsPerPage()"
+                  >
+                    <option v-for="(item, i) in itemsPerPageList" :key="i">{{ item }}</option>
+                  </select>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="p-2">
+            <div class="d-flex flex-row">
+              <div>
+                <button v-if="sortKey !== 'id'" class="btn-solid-blue" @click="ClearSort">Clear Sort</button>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
       <div v-if="wait" id="preloader"></div>
@@ -83,14 +139,54 @@
 <script>
 import { mapState, mapActions } from "vuex";
 import Log from "../../../assets/Log";
+import BasePagination from "../../shared/basePagination";
+import ItemsPerPageList from "../../../assets/staticData/itemsPerPageFive";
 import _ from "lodash";
 
 export default {
+  components: {
+    BasePagination,
+  },
   data() {
     return {
+      hover: -1,
       filter: undefined,
       userId: Log.getUser().id,
       wait: true,
+      showPager: true,
+      visibleItemsPerPageCount: 10,
+      itemsPerPageList: ItemsPerPageList,
+      currentPage: 1,
+      reverse: true,
+      sortKey: "id",
+      displayColumns: [
+        "Owner",
+        "Reference",
+        "Property",
+        "Unit",
+        "Size",
+        "Price Ex VAT",
+        "Region",
+        "Town",
+        "Suburb",
+        "Status",
+        "Type",
+        "Publish",
+      ],
+      columns: [
+        "owner",
+        "reference",
+        "property",
+        "unit",
+        "size",
+        "price",
+        "region",
+        "town",
+        "suburb",
+        "status",
+        "type",
+        "isPublished",
+      ],
     };
   },
   methods: {
@@ -112,6 +208,26 @@ export default {
     Delete(item) {
       this.deleteProperty(item.id);
     },
+    async pageChangeHandle(value) {
+      switch (value) {
+        case "next":
+          this.currentPage += 1;
+          break;
+        case "previous":
+          this.currentPage -= 1;
+          break;
+        default:
+          this.currentPage = value;
+      }
+    },
+    sortBy(sortKey) {
+      this.reverse = this.sortKey === sortKey ? !this.reverse : false;
+      this.sortKey = sortKey;
+    },
+    ClearSort() {
+      this.reverse = true;
+      this.sortKey = "id";
+    },
   },
   computed: {
     ...mapState("propertyList", ["properties"]),
@@ -125,18 +241,51 @@ export default {
                 .indexOf(this.filter.toLowerCase()) > -1
           )
         );
-        return list;
+        return _.orderBy(list, this.sortKey, this.SortDirection);
       } else {
-        return this.properties;
+        return _.orderBy(this.properties, this.sortKey, this.SortDirection);
       }
     },
+    PageCount() {
+      return this.visibleItemsPerPageCount !== 0
+        ? Math.ceil(
+            this.FilteredProperties.length / this.visibleItemsPerPageCount
+          )
+        : 1;
+    },
+    DisplayItems() {
+      const list = this.FilteredProperties;
+      const startSlice = (this.currentPage - 1) * this.visibleItemsPerPageCount;
+      let endSlice = this.currentPage * this.visibleItemsPerPageCount;
+      if (endSlice > list.length) {
+        endSlice = list.length;
+      }
+      return list.slice(startSlice, endSlice);
+    },
+    SortDirection() {
+      return this.reverse ? "desc" : "asc";
+    },
   },
   mounted() {
     this.wait = true;
     this.getAdminProperties(this.userId).then((fulfuilled) => {
       this.wait = false;
+      if (this.itemsPerPageList && this.itemsPerPageList.length > 0) {
+        const [startItem] = this.itemsPerPageList;
+        this.visibleItemsPerPageCount = startItem;
+      }
     });
   },
+  watch: {
+    filter: {
+      immediate: true,
+      handler(val, oldVal) {
+        if (val != oldVal) {
+          this.currentPage = 1;
+        }
+      },
+    },
+  },
 };
 </script>
 

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">
@@ -473,7 +474,7 @@ export default {
   },
   data() {
     return {
-      wait: false,
+      wait: true,
       userLoggedIn: Log.isLoggedIn(),
       listedWeekId: this.$route.params.id,
       selectedItems: [],
@@ -495,6 +496,9 @@ export default {
     Alert
   },
   async mounted() {
+    this.getWeek(this.weekParam.id).then(() => {
+      this.wait = false;
+    });
     if (this.sellItem.id) {
       this.newSale();
     }
@@ -506,7 +510,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/components/admin/status/timeshareAdminPage.vue

@@ -68,6 +68,7 @@
             :CustomActionHeading="'Publish'"
             :showColumnChooser="false"
             :displayColumns="columns"
+            :displayFormats="displayFormats"
             @onRowClick="onRowClick"
             @onClearSelected="onClearSelected"
             @onEdit="onEdit"
@@ -117,6 +118,7 @@ export default {
         "region",
         "sellPrice"
       ],
+      displayFormats: ["", "", "", "", "", "", "", "", "money"],
       // selectedItems: [],
       showMessage: false,
       region: ""

src/components/property/ListProperty/contentSection.vue

@@ -1,5 +1,6 @@
 <template>
   <section id="services">
+    <div v-if="wait" id="preloader"></div>
     <div class="container">
       <div class="col-12">
         <h1>List your property</h1>
@@ -16,7 +17,6 @@
               role="tab"
               aria-controls="pills-residential"
               aria-selected="true"
-              @click="getPropTypeResidential"
               >RESIDENTIAL</a
             >
           </li>
@@ -29,7 +29,6 @@
               role="tab"
               aria-controls="pills-commercial"
               aria-selected="false"
-              @click="getPropTypeCommercial"
               >COMMERCIAL</a
             >
           </li>
@@ -44,7 +43,7 @@
             role="tabpanel"
             aria-labelledby="pills-residential-tab"
           >
-            <ResidentialCreate />
+            <ResidentialCreate :propFields="residentialFields" />
           </div>
           <div
             class="tab-pane fade"
@@ -52,7 +51,7 @@
             role="tabpanel"
             aria-labelledby="pills-commercial-tab"
           >
-            <CommercialCreate />
+            <CommercialCreate :propFields="commercialFields" />
           </div>
         </div>
       </div>
@@ -70,24 +69,44 @@ export default {
     ResidentialCreate,
     CommercialCreate
   },
+  data() {
+    return {
+      wait: true,
+      residentialFields: [],
+      commercialFields: []
+    };
+  },
   methods: {
     ...mapActions("property", ["getPropertyTypes", "getPropertyFields"]),
-    getPropTypeResidential() {
-      this.getPropertyTypes("Residential");
-      this.getPropertyFields("Residential");
+    async loadResidentialFields() {
+      await this.getPropertyFields("Residential");
     },
-    getPropTypeCommercial() {
-      this.getPropertyTypes("Commercial");
-      this.getPropertyFields("Commercial");
+    async loadCommercialFields() {
+      await this.getPropertyFields("Commercial");
     }
   },
-  mounted() {
-    this.getPropertyTypes("Residential");
-    this.getPropertyFields("Residential");
-  },
   computed: {
-    ...mapState("property", ["propertyTypes"])
-  }
+    ...mapState("property", ["propertyTypes", "propertyFields"]),
+    propFields() {
+      if (!this.wait) {
+        return this.propertyFields[0].fields;
+      }
+    }
+  },
+  created() {
+    this.loadResidentialFields().then(() => {
+      this.residentialFields = this.propertyFields[0].fields.sort((a, b) =>
+        a.rank > b.rank ? 1 : -1
+      );
+      this.loadCommercialFields().then(() => {
+        this.wait = false;
+        this.commercialFields = this.propertyFields[0].fields.sort((a, b) =>
+          a.rank > b.rank ? 1 : -1
+        );
+      });
+    });
+  },
+  mounted() {}
 };
 </script>
 

src/components/property/commercial/commercialSearchResults.vue

@@ -1,12 +1,18 @@
 <template>
   <main id="main" style="margin-top:-20px; padding-bottom:50px">
     <div v-if="wait" id="preloader"></div>
-    <section v-if="properties.length > 0">
+    <div class="row pt-5 justify-content-md-center">
+      <h3 v-if="propertySearch.salesType === 'Sale'">COMMERCIAL PROPERTIES FOR SALE</h3>
+      <h3 v-else-if="propertySearch.salesType === 'Rent'">COMMERCIAL PROPERTIES FOR RENT</h3>
+    </div>
+    <propertyCard
+      v-if="properties.length > 0"
+      name="propertyholder"
+      :properties="properties"
+      :showSort="false"
+    />
+    <!-- <section v-if="properties.length > 0">
       <div class="container">
-        <div class="row pt-5 justify-content-md-center">
-          <h3 v-if="propertySearch.salesType === 'Sale'">COMMERCIAL PROPERTIES FOR SALE</h3>
-          <h3 v-else-if="propertySearch.salesType === 'Rent'">COMMERCIAL PROPERTIES FOR RENT</h3>
-        </div>
         <div class="row justify-content-md-center">
           <div
             class="col-lg-3 col-md-6 col-sm-6"
@@ -19,12 +25,12 @@
                 <h4>{{ currentProperty.displayPrice }}</h4>
                 <p>
                   {{ currentProperty.suburb }}, {{ currentProperty.city }} |
-                  {{ currentProperty.area }}M<sup>2</sup>
+                  {{ currentProperty.area }}
                 </p>
                 <p>{{ currentProperty.shortDescription }}</p>
                 <br />
 
-                <!-- <a href="commercialproperty-page.php" class="btn-white-border">VIEW</a> -->
+                <a href="commercialproperty-page.php" class="btn-white-border">VIEW</a>
                 <router-link
                   class="btn-white-border"
                   :to="`/property/commercial/property/${currentProperty.id}`"
@@ -35,7 +41,7 @@
           </div>
         </div>
       </div>
-    </section>
+    </section> -->
     <section v-else id="intro" style="margin-bottom:-50px">
       <div class="container">
         <div class="row d-flex justify-content-center">
@@ -72,7 +78,7 @@
 <script>
 /* eslint-disable */
 import { mapState, mapActions } from "vuex";
-import propertyCard from "../propertyCard";
+import propertyCard from "../propertyCardSearch";
 import carousel from "vue-owl-carousel";
 
 export default {

src/components/property/commercial/createProperty/commercialCreateNew.vue

@@ -251,17 +251,12 @@
         <div class="section-header">
           <h2>Property Information</h2>
         </div>
-        <div v-for="item in propertyFields" :key="item.id">
+        <!-- <div v-for="item in propertyFields" :key="item.id">
           <div v-if="item.name === 'Commercial Fields'">
-            <UserField
-              :fields="sortFields"
-              :id="item.name"
-              @UpdateUserDefinedFields="UpdateUserDefinedFields"
-              :fieldValues="item.fields"
-            />
+            
           </div>
-        </div>
-
+        </div> -->
+        <UserField :fields="propFields" @UpdateUserDefinedFields="UpdateUserDefinedFields" />
         <div class="row">
           <div class="col-sm-12">
             <div class="section-header">
@@ -348,6 +343,9 @@ export default {
     carouselSection,
     mapSection
   },
+  props: {
+    propFields: {}
+  },
   data() {
     return {
       propertyType: "Commercial",
@@ -539,10 +537,7 @@ export default {
     ...mapGetters("fees", ["getListingFee"]),
     sortFields() {
       var display = [];
-
       display = this.propertyFields[0].fields.sort((a, b) => (a.rank > b.rank ? 1 : -1));
-      console.log(display);
-
       return display;
     },
     SalesTypeChanged() {

src/components/property/commercial/singleView/contentSection.vue

@@ -53,9 +53,6 @@
             </div>-->
             <p>{{ property.shortDescription }}</p>
             <p>{{ property.price | toCurrency }}</p>
-            <div class="btn-white-border">
-              <i class="fa fa-search"></i>BOOK A VIEWING
-            </div>
           </div>
           <div class="panel-left px-5 pb-5 text-center">
             <h4 class="text-white">Share this Property</h4>
@@ -81,10 +78,9 @@
         </div>
         <div class="col-md-8 p-5 resort-profile">
           <h2 v-if="property.showAddress">
-            <div
-              style="display:inline"
-              v-if="property.propertyName !== null"
-            >{{ property.propertyName }} /</div>
+            <div style="display:inline" v-if="property.propertyName !== null">
+              {{ property.propertyName }} /
+            </div>
             {{ property.streetNumber }} {{ property.streetName }}
           </h2>
           <h2 v-else>{{ property.propertyName }}</h2>
@@ -107,11 +103,26 @@
 
           <div class="mt-5" v-html="property.description"></div>
           <router-link
-            style="float:right"
+            style="float:right; white-space: nowrap;"
             class="btn-solid-blue mt-3"
             :to="{ name: 'EnquireNow', params: { id: $route.params.id } }"
-          >MORE INFO...</router-link>
-          <h4 v-if="property.video !== null" class="mt-5">Video Tour</h4>
+            >ENQUIRE NOW</router-link
+          >
+
+          <h4 v-if="property.virtualTour !== null" style="margin-top:150px">Virtual Tour</h4>
+          <iframe
+            v-if="property.virtualTour !== null"
+            width="100%"
+            height="500px"
+            :src="property.virtualTour"
+            frameborder="0"
+            allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+            allowfullscreen
+            style="margin-bottom:-6px"
+            class="mt-3"
+          ></iframe>
+
+          <h4 v-if="property.video !== null" class="mt-5">Video</h4>
           <iframe
             v-if="property.video !== null"
             width="100%"
@@ -179,11 +190,11 @@
 import gallery from "../../../shared/gallerySlideShow";
 export default {
   components: {
-    gallery,
+    gallery
   },
   props: {
     property: {},
-    propertyImages: {},
+    propertyImages: {}
   },
   mounted() {
     console.log(this.property);
@@ -191,7 +202,7 @@ export default {
   data() {
     return {
       index: null,
-      date: new Date(),
+      date: new Date()
     };
   },
   computed: {
@@ -201,11 +212,11 @@ export default {
         list.push(this.propertyImages[i].image);
       }
       return list;
-    },
+    }
   },
   created() {
     this.$emit("Loaded", true);
-  },
+  }
 };
 </script>
 

src/components/property/editProperty/editProperty.vue

@@ -26,7 +26,7 @@
                     v-model="property.statusString"
                     @change="StatusChanged"
                   >
-                    <option v-for="(item, i) in statuses" :key="i">{{ item }}</option>
+                    <option v-for="(item, i) in Statuses" :key="i">{{ item }}</option>
                   </select>
                 </div>
               </div>
@@ -135,8 +135,9 @@
                       </select>
                     </div>
                   </div>
-                  <div class="row my-3">
+                  <div v-if="!property.isSale" class="row my-3">
                     <div class="col-md-12">
+                      Date Available
                       <input
                         type="date"
                         class="form-control uniInput"
@@ -146,6 +147,21 @@
                       />
                     </div>
                   </div>
+                  <div
+                    class="row my-3"
+                    v-if="property.statusString === 'Sold' || property.statusString ==='Rented Out'"
+                  >
+                    <div class="col-md-12">
+                      Hide Property After
+                      <input
+                        type="date"
+                        class="form-control uniInput"
+                        name="date"
+                        v-model="property.cutOffDisplayDateString"
+                      />
+                    </div>
+                  </div>
+
                   <div class="row my-3">
                     <br />
                   </div>
@@ -540,6 +556,18 @@ export default {
       }
       return list;
     },
+    Statuses() {
+      const list = [];
+      for (let i = 0; i < this.statuses.length; i++) {
+        if (this.property.isSale && this.statuses[i] !== "Rented Out") {
+          list.push(this.statuses[i]);
+        }
+        if (!this.property.isSale && this.statuses[i] !== "Sold") {
+          list.push(this.statuses[i]);
+        }
+      }
+      return list;
+    },
   },
 };
 </script>

src/components/property/enquireNow/contentSection.vue

@@ -23,89 +23,106 @@
                 type="text"
                 name="name"
                 class="form-control"
-                id="Unit"
-                placeholder="Unit"
+                id="Suburb"
+                placeholder="Suburb"
                 data-rule="minlen:4"
-                v-model="property.unit"
+                v-model="property.suburb"
                 disabled
               />
             </float-label>
-
-            <div class="validation"></div>
-          </div>
-          <div class="form-group col-md-6">
-            <float-label>
+            <!-- <float-label>
               <input
                 type="text"
                 name="name"
                 class="form-control"
-                id="Price"
-                placeholder="Price"
+                id="Unit"
+                placeholder="Unit"
                 data-rule="minlen:4"
-                v-model="property.price"
+                v-model="property.unit"
                 disabled
               />
-            </float-label>
+            </float-label> -->
 
             <div class="validation"></div>
           </div>
           <div class="form-group col-md-6">
-            <float-label>
-              <input
-                type="text"
-                name="name"
+            <float-label label="PRICE">
+              <currency-input
+                onclick="this.setSelectionRange(0, this.value.length)"
+                name="resPrice"
+                :value="property.price"
+                @input="property.price = $event"
+                v-model="property.price"
+                id="resPrice"
                 class="form-control"
-                id="Size"
-                placeholder="Size"
-                data-rule="minlen:4"
-                v-model="size"
                 disabled
               />
             </float-label>
 
             <div class="validation"></div>
           </div>
+
+          <div class="form-group col-md-6">
+            <div v-for="(el, i) in property.displayData[0].values" :key="i">
+              <float-label v-if="el.name === 'Erf Size'">
+                <input
+                  type="text"
+                  name="name"
+                  class="form-control"
+                  id="Size"
+                  placeholder="Size"
+                  data-rule="minlen:4"
+                  v-model="el.value"
+                  disabled
+                />
+              </float-label>
+            </div>
+
+            <div class="validation"></div>
+          </div>
           <div class="form-group col-md-6 mb-4">
+            <div class="validation"></div>
+          </div>
+          <div class="form-group col-md-12 mb-4 mt-2">
             <float-label>
               <input
                 type="text"
                 name="name"
-                class="form-control"
-                id="Suburb"
-                placeholder="Suburb"
+                class="form-control uniInput"
+                id="Name"
+                placeholder="Name"
                 data-rule="minlen:4"
-                v-model="property.suburb"
-                disabled
+                v-model="indiv.name"
               />
             </float-label>
 
             <div class="validation"></div>
           </div>
-          <div class="form-group col-md-12 mb-4">
+          <div class="form-group col-md-6 mb-4">
             <float-label>
               <input
                 type="text"
                 name="name"
-                class="form-control"
-                id="Name"
-                placeholder="Name"
+                class="form-control uniInput"
+                id="ContactNumber"
+                placeholder="ContactNumber"
                 data-rule="minlen:4"
-                v-model="name"
+                v-model="indiv.cellNumber"
               />
             </float-label>
 
             <div class="validation"></div>
           </div>
-          <div class="form-group col-md-12 mb-4">
+          <div class="form-group col-md-6">
             <float-label>
               <input
                 type="text"
                 name="name"
-                class="form-control"
-                id="ContactNumber"
-                placeholder="ContactNumber"
+                class="form-control uniInput"
+                id="Email"
+                placeholder="Email"
                 data-rule="minlen:4"
-                v-model="contactNumber"
+                v-model="indiv.emailAddress"
               />
             </float-label>
 
@@ -113,14 +130,15 @@
           </div>
           <div class="form-group col-md-12">
             <float-label>
-              <input
-                type="text"
-                name="name"
-                class="form-control"
+              <textarea
+                type="textArea"
+                style="height:130px"
+                name="message"
+                class="form-control uniInput"
                 id="Email"
-                placeholder="Email"
+                placeholder="Message"
                 data-rule="minlen:4"
-                v-model="email"
+                v-model="message"
               />
             </float-label>
 
@@ -142,10 +160,12 @@
 /* eslint-disable */
 import axios from "axios";
 import alert from "../../shared/alert";
+import Log from "../../../assets/Log";
+import { mapState, mapGetters, mapActions } from "vuex";
 
 export default {
   components: {
-    alert,
+    alert
   },
   data() {
     return {
@@ -155,25 +175,35 @@ export default {
       contactNumber: null,
       property: null,
       message: null,
-      boolSent: false,
+      boolSent: false
     };
   },
   mounted() {
     this.boolSent = false;
+    this.getIndividual(Log.getUser().id);
   },
   props: {
-    property: {},
+    property: {}
+  },
+  computed: {
+    ...mapState("individual", ["indiv"]),
+    ...mapState("authentication", ["isLoggedIn", "user"])
+    // ...mapGetters({
+    //   user: "authentication/getUser",
+    //   person: "authentication/getPerson"
+    // })
   },
   methods: {
+    ...mapActions("individual", ["getIndividual"]),
     async sendMail() {
       var mailObj = {
         toAddress: "jlouw365@gmail.com",
         fromAddress: "jlouw365@gmail.com",
-        name: this.name,
-        email: this.email,
-        phone: this.contactNumber,
+        name: this.indiv.name,
+        email: this.indiv.emailAddress,
+        phone: this.indiv.cellNumber,
         property: this.property.id.toString(),
-        message: this.message,
+        message: this.message
       };
 
       const response = await axios.post("/api/mail/1", mailObj);
@@ -186,11 +216,11 @@ export default {
     },
     countDownChanged(dismissCountDown) {
       this.dismissCountDown = dismissCountDown;
-    },
+    }
   },
   created() {
     this.$emit("Loaded", true);
-  },
+  }
 };
 </script>
 

src/components/property/propertyCard.vue

@@ -12,11 +12,13 @@
               <div class="portfolio-item p-4 wow fadeInUp justify-content-md-center">
                 <div class="feature-top pt-3 mb-2">
                   <h3>{{ currentProperty.displayPrice }}</h3>
-                  <img
-                    style="max-height:165px; object-fit: cover;"
-                    :src="currentProperty.displayImage"
-                    alt
-                  />
+                  <div>
+                    <img
+                      style="height:165px; object-fit: cover;"
+                      :src="currentProperty.displayImage"
+                      alt
+                    />
+                  </div>
                 </div>
                 <h1>{{ currentProperty.suburb }}</h1>
                 <p>
@@ -24,16 +26,10 @@
                   {{ currentProperty.propertyReference }}
                 </p>
                 <p
-                  v-if="!currentProperty.isSale"
-                  :class="[currentProperty.hasPendingOffer ? 'pendingOffer' : 'normalText']"
-                >
-                  <strong>{{ currentProperty.available }}</strong>
-                </p>
-                <p
-                  v-if="currentProperty.isSale  && currentProperty.hasPendingOffer"
-                  class="pendingOffer"
+                  v-if="currentProperty.displayText != ''"
+                  :class="[currentProperty.displayColor === 'green' ? 'greenText' : currentProperty.displayColor === 'orange' ? 'pendingOffer' : currentProperty.displayColor === 'red' ? 'redText' : 'normalText']"
                 >
-                  <strong>{{ currentProperty.available }}</strong>
+                  <strong>{{ currentProperty.displayText }}</strong>
                 </p>
               </div>
             </router-link>
@@ -44,7 +40,7 @@
                 <div class="feature-top pt-3 mb-2">
                   <h3>{{ currentProperty.displayPrice }}</h3>
                   <img
-                    style="max-height:165px; object-fit: cover;"
+                    style="height:165px; object-fit: cover;"
                     :src="currentProperty.displayImage"
                     alt
                   />
@@ -54,6 +50,12 @@
                   <strong>Property Reference</strong>
                   {{ currentProperty.propertyReference }}
                 </p>
+                <p
+                  v-if="currentProperty.displayText != ''"
+                  :class="[currentProperty.displayColor === 'green' ? 'greenText' : currentProperty.displayColor === 'orange' ? 'pendingOffer' : currentProperty.displayColor === 'red' ? 'redText' : 'normalText']"
+                >
+                  <strong>{{ currentProperty.displayText }}</strong>
+                </p>
               </div>
             </router-link>
           </div>

src/components/property/propertyCardSearch.vue

@@ -0,0 +1,111 @@
+<template>
+  <section id="portfolio">
+    <div class="container-fluid">
+      <div class="row">
+        <div
+          class="col-lg-3 col-md-6 col-sm-6 my-3"
+          v-for="currentProperty in properties"
+          :key="currentProperty.id"
+        >
+          <div v-if="currentProperty.propertyUsageType === 'Residential'">
+            <router-link :to="`/property/residential/property/${currentProperty.id}`">
+              <div class="portfolio-item p-4 wow fadeInUp justify-content-md-center">
+                <div class="feature-top pt-3 mb-2">
+                  <h3 style="color:white !important">{{ currentProperty.displayPrice }}</h3>
+                  <img
+                    style="height:165px; object-fit: cover;"
+                    :src="currentProperty.displayImage"
+                    alt
+                  />
+                </div>
+                <h1>{{ currentProperty.suburb }}</h1>
+                <p>
+                  <strong>Property Reference</strong>
+                  {{ currentProperty.propertyReference }}
+                </p>
+                <p
+                  v-if="currentProperty.displayText != ''"
+                  :class="[currentProperty.displayColor === 'green' ? 'greenText' : currentProperty.displayColor === 'orange' ? 'pendingOffer' : currentProperty.displayColor === 'red' ? 'redText' : 'normalText']"
+                >
+                  <strong>{{ currentProperty.displayText }}</strong>
+                </p>
+              </div>
+            </router-link>
+          </div>
+          <div v-else-if="currentProperty.propertyUsageType === 'Commercial'">
+            <router-link :to="`/property/commercial/property/${currentProperty.id}`">
+              <div class="portfolio-item p-4 wow fadeInUp justify-content-md-center">
+                <div class="feature-top pt-3 mb-2">
+                  <h3>{{ currentProperty.displayPrice }}</h3>
+                  <img
+                    style="height:165px; object-fit: cover;"
+                    :src="currentProperty.displayImage"
+                    alt
+                  />
+                </div>
+                <h1>{{ currentProperty.suburb }}</h1>
+                <p>
+                  <strong>Property Reference</strong>
+                  {{ currentProperty.propertyReference }}
+                </p>
+              </div>
+            </router-link>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+  <!-- #listings -->
+</template>
+
+<script>
+/* eslint-disable */
+
+export default {
+  props: {
+    properties: { type: Array, default: () => [] },
+    showSort: { type: Boolean, default: true },
+    salesType: { type: String, default: "Rent" },
+  },
+  methods: {
+    sortHighPrice() {
+      function compare(a, b) {
+        if (a.price < b.price) return 1;
+        if (a.price > b.price) return -1;
+        return 0;
+      }
+
+      return this.properties.sort(compare);
+    },
+    sortLowPrice() {
+      function compare(a, b) {
+        if (a.price < b.price) return -1;
+        if (a.price > b.price) return 1;
+        return 0;
+      }
+
+      return this.properties.sort(compare);
+    },
+    sortNewest() {
+      function compare(a, b) {
+        if (a.dateCreated < b.dateCreated) return 1;
+        if (a.dateCreated > b.dateCreated) return -1;
+        return 0;
+      }
+
+      return this.properties.sort(compare);
+    },
+    sortDateAvailable() {
+      function compare(a, b) {
+        if (a.dateAvailable > b.dateAvailable) return 1;
+        if (a.dateAvailable < b.dateAvailable) return -1;
+        return 0;
+      }
+
+      return this.properties.sort(compare);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/components/property/propertyImage.vue

@@ -22,6 +22,7 @@
           v-if="allowMultiple"
           type="checkbox"
           id="checkbox"
+          name="checkbox"
           v-model="imagesDefault[i]"
           @change="updateList(i)"
           :disabled="!mayEdit"
@@ -47,14 +48,14 @@ export default {
     loadedImages: Function,
     mayEdit: { type: Boolean, default: () => true },
     allowMultiple: { type: Boolean, default: () => true },
-    savedImages: { type: Array, default: () => [] },
+    savedImages: { type: Array, default: () => [] }
   },
   data() {
     return {
       images: {},
       image: [],
       imagesDefault: [],
-      maxSavedIndex: 0,
+      maxSavedIndex: 0
     };
   },
   // Commented out for now.
@@ -87,7 +88,7 @@ export default {
         const reader = new FileReader();
         var vm = this;
 
-        reader.onload = (e) => {
+        reader.onload = e => {
           vm.image.push(e.target.result);
         };
         reader.readAsDataURL(file[i]);
@@ -117,7 +118,7 @@ export default {
         }
         this.$emit("DefaultImage", index);
       }
-    },
+    }
   },
   watch: {
     savedImages: {
@@ -132,9 +133,9 @@ export default {
             this.maxSavedIndex = i;
           }
         }
-      },
-    },
-  },
+      }
+    }
+  }
 };
 </script>
 
@@ -143,7 +144,6 @@ export default {
   background: #d9534f;
   border-width: 0px;
   width: 150px;
-  margin-left: 0;
   font-family: "Muli";
   font-size: 15px;
   letter-spacing: 1px;
@@ -151,7 +151,7 @@ export default {
   padding: 10px 32px;
   border-radius: 2px;
   transition-duration: 5s;
-  margin: 10px;
+  margin-top: 10px;
   color: #fff;
 }
 

src/components/property/propertyUserField.vue

@@ -1,50 +1,38 @@
 <template>
   <div class="row">
-    <div class="col-md-4 mb-3 mt-2" v-for="(currentField, i) in fields" :key="i">
-      <div class="input-group-prepend">
-        <!-- <span class="input-group-text" style="color: #60CBEB">
-          <b>{{ GetFirstLetter(currentField.name) }}</b>
-        </span> -->
-        <div v-if="!setFields[i] && currentField.type !== 'yesno'">
-          <label class="uniSelectLabel" style="margin-top:-10px">{{ currentField.name }}</label>
-        </div>
-        <float-label :label="currentField.name" style="width:100%;top:-1em !important;">
-          <input
-            v-if="currentField.type === 'number'"
-            class="form-control uniInput"
-            type="number"
-            name="currentField.name"
-            id="currentField.id"
-            v-model="setFields[i]"
-            @change="UpdateSetFields(currentField, i)"
-          />
-
-          <input
-            v-if="currentField.type === 'text'"
-            class="form-control uniInput"
-            type="text"
-            name="currentField.name"
-            id="currentField.id"
-            v-model="setFields[i]"
-            @change="UpdateSetFields(currentField, i)"
-          />
-        </float-label>
+    <div class="col-md-4" v-for="(currentField, i) in fields" :key="i">
+      <div v-if="!setFields[i] && currentField.type !== 'yesno'">
+        <label class="uniSelectLabel" style="margin-top:10px;">{{ currentField.name }}</label>
       </div>
-    </div>
-
-    <div class="col-md-4 mb-2" v-for="(currentField, i) in fields" :key="'checkField' + i">
-      <div class="input-group-prepend">
-        <!-- <span class="input-group-text" style="color: #60CBEB">
-          <b>{{ GetFirstLetter(currentField.name) }}</b>
-        </span> -->
-        <div v-if="currentField.type === 'yesno'">
-          <label class="uniSelectLabel">{{ currentField.name }}</label>
-        </div>
+      <float-label :label="currentField.name" style="width:100%;top:-1em !important;">
+        <input
+          v-if="currentField.type === 'number'"
+          class="form-control uniInput"
+          type="number"
+          style="margin-top:20px;"
+          :name="currentField.name"
+          :id="currentField.id"
+          v-model="setFields[i]"
+          @change="UpdateSetFields(currentField, i)"
+        />
 
         <input
-          v-if="currentField.type === 'yesno'"
+          v-if="currentField.type === 'text'"
+          class="form-control uniInput"
+          type="text"
+          style="margin-top:20px;"
+          :name="currentField.name"
+          :id="currentField.id"
+          v-model="setFields[i]"
+          @change="UpdateSetFields(currentField, i)"
+        />
+      </float-label>
+      <div class="input-group" v-if="currentField.type === 'yesno'">
+        <label class="uniSelectLabel" :for="currentField.name">{{ currentField.name }}</label>
+        <input
           type="checkbox"
-          id="currentField.id"
+          :id="currentField.id"
+          :name="currentField.name"
           style="margin-left:-5px; margin-top:10px"
           v-model="setFields[i]"
           @change="UpdateSetFields(currentField, i)"
@@ -71,7 +59,9 @@ export default {
         userDefinedFieldId: field.id,
         value: this.setFields[index]
       };
-      this.$emit("UpdateUserDefinedFields", item);
+      if (item) {
+        this.$emit("UpdateUserDefinedFields", item);
+      }
     },
     GetFirstLetter(value) {
       if (value) {

src/components/property/residential/createProperty/residentialCreateNew.vue

@@ -4,9 +4,9 @@
       <div class="container pb-5">
         <div class="row">
           <div class="col">
-            <label v-if="!salesType" class="uniSelectLabel" for="saleType">Sale Type</label>
+            <label v-if="!salesType" class="uniSelectLabel" for="resSaleType">Sale Type</label>
             <float-label label="Sale Type">
-              <select class="form-control uniSelect mb-3" name="saleType" v-model="salesType">
+              <select class="form-control uniSelect mb-3" name="resSaleType" v-model="salesType">
                 <option value="Sale">To Sell</option>
                 <option value="Rental">To Rent</option>
               </select>
@@ -22,7 +22,7 @@
               <input
                 class="form-control uniInput"
                 type="text"
-                name="propertyName"
+                name="resPropertyName"
                 v-model="property.propertyName"
               />
             </float-label>
@@ -35,7 +35,7 @@
               <input
                 class="form-control uniInput"
                 type="text"
-                name="propertyRef"
+                name="resPropertyRef"
                 v-model="property.propertyRef"
               />
             </float-label>
@@ -45,15 +45,15 @@
           <div class="col-md-6">
             <select
               class="form-control uniSelect"
-              name="propertyType"
-              id="propertyType"
+              name="resPropertyType"
+              id="resPropertyType"
               v-model="property.propertyTypeId"
               @change="PropertyTypeSelected"
             >
               <option value="0">Please select type *</option>
-              <option v-for="item in propertyTypes" :value="item.id" :key="item.id">
-                {{ item.description }}
-              </option>
+              <option v-for="item in propertyTypes" :value="item.id" :key="item.id">{{
+                item.description
+              }}</option>
             </select>
           </div>
         </div>
@@ -72,24 +72,29 @@
               <div class="col-md-6">
                 <div v-if="property.price < 1">
                   <label
-                    for="price"
+                    for="resPrice"
                     class="uniSelectLabel"
                     style="text-transform:uppercase; margin-left:17px; background-color:white"
                     >{{ salesType }} Price</label
                   >
                 </div>
                 <float-label label="Price">
-                  <currency-input <<<<<<< HEAD ======= onclick="this.setSelectionRange(0,
-                  this.value.length)" >>>>>>> 6bbfd86e089da859d019dcbda5cc0fe053af8db2 name="price"
-                  :value="property.price" @input="property.price = $event" v-model="property.price"
-                  id="price" class="form-control uniInput" />
+                  <currency-input
+                    onclick="this.setSelectionRange(0, this.value.length)"
+                    name="resPrice"
+                    :value="property.price"
+                    @input="property.price = $event"
+                    v-model="property.price"
+                    id="resPrice"
+                    class="form-control uniInput"
+                  />
                 </float-label>
               </div>
               <div v-if="salesType === 'Rental'" class="col-md-6">
                 <select
                   class="form-control uniSelect"
-                  name="propertyType"
-                  id="propertyType"
+                  name="resPropertyType"
+                  id="resPropertyType"
                   v-model="property.pricePer"
                 >
                   <option value>Please select</option>
@@ -103,7 +108,7 @@
                 <input
                   type="date"
                   class="form-control uniInput"
-                  name="date"
+                  name="resDate"
                   v-model="property.dateAvailable"
                 />
               </div>
@@ -114,13 +119,13 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.streetNumber">
-                  <label for="streetNumber" class="uniSelectLabel">STREET NUMBER</label>
+                  <label for="resStreetNumber" class="uniSelectLabel">STREET NUMBER</label>
                 </div>
                 <input
                   class="form-control uniInput"
                   type="text"
-                  name="streetNumber"
-                  id="streetNumber"
+                  name="resStreetNumber"
+                  id="resStreetNumber"
                   v-model="property.streetNumber"
                 />
               </div>
@@ -128,13 +133,13 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.streetName">
-                  <label for="streetName" class="uniSelectLabel">STREET NAME</label>
+                  <label for="resStreetName" class="uniSelectLabel">STREET NAME</label>
                 </div>
                 <input
                   class="form-control uniInput"
                   type="text"
-                  name="streetName"
-                  id="streetName"
+                  name="resStreetName"
+                  id="resStreetName"
                   v-model="property.streetName"
                 />
               </div>
@@ -142,13 +147,13 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.suburb">
-                  <label for="suburb" class="uniSelectLabel">SUBURB</label>
+                  <label for="resSuburb" class="uniSelectLabel">SUBURB</label>
                 </div>
                 <input
                   class="form-control uniInput"
                   type="text"
-                  name="suburb"
-                  id="suburb"
+                  name="resSuburb"
+                  id="resSuburb"
                   v-model="property.suburb"
                 />
               </div>
@@ -156,13 +161,13 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.city">
-                  <label for="city" class="uniSelectLabel">CITY</label>
+                  <label for="resCity" class="uniSelectLabel">CITY</label>
                 </div>
                 <input
                   class="form-control uniInput"
                   type="text"
-                  name="city"
-                  id="city"
+                  name="resCity"
+                  id="resCity"
                   v-model="property.city"
                 />
               </div>
@@ -170,13 +175,13 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.province">
-                  <label for="province" class="uniSelectLabel">PROVINCE</label>
+                  <label for="resProvince" class="uniSelectLabel">PROVINCE</label>
                 </div>
                 <input
                   class="form-control uniInput"
                   type="text"
-                  name="province"
-                  id="province"
+                  name="resProvince"
+                  id="resProvince"
                   v-model="property.province"
                 />
               </div>
@@ -184,13 +189,13 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.postalCode">
-                  <label for="postalCode" class="uniSelectLabel">POSTAL CODE</label>
+                  <label for="resPostalCode" class="uniSelectLabel">POSTAL CODE</label>
                 </div>
                 <input
                   class="form-control uniInput"
                   type="text"
-                  name="postalCode"
-                  id="postalCode"
+                  name="resPostalCode"
+                  id="resPostalCode"
                   v-model="property.postalCode"
                 />
               </div>
@@ -198,13 +203,13 @@
             <div class="row my-3">
               <div class="col-md-12">
                 <div v-if="!property.country">
-                  <label for="country" class="uniSelectLabel">COUNTRY</label>
+                  <label for="resCountry" class="uniSelectLabel">COUNTRY</label>
                 </div>
                 <input
                   class="form-control uniInput"
                   type="text"
-                  name="country"
-                  id="country"
+                  name="resCountry"
+                  id="resCountry"
                   v-model="property.country"
                 />
               </div>
@@ -233,42 +238,10 @@
         <div class="section-header">
           <h2>Property Information</h2>
         </div>
-
-        <div v-for="item in propertyFields" :key="item.id">
-          <div v-if="item.name === 'Residential Fields'">
-            <UserField
-              :fields="item.fields"
-              :id="item.name"
-              @UpdateUserDefinedFields="UpdateUserDefinedFields"
-              :fieldValues="item.fields"
-            />
-          </div>
-        </div>
-        <!-- <UserField
-          v-if="propertyOverviewFields.length > 0"
-          :fields="propertyOverviewFields[0].fields"
-          @UpdateUserDefinedFields="UpdateUserDefinedFields"
-          :id="1"
-        ></UserField> -->
-        <!-- <div class="row">
-          <div class="col-md-12">
-            <div v-for="item in propertyFields" :key="item.id">
-              <div class="row">
-                <div class="col-sm-12">
-                  <div class="section-header">
-                    <h2>{{ item.name }}</h2>
-                  </div>
-                </div>
-              </div>
-              <UserField
-                :fields="item.fields"
-                :id="item.name"
-                @UpdateUserDefinedFields="UpdateUserDefinedFields"
-                :fieldValues="item.fields"
-              />
-            </div>
-          </div>
-        </div>-->
+        <UserField
+          :fields="propFields"
+          @UpdateUserDefinedFields="UpdateUserResidentialFields"
+        ></UserField>
         <div class="row">
           <div class="col-sm-12">
             <div class="section-header">
@@ -284,8 +257,8 @@
                 <input
                   class="form-control uniInput"
                   type="link"
-                  name="vtlink"
-                  id="vtlink"
+                  name="resVtlink"
+                  id="resVtlink"
                   v-model="property.virtualTour"
                 />
               </float-label>
@@ -300,8 +273,8 @@
                 <input
                   class="form-control uniInput"
                   type="link"
-                  name="vlink"
-                  id="vlink"
+                  name="resVlink"
+                  id="resVlink"
                   v-model="property.video"
                 />
               </float-label>
@@ -355,6 +328,9 @@ export default {
     carouselSection,
     mapSection
   },
+  props: {
+    propFields: {}
+  },
   data() {
     return {
       propertyType: "Residential",
@@ -477,11 +453,9 @@ export default {
     loadedImages(values) {
       this.images = values;
     },
-    UpdateUserDefinedFields(item) {
+    UpdateUserResidentialFields(item) {
       let update = false;
       this.propertyFieldValues.forEach(element => {
-        console.log(element);
-
         if (element.userDefinedFieldId === item.userDefinedFieldId) {
           element.value = item.value;
           update = true;
@@ -518,8 +492,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.propertyFields);
-
     this.wait = false;
     this.getProperty(0);
     this.clearPropertyImages();

src/components/property/residential/residentialSearchResults.vue

@@ -1,12 +1,18 @@
 <template>
   <main id="main" style="margin-top:-20px; padding-bottom:50px">
     <div v-if="wait" id="preloader"></div>
-    <section v-if="properties.length > 0">
+    <div class="row pt-5 justify-content-md-center">
+      <h3 v-if="propertySearch.salesType === 'Sale'">RESIDENTIAL PROPERTIES FOR SALE</h3>
+      <h3 v-else-if="propertySearch.salesType === 'Rent'">RESIDENTIAL PROPERTIES FOR RENT</h3>
+    </div>
+    <propertyCard
+      v-if="properties.length > 0"
+      name="propertyholder"
+      :properties="properties"
+      :showSort="false"
+    />
+    <!-- <section v-if="properties.length > 0">
       <div class="container">
-        <div class="row pt-5 justify-content-md-center">
-          <h3 v-if="propertySearch.salesType === 'Sale'">RESIDENTIAL PROPERTIES FOR SALE</h3>
-          <h3 v-else-if="propertySearch.salesType === 'Rent'">RESIDENTIAL PROPERTIES FOR RENT</h3>
-        </div>
         <div class="row justify-content-md-center">
           <div
             class="col-lg-3 col-md-6 col-sm-6"
@@ -21,7 +27,7 @@
                 <p>{{ currentProperty.shortDescription }}</p>
                 <br />
 
-                <!-- <a href="commercialproperty-page.php" class="btn-white-border">VIEW</a> -->
+                <a href="commercialproperty-page.php" class="btn-white-border">VIEW</a>
                 <router-link
                   class="btn-white-border"
                   :to="`/property/residential/property/${currentProperty.id}`"
@@ -32,7 +38,7 @@
           </div>
         </div>
       </div>
-    </section>
+    </section> -->
     <section v-else id="intro" style="margin-bottom:-50px">
       <div class="container">
         <div class="row d-flex justify-content-center">
@@ -69,7 +75,7 @@
 <script>
 /* eslint-disable */
 import { mapState, mapActions } from "vuex";
-import propertyCard from "../propertyCard";
+import propertyCard from "../propertyCardSearch";
 
 export default {
   name: "propertysearch",

src/components/property/residential/singleView/contentSection.vue

@@ -1,6 +1,6 @@
 <template>
   <section>
-    <div class="container pb-5">
+    <div class="container">
       <div class="row" id="resort-profile">
         <div class="col-md-4">
           <div class="resPortfolioSection">
@@ -44,8 +44,6 @@
                 <p v-if="field.name === 'Bathrooms'">Bathrooms {{ field.value }}</p>
               </div>
             </div>
-
-            <div class="btn-white-border"><i class="fa fa-search"></i>BOOK A VIEWING</div>
           </div>
           <div class="panel-left px-5 pb-5 text-center">
             <h4 class="text-white">Share this Property</h4>
@@ -91,30 +89,50 @@
                 <p v-html="property.description"></p>
               </div>
             </div>
-          </div>
-          <div>
-            <router-link
-              style="float:right"
-              class="btn-solid-blue mt-3"
-              :to="{ name: 'EnquireNow', params: { id: $route.params.id } }"
-              >MORE INFO...</router-link
-            >
-            <h4>Property Features</h4>
-            {{ propertyFeatures }}
-            <div v-for="(data, i) in property.displayData" :key="i" class="row my-3">
-              <div v-for="(field, j) in data.values" :key="j" class="col-md-6">
-                <div v-if="field.value.toUpperCase() != 'TRUE'">
-                  <i class="fa fa-check-circle"></i>
-                  {{ field.value }} {{ field.name }}
-                </div>
-                <div v-else>
-                  <i class="fa fa-check-circle"></i>
-                  {{ field.name }}
+            <div class="row">
+              <div class="col">
+                <h4>Property Features</h4>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-md-8">
+                <div v-for="(data, i) in property.displayData" :key="i" class="row my-3">
+                  <div v-for="(field, j) in data.values" :key="j" class="col-md-6">
+                    <div v-if="field.value !== 'yes'">
+                      <i class="fa fa-check-circle"></i>
+                      {{ field.value }} {{ field.name }}
+                    </div>
+                    <div v-else>
+                      <i class="fa fa-check-circle"></i>
+                      {{ field.name }}
+                    </div>
+                  </div>
                 </div>
               </div>
+              <div class="col-md-4">
+                <router-link
+                  style="float:right; white-space: nowrap;"
+                  class="btn-solid-blue mt-3"
+                  :to="{ name: 'EnquireNow', params: { id: $route.params.id } }"
+                  >ENQUIRE NOW</router-link
+                >
+              </div>
             </div>
           </div>
-          <h4 v-if="property.video != null" class="mt-5">Video Tour</h4>
+
+          <h4 v-if="property.virtualTour != null" style="margin-top:150px">Virtual Tour</h4>
+          <iframe
+            v-if="property.virtualTour != null"
+            width="100%"
+            :src="property.virtualTour"
+            frameborder="0"
+            allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+            allowfullscreen
+            style="margin-bottom:-6px"
+            class="mt-3"
+          ></iframe>
+
+          <h4 v-if="property.video != null" class="mt-5">Video</h4>
           <iframe
             v-if="property.video != null"
             width="100%"
@@ -125,6 +143,7 @@
             style="margin-bottom:-6px"
             class="mt-3"
           ></iframe>
+
           <p></p>
           <div class="d-flex mt-3">
             <iframe

src/components/shared/listView.vue

@@ -1,24 +1,25 @@
 /* eslint-disable no-restricted-syntax */ /* eslint-disable guard-for-in */
 <template>
   <div>
-    <div style="height:5px"></div>
-    <div class="d-flex justify-content-between">
-      <div class="p-2" v-if="!hideSearch">
-        <float-label label="SEARCH">
-          <input v-model="searchItem" class="form-control uniInput mt-3" placeholder="Search..." />
+    <div class="row">
+      <div align="center" class="col">
+        <float-label class="mb-3" label="SEARCH" style="width:50%; float:center">
+          <input v-model="searchItem" class="form-control uniInput mt-3" placeholder="SEARCH" />
         </float-label>
       </div>
+    </div>
+
+    <div class="d-flex justify-content-between">
+      <div class="p-2" v-if="!hideSearch"></div>
       <div class="p-2" v-if="title">
         <h2>{{ title }}</h2>
       </div>
       <div class="p-2">
         <div class="d-flex flex-row">
           <div class="p2" v-if="showColumnChooser">
-            <div
-              class="btn-solid-blue cursor-pointer"
-              data-toggle="modal"
-              data-target="#myModal"
-            >Column Chooser</div>
+            <div class="btn-solid-blue cursor-pointer" data-toggle="modal" data-target="#myModal">
+              Column Chooser
+            </div>
             <div class="col-md-12">
               <div id="myModal" class="modal fade" role="dialog">
                 <div class="modal-dialog modal-lg" style="width:500px">
@@ -37,7 +38,9 @@
             </div>
           </div>
           <div class="p2" v-if="selectedItems.length > 0">
-            <div class="btn-solid-blue cursor-pointer" @click="onClearSelected()">Clear Selected</div>
+            <div class="btn-solid-blue cursor-pointer" @click="onClearSelected()">
+              Clear Selected
+            </div>
           </div>
           <div class="p2" v-if="showNew">
             <div class="btn-solid-blue cursor-pointer" @click="onNew()">New</div>
@@ -62,14 +65,12 @@
                 :class="{ active: hover === c }"
               >
                 <div class="d-flex bd-highlight">
-                  <div
-                    v-if="displayHeaders.length === 0"
-                    class="p-2 w-100 bd-highlight"
-                  >{{ column | toProper }}</div>
-                  <div
-                    v-else
-                    class="p-2 w-100 bd-highlight"
-                  >{{ displayHeaders[c] !== "" ? displayHeaders[c] : column | toProper }}</div>
+                  <div v-if="displayHeaders.length === 0" class="p-2 w-100 bd-highlight">
+                    {{ column | toProper }}
+                  </div>
+                  <div v-else class="p-2 w-100 bd-highlight">
+                    {{ displayHeaders[c] !== "" ? displayHeaders[c] : column | toProper }}
+                  </div>
                   <div class="p-2 flex-shrink-1 bd-highlight">
                     <img
                       src="../../../public/img/sort-up.png"
@@ -90,7 +91,8 @@
             <th v-if="deleteable"></th>
           </tr>
         </thead>
-        <tbody class="table">
+
+        <tbody>
           <tr
             v-for="(item, i) in DisplayItems"
             :key="i"
@@ -98,29 +100,32 @@
             :class="{ selected: isSelected(i), 'cursor-pointer': allowSelect }"
           >
             <td v-for="(column, c) in Columns" :key="c">
-              <div
-                v-if="displayFormats.length === 0"
-              >{{ isObject(item[column]) ? item[column].display : item[column] }}</div>
+              <div v-if="displayFormats.length === 0">
+                {{ isObject(item[column]) ? item[column].display : item[column] }}
+              </div>
               <div v-else-if="displayFormats.length > 0 && displayFormats[c] === 'date'">
-                <div
-                  v-if="item[column] !== '0001-01-01T00:00:00'"
-                >{{ isObject(item[column]) ? item[column].display : item[column] | toDate }}</div>
+                <div v-if="item[column] !== '0001-01-01T00:00:00'">
+                  {{ isObject(item[column]) ? item[column].display : item[column] | toDate }}
+                </div>
               </div>
               <div
+                style="padding-left:10px;white-space: nowrap;"
                 v-else-if="displayFormats.length > 0 && displayFormats[c] === 'money'"
-              >{{ isObject(item[column]) ? item[column].display : item[column] | toCurrency }}</div>
+              >
+                {{ isObject(item[column]) ? item[column].display : item[column] | toCurrency }}
+              </div>
               <div v-else-if="displayFormats.length > 0 && displayFormats[c] === 'image'">
                 <img :src="item[column]" style="height:100px; width:100px; object-fit: cover;" />
               </div>
               <div v-else>{{ isObject(item[column]) ? item[column].display : item[column] }}</div>
             </td>
             <td v-if="showCustomAction" class="my-width">
-              <button
-                type="button"
-                class="btn my-btn"
-                @click="onCustomClick(item)"
-              >{{ CustomActionHeading }}</button>
+              <button type="button" class="btn my-btn" @click="onCustomClick(item)">
+                <p v-if="CustomActionHeading !== 'Publish'">{{ CustomActionHeading }}</p>
+                <img v-else src="../../../public/img/icons/Upload.png" height="25" width="25" />
+              </button>
             </td>
+
             <td v-if="editable" class="my-width">
               <a @click="onEdit(item)" class="p-3">
                 <img src="../../../public/img/icons/Edit.png" height="25" width="25" />
@@ -139,10 +144,10 @@
       <div class="d-flex justify-content-between" v-if="showPager">
         <div class="p-1">
           {{
-          currentPage +
-          " / " +
-          PageCount +
-          (!hideItemCount ? " - (" + FilteredItems.length + " items)" : "")
+            currentPage +
+              " / " +
+              PageCount +
+              (!hideItemCount ? " - (" + FilteredItems.length + " items)" : "")
           }}
         </div>
         <div class="p-1">
@@ -187,7 +192,7 @@ export default {
   components: {
     BasePagination,
     Alert,
-    ListViewControl,
+    ListViewControl
   },
   mounted() {
     try {
@@ -203,75 +208,75 @@ export default {
   },
   props: {
     compact: {
-      default: true,
+      default: false
     },
     allowSelect: {
-      default: true,
+      default: true
     },
     allowMultipleSelect: {
-      default: false,
+      default: false
     },
     hideSearch: {
-      default: false,
+      default: false
     },
     showNew: {
-      default: true,
+      default: true
     },
     items: undefined,
     editable: {
-      default: false,
+      default: false
     },
     deleteable: {
-      default: false,
+      default: false
     },
     columnCount: {
-      default: 6,
+      default: 6
     },
     showPager: {
-      default: true,
+      default: true
     },
     title: {
-      default: undefined,
+      default: undefined
     },
     sortKey: {
-      default: "id",
+      default: "id"
     },
     hideItemCount: {
-      default: false,
+      default: false
     },
     currentPage: {
-      default: 1,
+      default: 1
     },
     bordered: {
-      default: true,
+      default: false
     },
     striped: {
-      default: true,
+      default: true
     },
     showColumnChooser: {
-      default: true,
+      default: true
     },
     displayColumns: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
     displayFormats: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
     displayHeaders: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
     showCustomAction: {
-      default: false,
+      default: false
     },
     CustomActionHeading: {
-      default: "",
+      default: ""
     },
     CustomActionCondition: {
-      default: "",
-    },
+      default: ""
+    }
   },
   data() {
     return {
@@ -284,7 +289,7 @@ export default {
       visibleItemsPerPageCount: 20,
       itemsPerPageList: ItemsPerPageList,
       visibleColumn: [],
-      allColumn: [],
+      allColumn: []
     };
   },
   methods: {
@@ -306,16 +311,12 @@ export default {
         for (const i in Object.keys(this.items)) {
           const item = this.items[i];
           for (const o in Object.keys(item)) {
-            if (
-              !listAll.includes(Object.keys(item)[o]) &&
-              !Array.isArray(Object.values(item)[o])
-            ) {
+            if (!listAll.includes(Object.keys(item)[o]) && !Array.isArray(Object.values(item)[o])) {
               const columnName = Object.keys(item)[o];
-              if (!listAll.some((x) => x.column === columnName)) {
+              if (!listAll.some(x => x.column === columnName)) {
                 listAll.push({
                   column: columnName,
-                  show:
-                    _.filter(listAll, (x) => x.show).length < this.columnCount,
+                  show: _.filter(listAll, x => x.show).length < this.columnCount
                 });
               }
             }
@@ -330,7 +331,7 @@ export default {
     },
     isSelected(i) {
       const ind = this.getActualIndex(i);
-      return _.some(this.selectedItems, (x) => x === ind);
+      return _.some(this.selectedItems, x => x === ind);
     },
     onNew() {
       this.$emit("onNew");
@@ -366,8 +367,8 @@ export default {
     },
     onRowClick(item, i) {
       const ind = this.getActualIndex(i);
-      if (_.some(this.selectedItems, (x) => x === ind)) {
-        this.selectedItems = this.selectedItems.filter((x) => x !== ind);
+      if (_.some(this.selectedItems, x => x === ind)) {
+        this.selectedItems = this.selectedItems.filter(x => x !== ind);
       } else {
         if (!this.allowMultipleSelect) {
           this.selectedItems = [];
@@ -420,7 +421,7 @@ export default {
         if (array[i] === value) return true;
       }
       return false;
-    },
+    }
   },
   computed: {
     ListWidth() {
@@ -447,7 +448,7 @@ export default {
           listColumns.push(this.displayColumns[i]);
         }
       } else {
-        const list = _.filter(this.allColumn, (x) => x.show);
+        const list = _.filter(this.allColumn, x => x.show);
         for (const i in list) {
           const item = list[i];
           if (item) {
@@ -464,9 +465,9 @@ export default {
       return list;
     },
     FilteredItems() {
-      const list = _.filter(this.items, (item) =>
+      const list = _.filter(this.items, item =>
         Object.values(item).some(
-          (i) =>
+          i =>
             JSON.stringify(i)
               .toLowerCase()
               .indexOf(this.searchItem.toLowerCase()) > -1
@@ -484,8 +485,8 @@ export default {
       return list.slice(startSlice, endSlice);
     },
 
-    GetAllColumn() {},
-  },
+    GetAllColumn() {}
+  }
 };
 </script>
 <style scoped>

src/components/timeshare/resort/resortPageNew.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <carouselSection v-if="!wait" :resortImages="resort.images" />
-    <main id="main" style="margin-top:-20px">
+    <main id="main" style="margin-top:-20px;">
       <section>
-        <div class="container">
+        <div class="container wider">
           <div class="row" id="resort-profile">
             <div class="col-md-3">
               <img src="img/listings/property1/property1-gallery.jpg" class="img-fluid" alt />
@@ -18,7 +18,7 @@
               <gallerySection :images="resort.images" />
               <FilterComponent :hideTop="true" />
             </div>
-            <div class="col-md-9 p-5 resort-profile">
+            <div class="col-md-9 resort-profile" style="margin-top:15px; margin-bottom:15px;">
               <h2>{{ resort.prName }}</h2>
               <WeekList :resortCode="resortCode" />
               <p v-if="resort.description && resort.description !== ''">{{ resort.description }}</p>
@@ -97,4 +97,8 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.wider {
+  width: 1600px;
+}
+</style>

src/components/timeshare/sell/contentSection.vue

@@ -843,18 +843,18 @@ export default {
   name: "TimeshareToSell",
   props: {
     weekId: {
-      default: 0
-    }
+      default: 0,
+    },
   },
   data() {
     return {
       wait: false,
-      userLoggedIn: Log.isLoggedIn()
+      userLoggedIn: Log.isLoggedIn(),
     };
   },
   components: {
     addressAutoComplete,
-    Alert
+    Alert,
   },
   mounted() {
     if (this.sellItem.id) {
@@ -880,13 +880,13 @@ export default {
       "sellItem",
       "agencies",
       "agents",
-      "getTemplate"
+      "getTemplate",
     ]),
     ...mapState("individual", ["indiv"]),
     ...mapState("authentication", ["isLoggedIn"]),
     ...mapGetters({
       user: "authentication/getUser",
-      person: "authentication/getPerson"
+      person: "authentication/getPerson",
     }),
     ...mapState("bank", ["banks"]),
     refAgent() {
@@ -901,7 +901,8 @@ export default {
         this.sellItem.region.regionCode
       ) {
         const item = this.detailedRegion.find(
-          region => region.region.regionCode === this.sellItem.region.regionCode
+          (region) =>
+            region.region.regionCode === this.sellItem.region.regionCode
         );
         if (item) {
           list = item.children;
@@ -909,14 +910,14 @@ export default {
       } else {
         list = this.resorts;
       }
-      return _.sortBy(list, x => x.resortName);
+      return _.sortBy(list, (x) => x.resortName);
     },
     isLoggedIn() {
       return this.user && this.person;
     },
     displayNotDeletedAgents() {
       var notDeletedArr = [];
-      this.agents.forEach(agent => {
+      this.agents.forEach((agent) => {
         if (!agent.isDeleted) {
           if (agent.agencyId === this.sellItem.agencyId) {
             notDeletedArr.push(agent);
@@ -937,7 +938,7 @@ export default {
         return false;
       }
       return true;
-    }
+    },
   },
   methods: {
     ...mapActions("individual", ["getIndividual"]),
@@ -945,7 +946,7 @@ export default {
       "initTimeshare",
       "onResortChange",
       "saveWeek",
-      "getBlankWeek"
+      "getBlankWeek",
     ]),
     ...mapActions("payment", ["addPayment"]),
     ...mapActions("bank", ["getBanks"]),
@@ -957,10 +958,9 @@ export default {
       if (this.userLoggedIn) {
         this.sellItem.ownerObject = this.indiv;
         this.sellItem.status = undefined;
-        console.log(this.sellItem);
-        //   this.saveWeek(this.sellItem).then(fulfilled => {
-        //     this.paygateRedirect();
-        //   });
+        this.saveWeek(this.sellItem).then((fulfilled) => {
+          this.paygateRedirect();
+        });
       }
     },
     paygateRedirect() {
@@ -971,16 +971,16 @@ export default {
         creatydById: Log.getUser().id, //Log.getUser().id,
         amount: amount,
         paymentStatus: "",
-        paymentToken: ""
+        paymentToken: "",
       };
 
-      this.addPayment(paymentObj).then(res => {
+      this.addPayment(paymentObj).then((res) => {
         this.$router.push({
           name: "PaymentGateway",
           params: {
             paymentReqId: res.PAY_REQUEST_ID,
-            checksum: res.CHECKSUM
-          }
+            checksum: res.CHECKSUM,
+          },
         });
       });
     },
@@ -1005,7 +1005,7 @@ export default {
     resortChange() {
       this.onResortChange({
         resortName: this.sellItem.resort.resortName,
-        resortCode: this.sellItem.resort.resortCode
+        resortCode: this.sellItem.resort.resortCode,
       });
 
       if (this.sellItem && this.sellItem.resort === "Other") {
@@ -1035,8 +1035,8 @@ export default {
       } else {
         this.sellItem.mandateDate = undefined;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 

src/main.js

@@ -37,7 +37,10 @@ axios.defaults.baseURL = "http://training.provision-sa.com:82";
 Vue.prototype.$axios = axios;
 const pluginOptions = {
   /* see config reference */
-  globalOptions: { currency: ["ZAR", null, { prefix: "R" }][2] }
+  globalOptions: {
+    currency: ["ZAR", null, { prefix: "R" }][2],
+    precision: 0
+  }
 };
 Vue.use(VueCurrencyInput, pluginOptions);
 Vue.prototype.$http = axios;
@@ -63,7 +66,7 @@ Vue.filter("toCurrency", value => {
     return value;
   }
   const formatter = new Intl.NumberFormat("en-US", {
-    minimumFractionDigits: 2
+    minimumFractionDigits: 0
   });
   return `R ${formatter.format(value)}`;
 });

src/store/modules/property/property.js

@@ -53,7 +53,9 @@ export default {
       state.statuses = stats;
     }
   },
-  getters: {},
+  getters: {
+    getFields: state => state.propertyFields
+  },
   actions: {
     getStatuses({ commit }) {
       axios
@@ -123,9 +125,9 @@ export default {
         .then(response => commit("setPropertyOverviewFields", response.data));
     },
     getPropertyFields({ commit }, propertyType) {
-      axios
-        .get(`/api/propertyFields/PropertyType/${propertyType}`)
-        .then(response => commit("setPropertyFields", response.data));
+      return axios.get(`/api/propertyFields/PropertyType/${propertyType}`).then(response => {
+        commit("setPropertyFields", response.data);
+      });
     },
     getSavedPropertyFields({ commit }, id) {
       axios

src/store/modules/timeshare/myWeeks.js

@@ -58,8 +58,8 @@ export default {
     //   .then(result => commit('removeListing', id))
     //   .catch(console.error);
     // }
-    getWeek({ commit }, id) {
-      axios
+    async getWeek({ commit }, id) {
+      await axios
         .get(`/api/timeshareweek/${id}`)
         .then(r => {
           console.log(JSON.stringify(r));