Add Consent to TimeshareAdmin and Offers

src/components/admin/property/propertyList.vue

@@ -8,11 +8,16 @@
         <h6>{{ curAgency }}</h6>
       </div>
       <div v-if="ROLE === 'Agent'">
-        <h6>{{ agent[0].name + " " + agent[0].surname }}</h6>
+        <h6>{{ agent[0].name + ' ' + agent[0].surname }}</h6>
       </div>
       <div class="row">
         <div class="col-lg-6 offset-3">
-          <input class="form-control uniSelect" type="text" placeholder="SEARCH" v-model="filter" />
+          <input
+            class="form-control uniSelect"
+            type="text"
+            placeholder="SEARCH"
+            v-model="filter"
+          />
         </div>
       </div>
       <div class="row">
@@ -76,7 +81,11 @@
                 <td>{{ item.type }}</td>
                 <td v-if="!item.isPublished">
                   <a v-on:click="Publish(item)">
-                    <img src="../../../../public/img/icons/Upload.png" height="25" width="25" />
+                    <img
+                      src="../../../../public/img/icons/Upload.png"
+                      height="25"
+                      width="25"
+                    />
                   </a>
                 </td>
                 <td v-else>
@@ -90,12 +99,20 @@
                 </td>
                 <td>
                   <a v-on:click="Edit(item)">
-                    <img src="../../../../public/img/icons/Edit.png" height="25" width="25" />
+                    <img
+                      src="../../../../public/img/icons/Edit.png"
+                      height="25"
+                      width="25"
+                    />
                   </a>
                 </td>
                 <td>
                   <a v-on:click="Delete(item)">
-                    <img src="../../../../public/img/icons/delete.png" height="25" width="25" />
+                    <img
+                      src="../../../../public/img/icons/delete.png"
+                      height="25"
+                      width="25"
+                    />
                   </a>
                 </td>
               </tr>
@@ -104,7 +121,10 @@
           <div class="d-flex justify-content-between" v-if="showPager">
             <div class="p-1">
               {{
-                currentPage + " / " + PageCount + (" - (" + FilteredProperties.length + " items)")
+                currentPage +
+                ' / ' +
+                PageCount +
+                (' - (' + FilteredProperties.length + ' items)')
               }}
             </div>
             <div class="p-1">
@@ -124,7 +144,9 @@
                     v-model="visibleItemsPerPageCount"
                     @change="onChangeItemsPerPage()"
                   >
-                    <option v-for="(item, i) in itemsPerPageList" :key="i">{{ item }}</option>
+                    <option v-for="(item, i) in itemsPerPageList" :key="i">
+                      {{ item }}
+                    </option>
                   </select>
                 </div>
               </div>
@@ -133,7 +155,11 @@
           <div class="p-2">
             <div class="d-flex flex-row">
               <div>
-                <button v-if="sortKey !== 'id'" class="btn-solid-blue" @click="ClearSort">
+                <button
+                  v-if="sortKey !== 'id'"
+                  class="btn-solid-blue"
+                  @click="ClearSort"
+                >
                   Clear Sort
                 </button>
               </div>
@@ -147,15 +173,15 @@
 
 <script>
 /* eslint-disable */
