Fix to publish Timeshare

src/components/admin/status/editTimeShareAdminPage.vue

@@ -19,7 +19,10 @@
               <div class="form-row">
                 <div class="form-group col-md-6">
                   <div class="input-group">
-                    <label v-if="!selectedRegion" class="uniSelectLabel" for="weekInfoRegionSelect"
+                    <label
+                      v-if="!selectedRegion"
+                      class="uniSelectLabel"
+                      for="weekInfoRegionSelect"
                       >REGION</label
                     >
                   </div>
@@ -29,7 +32,11 @@
                       v-model="selectedRegion"
                       style="font-size: 15px"
                     >
-                      <option v-for="(region, r) in regions" :key="r" :value="region.regionCode">
+                      <option
+                        v-for="(region, r) in regions"
+                        :key="r"
+                        :value="region.regionCode"
+                      >
                         {{ region.regionName }}
                       </option>
                     </select>
@@ -41,15 +48,19 @@
                 </div>
                 <div class="form-group col-md-6">
                   <div class="input-group">
-                    <float-label label="RESORT NAME" style="width:100%" fixed>
-                      <select class="form-control uniSelect" v-model="selectedResort">
+                    <float-label label="RESORT NAME" style="width: 100%" fixed>
+                      <select
+                        class="form-control uniSelect"
+                        v-model="selectedResort"
+                      >
                         <option value="Other">Other</option>
                         <option
                           v-for="(resort, r) in filteredResort"
                           :key="r"
                           :value="resort.resortCode"
-                          >{{ resort.resortName }}</option
                         >
+                          {{ resort.resortName }}
+                        </option>
                       </select>
                     </float-label>
 
@@ -86,7 +97,10 @@
                 </div>
                 <div class="form-group col-md-6">
                   <div v-if="weekParam.otherResort">
-                    <label v-if="!weekParam.region" class="uniSelectLabel" for="region"
+                    <label
+                      v-if="!weekParam.region"
+                      class="uniSelectLabel"
+                      for="region"
                       >REGION</label
                     >
                   </div>
@@ -107,7 +121,7 @@
                 <div class="form-group col-md-6">
                   <float-label>
                     <input
-                      type="number"
+                      type="text"
                       class="form-control"
                       name="unitNumber"
                       id="unitNumber"
@@ -142,9 +156,13 @@
                       id="season"
                       v-model="selectedSeason"
                     >
-                      <option :value="season.name" v-for="(season, r) in seasons" :key="r">{{
-                        season.name
-                      }}</option>
+                      <option
+                        :value="season.name"
+                        v-for="(season, r) in seasons"
+                        :key="r"
+                      >
+                        {{ season.name }}
+                      </option>
                     </select>
                   </float-label>
 
@@ -158,7 +176,9 @@
                       id="region"
                       v-model="selectedBedrooms"
                     >
-                      <option v-for="(item, i) in resortBedrooms" :key="i">{{ item }}</option>
+                      <option v-for="(item, i) in resortBedrooms" :key="i">
+                        {{ item }}
+                      </option>
                     </select>
                   </float-label>
 
@@ -172,7 +192,9 @@
                       id="region"
                       v-model="selectedMaxSleep"
                     >
-                      <option v-for="(item, i) in maxSleep" :key="i">{{ item }}</option>
+                      <option v-for="(item, i) in maxSleep" :key="i">
+                        {{ item }}
+                      </option>
                     </select>
                   </float-label>
 
@@ -266,7 +288,9 @@
             <div align="left" class="custom-control custom-switch mb-2">
               <div class="row">
                 <div align="center" class="col">
-                  <label class="mr-5">Has your week been spacebanked for the current year?</label>
+                  <label class="mr-5"
+                    >Has your week been spacebanked for the current year?</label
+                  >
                   <input
                     type="checkbox"
                     class="custom-control-input"
@@ -279,7 +303,9 @@
                   </label>
                   <div
                     class="spacebanked1"
