Various Fixes

package-lock.json

@@ -12412,9 +12412,9 @@
       "integrity": "sha512-AeYn51cG/iSZbRAOnDrmzdv+Q8bBtElB3R0U37eM3NRKkcFsf6CLBw5lip1sSbichdn1ANfzjM+N1gki3GvMqw=="
     },
     "vue-json-excel": {
-      "version": "0.2.98",
-      "resolved": "https://registry.npmjs.org/vue-json-excel/-/vue-json-excel-0.2.98.tgz",
-      "integrity": "sha512-hPA3/cOe5nGbEZiJyfpdBIdqBExxF6EhMhpX6vC654PYbTVzdzp7O9ZsC1AgqbgRDR8VjzAaPaEeHg2vGS88FQ==",
+      "version": "0.2.99",
+      "resolved": "https://registry.npmjs.org/vue-json-excel/-/vue-json-excel-0.2.99.tgz",
+      "integrity": "sha512-Zu1uV/KUGjG8oGchF1kK/53eaTEXoKPC4pZknuF3n+/7fctxuuOuQ5bda9GRE0PukRCbyJtL1v3Y256GmnyOaQ==",
       "requires": {
         "downloadjs": "^1.4.7"
       }

package.json

@@ -37,7 +37,7 @@
     "vue-eva-icons": "^1.1.1",
     "vue-float-label": "^1.6.1",
     "vue-js-modal": "^1.3.33",
-    "vue-json-excel": "^0.2.98",
+    "vue-json-excel": "^0.2.99",
     "vue-owl-carousel": "^2.0.3",
     "vue-router": "^3.1.5",
     "vue-social-sharing": "^3.0.0-beta.11",

src/components/admin/status/timeshareAdminList.vue

@@ -5,14 +5,82 @@
         <h1>Property Admin</h1>
       </div>
       <div class="row">
-        <div class="col-lg-6 offset-3">
-          <input class="form-control uniSelect" type="text" placeholder="SEARCH" v-model="filter" />
+        <div class="col-lg-4"></div>
+        <div class="col-lg-4">
+          <input
+            @input="updateLazyFilter"
+            class="form-control uniSelect"
+            type="text"
+            placeholder="SEARCH"
+            v-model="filter"
+          />
+        </div>
+        <div class="col-lg-4">
+          <select
+            @change="downloadExcelSheet"
+            name="downloadType"
+            class="form-control uniSelect"
+            v-model="selectedExcelDownload"
+            id=""
+          >
+            <option value="">Select Download Option</option>
+            <option value="displayItems">
+              <download-excel
+                ref="dlDisplay"
+                :data="DisplayItems"
+                :fields="excelFields"
+                worksheet="Timeshare Listings"
+                name="Uni-Vate Timeshare.xls"
+              >
+                Download Display Items
+              </download-excel>
+            </option>
+            <option value="allPublished">
+              <download-excel
+                ref="dlPublished"
+                :data="OnlyPublished"
+                :fields="excelFields"
+                worksheet="Timeshare Listings"
+                name="Uni-Vate Timeshare.xls"
+              >
+                Download Published Items
+              </download-excel>
+            </option>
+            <option value="allItems">
+              <download-excel
+                ref="dlAll"
+                :data="AllListingsSortedById"
+                :fields="excelFields"
+                worksheet="Timeshare Listings"
+                name="Uni-Vate Timeshare.xls"
+              >
+                Download All
+              </download-excel>
+            </option>
+          </select>
         </div>
       </div>
       <div class="row">
         <br />
       </div>
     </div>
+    <!-- <div class="row">
+      <div class="col">
+        {{ DisplayItems[0] }}
+      </div>
+    </div>
+    <div class="row">
+      <div class="col">
+        <download-excel
+          :data="DisplayItems"
+          :fields="excelFields"
+          worksheet="Timeshare Listings"
+          name="Uni-Vate Timeshare.xls"
+        >
+          Download Excel
+        </download-excel>
+      </div>
+    </div> -->
     <div class="container-fluid">
       <div class="row justify-content-center">
         <div class="col-auto">
@@ -163,6 +231,50 @@ export default {
       currentPage: 1,
       reverse: true,
       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",
+        Amount: {
+          field: "sellPrice",
+          callback: value => {
+            return "R " + value;
+          }
+        },
+        Levy: {
+          field: "levyAmount",
+          callback: value => {
+            return "R " + value;
+          }
+        },
+        ArrivalDate: {
+          field: "arrivalDate",
+          callback: value => {
+            return value.substring(0, 10);
+          }
+        },
+        DepartureDate: {
+          field: "departureDate",
+          callback: value => {
+            return value.substring(0, 10);
+          }
+        },
+        Submitted: {
+          field: "pulbishedDate",
+          callback: value => {
+            return value.substring(0, 10);
+          }
+        },
+        Status: "status.description"
+      },
       displayColumns: [
         "Ref",
         "Owner",
@@ -194,6 +306,7 @@ export default {
   },
   methods: {
     ...mapActions("myWeeks", ["getAllItems"]),
+    ...mapActions("timeshare", ["updateFilter"]),
     ...mapActions("myWeeks", [
       "getItems",
       "verifyWeek",
@@ -202,6 +315,21 @@ export default {
       "unpublishWeek",
       "deleteListing"
     ]),
+    updateLazyFilter() {
+      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();
+      }
+    },
     Publish(item) {
       var today = new Date();
       var dd = String(today.getDate()).padStart(2, "0");
@@ -250,15 +378,16 @@ export default {
   },
   computed: {
     ...mapState("propertyList", ["properties"]),
+    ...mapState("timeshare", ["timeshareFilter"]),
     ...mapGetters({ getNeedsVerify: "myWeeks/getNeedsVerify" }),
     FilteredListings() {
-      if (this.filter) {
+      if (this.timeshareFilter) {
         const list = _.filter(this.getNeedsVerify, item =>
           Object.values(item).some(
             i =>
               JSON.stringify(i)
                 .toLowerCase()
-                .indexOf(this.filter.toLowerCase()) > -1
+                .indexOf(this.timeshareFilter.toLowerCase()) > -1
           )
         );
         return _.orderBy(list, this.sortKey, this.SortDirection);
@@ -266,6 +395,18 @@ export default {
         return _.orderBy(this.getNeedsVerify, this.sortKey, this.SortDirection);
       }
     },
+    AllListingsSortedById() {
+      return _.orderBy(this.getNeedsVerify, "id", "desc");
+    },
+    OnlyPublished() {
+      var list = [];
+      this.FilteredListings.forEach(listing => {
+        if (listing.publish) {
+          list.push(listing);
+        }
+      });
+      return list;
+    },
     PageCount() {
       return this.visibleItemsPerPageCount !== 0
         ? Math.ceil(this.FilteredListings.length / this.visibleItemsPerPageCount)
@@ -290,6 +431,9 @@ export default {
     });
   },
   mounted() {
+    if (this.timeshareFilter !== "") {
+      this.filter = this.timeshareFilter;
+    }
     // this.getAdminProperties(this.userId).then(fulfuilled => {
     //   this.wait = false;
     //   if (this.itemsPerPageList && this.itemsPerPageList.length > 0) {

src/components/communication/newEmailTemplate.vue

@@ -70,9 +70,23 @@
                       <option value="[MODULE]">Module</option>
                       <option value="[RESORTPRICE]">Resort Price</option>
                       <option value="[RESORTSEASON]">Resort Season</option>
+                      <option value="[RESORTREGION]">Resort Region</option>
                       <option value="[RESORTLEVY]">Resort Levy</option>
                       <option value="[OFFERMADE]">Offer Made</option>
                       <option value="[OWNER]">OWNER</option>
+                      <option value="[SLEEPMAX]">Sleep Max</option>
+                      <option value="[WEEK]">Week</option>
+                      <option value="[BEDROOMS]">Bedrooms</option>
+                      <option value="[ASKINGPRICE]">Asking Price</option>
+                      <option value="[ARRIVALDATE]">Arrival Date</option>
+                      <option value="[DEPARTUREDATE]">Departure Date</option>
+                      <option value="[AGENTREFER]">Referred By Agent</option>
+                      <option value="[ALLLEVY]">Levies Paid</option>
+                      <option value="[WEEKPLACEDFORRENTAL]">Current year Rental</option>
+                      <option value="[ORIGINALPURCHASEDATE]">Original Purchase Date</option>
+                      <option value="[CUROCCUPATIONDATES]">Current Occupation Dates</option>
+                      <option value="[ORIGINALPURCHASEPRICE]">Original Purchase Price</option>
+                      <option value="[AGENTCOMM]">Agent Commission</option>
                     </optgroup>
                     <optgroup label="Property Fields">
                       <option value="[PROPERTYREF]">Property Ref</option>

src/components/timeshare/buy/carouselSection.vue

@@ -122,6 +122,7 @@ export default {
   },
   methods: {
     ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek"]),
+    ...mapActions("resort", ["getResortWithListings"]),
     regionChange(item) {
       let reg = this.regions.find(r => r.regionName === item.target.value);
       this.regionObj = reg;
@@ -149,23 +150,49 @@ export default {
   computed: {
     ...mapState("timeshare", ["resorts", "regions", "detailedRegion"]),
     ...mapState("weekList", ["searchParams", "filter"]),
+    ...mapState("resort", ["resortsWithListings"]),
     filteredResort() {
       let list = [];
+      var itemList = [];
       if (this.searchParams.region && this.searchParams.region !== "") {
-        const item = this.detailedRegion.find(
-          region => region.region.regionCode === this.regionObj.regionCode
-        );
-        if (item) {
-          list = item.children;
+        this.resortsWithListings.forEach(resortListing => {
+          if (
+            resortListing.resortRegion[0].code.toUpperCase() ===
+            this.regionObj.regionCode.toUpperCase()
+          ) {
+            itemList.push(resortListing);
+          }
+        });
+        if (itemList.length > 0) {
+          list = itemList;
+        } else {
+          list[0] = {
+            resortName: " - No Listings - "
+          };
         }
       } else {
-        list = this.resorts;
+        list = this.resortsWithListings;
       }
       return _.sortBy(list, x => x.resortName);
     }
+    // filteredResort() {
+    //   let list = [];
+    //   if (this.searchParams.region && this.searchParams.region !== "") {
+    //     const item = this.detailedRegion.find(
+    //       region => region.region.regionCode === this.regionObj.regionCode
+    //     );
+    //     if (item) {
+    //       list = item.children;
+    //     }
+    //   } else {
+    //     list = this.resorts;
+    //   }
+    //   return _.sortBy(list, x => x.resortName);
+    // }
   },
   created() {
     this.initTimeshare(this.weekId);
+    this.getResortWithListings();
   },
   mounted() {
     this.searchParams.region = null;

src/main.js

@@ -13,12 +13,14 @@ import VueCurrencyInput from "vue-currency-input";
 import VueFloatLabel from "vue-float-label";
 import VueCryptojs from "vue-cryptojs";
 import VueAnalytics from 'vue-analytics';
+import JsonExcel from "vue-json-excel";
 
 Vue.use(VueSocialSharing);
 Vue.use(EvaIcons);
 Vue.use(Vuetify);
 Vue.use(VueFloatLabel);
 Vue.use(VueCryptojs);
+Vue.component("downloadExcel", JsonExcel);
 
 Vue.use(VueGoogleMaps, {
   load: {

src/store/modules/timeshare/resort.js

@@ -11,7 +11,8 @@ export default {
     images: [],
     layout: "",
     description: "",
-    resortMedia: undefined
+    resortMedia: undefined,
+    resortsWithListings: []
   },
   mutations: {
     setResort(state, resort) {
@@ -36,6 +37,9 @@ export default {
     },
     setResortMedia(state, media) {
       state.resortMedia = media;
+    },
+    setResortsWithListings(state, data){
+      state.resortsWithListings = data
     }
   },
   getters: {},
@@ -156,6 +160,11 @@ export default {
           commit("setResort", result.data);
         })
         .catch(error => console.log(new Error(error.message)));
+    },
+    async getResortWithListings({commit}, resortCode){
+      await axios.get("/api/resort/GetPublishedResortsWithListings").then(result => {
+        commit("setResortsWithListings", result.data)
+      })
     }
   }
 };

src/store/modules/timeshare/timeshare.js

@@ -18,6 +18,7 @@ export default {
     bankedEntities: [],
     agencies: [],
     agents: [],
+    timeshareFilter: "",
     maritalStatus: MaritalStatus,
     result: undefined,
     latestWeeks: [],
@@ -60,6 +61,9 @@ export default {
     setUnitConfigurationList(state, list) {
       state.unitConfigurationList = list;
     },
+    filterStore(state, input){
+      state.timeshareFilter = input
+    },
     setAgency(state, agencies) {
       state.agencies = agencies;
     },
@@ -155,6 +159,9 @@ export default {
         dispatch("getWeekDetail", timeshareId);
       }
     },
+    updateFilter({commit}, input){
+      commit('filterStore', input)
+    },
     getWeekDetail({ commit }, timeshareId) {
       axios
         .get(`api/timeshareweek/${timeshareId}`)