EnquireNow & Styling

src/components/admin/misc/termsConditions.vue

@@ -8,22 +8,31 @@
           </div>
         </div>
       </div>
+
       <div class="row">
         <div class="col-md-6">
           <label for="version" class="uniSelectLabel">Version:</label>
           <input name="version" type="text" v-model="version" class="mt-5 mb-3 ml-2" />
         </div>
         <div class="col-md-6 mt-5">
-          <p style="float:right">Last Modified: {{ terms.modified | toDate }}</p>
+          <p style="float:right">Last Modified: {{ getModiefiedDate }}</p>
         </div>
       </div>
       <div class="row">
         <div class="col">
           <vue-editor v-model="termsInput" :editor-toolbar="customToolbar" />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-2 mt-3">
           <button @click="saveTerms()" class="btn-solid-blue">Save</button>
         </div>
+        <div v-if="updated" class="col mt-3">
+          <alert :text="'Terms and Contidtions Updated!!'" :type="'SUCCESS'" />
+        </div>
       </div>
     </div>
+    <div v-if="wait" id="preloader"></div>
   </main>
 </template>
 
@@ -31,15 +40,19 @@
 /* eslint-disable */
 import { VueEditor } from "vue2-editor";
 import { mapActions, mapGetters, mapState } from "vuex";