-import { mapState, mapActions } from "vuex";
-import Log from "../../../assets/Log";
-import BasePagination from "../../shared/basePagination";
-import ItemsPerPageList from "../../../assets/staticData/itemsPerPageFive";
-import _ from "lodash";
+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
+    BasePagination,
   },
   data() {
     return {
@@ -168,155 +194,157 @@ export default {
       itemsPerPageList: ItemsPerPageList,
       currentPage: 1,
       reverse: true,
-      sortKey: "id",
+      sortKey: 'id',
       displayColumns: [
-        "ID",
-        "Owner",
-        "Reference",
-        "Property",
-        "Unit",
-        "Size",
-        "Price Ex VAT",
-        "Region",
-        "Town",
-        "Suburb",
-        "Status",
-        "Type",
-        "Publish"
+        'ID',
+        'Owner',
+        'Reference',
+        'Property',
+        'Unit',
+        'Size',
+        'Price Ex VAT',
+        'Region',
+        'Town',
+        'Suburb',
+        'Status',
+        'Type',
+        'Publish',
       ],
       columns: [
-        "id",
-        "owner",
-        "reference",
-        "property",
-        "unit",
-        "size",
-        "price",
-        "region",
-        "town",
-        "suburb",
-        "status",
-        "type",
-        "isPublished"
-      ]
-    };
+        'id',
+        'owner',
+        'reference',
+        'property',
+        'unit',
+        'size',
+        'price',
+        'region',
+        'town',
+        'suburb',
+        'status',
+        'type',
+        'isPublished',
+      ],
+    }
   },
   methods: {
-    ...mapActions("propertyList", [
-      "getAdminProperties",
-      "deleteProperty",
-      "publishProperty",
-      "unpublishProperty"
+    ...mapActions('propertyList', [
+      'getAdminProperties',
+      'deleteProperty',
+      'publishProperty',
+      'unpublishProperty',
     ]),
-    ...mapActions("register", ["getAgentById"]),
-    ...mapActions("timeshare", ["getAgencies"]),
+    ...mapActions('register', ['getAgentById']),
+    ...mapActions('timeshare', ['getAgencies']),
     Publish(item) {
-      this.publishProperty(item);
+      this.publishProperty(item)
     },
     Unpublish(item) {
-      this.unpublishProperty(item);
+      this.unpublishProperty(item)
     },
     Edit(item) {
-      this.$router.push(`/property/edit/${item.id}`);
+      this.$router.push(`/property/edit/${item.id}`)
     },
     Delete(item) {
-      this.deleteProperty(item.id);
+      this.deleteProperty(item.id)
     },
     async pageChangeHandle(value) {
       switch (value) {
-        case "next":
-          this.currentPage += 1;
-          break;
-        case "previous":
-          this.currentPage -= 1;
-          break;
+        case 'next':
+          this.currentPage += 1
+          break
+        case 'previous':
+          this.currentPage -= 1
+          break
         default:
-          this.currentPage = value;
+          this.currentPage = value
       }
     },
     sortBy(sortKey) {
-      this.reverse = this.sortKey === sortKey ? !this.reverse : false;
-      this.sortKey = sortKey;
+      this.reverse = this.sortKey === sortKey ? !this.reverse : false
+      this.sortKey = sortKey
     },
     ClearSort() {
-      this.reverse = true;
-      this.sortKey = "id";
-    }
+      this.reverse = true
+      this.sortKey = 'id'
+    },
   },
   computed: {
-    ...mapState("propertyList", ["properties"]),
-    ...mapState("register", ["agent"]),
-    ...mapState("timeshare", ["agencies"]),
+    ...mapState('propertyList', ['properties']),
+    ...mapState('register', ['agent']),
+    ...mapState('timeshare', ['agencies']),
     FilteredProperties() {
       if (this.filter) {
-        const list = _.filter(this.properties, item =>
+        const list = _.filter(this.properties, (item) =>
           Object.values(item).some(
-            i =>
+            (i) =>
               JSON.stringify(i)
                 .toLowerCase()
-                .indexOf(this.filter.toLowerCase()) > -1
-          )
-        );
-        return _.orderBy(list, this.sortKey, this.SortDirection);
+                .indexOf(this.filter.toLowerCase()) > -1,
+          ),
+        )
+        return _.orderBy(list, this.sortKey, this.SortDirection)
       } else {
-        return _.orderBy(this.properties, this.sortKey, this.SortDirection);
+        return _.orderBy(this.properties, this.sortKey, this.SortDirection)
       }
     },
     PageCount() {
       return this.visibleItemsPerPageCount !== 0
-        ? Math.ceil(this.FilteredProperties.length / this.visibleItemsPerPageCount)
-        : 1;
+        ? Math.ceil(
+            this.FilteredProperties.length / this.visibleItemsPerPageCount,
+          )
+        : 1
     },
     curAgency() {
-      var selAgency = "";
-      this.agencies.forEach(agency => {
+      var selAgency = ''
+      this.agencies.forEach((agency) => {
         if (this.agent[0].agencyId === agency.id) {
-          selAgency = agency.agencyName;
+          selAgency = agency.agencyName
         }
-      });
-      return selAgency;
+      })
+      return selAgency
     },
     DisplayItems() {
-      const list = this.FilteredProperties;
-      const startSlice = (this.currentPage - 1) * this.visibleItemsPerPageCount;
-      let endSlice = this.currentPage * this.visibleItemsPerPageCount;
+      const list = this.FilteredProperties
+      const startSlice = (this.currentPage - 1) * this.visibleItemsPerPageCount
+      let endSlice = this.currentPage * this.visibleItemsPerPageCount
       if (endSlice > list.length) {
-        endSlice = list.length;
+        endSlice = list.length
       }
-      return list.slice(startSlice, endSlice);
+      return list.slice(startSlice, endSlice)
     },
     SortDirection() {
-      return this.reverse ? "desc" : "asc";
+      return this.reverse ? 'desc' : 'asc'
     },
     ROLE() {
-      return Log.getUser().role;
-    }
+      return Log.getUser().role
+    },
   },
   created() {
-    this.getAgentById(Log.getUser().id);
-    this.getAgencies();
+    this.getAgentById(Log.getUser().id)
+    this.getAgencies()
   },
   mounted() {
-    this.wait = true;
-    this.getAdminProperties(this.userId).then(fulfuilled => {
-      this.wait = false;
+    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;
+        const [startItem] = this.itemsPerPageList
+        this.visibleItemsPerPageCount = startItem
       }
-    });
+    })
   },
   watch: {
     filter: {
       immediate: true,
       handler(val, oldVal) {
         if (val != oldVal) {
-          this.currentPage = 1;
+          this.currentPage = 1
         }
-      }
-    }
-  }
-};
+      },
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>
@@ -351,6 +379,6 @@ export default {
   border-bottom: solid;
   border-width: 2px;
   border-color: rgb(27, 117, 187);
-  font-family: "Muli";
+  font-family: 'Muli';
 }
 </style>