-                    :class="{ 'spacebanked1--clicked': weekParam.currentYearBanked }"
+                    :class="{
+                      'spacebanked1--clicked': weekParam.currentYearBanked,
+                    }"
                   >
                     <div class="col-md-6">
                       <label
@@ -293,9 +319,13 @@
                         v-if="weekParam.currentYearBanked"
                         v-model="weekParam.bankedWith"
                       >
-                        <option v-for="(item, i) in bankedEntities" :key="i" :value="item">{{
-                          item
-                        }}</option>
+                        <option
+                          v-for="(item, i) in bankedEntities"
+                          :key="i"
+                          :value="item"
+                        >
+                          {{ item }}
+                        </option>
                       </select>
                     </div>
                   </div>
@@ -303,14 +333,17 @@
               </div>
             </div>
 
-            <div class="section-header" style="margin-top:50px">
+            <div class="section-header" style="margin-top: 50px">
               <h2>Detailed Individual Information</h2>
             </div>
             <div class="form">
               <div v-if="ROLE === 'Super Admin'" class="row mb-4">
                 <div class="col">
                   <float-label label="OWNER TYPE" fixed>
-                    <select v-model="weekParam.customOwner" class="form-control uniSelect mt-3">
+                    <select
+                      v-model="weekParam.customOwner"
+                      class="form-control uniSelect mt-3"
+                    >
                       <option v-bind:value="true">Custom Owner</option>
                       <option v-bind:value="false">Registered User</option>
                     </select>
@@ -326,9 +359,13 @@
                       class="form-control uniSelect mt-3"
                       @change="updateCurrentUser()"
                     >
-                      <option v-for="indiv in individuals" :key="indiv.id" :value="indiv.id">{{
-                        indiv.fullName
-                      }}</option>
+                      <option
+                        v-for="indiv in individuals"
+                        :key="indiv.id"
+                        :value="indiv.id"
+                      >
+                        {{ indiv.fullName }}
+                      </option>
                     </select>
                   </float-label>
                 </div>
@@ -458,7 +495,7 @@
                 </div>
               </div>
             </div>
-            <div class="section-header" style="margin-top:50px">
+            <div class="section-header" style="margin-top: 50px">
               <h2>Week Agent</h2>
             </div>
             <div class="row">
@@ -470,9 +507,13 @@
                   name="agency"
                   v-model="weekParam.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">
@@ -484,7 +525,11 @@
                   v-model="weekParam.agentId"
                   :disabled="!weekParam.agencyId"
                 >
-                  <option v-for="(item, i) in displayNotDeletedAgents" :key="i" :value="item.id">
+                  <option
+                    v-for="(item, i) in displayNotDeletedAgents"
+                    :key="i"
+                    :value="item.id"
+                  >
                     <div>{{ item.name + " " + item.surname }}</div>
                   </option>
                 </select>
@@ -504,9 +549,13 @@
                         id="status"
                         v-model="weekParam.status.id"
                       >
-                        <option :key="status.id" :value="status.id" v-for="status in statusList">{{
-                          status.description
-                        }}</option>
+                        <option
+                          :key="status.id"
+                          :value="status.id"
+                          v-for="status in statusList"
+                        >
+                          {{ status.description }}
+                        </option>
                       </select>
                     </float-label>
                   </div>
@@ -539,10 +588,14 @@
               </div>
               <div class="row">
                 <div class="text-center col-6">
-                  <button class="btn-solid-blue" v-on:click="saveEdit()">SAVE</button>
+                  <button class="btn-solid-blue" v-on:click="saveEdit()">
+                    SAVE
+                  </button>
                 </div>
                 <div class="text-center col-6">
-                  <button class="btn-solid-blue" v-on:click="backToListView()">BACK</button>
+                  <button class="btn-solid-blue" v-on:click="backToListView()">
+                    BACK
+                  </button>
                 </div>
               </div>
             </div>
