TimeshareWeekAdminUpdate

src/components/admin/status/editTimeShareAdminPage.vue

@@ -20,11 +20,9 @@
               <div class="form-row">
                 <div class="form-group col-md-6">
                   <div class="input-group">
-                    <label
-                      v-if="!selectedRegion"
-                      class="uniSelectLabel"
-                      for="weekInfoRegionSelect"
-                    >REGION</label>
+                    <label v-if="!selectedRegion" class="uniSelectLabel" for="weekInfoRegionSelect"
+                      >REGION</label
+                    >
                   </div>
                   <float-label label="REGION" fixed>
                     <select
@@ -33,9 +31,7 @@
                       style="font-size: 15px"
                     >
                       <option v-for="(region, r) in regions" :key="r" :value="region.regionCode">
-                        {{
-                        region.regionName
-                        }}
+                        {{ region.regionName }}
                       </option>
                     </select>
                   </float-label>
@@ -53,7 +49,8 @@
                           v-for="(resort, r) in filteredResort"
                           :key="r"
                           :value="resort.resortCode"
-                        >{{ resort.resortName }}</option>
+                          >{{ resort.resortName }}</option
+                        >
                       </select>
                     </float-label>
 
@@ -75,7 +72,9 @@
                 </div>
                 <div class="form-group col-md-6">
                   <div v-if="weekParam.otherResort">
-                    <label v-if="!weekParam.region" class="uniSelectLabel" for="region">REGION</label>
+                    <label v-if="!weekParam.region" class="uniSelectLabel" for="region"
+                      >REGION</label
+                    >
                   </div>
                   <float-label>
                     <select
@@ -86,9 +85,7 @@
                       v-model="weekParam.region"
                     >
                       <option v-for="(region, r) in regions" :key="r">
-                        {{
-                        region.regionName
-                        }}
+                        {{ region.regionName }}
                       </option>
                     </select>
                   </float-label>
@@ -195,44 +192,61 @@
                     </select>
                   </float-label>
                 </div>
-                <div class="form-row">
-                  <div class="form-group col-md-6 mt-2">
-                    <float-label label="ARRIVAL DATE" fixed>
-                      <input
-                        type="date"
-                        class="form-control"
-                        name="occupationDate1"
-                        v-model="dateParam"
-                      />
-                    </float-label>
+                <div class="form-group col-md-6 mt-2"></div>
+                <div class="form-group col-md-6 mt-4">
+                  <float-label label="ARRIVAL DATE" fixed>
+                    <input
+                      type="date"
+                      class="form-control"
+                      name="occupationDate1"
+                      v-model="dateParam"
+                    />
+                  </float-label>
 
-                    <div class="validation"></div>
-                  </div>
-                  <div class="form-group col-md-6 mt-2">
-                    <float-label label="DEPARTURE DATE" fixed>
-                      <input
-                        type="date"
-                        class="form-control"
-                        name="occupationDate2"
-                        v-model="depDateParam"
-                      />
-                    </float-label>
+                  <div class="validation"></div>
+                </div>
+                <div class="form-group col-md-6 mt-4">
+                  <float-label label="DEPARTURE DATE" fixed>
+                    <input
+                      type="date"
+                      class="form-control"
+                      name="occupationDate2"
+                      v-model="depDateParam"
+                    />
+                  </float-label>
 
-                    <div class="validation"></div>
-                  </div>
-                  <div class="form-group col-md-6 mt-2">
-                    <float-label label="PURCHASE PRICE">
-                      <input
-                        class="form-control"
-                        placeholder="R"
-                        type="number"
-                        step="any"
-                        name="purchasePrice"
-                        v-model="weekParam.sellPrice"
-                      />
-                    </float-label>
-                    <div class="validation"></div>
-                  </div>
+                  <div class="validation"></div>
+                </div>
+                <div class="form-group col-md-6 mt-2">
+                  <label v-if="!weekParam.askingPrice" for="tsaPrice" class="uniSelectLabel"
+                    >ASKING PRICE</label
+                  >
+                  <float-label label="ASKING PRICE">
+                    <currency-input
+                      onclick="this.setSelectionRange(0, this.value.length)"
+                      name="tsaPrice"
+                      :value="weekParam.askingPrice"
+                      @input="weekParam.askingPrice = $event"
+                      v-model="weekParam.askingPrice"
+                      id="resPrice"
+                      class="form-control uniInput"
+                    />
+                  </float-label>
+                  <div class="validation"></div>
+                </div>
+                <div class="form-group col-md-6 mt-2">
+                  <float-label label="FINAL PRICE">
+                    <currency-input
+                      onclick="this.setSelectionRange(0, this.value.length)"
+                      name="tsPrice"
+                      :value="weekParam.sellPrice"
+                      @input="weekParam.sellPrice = $event"
+                      v-model="weekParam.sellPrice"
+                      id="resPrice"
+                      class="form-control uniInput"
+                    />
+                  </float-label>
+                  <div class="validation"></div>
                 </div>
               </div>
             </div>