src/components/admin/status/timeshareAdminList.vue

@@ -2,7 +2,7 @@
   <section id="contact2">
     <div class="container">
       <div class="section-header">
-        <h1>Property Admin</h1>
+        <h1>Timeshare Admin</h1>
       </div>
       <div class="row">
         <div class="col-lg-4"></div>
@@ -84,11 +84,14 @@
     <div class="container-fluid">
       <div class="row justify-content-center">
         <div class="col-auto">
-          <table class="table table-striped table-responsive" style="max-width:1920px">
+          <table
+            class="table table-striped table-responsive"
+            style="max-width: 1920px;"
+          >
             <thead>
               <tr>
                 <th scope="col" v-for="(col, c) in displayColumns" :key="c">
-                  <div @click="sortBy(columns[c])" style="cursor: pointer">
+                  <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">
@@ -135,9 +138,14 @@
                 <td>{{ item.sellPrice | toCurrency }}</td>
                 <td>{{ item.pulbishedDate | toDate }}</td>
                 <td>{{ item.status.description }}</td>
+                <td>{{ item.consent }}</td>
                 <td v-if="!item.publish">
                   <a v-on:click="Publish(item)">
-                    <img src="../../../../public/img/icons/Upload.png" height="25" width="25" />
+                    <img
+                      src="../../../../public/img/icons/Upload.png"
+                      height="25"
+                      width="25"
+                    />
                   </a>
                 </td>
                 <td v-else>
@@ -151,12 +159,20 @@
                 </td>
                 <td>
                   <a v-on:click="Edit(item)">
-                    <img src="../../../../public/img/icons/Edit.png" height="25" width="25" />
+                    <img
+                      src="../../../../public/img/icons/Edit.png"
+                      height="25"
+                      width="25"
+                    />
                   </a>
                 </td>
                 <td>
                   <a v-on:click="Delete(item)">
-                    <img src="../../../../public/img/icons/delete.png" height="25" width="25" />
+                    <img
+                      src="../../../../public/img/icons/delete.png"
+                      height="25"
+                      width="25"
+                    />
                   </a>
                 </td>
               </tr>
@@ -164,7 +180,12 @@
           </table>
           <div class="d-flex justify-content-between" v-if="showPager">
             <div class="p-1">
-              {{ currentPage + " / " + PageCount + (" - (" + FilteredListings.length + " items)") }}
+              {{
+                currentPage +
+                ' / ' +
+                PageCount +
+                (' - (' + FilteredListings.length + ' items)')
+              }}
             </div>
             <div class="p-1">
               <BasePagination
@@ -194,7 +215,11 @@
           <div class="p-2">
             <div class="d-flex flex-row">
               <div>
-                <button v-if="sortKey !== 'id'" class="btn-solid-blue" @click="ClearSort">
+                <button
+                  v-if="sortKey !== 'id'"
+                  class="btn-solid-blue"
+                  @click="ClearSort"
+                >
                   Clear Sort
                 </button>
               </div>
@@ -209,15 +234,15 @@
 
 <script>
 /* eslint-disable */