@@ -575,8 +628,8 @@ export default {
   props: {
     weekParam: {},
     weekId: {
-      default: 0
-    }
+      default: 0,
+    },
   },
   data() {
     return {
@@ -596,12 +649,12 @@ export default {
       depDateParam: {},
       pubDateParam: {},
       boolAwaitingPayment: false,
-      selectedUser: ""
+      selectedUser: "",
     };
   },
   components: {
     addressAutoComplete,
-    Alert
+    Alert,
   },
   async mounted() {
     if (this.sellItem.id) {
@@ -625,11 +678,17 @@ 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.pulbishedDate).toISOString().substring(0, 10);
+    var datePub = new Date(this.weekParam.pulbishedDate)
+      .toISOString()
+      .substring(0, 10);
     this.pubDateParam = datePub;
     if (this.weekParam.status.description === "Awaiting Payment") {
       if (this.ROLE !== "Super Admin") {
@@ -672,7 +731,7 @@ export default {
       "sellItem",
       "agencies",
       "agents",
-      "getTemplate"
+      "getTemplate",
     ]),
     ...mapGetters("nonRegIndividual", ["getIndiv"]),
     ...mapState("individual", ["indiv"]),
@@ -681,7 +740,7 @@ export default {
     ...mapState("status", ["statusList"]),
     ...mapGetters({
       user: "authentication/getUser",
-      person: "authentication/getPerson"
+      person: "authentication/getPerson",
     }),
     ...mapState("bank", ["banks"]),
     ...mapState("register", ["individuals", "removeIndividual"]),
@@ -697,7 +756,7 @@ export default {
       let list = [];
       if (this.week && this.week.region && this.selectedRegion) {
         const item = this.detailedRegion.find(
-          region => region.region.regionCode === this.selectedRegion
+          (region) => region.region.regionCode === this.selectedRegion
         );
         if (item) {
           list = item.children;
@@ -705,14 +764,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.weekParam.agencyId) {
             notDeletedArr.push(agent);
@@ -720,12 +779,17 @@ export default {
         }
       });
       return notDeletedArr;
-    }
+    },
   },
   methods: {
     ...mapActions("individual", ["getIndividual"]),
     ...mapActions("nonRegIndividual", ["retrieveNonRegIndiv"]),
-    ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
+    ...mapActions("timeshare", [
+      "initTimeshare",
+      "onResortChange",
+      "saveWeek",
+      "getBlankWeek",
+    ]),
     ...mapActions("payment", ["addPayment"]),
     ...mapActions("bank", ["getBanks"]),
     ...mapActions("myWeeks", ["getItems", "getWeek", "editSave"]),
@@ -736,7 +800,7 @@ export default {
       this.getBlankWeek();
     },
     updateCurrentUser() {
-      this.individuals.forEach(indiv => {
+      this.individuals.forEach((indiv) => {
         if (this.weekParam.ownerId === indiv.id) {
           this.week.owner.name = indiv.name;
           this.week.owner.surname = indiv.surname;
@@ -750,13 +814,13 @@ export default {
       });
     },
     saveEdit() {
-      this.regions.forEach(region => {
+      this.regions.forEach((region) => {
         if (region.regionCode === this.selectedRegion) {
           //console.log(region);
           this.weekParam.regionId = region.id;
         }
       });
-      this.resorts.forEach(resort => {
+      this.resorts.forEach((resort) => {
         if (resort.resortCode === this.selectedResort) {
           this.weekParam.resortCode = resort.resortCode;
           this.weekParam.resortName = resort.resortName;
@@ -765,12 +829,12 @@ export default {
       console.log(this.selectedSeason);
       this.weekParam.season = this.selectedSeason;
 
-      this.resortBedrooms.forEach(bedroom => {
+      this.resortBedrooms.forEach((bedroom) => {
         if (bedroom === this.selectedBedrooms) {
           this.weekParam.bedroom = bedroom;
         }
       });
-      this.maxSleep.forEach(sleepMax => {
+      this.maxSleep.forEach((sleepMax) => {
         if (sleepMax === this.selectedMaxSleep) {
           this.weekParam.maxSleep = sleepMax;
         }
@@ -781,11 +845,17 @@ export default {
       if (this.week.owner.telephone === "") {
         delete this.week.owner.telephone;
       }
-      this.weekParam.arrivalDate = new Date(this.dateParam).toISOString().substring(0, 10);
-      this.weekParam.departureDate = new Date(this.depDateParam).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);
       //console.log(this.pubDateParam);
       if (this.pubDateParam) {
-        this.weekParam.pulbishedDate = new Date(this.pubDateParam).toISOString().substring(0, 19);
+        this.weekParam.pulbishedDate = new Date(this.pubDateParam)
+          .toISOString()
+          .substring(0, 19);
       }
       this.weekParam.owner = this.week.owner;
       this.weekParam.askingPrice = this.week.askingPrice;
@@ -808,7 +878,7 @@ export default {
     resortChange() {
       this.onResortChange({
         resortName: this.week.resort.resortName,
-        resortCode: this.week.resort.resortCode
+        resortCode: this.week.resort.resortCode,
       });
 
       if (this.week && this.week.resort === "Other") {
@@ -834,20 +904,20 @@ 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,
+          },
         });
       });
-    }
-  }
+    },
+  },
 };
 </script>
 

src/components/admin/status/timeshareAdminList.vue

@@ -6,7 +6,12 @@
       </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">
@@ -18,7 +23,7 @@
             <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">
@@ -66,7 +71,11 @@
                 <td>{{ item.status.description }}</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>
@@ -80,12 +89,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>
@@ -93,7 +110,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
@@ -112,7 +134,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>
@@ -121,7 +145,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>
@@ -144,7 +172,7 @@ import _ from "lodash";
 
 export default {
   components: {
-    BasePagination
+    BasePagination,
   },
   data() {
     return {
@@ -169,7 +197,7 @@ export default {
         "Region",
         "Amount",
         "Submitted",
-        "Status"
+        "Status",
       ],
       columns: [
         "owner",
@@ -181,32 +209,36 @@ export default {
         "season",
         "region",
         "sellPrice",
-        "weekStatus"
-      ]
+        "weekStatus",
+      ],
     };
   },
   methods: {
     ...mapActions("myWeeks", ["getAllItems"]),
-    ...mapActions("myWeeks", ["getItems", "verifyWeek", "editSave", "publishOnly"]),
+    ...mapActions("myWeeks", [
+      "getItems",
+      "verifyWeek",
+      "editSave",
+      "publishWeek",
+      "unpublishWeek",
+    ]),
     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.status.id = 26;
-      item.status.code = "FS";
-      item.status.description = "For Sale";
-      item.status.statusType = true;
-      console.log(JSON.stringify(item));
-      this.publishOnly(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.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);
     },
     Unpublish(item) {
-      item.publish = false;
-
-      console.log(item);
-      this.publishOnly(item);
+      this.unpublishWeek(item);
     },
     Edit(item) {
       this.$router.push({ name: "EditTimeshare", params: { weekParam: item } });
@@ -234,16 +266,16 @@ export default {
     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 =>
+        const list = _.filter(this.getNeedsVerify, (item) =>
           Object.values(item).some(
-            i =>
+            (i) =>
               JSON.stringify(i)
                 .toLowerCase()
                 .indexOf(this.filter.toLowerCase()) > -1
@@ -256,7 +288,9 @@ export default {
     },
     PageCount() {
       return this.visibleItemsPerPageCount !== 0
-        ? Math.ceil(this.FilteredListings.length / this.visibleItemsPerPageCount)
+        ? Math.ceil(
+            this.FilteredListings.length / this.visibleItemsPerPageCount
+          )
         : 1;
     },
     DisplayItems() {
@@ -270,7 +304,7 @@ export default {
     },
     SortDirection() {
       return this.reverse ? "desc" : "asc";
-    }
+    },
   },
   created() {
     this.getItems(this.userId).then(() => {
@@ -293,9 +327,9 @@ export default {
         if (val != oldVal) {
           this.currentPage = 1;
         }
-      }
-    }
-  }
+      },
+    },
+  },
 };
 </script>
 

src/components/timeshare/sell/contentSection.vue

@@ -20,7 +20,10 @@
                 <label class="custom-control-label" for="customSwitch1">
                   {{ refAgent ? "Yes" : "No" }}
                 </label>
-                <div class="refbyAgent" :class="{ 'refbyAgent--clicked': refAgent }">
+                <div
+                  class="refbyAgent"
+                  :class="{ 'refbyAgent--clicked': refAgent }"
+                >
                   <div class="col-md-6" v-if="refAgent">
                     <label for="Name of Agency">Agency</label>
                     <select
@@ -29,9 +32,13 @@
                       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">
@@ -63,10 +70,13 @@
             <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"
+                  <label
+                    v-if="!sellItem.region"
+                    class="uniSelectLabel"
+                    for="weekInfoRegionSelect"
                     >REGION</label
                   >
-                  <float-label label="REGION" style="width:100%">
+                  <float-label label="REGION" style="width: 100%">
                     <select
                       id="weekInfoRegionSelect"
                       class="form-control uniSelect"
@@ -74,7 +84,11 @@
                       @change="regionChange()"
                       style="font-size: 15px"
                     >
-                      <option v-for="(region, r) in regions" :key="r" :value="region">
+                      <option
+                        v-for="(region, r) in regions"
+                        :key="r"
+                        :value="region"
+                      >
                         {{ region.regionName }}
                       </option>
                     </select>
@@ -94,10 +108,13 @@
               </div>
               <div class="form-group col-md-6 mt-2">
                 <div class="input-group">
-                  <label v-if="!sellItem.resort" class="uniSelectLabel" for="weekInfoResortSelect"
+                  <label
+                    v-if="!sellItem.resort"
+                    class="uniSelectLabel"
+                    for="weekInfoResortSelect"
                     >RESORT NAME</label
                   >
-                  <float-label label="RESORT NAME" style="width:100%">
+                  <float-label label="RESORT NAME" style="width: 100%">
                     <select
                       id="weekInfoResortSelect"
                       class="form-control uniSelect"
@@ -105,7 +122,11 @@
                       @change="resortChange()"
                     >
                       <option value="Other">Other</option>
-                      <option v-for="(resort, r) in filteredResort" :key="r" :value="resort">
+                      <option
+                        v-for="(resort, r) in filteredResort"
+                        :key="r"
+                        :value="resort"
+                      >
                         {{ resort.resortName }}
                       </option>
                     </select>
@@ -134,7 +155,12 @@
               </div>
               <div class="form-group col-md-6 mt-2">
                 <div v-if="sellItem.otherResort">
-                  <label v-if="!sellItem.region" class="uniSelectLabel" for="region">REGION</label>
+                  <label
+                    v-if="!sellItem.region"
+                    class="uniSelectLabel"
+                    for="region"
+                    >REGION</label
+                  >
                 </div>
 
                 <select
@@ -144,13 +170,15 @@
                   id="region"
                   v-model="sellItem.region"
                 >
-                  <option v-for="(region, r) in regions" :key="r">{{ region.regionName }}</option>
+                  <option v-for="(region, r) in regions" :key="r">
+                    {{ region.regionName }}
+                  </option>
                 </select>
               </div>
               <div class="form-group col-md-6 mt-2">
                 <float-label>
                   <input
-                    type="number"
+                    type="text"
                     class="form-control"
                     name="unitNumber"
                     id="unitNumber"
@@ -178,7 +206,12 @@
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6 mt-2">
-                <label v-if="!sellItem.season" class="uniSelectLabel" for="region">SEASON</label>
+                <label
+                  v-if="!sellItem.season"
+                  class="uniSelectLabel"
+                  for="region"
+                  >SEASON</label
+                >
                 <float-label label="SEASON">
                   <select
                     class="form-control uniSelect"
@@ -186,14 +219,19 @@
                     id="region"
                     v-model="sellItem.season"
                   >
-                    <option v-for="(season, r) in seasons" :key="r">{{ season.name }}</option>
+                    <option v-for="(season, r) in seasons" :key="r">
+                      {{ season.name }}
+                    </option>
                   </select>
                 </float-label>
 
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6 mt-2">
-                <label v-if="!sellItem.bedrooms" class="uniSelectLabel" for="region"
+                <label
+                  v-if="!sellItem.bedrooms"
+                  class="uniSelectLabel"
+                  for="region"
                   >BEDROOM/S</label
                 >
                 <float-label label="BEDROOM/S">
@@ -203,14 +241,19 @@
                     id="region"
                     v-model="sellItem.bedrooms"
                   >
-                    <option v-for="(item, i) in resortBedrooms" :key="i">{{ item }}</option>
+                    <option v-for="(item, i) in resortBedrooms" :key="i">
+                      {{ item }}
+                    </option>
                   </select>
                 </float-label>
 
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6 mt-2">
-                <label v-if="!sellItem.maxSleep" class="uniSelectLabel" for="region"
+                <label
+                  v-if="!sellItem.maxSleep"
+                  class="uniSelectLabel"
+                  for="region"
                   >SLEEP MAX</label
                 >
                 <float-label label="SLEEP MAX">
@@ -220,7 +263,9 @@
                     id="region"
                     v-model="sellItem.maxSleep"
                   >
-                    <option v-for="(item, i) in maxSleep" :key="i">{{ item }}</option>
+                    <option v-for="(item, i) in maxSleep" :key="i">
+                      {{ item }}
+                    </option>
                   </select>
                 </float-label>
 
@@ -242,7 +287,10 @@
                 <div class="validation"></div>
               </div>
               <div class="form-group col-md-6 mt-2">
-                <label v-if="!sellItem.weekType" class="uniSelectLabel" for="region"
+                <label
+                  v-if="!sellItem.weekType"
+                  class="uniSelectLabel"
+                  for="region"
                   >WEEK TYPE</label
                 >
                 <float-label label="WEEK TYPE">
@@ -264,7 +312,9 @@
           <div align="left" class="custom-control custom-switch mb-2">
             <div class="row">
               <div align="center" class="col">
-                <label class="mr-5">Has your week been spacebanked for the current year?</label>
+                <label class="mr-5"
+                  >Has your week been spacebanked for the current year?</label
+                >
                 <input
                   type="checkbox"
                   class="custom-control-input"
@@ -277,10 +327,14 @@
                 </label>
                 <div
                   class="spacebanked1"
-                  :class="{ 'spacebanked1--clicked': sellItem.currentYearBanked }"
+                  :class="{
+                    'spacebanked1--clicked': sellItem.currentYearBanked,
+                  }"
                 >
                   <div class="col-md-6">
-                    <label for="If yes, please confirm with whom" v-if="sellItem.currentYearBanked"
+                    <label
+                      for="If yes, please confirm with whom"
+                      v-if="sellItem.currentYearBanked"
                       >Please confirm with whom</label
                     >
                     <select
@@ -289,7 +343,9 @@
                       v-if="sellItem.currentYearBanked"
                       v-model="sellItem.bankedWith"
                     >
-                      <option v-for="(item, i) in bankedEntities" :key="i">{{ item }}</option>
+                      <option v-for="(item, i) in bankedEntities" :key="i">
+                        {{ item }}
+                      </option>
                     </select>
                   </div>
                 </div>
@@ -372,28 +428,37 @@
               <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"
+                    <label
+                      v-if="indiv.howMarried === 'N/A'"
+                      for="howMarried"
+                      class="uniSelectLabel"
                       >Marital Status</label
                     >
                   </span>
 
-                  <float-label label="Marital Status" style="width:100%">
+                  <float-label label="Marital Status" style="width: 100%">
                     <select
                       class="form-control uniSelect"
                       id="howMarried"
                       v-model="indiv.howMarried"
                     >
                       <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="In Community Of Property">
+                        In 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="Traditional Wedding">
+                        Traditional Wedding
+                      </option>
                       <option value="Single">Single</option>
                       <option value="Divorced">Divorced</option>
                       <option value="Widow">Widow</option>
-                      <option value="Committed Relationship">Committed Relationship</option>
+                      <option value="Committed Relationship">
+                        Committed Relationship
+                      </option>
                       <option value="Partner">Partner</option>
                     </select>
                   </float-label>
@@ -450,10 +515,16 @@
               </div>
             </div>
           </div>
-          <div v-if="indiv.howMarried === 'In Community Of Property'" class="section-header">
+          <div
+            v-if="indiv.howMarried === 'In Community Of Property'"
+            class="section-header"
+          >
             <h2>Spouse Details</h2>
           </div>
-          <div v-if="indiv.howMarried === 'In Community Of Property'" class="form">
+          <div
+            v-if="indiv.howMarried === 'In Community Of Property'"
+            class="form"
+          >
             <div class="form-row mb-2">
               <div class="form-group col-md-6 mt-2">
                 <float-label>
@@ -632,9 +703,14 @@
             <div class="form-row">
               <div
                 class="form-group col-md-12"
-                style="border:solid;border-width:2px; border-color:rgb(27, 117, 187);border-radius: 3px"
+                style="
+                  border: solid;
+                  border-width: 2px;
+                  border-color: rgb(27, 117, 187);
+                  border-radius: 3px;
+                "
               >
-                <p style="text-align: left; margin:auto; padding:10px">
+                <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>
@@ -643,7 +719,10 @@
 
             <div class="form-row">
               <div class="col-md-8">
-                <p>1.1. All levy amounts for the current cycle have been paid in full</p>
+                <p>
+                  1.1. All levy amounts for the current cycle have been paid in
+                  full
+                </p>
               </div>
               <div class="form-group col-md-2">
                 <div class="custom-control custom-switch">
@@ -685,7 +764,10 @@
 
             <div class="form-row">
               <div class="col-md-8">
-                <p>1.3. I / We bought the timeshare module/week on the following date:</p>
+                <p>
+                  1.3. I / We bought the timeshare module/week on the following
+                  date:
+                </p>
               </div>
               <div class="form-group col-md-2">
                 <input
@@ -700,7 +782,10 @@
 
             <div class="form-row">
               <div class="col-md-8">
-                <p>1.4. The purchase price for which I / we bought timeshare module / week was:</p>
+                <p>
+                  1.4. The purchase price for which I / we bought timeshare
+                  module / week was:
+                </p>
               </div>
               <div class="form-group col-md-2">
                 <input
@@ -718,8 +803,8 @@
             <div class="form-row">
               <div class="col-md-8">
                 <p>
-                  1.5. I / We bought the timeshare module / week for the following dates for the
-                  current year:
+                  1.5. I / We bought the timeshare module / week for the
+                  following dates for the current year:
                 </p>
               </div>
               <div class="form-group col-md-2">
@@ -747,8 +832,8 @@
             <div class="form-row">
               <div class="col-md-8">
                 <p>
-                  1.6. The selling price for the timeshare module / week for which I / we want to
-                  sell is: (Incl. Vat)
+                  1.6. The selling price for the timeshare module / week for
+                  which I / we want to sell is: (Incl. Vat)
                 </p>
               </div>
               <div class="form-group col-md-2">
@@ -766,7 +851,9 @@
 
             <div class="form-row">
               <div class="col-md-8">
-                <p>1.7. Estate agent's commission agreed to (state Rand value)</p>
+                <p>
+                  1.7. Estate agent's commission agreed to (state Rand value)
+                </p>
               </div>
               <div class="form-group col-md-2">
                 <input
@@ -784,31 +871,44 @@
             <div class="form-row">
               <div class="col-md-8">
                 <p>
-                  1.8. I hereby Mandate Uni-Vate properties to sell the timeshare listed above on my
-                  behalf
+                  1.8. I hereby Mandate Uni-Vate properties to sell the
+                  timeshare listed above on my behalf
                 </p>
               </div>
               <div class="form-group col-md-4">
-                <input type="checkbox" @change="SetMandateDate" v-model="sellItem.mandate" />
+                <input
+                  type="checkbox"
+                  @change="SetMandateDate"
+                  v-model="sellItem.mandate"
+                />
               </div>
             </div>
             <div class="form-row" v-if="!CanSave">
               <div class="col-md-12">
-                <p class="alert myError">Please ensure that you add spouse details.</p>
+                <p class="alert myError">
+                  Please ensure that you add spouse details.
+                </p>
               </div>
             </div>
             <div class="form-row" v-if="profileEmailError">
               <div class="col-md-12">
                 <p class="alert myError">
-                  Please ensure that your email is correct before adding a timeshare week.
+                  Please ensure that your email is correct before adding a
+                  timeshare week.
                 </p>
               </div>
             </div>
             <div class="text-center col-12" v-if="CanSave">
-              <button class="btn-solid-blue" v-if="!sellItem.id" @click="submitSale()">
+              <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>
+              <button class="btn-solid-blue" v-else @click="newSale()">
+                NEW WEEK
+              </button>
             </div>
             <!-- <div class="text-center col-12">
               <button class="btn-solid-blue" @click="paygateRedirect()">PayGate</button>
@@ -838,19 +938,19 @@ export default {
   name: "TimeshareToSell",
   props: {
     weekId: {
-      default: 0
-    }
+      default: 0,
+    },
   },
   data() {
     return {
       wait: false,
       userLoggedIn: Log.isLoggedIn(),
-      profileEmailError: false
+      profileEmailError: false,
     };
   },
   components: {
     addressAutoComplete,
-    Alert
+    Alert,
   },
   mounted() {
     if (this.sellItem.id) {
@@ -876,13 +976,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() {
@@ -891,9 +991,14 @@ 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;
@@ -901,14 +1006,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);
@@ -919,17 +1024,26 @@ 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() {
@@ -941,12 +1055,15 @@ export default {
         this.sellItem.ownerObject = this.indiv;
         this.sellItem.weekStatus = "For Sale";
         this.saveWeek(this.sellItem)
-          .then(fulfilled => {
+          .then((fulfilled) => {
             console.log(fulfilled);
-            this.$router.push({ name: "PaymentOption", params: { week: fulfilled } });
+            this.$router.push({
+              name: "PaymentOption",
+              params: { week: fulfilled },
+            });
             //this.paygateRedirect();
           })
-          .catch(ex => {
+          .catch((ex) => {
             this.profileEmailError = true;
           });
       } else {
@@ -961,16 +1078,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,
+          },
         });
       });
     },
@@ -995,7 +1112,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") {
@@ -1007,7 +1124,9 @@ 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;
@@ -1023,8 +1142,8 @@ export default {
       } else {
         this.sellItem.mandateDate = undefined;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 

src/store/modules/timeshare/myWeeks.js

@@ -25,11 +25,17 @@ export default {
       });
 
       Object.assign(state.items[index], item);
+    },
+    updatePublished(state, item) {
+      state.items.find(week => week.id === item.id).publish = true;
+    },
+    updateUnpublished(state, item) {
+      state.items.find(week => week.id === item.id).publish = false;
     }
   },
   getters: {
     getNeedsVerify(state) {
-      return state.items
+      return state.items;
     }
     // removeListing(state, id) {
     //   state.myWeeks.pop(state.myWeeks.find(w => w.id === id));
@@ -58,8 +64,17 @@ export default {
         console.log(err);
       }
     },
-    publishWeek(id) {
-      axios.post(`/api/timeshareweek/publishweek/${id}`).catch(console.error);
+    publishWeek({ commit }, item) {
+      axios
+        .post(`/api/timeshareweek/publishweek/${item.id}`)
+        .then(result => commit("updatePublished", item))
+        .catch(console.error);
+    },
+    unpublishWeek({ commit }, item) {
+      axios
+        .post(`/api/timeshareweek/UnpublishWeek/${item.id}`)
+        .then(result => commit("updateUnpublished", item))
+        .catch(console.error);
     },
     // deleteListing({ commit }, id) {
     //   axios