@@ -244,23 +258,33 @@
                     type="checkbox"
                     class="custom-control-input"
                     id="customSwitch2"
-                    :checked="sellItem.currentYearBanked"
+                    :checked="weekParam.currentYearBanked"
+                    @change="changeCurrentBanked"
                   />
-                  <label
-                    class="custom-control-label"
-                    for="customSwitch2"
-                  >{{ sellItem.currentYearBanked ? "Yes" : "No" }}</label>
+                  <label class="custom-control-label" for="customSwitch2">
+                    {{ weekParam.currentYearBanked ? "Yes" : "No" }}
+                  </label>
                   <div
                     class="spacebanked1"
-                    :class="{ 'spacebanked1--clicked': sellItem.currentYearBanked }"
+                    :class="{ 'spacebanked1--clicked': weekParam.currentYearBanked }"
                   >
                     <div class="col-md-6">
                       <label
                         for="If yes, please confirm with whom"
-                        v-if="sellItem.currentYearBanked"
-                      >Please confirm with whom</label>
+                        v-if="weekParam.currentYearBanked"
+                        >Please confirm with whom</label
+                      >
+                      <select
+                        class="form-control uniSelect"
+                        name="spacebankOwner"
+                        v-if="weekParam.currentYearBanked"
+                        v-model="weekParam.bankedWith"
+                      >
+                        <option v-for="(item, i) in bankedEntities" :key="i" :value="item">{{
+                          item
+                        }}</option>
+                      </select>
                     </div>
-                    <div class="validation"></div>
                   </div>
                 </div>
               </div>
@@ -394,7 +418,9 @@
             <div class="form">
               <div class="row">
                 <div class="form-group col-md-6">
-                  <label v-if="!weekParam.weekStatus" class="uniSelectLabel" for="status">STATUS</label>
+                  <label v-if="!weekParam.weekStatus" class="uniSelectLabel" for="status"
+                    >STATUS</label
+                  >
                   <float-label label="STATUS" fixed>
                     <select
                       class="form-control uniSelect"
@@ -408,7 +434,6 @@
                   </float-label>
                 </div>
                 <div class="form-group col-md-6">
-                  <label v-if="!weekParam.publish" class="uniSelectLabel" for="publish">Publish</label>
                   <float-label label="Publish" fixed>
                     <select
                       class="form-control uniSelect"
@@ -435,21 +460,15 @@
                 </div>
               </div>
             </div>
-            <div class="form">
-              <div id="sendmessage">Your details has been sent. Thank you!</div>
-              <div id="errormessage"></div>
-              <div class="text-center col-12">
+            <div class="row">
+              <div class="text-center col-6">
                 <button class="btn-solid-blue" v-on:click="saveEdit()">Save</button>
               </div>
-              <div class="text-center col-12">
+              <div class="text-center col-6">
                 <button class="btn-solid-blue" v-on:click="backToListView()">Back</button>
               </div>
-              <br />
-              <br />
             </div>
           </div>
-          <br />
-          <br />
         </div>
       </div>
     </section>
@@ -518,17 +537,11 @@ export default {
     this.selectedWeekType = this.weekParam.weekType;
     this.selectedStatus = this.weekParam.status;
     this.selectedPublish = this.weekParam.publish;
-    var date = new Date(this.weekParam.arrivalDate)
-      .toISOString()
-      .substring(0, 10);
+    var date = new Date(this.weekParam.arrivalDate).toISOString().substring(0, 10);
     this.dateParam = date;
-    var depDate = new Date(this.weekParam.departureDate)
-      .toISOString()
-      .substring(0, 10);
+    var depDate = new Date(this.weekParam.departureDate).toISOString().substring(0, 10);
     this.depDateParam = depDate;
-    var datePub = new Date(this.weekParam.publish)
-      .toISOString()
-      .substring(0, 10);
+    var datePub = new Date(this.weekParam.pulbishedDate).toISOString().substring(0, 10);
     this.pubDateParam = datePub;
   },
   created() {
@@ -562,11 +575,7 @@ export default {
     },
     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
         );