-import { mapState, mapActions, mapGetters } from "vuex";
-import Log from "../../../assets/Log";
-import BasePagination from "../../shared/basePagination";
-import ItemsPerPageList from "../../../assets/staticData/itemsPerPageFive";
-import _ from "lodash";
+import { mapState, mapActions, mapGetters } 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
+    BasePagination,
   },
   data() {
     return {
@@ -230,209 +255,213 @@ export default {
       itemsPerPageList: ItemsPerPageList,
       currentPage: 1,
       reverse: true,
-      sortKey: "id",
-      selectedExcelDownload: "",
+      sortKey: 'id',
+      selectedExcelDownload: '',
       excelFields: {
-        Ref: "id",
-        Owner: "owner",
-        agent: "Agent",
-        Resort: "resort.resortName",
-        Module: "module",
-        Unit: "unitNumber",
-        Beds: "bedrooms",
-        MaxSleep: "maxSleep",
-        Season: "season",
-        Region: "region.regionName",
+        Ref: 'id',
+        Owner: 'owner',
+        agent: 'Agent',
+        Resort: 'resort.resortName',
+        Module: 'module',
+        Unit: 'unitNumber',
+        Beds: 'bedrooms',
+        MaxSleep: 'maxSleep',
+        Season: 'season',
+        Region: 'region.regionName',
         Amount: {
-          field: "sellPrice",
-          callback: value => {
-            return "R " + value;
-          }
+          field: 'sellPrice',
+          callback: (value) => {
+            return 'R ' + value
+          },
         },
         Levy: {
-          field: "levyAmount",
-          callback: value => {
-            return "R " + value;
-          }
+          field: 'levyAmount',
+          callback: (value) => {
+            return 'R ' + value
+          },
         },
         ArrivalDate: {
-          field: "arrivalDate",
-          callback: value => {
-            return value.substring(0, 10);
-          }
+          field: 'arrivalDate',
+          callback: (value) => {
+            return value.substring(0, 10)
+          },
         },
         DepartureDate: {
-          field: "departureDate",
-          callback: value => {
-            return value.substring(0, 10);
-          }
+          field: 'departureDate',
+          callback: (value) => {
+            return value.substring(0, 10)
+          },
         },
         Submitted: {
-          field: "pulbishedDate",
-          callback: value => {
-            return value.substring(0, 10);
-          }
+          field: 'pulbishedDate',
+          callback: (value) => {
+            return value.substring(0, 10)
+          },
         },
-        Status: "status.description"
+        Status: 'status.description',
       },
       displayColumns: [
-        "Ref",
-        "Owner",
-        "Agent",
-        "Resort",
-        "Week Module",
-        "Unit",
-        "Beds",
-        "Season",
-        "Region",
-        "Amount",
-        "Submitted",
-        "Status"
+        'Ref',
+        'Owner',
+        'Agent',
+        'Resort',
+        'Week Module',
+        'Unit',
+        'Beds',
+        'Season',
+        'Region',
+        'Amount',
+        'Submitted',
+        'Status',
+        'Consent',
       ],
       columns: [
-        "id",
-        "owner",
-        "agent",
-        "resort",
-        "module",
-        "unitNumber",
-        "bedrooms",
-        "season",
-        "region",
-        "sellPrice",
-        "weekStatus"
-      ]
-    };
+        'id',
+        'owner',
+        'agent',
+        'resort',
+        'module',
+        'unitNumber',
+        'bedrooms',
+        'season',
+        'region',
+        'sellPrice',
+        'weekStatus',
+        'consent',
+      ],
+    }
   },
   methods: {
-    ...mapActions("myWeeks", ["getAllItems"]),
-    ...mapActions("timeshare", ["updateFilter"]),
-    ...mapActions("myWeeks", [
-      "getItems",
-      "verifyWeek",
-      "editSave",
-      "publishWeek",
-      "unpublishWeek",
-      "deleteListing"
+    ...mapActions('myWeeks', ['getAllItems']),
+    ...mapActions('timeshare', ['updateFilter']),
+    ...mapActions('myWeeks', [
+      'getItems',
+      'verifyWeek',
+      'editSave',
+      'publishWeek',
+      'unpublishWeek',
+      'deleteListing',
     ]),
     updateLazyFilter() {
-      this.updateFilter(this.filter);
+      this.updateFilter(this.filter)
     },
     downloadExcelSheet() {
-      if (this.selectedExcelDownload == "displayItems") {
-        const elem = this.$refs.dlDisplay;
-        elem.$el.click();
-      } else if (this.selectedExcelDownload == "allPublished") {
-        const elem = this.$refs.dlPublished;
-        elem.$el.click();
-      } else if (this.selectedExcelDownload == "allItems") {
-        const elem = this.$refs.dlAll;
-        elem.$el.click();
+      if (this.selectedExcelDownload == 'displayItems') {
+        const elem = this.$refs.dlDisplay
+        elem.$el.click()
+      } else if (this.selectedExcelDownload == 'allPublished') {
+        const elem = this.$refs.dlPublished
+        elem.$el.click()
+      } else if (this.selectedExcelDownload == 'allItems') {
+        const elem = this.$refs.dlAll
+        elem.$el.click()
       }
     },
     Publish(item) {
-      var today = new Date();
-      var dd = String(today.getDate()).padStart(2, "0");
-      var mm = String(today.getMonth() + 1).padStart(2, "0"); //January is 0!
-      var yyyy = today.getFullYear();
-      item.pulbishedDate = today.toISOString().substring(0, 19);
-      item.publish = true;
+      var today = new Date()
+      var dd = String(today.getDate()).padStart(2, '0')
+      var mm = String(today.getMonth() + 1).padStart(2, '0') //January is 0!
+      var yyyy = today.getFullYear()
+      item.pulbishedDate = today.toISOString().substring(0, 19)
+      item.publish = true
       // item.status.id = 26;
       // item.status.code = "FS";
       // item.status.description = "For Sale";
       // item.status.statusType = true;
       // console.log(JSON.stringify(item));
       // this.publishOnly(item);
-      this.publishWeek(item);
+      this.publishWeek(item)
     },
     Unpublish(item) {
-      this.unpublishWeek(item);
+      this.unpublishWeek(item)
     },
     Edit(item) {
-      this.$router.push({ name: "EditTimeshare", params: { weekParam: item } });
+      this.$router.push({ name: 'EditTimeshare', params: { weekParam: item } })
       // this.$router.push(`/editTimeShare/${item.id}`);
     },
     Delete(item) {
-      this.deleteListing(item.id);
+      this.deleteListing(item.id)
     },
     async pageChangeHandle(value) {
       switch (value) {
-        case "next":
-          this.currentPage += 1;
-          break;
-        case "previous":
-          this.currentPage -= 1;
-          break;
+        case 'next':
+          this.currentPage += 1
+          break
+        case 'previous':
+          this.currentPage -= 1
+          break
         default:
-          this.currentPage = value;
+          this.currentPage = value
       }
     },
     sortBy(sortKey) {
-      this.reverse = this.sortKey === sortKey ? !this.reverse : false;
-      this.sortKey = sortKey;
+      this.reverse = this.sortKey === sortKey ? !this.reverse : false
+      this.sortKey = sortKey
     },
     ClearSort() {
-      this.reverse = true;
-      this.sortKey = "id";
-    }
+      this.reverse = true
+      this.sortKey = 'id'
+    },
   },
   computed: {
-    ...mapState("propertyList", ["properties"]),
-    ...mapState("timeshare", ["timeshareFilter"]),
-    ...mapGetters({ getNeedsVerify: "myWeeks/getNeedsVerify" }),
+    ...mapState('propertyList', ['properties']),
+    ...mapState('timeshare', ['timeshareFilter']),
+    ...mapGetters({ getNeedsVerify: 'myWeeks/getNeedsVerify' }),
     FilteredListings() {
       if (this.timeshareFilter) {
-        const list = _.filter(this.getNeedsVerify, item =>
+        const list = _.filter(this.getNeedsVerify, (item) =>
           Object.values(item).some(
-            i =>
+            (i) =>
               JSON.stringify(i)
                 .toLowerCase()
-                .indexOf(this.timeshareFilter.toLowerCase()) > -1
-          )
-        );
-        return _.orderBy(list, this.sortKey, this.SortDirection);
+                .indexOf(this.timeshareFilter.toLowerCase()) > -1,
+          ),
+        )
+        return _.orderBy(list, this.sortKey, this.SortDirection)
       } else {
-        return _.orderBy(this.getNeedsVerify, this.sortKey, this.SortDirection);
+        return _.orderBy(this.getNeedsVerify, this.sortKey, this.SortDirection)
       }
     },
     AllListingsSortedById() {
-      return _.orderBy(this.getNeedsVerify, "id", "desc");
+      return _.orderBy(this.getNeedsVerify, 'id', 'desc')
     },
     OnlyPublished() {
-      var list = [];
-      this.FilteredListings.forEach(listing => {
+      var list = []
+      this.FilteredListings.forEach((listing) => {
         if (listing.publish) {
-          list.push(listing);
+          list.push(listing)
         }
-      });
-      return list;
+      })
+      return list
     },
     PageCount() {
       return this.visibleItemsPerPageCount !== 0
-        ? Math.ceil(this.FilteredListings.length / this.visibleItemsPerPageCount)
-        : 1;
+        ? Math.ceil(
+            this.FilteredListings.length / this.visibleItemsPerPageCount,
+          )
+        : 1
     },
     DisplayItems() {
-      const list = this.FilteredListings;
-      const startSlice = (this.currentPage - 1) * this.visibleItemsPerPageCount;
-      let endSlice = this.currentPage * this.visibleItemsPerPageCount;
+      const list = this.FilteredListings
+      const startSlice = (this.currentPage - 1) * this.visibleItemsPerPageCount
+      let endSlice = this.currentPage * this.visibleItemsPerPageCount
       if (endSlice > list.length) {
-        endSlice = list.length;
+        endSlice = list.length
       }
-      return list.slice(startSlice, endSlice);
+      return list.slice(startSlice, endSlice)
     },
     SortDirection() {
-      return this.reverse ? "desc" : "asc";
-    }
+      return this.reverse ? 'desc' : 'asc'
+    },
   },
   created() {
     this.getItems(this.userId).then(() => {
-      this.wait = false;
-    });
+      this.wait = false
+    })
   },
   mounted() {
-    if (this.timeshareFilter !== "") {
-      this.filter = this.timeshareFilter;
+    if (this.timeshareFilter !== '') {
+      this.filter = this.timeshareFilter
     }
     // this.getAdminProperties(this.userId).then(fulfuilled => {
     //   this.wait = false;
@@ -447,12 +476,12 @@ export default {
       immediate: true,
       handler(val, oldVal) {
         if (val != oldVal) {
-          this.currentPage = 1;
+          this.currentPage = 1
         }
-      }
-    }
-  }
-};
+      },
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>
@@ -487,6 +516,6 @@ export default {
   border-bottom: solid;
   border-width: 2px;
   border-color: rgb(27, 117, 187);
-  font-family: "Muli";
+  font-family: 'Muli';
 }
 </style>