+import alert from "../../shared/alert";
 
 export default {
   components: {
-    VueEditor
+    VueEditor,
+    alert
   },
   data() {
     return {
       termsInput: "",
       version: "",
+      updated: false,
+      wait: true,
       customToolbar: [
         [{ header: [false, 1, 2, 3, 4, 5, 6] }],
         ["bold", "italic", "underline", "strike"],
@@ -60,17 +73,27 @@ export default {
         termsConditions: this.termsInput,
         version: this.version
       };
-      this.setTerms(termsObj);
+      this.setTerms(termsObj).then(() => {
+        this.updated = true;
+        this.$router.go();
+      });
     },
     async populateTerms() {
       await this.retrieveTerms();
       this.version = this.terms.version;
       this.termsInput = this.terms.termsConditions;
+      setTimeout(() => {
+        this.wait = false;
+      }, 500);
     }
   },
   computed: {
     ...mapGetters("termsConditions", ["getTermsAndConditions"]),
-    ...mapState("termsConditions", ["terms"])
+    ...mapState("termsConditions", ["terms"]),
+    getModiefiedDate() {
+      var date = new Date(this.terms.modified);
+      return date.getDate() + " / " + (date.getMonth() + 1) + " / " + date.getFullYear();
+    }
   }
 };
 </script>

src/components/admin/status/timeshareAdminPage.vue

@@ -10,75 +10,70 @@
           </div>
         </div>
       </div>
-    </div>
-
-    <div class="row">
-      <div class="offset-1 col-md-6">
-        <div class="form-group col-md-3">
-                <div class="input-group">
-                  <label
-                    class="uniSelectLabel"
-                    for="weekInfoRegionSelect"
-                  >REGION</label>
-
-                  <select
-                    id="weekInfoRegionSelect"
-                    class="form-control uniSelect"
-                    @change="regionChange()"
-                    style="font-size: 15px"
-                  >
-                    <option
-                      v-for="(region, r) in regions"
-                      :key="r"
-                      :value="region"
-                    >{{ region.regionName }}</option>
-                  </select>
-                </div>
-                <div class="validation"></div>
-              </div>
-
-                  <div class="form-group col-md-3">
-                <div class="input-group">
-                  <label
-                    class="uniSelectLabel"
-                    for="weekInfoResortSelect"
-                  >RESORT NAME</label>
-
-                  <select
-                    id="weekInfoResortSelect"
-                    class="form-control uniSelect"
-                    @change="resortChange()"
-                  >
-                    <option value="Other">Other</option>
-                    <option
-                      v-for="(resort, r) in resorts"
-                      :key="r"
-                      :value="resort"
-                    >{{ resort.resortName }}</option>
-                  </select>
-                </div>
-                  </div>
-
-                  <div class="form-group col-md-3">
-                <label class="uniSelectLabel" for="region">SEASON</label>
-
-                <select
-                  class="form-control uniSelect"
-                  name="region"
-                  id="region">
-                  <option v-for="(season, r) in seasons" :key="r">{{ season.name }}</option>
-                </select>
-                <div class="validation"></div>
-              </div>
-
-              <div class="form-group col-md-3">
-                <label class="uniSlectLabel">STATUS</label>
-                <select class="form-control uniSelect"
-                        name="status">
-                </select>
-              </div>
-              <button type="button"> Filter</button>
-        <!-- <button
+      <div class="row">
+        <div class="col-md-3">
+          <float-label label="REGION">
+            <select
+              id="weekInfoRegionSelect"
+              class="form-control uniSelect"
+              @change="regionChange()"
+              style="font-size: 15px"
+            >
+              <option v-for="(region, r) in regions" :key="r" :value="region">{{
+                region.regionName
+              }}</option>
+            </select>
+          </float-label>
+        </div>
+        <div class="col-md-3">
+          <float-label label="RESORT NAME">
+            <select
+              id="weekInfoResortSelect"
+              class="form-control uniSelect"
+              @change="resortChange()"
+            >
+              <option value="Other">Other</option>
+              <option v-for="(resort, r) in resorts" :key="r" :value="resort">{{
+                resort.resortName
+              }}</option>
+            </select>
+          </float-label>
+        </div>
+        <div class="col-md-3">
+          <float-label label="SEASON">
+            <select class="form-control uniSelect" name="region" id="region">
+              <option v-for="(season, r) in seasons" :key="r">{{ season.name }}</option>
+            </select>
+          </float-label>
+        </div>
+        <div class="col-md-3">
+          <float-label label="STATUS">
+            <select class="form-control uniSelect" name="status"> </select>
+          </float-label>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col">
+          <button style="float:right" class="btn-solid-blue" type="button">Filter</button>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-12">
+          <ListView
+            :items="getNeedsVerify"
+            :editable="true"
+            :deleteable="true"
+            :showCustomAction="true"
+            :CustomActionHeading="'Publish'"
+            @onRowClick="onRowClick"
+            @onClearSelected="onClearSelected"
+            @onEdit="onEdit"
+            :showNew="false"
+          />
+        </div>
+      </div>
+      <!-- <div class="offset-1 col-md-6">
+        <button
           type="button"
           :class="{
             'form-control btn btn-primary ': 1 === 1,
@@ -89,22 +84,9 @@
           @click="onVerify()"
         >
           {{ ButtonMessage }}
-        </button> -->
-        <!-- <div>{{ Message }}</div> -->
-      </div>
-      <div class="offset-1 col-md-10">
-        <ListView
-          :items="getNeedsVerify"
-          :editable="true"
-          :deleteable="true"
-          :showCustomAction="true"
-          :CustomActionHeading="'Publish'"
-          @onRowClick="onRowClick"
-          @onClearSelected="onClearSelected"
-          @onEdit="onEdit"
-          :showNew="false"
-        />
-      </div>
+        </button> 
+        <div>{{ Message }}</div>
+      </div> -->
     </div>
   </main>
 </template>
@@ -130,22 +112,13 @@ export default {
     this.initTimeshare(0);
   },
   computed: {
-        ...mapState("timeshare", [
-      "resorts",
-      "regions",
-      "seasons",
-    ]),
+    ...mapState("timeshare", ["resorts", "regions", "seasons"]),
     ...mapState("individual", ["indiv"]),
     filteredResort() {
       let list = [];
-      if (
-        this.sellItem &&
-        this.sellItem.region &&
-        this.sellItem.region.regionCode
-      ) {
+      if (this.sellItem && this.sellItem.region && 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;
@@ -153,7 +126,7 @@ export default {
       } else {
         list = this.resorts;
       }
-      return _.sortBy(list, (x) => x.resortName);
+      return _.sortBy(list, x => x.resortName);
     },
     SelectedItems() {
       const selectedArray = [];
@@ -191,12 +164,7 @@ export default {
   methods: {
     ...mapActions("myWeeks", ["getItems", "verifyWeek"]),
     ...mapActions("alert", ["success"]),
-     ...mapActions("timeshare", [
-      "initTimeshare",
-      "onResortChange",
-      "saveWeek",
-      "getBlankWeek",
-    ]),
+    ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
     onVerify() {
       if (this.selectedItems.length > 0) {
         for (const i in this.selectedItems) {
@@ -218,7 +186,7 @@ export default {
     },
     onClearSelected() {
       this.selectedItems = [];
-    },
+    }
     //   onDelete(item) {
     //   this.deleteListing(item.id);
     // },

src/components/misc/bondCaclculator.vue

@@ -2,23 +2,23 @@
   <div>
     <h2 id="modal-bondcal">Bond Calculator</h2>
     <p>Calculate the value of the property you could buy</p>
-    <input
-      type="text"
-      class="form-control mb-2"
-      name="income"
-      v-currency="{ currency: ['ZAR', null, { prefix: 'R' }][2] }"
-      id="gross-income"
-      placeholder="Gross Monthly Household Income"
+    <currency-input
+      onClick="this.setSelectionRange(0, this.value.length)"
+      name="price"
+      :value="value"
+      @input="value = $event"
       v-model="amount"
-    />
-    <input
-      type="text"
+      id="gross-income"
       class="form-control mb-2"
+    />
+    <currency-input
+      onClick="this.setSelectionRange(0, this.value.length)"
       name="deposit"
-      v-currency="{ currency: ['ZAR', null, { prefix: 'R' }][2] }"
-      id="deposit"
-      placeholder="Deposit Amount – May be Required"
+      :value="value"
+      @input="value = $event"
       v-model="deposit"
+      id="gross-income"
+      class="form-control mb-2"
     />
     <div class="slidecontainer mt-4">
       <input type="range" min="5" max="30" value="10" class="slider" id="myRange" v-model="term" />
@@ -80,12 +80,13 @@ export default {
   },
   computed: {
     totalMonthlyPayment() {
-      var rate = this.calcRate;
+      var rate = this.rate / 100 / 12;
       var years = this.term * 12;
       var topPart = rate * Math.pow(1 + rate, years);
       var bottomPart = Math.pow(1 + rate, years) - 1;
 
-      var netAmnt = parseFloat(this.amount) - parseFloat(this.deposit);
+      var netAmnt = this.amount - this.deposit;
+
       var bond = (netAmnt * topPart) / bottomPart;
       if (isNaN(bond)) {
         return 0;

src/components/property/commercial/enquireNow/enquirenow.vue

@@ -1,22 +0,0 @@
-<template>
-  <div>
-    <carouselSection />
-    <main id="main" style="margin-top:-20px;padding-bottom:50px">
-      <contentSection />
-    </main>
-  </div>
-</template>
-
-<script>
-/* eslint-disable */
-import carouselSection from "./carouselSection";
-import contentSection from "./contentSection";
-export default {
-  components: {
-    carouselSection,
-    contentSection
-  }
-};
-</script>
-
-<style lang="scss" scoped></style>

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

@@ -95,7 +95,14 @@
               </div>
             </div>
           </div>
+
           <div class="mt-5" v-html="property.description"></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 v-if="property.video !== null" class="mt-5">Video Tour</h4>
           <iframe
             v-if="property.video !== null"
@@ -134,7 +141,7 @@
                     </div>
                   </td>
                   <td>
-                    <router-link class="btn-solid-blue" to="/EnquireNow">MORE INFO</router-link>
+                    
                   </td>
                 </tr>
               </tbody>

src/components/property/commercial/enquireNow/carouselSection.vue → src/components/property/enquireNow/carouselSection.vue

@@ -20,12 +20,7 @@
       style="margin-top:-50px"
       :responsive="{ 0: { items: 1, nav: false }, 600: { items: 1, nav: false } }"
     >
-      <img class="item" src="/img/intro-carousel/home-1.jpg" alt="" />
-      <img class="item" src="/img/intro-carousel/home-2.jpg" alt="" />
-      <img class="item" src="/img/intro-carousel/home-3.jpg" alt="" />
-      <img class="item" src="/img/intro-carousel/home-4.jpg" alt="" />
-      <img class="item" src="/img/intro-carousel/home-5.jpg" alt="" />
-      <img class="item" src="/img/intro-carousel/home-6.jpg" alt="" />
+      <img class="item" v-for="(image, i) in images" :key="i" :src="image" />
     </carousel>
 
     <div id="intro-carousel" class="owl-carousel"></div>
@@ -39,6 +34,9 @@ import carousel from "vue-owl-carousel";
 export default {
   components: {
     carousel
+  },
+  props: {
+    images: {}
   }
 };
 </script>

src/components/property/commercial/enquireNow/contentSection.vue → src/components/property/enquireNow/contentSection.vue

@@ -2,30 +2,21 @@
   <div class="container pt-5">
     <div class="row mb-8">
       <div class="col-md-6">
-        <h3>Mooikloof Office Park</h3>
-        <p>
-          The cream of the crop, no costs were spared on the finishing touches of this beautiful
-          office. This 160m2 office is ideally situated in Pretoria East in the hub of business
-          expansion for Pretoria. Two superb, air-conditioned ground floor units divided only by
-          glass and completed with two small recording studios. The Space is currently used for
-          corporate boardroom and training centre functions and can accommodate up to 25 delegates.
-          Stunning finishes y interior designer complete the unit with style and class. The perfect
-          address and office for the established professional for the training centre of your
-          dreams!
-        </p>
+        <h3>{{ property.propertyName }}</h3>
+        <p v-html="property.description"></p>
         <p><strong>View by Appointment only!</strong></p>
         <br />
         <p></p>
-        To arrange a viewing contact Mynie:
+        <!-- To arrange a viewing contact Mynie:
         <div class="col-md-4">
           <a href="mailto:info@univateproperties.co.za">info@univateproperties.co.za</a><br />
           <a href="tel:0124921238">+27 (0) 12 492 1238</a>
-        </div>
+        </div> -->
       </div>
       <div class="col-md-6">
-        <form>
-          <div class="form-group row">
-            <div class="form-group col-md-6">
+        <div class="form-group row">
+          <div class="form-group col-md-6 mb-4">
+            <float-label>
               <input
                 type="text"
                 name="name"
@@ -33,11 +24,15 @@
                 id="Unit"
                 placeholder="Unit"
                 data-rule="minlen:4"
-                v-model="Unit"
+                v-model="property.unit"
+                disabled
               />
-              <div class="validation"></div>
-            </div>
-            <div class="form-group col-md-6">
+            </float-label>
+
+            <div class="validation"></div>
+          </div>
+          <div class="form-group col-md-6">
+            <float-label>
               <input
                 type="text"
                 name="name"
@@ -45,11 +40,15 @@
                 id="Price"
                 placeholder="Price"
                 data-rule="minlen:4"
-                v-model="Price"
+                v-model="property.price"
+                disabled
               />
-              <div class="validation"></div>
-            </div>
-            <div class="form-group col-md-6">
+            </float-label>
+
+            <div class="validation"></div>
+          </div>
+          <div class="form-group col-md-6">
+            <float-label>
               <input
                 type="text"
                 name="name"
@@ -57,11 +56,15 @@
                 id="Size"
                 placeholder="Size"
                 data-rule="minlen:4"
-                v-model="Size"
+                v-model="size"
+                disabled
               />
-              <div class="validation"></div>
-            </div>
-            <div class="form-group col-md-6">
+            </float-label>
+
+            <div class="validation"></div>
+          </div>
+          <div class="form-group col-md-6 mb-4">
+            <float-label>
               <input
                 type="text"
                 name="name"
@@ -69,11 +72,15 @@
                 id="Suburb"
                 placeholder="Suburb"
                 data-rule="minlen:4"
-                v-model="Suburb"
+                v-model="property.suburb"
+                disabled
               />
-              <div class="validation"></div>
-            </div>
-            <div class="form-group col-md-12">
+            </float-label>
+
+            <div class="validation"></div>
+          </div>
+          <div class="form-group col-md-12 mb-4">
+            <float-label>
               <input
                 type="text"
                 name="name"
@@ -81,11 +88,14 @@
                 id="Name"
                 placeholder="Name"
                 data-rule="minlen:4"
-                v-model="Name"
+                v-model="name"
               />
-              <div class="validation"></div>
-            </div>
-            <div class="form-group col-md-12">
+            </float-label>
+
+            <div class="validation"></div>
+          </div>
+          <div class="form-group col-md-12 mb-4">
+            <float-label>
               <input
                 type="text"
                 name="name"
@@ -93,11 +103,14 @@
                 id="ContactNumber"
                 placeholder="ContactNumber"
                 data-rule="minlen:4"
-                v-model="ContactNumber"
+                v-model="contactNumber"
               />
-              <div class="validation"></div>
-            </div>
-            <div class="form-group col-md-12">
+            </float-label>
+
+            <div class="validation"></div>
+          </div>
+          <div class="form-group col-md-12">
+            <float-label>
               <input
                 type="text"
                 name="name"
@@ -107,16 +120,17 @@
                 data-rule="minlen:4"
                 v-model="email"
               />
-              <div class="validation"></div>
-            </div>
-          </div>
-          <div class="text-center">
-            <button class="btn-solid-blue" @click="sendMail()">ENQUIRE NOW</button>
-          </div>
-          <div v-if="boolSent">
-            <alert :text="alertMsg" :type="'SUCCESS'" />
+            </float-label>
+
+            <div class="validation"></div>
           </div>
-        </form>
+        </div>
+        <div class="text-center">
+          <button class="btn-solid-blue" @click="sendMail()">ENQUIRE NOW</button>
+        </div>
+        <div v-if="boolSent">
+          <alert :text="alertMsg" :type="'SUCCESS'" />
+        </div>
       </div>
     </div>
   </div>
@@ -125,7 +139,7 @@
 <script>
 /* eslint-disable */
 import axios from "axios";
-import alert from "../../../shared/alert";
+import alert from "../../shared/alert";
 
 export default {
   components: {
@@ -136,7 +150,7 @@ export default {
       alertMsg: "Sent! You can expect a reply soon!",
       name: null,
       email: null,
-      phone: null,
+      contactNumber: null,
       property: null,
       message: null,
       boolSent: false
@@ -145,15 +159,18 @@ export default {
   mounted() {
     this.boolSent = false;
   },
+  props: {
+    property: {}
+  },
   methods: {
     async sendMail() {
       var mailObj = {
-        toAddress: "lenes@provision-sa.com",
+        toAddress: "jlouw365@gmail.com",
         fromAddress: "jlouw365@gmail.com",
         name: this.name,
         email: this.email,
-        phone: this.phone,
-        property: this.property,
+        phone: this.contactNumber,
+        property: this.property.id.toString(),
         message: this.message
       };
 

src/components/property/enquireNow/enquirenow.vue

@@ -0,0 +1,46 @@
+<template>
+  <div>
+    <carouselSection v-if="propertyImages.length > 0" :images="propertyImages" />
+    <main id="main" style="margin-top:-20px;padding-bottom:50px">
+      <contentSection :property="property" />
+    </main>
+  </div>
+</template>
+
+<script>
+/* eslint-disable */
+import { mapState, mapActions } from "vuex";
+import carouselSection from "./carouselSection";
+import contentSection from "./contentSection";
+export default {
+  components: {
+    carouselSection,
+    contentSection
+  },
+  async mounted() {
+    await this.getProperty(this.$route.params.id);
+    await this.getPropertyImages(this.$route.params.id);
+    this.mayEditProperty(this.$route.params.id);
+  },
+  computed: {
+    ...mapState("property", ["property", "propertyImages"]),
+    ...mapState("propertyEdit", ["mayEdit"])
+  },
+  methods: {
+    ...mapActions("property", ["getProperty", "getPropertyImages", "clearPropertyImages"]),
+    ...mapActions("propertyEdit", ["mayEditProperty"]),
+    formatPrice(value) {
+      const val = (value / 1).toFixed(2);
+      return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " ");
+    },
+    formatAddress(value) {
+      if (value !== "") {
+        return `${value}<br/>`;
+      }
+      return "";
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -5,7 +5,7 @@
         <div class="col-md-4">
           <div class="resPortfolioSection">
             <iframe
-              v-if="property.video != ''"
+              v-if="property.video != null"
               width="100%"
               src="https://www.youtube.com/embed/watch_popup?v=qKgHJYzWtVA"
               frameborder="0"
@@ -92,6 +92,12 @@
             </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>
 
             <div v-for="(data, i) in property.displayData" :key="i" class="row my-3">
@@ -103,9 +109,9 @@
               </div>
             </div>
           </div>
-          <h4 v-if="property.video != ''" class="mt-5">Video Tour</h4>
+          <h4 v-if="property.video != null" class="mt-5">Video Tour</h4>
           <iframe
-            v-if="property.video != ''"
+            v-if="property.video != null"
             width="100%"
             src="https://www.youtube.com/embed/watch_popup?v=qKgHJYzWtVA"
             frameborder="0"

src/components/shared/listView.vue

@@ -2,9 +2,11 @@
 <template>
   <div>
     <div style="height:5px"></div>
-    <div class="d-flex justify-content-between table-title">
+    <div class="d-flex justify-content-between ">
       <div class="p-2" v-if="!hideSearch">
-        <input v-model="searchItem" class="form-control" placeholder="Search...." />
+        <float-label>
+          <input v-model="searchItem" class="form-control uniInput mt-3" placeholder="Search...." />
+        </float-label>
       </div>
       <div class="p-2" v-if="title">
         <h2>{{ title }}</h2>
@@ -12,23 +14,19 @@
       <div class="p-2">
         <div class="d-flex flex-row">
           <div class="p2" v-if="showColumnChooser">
-            <div
-              class="btn btn-primary myBackground btn-width cursor-pointer"
-              data-toggle="modal"
-              data-target="#myModal"
-            >
+            <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">
+                <div class="modal-dialog modal-lg" style="width:500px">
                   <!-- Modal content-->
                   <div class="modal-content">
                     <div class="modal-header">
                       <h5>Column Chooser</h5>
                       <button type="button" class="close" data-dismiss="modal">&times;</button>
                     </div>
-                    <div style="margin-left:50px; margin-right:50px;margin-bottom:50px;">
+                    <div style="margin-bottom:50px;">
                       <ListViewControl :items="allColumn" @checkItem="checkItem" />
                     </div>
                   </div>
@@ -37,15 +35,12 @@
             </div>
           </div>
           <div class="p2" v-if="selectedItems.length > 0">
-            <div
-              class="btn btn-primary myBackground btn-width cursor-pointer"
-              @click="onClearSelected()"
-            >
+            <div class="btn-solid-blue cursor-pointer" @click="onClearSelected()">
               Clear Selected
             </div>
           </div>
           <div class="p2" v-if="showNew">
-            <div class="btn btn-primary myBackground btn-width cursor-pointer" @click="onNew()">
+            <div class="btn-solid-blue cursor-pointer" @click="onNew()">
               New
             </div>
           </div>
@@ -56,6 +51,7 @@
     <div v-if="items && items.length > 0" class="table-responsive">
       <table
         id="table"
+        class="table table-striped"
         :class="{ 'table table-hover': 1 === 1, 'table-sm': compact, 'table-bordered': bordered }"
       >
         <thead>
@@ -94,7 +90,7 @@
             <th v-if="deleteable"></th>
           </tr>
         </thead>
-        <tbody class="my-table">
+        <tbody class="table">
           <tr
             v-for="(item, i) in DisplayItems"
             :key="i"

src/components/shared/listViewControl.vue

@@ -1,12 +1,15 @@
 <template>
   <div class="container">
-    <div class="offset-3 col-md-6">
-      <input v-model="searchItem" class="form-control" placeholder="Search...." />
+    <div class="row">
+      <div class="col-md-12">
+        <input v-model="searchItem" class="form-control" placeholder="Search...." />
+      </div>
     </div>
+
     <hr />
     <div class="row">
-      <div v-for="item in items" :key="item" class="col-md-4">
-        <div :class="{'inSearch': isInSelected(item)}">
+      <div v-for="item in items" :key="item" class="col-md-6">
+        <div :class="{ inSearch: isInSelected(item) }">
           <CheckItem :title="item.column" :show="item.show" @checkItem="checkItem" />
         </div>
       </div>
@@ -14,34 +17,32 @@
   </div>
 </template>
 <script>
-import CheckItem from './checkItem.vue';
+import CheckItem from "./checkItem.vue";
 
 export default {
   components: {
-    CheckItem,
+    CheckItem
   },
   data() {
     return {
-      searchItem: undefined,
+      searchItem: undefined
     };
   },
   props: {
-    items: undefined,
+    items: undefined
   },
   methods: {
     isInSelected(i) {
       if (this.searchItem && this.searchItem.length > 0) {
-        return (
-          i.column.toLowerCase().indexOf(this.searchItem.toLowerCase()) > -1
-        );
+        return i.column.toLowerCase().indexOf(this.searchItem.toLowerCase()) > -1;
       }
       return false;
     },
     checkItem(column, show) {
-      this.$emit('checkItem', column, show);
-    },
+      this.$emit("checkItem", column, show);
+    }
   },
-  computed: {},
+  computed: {}
 };
 </script>
 <style>

src/components/shared/navBar.vue

@@ -50,8 +50,7 @@
                       Commercial
                     </a>
                     <ul style="margin-top:-10px; text-align:left" :class="commercialClass">
-                      <li>
-                        
+                      <li>                     
                       </li>
                       <hr />
                       <li>

src/components/timeshare/myWeeksPage.vue

@@ -17,7 +17,7 @@
         <button
           type="button"
           :class="{
-            'form-control btn btn-primary ': 1 === 1,
+            'form-control btn-solid-blue ': 1 === 1,
             'my-disable':
               !(selectedItems.length == 1) ||
               !items[selectedItems] ||

src/router/index.js

@@ -83,7 +83,7 @@ import LandingPage from "../components/marketing/landingPage.vue";
 import LandingPageWeek from "../components/marketing/landingPageWeek.vue";
 import MarketingPage from "../components/marketing/clientView.vue";
 import MarketingPageExp from "../components/marketing/landingPageExpired.vue";
-import EnquireNow from "../components/property/commercial/enquireNow/enquirenow.vue";
+import EnquireNow from "../components/property/enquireNow/enquirenow.vue";
 import MyWeeksEdit from "../components/admin/status/editTimeShareAdminPage.vue";
 
 Vue.use(Router);
@@ -449,7 +449,7 @@ export default new Router({
       component: MarketingPageExp
     },
     {
-      path: "/EnquireNow",
+      path: "/EnquireNow/:id",
       name: "EnquireNow",
       component: EnquireNow
     },

src/store/modules/misc/termsConditions.js

@@ -20,9 +20,13 @@ export default {
       });
     },
     async setTerms({ commit }, terms) {
-      await axios.post("api/tc/", terms).then(res => {
-        commit("newTermsAndConditions", res.data);
-      });
+      const response = await axios.post("api/tc/", terms);
+      if (response.status === 200) {
+        commit("newTermsAndConditions", response.data);
+        return Promise.resolve();
+      } else {
+        return Promise.reject();
+      }
     }
   }
 };