@@ -584,12 +593,7 @@ export default {
   },
   methods: {
     ...mapActions("individual", ["getIndividual"]),
-    ...mapActions("timeshare", [
-      "initTimeshare",
-      "onResortChange",
-      "saveWeek",
-      "getBlankWeek"
-    ]),
+    ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
     ...mapActions("payment", ["addPayment"]),
     ...mapActions("bank", ["getBanks"]),
     ...mapActions("myWeeks", ["getItems", "getWeek", "editSave"]),
@@ -626,18 +630,12 @@ export default {
       if (this.week.owner.cellNumber === "") {
         this.week.owner.cellNumber = "0000000000";
       }
-      this.weekParam.arrivalDate = new Date(this.dateParam)
-        .toISOString()
-        .substring(0, 10);
-      this.weekParam.departureDate = new Date(this.depDateParam)
-        .toISOString()
-        .substring(0, 10);
-      this.weekParam.publishedDate = new Date(this.pubDateParam)
-        .toISOString()
-        .substring(0, 10);
+      this.weekParam.arrivalDate = new Date(this.dateParam).toISOString().substring(0, 10);
+      this.weekParam.departureDate = new Date(this.depDateParam).toISOString().substring(0, 10);
+      this.weekParam.pulbishedDate = new Date(this.pubDateParam).toISOString().substring(0, 19);
       this.weekParam.regionId = this.weekParam.region.id;
       this.weekParam.agentId = this.week.agentId;
-      this.weekParam.bankedWith = this.week.bankedWith;
+      //this.weekParam.bankedWith = this.week.bankedWith;
       this.weekParam.owner = this.week.owner;
       parseFloat(this.weekParam.sellPrice);
       parseFloat(this.weekParam.levyAmount);
@@ -649,7 +647,9 @@ export default {
       delete this.weekParam.owner.howMarried;
       delete this.weekParam.cellNumber;
       console.log(JSON.stringify(this.weekParam));
-      this.editSave(this.weekParam);
+      // this.editSave(this.weekParam).then(() => {
+      //   this.backToListView();
+      // });
     },
     resortChange() {
       this.onResortChange({
@@ -665,6 +665,10 @@ export default {
         this.week.otherResort = false;
       }
     },
+    changeCurrentBanked() {
+      this.weekParam.bankedWith = undefined;
+      this.weekParam.currentYearBanked = !this.weekParam.currentYearBanked;
+    },
     backToListView() {
       this.$router.push("/status/timeshareAdmin");
     }

src/components/admin/status/timeshareAdminList.vue

@@ -0,0 +1,342 @@
+<template>
+  <section id="contact2">
+    <div class="container">
+      <div class="section-header">
+        <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>
+      </div>
+      <div class="row">
+        <br />
+      </div>
+      <div class="row">
+        <div class="col-lg-12">
+          <table class="table table-striped table-responsive">
+            <thead>
+              <tr>
+                <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>
+                <th scope="col">Region</th>
+                <th scope="col">Town</th>
+                <th scope="col">Suburb</th>
+                <th scope="col">Status</th>
+                <th scope="col">Type</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 DisplayItems" :key="i">
+                <td>{{ item.owner }}</td>
+                <td>{{ item.agent }}</td>
+                <td>{{ item.resort.resortName }}</td>
+                <td>{{ item.weekNumber }}</td>
+                <td>{{ item.unitNumber }}</td>
+                <td>{{ item.bedrooms }}</td>
+                <td>{{ item.season }}</td>
+                <td>{{ item.region.regionName }}</td>
+                <td>{{ item.sellPrice | toCurrency }}</td>
+                <td>{{ item.pulbishedDate | toDate }}</td>
+                <td>{{ item.weekStatus }}</td>
+                <td v-if="!item.publish">
+                  <a v-on:click="Publish(item)">
+                    <img src="../../../../public/img/icons/Upload.png" height="25" width="25" />
+                  </a>
+                </td>
+                <td v-else>
+                  <a v-on:click="Unpublish(item)">
+                    <img
+                      src="../../../../public/img/icons/Download-grey.png"
+                      height="25"
+                      width="25"
+                    />
+                  </a>
+                </td>
+                <td>
+                  <a v-on:click="Edit(item)">
+                    <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" />
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <div class="d-flex justify-content-between" v-if="showPager">
+            <div class="p-1">
+              {{ currentPage + " / " + PageCount + (" - (" + FilteredListings.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>
+    </div>
+  </section>
+</template>
+
+<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";
+
+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",
+        "Agent",
+        "Resort",
+        "Week Module",
+        "Unit",
+        "Beds",
+        "Season",
+        "Region",
+        "Amount",
+        "Submitted",
+        "Status"
+      ],
+      columns: [
+        "owner",
+        "agent",
+        "resort",
+        "weekNumber",
+        "unitNumber",
+        "bedrooms",
+        "season",
+        "region",
+        "sellPrice",
+        "weekStatus"
+      ]
+    };
+  },
+  methods: {
+    ...mapActions("myWeeks", ["getAllItems"]),
+    ...mapActions("myWeeks", ["getItems", "verifyWeek", "editSave"]),
+    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;
+      item.owner = {
+        name: item.owner
+      };
+      item.agent = {
+        name: item.agent
+      };
+      console.log(JSON.stringify(item));
+      this.editSave(item);
+    },
+    Unpublish(item) {
+      item.publish = false;
+      item.owner = {
+        name: item.owner
+      };
+      item.agent = {
+        name: item.agent
+      };
+      console.log(item);
+      this.editSave(item);
+    },
+    Edit(item) {
+      this.$router.push({ name: "EditTimeshare", params: { weekParam: item } });
+      // this.$router.push(`/editTimeShare/${item.id}`);
+    },
+    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"]),
+    ...mapGetters({ getNeedsVerify: "myWeeks/getNeedsVerify" }),
+    FilteredListings() {
+      if (this.filter) {
+        const list = _.filter(this.getNeedsVerify, item =>
+          Object.values(item).some(
+            i =>
+              JSON.stringify(i)
+                .toLowerCase()
+                .indexOf(this.filter.toLowerCase()) > -1
+          )
+        );
+        return _.orderBy(list, this.sortKey, this.SortDirection);
+      } else {
+        return _.orderBy(this.getNeedsVerify, this.sortKey, this.SortDirection);
+      }
+    },
+    PageCount() {
+      return this.visibleItemsPerPageCount !== 0
+        ? 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;
+      if (endSlice > list.length) {
+        endSlice = list.length;
+      }
+      return list.slice(startSlice, endSlice);
+    },
+    SortDirection() {
+      return this.reverse ? "desc" : "asc";
+    }
+  },
+  created() {
+    this.getItems(this.userId).then(() => {
+      this.wait = false;
+    });
+  },
+  mounted() {
+    // 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>
+
+<style lang="scss" scoped>
+.refbyAgent {
+  will-change: transform;
+  transition: height 500ms;
+  height: 0px;
+}
+
+.refbyAgent--clicked {
+  height: 150px;
+}
+
+.spacebanked1 {
+  will-change: transform;
+  transition: height 500ms;
+  height: 0px;
+}
+
+.spacebanked1--clicked {
+  height: 150px;
+}
+
+.custom-file-label {
+  border-width: 2px;
+  border-color: rgb(27, 117, 187);
+  margin-bottom: 20px;
+}
+
+.custom-file-label::after {
+  border-left: none;
+  border-bottom: solid;
+  border-width: 2px;
+  border-color: rgb(27, 117, 187);
+  font-family: "Muli";
+}
+</style>

src/components/admin/status/timeshareAdminPage.vue

@@ -60,7 +60,8 @@
       </div>-->
       <div class="row">
         <div class="col-md-12">
-          <ListView
+          <timeshareList />
+          <!-- <ListView
             :items="getNeedsVerify"
             :editable="true"
             :deleteable="true"
@@ -73,7 +74,7 @@
             @onClearSelected="onClearSelected"
             @onEdit="onEdit"
             :showNew="false"
-          />
+          /> -->
         </div>
       </div>
       <!-- <div class="offset-1 col-md-6">
@@ -98,11 +99,12 @@
 import { mapState, mapActions, mapGetters } from "vuex";
 import Log from "../../../assets/Log";
 import ListView from "../../shared/listView.vue";
+import timeshareList from "./timeshareAdminList";
 
 export default {
   name: "TimeshareAdmin",
   components: {
-    ListView
+    timeshareList
   },
   data() {
     return {
@@ -124,10 +126,6 @@ export default {
       region: ""
     };
   },
-  mounted() {
-    this.getItems(this.user.id);
-    this.initTimeshare(0);
-  },
   computed: {
     ...mapState("timeshare", ["resorts", "regions", "seasons", "detailedRegion"]),
     ...mapState("individual", ["indiv"]),

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

@@ -438,13 +438,13 @@ export default {
         this.property.userId = this.user.id;
       }
 
-      this.property.propertyUserFields.forEach(item => {
-        if (item.value === true) {
-          item.value = "yes";
-        } else if (item.value === false) {
-          item.value = "no";
-        }
-      });
+      // this.property.propertyUserFields.forEach(item => {
+      //   if (item.value === true) {
+      //     item.value = "yes";
+      //   } else if (item.value === false) {
+      //     item.value = "no";
+      //   }
+      // });
 
       console.log(this.property);
 

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

@@ -89,7 +89,10 @@
           <div v-if="property.displayData.length > 0">
             <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'">
+                <div
+                  :style="field.value.toUpperCase() === 'FALSE' ? 'display:none' : 'display:show'"
+                  v-if="field.value.toUpperCase() != 'TRUE'"
+                >
                   <i class="fa fa-check-circle"></i>
                   {{ field.value }} {{ field.name }}
                 </div>

src/components/property/editProperty/editProperty.vue

@@ -67,9 +67,7 @@
                   >
                     <option value="0">Please select type *</option>
                     <option v-for="item in propertyTypes" :value="item.id" :key="item.id">
-                      {{
-                      item.description
-                      }}
+                      {{ item.description }}
                     </option>
                   </select>
                 </div>
@@ -110,7 +108,8 @@
                           for="price"
                           class="uniSelectLabel"
                           style="text-transform:uppercase; margin-left:17px; background-color:white"
-                        >{{ property.salesTypeString }} Price</label>
+                          >{{ property.salesTypeString }} Price</label
+                        >
                       </div>
                       <input
                         class="form-control uniInput"
@@ -149,7 +148,9 @@
                   </div>
                   <div
                     class="row my-3"
-                    v-if="property.statusString === 'Sold' || property.statusString ==='Rented Out'"
+                    v-if="
+                      property.statusString === 'Sold' || property.statusString === 'Rented Out'
+                    "
                   >
                     <div class="col-md-12">
                       Hide Property After
@@ -272,11 +273,9 @@
                   </div>
                   <div class="row my-3">
                     <div class="col-md-12">
-                      <button
-                        type="button"
-                        @click="clearAddress()"
-                        class="btn-solid-blue"
-                      >Clear Address</button>
+                      <button type="button" @click="clearAddress()" class="btn-solid-blue">
+                        Clear Address
+                      </button>
                     </div>
                   </div>
                 </div>
@@ -314,11 +313,7 @@
                     </div>
                     <div v-else-if="field.type === 'yesno'">
                       {{ field.name }}
-                      <input
-                        type="checkbox"
-                        v-model="field.value"
-                        :disabled="!canEdit"
-                      />
+                      <input type="checkbox" v-model="field.value" :disabled="!canEdit" />
                     </div>
                     <div v-else class="display:none"></div>
                   </div>
@@ -333,8 +328,10 @@
               </div>
               <div class="form-group row">
                 <div class="col-md-12">
-                  <label class="uniSelectLabel">Virtual Tour (URL)</label>
-                  <div class="input-group-prepend">
+                  <label v-if="!property.virtualTour" class="uniSelectLabel"
+                    >Virtual Tour (URL)</label
+                  >
+                  <float-label label="Virtual Tour (URL)">
                     <input
                       class="form-control uniInput"
                       type="link"
@@ -343,13 +340,13 @@
                       v-model="property.virtualTour"
                       :disabled="!canEdit"
                     />
-                  </div>
+                  </float-label>
                 </div>
               </div>
-              <div class="row">
-                <div class="col-md-12">
-                  <label class="uniSelectLabel">Video (URL)</label>
-                  <div class="input-group-prepend">
+              <div class="row mt-3">
+                <div class="col-md-12 mt-2">
+                  <label v-if="!property.video" class="uniSelectLabel">Video (URL)</label>
+                  <float-label label="Video (URL)">
                     <input
                       class="form-control uniInput"
                       type="link"
@@ -358,7 +355,7 @@
                       v-model="property.video"
                       :disabled="!canEdit"
                     />
-                  </div>
+                  </float-label>
                 </div>
               </div>
               <div class="row mt-3">
@@ -377,8 +374,12 @@
                 @DeleteImage="DeleteImage"
                 :mayEdit="canEdit"
               />
-              <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">Save</button>
-              <button v-if="!wait" type="button" @click="Close()" class="btn-solid-blue">Close</button>
+              <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">
+                Save
+              </button>
+              <button v-if="!wait" type="button" @click="Close()" class="btn-solid-blue">
+                Close
+              </button>
               <div v-if="!addressSet">
                 <p class="alert myError">Please enter an address.</p>
               </div>
@@ -404,7 +405,7 @@ export default {
   components: {
     mapSection,
     ImageLoad,
-    VueEditor,
+    VueEditor
   },
   data() {
     return {
@@ -416,16 +417,11 @@ export default {
       customToolbar: [
         [{ header: [false, 1, 2, 3, 4, 5, 6] }],
         ["bold", "italic", "underline", "strike"],
-        [
-          { align: "" },
-          { align: "center" },
-          { align: "right" },
-          { align: "justify" },
-        ],
+        [{ align: "" }, { align: "center" }, { align: "right" }, { align: "justify" }],
         [{ list: "ordered" }, { list: "bullet" }, { list: "check" }],
         [{ script: "sub" }, { script: "super" }],
-        [{ indent: "-1" }, { indent: "+1" }],
-      ],
+        [{ indent: "-1" }, { indent: "+1" }]
+      ]
     };
   },
   methods: {
@@ -433,7 +429,7 @@ export default {
       "getProperty",
       "getPropertyTypes",
       "getPropertyFields",
-      "updateProperty",
+      "updateProperty"
     ]),
     StatusChanged(item) {
       if (
@@ -496,7 +492,7 @@ export default {
         }
         this.property.newImages.push({
           image: this.images[i],
-          isDefault: setAsDefault,
+          isDefault: setAsDefault
         });
       }
 
@@ -504,7 +500,7 @@ export default {
 
       //console.log(JSON.stringify(this.property));
 
-      this.updateProperty(this.property).then((fulfilled) => {
+      this.updateProperty(this.property).then(fulfilled => {
         this.$router.push("/PropertyAdmin");
       });
     },
@@ -525,10 +521,10 @@ export default {
     },
     DeleteImage(item) {
       this.propertyImages[item].isDeleted = true;
-    },
+    }
   },
   mounted() {
-    this.getProperty(this.$route.params.id).then((fulfilled) => {
+    this.getProperty(this.$route.params.id).then(fulfilled => {
       this.wait = false;
       if (
         this.property.statusString === "Offer Pending" ||
@@ -547,7 +543,7 @@ export default {
       "propertyTypes",
       "propertyImages",
       "propertyFields",
-      "statuses",
+      "statuses"
     ]),
     savedImages() {
       const list = [];
@@ -567,8 +563,8 @@ export default {
         }
       }
       return list;
-    },
-  },
+    }
+  }
 };
 </script>
 

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

@@ -421,13 +421,13 @@ export default {
       if (this.user) {
         this.property.userId = this.user.id;
       }
-      this.property.propertyUserFields.forEach(item => {
-        if (item.value === true) {
-          item.value = "yes";
-        } else if (item.value === false) {
-          item.value = "no";
-        }
-      });
+      // this.property.propertyUserFields.forEach(item => {
+      //   if (item.value === true) {
+      //     item.value = "yes";
+      //   } else if (item.value === false) {
+      //     item.value = "no";
+      //   }
+      // });
 
       this.saveProperty(this.property)
         .then(fulfilled => {

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

@@ -98,7 +98,12 @@
               <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'">
+                    <div
+                      :style="
+                        field.value.toUpperCase() === 'FALSE' ? 'display:none' : 'display:show'
+                      "
+                      v-if="field.value.toUpperCase() !== 'TRUE'"
+                    >
                       <i class="fa fa-check-circle"></i>
                       {{ field.value }} {{ field.name }}
                     </div>

src/components/timeshare/sell/contentSection.vue

@@ -19,9 +19,7 @@
                   @change="changeRef"
                 />
                 <label class="custom-control-label" for="customSwitch1">
-                  {{
-                  refAgent ? "Yes" : "No"
-                  }}
+                  {{ refAgent ? "Yes" : "No" }}
                 </label>
                 <div class="refbyAgent" :class="{ 'refbyAgent--clicked': refAgent }">
                   <div class="col-md-6" v-if="refAgent">
@@ -32,11 +30,9 @@
                       name="agency"
                       v-model="sellItem.agencyId"
                     >
-                      <option
-                        v-for="(item, i) in agencies"
-                        :key="i"
-                        :value="item.id"
-                      >{{ item.agencyName }}</option>
+                      <option v-for="(item, i) in agencies" :key="i" :value="item.id">{{
+                        item.agencyName
+                      }}</option>
                     </select>
                   </div>
                   <div class="col-md-6" v-if="refAgent">
@@ -68,11 +64,9 @@
             <div class="form-row">
               <div class="form-group col-md-6 mt-2">
                 <div class="input-group">
-                  <label
-                    v-if="!sellItem.region"
-                    class="uniSelectLabel"
-                    for="weekInfoRegionSelect"
-                  >REGION</label>
+                  <label v-if="!sellItem.region" class="uniSelectLabel" for="weekInfoRegionSelect"
+                    >REGION</label
+                  >
                   <float-label label="REGION" style="width:100%">
                     <select
                       id="weekInfoRegionSelect"
@@ -82,9 +76,7 @@
                       style="font-size: 15px"
                     >
                       <option v-for="(region, r) in regions" :key="r" :value="region">
-                        {{
-                        region.regionName
-                        }}
+                        {{ region.regionName }}
                       </option>
                     </select>
                   </float-label>
@@ -103,11 +95,9 @@
               </div>
               <div class="form-group col-md-6 mt-2">
                 <div class="input-group">
-                  <label
-                    v-if="!sellItem.resort"
-                    class="uniSelectLabel"
-                    for="weekInfoResortSelect"
-                  >RESORT NAME</label>
+                  <label v-if="!sellItem.resort" class="uniSelectLabel" for="weekInfoResortSelect"
+                    >RESORT NAME</label
+                  >
                   <float-label label="RESORT NAME" style="width:100%">
                     <select
                       id="weekInfoResortSelect"
@@ -117,9 +107,7 @@
                     >
                       <option value="Other">Other</option>
                       <option v-for="(resort, r) in filteredResort" :key="r" :value="resort">
-                        {{
-                        resort.resortName
-                        }}
+                        {{ resort.resortName }}
                       </option>
                     </select>
                   </float-label>
@@ -206,7 +194,9 @@
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6 mt-2">
-                <label v-if="!sellItem.bedrooms" class="uniSelectLabel" for="region">BEDROOM/S</label>
+                <label v-if="!sellItem.bedrooms" class="uniSelectLabel" for="region"
+                  >BEDROOM/S</label
+                >
                 <float-label label="BEDROOM/S">
                   <select
                     class="form-control uniSelect"
@@ -221,7 +211,9 @@
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6 mt-2">
-                <label v-if="!sellItem.maxSleep" class="uniSelectLabel" for="region">SLEEP MAX</label>
+                <label v-if="!sellItem.maxSleep" class="uniSelectLabel" for="region"
+                  >SLEEP MAX</label
+                >
                 <float-label label="SLEEP MAX">
                   <select
                     class="form-control uniSelect"
@@ -251,7 +243,9 @@
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6 mt-2">
-                <label v-if="!sellItem.weekType" class="uniSelectLabel" for="region">WEEK TYPE</label>
+                <label v-if="!sellItem.weekType" class="uniSelectLabel" for="region"
+                  >WEEK TYPE</label
+                >
                 <float-label label="WEEK TYPE">
                   <select
                     class="form-control uniSelect"
@@ -280,19 +274,16 @@
                   @change="changeCurrentBanked"
                 />
                 <label class="custom-control-label" for="customSwitch2">
-                  {{
-                  sellItem.currentYearBanked ? "Yes" : "No"
-                  }}
+                  {{ sellItem.currentYearBanked ? "Yes" : "No" }}
                 </label>
                 <div
                   class="spacebanked1"
                   :class="{ 'spacebanked1--clicked': sellItem.currentYearBanked }"
                 >
                   <div class="col-md-6">
-                    <label
-                      for="If yes, please confirm with whom"
-                      v-if="sellItem.currentYearBanked"
-                    >Please confirm with whom</label>
+                    <label for="If yes, please confirm with whom" v-if="sellItem.currentYearBanked"
+                      >Please confirm with whom</label
+                    >
                     <select
                       class="form-control uniSelect"
                       name="spacebankOwner"
@@ -382,11 +373,9 @@
               <div class="form-group col-md-6">
                 <div class="input-group">
                   <span v-if="!indiv.howMarried">
-                    <label
-                      v-if="indiv.howMarried === 'N/A'"
-                      for="howMarried"
-                      class="uniSelectLabel"
-                    >Marital Status</label>
+                    <label v-if="indiv.howMarried === 'N/A'" for="howMarried" class="uniSelectLabel"
+                      >Marital Status</label
+                    >
                   </span>
 
                   <float-label label="Marital Status" style="width:100%">
@@ -397,7 +386,9 @@
                     >
                       <option value="N/A">N/A</option>
                       <option value="In Community Of Property">In Community Of Property</option>
-                      <option value="Out of Community Of Property">Out of Community Of Property</option>
+                      <option value="Out of Community Of Property"
+                        >Out of Community Of Property</option
+                      >
                       <option value="Other">Other</option>
                       <option value="Traditional Wedding">Traditional Wedding</option>
                       <option value="Single">Single</option>
@@ -644,9 +635,9 @@
                 class="form-group col-md-12"
                 style="border:solid;border-width:2px; border-color:rgb(27, 117, 187); border-radius: 3px"
               >
-                <p
-                  style="text-align: left; margin:auto; padding:10px"
-                >1. With respect to my timeshare module/week, I confirm that:</p>
+                <p style="text-align: left; margin:auto; padding:10px">
+                  1. With respect to my timeshare module/week, I confirm that:
+                </p>
                 <div class="validation"></div>
               </div>
             </div>
@@ -665,9 +656,7 @@
                     @change="changeLeviesPaidInFull"
                   />
                   <label class="custom-control-label" for="customSwitch3">
-                    {{
-                    sellItem.leviesPaidInFull ? "Yes" : "No"
-                    }}
+                    {{ sellItem.leviesPaidInFull ? "Yes" : "No" }}
                   </label>
                 </div>
                 <div class="validation"></div>
@@ -688,9 +677,7 @@
                     @change="changeWeekPlacedForRental"
                   />
                   <label class="custom-control-label" for="customSwitch4">
-                    {{
-                    sellItem.weekPlacedForRental ? "Yes" : "No"
-                    }}
+                    {{ sellItem.weekPlacedForRental ? "Yes" : "No" }}
                   </label>
                 </div>
                 <div class="validation"></div>
@@ -812,7 +799,9 @@
               </div>
             </div>
             <div class="text-center col-12" v-if="CanSave">
-              <button class="btn-solid-blue" v-if="!sellItem.id" @click="submitSale()">SUBMIT</button>
+              <button class="btn-solid-blue" v-if="!sellItem.id" @click="submitSale()">
+                SUBMIT
+              </button>
               <button class="btn-solid-blue" v-else @click="newSale()">NEW WEEK</button>
             </div>
             <!-- <div class="text-center col-12">
@@ -843,18 +832,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 +869,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() {
@@ -895,14 +884,9 @@ export default {
     ...mapGetters("fees", ["getListingFee"]),
     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;
@@ -910,14 +894,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);
@@ -928,26 +912,17 @@ export default {
     },
     CanSave() {
       if (this.indiv.howMarried === "In Community Of Property") {
-        if (
-          this.indiv.spouseName ||
-          this.indiv.spouseSurname ||
-          this.spouseEmail
-        ) {
+        if (this.indiv.spouseName || this.indiv.spouseSurname || this.spouseEmail) {
           return true;
         }
         return false;
       }
       return true;
-    },
+    }
   },
   methods: {
     ...mapActions("individual", ["getIndividual"]),
-    ...mapActions("timeshare", [
-      "initTimeshare",
-      "onResortChange",
-      "saveWeek",
-      "getBlankWeek",
-    ]),
+    ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
     ...mapActions("payment", ["addPayment"]),
     ...mapActions("bank", ["getBanks"]),
     newSale() {
@@ -958,7 +933,8 @@ export default {
       if (this.userLoggedIn) {
         this.sellItem.ownerObject = this.indiv;
         this.sellItem.status = undefined;
-        this.saveWeek(this.sellItem).then((fulfilled) => {
+        this.sellItem.weekStatus = "For Sale";
+        this.saveWeek(this.sellItem).then(fulfilled => {
           this.paygateRedirect();
         });
       }
@@ -971,16 +947,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 +981,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") {
@@ -1017,9 +993,7 @@ export default {
       }
     },
     regionChange() {
-      this.sellItem.regionId = this.sellItem.region
-        ? this.sellItem.region.id
-        : 1;
+      this.sellItem.regionId = this.sellItem.region ? this.sellItem.region.id : 1;
     },
     UpdateAddress(address) {
       this.indiv.address.streetNumber = address.streetNumber;
@@ -1035,8 +1009,8 @@ export default {
       } else {
         this.sellItem.mandateDate = undefined;
       }
-    },
-  },
+    }
+  }
 };
 </script>
 

src/store/modules/timeshare/myWeeks.js

@@ -36,12 +36,21 @@ export default {
     // },
   },
   actions: {
-    getItems({ commit }, id) {
-      axios
+    async getItems({ commit }, id) {
+      await axios
         .get(`/api/timeshareweek/getMyWeek/${id}`)
         .then(r => commit("setItems", r.data))
         .catch(console.error);
     },
+    async getAllItems({ commit }) {
+      const response = await axios.get("api/timeshareweek/");
+      if (response.status === 200) {
+        commit("setItems");
+        return Promise.resolve();
+      } else {
+        return Promise.reject();
+      }
+    },
     verifyWeek({ commit }, id) {
       try {
         axios.post(`/api/timeshareweek/verifyweek/${id}`).catch(console.error);
@@ -67,11 +76,13 @@ export default {
         })
         .catch(console.error);
     },
-    editSave({ commit }, week) {
-      axios
+    async editSave({ commit }, week) {
+      await axios
         .put(`/api/timeshareweek`, week)
         .then(r => {
-          commit("setItem", r.data);
+          week.owner = week.owner.name;
+          week.agent = week.agent.name;
+          commit("setItem", week);
         })
         .catch(console.error);
     }