src/components/home/carouselSection.vue

@@ -140,8 +140,15 @@
                   </div>
                 </div>
               </div>
-
-              <div></div>
+              <div>
+                <p>
+                  <strong class="color-black">
+                    Please note that Uni-Vate Properties will be closed for the
+                    festive season from 15th December and will reopen on the 5th
+                    of January.
+                  </strong>
+                </p>
+              </div>
             </div>
           </div>
         </div>

src/components/home/homePage.vue

@@ -9,31 +9,34 @@
   </div>
 </template>
 <script>
-import CarouselSection from "./carouselSection.vue";
+import CarouselSection from './carouselSection.vue'
 //import ServiceSection from "./serviceSection.vue";
-import PropertySection from "./propertySection.vue";
+import PropertySection from './propertySection.vue'
 //import NewsSection from "./newsSection.vue";
 //import TestimonialSection from "./testimonialSection.vue";
-import AOS from "aos";
-import "aos/dist/aos.css";
+import AOS from 'aos'
+import 'aos/dist/aos.css'
 export default {
   created() {
-    AOS.init();
+    AOS.init()
   },
   components: {
     CarouselSection,
     //ServiceSection,
-    PropertySection
+    PropertySection,
     //NewsSection,
     //TestimonialSection
   },
   head: {
     title: {
-      inner: "Uni-Vate Properties"
+      inner: 'Uni-Vate Properties',
     },
     meta: [
-      { name: "google-site-verification", content: "wgxKi_f6JKZBurr242rfYmwmyjrcdkbWWBxrkcNvn90" }
-    ]
-  }
-};
+      {
+        name: 'google-site-verification',
+        content: 'wgxKi_f6JKZBurr242rfYmwmyjrcdkbWWBxrkcNvn90',
+      },
+    ],
+  },
+}
 </script>

src/components/processFlow/offers.vue

@@ -73,9 +73,28 @@ export default {
         'price',
         'offer',
         'madeBy',
+        'consent',
+      ],
+      formats: [
+        'date',
+        'text',
+        'text',
+        'text',
+        'money',
+        'money',
+        'text',
+        'boolean',
+      ],
+      columnHeaders: [
+        '',
+        '',
+        'description',
+        '',
+        '',
+        'offerPrice',
+        'offerBy',
+        'Consent',
       ],
-      formats: ['date', 'text', 'text', 'text', 'money', 'money', 'text'],
-      columnHeaders: ['', '', 'description', '', '', 'offerPrice', 'offerBy'],
     }
   },
   methods: {

src/components/timeshare/myWeeksPage.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- eslint-disable max-len -->
-  <main id="main" style="margin-top:-30px;padding-bottom:50px">
+  <main id="main" style="margin-top: -30px; padding-bottom: 50px;">
     <div class="container">
       <div class="row">
         <div class="col">
@@ -13,11 +13,14 @@
     <div class="container-fluid">
       <div class="row justify-content-center">
         <div class="col-auto">
-          <table class="table table-striped table-responsive" style="max-width:1920px">
+          <table
+            class="table table-striped table-responsive"
+            style="max-width: 1920px;"
+          >
             <thead>
               <tr>
                 <th scope="col" v-for="(col, c) in displayColumns" :key="c">
-                  <div @click="sortBy(columns[c])" style="cursor: pointer">
+                  <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">
@@ -63,6 +66,7 @@
                 <td>{{ item.sellPrice | toCurrency }}</td>
                 <td>{{ item.pulbishedDate | toDate }}</td>
                 <td>{{ item.status.description }}</td>
+                <td>{{ item.consent }}</td>
                 <!-- <td v-if="!item.publish">
                   <a v-on:click="Publish(item)">
                     <img src="../../../public/img/icons/Upload.png" height="25" width="25" />
@@ -75,12 +79,20 @@
                 </td> -->
                 <td>
                   <a v-on:click="Edit(item)">
-                    <img src="../../../public/img/icons/Edit.png" height="25" width="25" />
+                    <img
+                      src="../../../public/img/icons/Edit.png"
+                      height="25"
+                      width="25"
+                    />
                   </a>
                 </td>
                 <td>
                   <a v-on:click="Delete(item)">
-                    <img src="../../../public/img/icons/delete.png" height="25" width="25" />
+                    <img
+                      src="../../../public/img/icons/delete.png"
+                      height="25"
+                      width="25"
+                    />
                   </a>
                 </td>
               </tr>
@@ -88,7 +100,12 @@
           </table>
           <div class="d-flex justify-content-between" v-if="showPager">
             <div class="p-1">
-              {{ currentPage + " / " + PageCount + (" - (" + FilteredListings.length + " items)") }}
+              {{
+                currentPage +
+                ' / ' +
+                PageCount +
+                (' - (' + FilteredListings.length + ' items)')
+              }}
             </div>
             <div class="p-1">
               <BasePagination
@@ -118,7 +135,11 @@
           <div class="p-2">
             <div class="d-flex flex-row">
               <div>
-                <button v-if="sortKey !== 'id'" class="btn-solid-blue" @click="ClearSort">
+                <button
+                  v-if="sortKey !== 'id'"
+                  class="btn-solid-blue"
+                  @click="ClearSort"
+                >
                   Clear Sort
                 </button>
               </div>
@@ -160,17 +181,17 @@
 </template>
 <script>
 /* eslint-disable */
-import { mapState, mapActions, mapGetters } from "vuex";
-import Log from "../../assets/Log";
-import ListView from "../shared/listView.vue";
-import BasePagination from "../shared/basePagination";
-import ItemsPerPageList from "../../assets/staticData/itemsPerPageFive";
-import _ from "lodash";
+import { mapState, mapActions, mapGetters } from 'vuex'
+import Log from '../../assets/Log'
+import ListView from '../shared/listView.vue'
+import BasePagination from '../shared/basePagination'
+import ItemsPerPageList from '../../assets/staticData/itemsPerPageFive'
+import _ from 'lodash'
 
 export default {
   components: {
     ListView,
-    BasePagination
+    BasePagination,
   },
   data() {
     return {
@@ -181,121 +202,123 @@ export default {
       itemsPerPageList: ItemsPerPageList,
       reverse: true,
       currentPage: 1,
-      sortKey: "id",
+      sortKey: 'id',
       displayColumns: [
-        "Ref",
-        "Owner",
-        "Agent",
-        "Resort",
-        "Week Module",
-        "Unit",
-        "Beds",
-        "Season",
-        "Region",
-        "Amount",
-        "Submitted",
-        "Status"
+        'Ref',
+        'Owner',
+        'Agent',
+        'Resort',
+        'Week Module',
+        'Unit',
+        'Beds',
+        'Season',
+        'Region',
+        'Amount',
+        'Submitted',
+        'Status',
+        'Consent',
       ],
       columns: [
-        "id",
-        "owner",
-        "agent",
-        "resort",
-        "module",
-        "unitNumber",
-        "bedrooms",
-        "season",
-        "region",
-        "sellPrice",
-        "weekStatus"
-      ]
-    };
+        'id',
+        'owner',
+        'agent',
+        'resort',
+        'module',
+        'unitNumber',
+        'bedrooms',
+        'season',
+        'region',
+        'sellPrice',
+        'weekStatus',
+        'consent',
+      ],
+    }
   },
   created() {
     this.getItems(Log.getUser().id).then(() => {
-      this.wait = false;
-    });
+      this.wait = false
+    })
   },
   mounted() {},
   computed: {
-    ...mapGetters({ getNeedsVerify: "myWeeks/getNeedsVerify" }),
-    ...mapState("myWeeks", ["items"]),
+    ...mapGetters({ getNeedsVerify: 'myWeeks/getNeedsVerify' }),
+    ...mapState('myWeeks', ['items']),
     FilteredListings() {
       if (this.filter) {
-        const list = _.filter(this.getNeedsVerify, item =>
+        const list = _.filter(this.getNeedsVerify, (item) =>
           Object.values(item).some(
-            i =>
+            (i) =>
               JSON.stringify(i)
                 .toLowerCase()
-                .indexOf(this.filter.toLowerCase()) > -1
-          )
-        );
-        return _.orderBy(list, this.sortKey, this.SortDirection);
+                .indexOf(this.filter.toLowerCase()) > -1,
+          ),
+        )
+        return _.orderBy(list, this.sortKey, this.SortDirection)
       } else {
-        return _.orderBy(this.getNeedsVerify, this.sortKey, this.SortDirection);
+        return _.orderBy(this.getNeedsVerify, this.sortKey, this.SortDirection)
       }
     },
     PageCount() {
       return this.visibleItemsPerPageCount !== 0
         ? Math.ceil(this.items.length / this.visibleItemsPerPageCount)
-        : 1;
+        : 1
     },
     DisplayItems() {
-      const list = this.FilteredListings;
-      const startSlice = (this.currentPage - 1) * this.visibleItemsPerPageCount;
-      let endSlice = this.currentPage * this.visibleItemsPerPageCount;
+      const list = this.FilteredListings
+      const startSlice = (this.currentPage - 1) * this.visibleItemsPerPageCount
+      let endSlice = this.currentPage * this.visibleItemsPerPageCount
       if (endSlice > list.length) {
-        endSlice = list.length;
+        endSlice = list.length
       }
-      return list.slice(startSlice, endSlice);
+      return list.slice(startSlice, endSlice)
     },
     SortDirection() {
-      return this.reverse ? "desc" : "asc";
-    }
+      return this.reverse ? 'desc' : 'asc'
+    },
   },
   methods: {
-    ...mapActions("myWeeks", ["getItems"]),
+    ...mapActions('myWeeks', ['getItems']),
     onEdit(item) {
-      this.$router.push(`/timeshare/${item.id}`);
+      this.$router.push(`/timeshare/${item.id}`)
     },
     onNew() {
-      this.$router.push("/timeshare/sell");
+      this.$router.push('/timeshare/sell')
     },
     onRowClick(items) {
-      this.selectedItems = items;
+      this.selectedItems = items
     },
     onClearSelected() {
-      this.selectedItems = [];
+      this.selectedItems = []
     },
     Edit(item) {
-      this.$router.push({ name: "EditTimeshare", params: { weekParam: item } });
+      this.$router.push({ name: 'EditTimeshare', params: { weekParam: item } })
       // this.$router.push(`/editTimeShare/${item.id}`);
     },
     Delete(item) {
-      this.deleteListing(item.id);
+      this.deleteListing(item.id)
     },
     async pageChangeHandle(value) {
       switch (value) {
-        case "next":
-          this.currentPage += 1;
-          break;
-        case "previous":
-          this.currentPage -= 1;
-          break;
+        case 'next':
+          this.currentPage += 1
+          break
+        case 'previous':
+          this.currentPage -= 1
+          break
         default:
-          this.currentPage = value;
+          this.currentPage = value
       }
     },
     sortBy(sortKey) {
-      this.reverse = this.sortKey === sortKey ? !this.reverse : false;
-      this.sortKey = sortKey;
+      this.reverse = this.sortKey === sortKey ? !this.reverse : false
+      this.sortKey = sortKey
     },
     ClearSort() {
-      this.reverse = true;
-      this.sortKey = "id";
-    }
-  }
-};
+      this.reverse = true
+      this.sortKey = 'id'
+    },
+  },
+}
 </script>
 <style scoped>
 .my-disable {

src/router/index.js

@@ -66,7 +66,7 @@ import ContactUs from '../components/misc/contactUs.vue'
 import PrivacyPolicy from '../components/misc//privacyPolicy/privacyPolicyPage.vue'
 import WebsiteDisclaimer from '../components/misc/Disclaimer/WebsiteDisclaimer.vue'
 import TermsConditions from '../components/admin/misc/termsConditions.vue'
-import TermsConditionsView from '../components/misc/TermsConditions/termsConditions.vue'
+import TermsConitionsView from '../components/misc/TermsConditions/termsConditions.vue'
 import ContactUsLog from '../components/communication/contactUsLog.vue'
 import ContactUsSourceList from '../components/communication/contactUsSourceList.vue'
 import ContactUsSource from '../components/communication/contactUsSource.vue'